From 906c65c1642fd29db27fd1ac690a77eef6ac863f Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Tue, 10 Mar 2026 10:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AE=A1=E7=90=86=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E4=B8=8A=E6=9E=B6=E7=94=9F=E6=88=90=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/StockShelfOrderDomainService.java | 25 ++++++++++++-------
 1 file changed, 16 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 69c3610a4..d112aba43 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
@@ -746,6 +746,14 @@ public class StockShelfOrderDomainService {
                 inventoryAdjustmentRecord.setFreezeAfterQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setInventoryBeforeQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
+                inventoryAdjustmentRecord.setNetWeight(BigDecimal.ZERO );
+                inventoryAdjustmentRecord.setGrossWeight(BigDecimal.ZERO);
+                inventoryAdjustmentRecord.setVolume(BigDecimal.ZERO);
+                inventoryAdjustmentRecord.setArea(BigDecimal.ZERO);
+                inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight() == null ? BigDecimal.ZERO : materialInventory.getNetWeight());
+                inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight() == null ? BigDecimal.ZERO : materialInventory.getGrossWeight());
+                inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume() == null ? BigDecimal.ZERO : materialInventory.getVolume());
+                inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea() == null ? BigDecimal.ZERO : materialInventory.getArea());
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             } else if (materialInventoryPOS.size() == 1) {
                 MaterialInventory materialInventory = new MaterialInventory();
@@ -835,6 +843,14 @@ public class StockShelfOrderDomainService {
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
                 inventoryAdjustmentRecord.setCreateByName(loginUser.getUsername());
                 inventoryAdjustmentRecord.setCreateTime(new Date());
+                inventoryAdjustmentRecord.setNetWeight(BigDecimal.ZERO );
+                inventoryAdjustmentRecord.setGrossWeight(BigDecimal.ZERO);
+                inventoryAdjustmentRecord.setVolume(BigDecimal.ZERO);
+                inventoryAdjustmentRecord.setArea(BigDecimal.ZERO);
+                inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight() == null ? BigDecimal.ZERO : materialInventory.getNetWeight());
+                inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight() == null ? BigDecimal.ZERO : materialInventory.getGrossWeight());
+                inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume() == null ? BigDecimal.ZERO : materialInventory.getVolume());
+                inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea() == null ? BigDecimal.ZERO : materialInventory.getArea());
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             }
         }
@@ -1072,15 +1088,6 @@ public class StockShelfOrderDomainService {
             inventoryStandingDetailDO.setCreateBy(loginUser.getUserid());
             inventoryStandingDetailDO.setCreateByName(loginUser.getUsername());
             inventoryStandingDetailDO.setCreateTime(new Date());
-            InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
-            inventoryAdjustmentRecord.setNetWeight(BigDecimal.ZERO );
-            inventoryAdjustmentRecord.setGrossWeight(BigDecimal.ZERO);
-            inventoryAdjustmentRecord.setVolume(BigDecimal.ZERO);
-            inventoryAdjustmentRecord.setArea(BigDecimal.ZERO);
-            inventoryAdjustmentRecord.setAdjustedNetWeight(shelfMaterialDetailPO.getTotalNetWeight() == null ? BigDecimal.ZERO : shelfMaterialDetailPO.getTotalNetWeight());
-            inventoryAdjustmentRecord.setAdjustedGrossWeight(shelfMaterialDetailPO.getTotalGrossWeight() == null ? BigDecimal.ZERO : shelfMaterialDetailPO.getTotalGrossWeight());
-            inventoryAdjustmentRecord.setAdjustedVolume(shelfMaterialDetailPO.getTotalVolume() == null ? BigDecimal.ZERO : shelfMaterialDetailPO.getTotalVolume());
-            inventoryAdjustmentRecord.setAdjustedArea(shelfMaterialDetailPO.getTotalArea() == null ? BigDecimal.ZERO : shelfMaterialDetailPO.getTotalArea());
             inventoryStandingDetailDOList.add(inventoryStandingDetailDO);
         }
         inventoryStandingDetailService.batchInsert(inventoryStandingDetailDOList);