- [x] 处理收款单报错

- [x] 付款单(同名转账&&跨主题调拨)携带资金计划科目逻辑优化,进入逻辑条件优化(应付 &&  被动付款)
s

main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillFromPlugin.java

@@ -40,14 +40,17 @@ public class RecBillFromPlugin extends AbstractFormPlugin implements Plugin {
         //携带付款人编码
         String payerformid = ""+this.getView().getModel().getValue("payerformid");//付款人类型标识ID
         Long payer = Long.valueOf(""+this.getView().getModel().getValue("payer"));//付款人ID
-        if (!"other".equals(payerformid)) {
-            DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(payer, payerformid);
-            if (null != dynamicObject) {
-                Label label1 = this.getView().getControl("shjh_positionbr4");
-                label1.setText(dynamicObject.getString("number"));
+        if (payer != 0 && payerformid!= null &&!payerformid.isEmpty()) {
+            if (!"other".equals(payerformid)) {
+                DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(payer, payerformid);
+                if (null != dynamicObject) {
+                    Label label1 = this.getView().getControl("shjh_positionbr4");
+                    label1.setText(dynamicObject.getString("number"));
+                }
             }
         }
 
+
         //携带生单规则分录的业务大类,业务小类,成本中心,利润中心到收款处理单头__逻辑迁移到单据保存操作插件
 //        carryCustomer();
         //根据分录清账状态去默认表头的清账状态

main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java

@@ -41,11 +41,16 @@ public class PayBillSaveOperation extends AbstractOperationServicePlugIn impleme
                 DynamicObject shjhMembersubject = bill.getDynamicObject("shjh_membersubject");
                 if (null != paymentidentify && null == shjhMembersubject) {
                     String paymentidentifyNumber = paymentidentify.getString("number");
-                    if ("FKBS02".equals(paymentidentifyNumber)) {
+                    //被动 || 来源系统不为应付
+                    String sourcetype = bill.getString("sourcetype");
+
+                    if ("FKBS02".equals(paymentidentifyNumber) || !"AP".equals(sourcetype)) {
                         //根据配置表携带资金计划科目
                         bill.set("shjh_membersubject", xdMembersubject(bill));
 
                     }
+                    //来源系统资金调度
+
                 }
             }
             SaveServiceHelper.update(dataEntities);
@@ -240,6 +245,11 @@ public class PayBillSaveOperation extends AbstractOperationServicePlugIn impleme
                 QFilter q2 = new QFilter("shjh_bhcgz.fbasedataid", QCP.equals, null);
                 qFilter = qFilter.and(q2);
             }
+        }else {
+            QFilter q2 = new QFilter("shjh_yym.fbasedataid", QCP.equals, null);
+            QFilter q3 = new QFilter("shjh_kjkm.fbasedataid", QCP.equals, null);
+            QFilter q4 = new QFilter("shjh_bhcgz.fbasedataid", QCP.equals, null);
+            qFilter = qFilter.and(q2).and(q3).and(q4);
         }
 
         DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_pay_account", "id,shjh_membersubject", qFilter.toArray());

main/java/shjh/jhzj7/fi/fi/utils/EsbUtils.java

@@ -54,7 +54,7 @@ public class EsbUtils {
     public static Map<String, Long> getOrgNumberIds(){
         Map<String, Long> orgids = new HashMap<>();
         DynamicObject[] orginfos = BusinessDataServiceHelper.load(orgName,"id,number",
-                new QFilter[]{new QFilter("fisaccounting","=",1)});
+                new QFilter[]{new QFilter("fisaccounting","=","1")});
         for (DynamicObject orginfo : orginfos) {
             orgids.put(orginfo.getString("number"),orginfo.getLong("id"));
         }

main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java

@@ -782,7 +782,7 @@ public class ApplyAdjustBillControler {
     /**
      * 设置付款类型 外部系统单据类型
      * @param ap_payapply       付款申请单的动态对象
-     * @param accountingsubject 会计科目
+     * @param uuid 单据号
      */
     public static void setPaymentType(DynamicObject ap_payapply, String uuid) {
 //        String paymentTypeName = "1221020200".equals(accountingsubject) ? "对私付款" : "对公付款";