From ad89401f6831b784cd9559ab820a8ff30f6e72b1 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Mon, 12 May 2025 15:24:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=89=B9=E6=AC=A1=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=85=A5=E5=BA=93=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8QMS=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=88=90=E5=8A=9F=E5=90=8E=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=87=8D=E5=A4=8D=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialReceiveActController.java         |  8 ++++++-
 .../Impl/SDKMaterialPackingServiceImpl.java   | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
index 382c404..a3961df 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
@@ -552,7 +552,13 @@ public class MaterialReceiveActController {
 			EventInfoUtil util = new EventInfoUtil();
 			makeEventInfo = util.makeEventInfo("NormalStockInForSDK", user, "NormalStockInForSDK");
 			// 更新入库凭证
-			SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoId, makeEventInfo);
+			//SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoId, makeEventInfo);
+			/**
+			 * updateUndoIdByReceive和updateStockState都在MATERIALPACKINGHISTORY表插入了数据，导致有重复的入库记录
+			 * 为了不影响后续通过undoId作为条件处理其它业务，新建方法updateMaterialPackingUndoIdByReceive，只更新undoId，不插入MATERIALPACKINGHISTORY表
+			 * 2025-05-12
+			 */
+			SDKMaterialPackingServiceImpl.updateMaterialPackingUndoIdByReceive(receiveRequestName, undoId);
 			// 更新库存状态
 			SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoId,commitDate);
 			SDKMaterialPackingServiceImpl.updateStockState( makeEventInfo, undoId,opCode);
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java
index 7a402b1..261b3e9 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java
@@ -455,4 +455,28 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO<MaterialPack
 
 	}
 
+	/**
+	 * 根据RECEIVEREQUESTNAME更新标签信息的物料凭证
+	 * @param receiveRequestName DN
+	 * @param UNDOID 物料凭证
+	 */
+	public void updateMaterialPackingUndoIdByReceive (String receiveRequestName,String UNDOID) {
+		String sql = "SELECT MATERIALPACKINGNAME, SITENAME FROM MATERIALPACKING WHERE RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND STOCKSTATE = 'Created' ";
+		Map<String, Object> hashMap = new HashMap<String,Object> ();
+		hashMap.put("RECEIVEREQUESTNAME", receiveRequestName);
+		List<Map<String, Object>> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, hashMap);
+		for (Map<String, Object> map : queryForList) {
+			SetEventInfo setEventInfo = new SetEventInfo();
+			Map<String, Object> bindMap = new HashMap<String, Object>();
+			bindMap.put("unDoID",UNDOID);
+			setEventInfo.setUserColumns(bindMap);
+			MaterialPackingKey materialPackingKey = new MaterialPackingKey(map.get("SITENAME").toString(), map.get("MATERIALPACKINGNAME").toString());
+			//MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, eventInfo, setEventInfo);
+			MaterialPacking materialPacking = new MaterialPacking();
+			materialPacking.setKey(materialPackingKey);
+			materialPacking.setUnDoID(UNDOID);
+			MaterialPackingServiceProxy.getMaterialPackingService().update(materialPacking);
+		}
+
+	}
 }