diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index b3ee5e721..d2f881439 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWaybill.java
  * @author linfso
- * @date 2024-03-31 15:08:56
+ * @date 2024-03-31 15:18:53
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 运单列表 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisWaybill
  * @Description 运单列表
  * @author linfso
- * @date 2024-03-31 15:08:56
+ * @date 2024-03-31 15:18:53
  */
 @Data
 public class EmisWaybill extends BaseEntity
@@ -114,6 +114,8 @@ public class EmisWaybill extends BaseEntity
     private String paymentType;
     /* 支付月结编号 */
     private String custNo;
+    /* 计费方式 01-按重量 02-按体积 03-一口价 */
+    private String calcFeeType;
     /* 快递线路 */
     private String transLineType;
     /* 快递产品类型 */
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d763490e8..289350483 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -45,6 +45,7 @@
         <result property="sendPostcode"    column="send_postcode"    />
         <result property="paymentType"    column="payment_type"    />
         <result property="custNo"    column="cust_no"    />
+        <result property="calcFeeType"    column="calc_fee_type"    />
         <result property="transLineType"    column="trans_line_type"    />
         <result property="productType"    column="product_type"    />
         <result property="timeType"    column="time_type"    />
@@ -170,7 +171,7 @@
     </resultMap>
 
     <sql id="selectEmisWaybillVo">
-        select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill
+        select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_type, cust_no, calc_fee_type, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill
     </sql>
 
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@@ -216,6 +217,7 @@
             <if test="sendPostcode != null  and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
             <if test="paymentType != null  and paymentType != ''"> and payment_type like concat('%', #{paymentType}, '%')</if>
             <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
+            <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type like concat('%', #{calcFeeType}, '%')</if>
             <if test="transLineType != null  and transLineType != ''"> and trans_line_type like concat('%', #{transLineType}, '%')</if>
             <if test="productType != null  and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
             <if test="timeType != null  and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
@@ -343,7 +345,7 @@
     </select>
 
     <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">
-        select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark
+        select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_type, cust_no, calc_fee_type, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark
         from emis_waybill a
         where a.id = #{id}
     </select>
@@ -391,6 +393,7 @@
             <if test="sendPostcode != null and sendPostcode != ''">send_postcode,</if>
             <if test="paymentType != null and paymentType != ''">payment_type,</if>
             <if test="custNo != null and custNo != ''">cust_no,</if>
+            <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type,</if>
             <if test="transLineType != null and transLineType != ''">trans_line_type,</if>
             <if test="productType != null and productType != ''">product_type,</if>
             <if test="timeType != null and timeType != ''">time_type,</if>
@@ -555,6 +558,7 @@
             <if test="sendPostcode != null and sendPostcode != ''">#{sendPostcode},</if>
             <if test="paymentType != null and paymentType != ''">#{paymentType},</if>
             <if test="custNo != null and custNo != ''">#{custNo},</if>
+            <if test="calcFeeType != null and calcFeeType != ''">#{calcFeeType},</if>
             <if test="transLineType != null and transLineType != ''">#{transLineType},</if>
             <if test="productType != null and productType != ''">#{productType},</if>
             <if test="timeType != null and timeType != ''">#{timeType},</if>
@@ -722,6 +726,7 @@
             <if test="sendPostcode != null and sendPostcode != ''">send_postcode = #{sendPostcode},</if>
             <if test="paymentType != null and paymentType != ''">payment_type = #{paymentType},</if>
             <if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
+            <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type = #{calcFeeType},</if>
             <if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
             <if test="productType != null and productType != ''">product_type = #{productType},</if>
             <if test="timeType != null and timeType != ''">time_type = #{timeType},</if>