From f33f3d3ab4f43745e0ab077be39907ab2bd8520c Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 9 Mar 2026 15:49:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=20tms-oa=E6=8E=A5=E5=8F=A3-?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E5=87=BA=E8=B4=A7=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/EmisWaybillMapper.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 8c4f45f78..b6df2f5ad 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2928,7 +2928,16 @@
and FIND_IN_SET(payment_type,#{paymentType})
and calc_fee_type=#{calcFeeType}
and cust_no like concat('%', #{custNo}, '%')
- and cust_name like concat('%', #{custName}, '%')
+
+
+ and mu.company like concat('%', #{custName}, '%')
+
+
+ and cust_name like concat('%', #{custName}, '%')
+
+
+
and trans_line_type=#{transLineType}
and FIND_IN_SET(product_type,#{productType})
and time_type like concat('%', #{timeType}, '%')
From 2d0b00d28b6abbed3dd4ca74f7d8eaef5cf623c9 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 9 Mar 2026 16:34:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=20tms-oa=E6=8E=A5=E5=8F=A3-?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E5=87=BA=E8=B4=A7=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1-=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E7=B2=BE=E7=A1=AE=E5=8C=B9=E9=85=8D=20=20tms-?=
=?UTF-8?q?=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86-=E8=B4=A7=E7=89=A9?=
=?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1-=E6=89=B9=E9=87=8F=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E7=BB=84=E6=89=B9=E6=AC=A1=E7=94=B1=E4=BA=8E=E6=A8=A1?=
=?UTF-8?q?=E7=B3=8A=E5=8C=B9=E9=85=8D=E5=AF=BC=E8=87=B4=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
emis-biz/src/main/resources/mapper/EmisSiteMapper.xml | 11 ++++++++++-
.../src/main/resources/mapper/EmisWaybillMapper.xml | 9 +++++----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index c51f3423a..acd1e12cd 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -265,7 +265,16 @@
and id = #{id}
and FIND_IN_SET(`site_code`,#{siteCode})
- and site_name like concat('%', #{siteName}, '%')
+
+
+
+ and site_name = #{siteName}
+
+
+ and site_name like concat('%', #{siteName}, '%')
+
+
+
and site_name_en like concat('%', #{siteNameEn}, '%')
and default_currency like concat('%', #{defaultCurrency}, '%')
and cut_off_time like concat('%', #{cutOffTime}, '%')
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index b6df2f5ad..9cc067921 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2929,12 +2929,13 @@
and calc_fee_type=#{calcFeeType}
and cust_no like concat('%', #{custNo}, '%')
-
- and mu.company like concat('%', #{custName}, '%')
-
+ and mu.company =#{custName}
+
- and cust_name like concat('%', #{custName}, '%')
+ and cust_name =#{custName}