10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

update 到货单入库，修改QMS质检报文格式

Browse Source
This commit is contained in:
18110972313 2025-05-27 19:13:48 +08:00
parent 2030f4c390
commit 4102004c9c
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
View File

@ -477,11 +477,11 @@ public class QMSServiceImpl implements QMSService{
} }
public String sendToIQCByDataList(String opCode, String siteName, String deliveryName) throws CustomException { public String sendToIQCByDataList(String opCode, String siteName, String deliveryName,String commitDate) throws CustomException {
String sql = " \n" + String sql = " \n" +
"WITH AA AS (\n" + "WITH AA AS (\n" +
"\tSELECT\n" + "\tSELECT\n" +
"\t\tP.SITENAME,\n" + " P.SITENAME,\n" +
"\t\tP.RECEIVEREQUESTNAME,\n" + "\t\tP.RECEIVEREQUESTNAME,\n" +
"\t\tP.ERPFACTORY,\n" + "\t\tP.ERPFACTORY,\n" +
"\t\tP.ERPLOCATION,\n" + "\t\tP.ERPLOCATION,\n" +
@ -490,36 +490,39 @@ public class QMSServiceImpl implements QMSService{
"\t\tP.UNIT AS quantityUnit,\n" + "\t\tP.UNIT AS quantityUnit,\n" +
"\t\tLISTAGG(DISTINCT P.CHARGE , ';') WITHIN GROUP (ORDER BY P.CHARGE) AS LOTS,\n" + "\t\tLISTAGG(DISTINCT P.CHARGE , ';') WITHIN GROUP (ORDER BY P.CHARGE) AS LOTS,\n" +
"\t\tCOUNT(DISTINCT P.CHARGE ) batchQuantity,\n" + "\t\tCOUNT(DISTINCT P.CHARGE ) batchQuantity,\n" +
"\t\tP.SUPPLIERNAME\n" + "\t\tP.SUPPLIERNAME,\n" +
"\t\tP.TRUEGG " +
"\tFROM\n" + "\tFROM\n" +
"\t\tMATERIALPACKING P \n" + "\t\tMATERIALPACKING P \n" +
"\tWHERE\n" + "\tWHERE\n" +
"\t\tP.RECEIVEREQUESTNAME =:DELIVERYNAME\n" + "\t\tP.RECEIVEREQUESTNAME =:DELIVERYNAME\n" +
"\t\tGROUP BY \n" + "\t\tGROUP BY \n" +
"\t\tP.SITENAME,\n" + " P.SITENAME,\n" +
"\t\tP.RECEIVEREQUESTNAME,\n" + "\t\tP.RECEIVEREQUESTNAME,\n" +
"\t\tP.ERPFACTORY,\n" + "\t\tP.ERPFACTORY,\n" +
"\t\tP.ERPLOCATION,\n" + "\t\tP.ERPLOCATION,\n" +
"\t\tP.MATERIALSPECNAME,\n" + "\t\tP.MATERIALSPECNAME,\n" +
"\t\tP.LOCATIONNAME,\n" + "\t\tP.LOCATIONNAME,\n" +
"\t\tP.UNIT,\n" + "\t\tP.UNIT,\n" +
"\t\tP.SUPPLIERNAME\n" + "\t\tP.SUPPLIERNAME,\n" +
"\t\tP.TRUEGG " +
"\t\t)\n" + "\t\t)\n" +
"\t\t\n" + "\t\t\n" +
"SELECT\n" + "SELECT\n" +
"\tAA.SITENAME,\n" + " AA.SITENAME,\n" +
"AA.RECEIVEREQUESTNAME,\n" + "AA.RECEIVEREQUESTNAME,\n" +
"\t\tAA.ERPFACTORY,\n" + "\t\tAA.ERPFACTORY,\n" +
"\t\tAA.ERPLOCATION,\n" + "\t\tAA.ERPLOCATION,\n" +
"\t\tAA.materialCode,\n" + "\t\tAA.MATERIALCODE AS MATERIALSPECNAME,\n" +
"\t\tAA.LOCATIONNAME,\t\n" + "\t\tAA.LOCATIONNAME,\t\n" +
"\t\tAA.quantityUnit,\n" + "\t\tAA.quantityUnit AS UNIT,\n" +
"\t\tAA.LOTS,\n" + "\t\tAA.LOTS,\n" +
"\t\tAA.batchQuantity,\n" + "\t\tAA.batchQuantity,\n" +
"\t\tAA.SUPPLIERNAME,\n" + "\t\tAA.SUPPLIERNAME AS SUPPLIERCODE,\n" +
"\t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" + "\t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" +
"\t\tMP.MATERIALGROUP,\n" + "\t\tMP.MATERIALGROUP,\n" +
"\t\tMP.DESCRIPTION\n" + "\t\tMP.DESCRIPTION AS MATERIALNAME,\n" +
"\t\tAA.TRUEGG AS BATCHNUMBER " +
"FROM\n" + "FROM\n" +
"AA\n" + "AA\n" +
"LEFT JOIN BS_ERPLOCATION EL ON EL.ERPLOCATIONNAME = AA.ERPLOCATION\n" + "LEFT JOIN BS_ERPLOCATION EL ON EL.ERPLOCATIONNAME = AA.ERPLOCATION\n" +
@ -548,7 +551,7 @@ public class QMSServiceImpl implements QMSService{
//         "deliveryDate": "2024-1-1 12:2:2" //         "deliveryDate": "2024-1-1 12:2:2"
jsonObject.put("opCode", opCode); jsonObject.put("opCode", opCode);
jsonObject.put("deliveryNumber", opCode); jsonObject.put("deliveryNumber", opCode);
jsonObject.put("warehouse", list.get(i).get("ERPLOCATIONDESC")); //jsonObject.put("warehouse", list.get(i).get("ERPLOCATIONDESC"));
jsonObject.put("supplierName", list.get(i).get("SUPPLIERNAME")); jsonObject.put("supplierName", list.get(i).get("SUPPLIERNAME"));
jsonObject.put("supplierCode", list.get(i).get("SUPPLIERCODE")); jsonObject.put("supplierCode", list.get(i).get("SUPPLIERCODE"));
jsonObject.put("materialName", list.get(i).get("MATERIALNAME")); jsonObject.put("materialName", list.get(i).get("MATERIALNAME"));
@ -556,7 +559,7 @@ public class QMSServiceImpl implements QMSService{
jsonObject.put("materialGroup", list.get(i).get("MATERIALGROUP")); jsonObject.put("materialGroup", list.get(i).get("MATERIALGROUP"));
jsonObject.put("batchQuantity", list.get(i).get("BATCHQUANTITY"));// jsonObject.put("batchQuantity", list.get(i).get("BATCHQUANTITY"));//
jsonObject.put("quantityUnit", list.get(i).get("UNIT"));//QUANTITYUNIT jsonObject.put("quantityUnit", list.get(i).get("UNIT"));//QUANTITYUNIT
jsonObject.put("deliveryDate", list.get(i).get("DELIVERYDATE"));// jsonObject.put("deliveryDate", commitDate);//
jsonObject.put("specifications", list.get(i).get("BATCHNUMBER"));// jsonObject.put("specifications", list.get(i).get("BATCHNUMBER"));//
jsonObject.put("LOCATIONNAME", list.get(i).get("LOCATIONNAME")); jsonObject.put("LOCATIONNAME", list.get(i).get("LOCATIONNAME"));
jsonObject.put("inspector", "检验室(原材仓)"); jsonObject.put("inspector", "检验室(原材仓)");

2
zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
View File

@ -7134,7 +7134,7 @@ public class ToSAPServiceImpl {
// 调用 QMS // 调用 QMS
//qMSServiceImpl.PreIQCInfoSend(receiveRequestName, "SDK",opCode, erpFactory); //qMSServiceImpl.PreIQCInfoSend(receiveRequestName, "SDK",opCode, erpFactory);
exceptionMsg = "QMS返回"; exceptionMsg = "QMS返回";
qmsServiceImpl.sendToIQCByDataList(opCode, "SDK",deliveryName); qmsServiceImpl.sendToIQCByDataList(opCode, "SDK",deliveryName, commitDate);
} }
// 更新入库凭证,更新库存状态 // 更新入库凭证,更新库存状态
if (StringUtils.isNotEmpty(undoId)){ if (StringUtils.isNotEmpty(undoId)){