From bb31ab810ccabc5084d118f0b3f1b456d487e79e Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 20 May 2024 18:24:31 +0800 Subject: [PATCH] md --- .../xdadan/erp/emis/domain/EmisWaybill.java | 13 ++++ .../resources/mapper/EmisWaybillMapper.xml | 78 +++++++++---------- 2 files changed, 50 insertions(+), 41 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 27beae335..f00f4a470 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 @@ -35,6 +35,7 @@ public class EmisWaybill extends BaseEntity { private static final long serialVersionUID = 1L; + /* id */ private Long id; /* 订单号 */ @@ -132,6 +133,8 @@ public class EmisWaybill extends BaseEntity private String timeType; /* 计泡比例 */ private String meterType; + /* 取重方式 */ + private String carryType; /* 清关方式 */ private String customsClear; /* 报关方式 */ @@ -205,10 +208,18 @@ public class EmisWaybill extends BaseEntity private String currency; /* 结算重量 */ private BigDecimal settlementWeight; + /* 扫描重量 */ + private BigDecimal scanWeight; /* 计费重量 */ private BigDecimal feeWeight; /* 运费 */ private BigDecimal freight; + /* 实际支付方式 : 现金或月结 */ + private String realPaymentType; + /* 实收运费 */ + private BigDecimal realFee; + /* 是否特殊报价 */ + private String blSpecialQuote; /* 是否超长 */ private String blOverLong; /* 是否出账 */ @@ -343,6 +354,8 @@ public class EmisWaybill extends BaseEntity private String billPicDispatchRmk; /* 时区偏差 */ private String timezoneOffset; + /* 数据来源 */ + private String dataFrom; private List cargoList; diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 3d6ab1851..a1d6f2edb 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -53,6 +53,7 @@ + @@ -88,8 +89,12 @@ + + + + @@ -155,6 +160,7 @@ + @@ -227,7 +233,7 @@ - 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, 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, 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, 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, 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, fee_weight, freight, 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_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, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, del_flag, create_by, create_time, update_by, update_time, remark, 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, 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, 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, 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_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, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill - + insert into emis_waybill id, @@ -540,6 +523,7 @@ product_type, time_type, meter_type, + carry_type, customs_clear, customs_eclaration, estimate_date, @@ -575,8 +559,12 @@ 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, @@ -642,6 +630,7 @@ bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, + data_from, del_flag, create_by, create_time, @@ -700,6 +689,7 @@ #{productType}, #{timeType}, #{meterType}, + #{carryType}, #{customsClear}, #{customsEclaration}, #{estimateDate}, @@ -735,8 +725,12 @@ #{volumeWeight}, #{currency}, #{settlementWeight}, + #{scanWeight}, #{feeWeight}, #{freight}, + #{realPaymentType}, + #{realFee}, + #{blSpecialQuote}, #{blOverLong}, #{blBill}, #{blBillText}, @@ -802,6 +796,7 @@ #{billPicSendRmk}, #{billPicDispatchRmk}, #{timezoneOffset}, + #{dataFrom}, #{delFlag}, #{createBy}, #{createTime}, @@ -813,6 +808,7 @@ + update emis_waybill