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: <p> 运单列表 实体类 </p>
@@ -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 @@
         <result property="packType"    column="pack_type"    />
         <result property="dispatchMethod"    column="dispatch_method"    />
         <result property="pickupMethod"    column="pickup_method"    />
-        <result property="deliveryTime"    column="delivery_time"    />
-        <result property="deliveryStatus"    column="delivery_status"    />
-        <result property="deliveryMode"    column="delivery_mode"    />
-        <result property="deliverySite"    column="delivery_site"    />
-        <result property="deliverySiteCode"    column="delivery_site_code"    />
         <result property="pickStartDate"    column="pick_start_date"    />
         <result property="pickFinishDate"    column="pick_finish_date"    />
         <result property="pickFailReason"    column="pick_fail_reason"    />
@@ -106,6 +101,9 @@
         <result property="dispFdReason"    column="disp_fd_reason"    />
         <result property="transferCode"    column="transfer_code"    />
         <result property="transferBillcode"    column="transfer_billcode"    />
+        <result property="currentSiteCode"    column="current_site_code"    />
+        <result property="nextSiteCode"    column="next_site_code"    />
+        <result property="lastSiteCode"    column="last_site_code"    />
         <result property="sendSite"    column="send_site"    />
         <result property="sendSiteCode"    column="send_site_code"    />
         <result property="dispatchMan"    column="dispatch_man"    />
@@ -134,9 +132,7 @@
         <result property="blIsQuestion"    column="bl_is_question"    />
         <result property="problemCause"    column="problem_cause"    />
         <result property="blMessage"    column="bl_message"    />
-        <result property="blMessageText"    column="bl_message_text"    />
         <result property="blAcceptMessage"    column="bl_accept_message"    />
-        <result property="blAcceptMessageText"    column="bl_accept_message_text"    />
         <result property="signMan"    column="sign_man"    />
         <result property="signManCode"    column="sign_man_code"    />
         <result property="signSite"    column="sign_site"    />
