aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-03-19 20:54:06 +08:00
parent bb235b77bb
commit 0ce1c608b5
4 changed files with 92 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
View File

@ -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: <p> 国家 实体类 </p>
@ -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;
/* 三字码 */

31
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -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: <p> 运单列表 实体类 </p>
@ -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;
/* 修改人代码 */

11
emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
View File

@ -10,6 +10,7 @@
<result property="nameEn" column="name_en" />
<result property="code" column="code" />
<result property="continentId" column="continent_id" />
<result property="orderNum" column="order_num" />
<result property="twoCode" column="two_code" />
<result property="threeCode" column="three_code" />
<result property="remark" column="remark" />
@ -22,7 +23,7 @@
</resultMap>
<sql id="selectEmisCountryVo">
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
</sql>
<select id="selectEmisCountryList" parameterType="EmisCountry" resultMap="EmisCountryResult">
@ -33,6 +34,7 @@
<if test="nameEn != null and nameEn != ''"> and name_en like concat('%', #{nameEn}, '%')</if>
<if test="code != null and code != ''"> and code like concat('%', #{code}, '%')</if>
<if test="continentId != null "> and continent_id = #{continentId}</if>
<if test="orderNum != null "> and order_num = #{orderNum}</if>
<if test="twoCode != null and twoCode != ''"> and two_code like concat('%', #{twoCode}, '%')</if>
<if test="threeCode != null and threeCode != ''"> and three_code like concat('%', #{threeCode}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
@ -43,11 +45,11 @@
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
</where>
order by create_time desc
order by order_num desc
</select>
<select id="selectEmisCountryById" parameterType="Integer" resultMap="EmisCountryResult">
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
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 a
where a.id = #{id}
</select>
@ -60,6 +62,7 @@
<if test="nameEn != null and nameEn != ''">name_en,</if>
<if test="code != null and code != ''">code,</if>
<if test="continentId != null">continent_id,</if>
<if test="orderNum != null">order_num,</if>
<if test="twoCode != null and twoCode != ''">two_code,</if>
<if test="threeCode != null and threeCode != ''">three_code,</if>
<if test="remark != null and remark != ''">remark,</if>
@ -76,6 +79,7 @@
<if test="nameEn != null and nameEn != ''">#{nameEn},</if>
<if test="code != null and code != ''">#{code},</if>
<if test="continentId != null">#{continentId},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="twoCode != null and twoCode != ''">#{twoCode},</if>
<if test="threeCode != null and threeCode != ''">#{threeCode},</if>
<if test="remark != null and remark != ''">#{remark},</if>
@ -95,6 +99,7 @@
<if test="nameEn != null and nameEn != ''">name_en = #{nameEn},</if>
<if test="code != null and code != ''">code = #{code},</if>
<if test="continentId != null">continent_id = #{continentId},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="twoCode != null and twoCode != ''">two_code = #{twoCode},</if>
<if test="threeCode != null and threeCode != ''">three_code = #{threeCode},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>

54
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -13,6 +13,7 @@
<result property="orderStatus" column="order_status" />
<result property="orderStatusStr" column="order_status_str" />
<result property="orderType" column="order_type" />
<result property="orderDate" column="order_date" />
<result property="userId" column="user_id" />
<result property="customerCode" column="customer_code" />
<result property="customerName" column="customer_name" />
@ -104,8 +105,16 @@
<result property="currentSiteCode" column="current_site_code" />
<result property="nextSiteCode" column="next_site_code" />
<result property="lastSiteCode" column="last_site_code" />
<result property="registerSite" column="register_site" />
<result property="registerSiteCode" column="register_site_code" />
<result property="registerDate" column="register_date" />
<result property="registerMan" column="register_man" />
<result property="registerManCode" column="register_man_code" />
<result property="takePieceEmployee" column="take_piece_employee" />
<result property="takePieceEmployeeCode" column="take_piece_employee_code" />
<result property="sendSite" column="send_site" />
<result property="sendSiteCode" column="send_site_code" />
<result property="sendDate" column="send_date" />
<result property="dispatchMan" column="dispatch_man" />
<result property="dispatchManCode" column="dispatch_man_code" />
<result property="dispatchDate" column="dispatch_date" />
@ -140,6 +149,7 @@
<result property="signDate" column="sign_date" />
<result property="billPicSendRmk" column="bill_pic_send_rmk" />
<result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" />
<result property="timezoneOffset" column="timezone_offset" />
<result property="modifier" column="modifier" />
<result property="modifierCode" column="modifier_code" />
<result property="modifyDate" column="modify_date" />
@ -154,7 +164,7 @@
</resultMap>
<sql id="selectEmisWaybillVo">
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
</sql>
<select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@ -168,6 +178,7 @@
<if test="orderStatus != null and orderStatus != ''"> and order_status like concat('%', #{orderStatus}, '%')</if>
<if test="orderStatusStr != null and orderStatusStr != ''"> and order_status_str like concat('%', #{orderStatusStr}, '%')</if>
<if test="orderType != null and orderType != ''"> and order_type like concat('%', #{orderType}, '%')</if>
<if test="orderDate != null "> and order_date = #{orderDate}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
@ -259,8 +270,16 @@
<if test="currentSiteCode != null and currentSiteCode != ''"> and current_site_code like concat('%', #{currentSiteCode}, '%')</if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code like concat('%', #{nextSiteCode}, '%')</if>
<if test="lastSiteCode != null and lastSiteCode != ''"> and last_site_code like concat('%', #{lastSiteCode}, '%')</if>
<if test="registerSite != null and registerSite != ''"> and register_site like concat('%', #{registerSite}, '%')</if>
<if test="registerSiteCode != null and registerSiteCode != ''"> and register_site_code like concat('%', #{registerSiteCode}, '%')</if>
<if test="registerDate != null "> and register_date = #{registerDate}</if>
<if test="registerMan != null and registerMan != ''"> and register_man like concat('%', #{registerMan}, '%')</if>
<if test="registerManCode != null and registerManCode != ''"> and register_man_code like concat('%', #{registerManCode}, '%')</if>
<if test="takePieceEmployee != null and takePieceEmployee != ''"> and take_piece_employee like concat('%', #{takePieceEmployee}, '%')</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and take_piece_employee_code like concat('%', #{takePieceEmployeeCode}, '%')</if>
<if test="sendSite != null and sendSite != ''"> and send_site like concat('%', #{sendSite}, '%')</if>
<if test="sendSiteCode != null and sendSiteCode != ''"> and send_site_code like concat('%', #{sendSiteCode}, '%')</if>
<if test="sendDate != null "> and send_date = #{sendDate}</if>
<if test="dispatchMan != null and dispatchMan != ''"> and dispatch_man like concat('%', #{dispatchMan}, '%')</if>
<if test="dispatchManCode != null and dispatchManCode != ''"> and dispatch_man_code like concat('%', #{dispatchManCode}, '%')</if>
<if test="dispatchDate != null and dispatchDate != ''"> and dispatch_date like concat('%', #{dispatchDate}, '%')</if>
@ -295,6 +314,7 @@
<if test="signDate != null and signDate != ''"> and sign_date like concat('%', #{signDate}, '%')</if>
<if test="billPicSendRmk != null and billPicSendRmk != ''"> and bill_pic_send_rmk like concat('%', #{billPicSendRmk}, '%')</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''"> and bill_pic_dispatch_rmk like concat('%', #{billPicDispatchRmk}, '%')</if>
<if test="timezoneOffset != null and timezoneOffset != ''"> and timezone_offset like concat('%', #{timezoneOffset}, '%')</if>
<if test="modifier != null and modifier != ''"> and modifier like concat('%', #{modifier}, '%')</if>
<if test="modifierCode != null and modifierCode != ''"> and modifier_code like concat('%', #{modifierCode}, '%')</if>
<if test="modifyDate != null and modifyDate != ''"> and modify_date like concat('%', #{modifyDate}, '%')</if>
@ -311,7 +331,7 @@
</select>
<select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">
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
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 a
where a.id = #{id}
</select>
@ -327,6 +347,7 @@
<if test="orderStatus != null and orderStatus != ''">order_status,</if>
<if test="orderStatusStr != null and orderStatusStr != ''">order_status_str,</if>
<if test="orderType != null and orderType != ''">order_type,</if>
<if test="orderDate != null">order_date,</if>
<if test="userId != null">user_id,</if>
<if test="customerCode != null and customerCode != ''">customer_code,</if>
<if test="customerName != null and customerName != ''">customer_name,</if>
@ -418,8 +439,16 @@
<if test="currentSiteCode != null and currentSiteCode != ''">current_site_code,</if>
<if test="nextSiteCode != null and nextSiteCode != ''">next_site_code,</if>
<if test="lastSiteCode != null and lastSiteCode != ''">last_site_code,</if>
<if test="registerSite != null and registerSite != ''">register_site,</if>
<if test="registerSiteCode != null and registerSiteCode != ''">register_site_code,</if>
<if test="registerDate != null">register_date,</if>
<if test="registerMan != null and registerMan != ''">register_man,</if>
<if test="registerManCode != null and registerManCode != ''">register_man_code,</if>
<if test="takePieceEmployee != null and takePieceEmployee != ''">take_piece_employee,</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''">take_piece_employee_code,</if>
<if test="sendSite != null and sendSite != ''">send_site,</if>
<if test="sendSiteCode != null and sendSiteCode != ''">send_site_code,</if>
<if test="sendDate != null">send_date,</if>
<if test="dispatchMan != null and dispatchMan != ''">dispatch_man,</if>
<if test="dispatchManCode != null and dispatchManCode != ''">dispatch_man_code,</if>
<if test="dispatchDate != null and dispatchDate != ''">dispatch_date,</if>
@ -454,6 +483,7 @@
<if test="signDate != null and signDate != ''">sign_date,</if>
<if test="billPicSendRmk != null and billPicSendRmk != ''">bill_pic_send_rmk,</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">bill_pic_dispatch_rmk,</if>
<if test="timezoneOffset != null and timezoneOffset != ''">timezone_offset,</if>
<if test="modifier != null and modifier != ''">modifier,</if>
<if test="modifierCode != null and modifierCode != ''">modifier_code,</if>
<if test="modifyDate != null and modifyDate != ''">modify_date,</if>
@ -475,6 +505,7 @@
<if test="orderStatus != null and orderStatus != ''">#{orderStatus},</if>
<if test="orderStatusStr != null and orderStatusStr != ''">#{orderStatusStr},</if>
<if test="orderType != null and orderType != ''">#{orderType},</if>
<if test="orderDate != null">#{orderDate},</if>
<if test="userId != null">#{userId},</if>
<if test="customerCode != null and customerCode != ''">#{customerCode},</if>
<if test="customerName != null and customerName != ''">#{customerName},</if>
@ -566,8 +597,16 @@
<if test="currentSiteCode != null and currentSiteCode != ''">#{currentSiteCode},</if>
<if test="nextSiteCode != null and nextSiteCode != ''">#{nextSiteCode},</if>
<if test="lastSiteCode != null and lastSiteCode != ''">#{lastSiteCode},</if>
<if test="registerSite != null and registerSite != ''">#{registerSite},</if>
<if test="registerSiteCode != null and registerSiteCode != ''">#{registerSiteCode},</if>
<if test="registerDate != null">#{registerDate},</if>
<if test="registerMan != null and registerMan != ''">#{registerMan},</if>
<if test="registerManCode != null and registerManCode != ''">#{registerManCode},</if>
<if test="takePieceEmployee != null and takePieceEmployee != ''">#{takePieceEmployee},</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''">#{takePieceEmployeeCode},</if>
<if test="sendSite != null and sendSite != ''">#{sendSite},</if>
<if test="sendSiteCode != null and sendSiteCode != ''">#{sendSiteCode},</if>
<if test="sendDate != null">#{sendDate},</if>
<if test="dispatchMan != null and dispatchMan != ''">#{dispatchMan},</if>
<if test="dispatchManCode != null and dispatchManCode != ''">#{dispatchManCode},</if>
<if test="dispatchDate != null and dispatchDate != ''">#{dispatchDate},</if>
@ -602,6 +641,7 @@
<if test="signDate != null and signDate != ''">#{signDate},</if>
<if test="billPicSendRmk != null and billPicSendRmk != ''">#{billPicSendRmk},</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">#{billPicDispatchRmk},</if>
<if test="timezoneOffset != null and timezoneOffset != ''">#{timezoneOffset},</if>
<if test="modifier != null and modifier != ''">#{modifier},</if>
<if test="modifierCode != null and modifierCode != ''">#{modifierCode},</if>
<if test="modifyDate != null and modifyDate != ''">#{modifyDate},</if>
@ -626,6 +666,7 @@
<if test="orderStatus != null and orderStatus != ''">order_status = #{orderStatus},</if>
<if test="orderStatusStr != null and orderStatusStr != ''">order_status_str = #{orderStatusStr},</if>
<if test="orderType != null and orderType != ''">order_type = #{orderType},</if>
<if test="orderDate != null">order_date = #{orderDate},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
@ -717,8 +758,16 @@
<if test="currentSiteCode != null and currentSiteCode != ''">current_site_code = #{currentSiteCode},</if>
<if test="nextSiteCode != null and nextSiteCode != ''">next_site_code = #{nextSiteCode},</if>
<if test="lastSiteCode != null and lastSiteCode != ''">last_site_code = #{lastSiteCode},</if>
<if test="registerSite != null and registerSite != ''">register_site = #{registerSite},</if>
<if test="registerSiteCode != null and registerSiteCode != ''">register_site_code = #{registerSiteCode},</if>
<if test="registerDate != null">register_date = #{registerDate},</if>
<if test="registerMan != null and registerMan != ''">register_man = #{registerMan},</if>
<if test="registerManCode != null and registerManCode != ''">register_man_code = #{registerManCode},</if>
<if test="takePieceEmployee != null and takePieceEmployee != ''">take_piece_employee = #{takePieceEmployee},</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''">take_piece_employee_code = #{takePieceEmployeeCode},</if>
<if test="sendSite != null and sendSite != ''">send_site = #{sendSite},</if>
<if test="sendSiteCode != null and sendSiteCode != ''">send_site_code = #{sendSiteCode},</if>
<if test="sendDate != null">send_date = #{sendDate},</if>
<if test="dispatchMan != null and dispatchMan != ''">dispatch_man = #{dispatchMan},</if>
<if test="dispatchManCode != null and dispatchManCode != ''">dispatch_man_code = #{dispatchManCode},</if>
<if test="dispatchDate != null and dispatchDate != ''">dispatch_date = #{dispatchDate},</if>
@ -753,6 +802,7 @@
<if test="signDate != null and signDate != ''">sign_date = #{signDate},</if>
<if test="billPicSendRmk != null and billPicSendRmk != ''">bill_pic_send_rmk = #{billPicSendRmk},</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">bill_pic_dispatch_rmk = #{billPicDispatchRmk},</if>
<if test="timezoneOffset != null and timezoneOffset != ''">timezone_offset = #{timezoneOffset},</if>
<if test="modifier != null and modifier != ''">modifier = #{modifier},</if>
<if test="modifierCode != null and modifierCode != ''">modifier_code = #{modifierCode},</if>
<if test="modifyDate != null and modifyDate != ''">modify_date = #{modifyDate},</if>