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 4d7a32306..2eca2f09f 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
@@ -39,7 +39,6 @@ public class EmisWaybill extends BaseEntity
 
 
     /* id */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /* 订单号 */
     private String orderSn;
@@ -62,16 +61,8 @@ public class EmisWaybill extends BaseEntity
     private Long userId;
     /* 客户编号2502021 */
     private String customerCode;
-    /* 客户名称 */
+    /* 客户客户名称 */
     private String customerName;
-    /* 收件客户编号2502021 */
-    private String receiveCustomerCode;
-    /* 收件客户客户名称 */
-    private String receiveCustomerName;
-    /* 第三方客户客户编号 */
-    private String thirdCustomerCode;
-    /* 第三方客户客户名称 */
-    private String thirdCustomerName;
     /* wx openid */
     private String openId;
     /* 收货人名 */
@@ -128,6 +119,8 @@ public class EmisWaybill extends BaseEntity
     private String calcFeeType;
     /* 支付月结编号 */
     private String custNo;
+    /* 月结客户的名称 */
+    private String custName;
     /* 快递线路 */
     private String transLineType;
     /* 快递产品类型 */
@@ -357,10 +350,20 @@ public class EmisWaybill extends BaseEntity
     private String billPicDispatchRmk;
     /* 时区偏差 */
     private String timezoneOffset;
+    /* 付款状态 字典:emis_payment_status */
+    private String paymentStatus;
+    /* 付款时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date paymentDate;
+    /* 付款备注 */
+    private String paymentRemark;
+    /* 订单备注 */
+    private String orderRemark;
     /* 数据来源 */
     private String dataFrom;
 
 
+
     private List<EmisWaybillCargo> cargoList;
     private List<EmisWaybillFeeitem> feeitemList;
     private List<EmisWaybillAttachment> attachmentList;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 4c18af1ce..d57b94d22 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -22,6 +22,7 @@ import com.googlecode.aviator.AviatorEvaluator;
 import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.common.utils.DictUtils;
 import com.xdadan.erp.emis.domain.*;
+import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.enumtype.TransType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
@@ -246,8 +247,20 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         // 判断运单状态，如果已锁账，则不允许修改
         // 下单超过 24小时
+        // （1）当天开单的，次日9点前允许修改面单；
+        //（2）当天开单次日上午9点后未锁帐，总部/财务中心修改；
+        //（3）若运单已签收、已确认账单、已收款、已锁帐，登记申请审批后进行修改；
+//        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("HH:mm:ss");
+//        LocalTime localTime=LocalTime.parse(time,dtf);
+//        return LocalTime.now().isAfter(localTime);
+
         if(emisWaybillOld!=null ) {
-            if ("1".equals(emisWaybillOld.getBlBill()) || isOutTime(emisWaybillOld.getCreateTime())) {
+            if (
+                    "1".equals(emisWaybillOld.getBlBill())
+                            || ScanType.SIGNED.opCode.equals(emisWaybillOld.getWaybillStatus())
+                    || isOutTime(emisWaybillOld.getCreateTime())
+
+            ) {
                 throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "已锁账，不允许修改");
             }
         }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index dc6c7d4a1..c282f86b6 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -17,10 +17,6 @@
         <result property="userId"    column="user_id"    />
         <result property="customerCode"    column="customer_code"    />
         <result property="customerName"    column="customer_name"    />
-        <result property="receiveCustomerCode"    column="receive_customer_code"    />
-        <result property="receiveCustomerName"    column="receive_customer_name"    />
-        <result property="thirdCustomerCode"    column="third_customer_code"    />
-        <result property="thirdCustomerName"    column="third_customer_name"    />
         <result property="openId"    column="open_id"    />
         <result property="receiveName"    column="receive_name"    />
         <result property="receiveCompany"    column="receive_company"    />
@@ -49,6 +45,7 @@
         <result property="paymentType"    column="payment_type"    />
         <result property="calcFeeType"    column="calc_fee_type"    />
         <result property="custNo"    column="cust_no"    />
