From 888a646c3e45f41484a577ea8de95c251f77ac55 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Mon, 30 Mar 2026 16:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B3=E6=97=B6=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statementStatistics/po/ImmediateInventoryPO.java       | 7 +++++++
 .../mapper/materialInventory/MaterialInventoryMapper.xml   | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java
index 308904562..a3885172a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java
@@ -127,4 +127,11 @@ public class ImmediateInventoryPO {
     @ApiModelProperty("批次号")
     private String batchNumber;
 
+    @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/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index eebbebe16..124b47725 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -533,6 +533,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="organizationId"    column="organization_id"    />
         <result property="organizationName"    column="organization_name"    />
         <result property="topOrganizationId"    column="top_organization_id"    />
+        <result property="inOrderNumber"    column="in_order_number"    />
+        <result property="lotNumber"    column="lot_number"    />
     </resultMap>
     <select id="queryImmediateInventoryList" parameterType="com.mhd.wms.domain.statementStatistics.todo.ImmediateInventoryDO"
             resultMap="queryImmediateInventoryListResult">
@@ -645,7 +647,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.organization_id,
         a.organization_name,
         a.top_organization_id,
-        a.batch_number
+        a.batch_number,
+        a.in_order_number,a.lot_number
         FROM
         material_inventory a
         left join  material_base_info b on a.material_base_info_id=b.material_base_info_id