From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 6 ++++--
1 files changed, 4 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 066f266..2116d07 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -118,7 +118,9 @@
<select id="getGlassLRow">
select
max(a.technology_number) as rowCount,
- RowNum
+ RowNum,
+ a.order_number,
+ a.process_id
from pp.flow_card as a
left join
(select min((@i:=@i+1)) AS RowNum,c.*
@@ -130,7 +132,7 @@
on b.id = a.id
where a.order_id = #{orderId}
group by a.order_number,a.process_id
- order by RowNum
+ order by a.process_id,a.order_number
</select>
--
Gitblit v1.8.0