支付改成id+版本号

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/cas/opplugin/PayBillToolUtil.java

@@ -47,10 +47,11 @@ public class PayBillToolUtil {
 
             //EAS付款单据号
             String bbh = info.get("nckd_bbh") + "";//版本号
-            data.put("ERP_INS_ID", info.getPkValue() + "");
+
+            data.put("ERP_INS_ID", info.getPkValue() + "@" + bbh);
 
             //EAS付款单据号
-            data.put("ERP_PAYNO", info.get("billno") + "-" + bbh);
+            data.put("ERP_PAYNO", info.get("billno") + "");
 
             //录入人
             data.put("CREATOR", info.get("creator.name").toString());
@@ -264,10 +265,10 @@ public class PayBillToolUtil {
 
 
         String bbh = info.get("nckd_bbh") + "";//版本号
-        data.put("ERP_INS_ID", info.getPkValue() + "");
+        data.put("ERP_INS_ID", info.getPkValue() + "@" + bbh);
 
         //EAS付款单据号
-        data.put("ERP_PAYNO", info.get("billno") + "-" + bbh);
+        data.put("ERP_PAYNO", info.get("billno") + "");
 
         //付款日期
         data.put("PAY_DATE", TypeUtils.date2String(new Date(), TypeUtils.DEFAULT_DATE_FORMAT));

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/TransDetailApiPlugin.java

@@ -383,6 +383,10 @@ public class TransDetailApiPlugin implements Serializable {
         String casBillID = jsonObject.getString("sourceBillId");
         DynamicObject paybillDyn = null;
         if(StringUtils.isNotEmpty(casBillID)){
+            if(casBillID.contains("@")){
+                casBillID = casBillID.split("@")[0];
+            }
+
             Long billid  = Long.parseLong(casBillID);
             //获取 付款单号
             QFilter qFilter = new QFilter("id", QCP.equals, billid);