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 05d939d94..cea0842a2 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
@@ -161,8 +161,10 @@ public class EmisWaybill extends BaseEntity
     private String intoWarehouseContact;
     /* 入仓联系人电话 */
     private String intoWarehousePhone;
-    /* 入仓单号 */
+    /* 入仓预报单号 */
     private String intoWarehouseBillCode;
+    /* 实际进仓单关联 */
+    private String warehouseInNo;
     /* 客户发货开始时间 */
     private String customerDeliveryBeginTime;
     /* 客户发货截止时间 */
@@ -171,6 +173,22 @@ public class EmisWaybill extends BaseEntity
     private String goodsType;
     /* 货物描述 */
     private String goodsInfo;
+    /* 货物图片，逗号隔开 */
+    private String goodsPics;
+    /* 预入仓代垫运费 1-是 */
+    private String blPrepareInFreight;
+    /* 预入仓代垫运费 */
+    private BigDecimal prepareInEstFee;
+    /* 预入仓实际运费 */
+    private BigDecimal prepareInRealFee;
+    /* 预入仓快递公司 */
+    private String prepareInExpress;
+    /* 预入仓快递单号 */
+    private String prepareInBillCode;
+    /* 预入仓自定义标识 */
+    private String prepareInRemark;
+    /* 预入仓供应商 */
+    private String prepareInSupplier;
     /* 总重量 */
     private BigDecimal totalWeight;
     /* 总体积 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
index 0463507e9..298f2391c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
@@ -22,4 +22,10 @@ public class FeeItem {
     // 收费项
     private String remark;
 
+    // 计算表达式
+    private String calcExp;
+    // 续重
+    private String addWeight;
+
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index a5a070fa1..1d3a8560e 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -68,10 +68,19 @@
         <result property="intoWarehouseContact"    column="into_warehouse_contact"    />
         <result property="intoWarehousePhone"    column="into_warehouse_phone"    />
         <result property="intoWarehouseBillCode"    column="into_warehouse_bill_code"    />
+        <result property="warehouseInNo"    column="warehouse_in_no"    />
         <result property="customerDeliveryBeginTime"    column="customer_delivery_begin_time"    />
         <result property="customerDeliveryEndTime"    column="customer_delivery_end_time"    />
         <result property="goodsType"    column="goods_type"    />
         <result property="goodsInfo"    column="goods_info"    />
+        <result property="goodsPics"    column="goods_pics"    />
+        <result property="blPrepareInFreight"    column="bl_prepare_in_freight"    />
+        <result property="prepareInEstFee"    column="prepare_in_est_fee"    />
+        <result property="prepareInRealFee"    column="prepare_in_real_fee"    />
+        <result property="prepareInExpress"    column="prepare_in_express"    />
+        <result property="prepareInBillCode"    column="prepare_in_bill_code"    />
+        <result property="prepareInRemark"    column="prepare_in_remark"    />
+        <result property="prepareInSupplier"    column="prepare_in_supplier"    />
         <result property="totalWeight"    column="total_weight"    />
         <result property="totalVolume"    column="total_volume"    />
         <result property="parcelQty"    column="parcel_qty"    />
@@ -155,7 +164,7 @@
     </resultMap>
 
     <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, 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_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_cause, 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 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, 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_cause, 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 from emis_waybill
     </sql>
 
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@@ -224,10 +233,19 @@
             <if test="intoWarehouseContact != null  and intoWarehouseContact != ''"> and into_warehouse_contact like concat('%', #{intoWarehouseContact}, '%')</if>
             <if test="intoWarehousePhone != null  and intoWarehousePhone != ''"> and into_warehouse_phone like concat('%', #{intoWarehousePhone}, '%')</if>
             <if test="intoWarehouseBillCode != null  and intoWarehouseBillCode != ''"> and into_warehouse_bill_code like concat('%', #{intoWarehouseBillCode}, '%')</if>
+            <if test="warehouseInNo != null  and warehouseInNo != ''"> and warehouse_in_no like concat('%', #{warehouseInNo}, '%')</if>
             <if test="customerDeliveryBeginTime != null  and customerDeliveryBeginTime != ''"> and customer_delivery_begin_time like concat('%', #{customerDeliveryBeginTime}, '%')</if>
             <if test="customerDeliveryEndTime != null  and customerDeliveryEndTime != ''"> and customer_delivery_end_time like concat('%', #{customerDeliveryEndTime}, '%')</if>
             <if test="goodsType != null  and goodsType != ''"> and goods_type like concat('%', #{goodsType}, '%')</if>
             <if test="goodsInfo != null  and goodsInfo != ''"> and goods_info like concat('%', #{goodsInfo}, '%')</if>
+            <if test="goodsPics != null  and goodsPics != ''"> and goods_pics like concat('%', #{goodsPics}, '%')</if>
+            <if test="blPrepareInFreight != null  and blPrepareInFreight != ''"> and bl_prepare_in_freight like concat('%', #{blPrepareInFreight}, '%')</if>
+            <if test="prepareInEstFee != null "> and prepare_in_est_fee = #{prepareInEstFee}</if>
+            <if test="prepareInRealFee != null "> and prepare_in_real_fee = #{prepareInRealFee}</if>
+            <if test="prepareInExpress != null  and prepareInExpress != ''"> and prepare_in_express like concat('%', #{prepareInExpress}, '%')</if>
+            <if test="prepareInBillCode != null  and prepareInBillCode != ''"> and prepare_in_bill_code like concat('%', #{prepareInBillCode}, '%')</if>
+            <if test="prepareInRemark != null  and prepareInRemark != ''"> and prepare_in_remark like concat('%', #{prepareInRemark}, '%')</if>
+            <if test="prepareInSupplier != null  and prepareInSupplier != ''"> and prepare_in_supplier like concat('%', #{prepareInSupplier}, '%')</if>
             <if test="totalWeight != null "> and total_weight like concat('%', #{totalWeight}, '%')</if>
             <if test="totalVolume != null "> and total_volume like concat('%', #{totalVolume}, '%')</if>
             <if test="parcelQty != null "> and parcel_qty like concat('%', #{parcelQty}, '%')</if>
@@ -313,25 +331,12 @@
     </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, 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_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_cause, 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, 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_cause, 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
         from emis_waybill a
         where a.id = #{id}
     </select>
 
-    <select id="selectEmisWaybillByBillCode" parameterType="string" 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, 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_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_cause, 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
-        from emis_waybill a
-        where a.bill_code = #{billCode}
-    </select>
-
-    <select id="selectEmisWaybillByOrderSn" parameterType="string" 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, 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_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_cause, 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
-        from emis_waybill a
-        where a.order_sn = #{orderSn}
-    </select>
-
-
-    <insert id="insertEmisWaybill" parameterType="EmisWaybill" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertEmisWaybill" parameterType="EmisWaybill">
         insert into emis_waybill
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -397,10 +402,19 @@
             <if test="intoWarehouseContact != null and intoWarehouseContact != ''">into_warehouse_contact,</if>
             <if test="intoWarehousePhone != null and intoWarehousePhone != ''">into_warehouse_phone,</if>
             <if test="intoWarehouseBillCode != null and intoWarehouseBillCode != ''">into_warehouse_bill_code,</if>
+            <if test="warehouseInNo != null and warehouseInNo != ''">warehouse_in_no,</if>
             <if test="customerDeliveryBeginTime != null and customerDeliveryBeginTime != ''">customer_delivery_begin_time,</if>
             <if test="customerDeliveryEndTime != null and customerDeliveryEndTime != ''">customer_delivery_end_time,</if>
             <if test="goodsType != null and goodsType != ''">goods_type,</if>
             <if test="goodsInfo != null and goodsInfo != ''">goods_info,</if>
+            <if test="goodsPics != null and goodsPics != ''">goods_pics,</if>
+            <if test="blPrepareInFreight != null and blPrepareInFreight != ''">bl_prepare_in_freight,</if>
+            <if test="prepareInEstFee != null">prepare_in_est_fee,</if>
+            <if test="prepareInRealFee != null">prepare_in_real_fee,</if>
+            <if test="prepareInExpress != null and prepareInExpress != ''">prepare_in_express,</if>
+            <if test="prepareInBillCode != null and prepareInBillCode != ''">prepare_in_bill_code,</if>
+            <if test="prepareInRemark != null and prepareInRemark != ''">prepare_in_remark,</if>
+            <if test="prepareInSupplier != null and prepareInSupplier != ''">prepare_in_supplier,</if>
             <if test="totalWeight != null">total_weight,</if>
             <if test="totalVolume != null">total_volume,</if>
             <if test="parcelQty != null">parcel_qty,</if>
@@ -546,10 +560,19 @@
             <if test="intoWarehouseContact != null and intoWarehouseContact != ''">#{intoWarehouseContact},</if>
             <if test="intoWarehousePhone != null and intoWarehousePhone != ''">#{intoWarehousePhone},</if>
             <if test="intoWarehouseBillCode != null and intoWarehouseBillCode != ''">#{intoWarehouseBillCode},</if>
+            <if test="warehouseInNo != null and warehouseInNo != ''">#{warehouseInNo},</if>
             <if test="customerDeliveryBeginTime != null and customerDeliveryBeginTime != ''">#{customerDeliveryBeginTime},</if>
             <if test="customerDeliveryEndTime != null and customerDeliveryEndTime != ''">#{customerDeliveryEndTime},</if>
             <if test="goodsType != null and goodsType != ''">#{goodsType},</if>
             <if test="goodsInfo != null and goodsInfo != ''">#{goodsInfo},</if>
+            <if test="goodsPics != null and goodsPics != ''">#{goodsPics},</if>
+            <if test="blPrepareInFreight != null and blPrepareInFreight != ''">#{blPrepareInFreight},</if>
+            <if test="prepareInEstFee != null">#{prepareInEstFee},</if>
+            <if test="prepareInRealFee != null">#{prepareInRealFee},</if>
+            <if test="prepareInExpress != null and prepareInExpress != ''">#{prepareInExpress},</if>
+            <if test="prepareInBillCode != null and prepareInBillCode != ''">#{prepareInBillCode},</if>
+            <if test="prepareInRemark != null and prepareInRemark != ''">#{prepareInRemark},</if>
+            <if test="prepareInSupplier != null and prepareInSupplier != ''">#{prepareInSupplier},</if>
             <if test="totalWeight != null">#{totalWeight},</if>
             <if test="totalVolume != null">#{totalVolume},</if>
             <if test="parcelQty != null">#{parcelQty},</if>
@@ -633,112 +656,12 @@
         </trim>
     </insert>
 
-    <!--            <if test="orderSn != null and orderSn != ''">order_sn = #{orderSn},</if>-->
-    <!--            <if test="custOrderId != null and custOrderId != ''">cust_order_id = #{custOrderId},</if>-->
-    <!--            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>-->
-
     <update id="updateEmisWaybill" parameterType="EmisWaybill">
         update emis_waybill
         <trim prefix="SET" suffixOverrides=",">
-            <if test="billCodeSub != null and billCodeSub != ''">bill_code_sub = #{billCodeSub},</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>
-            <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>
-            <if test="receiveMobile != null and receiveMobile != ''">receive_mobile = #{receiveMobile},</if>
-            <if test="receiveTel != null and receiveTel != ''">receive_tel = #{receiveTel},</if>
-            <if test="receiveCountry != null and receiveCountry != ''">receive_country = #{receiveCountry},</if>
-            <if test="receiveProvince != null and receiveProvince != ''">receive_province = #{receiveProvince},</if>
-            <if test="receiveCity != null and receiveCity != ''">receive_city = #{receiveCity},</if>
-            <if test="receiveCounty != null and receiveCounty != ''">receive_county = #{receiveCounty},</if>
-            <if test="receiveTown != null and receiveTown != ''">receive_town = #{receiveTown},</if>
-            <if test="receiveAddress != null and receiveAddress != ''">receive_address = #{receiveAddress},</if>
-            <if test="receivePostcode != null and receivePostcode != ''">receive_postcode = #{receivePostcode},</if>
-            <if test="receivePcd != null and receivePcd != ''">receive_pcd = #{receivePcd},</if>
-            <if test="sendName != null and sendName != ''">send_name = #{sendName},</if>
-            <if test="sendCompany != null and sendCompany != ''">send_company = #{sendCompany},</if>
-            <if test="sendMobile != null and sendMobile != ''">send_mobile = #{sendMobile},</if>
-            <if test="sendTel != null and sendTel != ''">send_tel = #{sendTel},</if>
-            <if test="sendCountry != null and sendCountry != ''">send_country = #{sendCountry},</if>
-            <if test="sendProvince != null and sendProvince != ''">send_province = #{sendProvince},</if>
-            <if test="sendCity != null and sendCity != ''">send_city = #{sendCity},</if>
-            <if test="sendCounty != null and sendCounty != ''">send_county = #{sendCounty},</if>
-            <if test="sendTown != null and sendTown != ''">send_town = #{sendTown},</if>
-            <if test="sendAddress != null and sendAddress != ''">send_address = #{sendAddress},</if>
-            <if test="sendPostcode != null and sendPostcode != ''">send_postcode = #{sendPostcode},</if>
-            <if test="sendPcd != null and sendPcd != ''">send_pcd = #{sendPcd},</if>
-            <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="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>
-            <if test="meterType != null and meterType != ''">meter_type = #{meterType},</if>
-            <if test="customsClear != null and customsClear != ''">customs_clear = #{customsClear},</if>
-            <if test="customsEclaration != null and customsEclaration != ''">customs_eclaration = #{customsEclaration},</if>
-            <if test="estimateDate != null">estimate_date = #{estimateDate},</if>
-            <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="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>
-            <if test="intoWarehouseCode != null and intoWarehouseCode != ''">into_warehouse_code = #{intoWarehouseCode},</if>
-            <if test="intoWarehouseName != null and intoWarehouseName != ''">into_warehouse_name = #{intoWarehouseName},</if>
-            <if test="intoWarehouseAddress != null and intoWarehouseAddress != ''">into_warehouse_address = #{intoWarehouseAddress},</if>
-            <if test="intoWarehouseContact != null and intoWarehouseContact != ''">into_warehouse_contact = #{intoWarehouseContact},</if>
-            <if test="intoWarehousePhone != null and intoWarehousePhone != ''">into_warehouse_phone = #{intoWarehousePhone},</if>
-            <if test="intoWarehouseBillCode != null and intoWarehouseBillCode != ''">into_warehouse_bill_code = #{intoWarehouseBillCode},</if>
-            <if test="customerDeliveryBeginTime != null and customerDeliveryBeginTime != ''">customer_delivery_begin_time = #{customerDeliveryBeginTime},</if>
-            <if test="customerDeliveryEndTime != null and customerDeliveryEndTime != ''">customer_delivery_end_time = #{customerDeliveryEndTime},</if>
-            <if test="goodsType != null and goodsType != ''">goods_type = #{goodsType},</if>
-            <if test="goodsInfo != null and goodsInfo != ''">goods_info = #{goodsInfo},</if>
-            <if test="totalWeight != null">total_weight = #{totalWeight},</if>
-            <if test="totalVolume != null">total_volume = #{totalVolume},</if>
-            <if test="parcelQty != null">parcel_qty = #{parcelQty},</if>
-            <if test="billWeight != null">bill_weight = #{billWeight},</if>
-            <if test="volumeWeight != null">volume_weight = #{volumeWeight},</if>
-            <if test="currency != null and currency != ''">currency = #{currency},</if>
-            <if test="settlementWeight != null">settlement_weight = #{settlementWeight},</if>
-            <if test="feeWeight != null">fee_weight = #{feeWeight},</if>
-            <if test="freight != null">freight = #{freight},</if>
-            <if test="blOverLong != null and blOverLong != ''">bl_over_long = #{blOverLong},</if>
-            <if test="blOverWeight != null and blOverWeight != ''">bl_over_weight = #{blOverWeight},</if>
-            <if test="overWeightNumber != null and overWeightNumber != ''">over_weight_number = #{overWeightNumber},</if>
-            <if test="feeRemaker != null and feeRemaker != ''">fee_remaker = #{feeRemaker},</if>
-            <if test="thirdCode != null and thirdCode != ''">third_code = #{thirdCode},</if>
-            <if test="realValue != null and realValue != ''">real_value = #{realValue},</if>
-            <if test="registerSiteCode != null and registerSiteCode != ''">register_site_code = #{registerSiteCode},</if>
-            <if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''">take_piece_employee_code = #{takePieceEmployeeCode},</if>
-            <if test="sendSiteCode != null and sendSiteCode != ''">send_site_code = #{sendSiteCode},</if>
-            <if test="sendDate != null">send_date = #{sendDate},</if>
-            <if test="dispatchSiteCode != null and dispatchSiteCode != ''">dispatch_site_code = #{dispatchSiteCode},</if>
-            <if test="destinationCode != null and destinationCode != ''">destination_code = #{destinationCode},</if>
-            <if test="destinationProvince != null and destinationProvince != ''">destination_province = #{destinationProvince},</if>
-            <if test="destinationCity != null and destinationCity != ''">destination_city = #{destinationCity},</if>
-            <if test="destinationCounty != null and destinationCounty != ''">destination_county = #{destinationCounty},</if>
-            <if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''">dispatch_underling_site_code = #{dispatchUnderlingSiteCode},</if>
-            <if test="destinationCenterCode != null and destinationCenterCode != ''">destination_center_code = #{destinationCenterCode},</if>
-            <if test="marketManCode != null and marketManCode != ''">market_man_code = #{marketManCode},</if>
-            <if test="payee != null and payee != ''">payee = #{payee},</if>
-            <if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
-            <if test="operateEmployeeCode != null and operateEmployeeCode != ''">operate_employee_code = #{operateEmployeeCode},</if>
-            <if test="blMessage != null and blMessage != ''">bl_message = #{blMessage},</if>
-            <if test="blAcceptMessage != null and blAcceptMessage != ''">bl_accept_message = #{blAcceptMessage},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
-            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="tmpUpdateEmisWaybill" parameterType="EmisWaybill">
-        update emis_waybill
-        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderSn != null and orderSn != ''">order_sn = #{orderSn},</if>
+            <if test="custOrderId != null and custOrderId != ''">cust_order_id = #{custOrderId},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
             <if test="billCodeSub != null and billCodeSub != ''">bill_code_sub = #{billCodeSub},</if>
             <if test="orderStatus != null and orderStatus != ''">order_status = #{orderStatus},</if>
             <if test="waybillStatus != null and waybillStatus != ''">waybill_status = #{waybillStatus},</if>
@@ -798,10 +721,19 @@
             <if test="intoWarehouseContact != null and intoWarehouseContact != ''">into_warehouse_contact = #{intoWarehouseContact},</if>
             <if test="intoWarehousePhone != null and intoWarehousePhone != ''">into_warehouse_phone = #{intoWarehousePhone},</if>
             <if test="intoWarehouseBillCode != null and intoWarehouseBillCode != ''">into_warehouse_bill_code = #{intoWarehouseBillCode},</if>
+            <if test="warehouseInNo != null and warehouseInNo != ''">warehouse_in_no = #{warehouseInNo},</if>
             <if test="customerDeliveryBeginTime != null and customerDeliveryBeginTime != ''">customer_delivery_begin_time = #{customerDeliveryBeginTime},</if>
             <if test="customerDeliveryEndTime != null and customerDeliveryEndTime != ''">customer_delivery_end_time = #{customerDeliveryEndTime},</if>
             <if test="goodsType != null and goodsType != ''">goods_type = #{goodsType},</if>
             <if test="goodsInfo != null and goodsInfo != ''">goods_info = #{goodsInfo},</if>
+            <if test="goodsPics != null and goodsPics != ''">goods_pics = #{goodsPics},</if>
+            <if test="blPrepareInFreight != null and blPrepareInFreight != ''">bl_prepare_in_freight = #{blPrepareInFreight},</if>
+            <if test="prepareInEstFee != null">prepare_in_est_fee = #{prepareInEstFee},</if>
+            <if test="prepareInRealFee != null">prepare_in_real_fee = #{prepareInRealFee},</if>
+            <if test="prepareInExpress != null and prepareInExpress != ''">prepare_in_express = #{prepareInExpress},</if>
+            <if test="prepareInBillCode != null and prepareInBillCode != ''">prepare_in_bill_code = #{prepareInBillCode},</if>
+            <if test="prepareInRemark != null and prepareInRemark != ''">prepare_in_remark = #{prepareInRemark},</if>
+            <if test="prepareInSupplier != null and prepareInSupplier != ''">prepare_in_supplier = #{prepareInSupplier},</if>
             <if test="totalWeight != null">total_weight = #{totalWeight},</if>
             <if test="totalVolume != null">total_volume = #{totalVolume},</if>
             <if test="parcelQty != null">parcel_qty = #{parcelQty},</if>