From f6c454765e51c9439d92cee3bd07ec4c99b291f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 5 Sep 2026 19:21:17 +0800
Subject: [PATCH] =?UTF-8?q?jobid=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/po/MaterialInventoryPO.java       | 16 ++++++++++++++++
 .../MaterialInventoryMapper.xml                  |  8 ++++++++
 2 files changed, 24 insertions(+)

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 c870cb7dc..0a1007541 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
@@ -261,4 +261,20 @@ public class MaterialInventoryPO extends MaterialBasePO {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "上次计费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date lastBillingTime;
+
+    @ApiModelProperty("每月仓租")
+    @Excel(name = "每月仓租")
+    private BigDecimal monthlyWarehouseRent;
+
+    @ApiModelProperty("半月仓租")
+    @Excel(name = "半月仓租")
+    private BigDecimal halfMonthWarehouseRent;
+
+    @ApiModelProperty("每月仓租单位")
+    @Excel(name = "每月仓租单位")
+    private String monthlyWarehouseRentUnit;
+
+    @ApiModelProperty("半月仓租单位")
+    @Excel(name = "半月仓租单位")
+    private String halfMonthWarehouseRentUnit;
 }
\ 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 99b1f9c96..8004d7413 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -71,6 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 typeHandler="com.mhd.common.core.handler.ListTypeHandler"    />
         <result property="materialClassifyName"    column="material_classify_name"
                 typeHandler="com.mhd.common.core.handler.ListTypeHandler"    />
+        <result property="monthlyWarehouseRentUnit"    column="monthly_warehouse_rent_unit"    />
+        <result property="halfMonthWarehouseRentUnit"    column="half_month_warehouse_rent_unit"    />
+        <result property="halfMonthWarehouseRent"    column="half_month_warehouse_rent"    />
+        <result property="monthlyWarehouseRent"    column="monthly_warehouse_rent"    />
     </resultMap>
 
 
@@ -95,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.bar_code as inv_bar_code,
         a.in_order_number,a.lot_number,
         a.last_billing_time,
+        b.MONTHLY_WAREHOUSE_RENT_UNIT,
+        b.HALF_MONTH_WAREHOUSE_RENT_UNIT,
+        b.HALF_MONTH_WAREHOUSE_RENT,
+        b.MONTHLY_WAREHOUSE_RENT,
         CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END as sort_order
     </sql>