@@ -158,7 +154,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, 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
     </sql>
 
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@@ -210,11 +206,6 @@
             <if test="packType != null  and packType != ''"> and pack_type like concat('%', #{packType}, '%')</if>
             <if test="dispatchMethod != null  and dispatchMethod != ''"> and dispatch_method like concat('%', #{dispatchMethod}, '%')</if>
             <if test="pickupMethod != null  and pickupMethod != ''"> and pickup_method like concat('%', #{pickupMethod}, '%')</if>
-            <if test="deliveryTime != null "> and delivery_time = #{deliveryTime}</if>
-            <if test="deliveryStatus != null  and deliveryStatus != ''"> and delivery_status like concat('%', #{deliveryStatus}, '%')</if>
-            <if test="deliveryMode != null  and deliveryMode != ''"> and delivery_mode like concat('%', #{deliveryMode}, '%')</if>
-            <if test="deliverySite != null  and deliverySite != ''"> and delivery_site like concat('%', #{deliverySite}, '%')</if>
-            <if test="deliverySiteCode != null  and deliverySiteCode != ''"> and delivery_site_code like concat('%', #{deliverySiteCode}, '%')</if>
             <if test="pickStartDate != null "> and pick_start_date = #{pickStartDate}</if>
             <if test="pickFinishDate != null "> and pick_finish_date = #{pickFinishDate}</if>
             <if test="pickFailReason != null  and pickFailReason != ''"> and pick_fail_reason like concat('%', #{pickFailReason}, '%')</if>
@@ -265,6 +256,9 @@
             <if test="dispFdReason != null  and dispFdReason != ''"> and disp_fd_reason like concat('%', #{dispFdReason}, '%')</if>
             <if test="transferCode != null  and transferCode != ''"> and transfer_code like concat('%', #{transferCode}, '%')</if>
             <if test="transferBillcode != null  and transferBillcode != ''"> and transfer_billcode like concat('%', #{transferBillcode}, '%')</if>
+            <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="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="dispatchMan != null  and dispatchMan != ''"> and dispatch_man like concat('%', #{dispatchMan}, '%')</if>
@@ -293,9 +287,7 @@
             <if test="blIsQuestion != null  and blIsQuestion != ''"> and bl_is_question like concat('%', #{blIsQuestion}, '%')</if>
             <if test="problemCause != null  and problemCause != ''"> and problem_cause like concat('%', #{problemCause}, '%')</if>
             <if test="blMessage != null  and blMessage != ''"> and bl_message like concat('%', #{blMessage}, '%')</if>
-            <if test="blMessageText != null  and blMessageText != ''"> and bl_message_text like concat('%', #{blMessageText}, '%')</if>
             <if test="blAcceptMessage != null  and blAcceptMessage != ''"> and bl_accept_message like concat('%', #{blAcceptMessage}, '%')</if>
-            <if test="blAcceptMessageText != null  and blAcceptMessageText != ''"> and bl_accept_message_text like concat('%', #{blAcceptMessageText}, '%')</if>
             <if test="signMan != null  and signMan != ''"> and sign_man like concat('%', #{signMan}, '%')</if>
             <if test="signManCode != null  and signManCode != ''"> and sign_man_code like concat('%', #{signManCode}, '%')</if>
             <if test="signSite != null  and signSite != ''"> and sign_site like concat('%', #{signSite}, '%')</if>
@@ -319,7 +311,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, 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
+        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 a
         where a.id = #{id}
     </select>
@@ -373,11 +365,6 @@
             <if test="packType != null and packType != ''">pack_type,</if>
             <if test="dispatchMethod != null and dispatchMethod != ''">dispatch_method,</if>
             <if test="pickupMethod != null and pickupMethod != ''">pickup_method,</if>
-            <if test="deliveryTime != null">delivery_time,</if>
-            <if test="deliveryStatus != null and deliveryStatus != ''">delivery_status,</if>
-            <if test="deliveryMode != null and deliveryMode != ''">delivery_mode,</if>
-            <if test="deliverySite != null and deliverySite != ''">delivery_site,</if>
-            <if test="deliverySiteCode != null and deliverySiteCode != ''">delivery_site_code,</if>
             <if test="pickStartDate != null">pick_start_date,</if>
             <if test="pickFinishDate != null">pick_finish_date,</if>
             <if test="pickFailReason != null and pickFailReason != ''">pick_fail_reason,</if>
@@ -428,6 +415,9 @@
             <if test="dispFdReason != null and dispFdReason != ''">disp_fd_reason,</if>
             <if test="transferCode != null and transferCode != ''">transfer_code,</if>
             <if test="transferBillcode != null and transferBillcode != ''">transfer_billcode,</if>
+            <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="sendSite != null and sendSite != ''">send_site,</if>
             <if test="sendSiteCode != null and sendSiteCode != ''">send_site_code,</if>
             <if test="dispatchMan != null and dispatchMan != ''">dispatch_man,</if>
@@ -456,9 +446,7 @@
             <if test="blIsQuestion != null and blIsQuestion != ''">bl_is_question,</if>
             <if test="problemCause != null and problemCause != ''">problem_cause,</if>
             <if test="blMessage != null and blMessage != ''">bl_message,</if>
-            <if test="blMessageText != null and blMessageText != ''">bl_message_text,</if>
             <if test="blAcceptMessage != null and blAcceptMessage != ''">bl_accept_message,</if>
-            <if test="blAcceptMessageText != null and blAcceptMessageText != ''">bl_accept_message_text,</if>
             <if test="signMan != null and signMan != ''">sign_man,</if>
             <if test="signManCode != null and signManCode != ''">sign_man_code,</if>
             <if test="signSite != null and signSite != ''">sign_site,</if>
@@ -525,11 +513,6 @@
             <if test="packType != null and packType != ''">#{packType},</if>
             <if test="dispatchMethod != null and dispatchMethod != ''">#{dispatchMethod},</if>
             <if test="pickupMethod != null and pickupMethod != ''">#{pickupMethod},</if>
-            <if test="deliveryTime != null">#{deliveryTime},</if>
-            <if test="deliveryStatus != null and deliveryStatus != ''">#{deliveryStatus},</if>
-            <if test="deliveryMode != null and deliveryMode != ''">#{deliveryMode},</if>
-            <if test="deliverySite != null and deliverySite != ''">#{deliverySite},</if>
-            <if test="deliverySiteCode != null and deliverySiteCode != ''">#{deliverySiteCode},</if>
             <if test="pickStartDate != null">#{pickStartDate},</if>
             <if test="pickFinishDate != null">#{pickFinishDate},</if>
             <if test="pickFailReason != null and pickFailReason != ''">#{pickFailReason},</if>
@@ -580,6 +563,9 @@
             <if test="dispFdReason != null and dispFdReason != ''">#{dispFdReason},</if>
             <if test="transferCode != null and transferCode != ''">#{transferCode},</if>
             <if test="transferBillcode != null and transferBillcode != ''">#{transferBillcode},</if>
+            <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="sendSite != null and sendSite != ''">#{sendSite},</if>
             <if test="sendSiteCode != null and sendSiteCode != ''">#{sendSiteCode},</if>
             <if test="dispatchMan != null and dispatchMan != ''">#{dispatchMan},</if>
@@ -608,9 +594,7 @@
             <if test="blIsQuestion != null and blIsQuestion != ''">#{blIsQuestion},</if>
             <if test="problemCause != null and problemCause != ''">#{problemCause},</if>
             <if test="blMessage != null and blMessage != ''">#{blMessage},</if>
-            <if test="blMessageText != null and blMessageText != ''">#{blMessageText},</if>
             <if test="blAcceptMessage != null and blAcceptMessage != ''">#{blAcceptMessage},</if>
-            <if test="blAcceptMessageText != null and blAcceptMessageText != ''">#{blAcceptMessageText},</if>
             <if test="signMan != null and signMan != ''">#{signMan},</if>
             <if test="signManCode != null and signManCode != ''">#{signManCode},</if>
             <if test="signSite != null and signSite != ''">#{signSite},</if>
@@ -680,11 +664,6 @@
             <if test="packType != null and packType != ''">pack_type = #{packType},</if>
             <if test="dispatchMethod != null and dispatchMethod != ''">dispatch_method = #{dispatchMethod},</if>
             <if test="pickupMethod != null and pickupMethod != ''">pickup_method = #{pickupMethod},</if>
-            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
-            <if test="deliveryStatus != null and deliveryStatus != ''">delivery_status = #{deliveryStatus},</if>
-            <if test="deliveryMode != null and deliveryMode != ''">delivery_mode = #{deliveryMode},</if>
-            <if test="deliverySite != null and deliverySite != ''">delivery_site = #{deliverySite},</if>
-            <if test="deliverySiteCode != null and deliverySiteCode != ''">delivery_site_code = #{deliverySiteCode},</if>
             <if test="pickStartDate != null">pick_start_date = #{pickStartDate},</if>
             <if test="pickFinishDate != null">pick_finish_date = #{pickFinishDate},</if>
             <if test="pickFailReason != null and pickFailReason != ''">pick_fail_reason = #{pickFailReason},</if>
@@ -735,6 +714,9 @@
             <if test="dispFdReason != null and dispFdReason != ''">disp_fd_reason = #{dispFdReason},</if>
             <if test="transferCode != null and transferCode != ''">transfer_code = #{transferCode},</if>
             <if test="transferBillcode != null and transferBillcode != ''">transfer_billcode = #{transferBillcode},</if>
+            <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="sendSite != null and sendSite != ''">send_site = #{sendSite},</if>
             <if test="sendSiteCode != null and sendSiteCode != ''">send_site_code = #{sendSiteCode},</if>
             <if test="dispatchMan != null and dispatchMan != ''">dispatch_man = #{dispatchMan},</if>
@@ -763,9 +745,7 @@
             <if test="blIsQuestion != null and blIsQuestion != ''">bl_is_question = #{blIsQuestion},</if>
             <if test="problemCause != null and problemCause != ''">problem_cause = #{problemCause},</if>
             <if test="blMessage != null and blMessage != ''">bl_message = #{blMessage},</if>
-            <if test="blMessageText != null and blMessageText != ''">bl_message_text = #{blMessageText},</if>
             <if test="blAcceptMessage != null and blAcceptMessage != ''">bl_accept_message = #{blAcceptMessage},</if>
-            <if test="blAcceptMessageText != null and blAcceptMessageText != ''">bl_accept_message_text = #{blAcceptMessageText},</if>
             <if test="signMan != null and signMan != ''">sign_man = #{signMan},</if>
             <if test="signManCode != null and signManCode != ''">sign_man_code = #{signManCode},</if>
             <if test="signSite != null and signSite != ''">sign_site = #{signSite},</if>