From ac2b28d22607edb13e9c3a43b84588b87a64f7cd Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 11 Mar 2026 10:48:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?demand:=20=20=20=20=20tms-=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86-=E7=BB=84=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=B4=E6=8A=A4-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E8=A7=84=E5=88=99=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=A4=9A=E4=B8=AA=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=BC=A0=E5=A4=9A=E4=B8=AA=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=BF=85=E9=A1=BB=E6=98=AF=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=85=A8=E5=8C=85=E5=90=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/EmisTransPlanRuleMapper.xml   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index 6c2a77dc8..6be50bc18 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -96,7 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND l.trans_manager like concat('%', #{transManager}, '%')
             </if>
             <if test="productType != null  and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
-            <if test="supplierCode != null  and supplierCode != ''"> and ( FIND_IN_SET(#{supplierCode},r.supplier_code) )</if>
+            <if test="supplierCode != null and supplierCode != ''">
+                <foreach item="code" collection="supplierCode.replace(' ', '').split(',')">
+                    and FIND_IN_SET(#{code}, r.supplier_code)
+                </foreach>
+            </if>
         </where>
         order by id desc
     </select>

From f8fee6af404db7292eed2995ceb82d60df38fdfb Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 11 Mar 2026 10:53:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?demand:=20=20=20=20=20tms-=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86-=E7=BB=84=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=B4=E6=8A=A4-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E8=A7=84=E5=88=99=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=A4=9A=E4=B8=AA=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=BC=A0=E5=A4=9A=E4=B8=AA=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=BF=85=E9=A1=BB=E6=98=AF=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=85=A8=E5=8C=85=E5=90=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/EmisTransPlanRuleMapper.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index 6be50bc18..e7ef77c15 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -59,8 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="productType != null  and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
             <if test="supplierCode != null and supplierCode != ''">
-                and CONCAT(',', r.supplier_code, ',')
-                REGEXP CONCAT(',(', REPLACE(#{supplierCode}, ',', '|'), '),')
+                <foreach item="code" collection="supplierCode.replace(' ', '').split(',')">
+                    and FIND_IN_SET(#{code}, r.supplier_code)
+                </foreach>
             </if>
         </where>
         order by id desc
@@ -96,11 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND l.trans_manager like concat('%', #{transManager}, '%')
             </if>
             <if test="productType != null  and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
-            <if test="supplierCode != null and supplierCode != ''">
-                <foreach item="code" collection="supplierCode.replace(' ', '').split(',')">
-                    and FIND_IN_SET(#{code}, r.supplier_code)
-                </foreach>
-            </if>
+            <if test="supplierCode != null  and supplierCode != ''"> and ( FIND_IN_SET(#{supplierCode},r.supplier_code) )</if>
         </where>
         order by id desc
     </select>

From 23e11734842910c5e55f986d0725de0659ae41c6 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 11 Mar 2026 11:01:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?demand:=20=20=20=20=20tms-=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86-=E7=BB=84=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=B4=E6=8A=A4-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E8=A7=84=E5=88=99=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=A4=9A=E4=B8=AA=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=BC=A0=E5=A4=9A=E4=B8=AA=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=BF=85=E9=A1=BB=E6=98=AF=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=85=A8=E5=8C=85=E5=90=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index e7ef77c15..66ad527fa 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="productType != null  and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
             <if test="supplierCode != null and supplierCode != ''">
-                <foreach item="code" collection="supplierCode.replace(' ', '').split(',')">
+                <foreach item="code" collection="supplierCode.split(',')">
                     and FIND_IN_SET(#{code}, r.supplier_code)
                 </foreach>
             </if>