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 | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 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 02be7dc..1b4a22e 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -71,11 +71,35 @@
<!--鏌ヨ绛涢�夊悗鍞竴鐨勬祦绋嬪崱鍙�-->
<select id="filterOrderProcess">
- select id,process,order_number,technology_number
+ select a.* from( select id as id,process,order_number,technology_number,b.nickname,
+ case b.nickname when '' then 1
+ when null then 1
+ when 'stepC' then 2
+ when 'stepA' then 3
+ when 'stepD' then 4
+ when 'stepB' then 4
+ end as sort
+
+
from order_process_detail
+ left join (select DISTINCT basic_name,nickname from basic_data where basic_category = 'process') as b
+ on b.basic_name = process
where order_id = #{orderId}
- group by process
- order by id
+ group by process) as a
+ left join (SELECT max(count) as count,process from (SELECT count(opd1.id) as count,opd.process
+ from order_process_detail as opd
+ LEFT JOIN (SELECT id,process_id,order_number,technology_number
+ from order_process_detail
+ where order_id = #{orderId}) as opd1
+ on opd.process_id = opd1.process_id
+ and opd.order_number = opd1.order_number
+ and opd.technology_number = opd1.technology_number
+ and opd.id>=opd1.id
+ where opd.order_id =#{orderId}
+ group by opd.id) as a
+ GROUP BY process) as sort1
+ on sort1.process = a.process
+ order by sort,sort1.count,id
</select>
@@ -95,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">
@@ -191,4 +235,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