Merge remote-tracking branch 'origin/master'

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

@@ -45,7 +45,8 @@ public class PayBillToolUtil {
 
             //EAS付款单据号
             String bbh = info.get("nckd_bbh") + "";//版本号
-            data.put("ERP_INS_ID", info.getPkValue() + "-" + bbh);
+            data.put("ERP_INS_ID", info.getPkValue() + "");
+
             //EAS付款单据号
             data.put("ERP_PAYNO", info.get("billno") + "-" + bbh);
 
@@ -261,7 +262,8 @@ public class PayBillToolUtil {
 
 
         String bbh = info.get("nckd_bbh") + "";//版本号
-        data.put("ERP_INS_ID", info.getPkValue() + "-" + bbh);
+        data.put("ERP_INS_ID", info.getPkValue() + "");
+
         //EAS付款单据号
         data.put("ERP_PAYNO", info.get("billno") + "-" + bbh);
 

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/cas/task/AgentpaybillQueryStatusTast.java

@@ -43,7 +43,8 @@ public class AgentpaybillQueryStatusTast extends AbstractTask {
             JSONObject param = new JSONObject();
             PayBillToolUtil.headJson(param);
             JSONObject data = new JSONObject();
-            data.put("ERP_INS_ID",dataEntity.getPkValue()+"-"+dataEntity.get("nckd_bbh"));
+            data.put("ERP_INS_ID",dataEntity.getPkValue()+"");
+
             param.put("data",data);
             param.put("txDateTime",Utils.getData(new Date(), "yyyyMMddHHmmss"));
             param.put("batchNo",TypeUtils.nullToString(dataEntity.get("billno"))+"-"+TypeUtils.nullToString(dataEntity.get("nckd_bbh"))+"-"+Utils.getData(new Date(), "yyyyMMddHHmmss"));

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/cas/task/PayQueryStatusTast.java

@@ -39,7 +39,8 @@ public class PayQueryStatusTast extends AbstractTask {
             JSONObject param = new JSONObject();
             PayBillToolUtil.headJson(param);
             JSONObject data = new JSONObject();
-            data.put("ERP_INS_ID",dataEntity.getPkValue()+"-"+dataEntity.get("nckd_bbh"));
+            data.put("ERP_INS_ID",dataEntity.getPkValue()+"");
+
             param.put("data",data);
             param.put("txDateTime",Utils.getData(new Date(), "yyyyMMddHHmmss"));
             param.put("batchNo",TypeUtils.nullToString(dataEntity.get("billno"))+"-"+TypeUtils.nullToString(dataEntity.get("nckd_bbh"))+"-"+Utils.getData(new Date(), "yyyyMMddHHmmss"));