From 523b88391afc89d2a4d80a5af48d75ec8bb9875a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Mon, 19 May 2025 10:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=EF=BC=88pd?=
 =?UTF-8?q?a=EF=BC=89=E5=85=A5=E5=BA=93=E6=B8=85=E9=99=A4shiprequestname?=
 =?UTF-8?q?=E6=A0=8F=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cim/idm/controller/MaterialReceiveActController.java | 2 +-
 .../cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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 d63697e..4841f7c 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
@@ -555,7 +555,7 @@ public class MaterialReceiveActController {
 			EventInfoUtil util = new EventInfoUtil();
 			makeEventInfo = util.makeEventInfo("NormalStockInForSDK", user, "NormalStockInForSDK");
 			// 更新入库凭证
-			SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoId, makeEventInfo);
+			SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoId, makeEventInfo, sign);
 			/**
 			 * updateUndoIdByReceive和updateStockState都在MATERIALPACKINGHISTORY表插入了数据，导致有重复的入库记录
 			 * 为了不影响后续通过undoId作为条件处理其它业务，新建方法updateMaterialPackingUndoIdByReceive，只更新undoId，不插入MATERIALPACKINGHISTORY表
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 764b325..e0b3bd8 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
@@ -389,7 +389,7 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO<MaterialPack
 
 	}
 	
-	public void updateUndoIdByReceive (String receiveRequestName,String UNDOID,EventInfo eventInfo) {
+	public void updateUndoIdByReceive (String receiveRequestName,String UNDOID,EventInfo eventInfo, String sign) {
 		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);
@@ -398,6 +398,9 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO<MaterialPack
 			SetEventInfo setEventInfo = new SetEventInfo();
 			Map<String, Object> bindMap = new HashMap<String, Object>();
 			bindMap.put("unDoID",UNDOID);
+			if ("app".equals(sign)) {
+				bindMap.put("shipRequestName", "");
+			}
 			setEventInfo.setUserColumns(bindMap);
 			MaterialPackingKey materialPackingKey = new MaterialPackingKey(map.get("SITENAME").toString(), map.get("MATERIALPACKINGNAME").toString());
 			MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, eventInfo, setEventInfo);