From 9a895b8fbaaf8fd26cf6778c67982c9f7a0b92bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 17 Apr 2026 20:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/MaterialInventoryImpl.java    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
index 18e56baf3..3f9d01540 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
@@ -619,7 +619,17 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory.getFreezeQuantity().add(materialInventoryParamDO.getQuantity()));//调整后 冻结-出库
             inventoryAdjustmentRecord.setInventoryBeforeQuantity(materialInventory.getInventoryQuantity());
             inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
-        } else if ("上架".equals(adjustAction)){
+            // 调整前：库存数量（净重、毛重、体积、面积）
+            inventoryAdjustmentRecord.setNetWeight(materialInventory.getNetWeight());
+            inventoryAdjustmentRecord.setGrossWeight(materialInventory.getGrossWeight());
+            inventoryAdjustmentRecord.setVolume(materialInventory.getVolume());
+            inventoryAdjustmentRecord.setArea(materialInventory.getArea());
+            // 调整后：库存数量 - 复核时填写的数量
+            inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight());
+            inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight());
+            inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
+            inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
+        } else if ("入库".equals(adjustAction)){
             if (materialInventory == null) {
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventoryParamDO.getQuantity());
@@ -655,7 +665,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                 inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume().add(inventoryAdjustmentRecord.getVolume()));
                 inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea().add(inventoryAdjustmentRecord.getArea()));
             }
-        } else if ("出库交接".equals(adjustAction)){
+        } else if ("出库".equals(adjustAction)){
             inventoryAdjustmentRecord.setAllocationBeforeQuantity(materialInventory.getAllocationQuantity());
             inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity());
             inventoryAdjustmentRecord.setFreezeBeforeQuantity(materialInventory.getFreezeQuantity());
@@ -679,6 +689,16 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory.getFreezeQuantity());//调整后 冻结-出库
             //inventoryAdjustmentRecord.setInventoryBeforeQuantity(oldInventoryQuantity);
             inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
+            // 调整前：库存数量（净重、毛重、体积、面积）
+            inventoryAdjustmentRecord.setNetWeight(materialInventory.getNetWeight());
+            inventoryAdjustmentRecord.setGrossWeight(materialInventory.getGrossWeight());
+            inventoryAdjustmentRecord.setVolume(materialInventory.getVolume());
+            inventoryAdjustmentRecord.setArea(materialInventory.getArea());
+            // 调整后：库存数量 - 复核时填写的数量
+            inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight());
+            inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight());
+            inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
+            inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
         } else if ("库存冻结".equals(adjustAction)) {
             inventoryAdjustmentRecord.setAllocationBeforeQuantity(materialInventory.getAllocationQuantity());
             inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity().subtract(materialInventoryParamDO.getQuantity()));