diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 2ded16cc0..0acfe09d4 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -212,31 +212,35 @@
-
-
- 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
-
-
+
+
+
+
+
+ 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_center_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, bl_sign, 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, bl_special_goods, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill
+
+
+
-
+
+
+
@@ -610,7 +616,7 @@
print_man_code,
print_site,
print_date,
- print_count,
+ print_count,
bl_disp_fd,
transfer_code,
transfer_billcode,
@@ -624,6 +630,7 @@
register_man_code,
take_piece_employee_code,
send_site_code,
+ send_center_code,
send_date,
dispatch_man_code,
dispatch_date,
@@ -648,10 +655,11 @@
bl_message,
bl_accept_message,
bl_gen_subbill,
+ bl_sign,
sign_man,
sign_man_code,
sign_site_code,
- sign_date,
+ sign_date,
bill_pic_send_rmk,
bill_pic_dispatch_rmk,
timezone_offset,
@@ -660,6 +668,7 @@
payment_remark,
order_remark,
data_from,
+ bl_special_goods,
remark,
del_flag,
create_by,
@@ -777,7 +786,7 @@
#{printManCode},
#{printSite},
#{printDate},
- #{printCount},
+ #{printCount},
#{blDispFd},
#{transferCode},
#{transferBillcode},
@@ -791,6 +800,7 @@
#{registerManCode},
#{takePieceEmployeeCode},
#{sendSiteCode},
+ #{sendCenterCode},
#{sendDate},
#{dispatchManCode},
#{dispatchDate},
@@ -815,10 +825,11 @@
#{blMessage},
#{blAcceptMessage},
#{blGenSubbill},
+ #{blSign},
#{signMan},
#{signManCode},
#{signSiteCode},
- #{signDate},
+ #{signDate},
#{billPicSendRmk},
#{billPicDispatchRmk},
#{timezoneOffset},
@@ -827,6 +838,7 @@
#{paymentRemark},
#{orderRemark},
#{dataFrom},
+ #{blSpecialGoods},
#{remark},
#{delFlag},
#{createBy},
@@ -838,12 +850,13 @@
-
update emis_waybill
cust_order_id = #{custOrderId},
bill_code_sub = #{billCodeSub},
+ order_status = #{orderStatus},
+ waybill_status = #{waybillStatus},
order_type = #{orderType},
order_date = #{orderDate},
user_id = #{userId},
@@ -944,7 +957,7 @@
print_man_code = #{printManCode},
print_site = #{printSite},
print_date = #{printDate},
- print_count = #{printCount},
+ print_count = #{printCount},
bl_disp_fd = #{blDispFd},
transfer_code = #{transferCode},
transfer_billcode = #{transferBillcode},
@@ -958,6 +971,7 @@
register_man_code = #{registerManCode},
take_piece_employee_code = #{takePieceEmployeeCode},
send_site_code = #{sendSiteCode},
+ send_center_code = #{sendCenterCode},
send_date = #{sendDate},
dispatch_man_code = #{dispatchManCode},
dispatch_date = #{dispatchDate},
@@ -982,10 +996,11 @@
bl_message = #{blMessage},
bl_accept_message = #{blAcceptMessage},
bl_gen_subbill = #{blGenSubbill},
+ bl_sign = #{blSign},
sign_man = #{signMan},
sign_man_code = #{signManCode},
sign_site_code = #{signSiteCode},
- sign_date = #{signDate},
+ sign_date = #{signDate},
bill_pic_send_rmk = #{billPicSendRmk},
bill_pic_dispatch_rmk = #{billPicDispatchRmk},
timezone_offset = #{timezoneOffset},
@@ -994,6 +1009,7 @@
payment_remark = #{paymentRemark},
order_remark = #{orderRemark},
data_from = #{dataFrom},
+ bl_special_goods = #{blSpecialGoods},
remark = #{remark},
del_flag = #{delFlag},
create_by = #{createBy},
@@ -1006,173 +1022,6 @@
where id = #{id}
-
- update emis_waybill
-
- cust_order_id = #{custOrderId},
- bill_code_sub = #{billCodeSub},
- order_type = #{orderType},
- order_date = #{orderDate},
- user_id = #{userId},
- customer_code = #{customerCode},
- customer_name = #{customerName},
- open_id = #{openId},
- receive_name = #{receiveName},
- receive_company = #{receiveCompany},
- receive_mobile = #{receiveMobile},
- receive_tel = #{receiveTel},
- receive_country = #{receiveCountry},
- receive_province = #{receiveProvince},
- receive_city = #{receiveCity},
- receive_county = #{receiveCounty},
- receive_town = #{receiveTown},
- receive_address = #{receiveAddress},
- receive_postcode = #{receivePostcode},
- receive_pcd = #{receivePcd},
- send_name = #{sendName},
- send_company = #{sendCompany},
- send_mobile = #{sendMobile},
- send_tel = #{sendTel},
- send_country = #{sendCountry},
- send_province = #{sendProvince},
- send_city = #{sendCity},
- send_county = #{sendCounty},
- send_town = #{sendTown},
- send_address = #{sendAddress},
- send_postcode = #{sendPostcode},
- send_pcd = #{sendPcd},
- payment_type = #{paymentType},
- calc_fee_type = #{calcFeeType},
- cust_no = #{custNo},
- cust_name = #{custName},
- trans_line_type = #{transLineType},
- product_type = #{productType},
- time_type = #{timeType},
- meter_type = #{meterType},
- carry_type = #{carryType},
- customs_clear = #{customsClear},
- customs_eclaration = #{customsEclaration},
- estimate_date = #{estimateDate},
- pack_type = #{packType},
- dispatch_method = #{dispatchMethod},
- pickup_method = #{pickupMethod},
- pick_start_date = #{pickStartDate},
- pick_finish_date = #{pickFinishDate},
- pick_fail_reason = #{pickFailReason},
- into_warehouse_code = #{intoWarehouseCode},
- into_warehouse_name = #{intoWarehouseName},
- into_warehouse_address = #{intoWarehouseAddress},
- into_warehouse_contact = #{intoWarehouseContact},
- into_warehouse_phone = #{intoWarehousePhone},
- into_warehouse_bill_code = #{intoWarehouseBillCode},
- warehouse_in_no = #{warehouseInNo},
- customer_delivery_begin_time = #{customerDeliveryBeginTime},
- customer_delivery_end_time = #{customerDeliveryEndTime},
- goods_type = #{goodsType},
- goods_info = #{goodsInfo},
- goods_pics = #{goodsPics},
- bl_prepare_in_freight = #{blPrepareInFreight},
- prepare_in_est_fee = #{prepareInEstFee},
- prepare_in_real_fee = #{prepareInRealFee},
- prepare_in_express = #{prepareInExpress},
- prepare_in_bill_code = #{prepareInBillCode},
- prepare_in_remark = #{prepareInRemark},
- prepare_in_supplier = #{prepareInSupplier},
- total_weight = #{totalWeight},
- total_volume = #{totalVolume},
- parcel_qty = #{parcelQty},
- bill_weight = #{billWeight},
- volume_weight = #{volumeWeight},
- currency = #{currency},
- settlement_weight = #{settlementWeight},
- scan_weight = #{scanWeight},
- fee_weight = #{feeWeight},
- freight = #{freight},
- real_payment_type = #{realPaymentType},
- real_fee = #{realFee},
- bl_special_quote = #{blSpecialQuote},
- bl_over_long = #{blOverLong},
- bl_bill = #{blBill},
- bl_bill_text = #{blBillText},
- bl_over_weight = #{blOverWeight},
- over_weight_number = #{overWeightNumber},
- fee_remaker = #{feeRemaker},
- third_code = #{thirdCode},
- real_value = #{realValue},
- bl_insure = #{blInsure},
- insure_value = #{insureValue},
- insure_value_currency = #{insureValueCurrency},
- insure_fee_currency = #{insureFeeCurrency},
- insure_fee = #{insureFee},
- insure_remark = #{insureRemark},
- insure_site_code = #{insureSiteCode},
- insure_date = #{insureDate},
- bl_print = #{blPrint},
- print_man_code = #{printManCode},
- print_site = #{printSite},
- print_date = #{printDate},
- print_count = #{printCount},
- bl_disp_fd = #{blDispFd},
- transfer_code = #{transferCode},
- transfer_billcode = #{transferBillcode},
- disp_fd_date = #{dispFdDate},
- disp_fd_reason = #{dispFdReason},
- current_site_code = #{currentSiteCode},
- next_site_code = #{nextSiteCode},
- last_site_code = #{lastSiteCode},
- register_site_code = #{registerSiteCode},
- register_date = #{registerDate},
- register_man_code = #{registerManCode},
- take_piece_employee_code = #{takePieceEmployeeCode},
- send_site_code = #{sendSiteCode},
- send_date = #{sendDate},
- dispatch_man_code = #{dispatchManCode},
- dispatch_date = #{dispatchDate},
- dispatch_site_code = #{dispatchSiteCode},
- produce_bill_date = #{produceBillDate},
- produce_bill_site_code = #{produceBillSiteCode},
- produce_bill_man_code = #{produceBillManCode},
- destination_code = #{destinationCode},
- destination_province = #{destinationProvince},
- destination_city = #{destinationCity},
- destination_county = #{destinationCounty},
- dispatch_underling_site_code = #{dispatchUnderlingSiteCode},
- destination_center_code = #{destinationCenterCode},
- market_man_code = #{marketManCode},
- payee = #{payee},
- salesmen = #{salesmen},
- operate_employee_code = #{operateEmployeeCode},
- bl_is_question = #{blIsQuestion},
- problem_type = #{problemType},
- problem_cause = #{problemCause},
- problem_delay_days = #{problemDelayDays},
- bl_message = #{blMessage},
- bl_accept_message = #{blAcceptMessage},
- bl_gen_subbill = #{blGenSubbill},
- sign_man = #{signMan},
- sign_man_code = #{signManCode},
- sign_site_code = #{signSiteCode},
- sign_date = #{signDate},
- bill_pic_send_rmk = #{billPicSendRmk},
- bill_pic_dispatch_rmk = #{billPicDispatchRmk},
- timezone_offset = #{timezoneOffset},
- payment_status = #{paymentStatus},
- payment_date = #{paymentDate},
- payment_remark = #{paymentRemark},
- order_remark = #{orderRemark},
- data_from = #{dataFrom},
- remark = #{remark},
- del_flag = #{delFlag},
- create_by = #{createBy},
- create_time = #{createTime},
- update_by = #{updateBy},
- update_time = #{updateTime},
- create_site = #{createSite},
- update_site = #{updateSite},
-
- where bill_code=#{billCode}
-
-
update emis_waybill set bl_print='1',print_man_code=#{printManCode},print_site=#{printSite},print_date=now(),print_count=print_count+1 where bill_code=#{billCode}
@@ -1206,16 +1055,10 @@
-
-
-
-
update emis_waybill set waybill_status=#{waybillStatus} where bill_code=#{billCode}
-
-
update emis_waybill set order_status=#{orderStatus} where bill_code=#{billCode}