From 861f2f845d55b9dbf78985aee426f1426dc31cca 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, 16 Jun 2026 15:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B7=E8=A7=84=E5=88=99=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockInOrderMapper.xml                     | 8 ++++++++
 .../ReserveInMaterialDetailMapper.xml                     | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index ad985ac22..de7c0715f 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -100,6 +100,13 @@
         <result property="tmsOrderNumber"    column="TMS_ORDER_NUMBER"    />
         <result property="pictureUrl"    column="PICTURE_URL"    />
         <result property="amount"    column="AMOUNT"    />
+        <result property="businessPriceWay"    column="BUSINESS_PRICE_WAY"    />
+        <result property="businessChargeType"    column="BUSINESS_CHARGE_TYPE"    />
+        <result property="totalWarehouseRent"    column="TOTAL_WAREHOUSE_RENT"    />
+        <result property="manpowerFee"    column="MANPOWER_FEE"    />
+        <result property="fireInsureFee"    column="FIRE_INSURE_FEE"    />
+        <result property="discount"    column="DISCOUNT"    />
+        <result property="isFreeManpowerFee"    column="IS_FREE_MANPOWER_FEE"    />
     </resultMap>
 
 
@@ -108,6 +115,7 @@
         a.audit_status, a.audit_remark, a.audit_by, a.audit_by_name, a.audit_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_code,
         a.shipper_name, a.order_type_code, a.order_type_name, a.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number,
         a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,a.business_order_no,a.amount,
+        a.business_price_way,a.business_charge_type,a.total_warehouse_rent,a.manpower_fee,a.fire_insure_fee,a.discount,a.is_free_manpower_fee,
         -- 计划入库数量：入库明细表 in_material_detail 的 quantity 汇总
 <!--        (select ifnull(sum(imd.quantity), 0)-->
 <!--           from in_material_detail imd-->
diff --git a/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml
index d47119e44..ff393ead5 100644
--- a/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml
@@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reservePrice"    column="reserve_price"    />
         <result property="reserveUnitPrice"    column="reserve_unit_price"    />
         <result property="shelfLife"    column="shelf_life"    />
+        <result property="fireInsureFee"    column="fire_insure_fee"    />
     </resultMap>
 
 
@@ -106,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.discount_rate ,
         a.single_volume ,
         a.single_gross_weight ,
+        a.fire_insure_fee,
         a.lot_no ,a.reserve_quantity,a.reserve_gross_weight,a.reserve_net_weight,a.reserve_volume,a.reserve_area,a.reserve_price,a.reserve_unit_price,a.shelf_life,
         a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.in_order_number, a.material_base_info_id,
         a.material_code, a.material_name, a.bar_code, a.quantity, a.receipt_quantity, a.shelves_quantity,