From 1a95bf38fead01bdc273af4e7d33a83703ab87b8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 24 十一月 2025 15:15:17 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 8cea4e5..7e722f7 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -78,11 +78,13 @@
when 'stepA' then 3
when 'stepD' then 4
when 'stepB' then 4
- end as sort
+ else 1
+ end as sort,
+ b.sort as 'sort2'
from order_process_detail
- left join (select DISTINCT basic_name,nickname from basic_data where basic_category = 'process') as b
+ left join (select DISTINCT basic_name,nickname,sort from basic_data where basic_category = 'process') as b
on b.basic_name = process
where order_id = #{orderId}
group by process) as a
@@ -99,7 +101,7 @@
group by opd.id) as a
GROUP BY process) as sort1
on sort1.process = a.process
- order by sort,sort1.count,id
+ order by sort,sort2,sort1.count,id
</select>
--
Gitblit v1.8.0