From b568bccf02bc911113abe9836162e9160823fc1a Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Fri, 13 Mar 2026 11:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E5=BA=93=E5=AD=98=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=AE=B0=E5=BD=95=E8=B0=83=E6=95=B4=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/ShiftMaterialDetailImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 1c9628629..cf3988e0c 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
@@ -436,7 +436,7 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
         inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
         inventoryAdjustmentRecord.setMaterialBaseInfoId(shiftMaterialDetailDO.getMaterialBaseInfoId());
-        inventoryAdjustmentRecord.setMaterialCode(shiftMaterialDetailDO.getBarCode());
+        inventoryAdjustmentRecord.setMaterialCode(shiftMaterialDetailDO.getMaterialCode());
         inventoryAdjustmentRecord.setMaterialName(shiftMaterialDetailDO.getMaterialName());
         inventoryAdjustmentRecord.setBarCode(shiftMaterialDetailDO.getBarCode());
         inventoryAdjustmentRecord.setMaterialBaseInfoId(shiftMaterialDetailDO.getMaterialBaseInfoId());
@@ -463,14 +463,13 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         UserPo userPo = loginUser.getUserPo();
         if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
         inventoryAdjustmentRecord.setCreateTime(new Date());
-        inventoryAdjustmentRecord.setInventoryBeforeQuantity(BigDecimal.ZERO);
         inventoryAdjustmentRecord.setInventoryAfterQuantity(shiftMaterialDetailDO.getShiftQuantity());
-        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()));
+        inventoryAdjustmentRecord.setAllocationAfterQuantity(shiftMaterialDetailDO.getInventoryQuantity().subtract(shiftMaterialDetailDO.getShiftQuantity()));
         inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);//移位前物料记录
         InventoryAdjustmentRecord inventoryAdjustmentRecord2 = new InventoryAdjustmentRecord();
         BeanUtils.copyProperties(inventoryAdjustmentRecord, inventoryAdjustmentRecord2);
@@ -479,7 +478,8 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         inventoryAdjustmentRecord2.setGrossWeight(BigDecimal.ZERO);
         inventoryAdjustmentRecord2.setVolume(BigDecimal.ZERO);
         inventoryAdjustmentRecord2.setArea(BigDecimal.ZERO);
-
+        inventoryAdjustmentRecord.setInventoryBeforeQuantity(BigDecimal.ZERO);
+        inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO);
         inventoryAdjustmentRecord2.setAdjustedNetWeight(shiftMaterialDetailDO.getNetWeight());
         inventoryAdjustmentRecord2.setAdjustedGrossWeight(shiftMaterialDetailDO.getGrossWeight());
         inventoryAdjustmentRecord2.setAdjustedVolume(shiftMaterialDetailDO.getVolume());