From 845c72fc9778eaccaa079091142e0a49b1d090be Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 19 八月 2025 17:09:26 +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 | 27 ++++++++++++++++++++++-----
1 files changed, 22 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 d801a5f..7e5064d 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,18 @@
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>
<update id="insertByReportingWorkDetail">
@@ -215,4 +216,20 @@
group by e.order_number
</if>
</select>
+
+ <select id="getBehindProcess">
+ select group_concat(process) from sd.order_process_detail as a
+ where a.order_id = #{orderId}
+ and a.process_id = #{processId}
+ and a.order_number =#{orderNumber}
+ and a.technology_number =#{technologyNumber}
+ and a.id>(select id
+ from sd.order_process_detail as b
+ where b.order_id = #{orderId}
+ and b.process_id = #{processId}
+ and b.order_number =#{orderNumber}
+ and b.technology_number =#{technologyNumber}
+ and b.process = #{thisProcess}
+ )
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0