From bb235b77bb35b6dba24a58e569a76f376e42232b Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 8 Mar 2024 19:34:22 +0800 Subject: [PATCH] md --- .../xdadan/erp/emis/domain/EmisWaybill.java | 29 ++++------ .../resources/mapper/EmisWaybillMapper.xml | 54 ++++++------------- 2 files changed, 27 insertions(+), 56 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 81228023e..5c49e9730 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-01 06:13:11 + * @date 2024-03-08 11:33:13 * @Copyright: ShangHai Duta 2022 All rights reserved. * @version v1.0 * @Description:

运单列表 实体类

@@ -26,7 +26,7 @@ import lombok.Data; * @ClassName EmisWaybill * @Description 运单列表 * @author linfso - * @date 2024-03-01 06:13:11 + * @date 2024-03-08 11:33:13 */ @Data public class EmisWaybill extends BaseEntity @@ -126,17 +126,6 @@ public class EmisWaybill extends BaseEntity private String dispatchMethod; /* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */ private String pickupMethod; - /* 实际发货时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date deliveryTime; - /* 实际发货状态 */ - private String deliveryStatus; - /* 实际取件模式:1-上门取件 2-仓库收货 3-整柜提货 */ - private String deliveryMode; - /* 实际发件网点 */ - private String deliverySite; - /* 实际发件网点代码 */ - private String deliverySiteCode; /* 预计上门取件开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pickStartDate; @@ -240,6 +229,12 @@ public class EmisWaybill extends BaseEntity private String transferCode; /* 转单单号 */ private String transferBillcode; + /* 当前网点编号 */ + private String currentSiteCode; + /* 下一网点编号 */ + private String nextSiteCode; + /* 上一网点点号 */ + private String lastSiteCode; /* 发件网点 */ private String sendSite; /* 发件网点代码 */ @@ -295,14 +290,10 @@ public class EmisWaybill extends BaseEntity private String blIsQuestion; /* 问题件原因 */ private String problemCause; - /* 是否备注消息 */ + /* 是否给寄件人发短信 */ private String blMessage; - /* 是否备注消息类型 */ - private String blMessageText; - /* 是否发送收件人短信 */ + /* 是否给收件人发短信 */ private String blAcceptMessage; - /* 是否发短信给收件类型 */ - private String blAcceptMessageText; /* 签收人 */ private String signMan; /* 签收人代码 */ diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 63aa72f4c..65b2db57e 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -51,11 +51,6 @@ - - - - - @@ -106,6 +101,9 @@ + + + @@ -134,9 +132,7 @@ - - @@ -158,7 +154,7 @@ - select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_status_str, order_type, 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, 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, delivery_time, delivery_status, delivery_mode, delivery_site, delivery_site_code, 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, send_site, send_site_code, 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, 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_message_text, bl_accept_message, bl_accept_message_text, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, 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_status_str, order_type, 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, 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, send_site, send_site_code, 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, 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, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill @@ -373,11 +365,6 @@ pack_type, dispatch_method, pickup_method, - delivery_time, - delivery_status, - delivery_mode, - delivery_site, - delivery_site_code, pick_start_date, pick_finish_date, pick_fail_reason, @@ -428,6 +415,9 @@ disp_fd_reason, transfer_code, transfer_billcode, + current_site_code, + next_site_code, + last_site_code, send_site, send_site_code, dispatch_man, @@ -456,9 +446,7 @@ bl_is_question, problem_cause, bl_message, - bl_message_text, bl_accept_message, - bl_accept_message_text, sign_man, sign_man_code, sign_site, @@ -525,11 +513,6 @@ #{packType}, #{dispatchMethod}, #{pickupMethod}, - #{deliveryTime}, - #{deliveryStatus}, - #{deliveryMode}, - #{deliverySite}, - #{deliverySiteCode}, #{pickStartDate}, #{pickFinishDate}, #{pickFailReason}, @@ -580,6 +563,9 @@ #{dispFdReason}, #{transferCode}, #{transferBillcode}, + #{currentSiteCode}, + #{nextSiteCode}, + #{lastSiteCode}, #{sendSite}, #{sendSiteCode}, #{dispatchMan}, @@ -608,9 +594,7 @@ #{blIsQuestion}, #{problemCause}, #{blMessage}, - #{blMessageText}, #{blAcceptMessage}, - #{blAcceptMessageText}, #{signMan}, #{signManCode}, #{signSite}, @@ -680,11 +664,6 @@ pack_type = #{packType}, dispatch_method = #{dispatchMethod}, pickup_method = #{pickupMethod}, - delivery_time = #{deliveryTime}, - delivery_status = #{deliveryStatus}, - delivery_mode = #{deliveryMode}, - delivery_site = #{deliverySite}, - delivery_site_code = #{deliverySiteCode}, pick_start_date = #{pickStartDate}, pick_finish_date = #{pickFinishDate}, pick_fail_reason = #{pickFailReason}, @@ -735,6 +714,9 @@ disp_fd_reason = #{dispFdReason}, transfer_code = #{transferCode}, transfer_billcode = #{transferBillcode}, + current_site_code = #{currentSiteCode}, + next_site_code = #{nextSiteCode}, + last_site_code = #{lastSiteCode}, send_site = #{sendSite}, send_site_code = #{sendSiteCode}, dispatch_man = #{dispatchMan}, @@ -763,9 +745,7 @@ bl_is_question = #{blIsQuestion}, problem_cause = #{problemCause}, bl_message = #{blMessage}, - bl_message_text = #{blMessageText}, bl_accept_message = #{blAcceptMessage}, - bl_accept_message_text = #{blAcceptMessageText}, sign_man = #{signMan}, sign_man_code = #{signManCode}, sign_site = #{signSite},