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" />
+
+
+
+
@@ -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