From ee49266905004d0b66bf044b17cdf35b7b48b3b7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 10 Jul 2024 06:02:56 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisWaybill.java   |  5 ++
 .../resources/mapper/EmisWaybillMapper.xml    | 60 +++++++++++++++++--
 2 files changed, 61 insertions(+), 4 deletions(-)

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 0d741ceaa..3593da91d 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
@@ -432,6 +432,11 @@ public class EmisWaybill extends BaseEntity
     /* 是否敏感物 */
     private String blSpecialGoods;
 
+    /* ext_info */
+    private String extInfo;
+
+
+
     @TableField(exist = false)
     private List<EmisWaybillCargo> cargoList;
     @TableField(exist = false)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 55a6e13be..22f8d40a0 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -166,6 +166,7 @@
         <result property="orderRemark"    column="order_remark"    />
         <result property="dataFrom"    column="data_from"    />
         <result property="blSpecialGoods"    column="bl_special_goods"    />
+        <result property="extInfo"    column="ext_info"    />
 
 
         <!-- 扩展属性 -->
@@ -286,7 +287,7 @@
             a.dispatch_underling_site_code, a.destination_center_code, a.market_man_code, a.payee, a.salesmen, a.operate_employee_code,
             a.bl_is_question, a.problem_type, a.problem_cause, a.problem_delay_days, a.bl_message, a.bl_accept_message, a.bl_gen_subbill,
             a.bl_sign, a.sign_man, a.sign_man_code, a.sign_site_code, a.sign_date, a.bill_pic_send_rmk, a.bill_pic_dispatch_rmk, a.timezone_offset,
-            a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,
+            a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
             a.remark, a.del_flag, a.create_by,
             a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
 
@@ -368,7 +369,7 @@
             a.dispatch_underling_site_code, a.destination_center_code, a.market_man_code, a.payee, a.salesmen, a.operate_employee_code,
             a.bl_is_question, a.problem_type, a.problem_cause, a.problem_delay_days, a.bl_message, a.bl_accept_message, a.bl_gen_subbill,
             a.bl_sign, a.sign_man, a.sign_man_code, a.sign_site_code, a.sign_date, a.bill_pic_send_rmk, a.bill_pic_dispatch_rmk, a.timezone_offset,
-            a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,
+            a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
             a.remark, a.del_flag, a.create_by,
             a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
 
@@ -1180,13 +1181,61 @@
     <!--  通用权限判断 参数 isPrivQuery  -->
 
     <select id="selectWaitDoBillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
-        select id, order_sn, cust_order_id, bill_code, order_status, waybill_status, order_type, order_date, user_id, customer_code, 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, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, cust_name, trans_line_type, product_type, time_type, meter_type, carry_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, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, scan_weight, fee_weight, freight, real_payment_type, real_fee, bl_special_quote, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remark, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_center_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, bl_sign, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, payment_status, payment_date, payment_remark, order_remark, data_from, bl_special_goods, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select
+         id, order_sn, cust_order_id, bill_code, order_status, waybill_status, order_type,
+         order_date, user_id, customer_code, 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, receive_pcd, send_name, send_company, send_mobile, send_tel,
+         send_country, send_province, send_city, send_county, send_town, send_address, send_postcode,
+          send_pcd, payment_type, calc_fee_type, cust_no, cust_name, trans_line_type, product_type, time_type,
+          meter_type, carry_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, warehouse_in_no,
+            customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight,
+             prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark,
+             prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency,
+             settlement_weight, scan_weight, fee_weight, freight, real_payment_type, real_fee, bl_special_quote, bl_over_long,
+             bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remark, third_code, real_value, bl_insure,
+             insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code,
+             insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code,
+             transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code,
+             register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code,
+             send_center_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date,
+             produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city,
+              destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee,
+              salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days,
+              bl_message, bl_accept_message, bl_gen_subbill, bl_sign, sign_man, sign_man_code, sign_site_code,
+              sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, payment_status, payment_date,
+               payment_remark, order_remark, data_from, bl_special_goods, remark, del_flag, create_by, create_time,
+               update_by, update_time, create_site, update_site,ext_info
         from emis_waybill a
         where a.del_flag='0' and  a.bl_bill = '0' limit 300
     </select>
 
     <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">
-        select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, 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, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, cust_name, trans_line_type, product_type, time_type, meter_type, carry_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, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, scan_weight, fee_weight, freight, real_payment_type, real_fee, bl_special_quote, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remark, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_center_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, bl_sign, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, payment_status, payment_date, payment_remark, order_remark, data_from, bl_special_goods, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date,
+         user_id, customer_code, 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,
+         receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town,
+         send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, cust_name, trans_line_type, product_type,
+          time_type, meter_type, carry_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, warehouse_in_no,
+          customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight,
+          prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier,
+          total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, scan_weight, fee_weight, freight,
+          real_payment_type, real_fee, bl_special_quote, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number,
+          fee_remark, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee,
+           insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd,
+           transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code,
+           register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_center_code,
+           send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code,
+           produce_bill_man_code, destination_code, destination_province, destination_city, destination_county,
+           dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code,
+            bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill,
+            bl_sign, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset,
+             payment_status, payment_date, payment_remark, order_remark, data_from, bl_special_goods, remark, del_flag, create_by,
+              create_time, update_by, update_time, create_site, update_site,ext_info
         from emis_waybill a
         where a.id = #{id}
     </select>
@@ -1354,6 +1403,7 @@
             <if test="orderRemark != null and orderRemark != ''">order_remark,</if>
             <if test="dataFrom != null and dataFrom != ''">data_from,</if>
             <if test="blSpecialGoods != null and blSpecialGoods != ''">bl_special_goods,</if>
+            <if test="extInfo != null and extInfo != ''">ext_info,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -1524,6 +1574,7 @@
             <if test="orderRemark != null and orderRemark != ''">#{orderRemark},</if>
             <if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
             <if test="blSpecialGoods != null and blSpecialGoods != ''">#{blSpecialGoods},</if>
+            <if test="extInfo != null and extInfo != ''">#{extInfo},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -1695,6 +1746,7 @@
             <if test="orderRemark != null and orderRemark != ''">order_remark = #{orderRemark},</if>
             <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
             <if test="blSpecialGoods != null and blSpecialGoods != ''">bl_special_goods = #{blSpecialGoods},</if>
+            <if test="extInfo != null and extInfo != ''">ext_info = #{extInfo},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>