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 hashMap = new HashMap (); hashMap.put("RECEIVEREQUESTNAME", receiveRequestName); @@ -398,6 +398,9 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO bindMap = new HashMap(); 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);