From ab1a1ef906f9bc091131da61762960b1e6f37d2c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 4 Jul 2025 07:48:25 +0800
Subject: [PATCH] md

---
 .../erp/emis/mapper/EmisTmsCostFeeMapper.java |  3 --
 .../resources/mapper/EmisTmsCostFeeMapper.xml | 38 +++++++++++++++++--
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java
index c9e5a3aef..b65444bd3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java
@@ -32,11 +32,8 @@ public interface EmisTmsCostFeeMapper extends BaseMapper<EmisTmsCostFee>
      */
     public EmisTmsCostFee selectEmisTmsCostFeeById(Long id);
 
-
     public EmisTmsCostFee selectEmisTmsCostFeeByCostNo(String costNo);
 
-    public EmisWaybill selectThinWaybillInfoByCostFeeCalc(@Param("billCode")String billCode);
-
     public EmisTmsCostFee selectEmisTmsCostFeeByBatchNo(String batchNo);
 
     /**
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
index 0135b091b..ab31bfdde 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
@@ -43,16 +43,39 @@
     </resultMap>
 
 
-    <resultMap type="CostFeeWaybillRel" id="BaseCostFeeWaybillRelResult">
+
+    <resultMap type="EmisTmsCostFee" id="ThinCostFeeResult">
+        <result property="id"    column="id"    />
+        <result property="costNo"    column="cost_no"    />
+        <result property="costName"    column="cost_name"    />
+        <result property="batchNo"    column="batch_no"    />
+        <result property="feeType"    column="fee_type"    />
+        <result property="splitType"    column="split_type"    />
+        <result property="transType"    column="trans_type"    />
+        <result property="transSignNo"    column="trans_sign_no"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="sendPlace"    column="send_place"    />
+        <result property="destPlace"    column="dest_place"    />
+        <result property="costFee"    column="cost_fee"    />
+        <result property="usdCostFee"    column="usd_cost_fee"    />
+        <result property="billMonth"    column="bill_month"    />
+        <result property="tradeDate"    column="trade_date"    />
+        <result property="sendPieceSum"    column="send_piece_sum"    />
+        <result property="pieceNumber"    column="piece_number"    />
+        <result property="totalWeight"    column="total_weight"    />
+        <result property="totalVolume"    column="total_volume"    />
+    </resultMap>
+
+
+    <resultMap type="CostFeeWaybillRel" id="CostFeeWaybillRelResult">
         <result property="id"    column="id"    />
         <result property="costNo"    column="cost_no"    />
         <result property="billCode"    column="bill_code"    />
-    </resultMap>
 
-    <resultMap type="CostFeeWaybillRel" id="CostFeeWaybillRelResult" extends="BaseCostFeeWaybillRelResult">
         <association property="costFeeDetail"
                      column="cost_no"
-                     select="selectEmisTmsCostFeeByCostNo"
+                     select="selectThinCostFeeByCostNo"
                      fetchType="lazy"
         />
 
@@ -119,6 +142,13 @@
         WHERE a.del_flag = '0'  and bill_code=#{billCode}
     </select>
 
+    <select id="selectThinCostFeeByCostNo" parameterType="String" resultMap="ThinCostFeeResult">
+        select
+        id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, usd_cost_fee, bill_month, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume
+        from emis_tms_cost_fee a
+        where a.cost_no = #{costNo}
+    </select>
+
 
     <sql id="selectEmisTmsCostFeeVo">
         select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, usd_cost_fee, bill_month, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, bl_has_calc, calc_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee