diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 8f1aff425..ece22fff3 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -666,6 +666,8 @@
and send_town=#{sendTown}
and send_address like concat('%', #{sendAddress}, '%')
and send_postcode like concat('%', #{sendPostcode}, '%')
+ and a.enterprise_name like concat('%', #{enterpriseName}, '%')
+ and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')
and payment_type=#{paymentType}
and calc_fee_type=#{calcFeeType}
and cust_no like concat('%', #{custNo}, '%')
@@ -915,6 +917,8 @@
and a.send_town=#{sendTown}
and a.send_address like concat('%', #{sendAddress}, '%')
and a.send_postcode like concat('%', #{sendPostcode}, '%')
+ and a.enterprise_name like concat('%', #{enterpriseName}, '%')
+ and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')
and a.payment_type=#{paymentType}
and a.calc_fee_type=#{calcFeeType}
and a.cust_no like concat('%', #{custNo}, '%')
@@ -1212,6 +1216,8 @@
and bl_virtual=#{blVirtual}
and send_address like concat('%', #{sendAddress}, '%')
and send_postcode like concat('%', #{sendPostcode}, '%')
+ and a.enterprise_name like concat('%', #{enterpriseName}, '%')
+ and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')
and FIND_IN_SET(payment_type,#{paymentType})
and calc_fee_type=#{calcFeeType}
and cust_no like concat('%', #{custNo}, '%')
@@ -1611,6 +1617,8 @@
and send_town=#{sendTown}
and send_address like concat('%', #{sendAddress}, '%')
and send_postcode like concat('%', #{sendPostcode}, '%')
+ and a.enterprise_name like concat('%', #{enterpriseName}, '%')
+ and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')
and FIND_IN_SET(payment_type,#{paymentType})
and calc_fee_type=#{calcFeeType}
and cust_no like concat('%', #{custNo}, '%')
@@ -2080,6 +2088,8 @@
and send_town=#{sendTown}
and send_address like concat('%', #{sendAddress}, '%')
and send_postcode like concat('%', #{sendPostcode}, '%')
+ and a.enterprise_name like concat('%', #{enterpriseName}, '%')
+ and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')
and FIND_IN_SET(payment_type,#{paymentType})
and calc_fee_type=#{calcFeeType}
and cust_no like concat('%', #{custNo}, '%')
@@ -2511,6 +2521,8 @@
and a.product_type=#{productType}
and a.send_company like concat('%', #{sendCompany}, '%')
+ and a.enterprise_name like concat('%', #{enterpriseName}, '%')
+ and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')
and a.take_piece_employee_code=#{takePieceEmployeeCode}
and a.operate_employee_code=#{operateEmployeeCode}
and register_man_code= #{registerManCode}