From c22b28c4845ce67875e3f2ebf2014d7513b6d1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Mon, 20 Apr 2026 18:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=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

---
 .../repository/persistence/MaterialInventoryImpl.java         | 2 +-
 .../repository/todo/MaterialInventoryParamDO.java             | 2 ++
 .../stockShelfOrder/service/StockShelfOrderDomainService.java | 4 +++-
 3 files changed, 6 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 49b8b6e83..4c4f7e13e 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
@@ -634,7 +634,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
             inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
         } else if ("入库".equals(adjustAction)){
-            if (materialInventory == null) {
+            if ("1".equals(materialInventoryParamDO.getIsNew())) {
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventoryParamDO.getQuantity());
                 inventoryAdjustmentRecord.setFreezeBeforeQuantity(BigDecimal.ZERO);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java
index 2ee00d551..32bfd91ad 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java
@@ -100,4 +100,6 @@ public class MaterialInventoryParamDO extends MaterialBaseDO {
 
     private String batchNumber;
 
+    private String isNew;
+
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
index 41436aed4..af4313cca 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
@@ -1062,6 +1062,7 @@ public class StockShelfOrderDomainService {
 //                materialInventoryMapper.insert(materialInventory);
 
                 inventoryParamDO.setType("1");
+                inventoryParamDO.setIsNew("1");
 
                 //库存调整记录
                 materialInventoryService.xgkc(inventoryParamDO);
@@ -1119,9 +1120,10 @@ public class StockShelfOrderDomainService {
                 inventoryParamDO.setQuantity(shelfMaterialDetail.getShelvesQuantity());
                 inventoryParamDO.setType("1");
                 inventoryParamDO.setUpdateTime(new Date());
-                materialInventoryService.xgkc(inventoryParamDO);
+
                 //库存调整记录
                 materialInventoryService.kctzjl(inventoryParamDO, "入库", loginUser);
+                materialInventoryService.xgkc(inventoryParamDO);
                 //抄码商品对照数据插入
                 copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO);
             }