From 35706002455c370eca21e177b95e39cff78f8f5b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 15 七月 2025 08:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 12 ++++--------
1 files changed, 4 insertions(+), 8 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 a3e6861..00360af 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1168,7 +1168,6 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where position(#{process} in rwk.this_process)
- and rwk.this_process!='鍒囧壊'
and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
@@ -1178,7 +1177,7 @@
on o.order_id = od.order_id
where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0 and odpd.process!='鍒囧壊'
+ odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{process} in odpd.process)
and position(ifnull(#{inputVal}, '') in od.order_id)
and position(ifnull(#{project}, '') in o.project)
@@ -2220,7 +2219,6 @@
pp.reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where position(#{selectProcesses} in rwk.this_process)
- and rwk.this_process!='鍒囧壊'
and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
@@ -2230,7 +2228,7 @@
on o.order_id = od.order_id
where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0 and odpd.process!='鍒囧壊'
+ odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{selectProcesses} in odpd.process)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
@@ -2314,7 +2312,6 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where position(#{selectProcesses} in rwk.this_process)
- and rwk.this_process!='鍒囧壊'
and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
@@ -2324,7 +2321,7 @@
on o.order_id = od.order_id
where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0 and odpd.process!='鍒囧壊'
+ odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{selectProcesses} in odpd.process)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
@@ -2388,7 +2385,6 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where position(#{selectProcesses} in rwk.this_process)
- and rwk.this_process!='鍒囧壊'
and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
@@ -2398,7 +2394,7 @@
on o.order_id = od.order_id
where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0 and odpd.process!='鍒囧壊'
+ odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{selectProcesses} in odpd.process)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
--
Gitblit v1.8.0