From 162c5c7e65af0e0a247acb202ab2490e108353ea Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 29 九月 2024 12:31:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 61 ++++++++++++++----------------
1 files changed, 29 insertions(+), 32 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 afc8321..5e4f10d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1246,8 +1246,7 @@
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
- left join sd.product_detail as pd on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"
- where o.create_order>0 and rw.reviewed_state>=0 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
@@ -1266,16 +1265,15 @@
</if>
GROUP BY
- rw.order_id,
rw.reporting_work_id,
+ rw.process_id,
rw.this_process,
rw.teams_groups_name,
- rw.process_id,
rwd.order_number
ORDER BY
rw.this_process,
rw.process_id,
- fc.order_number,
+ rwd.order_number,
rw.reporting_work_time,
rw.teams_groups_name
limit #{offset},#{pageSize};
@@ -1292,31 +1290,30 @@
MAX( ogd.child_width ) as width,
MAX( ogd.child_height ) as height,
od.edging_type,
- opd.reporting_work_num as completed_quantity,
- ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,
+ rwd.completed_quantity as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
od.product_name,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
FROM
- sd.`order` as o left join sd.order_detail as od on od.order_id=o.order_id
- left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
- left join flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
- left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id
- left join sd.order_process_detail as opd on opd.order_id = o.order_id AND opd.process_id = rw.process_id
- AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process
- left join sd.product_detail as pd on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"
- where opd.reporting_work_num > 0 and rw.reviewed_state=1
- and date(rw.reporting_work_time) >= #{date[0]}
+ 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
+ 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>0
+ and date(rw.reporting_work_time) >= #{date[0]}
and date(rw.reporting_work_time) <= #{date[1]}
and position(#{process} in rw.this_process)
GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
rw.this_process,
rw.teams_groups_name,
- rw.process_id,
- fc.order_number
+ rwd.order_number
ORDER BY
rw.this_process,
rw.process_id,
- fc.order_number,
+ rwd.order_number,
rw.reporting_work_time,
rw.teams_groups_name
</select>
@@ -1337,19 +1334,17 @@
MAX( ogd.child_width ) as width,
MAX( ogd.child_height ) as height,
od.edging_type,
- opd.reporting_work_num as completed_quantity,
- ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,
+ rwd.completed_quantity as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
od.product_name,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
FROM
- sd.`order` as o left join sd.order_detail as od on od.order_id=o.order_id
- left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
- left join flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
- left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id
- left join sd.order_process_detail as opd on opd.order_id = o.order_id AND opd.process_id = rw.process_id
- AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process
- left join sd.product_detail as pd on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"
- where opd.reporting_work_num > 0 and rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ 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
+ 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>0 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
@@ -1366,15 +1361,17 @@
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
+
GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
rw.this_process,
rw.teams_groups_name,
- rw.process_id,
- fc.order_number
+ rwd.order_number
ORDER BY
rw.this_process,
rw.process_id,
- fc.order_number,
+ rwd.order_number,
rw.reporting_work_time,
rw.teams_groups_name
) as page_toal
--
Gitblit v1.8.0