From 6d390204f55d6bbb6f9eb7a97a9ebf48bfd2c2fd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 04 八月 2025 13:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 22349ce..c6f7f0b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -582,7 +582,7 @@
AND o.create_time < #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
- and fc.quantity - odpd.reporting_work_num>0
+ and GREATEST(fc.quantity - odpd.reporting_work_num, 0)>0
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
@@ -1464,6 +1464,7 @@
rw.reviewed,
rw.examine_time,
rw.device_name,
+ o.order_type,
-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
@@ -2749,7 +2750,7 @@
AND cb.technology_number = b.technology_number
where a.processing_card>0
and a.warehousing!=2
- and (c.quantity-b.reporting_work_num_count)>0
+ and (c.quantity-b.reporting_work_num)>0
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
@@ -2839,7 +2840,7 @@
AND cb.technology_number = b.technology_number
where a.processing_card>0
and a.warehousing!=2
- and (c.quantity-b.reporting_work_num_count)>0
+ and (c.quantity-b.reporting_work_num)>0
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
--
Gitblit v1.8.0