+        <result property="custName"    column="cust_name"    />
         <result property="transLineType"    column="trans_line_type"    />
         <result property="productType"    column="product_type"    />
         <result property="timeType"    column="time_type"    />
@@ -160,13 +157,17 @@
         <result property="billPicSendRmk"    column="bill_pic_send_rmk"    />
         <result property="billPicDispatchRmk"    column="bill_pic_dispatch_rmk"    />
         <result property="timezoneOffset"    column="timezone_offset"    />
+        <result property="paymentStatus"    column="payment_status"    />
+        <result property="paymentDate"    column="payment_date"    />
+        <result property="paymentRemark"    column="payment_remark"    />
+        <result property="orderRemark"    column="order_remark"    />
         <result property="dataFrom"    column="data_from"    />
+        <result property="remark"    column="remark"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
         <result property="createSite"    column="create_site"    />
         <result property="updateSite"    column="update_site"    />
 
@@ -196,10 +197,6 @@
         <association property="takePieceEmployeeName"    column="take_piece_employee_code" select="selectEmpNameByCode"/>
         <association property="operateEmployeeName"    column="operate_employee_code" select="selectEmpNameByCode"/>
 
-
-<!--        <association property="salesmenName"    column="salesmen" select="selectEmpNameByCode"/>-->
-<!--        <association property="payeeName"    column="payee" select="selectEmpNameByCode"/>-->
-
     </resultMap>
 
     <select id="selectDestNameByCode" parameterType="String" resultType="string">
@@ -238,7 +235,7 @@
 
 
     <sql id="selectEmisWaybillVo">
-        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
+        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, 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, cust_name, 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, payment_status, payment_date, payment_remark, order_remark, data_from, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill
     </sql>
 
     <select id="selectWaybillStatByEmpCode" parameterType="String" resultType="map">
@@ -483,7 +480,7 @@
     </select>
 
     <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">
-        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
+        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, 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, cust_name, 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, payment_status, payment_date, payment_remark, order_remark, data_from, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill
         from emis_waybill a
         where a.id = #{id}
     </select>
@@ -503,10 +500,6 @@
             <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>
-            <if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code,</if>
-            <if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name,</if>
-            <if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code,</if>
-            <if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name,</if>
             <if test="openId != null and openId != ''">open_id,</if>
             <if test="receiveName != null and receiveName != ''">receive_name,</if>
             <if test="receiveCompany != null and receiveCompany != ''">receive_company,</if>
@@ -535,6 +528,7 @@
             <if test="paymentType != null and paymentType != ''">payment_type,</if>
             <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type,</if>
             <if test="custNo != null and custNo != ''">cust_no,</if>
+            <if test="custName != null and custName != ''">cust_name,</if>
             <if test="transLineType != null and transLineType != ''">trans_line_type,</if>
             <if test="productType != null and productType != ''">product_type,</if>
             <if test="timeType != null and timeType != ''">time_type,</if>
@@ -646,13 +640,17 @@
             <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="paymentStatus != null and paymentStatus != ''">payment_status,</if>
+            <if test="paymentDate != null">payment_date,</if>
+            <if test="paymentRemark != null and paymentRemark != ''">payment_remark,</if>
+            <if test="orderRemark != null and orderRemark != ''">order_remark,</if>
             <if test="dataFrom != null and dataFrom != ''">data_from,</if>
+            <if test="remark != null and remark != ''">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="remark != null and remark != ''">remark,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
         </trim>
@@ -669,10 +667,6 @@
             <if test="userId != null">#{userId},</if>
             <if test="customerCode != null and customerCode != ''">#{customerCode},</if>
             <if test="customerName != null and customerName != ''">#{customerName},</if>
-            <if test="receiveCustomerCode != null and receiveCustomerCode != ''">#{receiveCustomerCode},</if>
-            <if test="receiveCustomerName != null and receiveCustomerName != ''">#{receiveCustomerName},</if>
-            <if test="thirdCustomerCode != null and thirdCustomerCode != ''">#{thirdCustomerCode},</if>
-            <if test="thirdCustomerName != null and thirdCustomerName != ''">#{thirdCustomerName},</if>
             <if test="openId != null and openId != ''">#{openId},</if>
             <if test="receiveName != null and receiveName != ''">#{receiveName},</if>
             <if test="receiveCompany != null and receiveCompany != ''">#{receiveCompany},</if>
