From ae5a0421846584e31d3c3572217f2bd8a9adff3e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 08 七月 2025 14:01:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 05acad1..d529328 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -215,7 +215,7 @@
LEFT JOIN sd.order_glass_detail AS ogd
ON od.order_id = ogd.order_id
AND od.order_number = ogd.order_number
- <if test="laminating == 'stepA'" >
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -521,7 +521,10 @@
GROUP BY c.order_number,c.technology_number
</select>
<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
- select rw.reporting_work_id,
+ SELECT a.*,
+ round(ogd.child_width*ogd.child_height * a.this_completed_quantity/1000000,2) as completedArea,
+ round(ogd.child_width*ogd.child_height * a.this_worn_quantity/1000000,2) as wornArea
+ from (select rw.reporting_work_id,
(rw.reporting_work_time) as reporting_work_time,
o.order_id,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct rwd.technology_number SEPARATOR '')) as process_id,
@@ -529,18 +532,18 @@
o.batch,
rw.this_process,
rw.this_completed_quantity,
- round(ogd.child_width*ogd.child_height * rw.this_completed_quantity/1000000,2) as completedArea,
rw.this_worn_quantity,
- round(ogd.child_width*ogd.child_height * rw.this_worn_quantity/1000000,2) as wornArea,
rw.device_name,
rw.teams_groups_name,
rw.reviewed_state,
rw.notes,
- rw.reviewed
+ rw.reviewed,
+ rwd.order_number,
+ rwd.technology_number
# (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
from
reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
- left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
+
left join sd.`order` as o on o.order_id=rw.order_id
where rw.reviewed_state != 2
and rw.reporting_work_time >= #{selectTime1}
@@ -574,7 +577,9 @@
</if>
GROUP BY rw.reporting_work_id
ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize};
+ limit #{offset},#{pageSize} ) as a
+ left join sd.order_glass_detail as ogd on ogd.order_id=a.order_id and ogd.order_number=a.order_number and ogd.technology_number=a.technology_number
+ GROUP BY a.reporting_work_id
</select>
<select id="getPageTotal">
@@ -952,7 +957,7 @@
LEFT JOIN sd.order_glass_detail AS ogd
ON od.order_id = ogd.order_id
AND od.order_number = ogd.order_number
- <if test="laminating == 'stepA'" >
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -1021,16 +1026,16 @@
<select id="getFootSum">
SELECT
SUM(rwd.completed_quantity) AS thisCompletedQuantity,
- ROUND(SUM(ogd.child_width * ogd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,
+ ROUND(SUM(rwd.child_width * rwd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,
SUM(rwd.breakage_quantity) AS thisWornQuantity,
- ROUND(SUM(ogd.child_width * ogd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea,
+ ROUND(SUM(rwd.child_width * rwd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea,
CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
count(distinct rw.reporting_work_id) as 'total'
FROM reporting_work AS rw
LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
- LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id
+ /*LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id
AND ogd.order_number = rwd.order_number
- AND ogd.technology_number = rwd.technology_number
+ AND ogd.technology_number = rwd.technology_number*/
LEFT JOIN sd.`order` AS o ON o.order_id = rw.order_id
WHERE rw.reviewed_state != 2
and rw.reporting_work_time >= #{selectTime1}
--
Gitblit v1.8.0