From a7d5b34a0fa720e5fd3dce1975e9dee94774a78e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 01 九月 2025 09:31:40 +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 | 175 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 148 insertions(+), 27 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 4892304..d9b1819 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -788,32 +788,77 @@
</select>
<select id="yieldMp">
- SELECT opd.process,
- o.order_id,
- o.customer_name,
- o.project,
- od.product_name,
- ROUND(SUM(distinct opd.reporting_work_num) * od.area, 2) as finishedArea
- ,
- ROUND(SUM(distinct opd.broken_num) * od.area, 2) as brokenArea,
- (ROUND(SUM(distinct opd.reporting_work_num) * od.area, 2) +
- ROUND(SUM(distinct opd.broken_num) * od.area, 2)) as area,
- CONCAT(ROUND(ROUND(ROUND(SUM(distinct opd.reporting_work_num) * od.area, 2) /
- (ROUND(SUM(distinct opd.reporting_work_num) * od.area, 2) +
- ROUND(SUM(distinct opd.broken_num) * od.area, 2)), 2) * 100), '%') as finished
- FROM sd.`order` AS o
- LEFT JOIN sd.order_detail AS od ON od.order_id = o.order_id
- LEFT JOIN flow_card AS fc ON fc.order_id = od.order_id
- AND fc.order_number = fc.order_number
- LEFT JOIN sd.order_process_detail AS opd ON opd.order_id = fc.order_id
- AND opd.process_id = fc.process_id
- AND opd.order_number = fc.order_number
- AND opd.technology_number = fc.technology_number
- WHERE opd.reporting_work_num > 0
- and o.create_order>0
- and DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
- AND position(#{selectProcesses} IN opd.process)
- GROUP BY opd.process, o.order_id
+ SELECT
+ t.reporting_work_time,
+ t.this_process as process,
+ t.process_id,
+ t.project,
+ t.batch,
+ SUM(t.completed_quantity) as completedQuantity,
+ SUM(t.area) as completedArea,
+ SUM(t.breakageQuantity) as breakageQuantity,
+ SUM(t.breakageArea) as breakageArea,
+ t.responsibleTeam,
+ CONCAT(ROUND(ROUND(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished,
+ t.product_name
+ FROM
+ (
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ o.project,
+ o.batch,
+ rw.process_id,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
+ IFNULL(dd.breakage_quantity,0) as breakageQuantity,
+ IFNULL(ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * dd.breakage_quantity / 1000000, 2),0) AS breakageArea,
+ IFNULL(dd.responsible_team,'') as responsibleTeam,
+ od.product_name
+
+ FROM
+ reporting_work AS rw
+ LEFT JOIN reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN damage_details as dd on dd.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
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON ogd.order_id = fc.order_id
+ AND ogd.order_number = fc.order_number
+ AND ogd.technology_number = fc.technology_number
+ LEFT JOIN sd.order_detail AS od
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN sd.`order` AS o
+ ON o.order_id = od.order_id
+ WHERE
+ o.create_order > 0
+ AND rw.reviewed_state >= 0
+ AND rwd.completed_quantity + IFNULL(dd.breakage_quantity,0)> 0
+ AND rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+ AND rw.this_process = #{selectProcesses}
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ ) t
+ GROUP BY
+ t.reporting_work_time,
+ t.this_process,
+ t.process_id,
+ t.responsibleTeam
+ ORDER BY
+ t.this_process,
+ t.process_id,
+ t.reporting_work_time
</select>
<select id="productionScheduleMp">
@@ -1417,7 +1462,15 @@
AND rwd.completed_quantity > 0
AND rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2}
- AND POSITION(#{selectProcesses} IN rw.this_process)
+ <choose>
+ <!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
+ <when test="selectProcesses != null and selectProcesses != ''">
+ AND rw.this_process = #{selectProcesses}
+ </when>
+ <!-- 鏈紶宸ュ簭锛氫笉鍔犻檺鍒讹紝鏌ユ墍鏈夛級 -->
+ <otherwise>
+ </otherwise>
+ </choose>
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
</if>
@@ -3153,4 +3206,72 @@
c.process_id
order by c.process_id, c.order_number, c.technology_number
</select>
+
+ <select id="yieldProcessMp">
+ SELECT
+
+ t.this_process as process,
+ SUM(t.completed_quantity) as completedQuantity,
+ SUM(t.area) as completedArea,
+ SUM(t.breakageQuantity) as breakageQuantity,
+ SUM(t.breakageArea) as breakageArea,
+ CONCAT(ROUND(ROUND(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished
+
+ FROM
+ (
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ o.project,
+ o.batch,
+ rw.process_id,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
+ IFNULL(dd.breakage_quantity,0) as breakageQuantity,
+ IFNULL(ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * dd.breakage_quantity / 1000000, 2),0) AS breakageArea,
+ IFNULL(dd.responsible_team,'') as responsibleTeam,
+ od.product_name
+
+
+ FROM
+ reporting_work AS rw
+ LEFT JOIN reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN damage_details as dd on dd.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
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON ogd.order_id = fc.order_id
+ AND ogd.order_number = fc.order_number
+ AND ogd.technology_number = fc.technology_number
+ LEFT JOIN sd.order_detail AS od
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN sd.`order` AS o
+ ON o.order_id = od.order_id
+ WHERE
+ o.create_order > 0
+ AND rw.reviewed_state >= 0
+ AND rwd.completed_quantity + IFNULL(dd.breakage_quantity,0)> 0
+ AND rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+
+ ) t
+
+ GROUP BY
+ t.this_process
+ ORDER BY
+ t.this_process
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0