From 97413a9725e1441f070edc139c1002954f1f50b7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 11:28:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
index 7e722f7..d513211 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -79,7 +79,7 @@
                             when 'stepD' then 4
                             when 'stepB' then 4
                             else 1
-                     end as sort,
+                     end as sortByprocess,
                     b.sort as 'sort2'
 
 
@@ -101,7 +101,7 @@
                                                     group by opd.id) as a
                     GROUP BY process)   as sort1
         on sort1.process = a.process
-        order by sort,sort2,sort1.count,id
+        order by sortByprocess,sort1.count,sort2,id
 
     </select>
 

--
Gitblit v1.8.0