From e8b5cb40840adef372a8ed544aa1624ae744210f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 29 May 2026 19:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E9=99=A4oms=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...InventoryAdjustmentRecordDomainService.java | 10 +++++++++-
 .../persistence/OutMaterialDetailImpl.java     | 18 ++++++++++++++++++
 .../service/StockShelfOrderDomainService.java  |  6 ++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
index f904600e2..9bccb9db7 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
@@ -457,11 +457,19 @@ public class InventoryAdjustmentRecordDomainService {
         //InventoryAdjustmentRecordDO inventoryAdjustmentRecord = new InventoryAdjustmentRecordDO();
         try {
             LoginUser loginUser = SecurityUtils.getLoginUser();
+            Long materialInventoryId = inventoryAdjustmentRecordDO.getMaterialInventoryId();
+            MaterialInventory materialInventory = materialInventoryService.getById(materialInventoryId);
             BigDecimal adjustQuantity = inventoryAdjustmentRecordDO.getAdjustQuantity();
             MaterialInventoryParamDO materialInventoryParamDO = new MaterialInventoryParamDO();
-            materialInventoryParamDO.setMaterialInventoryId(inventoryAdjustmentRecordDO.getMaterialInventoryId());
+            materialInventoryParamDO.setMaterialInventoryId(materialInventoryId);
             materialInventoryParamDO.setQuantity(adjustQuantity);
             materialInventoryParamDO.setType("7");
+            materialInventoryParamDO.setProductionDate(materialInventory.getProductionDate());
+            materialInventoryParamDO.setExpiryDate(materialInventory.getExpiryDate());
+            materialInventoryParamDO.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
+            materialInventoryParamDO.setWarehouseId(materialInventory.getWarehouseId());
+            materialInventoryParamDO.setLotNumber(materialInventory.getLotNumber());
+            materialInventoryParamDO.setBatchNumber(materialInventory.getBatchNumber());
             materialInventoryService.kctzjl(materialInventoryParamDO,"库存冻结",loginUser);
             materialInventoryService.xgkc(materialInventoryParamDO);
             MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
index 1ba0b4336..52af94400 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
@@ -585,6 +585,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 materialInventoryParamDO.setRelateNo(relateNo);
                 materialInventoryParamDO.setBatchNumber(outMaterialDetail.getBatchNumber());
                 materialInventoryParamDO.setLotNumber(outMaterialDetail.getLotNo());
+                materialInventoryParamDO.setProductionDate(materialInventory.getProductionDate());
+                materialInventoryParamDO.setExpiryDate(materialInventory.getExpiryDate());
+                materialInventoryParamDO.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
+                materialInventoryParamDO.setWarehouseId(materialInventory.getWarehouseId());
+                materialInventoryParamDO.setLotNumber(materialInventory.getLotNumber());
+                materialInventoryParamDO.setBatchNumber(materialInventory.getBatchNumber());
                 materialInventoryParamDO.setInOrderNumber(outMaterialDetail.getInOrderNumber());
                 materialInventoryService.kctzjl(materialInventoryParamDO,"分配库存",loginUser);
                 materialInventoryService.xgkc(materialInventoryParamDO);
@@ -973,6 +979,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 materialInventoryParamDO.setMaterialInventoryId(materialInventoryId);
                 materialInventoryParamDO.setQuantity(allocationQuantity);
                 materialInventoryParamDO.setType("3");
+                materialInventoryParamDO.setProductionDate(materialInventoryPO.getProductionDate());
+                materialInventoryParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
+                materialInventoryParamDO.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
+                materialInventoryParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
+                materialInventoryParamDO.setLotNumber(materialInventoryPO.getLotNumber());
+                materialInventoryParamDO.setBatchNumber(materialInventoryPO.getBatchNumber());
                 String cancelRelateNo = outMaterialDetail.getUniqueId() != null
                         ? outOrderNumber + "#" + outMaterialDetail.getUniqueId()
                         : outOrderNumber;
@@ -1076,6 +1088,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 String cancelRelateNoCh = outMaterialDetail.getUniqueId() != null
                         ? outOrderNumber + "#" + outMaterialDetail.getUniqueId()
                         : outOrderNumber;
+                materialInventoryParamDO.setProductionDate(materialInventoryPO.getProductionDate());
+                materialInventoryParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
+                materialInventoryParamDO.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
+                materialInventoryParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
+                materialInventoryParamDO.setLotNumber(materialInventoryPO.getLotNumber());
+                materialInventoryParamDO.setBatchNumber(materialInventoryPO.getBatchNumber());
                 materialInventoryParamDO.setRelateNo(cancelRelateNoCh);
                 materialInventoryService.kctzjl(materialInventoryParamDO,"取消分配",loginUser);
                 materialInventoryService.xgkc(materialInventoryParamDO);
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 afa2a8ef4..9a7bcb9dd 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
@@ -1332,6 +1332,12 @@ public class StockShelfOrderDomainService {
                 materialInventoryService.xgkc(inventoryParamDO);
                 MaterialInventoryOmsParamDO  materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
                 BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO);
+                materialInventoryOmsParamDO.setProductionDate(materialInventoryPO.getProductionDate());
+                materialInventoryOmsParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
+                materialInventoryOmsParamDO.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
+                materialInventoryOmsParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
+                materialInventoryOmsParamDO.setLotNumber(materialInventoryPO.getLotNumber());
+                materialInventoryOmsParamDO.setBatchNumber(materialInventoryPO.getBatchNumber());
                 materialInventoryOmsParamDO.setKctzType("入库");
                 materialInventoryOmsParamDO.setLoginUser(loginUser);
                 materialInventoryOmsParamDO.setMaterialInventoryId(null);