wanghaiwu 1 hete
szülő
commit
4e053a3499

+ 20 - 2
code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/SRMSynPayApiPlugin.java

@@ -280,11 +280,19 @@ public class SRMSynPayApiPlugin implements Serializable {
             return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
         }
 
+        String detailtype = "biztype_other";
         //合同台账
         DynamicObject contractInfo = null;
         if(!StringUtils.isEmpty(contract)) {
             qFilter = new QFilter("contractcode", QCP.equals, contract);
             contractInfo = BusinessDataServiceHelper.loadSingle("er_contractbill", qFilter.toArray());
+
+            if(contractInfo == null){
+                returnMessage = "合同(" + contract + ")在星瀚中未匹配到合同台账";
+                return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
+            }
+
+            detailtype = "biztype_contract";
         }
 
 
@@ -333,7 +341,8 @@ public class SRMSynPayApiPlugin implements Serializable {
         bizAcctOutBill.set("formid", "er_publicreimbursebill");//表单id
         bizAcctOutBill.set("iscrepayablebill", "0");//生成应付单
         bizAcctOutBill.set("billpayertype", "bd_supplier");//往来类型
-        bizAcctOutBill.set("detailtype", "biztype_other");//关联业务
+        bizAcctOutBill.set("detailtype", detailtype);//关联业务
+        bizAcctOutBill.set("nckd_detailtype", detailtype);//是否关联合同
         bizAcctOutBill.set("assettype", "newasset");//资产类型
         bizAcctOutBill.set("abovequota", "0");//超额
         bizAcctOutBill.set("ispush", "false");//合同下推生成
@@ -1078,11 +1087,19 @@ public class SRMSynPayApiPlugin implements Serializable {
             return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
         }
 
+        String detailtype = "biztype_other";
         //合同台账
         DynamicObject contractInfo = null;
         if(!StringUtils.isEmpty(contract)) {
             qFilter = new QFilter("contractcode", QCP.equals, contract);
             contractInfo = BusinessDataServiceHelper.loadSingle("er_contractbill", qFilter.toArray());
+
+            if(contractInfo == null){
+                returnMessage = "合同(" + contract + ")在星瀚中未匹配到合同台账";
+                return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
+            }
+
+            detailtype = "biztype_contract";
         }
 
         //单据类型
@@ -1130,7 +1147,8 @@ public class SRMSynPayApiPlugin implements Serializable {
         dailyLoanBill.set("tel", applierInfo.get("phone"));//电话号码
         dailyLoanBill.set("formid", ENTITY_PREPAY);//表单id
         dailyLoanBill.set("billpayertype", "bd_supplier");//往来类型
-        dailyLoanBill.set("detailtype", "biztype_other");//关联业务
+        dailyLoanBill.set("detailtype", detailtype);//关联业务
+        dailyLoanBill.set("nckd_detailtype", detailtype);//是否关联合同
         dailyLoanBill.set("ispush", "false");//合同下推生成
         dailyLoanBill.set("nckd_srmstatus", "1");//srm状态,1:SRM已推送;2:已退回SRM;3:已反写SRM;4:反写SRM失败
 //        dailyLoanBill.set("repaymentdate", repaymentDate);//预计冲销日期