From 5c4e460cacaabd3b3fbb9b70f06a7b3caeedb6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 15 Sep 2026 14:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=A3=E7=A7=9F=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialInventoryApplicationService.java                | 2 ++
 .../repository/po/MaterialInventoryPO.java                  | 3 +++
 .../mapper/materialInventory/MaterialInventoryMapper.xml    | 6 ++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
index f8c74da3e..99fefa42b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
@@ -1021,6 +1021,8 @@ public class MaterialInventoryApplicationService {
         //未查询到库存记录
         if (materialInventoryPOS==null || materialInventoryPOS.size()==0) return;
         for (MaterialInventoryPO materialInventoryPO : materialInventoryPOS) {
+            String businessChargeType = materialInventoryPO.getBusinessChargeType();
+            if (!"散租".equals(businessChargeType)) continue;
             Date createTime = materialInventoryPO.getCreateTime();
             Long materialBaseInfoId = materialInventoryPO.getMaterialBaseInfoId();
             String lotNumber = materialInventoryPO.getLotNumber();
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 0a1007541..d5157b036 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
@@ -277,4 +277,7 @@ public class MaterialInventoryPO extends MaterialBasePO {
     @ApiModelProperty("半月仓租单位")
     @Excel(name = "半月仓租单位")
     private String halfMonthWarehouseRentUnit;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
 }
\ 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 3f5e19f8d..384540582 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="halfMonthWarehouseRentUnit"    column="half_month_warehouse_rent_unit"    />
         <result property="halfMonthWarehouseRent"    column="half_month_warehouse_rent"    />
         <result property="monthlyWarehouseRent"    column="monthly_warehouse_rent"    />
+        <result property="businessChargeType"    column="BUSINESS_CHARGE_TYPE"    />
     </resultMap>
 
 
@@ -1822,8 +1823,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="queryPushBms" resultMap="MaterialInventoryResult">
-        SELECT *
-        FROM MATERIAL_INVENTORY
+        SELECT *,
+               (SELECT BUSINESS_CHARGE_TYPE FROM NGWL_TEST_OMS.RESERVATION_STOCK_IN_ORDER WHERE EXECUTION_IN_ORDER_NUMBER = a.in_order_number) as BUSINESS_CHARGE_TYPE
+        FROM MATERIAL_INVENTORY a
         WHERE EXTRACT(DAY FROM CREATE_TIME) = EXTRACT(DAY FROM SYSDATE - 1) AND INVENTORY_QUANTITY > 0
           AND DEL_FLAG = 1 AND SHIPPER_ID = #{shipperId}
     </select>