@@ -701,6 +695,7 @@
             <if test="paymentType != null and paymentType != ''">#{paymentType},</if>
             <if test="calcFeeType != null and calcFeeType != ''">#{calcFeeType},</if>
             <if test="custNo != null and custNo != ''">#{custNo},</if>
+            <if test="custName != null and custName != ''">#{custName},</if>
             <if test="transLineType != null and transLineType != ''">#{transLineType},</if>
             <if test="productType != null and productType != ''">#{productType},</if>
             <if test="timeType != null and timeType != ''">#{timeType},</if>
@@ -812,13 +807,17 @@
             <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="paymentStatus != null and paymentStatus != ''">#{paymentStatus},</if>
+            <if test="paymentDate != null">#{paymentDate},</if>
+            <if test="paymentRemark != null and paymentRemark != ''">#{paymentRemark},</if>
+            <if test="orderRemark != null and orderRemark != ''">#{orderRemark},</if>
             <if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
         </trim>
@@ -835,10 +834,6 @@
             <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>
-            <if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code = #{receiveCustomerCode},</if>
-            <if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name = #{receiveCustomerName},</if>
-            <if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code = #{thirdCustomerCode},</if>
-            <if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name = #{thirdCustomerName},</if>
             <if test="openId != null and openId != ''">open_id = #{openId},</if>
             <if test="receiveName != null and receiveName != ''">receive_name = #{receiveName},</if>
             <if test="receiveCompany != null and receiveCompany != ''">receive_company = #{receiveCompany},</if>
@@ -867,6 +862,7 @@
             <if test="paymentType != null and paymentType != ''">payment_type = #{paymentType},</if>
             <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type = #{calcFeeType},</if>
             <if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
+            <if test="custName != null and custName != ''">cust_name = #{custName},</if>
             <if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
             <if test="productType != null and productType != ''">product_type = #{productType},</if>
             <if test="timeType != null and timeType != ''">time_type = #{timeType},</if>
@@ -978,13 +974,17 @@
             <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="paymentStatus != null and paymentStatus != ''">payment_status = #{paymentStatus},</if>
+            <if test="paymentDate != null">payment_date = #{paymentDate},</if>
+            <if test="paymentRemark != null and paymentRemark != ''">payment_remark = #{paymentRemark},</if>
+            <if test="orderRemark != null and orderRemark != ''">order_remark = #{orderRemark},</if>
             <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
@@ -1001,10 +1001,6 @@
             <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>
-            <if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code = #{receiveCustomerCode},</if>
-            <if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name = #{receiveCustomerName},</if>
-            <if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code = #{thirdCustomerCode},</if>
-            <if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name = #{thirdCustomerName},</if>
             <if test="openId != null and openId != ''">open_id = #{openId},</if>
             <if test="receiveName != null and receiveName != ''">receive_name = #{receiveName},</if>
             <if test="receiveCompany != null and receiveCompany != ''">receive_company = #{receiveCompany},</if>
@@ -1033,6 +1029,7 @@
             <if test="paymentType != null and paymentType != ''">payment_type = #{paymentType},</if>
             <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type = #{calcFeeType},</if>
             <if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
+            <if test="custName != null and custName != ''">cust_name = #{custName},</if>
             <if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
             <if test="productType != null and productType != ''">product_type = #{productType},</if>
             <if test="timeType != null and timeType != ''">time_type = #{timeType},</if>
@@ -1144,13 +1141,17 @@
             <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="paymentStatus != null and paymentStatus != ''">payment_status = #{paymentStatus},</if>
+            <if test="paymentDate != null">payment_date = #{paymentDate},</if>
+            <if test="paymentRemark != null and paymentRemark != ''">payment_remark = #{paymentRemark},</if>
+            <if test="orderRemark != null and orderRemark != ''">order_remark = #{orderRemark},</if>
             <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>