From a7748c3f762c5a68c368effdfef9c6f8e867059b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 二月 2025 09:27:03 +0800
Subject: [PATCH] 更改查询历史项目分组条件
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 a3773ea..9a5ca38 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -75,6 +75,7 @@
from order_process_detail
where order_id = #{orderId}
group by process
+ order by id
</select>
@@ -94,7 +95,7 @@
select
max(a.technology_number) as rowCount,
RowNum
- from order_process_detail as a
+ from sd.order_process_detail as a
left join
(select min((@i:=@i+1)) AS RowNum,c.*
from sd.order_glass_detail as c,
@@ -122,4 +123,45 @@
and a.process=#{thisProcess}
</update>
+
+ <select id="filterOrderProcessCollect">
+ select a.id,process,order_number,technology_number,a.order_id
+ from order_process_detail as a
+ left join `order` as b on a.order_id=b.order_id
+ where b.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ group by process
+
+ </select>
+
+ <select id="getGlassLRowCollect">
+ select
+ max(a.technology_number) as rowCount,
+ RowNum
+ from order_process_detail as a
+ left join
+ (select min((@i:=@i+1)) AS RowNum,c.*
+ from sd.order_glass_detail as c
+ left join sd.`order` o2 on c.order_id = o2.order_id,
+ (SELECT @i:=-1) as d
+ where o2.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ GROUP BY order_number
+ ) as b
+ on b.order_number = a.order_number
+ left join sd.`order` o on a.order_id = o.order_id
+ where o.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ group by a.order_number
+ </select>
+
+ <select id="selectNextProcess">
+ select a.process from sd.order_process_detail as a,
+ (select id,process from sd.order_process_detail
+ where process_id=#{processId}
+ and technology_number=#{technologyNumber}
+ and process=#{thisProcess}
+ group by process) as b
+ where a.id = b.id + 1
+ and a.process_id=#{processId}
+ and a.technology_number=#{technologyNumber}
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0