Merge remote-tracking branch 'origin/main' into main

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/PushTaskPlugin.java

@@ -44,14 +44,36 @@ public class PushTaskPlugin extends AbstractTask implements Plugin {
 
                 // 已结算、未结算、结算失败、未推送
                 // 付款处理
+                /**
+                 * 出纳	CAS
+                 * 应付	AP
+                 * 应收	AR
+                 * 费用	ER
+                 * 银企互联	BE
+                 * 采购管理	PM
+                 * 资金调度	FCA √
+                 * 融资管理	CFM √
+                 * 财务报账	FR
+                 * 内部金融	IFM
+                 * 产品委外	OM
+                 * 投资管理	CIM √
+                 * 资金结算	FS
+                 * 信用证	LC √
+                 * 交易管理	TM
+                 * 票据管理	CDM
+                 * 融资租赁	FL
+                 * 项目合同管理	pmct
+                 * 供应链融资	SCF
+                 */
                 case "cas_paybill":
                     DynamicObject[] objects1 = BusinessDataServiceHelper.load("cas_paybill",
                             "id,billno,actpayamt,entry,entry.e_expenseitem,entry.e_remark,entry.e_actamt,settletype," +
                                     "payeebanknum,payeetype,payeenumber,payeracctbank,payeebank,payeebankname,paymenttype," +
                                     "org,bizdate,description,shkd_pushstatus,shkd_businessnumber,shkd_businessid,shkd_businessname," +
-                                    "billstatus,bankpaystatus"
+                                    "billstatus,bankpaystatus,sourcetype"
                             , new QFilter("bizdate", QCP.large_equals, getFirstDayOfMonth(3))
-                                    .and("billstatus", QCP.equals, "D").toArray());
+                                    .and("billstatus", QCP.equals, "D")
+                                    .and("sourcetype", QCP.in, "FCA,CFM,CIM,LC,CDM,FL").toArray());
 
                     Arrays.stream(objects1).forEach(dynamicObject -> {
                         DynamicObject org = dynamicObject.getDynamicObject("org");