From 714ed2fda4d83bdc2da48ccfe7e42f220acbee99 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 21 十一月 2025 16:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 d3a6d6b..c1f24ab 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1516,7 +1516,9 @@
and position(#{process} in odpd.process)
and position(ifnull(#{inputVal}, '') in od.order_id)
and position(ifnull(#{project}, '') in o.project)
-
+ <if test="terminationVals != '1' and terminationVals != 1">
+ and fc.termination_status !=1
+ </if>
group by fc.process_id, fc.order_number, fc.technology_number,odpd.process
order by fc.process_id, fc.order_number, fc.technology_number
</select>
@@ -1731,7 +1733,7 @@
AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
</if>
<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
- AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}
+ and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
AND o.project REGEXP #{teamOutputDTO.project}
@@ -1884,7 +1886,7 @@
and rw.this_process regexp #{teamOutputDTO.thisProcess}
</if>
<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
- and rw.teams_groups_name regexp #{teamOutputDTO.teamsGroupsName}
+ and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
and o.project regexp #{teamOutputDTO.project}
@@ -2379,6 +2381,9 @@
and position(#{selectProcesses} in d.process)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
+ <if test="terminationVals != '1' and terminationVals != 1">
+ and fc.termination_status !=1
+ </if>
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
and o.customer_name regexp #{workInProgressDTO.customerName}
</if>
@@ -2565,7 +2570,7 @@
AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
</if>
<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
- AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}
+ and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
AND o.project REGEXP #{teamOutputDTO.project}
@@ -2702,6 +2707,9 @@
and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
+ <if test="terminationVals != '1' and terminationVals != 1">
+ and fc.termination_status !=1
+ </if>
<if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
and d.process regexp #{workInProgressDTO.thisProcess}
</if>
@@ -3157,8 +3165,13 @@
) AS cb ON cb.process_id = b.process_id
AND cb.order_sort = b.order_number
AND cb.technology_number = b.technology_number
+ left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
+ and fc.technology_number = d.technology_number
where a.processing_card>0
and a.warehousing!=2
+ <if test=" terminationVal != '1' and terminationVal != 1">
+ and termination_status !=1
+ </if>
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
@@ -3247,8 +3260,13 @@
) AS cb ON cb.process_id = b.process_id
AND cb.order_sort = b.order_number
AND cb.technology_number = b.technology_number
+ left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
+ and fc.technology_number = d.technology_number
where a.processing_card>0
and a.warehousing!=2
+ <if test="terminationVal != '1' and terminationVal != 1">
+ and termination_status !=1
+ </if>
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
@@ -3333,8 +3351,13 @@
) AS cb ON cb.process_id = b.process_id
AND cb.order_sort = b.order_number
AND cb.technology_number = b.technology_number
+ left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
+ and fc.technology_number = d.technology_number
where a.processing_card>0
and a.warehousing!=2
+ <if test="terminationVal != '1' and terminationVal != 1">
+ and termination_status !=1
+ </if>
and (c.quantity-b.reporting_work_num_count)>0
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
--
Gitblit v1.8.0