diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 081424f1f..c6b91b622 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -750,150 +750,150 @@
a.del_flag='0' and a.order_type='0'
and a.id = #{id}
- and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') )
- and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )
- and order_type=#{orderType}
- and cust_order_id=#{custOrderId}
- and bill_code_sub like concat('%', #{billCodeSub}, '%')
- and order_status=#{orderStatus}
- and waybill_status=#{waybillStatus}
- and order_type=#{orderType}
- and order_date = #{orderDate}
- and user_id = #{userId}
- and customer_code=#{customerCode}
- and customer_name like concat('%', #{customerName}, '%')
- and open_id like concat('%', #{openId}, '%')
- and receive_name like concat('%', #{receiveName}, '%')
- and receive_company like concat('%', #{receiveCompany}, '%')
- and receive_mobile like concat('%', #{receiveMobile}, '%')
- and receive_tel like concat('%', #{receiveTel}, '%')
- and receive_country=#{receiveCountry}
- and receive_province=#{receiveProvince}
- and receive_city=#{receiveCity}
- and receive_county=#{receiveCounty}
- and receive_town=#{receiveTown}
- and receive_address like concat('%', #{receiveAddress}, '%')
- and receive_postcode like concat('%', #{receivePostcode}, '%')
- and receive_pcd like concat('%', #{receivePcd}, '%')
- and send_name like concat('%', #{sendName}, '%')
- and send_company like concat('%', #{sendCompany}, '%')
- and send_mobile like concat('%', #{sendMobile}, '%')
- and send_tel like concat('%', #{sendTel}, '%')
- and send_country=#{sendCountry}
- and send_province=#{sendProvince}
- and send_city=#{sendCity}
- and send_county=#{sendCounty}
- and send_town=#{sendTown}
- and send_address like concat('%', #{sendAddress}, '%')
- and send_postcode like concat('%', #{sendPostcode}, '%')
- and payment_type=#{paymentType}
- and calc_fee_type=#{calcFeeType}
- and cust_no like concat('%', #{custNo}, '%')
- and cust_name like concat('%', #{custName}, '%')
- and trans_line_type=#{transLineType}
- and product_type=#{productType}
- and time_type like concat('%', #{timeType}, '%')
- and meter_type like concat('%', #{meterType}, '%')
- and carry_type like concat('%', #{carryType}, '%')
- and customs_clear=#{customsClear}
- and customs_eclaration=#{customsEclaration}
- and estimate_date = #{estimateDate}
- and FIND_IN_SET(#{packType},pack_type)
- and dispatch_method=#{dispatchMethod}
- and pickup_method= #{pickupMethod}
- and pick_start_date = #{pickStartDate}
- and pick_finish_date = #{pickFinishDate}
- and pick_fail_reason like concat('%', #{pickFailReason}, '%')
- and into_warehouse_code like concat('%', #{intoWarehouseCode}, '%')
- and into_warehouse_name like concat('%', #{intoWarehouseName}, '%')
- and into_warehouse_address like concat('%', #{intoWarehouseAddress}, '%')
- and into_warehouse_contact like concat('%', #{intoWarehouseContact}, '%')
- and into_warehouse_phone like concat('%', #{intoWarehousePhone}, '%')
- and into_warehouse_bill_code like concat('%', #{intoWarehouseBillCode}, '%')
- and warehouse_in_no like concat('%', #{warehouseInNo}, '%')
- and customer_delivery_begin_time like concat('%', #{customerDeliveryBeginTime}, '%')
- and customer_delivery_end_time like concat('%', #{customerDeliveryEndTime}, '%')
- and goods_info like concat('%', #{goodsInfo}, '%')
- and bl_prepare_in_freight=#{blPrepareInFreight}
- and prepare_in_est_fee = #{prepareInEstFee}
- and prepare_in_real_fee = #{prepareInRealFee}
- and prepare_in_express like concat('%', #{prepareInExpress}, '%')
- and prepare_in_bill_code like concat('%', #{prepareInBillCode}, '%')
- and prepare_in_remark like concat('%', #{prepareInRemark}, '%')
- and prepare_in_supplier like concat('%', #{prepareInSupplier}, '%')
- and total_weight = #{totalWeight}
- and total_volume = #{totalVolume}
- and parcel_qty = #{parcelQty}
- and bill_weight = #{billWeight}
- and volume_weight = #{volumeWeight}
- and currency= #{currency}
- and settlement_weight = #{settlementWeight}
- and scan_weight = #{scanWeight}
- and fee_weight = #{feeWeight}
- and freight = #{freight}
- and real_payment_type=#{realPaymentType}
- and real_fee = #{realFee}
- and bl_special_quote=#{blSpecialQuote}
- and bl_over_long=#{blOverLong}
- and bl_bill=#{blBill}
- and bl_bill_text like concat('%', #{blBillText}, '%')
- and bl_over_weight like concat('%', #{blOverWeight}, '%')
- and over_weight_number like concat('%', #{overWeightNumber}, '%')
- and fee_remark like concat('%', #{feeRemark}, '%')
- and third_code like concat('%', #{thirdCode}, '%')
- and real_value like concat('%', #{realValue}, '%')
- and bl_insure= #{blInsure}
- and insure_value like concat('%', #{insureValue}, '%')
- and insure_value_currency like concat('%', #{insureValueCurrency}, '%')
- and insure_fee_currency like concat('%', #{insureFeeCurrency}, '%')
- and insure_fee = #{insureFee}
- and insure_remark like concat('%', #{insureRemark}, '%')
- and insure_site_code=#{insureSiteCode}
- and bl_print=#{blPrint}
- and print_man_code like concat('%', #{printManCode}, '%')
- and print_site=#{printSite},
- and print_date like concat('%', #{printDate}, '%')
- and bl_disp_fd=#{blDispFd}
- and transfer_code like concat('%', #{transferCode}, '%')
- and transfer_billcode like concat('%', #{transferBillcode}, '%')
- and disp_fd_date = #{dispFdDate}
- and disp_fd_reason like concat('%', #{dispFdReason}, '%')
- and current_site_code=#{currentSiteCode}
- and next_site_code= #{nextSiteCode}
- and last_site_code=#{lastSiteCode}
- and register_site_code=#{registerSiteCode}
- and register_date = #{registerDate}
- and register_man_code= #{registerManCode}
- and take_piece_employee_code=#{takePieceEmployeeCode}
- and send_date = #{sendDate}
- and dispatch_man_code=#{dispatchManCode}
- and dispatch_site_code=#{dispatchSiteCode}
- and produce_bill_date = #{produceBillDate}
- and produce_bill_site_code=#{produceBillSiteCode}
- and produce_bill_man_code=#{produceBillManCode}
- and destination_code =#{destinationCode}
- and destination_province=#{destinationProvince}
- and destination_city=#{destinationCity}
- and destination_county=#{destinationCounty}
- and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}
- and destination_center_code=#{destinationCenterCode}
- and market_man_code = #{marketManCode}
+ and ( FIND_IN_SET(a.`order_sn`,#{orderSn}) or a.order_sn like concat('%', #{orderSn}, '%') )
+ and ( FIND_IN_SET(a.`bill_code`,#{billCode}) or a.bill_code like concat('%', #{billCode}, '%') )
+ and a.order_type=#{orderType}
+ and a.cust_order_id=#{custOrderId}
+ and a.bill_code_sub like concat('%', #{billCodeSub}, '%')
+ and a.order_status=#{orderStatus}
+ and a.waybill_status=#{waybillStatus}
+ and a.order_type=#{orderType}
+ and a.order_date = #{orderDate}
+ and a.user_id = #{userId}
+ and a.customer_code=#{customerCode}
+ and a.customer_name like concat('%', #{customerName}, '%')
+ and a.open_id like concat('%', #{openId}, '%')
+ and a.receive_name like concat('%', #{receiveName}, '%')
+ and a.receive_company like concat('%', #{receiveCompany}, '%')
+ and a.receive_mobile like concat('%', #{receiveMobile}, '%')
+ and a.receive_tel like concat('%', #{receiveTel}, '%')
+ and a.receive_country=#{receiveCountry}
+ and a.receive_province=#{receiveProvince}
+ and a.receive_city=#{receiveCity}
+ and a.receive_county=#{receiveCounty}
+ and a.receive_town=#{receiveTown}
+ and a.receive_address like concat('%', #{receiveAddress}, '%')
+ and a.receive_postcode like concat('%', #{receivePostcode}, '%')
+ and a.receive_pcd like concat('%', #{receivePcd}, '%')
+ and a.send_name like concat('%', #{sendName}, '%')
+ and a.send_company like concat('%', #{sendCompany}, '%')
+ and a.send_mobile like concat('%', #{sendMobile}, '%')
+ and a.send_tel like concat('%', #{sendTel}, '%')
+ and a.send_country=#{sendCountry}
+ and a.send_province=#{sendProvince}
+ and a.send_city=#{sendCity}
+ and a.send_county=#{sendCounty}
+ and a.send_town=#{sendTown}
+ and a.send_address like concat('%', #{sendAddress}, '%')
+ and a.send_postcode like concat('%', #{sendPostcode}, '%')
+ and a.payment_type=#{paymentType}
+ and a.calc_fee_type=#{calcFeeType}
+ and a.cust_no like concat('%', #{custNo}, '%')
+ and a.cust_name like concat('%', #{custName}, '%')
+ and a.trans_line_type=#{transLineType}
+ and a.product_type=#{productType}
+ and a.time_type like concat('%', #{timeType}, '%')
+ and a.meter_type like concat('%', #{meterType}, '%')
+ and a.carry_type like concat('%', #{carryType}, '%')
+ and a.customs_clear=#{customsClear}
+ and a.customs_eclaration=#{customsEclaration}
+ and a.estimate_date = #{estimateDate}
+ and FIND_IN_SET(#{packType},a.pack_type)
+ and a.dispatch_method=#{dispatchMethod}
+ and a.pickup_method= #{pickupMethod}
+ and a.pick_start_date = #{pickStartDate}
+ and a.pick_finish_date = #{pickFinishDate}
+ and a.pick_fail_reason like concat('%', #{pickFailReason}, '%')
+ and a.into_warehouse_code like concat('%', #{intoWarehouseCode}, '%')
+ and a.into_warehouse_name like concat('%', #{intoWarehouseName}, '%')
+ and a.into_warehouse_address like concat('%', #{intoWarehouseAddress}, '%')
+ and a.into_warehouse_contact like concat('%', #{intoWarehouseContact}, '%')
+ and a.into_warehouse_phone like concat('%', #{intoWarehousePhone}, '%')
+ and a.into_warehouse_bill_code like concat('%', #{intoWarehouseBillCode}, '%')
+ and a.warehouse_in_no like concat('%', #{warehouseInNo}, '%')
+ and a.customer_delivery_begin_time like concat('%', #{customerDeliveryBeginTime}, '%')
+ and a.customer_delivery_end_time like concat('%', #{customerDeliveryEndTime}, '%')
+ and a.goods_info like concat('%', #{goodsInfo}, '%')
+ and a.bl_prepare_in_freight=#{blPrepareInFreight}
+ and a.prepare_in_est_fee = #{prepareInEstFee}
+ and a.prepare_in_real_fee = #{prepareInRealFee}
+ and a.prepare_in_express like concat('%', #{prepareInExpress}, '%')
+ and a.prepare_in_bill_code like concat('%', #{prepareInBillCode}, '%')
+ and a.prepare_in_remark like concat('%', #{prepareInRemark}, '%')
+ and a.prepare_in_supplier like concat('%', #{prepareInSupplier}, '%')
+ and a.total_weight = #{totalWeight}
+ and a.total_volume = #{totalVolume}
+ and a.parcel_qty = #{parcelQty}
+ and a.bill_weight = #{billWeight}
+ and a.volume_weight = #{volumeWeight}
+ and a.currency= #{currency}
+ and a.settlement_weight = #{settlementWeight}
+ and a.scan_weight = #{scanWeight}
+ and a.fee_weight = #{feeWeight}
+ and a.freight = #{freight}
+ and a.real_payment_type=#{realPaymentType}
+ and a.real_fee = #{realFee}
+ and a.bl_special_quote=#{blSpecialQuote}
+ and a.bl_over_long=#{blOverLong}
+ and a.bl_bill=#{blBill}
+ and a.bl_bill_text like concat('%', #{blBillText}, '%')
+ and a.bl_over_weight like concat('%', #{blOverWeight}, '%')
+ and a.over_weight_number like concat('%', #{overWeightNumber}, '%')
+ and a.fee_remark like concat('%', #{feeRemark}, '%')
+ and a.third_code like concat('%', #{thirdCode}, '%')
+ and a.real_value like concat('%', #{realValue}, '%')
+ and a.bl_insure= #{blInsure}
+ and a.insure_value like concat('%', #{insureValue}, '%')
+ and a.insure_value_currency like concat('%', #{insureValueCurrency}, '%')
+ and a.insure_fee_currency like concat('%', #{insureFeeCurrency}, '%')
+ and a.insure_fee = #{insureFee}
+ and a.insure_remark like concat('%', #{insureRemark}, '%')
+ and a.insure_site_code=#{insureSiteCode}
+ and a.bl_print=#{blPrint}
+ and a.print_man_code like concat('%', #{printManCode}, '%')
+ and a.print_site=#{printSite},
+ and a.print_date like concat('%', #{printDate}, '%')
+ and a.bl_disp_fd=#{blDispFd}
+ and a.transfer_code like concat('%', #{transferCode}, '%')
+ and a.transfer_billcode like concat('%', #{transferBillcode}, '%')
+ and a.disp_fd_date = #{dispFdDate}
+ and a.disp_fd_reason like concat('%', #{dispFdReason}, '%')
+ and a.current_site_code=#{currentSiteCode}
+ and a.next_site_code= #{nextSiteCode}
+ and a.last_site_code=#{lastSiteCode}
+ and a.register_site_code=#{registerSiteCode}
+ and a.register_date = #{registerDate}
+ and a.register_man_code= #{registerManCode}
+ and a.take_piece_employee_code=#{takePieceEmployeeCode}
+ and a.send_date = #{sendDate}
+ and a.dispatch_man_code=#{dispatchManCode}
+ and a.dispatch_site_code=#{dispatchSiteCode}
+ and a.produce_bill_date = #{produceBillDate}
+ and a.produce_bill_site_code=#{produceBillSiteCode}
+ and a.produce_bill_man_code=#{produceBillManCode}
+ and a.destination_code =#{destinationCode}
+ and a.destination_province=#{destinationProvince}
+ and a.destination_city=#{destinationCity}
+ and a.destination_county=#{destinationCounty}
+ and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}
+ and a.destination_center_code=#{destinationCenterCode}
+ and a.market_man_code = #{marketManCode}
- and operate_employee_code=#{operateEmployeeCode}
- and bl_is_question=#{blIsQuestion}
- and problem_type=#{problemType}
- and problem_cause like concat('%', #{problemCause}, '%')
- and problem_delay_days = #{problemDelayDays}
- and bl_message=#{blMessage}
- and bl_accept_message=#{blAcceptMessage}
- and bl_gen_subbill=#{blGenSubbill}
- and sign_man like concat('%', #{signMan}, '%')
- and sign_man_code=#{signManCode}
- and sign_site_code=#{signSiteCode}
- and payment_status =#{paymentStatus}
- and payment_date = #{paymentDate}
- and payment_remark like concat('%', #{paymentRemark}, '%')
- and order_remark like concat('%', #{orderRemark}, '%')
+ and a.operate_employee_code=#{operateEmployeeCode}
+ and a.bl_is_question=#{blIsQuestion}
+ and a.problem_type=#{problemType}
+ and a.problem_cause like concat('%', #{problemCause}, '%')
+ and a.problem_delay_days = #{problemDelayDays}
+ and a.bl_message=#{blMessage}
+ and a.bl_accept_message=#{blAcceptMessage}
+ and a.bl_gen_subbill=#{blGenSubbill}
+ and a.sign_man like concat('%', #{signMan}, '%')
+ and a.sign_man_code=#{signManCode}
+ and a.sign_site_code=#{signSiteCode}
+ and a.payment_status =#{paymentStatus}
+ and a.payment_date = #{paymentDate}
+ and a.payment_remark like concat('%', #{paymentRemark}, '%')
+ and a.order_remark like concat('%', #{orderRemark}, '%')
and a.remark like concat('%', #{remark}, '%')
and a.create_by= #{createBy}
@@ -1175,8 +1175,8 @@
and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}
and destination_center_code=#{destinationCenterCode}
and market_man_code = #{marketManCode}
- and payee=#{payee}
- and salesmen like concat('%', #{salesmen}, '%')
+ and a.payee=#{payee}
+ and a.salesmen like concat('%', #{salesmen}, '%')
and operate_employee_code=#{operateEmployeeCode}
and bl_is_question=#{blIsQuestion}
and problem_type=#{problemType}