From 4102004c9c8f049fc9f612e50ef6953049508097 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 27 May 2025 19:13:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E4=BF=AE=E6=94=B9QMS=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E6=96=87=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cim/idm/service/impl/QMSServiceImpl.java  | 27 ++++++++++---------
 .../idm/service/impl/ToSAPServiceImpl.java    |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
index 2cfb05c..a42263a 100644
--- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
+++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
@@ -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" +
 				"WITH  AA AS (\n" +
 				"\tSELECT\n" +
-				"\t\tP.SITENAME,\n" +
+				" P.SITENAME,\n" +
 				"\t\tP.RECEIVEREQUESTNAME,\n" +
 				"\t\tP.ERPFACTORY,\n" +
 				"\t\tP.ERPLOCATION,\n" +
@@ -490,36 +490,39 @@ public class QMSServiceImpl implements QMSService{
 				"\t\tP.UNIT AS quantityUnit,\n" +
 				"\t\tLISTAGG(DISTINCT P.CHARGE , ';')  WITHIN GROUP (ORDER BY P.CHARGE) AS LOTS,\n" +
 				"\t\tCOUNT(DISTINCT P.CHARGE ) batchQuantity,\n" +
-				"\t\tP.SUPPLIERNAME\n" +
+				"\t\tP.SUPPLIERNAME,\n" +
+				"\t\tP.TRUEGG " +
 				"\tFROM\n" +
 				"\t\tMATERIALPACKING P \n" +
 				"\tWHERE\n" +
 				"\t\tP.RECEIVEREQUESTNAME =:DELIVERYNAME\n" +
 				"\t\tGROUP BY \n" +
-				"\t\tP.SITENAME,\n" +
+				" P.SITENAME,\n" +
 				"\t\tP.RECEIVEREQUESTNAME,\n" +
 				"\t\tP.ERPFACTORY,\n" +
 				"\t\tP.ERPLOCATION,\n" +
 				"\t\tP.MATERIALSPECNAME,\n" +
 				"\t\tP.LOCATIONNAME,\n" +
 				"\t\tP.UNIT,\n" +
-				"\t\tP.SUPPLIERNAME\n" +
+				"\t\tP.SUPPLIERNAME,\n" +
+				"\t\tP.TRUEGG " +
 				"\t\t)\n" +
 				"\t\t\n" +
 				"SELECT\n" +
-				"\tAA.SITENAME,\n" +
+				" AA.SITENAME,\n" +
 				"AA.RECEIVEREQUESTNAME,\n" +
 				"\t\tAA.ERPFACTORY,\n" +
 				"\t\tAA.ERPLOCATION,\n" +
-				"\t\tAA.materialCode,\n" +
+				"\t\tAA.MATERIALCODE AS MATERIALSPECNAME,\n" +
 				"\t\tAA.LOCATIONNAME,\t\n" +
-				"\t\tAA.quantityUnit,\n" +
+				"\t\tAA.quantityUnit AS UNIT,\n" +
 				"\t\tAA.LOTS,\n" +
 				"\t\tAA.batchQuantity,\n" +
-				"\t\tAA.SUPPLIERNAME,\n" +
+				"\t\tAA.SUPPLIERNAME AS SUPPLIERCODE,\n" +
 				"\t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" +
 				"\t\tMP.MATERIALGROUP,\n" +
-				"\t\tMP.DESCRIPTION\n" +
+				"\t\tMP.DESCRIPTION AS MATERIALNAME,\n" +
+				"\t\tAA.TRUEGG AS BATCHNUMBER " +
 				"FROM\n" +
 				"AA\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"
 			jsonObject.put("opCode", 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("supplierCode", list.get(i).get("SUPPLIERCODE"));
 			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("batchQuantity", list.get(i).get("BATCHQUANTITY"));//
 			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("LOCATIONNAME", list.get(i).get("LOCATIONNAME"));
 			jsonObject.put("inspector", "检验室(原材仓)");
diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
index fee5501..918e2c5 100644
--- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
+++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
@@ -7134,7 +7134,7 @@ public class ToSAPServiceImpl {
                 // 调用 QMS
                 //qMSServiceImpl.PreIQCInfoSend(receiveRequestName, "SDK",opCode, erpFactory);
                 exceptionMsg = "QMS返回";
-                qmsServiceImpl.sendToIQCByDataList(opCode, "SDK",deliveryName);
+                qmsServiceImpl.sendToIQCByDataList(opCode, "SDK",deliveryName, commitDate);
             }
             // 更新入库凭证,更新库存状态
             if (StringUtils.isNotEmpty(undoId)){