diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
index 5b355986e..78ba39d77 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
@@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisCountry.java
* @author linfso
- * @date 2023-12-12 06:35:32
+ * @date 2024-03-19 12:52:52
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: 国家 实体类
@@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel;
import com.xdadan.erp.common.core.domain.BaseEntity;
import com.xdadan.erp.common.core.domain.TreeEntity;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@@ -25,7 +26,7 @@ import lombok.Data;
* @ClassName EmisCountry
* @Description 国家
* @author linfso
- * @date 2023-12-12 06:35:32
+ * @date 2024-03-19 12:52:52
*/
@Data
public class EmisCountry extends BaseEntity
@@ -42,6 +43,8 @@ public class EmisCountry extends BaseEntity
private String code;
/* 所属洲id */
private Integer continentId;
+ /* 显示顺序 */
+ private Integer orderNum;
/* 二字码 */
private String twoCode;
/* 三字码 */
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 5c49e9730..dc728d9b3 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-08 11:33:13
+ * @date 2024-03-08 16:14:21
* @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-08 11:33:13
+ * @date 2024-03-08 16:14:21
*/
@Data
public class EmisWaybill extends BaseEntity
@@ -49,11 +49,14 @@ public class EmisWaybill extends BaseEntity
private String orderStatusStr;
/* 订单类型 0-预报订单 1-正式订单 */
private String orderType;
+ /* 下单时间 - 取客户当地时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date orderDate;
/* 客户ID */
private Long userId;
- /* 客户编号2502021 */
+ /* 寄件客户编号2502021 */
private String customerCode;
- /* 客户名称 */
+ /* 寄件客户客户名称 */
private String customerName;
/* wx openid */
private String openId;
@@ -235,10 +238,28 @@ public class EmisWaybill extends BaseEntity
private String nextSiteCode;
/* 上一网点点号 */
private String lastSiteCode;
+ /* 寄件网点 */
+ private String registerSite;
+ /* 寄件站点代码 */
+ private String registerSiteCode;
+ /* 寄件日期 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date registerDate;
+ /* 寄件人 */
+ private String registerMan;
+ /* 寄件人编号 */
+ private String registerManCode;
+ /* 取件员 */
+ private String takePieceEmployee;
+ /* 取件员代码 */
+ private String takePieceEmployeeCode;
/* 发件网点 */
private String sendSite;
/* 发件网点代码 */
private String sendSiteCode;
+ /* 发货时间 - 取本地时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sendDate;
/* 派件员 */
private String dispatchMan;
/* 派件人代码 */
@@ -308,6 +329,8 @@ public class EmisWaybill extends BaseEntity
private String billPicSendRmk;
/* 签收底单图片 */
private String billPicDispatchRmk;
+ /* 时区偏差 */
+ private String timezoneOffset;
/* 修改人 */
private String modifier;
/* 修改人代码 */
diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
index 335b1f10d..c4cc57aa5 100644
--- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
@@ -10,6 +10,7 @@
+
@@ -22,7 +23,7 @@
- select id, name, name_en, code, continent_id, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_country
+ select id, name, name_en, code, continent_id, order_num, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_country
@@ -60,6 +62,7 @@
name_en,
code,
continent_id,
+ order_num,
two_code,
three_code,
remark,
@@ -76,6 +79,7 @@
#{nameEn},
#{code},
#{continentId},
+ #{orderNum},
#{twoCode},
#{threeCode},
#{remark},
@@ -95,6 +99,7 @@
name_en = #{nameEn},
code = #{code},
continent_id = #{continentId},
+ order_num = #{orderNum},
two_code = #{twoCode},
three_code = #{threeCode},
remark = #{remark},
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 65b2db57e..9c71ee77f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -13,6 +13,7 @@
+
@@ -104,8 +105,16 @@
+
+
+
+
+
+
+
+
@@ -140,6 +149,7 @@
+
@@ -154,7 +164,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, 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
+ select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_status_str, 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, 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, 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, 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
@@ -327,6 +347,7 @@
order_status,
order_status_str,
order_type,
+ order_date,
user_id,
customer_code,
customer_name,
@@ -418,8 +439,16 @@
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,
@@ -454,6 +483,7 @@
sign_date,
bill_pic_send_rmk,
bill_pic_dispatch_rmk,
+ timezone_offset,
modifier,
modifier_code,
modify_date,
@@ -475,6 +505,7 @@
#{orderStatus},
#{orderStatusStr},
#{orderType},
+ #{orderDate},
#{userId},
#{customerCode},
#{customerName},
@@ -566,8 +597,16 @@
#{currentSiteCode},
#{nextSiteCode},
#{lastSiteCode},
+ #{registerSite},
+ #{registerSiteCode},
+ #{registerDate},
+ #{registerMan},
+ #{registerManCode},
+ #{takePieceEmployee},
+ #{takePieceEmployeeCode},
#{sendSite},
#{sendSiteCode},
+ #{sendDate},
#{dispatchMan},
#{dispatchManCode},
#{dispatchDate},
@@ -602,6 +641,7 @@
#{signDate},
#{billPicSendRmk},
#{billPicDispatchRmk},
+ #{timezoneOffset},
#{modifier},
#{modifierCode},
#{modifyDate},
@@ -626,6 +666,7 @@
order_status = #{orderStatus},
order_status_str = #{orderStatusStr},
order_type = #{orderType},
+ order_date = #{orderDate},
user_id = #{userId},
customer_code = #{customerCode},
customer_name = #{customerName},
@@ -717,8 +758,16 @@
current_site_code = #{currentSiteCode},
next_site_code = #{nextSiteCode},
last_site_code = #{lastSiteCode},
+ register_site = #{registerSite},
+ register_site_code = #{registerSiteCode},
+ register_date = #{registerDate},
+ register_man = #{registerMan},
+ register_man_code = #{registerManCode},
+ take_piece_employee = #{takePieceEmployee},
+ take_piece_employee_code = #{takePieceEmployeeCode},
send_site = #{sendSite},
send_site_code = #{sendSiteCode},
+ send_date = #{sendDate},
dispatch_man = #{dispatchMan},
dispatch_man_code = #{dispatchManCode},
dispatch_date = #{dispatchDate},
@@ -753,6 +802,7 @@
sign_date = #{signDate},
bill_pic_send_rmk = #{billPicSendRmk},
bill_pic_dispatch_rmk = #{billPicDispatchRmk},
+ timezone_offset = #{timezoneOffset},
modifier = #{modifier},
modifier_code = #{modifierCode},
modify_date = #{modifyDate},