From af7f980735d59234723dddc8702527d2c0433199 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Tue, 10 Mar 2026 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E7=AE=A1=E7=90=86=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/ShiftMaterialDetailImpl.java  | 68 ++++++++++++++++---
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
index fcb229436..254d4be70 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
@@ -396,10 +396,38 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         inventoryAdjustmentRecord.setVolume(materialInventory1.getVolume() == null ? BigDecimal.ZERO : materialInventory1.getVolume());
         inventoryAdjustmentRecord.setArea(materialInventory1.getArea() == null ? BigDecimal.ZERO : materialInventory1.getArea());
 
-        inventoryAdjustmentRecord.setAdjustedNetWeight(shiftMaterialDetailDO.getNetWeight() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getNetWeight());
-        inventoryAdjustmentRecord.setAdjustedGrossWeight(shiftMaterialDetailDO.getGrossWeight() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getGrossWeight());
-        inventoryAdjustmentRecord.setAdjustedVolume(shiftMaterialDetailDO.getVolume() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getVolume());
-        inventoryAdjustmentRecord.setAdjustedArea(shiftMaterialDetailDO.getArea() == null ? BigDecimal.ZERO : shiftMaterialDetailDO.getArea());
+        inventoryAdjustmentRecord.setAdjustedNetWeight(
+                materialInventory1.getNetWeight() != null ?
+                        materialInventory1.getNetWeight().subtract(shiftMaterialDetailDO.getNetWeight() != null ?
+                                shiftMaterialDetailDO.getNetWeight() : BigDecimal.ZERO) :
+                        BigDecimal.ZERO
+        );
+
+        inventoryAdjustmentRecord.setAdjustedGrossWeight(
+                materialInventory1.getGrossWeight() != null ?
+                        materialInventory1.getGrossWeight().subtract(shiftMaterialDetailDO.getGrossWeight() != null ?
+                                shiftMaterialDetailDO.getGrossWeight() : BigDecimal.ZERO) :
+                        BigDecimal.ZERO
+        );
+
+        inventoryAdjustmentRecord.setAdjustedVolume(
+                materialInventory1.getVolume() != null ?
+                        materialInventory1.getVolume().subtract(shiftMaterialDetailDO.getVolume() != null ?
+                                shiftMaterialDetailDO.getVolume() : BigDecimal.ZERO) :
+                        BigDecimal.ZERO
+        );
+
+        inventoryAdjustmentRecord.setAdjustedArea(
+                materialInventory1.getArea() != null ?
+                        materialInventory1.getArea().subtract(shiftMaterialDetailDO.getArea() != null ?
+                                shiftMaterialDetailDO.getArea() : BigDecimal.ZERO) :
+                        BigDecimal.ZERO
+        );
+//        inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory1.getNetWeight().subtract(shiftMaterialDetailDO.getNetWeight()));
+//        inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory1.getGrossWeight().subtract(shiftMaterialDetailDO.getGrossWeight()));
+//        inventoryAdjustmentRecord.setAdjustedVolume(materialInventory1.getVolume().subtract(shiftMaterialDetailDO.getVolume()));
+//        inventoryAdjustmentRecord.setAdjustedArea(materialInventory1.getArea().subtract(shiftMaterialDetailDO.getArea()));
+
 
         inventoryAdjustmentRecord.setAdjustAction("移位管理");
         inventoryAdjustmentRecord.setRelateNo(shiftMaterialDetailDO.getShiftNumber());
@@ -437,13 +465,35 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         inventoryAdjustmentRecord.setCreateTime(new Date());
         inventoryAdjustmentRecord.setInventoryBeforeQuantity(BigDecimal.ZERO);
         inventoryAdjustmentRecord.setInventoryAfterQuantity(shiftMaterialDetailDO.getShiftQuantity());
-//        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(shiftMaterialDetailDO.getInventoryQuantity());
         inventoryAdjustmentRecord.setInventoryAfterQuantity(shiftMaterialDetailDO.getInventoryQuantity().subtract(shiftMaterialDetailDO.getShiftQuantity()));
-        inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
+        inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);//移位前物料记录
+        InventoryAdjustmentRecord inventoryAdjustmentRecord2 = new InventoryAdjustmentRecord();
+        BeanUtils.copyProperties(inventoryAdjustmentRecord, inventoryAdjustmentRecord2);
+        inventoryAdjustmentRecord2.setNetWeight(BigDecimal.ZERO);
+        inventoryAdjustmentRecord2.setGrossWeight(BigDecimal.ZERO);
+        inventoryAdjustmentRecord2.setVolume(BigDecimal.ZERO);
+        inventoryAdjustmentRecord2.setArea(BigDecimal.ZERO);
+
+        inventoryAdjustmentRecord2.setAdjustedNetWeight(shiftMaterialDetailDO.getNetWeight());
+        inventoryAdjustmentRecord2.setAdjustedGrossWeight(shiftMaterialDetailDO.getGrossWeight());
+        inventoryAdjustmentRecord2.setAdjustedVolume(shiftMaterialDetailDO.getVolume());
+        inventoryAdjustmentRecord2.setAdjustedArea(shiftMaterialDetailDO.getArea());
+        inventoryAdjustmentRecord.setWarehouseCode(shiftMaterialDetailDO.getNewWarehouseCode());
+        inventoryAdjustmentRecord.setWarehouseName(shiftMaterialDetailDO.getNewWarehouseName());
+        inventoryAdjustmentRecord.setWarehouseId(shiftMaterialDetailDO.getNewWarehouseId());
+        inventoryAdjustmentRecord.setStorageCode(shiftMaterialDetailDO.getNewStorageCode());
+        inventoryAdjustmentRecord.setStorageName(shiftMaterialDetailDO.getNewStorageName());
+        inventoryAdjustmentRecord.setStorageLocationId(shiftMaterialDetailDO.getNewStorageLocationId());
+        inventoryAdjustmentRecord.setStorageLocationCode(shiftMaterialDetailDO.getNewStorageLocationCode());
+        inventoryAdjustmentRecord.setStorageLocationName(shiftMaterialDetailDO.getNewStorageLocationName());
+        inventoryAdjustmentRecord.setStorageSectionId(shiftMaterialDetailDO.getNewStorageSectionId());
+        inventoryAdjustmentRecord.setStorageLocationId(shiftMaterialDetailDO.getNewStorageLocationId());
+        inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord2);//移位后物料记录
     }
 
     /**