From a21d3dbbe5b74e926065a0d888b0c6342472fb4e Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Mon, 30 Mar 2026 15:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BA=93=E7=BC=96=E5=8F=B7=E5=92=8Clot?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/InventoryAdjustmentRecord.java                 | 8 ++++++++
 .../shiftMaterialDetail/entity/ShiftMaterialDetail.java   | 8 ++++++++
 .../repository/persistence/ShiftMaterialDetailImpl.java   | 2 ++
 .../repository/todo/ShiftMaterialDetailDO.java            | 8 ++++++++
 .../service/StockShelfOrderDomainService.java             | 4 ++++
 5 files changed, 30 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java
index 4a5c18caf..0ad56b3d4 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java
@@ -188,4 +188,12 @@ public class InventoryAdjustmentRecord extends BaseVOEntity {
     @Excel(name = "调整后面积")
     private BigDecimal adjustedArea;
 
+    @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/shiftMaterialDetail/entity/ShiftMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java
index ad0e85a13..f4a85184f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java
@@ -260,6 +260,14 @@ public class ShiftMaterialDetail extends BaseVOEntity {
     @Excel(name = "面积")
     private BigDecimal area;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
+
     @ApiModelProperty("移位详情")
     @TableField(exist = false)
     private List<ShiftMoveMaterialQuantityPO> shiftMoveMaterialQuantityList;
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 5337fde55..b1b4b7273 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
@@ -729,6 +729,8 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
 
 
         inventoryAdjustmentRecord.setAdjustAction("移位管理");
+        inventoryAdjustmentRecord.setInOrderNumber(shiftMaterialDetailDO.getInOrderNumber());
+        inventoryAdjustmentRecord.setLotNumber(shiftMaterialDetailDO.getLotNumber());
         inventoryAdjustmentRecord.setRelateNo(shiftMaterialDetailDO.getShiftNumber());
         inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" : materialInventory1.getMaterialStatusCode());
         inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" :  materialInventory1.getMaterialStatusCode());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java
index ac9748f99..f99500295 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java
@@ -273,6 +273,14 @@ public class ShiftMaterialDetailDO extends BaseVOEntity {
     @ApiModelProperty("总面积(SQM)，PDA 表单区修改后回传")
     private BigDecimal totalArea;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
+
     @ApiModelProperty("移位详情")
     @TableField(exist = false)
     private List<ShiftMaterialDetailDO> children;
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 d291bb1aa..af1fcd521 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
@@ -735,6 +735,8 @@ public class StockShelfOrderDomainService {
 
                 //库存调整记录
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
+                inventoryAdjustmentRecord.setInOrderNumber(stockReceiptOrderDO.getInOrderNumber());
+                inventoryAdjustmentRecord.setLotNumber(shelfMaterialDetail.getLotNumber());
                 inventoryAdjustmentRecord.setAdjustAction("入库");
                 inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber());
                 inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());
@@ -874,6 +876,8 @@ public class StockShelfOrderDomainService {
 
 
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
+                inventoryAdjustmentRecord.setInOrderNumber(stockReceiptOrderDO.getInOrderNumber());
+                inventoryAdjustmentRecord.setLotNumber(shelfMaterialDetail.getLotNumber());
                 inventoryAdjustmentRecord.setAdjustAction("入库");
                 inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber());
                 inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());