From 2146620d743c98f04c6dca919d22cdea89c2af53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Thu, 15 May 2025 19:44:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/controller/MaterialReceiveActController.java | 8 ++++++-- .../main/java/com/cim/idm/model/dto/TrackOutBoDto.java | 2 ++ .../idm/service/Impl/SDKMaterialPackingServiceImpl.java | 2 +- 3 files changed, 9 insertions(+), 3 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 3214661..f85acd8 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 @@ -519,6 +519,7 @@ public class MaterialReceiveActController { String commitDate = trackOutBoDto.getCommitDate(); String erpLocation = trackOutBoDto.getErpLocation(); String erpFactory1 = trackOutBoDto.getErpFactory(); + String sign = trackOutBoDto.getSign(); // 采购单处理 for (MaterialReceiveRequest request : requests) { String receiveRequestName = request.getReceiveRequestName(); @@ -563,8 +564,11 @@ public class MaterialReceiveActController { SDKMaterialPackingServiceImpl.updateMaterialPackingUndoIdByReceive(receiveRequestName, undoId); // 更新库存状态 SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoId,commitDate); -// SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode,erpLocation, erpFactory1); - SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode); + if ("app".equals(sign)) { + SDKMaterialPackingServiceImpl.updateStockStateNew(makeEventInfo, undoId,opCode,erpLocation, erpFactory1); + } else { + SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId, opCode); + } } // 到货单据更新状态 if (Objects.nonNull(materialDelivery)) { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java index c8794ef..f679b9e 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java @@ -15,6 +15,8 @@ public class TrackOutBoDto { private String erpLocation; /**组织*/ private String erpFactory; + /**标识*/ + private String sign; } 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 4e493bf..764b325 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 @@ -324,7 +324,7 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO hashMapErp = new HashMap ();