From 174a6b7bc81a21f8cf950760d3e17fd5f4b7c4dd Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 21 八月 2025 11:15:03 +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 | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 a48a8db..1b4a22e 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -119,17 +119,37 @@
select
max(a.technology_number) as rowCount,
RowNum
- from sd.order_process_detail as a
+ from pp.flow_card as a
left join
(select min((@i:=@i+1)) AS RowNum,c.*
- from sd.order_glass_detail as c,
+ from pp.flow_card as c,
(SELECT @i:=-1) as d
where order_id = #{orderId}
- GROUP BY order_number
+ GROUP BY order_number,process_id
) as b
- on b.order_number = a.order_number
+ on b.id = a.id
where a.order_id = #{orderId}
- group by a.order_number
+ group by a.order_number,a.process_id
+ order by RowNum
+
+ </select>
+
+ <select id="getProcessGlassLRow">
+ select
+ max(a.technology_number) as rowCount,
+ RowNum
+ from pp.flow_card as a
+ left join
+ (select min((@i:=@i+1)) AS RowNum,c.*
+ from pp.flow_card as c,
+ (SELECT @i:=-1) as d
+ where order_id = #{orderId}
+ GROUP BY process_id
+ ) as b
+ on b.id = a.id
+ where a.order_id = #{orderId}
+ group by a.process_id
+ order by RowNum
</select>
<update id="insertByReportingWorkDetail">
--
Gitblit v1.8.0