From fb2b24aa94cbf9fba8bbaa2d188204b596d7f06c Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Sat, 14 Mar 2026 13:13:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockShelfOrderDomainService.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index fe7640975..4df937db4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -711,10 +711,10 @@ public class StockShelfOrderDomainService { InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord(); inventoryAdjustmentRecord.setAdjustAction("入库"); inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber()); - inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge"); -// inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge"); - inventoryAdjustmentRecord.setAdjustAfterStatusName("合格"); -// inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格"); + inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode()); + inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode()); + inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" : materialInventory.getMaterialStatusName()); + inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName() == null ? "" : materialInventory.getMaterialStatusName()); inventoryAdjustmentRecord.setAdjustType(1L); inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId()); inventoryAdjustmentRecord.setMaterialCode(shelfMaterialDetail.getMaterialCode()); @@ -806,10 +806,12 @@ public class StockShelfOrderDomainService { InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord(); - inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge"); - inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge"); - inventoryAdjustmentRecord.setAdjustAfterStatusName("合格"); - inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格"); + inventoryAdjustmentRecord.setAdjustAction("入库"); + inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber()); + inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode()); + inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode()); + inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" : materialInventory.getMaterialStatusName()); + inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName() == null ? "" : materialInventory.getMaterialStatusName()); inventoryAdjustmentRecord.setAdjustType(1L); inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId()); inventoryAdjustmentRecord.setMaterialCode(shelfMaterialDetail.getMaterialCode()); @@ -834,7 +836,8 @@ public class StockShelfOrderDomainService { inventoryAdjustmentRecord.setStorageSectionId(materialInventory.getStorageSectionId()); inventoryAdjustmentRecord.setStorageLocationId(materialInventory.getStorageLocationId()); inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid()); - inventoryAdjustmentRecord.setCreateByName(loginUser.getUsername()); + UserPo userPo = loginUser.getUserPo(); + if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName()); inventoryAdjustmentRecord.setCreateTime(new Date()); inventoryAdjustmentRecord.setAllocationAfterQuantity(newAllocationQuantity); inventoryAdjustmentRecord.setAllocationBeforeQuantity(oldAllocationQuantity);