From d3428a7b57c4061da6455d06ecd68041712f5ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 5 Feb 2026 09:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/po/MaterialInventoryPO.java               | 9 +++++++++
 .../mapper/materialBaseInfo/MaterialBaseInfoMapper.xml   | 2 +-
 .../mapper/materialInventory/MaterialInventoryMapper.xml | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java
index 5c186a88a..afc9d37a2 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java
@@ -208,4 +208,13 @@ public class MaterialInventoryPO extends MaterialBasePO {
 
     @ApiModelProperty("物料更多属性列表（批次属性）")
     private List<MaterialMoreDetailPO> materialMoreDetailList;
+
+    @ApiModelProperty("包装名")
+    @Excel(name = "包装名")
+    private String packName;
+
+
+    @ApiModelProperty("单位名")
+    @Excel(name = "单位名")
+    private String unitName;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
index 3c3d2f748..b275be223 100644
--- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b.material_classify_name,
         b.material_type,
         b.material_type_name,
-        b.common
+        b.common,b.pack_name
     </sql>
 
     <sql id="selectMaterialBaseInfoPo1">
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index 24791757b..417867167 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="batchRefNo"    column="batch_ref_no"    />
         <result property="sheetRefNo"    column="sheet_ref_no"    />
         <result property="boxPalletNo"    column="box_pallet_no"    />
+        <result property="packName"    column="pack_name"    />
     </resultMap>