From dfc0b0137a11bb70d98b5a6ad08a54073cc5a925 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Mon, 30 Mar 2026 15:23:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=92=8Clot=E7=BC=96=E5=8F=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=BA=93=E5=AD=98=E6=98=AF=E5=90=A6=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/MaterialInventoryImpl.java     | 4 +++-
 .../repository/todo/MaterialInventoryDO.java              | 8 ++++++++
 .../shiftManage/service/ShiftManageDomainService.java     | 2 ++
 .../repository/po/ShiftMaterialDetailPO.java              | 8 ++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

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 792cbe8cf..8ef49d33a 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
@@ -269,7 +269,9 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                         + materialInventoryDO.getBatchRefNo() + "_"
                         + materialInventoryDO.getBatchNumber() + "_"
                         + materialInventoryDO.getMaterialStatusCode() + "_"
-                        + materialInventoryDO.getContainerCode();
+                        + materialInventoryDO.getContainerCode() + "_"
+                        + materialInventoryDO.getLotNumber() + "_"
+                        + materialInventoryDO.getInOrderNumber();
                 
                 // 注意：如果唯一性约束包含批次号、容器ID、物料状态等字段，那么key也应该包含这些字段
                 // 但是，根据唯一性约束名称IDX_MAT_INV_LOC_MAT_ID，它应该只包含storage_location_id和material_base_info_id
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
index 5bd99e6d3..3241edc2e 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
@@ -236,4 +236,12 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     @ApiModelProperty("冻结数量大于0条件")
     @Excel(name = "冻结数量大于0条件")
     private String greaterThanFreezeQuantity;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
 }
\ No newline at end of file
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 637c1da23..e8de9e80d 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
@@ -870,6 +870,8 @@ public class ShiftManageDomainService {
         if (ObjectUtil.isNull(materialInventoryDb)){
             MaterialInventoryDO materialInventoryDONow = new MaterialInventoryDO();
             BatchAttributeAssignment(materialMoreDetailList, materialInventoryDONow);//批次属性赋值
+            materialInventoryDONow.setLotNumber(shiftMaterialDetailPO.getLotNumber());
+            materialInventoryDONow.setInOrderNumber(shiftMaterialDetailPO.getInOrderNumber());
             materialInventoryDONow.setMaterialBaseInfoId(shiftMaterialDetailPO.getMaterialBaseInfoId());
             materialInventoryDONow.setWarehouseId(shiftMaterialDetailPO.getNewWarehouseId());
             materialInventoryDONow.setWarehouseCode(shiftMaterialDetailPO.getNewWarehouseCode());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/po/ShiftMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/po/ShiftMaterialDetailPO.java
index 3a768452a..3bf064b2d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/po/ShiftMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/po/ShiftMaterialDetailPO.java
@@ -275,6 +275,14 @@ public class ShiftMaterialDetailPO extends BaseVOEntity {
     @Excel(name = "总面积(SQM)")
     private BigDecimal totalArea;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
+
     @ApiModelProperty("移位详情")
     @TableField(exist = false)
     private List<ShiftMaterialDetailPO> children;