From 3c8aea5093e7a8e24b1f50c6e1c035c13026619a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Wed, 22 Apr 2026 18:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E7=9A=84=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=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=BA=93=E5=AD=98=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/shiftManage/service/ShiftManageDomainService.java  | 3 +++
 .../repository/persistence/ShiftMaterialDetailImpl.java       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
index e8de9e80d..c9bb54635 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
@@ -899,6 +899,9 @@ public class ShiftManageDomainService {
             materialInventoryDONow.setCreateBy(loginUser.getUserid());
             materialInventoryDONow.setCreateByName(loginUser.getUsername());
             materialInventoryDONow.setCreateTime(new Date());
+            materialInventoryDONow.setUpdateBy(loginUser.getUserid());
+            materialInventoryDONow.setUpdateByName(loginUser.getUsername());
+            materialInventoryDONow.setUpdateTime(new Date());
             return materialInventoryDONow;
         }else {
             MaterialInventoryDO materialInventoryDONow = new MaterialInventoryDO();
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 b1b4b7273..9b7fe3eb7 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
@@ -772,7 +772,6 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         UserPo userPo = loginUser.getUserPo();
         if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
         inventoryAdjustmentRecord.setCreateTime(new Date());
-        inventoryAdjustmentRecord.setInventoryAfterQuantity(shiftMaterialDetailDO.getShiftQuantity());
         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());
@@ -826,7 +825,8 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
         inventoryAdjustmentRecord2.setFreezeBeforeQuantity(newFreezeBefore);
         inventoryAdjustmentRecord2.setFreezeAfterQuantity(newFreezeBefore);
         inventoryAdjustmentRecord2.setInventoryAfterQuantity(newInvBefore.add(shiftQty));
-        inventoryAdjustmentRecord2.setAllocationAfterQuantity(materialInventory1.getAllocationQuantity().subtract(shiftMaterialDetailDO.getShiftQuantity()));
+        // 新库位移入：调整后可用数量 = 新库位调整前可用 + 移入数量（与调整后库存数量一致，均为移入可用量）
+        inventoryAdjustmentRecord2.setAllocationAfterQuantity(newAllocBefore.add(shiftQty));
         inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord2);//移位后物料记录（新库位增加）
     }