From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 70 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 1 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 cc3d8b4..d9b1819 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -799,7 +799,7 @@
SUM(t.breakageQuantity) as breakageQuantity,
SUM(t.breakageArea) as breakageArea,
t.responsibleTeam,
- CONCAT(ROUND(ROUND(t.area/(t.area + breakageArea),2)*100), '%') as finished,
+ CONCAT(ROUND(ROUND(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished,
t.product_name
FROM
(
@@ -3206,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