From 5205b1aca23c7026dda5778561acebc4359dcb49 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Tue, 10 Mar 2026 17:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E5=BC=82=E8=BF=87=E8=B4=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=89=8D=E5=90=8E=E5=87=80=E9=87=8D...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/DifferentManageImpl.java           | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java
index af865a359..725142249 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java
@@ -209,6 +209,10 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
         inventoryAdjustmentRecord.setGrossWeight(materialInventory1.getGrossWeight() == null ? BigDecimal.ZERO : materialInventory1.getGrossWeight());
         inventoryAdjustmentRecord.setVolume(materialInventory1.getVolume() == null ? BigDecimal.ZERO : materialInventory1.getVolume());
         inventoryAdjustmentRecord.setArea(materialInventory1.getArea() == null ? BigDecimal.ZERO : materialInventory1.getArea());
+        inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory1.getNetWeight() == null ? BigDecimal.ZERO : materialInventory1.getNetWeight());
+        inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory1.getGrossWeight() == null ? BigDecimal.ZERO : materialInventory1.getGrossWeight());
+        inventoryAdjustmentRecord.setAdjustedVolume(materialInventory1.getVolume() == null ? BigDecimal.ZERO : materialInventory1.getVolume());
+        inventoryAdjustmentRecord.setAdjustedArea(materialInventory1.getArea() == null ? BigDecimal.ZERO : materialInventory1.getArea());
         inventoryAdjustmentRecord.setAdjustAction("差异过账");
         inventoryAdjustmentRecord.setRelateNo(investigetionManageDetailDO.getInvestigationNumber());
         inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
@@ -216,7 +220,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
         inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
         inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
         inventoryAdjustmentRecord.setMaterialBaseInfoId(investigetionManageDetailDO.getMaterialBaseInfoId());
-        inventoryAdjustmentRecord.setMaterialCode(investigetionManageDetailDO.getBarCode());
+        inventoryAdjustmentRecord.setMaterialCode(investigetionManageDetailDO.getMaterialCode());
         inventoryAdjustmentRecord.setMaterialName(investigetionManageDetailDO.getMaterialName());
         inventoryAdjustmentRecord.setBarCode(investigetionManageDetailDO.getBarCode());
         inventoryAdjustmentRecord.setMaterialBaseInfoId(investigetionManageDetailDO.getMaterialBaseInfoId());
@@ -243,10 +247,10 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
         UserPo userPo = loginUser.getUserPo();
         if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
         inventoryAdjustmentRecord.setCreateTime(new Date());
-//        inventoryAdjustmentRecord.setAllocationAfterQuantity();
-//        inventoryAdjustmentRecord.setAllocationBeforeQuantity();
-//        inventoryAdjustmentRecord.setFreezeBeforeQuantity();
-//        inventoryAdjustmentRecord.setFreezeAfterQuantity();
+        inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory1.getAllocationQuantity() == null ? BigDecimal.ZERO : materialInventory1.getAllocationQuantity());
+        inventoryAdjustmentRecord.setAllocationBeforeQuantity(materialInventory1.getAllocationQuantity() == null ? BigDecimal.ZERO : materialInventory1.getAllocationQuantity());
+        inventoryAdjustmentRecord.setFreezeBeforeQuantity(materialInventory1.getFreezeQuantity() == null ? BigDecimal.ZERO : materialInventory1.getFreezeQuantity());
+        inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory1.getFreezeQuantity() == null ? BigDecimal.ZERO : materialInventory1.getFreezeQuantity());
         inventoryAdjustmentRecord.setInventoryBeforeQuantity(investigetionManageDetailDO.getInventoryQuantity());
         inventoryAdjustmentRecord.setInventoryAfterQuantity(investigetionManageDetailDO.getInvestigationQuantity());
         inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);