From 0dda77f2d5f24479c6e5f5526f31c3f775bedd7d Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 25 Aug 2025 17:03:29 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20tms/app=E8=BF=90=E5=8D=95=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E3=80=81?=
 =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BD=95=E5=85=A5=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=20tms/app=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E3=80=81=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E3=80=81=E7=BD=91?=
 =?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E5=90=8E=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0/=E6=96=B0=E5=A2=9E=E5=88=B0=E5=AF=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BA=BA=E4=BF=A1=E6=81=AF=20=20=20tms-=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86-=E5=AF=84=E4=BB=B6=E4=BA=BA?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80-=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=B7=BB=E5=8A=A0=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../src/main/resources/mapper/EmisWaybillMapper.xml  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 @@
             <if test="sendTown != null  and sendTown != ''"> and send_town=#{sendTown}</if>
             <if test="sendAddress != null  and sendAddress != ''"> and send_address like concat('%', #{sendAddress}, '%')</if>
             <if test="sendPostcode != null  and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseTaxId != null  and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
             <if test="paymentType != null  and paymentType != ''"> and payment_type=#{paymentType}</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
             <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
@@ -915,6 +917,8 @@
             <if test="sendTown != null  and sendTown != ''"> and a.send_town=#{sendTown}</if>
             <if test="sendAddress != null  and sendAddress != ''"> and a.send_address like concat('%', #{sendAddress}, '%')</if>
             <if test="sendPostcode != null  and sendPostcode != ''"> and a.send_postcode like concat('%', #{sendPostcode}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseTaxId != null  and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
             <if test="paymentType != null  and paymentType != ''"> and a.payment_type=#{paymentType}</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and a.calc_fee_type=#{calcFeeType}</if>
             <if test="custNo != null  and custNo != ''"> and a.cust_no like concat('%', #{custNo}, '%')</if>
@@ -1212,6 +1216,8 @@
             <if test="blVirtual ==1"> and bl_virtual=#{blVirtual}</if>
             <if test="sendAddress != null  and sendAddress != ''"> and send_address like concat('%', #{sendAddress}, '%')</if>
             <if test="sendPostcode != null  and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseTaxId != null  and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
             <if test="paymentType != null  and paymentType != ''"> and FIND_IN_SET(payment_type,#{paymentType})</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
             <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
@@ -1611,6 +1617,8 @@
             <if test="sendTown != null  and sendTown != ''"> and send_town=#{sendTown}</if>
             <if test="sendAddress != null  and sendAddress != ''"> and send_address like concat('%', #{sendAddress}, '%')</if>
             <if test="sendPostcode != null  and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseTaxId != null  and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
             <if test="paymentType != null  and paymentType != ''"> and FIND_IN_SET(payment_type,#{paymentType})</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
             <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
@@ -2080,6 +2088,8 @@
             <if test="sendTown != null  and sendTown != ''"> and send_town=#{sendTown}</if>
             <if test="sendAddress != null  and sendAddress != ''"> and send_address like concat('%', #{sendAddress}, '%')</if>
             <if test="sendPostcode != null  and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseTaxId != null  and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
             <if test="paymentType != null  and paymentType != ''"> and FIND_IN_SET(payment_type,#{paymentType})</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
             <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
@@ -2511,6 +2521,8 @@
             <if test="productType != null  and productType != ''"> and a.product_type=#{productType}</if>
 
             <if test="sendCompany != null  and sendCompany != ''"> and a.send_company like concat('%', #{sendCompany}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseTaxId != null  and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
             <if test="takePieceEmployeeCode != null  and takePieceEmployeeCode != ''"> and a.take_piece_employee_code=#{takePieceEmployeeCode}</if>
             <if test="operateEmployeeCode != null  and operateEmployeeCode != ''"> and a.operate_employee_code=#{operateEmployeeCode}</if>
             <if test="registerManCode != null  and registerManCode != ''"> and register_man_code= #{registerManCode}</if>