From d3dbeb5858a4516956c7b7b395f608ddb4e3255b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 7 Feb 2026 12:25:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=A4=E7=A9=BA;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockShelfOrderDomainService.java | 5 +++++ 1 file changed, 5 insertions(+) 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 eefa94178..b275ee219 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 @@ -545,19 +545,24 @@ public class StockShelfOrderDomainService { BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity(); BigDecimal newAllocationQuantity = materialInventoryPO.getAllocationQuantity().add(shelvesQuantity); BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity(); + BigDecimal oldArea = materialInventoryPO.getArea(); + oldArea = oldArea != null ? oldArea : BigDecimal.ZERO; BigDecimal totalArea = shelfMaterialDetail.getTotalArea(); totalArea = totalArea != null ? totalArea : BigDecimal.ZERO; BigDecimal newArea = oldArea.add(totalArea); BigDecimal oldVolume = materialInventoryPO.getVolume(); + oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO; BigDecimal totalVolume = shelfMaterialDetail.getTotalVolume(); totalVolume = totalVolume != null ? totalVolume : BigDecimal.ZERO; BigDecimal newVolume = oldVolume.add(totalVolume); BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight(); + oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO; BigDecimal totalGrossWeight = shelfMaterialDetail.getTotalGrossWeight(); totalGrossWeight = totalGrossWeight != null ? totalGrossWeight : BigDecimal.ZERO; BigDecimal newGrossWeight = oldGrossWeight.add(totalGrossWeight); BigDecimal oldNetWeight = materialInventoryPO.getNetWeight(); + oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO; BigDecimal totalNetWeight = shelfMaterialDetail.getTotalNetWeight(); totalNetWeight = totalNetWeight != null ? totalNetWeight : BigDecimal.ZERO; BigDecimal newNetWeight = oldNetWeight.add(totalNetWeight); From ad063713a48262665f7b2bcc6b407a20f2c575ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 7 Feb 2026 13:23:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=89=8D=E7=8A=B6=E6=80=81=E5=8E=BB=E9=99=A4?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockShelfOrder/service/StockShelfOrderDomainService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b275ee219..b13b506ab 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 @@ -497,9 +497,9 @@ public class StockShelfOrderDomainService { //库存调整记录 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord(); inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge"); - inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge"); +// inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge"); inventoryAdjustmentRecord.setAdjustAfterStatusName("合格"); - inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格"); +// inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格"); inventoryAdjustmentRecord.setAdjustType(1L); inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId()); inventoryAdjustmentRecord.setMaterialCode(shelfMaterialDetail.getMaterialCode());