diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index ab9c24f78..ec02de31c 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -167,42 +167,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -235,10 +234,90 @@
-
+
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_remaker, 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 from emis_waybill
+
+ 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_remaker, 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,
+
+ b.name as receive_country_name,c.name as send_country_name,
+ d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
+ g.region_name as send_province_name,h.region_name as send_city_name,i.region_name as send_county_name,
+ j.prod_name as product_type_name,k.line_name as trans_line_type_name,
+ l.site_name as send_site_name,m.site_name as dispatch_underling_site_name,
+ n.dest_name as destination_name,o.site_name as dispatch_site_name,
+ p.emp_name as dispatch_man_name,q.site_name as print_site_name,
+ r.emp_name as print_man_name,
+ s.emp_name as take_piece_employee_name,
+ t.emp_name as operate_employee_name,
+ u.site_name as register_site_name,
+ v.emp_name as register_man_name,
+ w.site_name as current_site_name,
+ x.site_name as next_site_name,
+ y.site_name as last_site_name,
+ z.type_name as problem_type_name
+
+ from emis_waybill a
+ left join emis_country b on a.receive_country=b.code
+ left join emis_country c on a.send_country=c.code
+ left join emis_region d on a.receive_province=d.region_code
+ left join emis_region e on a.receive_city=e.region_code
+ left join emis_region f on a.receive_county=f.region_code
+
+ left join emis_region g on a.send_province=g.region_code
+ left join emis_region h on a.send_city=h.region_code
+ left join emis_region i on a.send_county=i.region_code
+
+ left join emis_trans_product j on a.product_type=j.prod_code
+ left join emis_trans_line k on a.trans_line_type=k.line_code
+ left join emis_site l on a.send_site_code=l.site_code
+ left join emis_site m on a.dispatch_underling_site_code=m.site_code
+
+ left join emis_destination n on a.destination_code=n.dest_code
+ left join emis_site o on a.dispatch_site_code=o.site_code
+
+ left join sys_user p on a.dispatch_man_code=p.emp_code
+ left join emis_site q on a.print_site=q.site_code
+ left join sys_user r on a.print_man_code=r.emp_code
+ left join sys_user s on a.take_piece_employee_code=s.emp_code
+ left join sys_user t on a.operate_employee_code=t.emp_code
+ left join emis_site u on a.register_site_code=u.site_code
+ left join sys_user v on a.register_man_code=v.emp_code
+ left join emis_site w on a.current_site_code=w.site_code
+ left join emis_site x on a.next_site_code=x.site_code
+ left join emis_site y on a.last_site_code=y.site_code
+ left join emis_problem_type z on a.problem_type=z.id
+
+
+
+