From a7cc9c3be58bccd868bc8c12ed57c2b90fedc6b8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 十二月 2024 17:02:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 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 cec144b..2cb890c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -152,6 +152,7 @@
<result column="product_name" property="productName"/>
<result column="bend_radius" property="bendRadius"/>
<result column="glassNumber" property="glassNumber"/>
+ <result column="teams_groups_name" property="teamsGroupsName"/>
</resultMap>
<!-- 娴佺▼鍗¤繘搴�-->
@@ -323,7 +324,8 @@
o.project,
o.order_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
+ if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -337,7 +339,8 @@
odpd.broken_num) / 1000000, 2) as stockArea,
od.product_name,
od.bend_radius,
- ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
+ rws.teams_groups_name
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -373,6 +376,14 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
where LENGTH(fc.process_id) = 14
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
@@ -446,6 +457,14 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
where LENGTH(fc.process_id) = 14
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
@@ -656,7 +675,7 @@
ogd.child_height as childHeight,
fc.quantity,
round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
od.remarks
FROM sd.ORDER AS o
LEFT JOIN sd.order_detail AS od ON od.order_id = od.order_id
@@ -740,7 +759,7 @@
<select id="productionScheduleMp">
select a.order_number,
- if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
a.product_name,
b.child_width,
b.child_height,
@@ -1060,7 +1079,7 @@
o.project,
o.order_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -1422,14 +1441,15 @@
o.project,
o.order_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
sum(od.quantity) as quantity,
sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) as stockNum,
sum(ROUND(ogd.child_width * ogd.child_height *
(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) / 1000000, 2)) as stockArea,
- od.product_name
+ od.product_name,
+ rws.teams_groups_name
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -1465,6 +1485,14 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
where LENGTH(fc.process_id) = 14
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
@@ -1526,6 +1554,14 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
where LENGTH(fc.process_id) = 14
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
@@ -1554,14 +1590,15 @@
o.order_id,
fc.process_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
sum(od.quantity) as quantity,
sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) as stockNum,
sum(ROUND(ogd.child_width * ogd.child_height *
(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) / 1000000, 2)) as stockArea,
- od.product_name
+ od.product_name,
+ rws.teams_groups_name
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -1597,6 +1634,14 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
where LENGTH(fc.process_id) = 14
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
@@ -1661,6 +1706,14 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
where LENGTH(fc.process_id) = 14
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
--
Gitblit v1.8.0