From 59d34cb3d22f4f99805f78997b7229a46bec4fe5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 28 七月 2025 17:05:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 1122a2f..02be7dc 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -129,6 +129,7 @@
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}
+ and position(#{orderId} in b.order_id)
group by process
</select>
@@ -144,11 +145,12 @@
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}
+ and position(#{orderId} in o2.order_id)
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}
+ where o.create_time BETWEEN #{selectTime1} and #{selectTime2} and position(#{orderId} in o.order_id)
group by a.order_number
</select>
@@ -156,12 +158,14 @@
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 position(technology_number in #{technologyNumber})
+ and order_number=#{orderNumber}
and process=#{thisProcess}
group by process) as b
where a.id = b.id + 1
and a.process_id=#{processId}
- and a.technology_number=#{technologyNumber}
+ and a.order_number=#{orderNumber}
+ and position(a.technology_number in #{technologyNumber})
</select>
--
Gitblit v1.8.0