From 83fba12bbaf75a7cc92ebaffa30e1a0a55e2ec06 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 26 Jun 2025 14:17:38 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/EmisTransPlanRuleMapper.xml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index 9aa78faa0..c354b9964 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -28,11 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         r.manager, r.supplier_code, r.start_date, r.end_date, r.remark,
         r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site,
         l.line_name,l.trans_manager,
-        (SELECT GROUP_CONCAT(s.name) 
+        (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code)) 
          FROM emis_supplier s 
          WHERE FIND_IN_SET(s.code, r.supplier_code) 
          AND s.del_flag = '0') as supplier_name,
-        (SELECT GROUP_CONCAT(p.prod_name) 
+        (SELECT GROUP_CONCAT(p.prod_name ORDER BY FIND_IN_SET(p.prod_code, r.product_type)) 
          FROM emis_trans_product p 
          WHERE FIND_IN_SET(p.prod_code, r.product_type) 
          AND p.del_flag = '0') as product_type_name
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRulesForAllScan" parameterType="EmisTransPlanRule" resultMap="EmisTransPlanRuleResult">
         select r.id, r.line_code, r.product_type, r.start_site_code,r.next_site_code, s1.site_name as start_site_name,
         s2.site_name as next_site_name,
-        r.manager, r.supplier_code, r.start_date, r.end_date, (SELECT GROUP_CONCAT(s.name)
+        r.manager, r.supplier_code, r.start_date, r.end_date, (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code))
         FROM emis_supplier s
         WHERE FIND_IN_SET(s.code, r.supplier_code)
         AND s.del_flag = '0') as supplier_name
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEmisTransPlanRuleByLineCodes" parameterType="list" resultMap="EmisTransPlanRuleResult">
         select r.id, r.line_code, r.product_type, r.start_site_code,r.next_site_code, s1.site_name as start_site_name,
         s2.site_name as next_site_name,
-        r.manager, r.supplier_code, r.start_date, r.end_date, (SELECT GROUP_CONCAT(s.name)
+        r.manager, r.supplier_code, r.start_date, r.end_date, (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code))
         FROM emis_supplier s
         WHERE FIND_IN_SET(s.code, r.supplier_code)
         AND s.del_flag = '0') as supplier_name
@@ -146,13 +146,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectSupplierNamesByCodes" parameterType="String" resultType="String">
-        SELECT GROUP_CONCAT(s.name) 
+        SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, #{supplierCodes})) 
         FROM emis_supplier s
         WHERE FIND_IN_SET(s.code, #{supplierCodes}) AND s.del_flag = 0
     </select>
 
     <select id="selectProductTypeNamesByCodes" parameterType="String" resultType="String">
-        SELECT GROUP_CONCAT(s.prod_name)
+        SELECT GROUP_CONCAT(s.prod_name ORDER BY FIND_IN_SET(s.prod_code, #{productType}))
         FROM emis_trans_product s
         WHERE FIND_IN_SET(s.prod_code, #{productType}) AND s.del_flag = 0
     </select>