From dc2d2b3555ef8d6121bf6012f693d415dc2e0ee9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 15 七月 2025 08:30:58 +0800
Subject: [PATCH] 补充更新
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 9eca656..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)
@@ -1353,7 +1352,8 @@
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
ELSE MAX( ogd.glass_child )
- END AS workProcessName
+ END AS workProcessName,
+ o.batch
FROM
reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
@@ -1436,7 +1436,8 @@
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
ELSE MAX( ogd.glass_child )
- END AS workProcessName
+ END AS workProcessName,
+ o.batch
FROM
reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
@@ -2218,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
@@ -2228,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)
@@ -2312,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
@@ -2322,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)
@@ -2386,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
@@ -2396,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