From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 67 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 32 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 65b97f4..e5ac7c9 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -102,9 +102,7 @@
</select>
<select id="SelectWorkBasicTeamsMp">
- SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
- on bd.id=bdp.basic_category
- where bd.basic_category="process" and bdp.basic_type="teamsgroups" and bd.basic_name = #{process}
+ select * from erp_user_info.`user` WHERE address=#{process}
</select>
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
@@ -215,7 +213,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="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')" >
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -258,7 +256,7 @@
from reporting_work as a
left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
where this_process=#{previousProcess} and process_id= #{processIdStr} and a.reviewed_state>=0
- <if test="laminating != 'laminating'">
+ <if test="laminating == ''">
AND POSITION(b.technology_number in #{technologyStr})
</if>
GROUP BY b.order_number,b.technology_number
@@ -268,7 +266,7 @@
fc.process_id = #{processIdStr}
AND odpd.process = #{process}
- <if test="laminating != 'laminating'">
+ <if test="laminating == ''">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
order by fc.order_number
@@ -300,15 +298,13 @@
<select id="historyTeamsMp">
SELECT
- bdp.id,
- bdp.basic_type,
+ bd.id,
+ bd.basic_type,
rw.teams as basic_name,
bd.basic_name,bd.id AS basic_category,
rw.process
FROM
sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp
- ON bd.id = bdp.basic_category
right join (
select distinct process,teams from
( select distinct rw.this_process as process,rw.teams_groups_name as teams
@@ -317,8 +313,6 @@
) as t
) as rw
on rw.process=bd.basic_name
- WHERE
- bdp.basic_type = 'teamsgroups'
GROUP BY rw.process,rw.teams
</select>
@@ -328,10 +322,9 @@
bd.basic_name AS basic_category
FROM
sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
+
WHERE
bd.basic_category = 'process'
- AND bdp.basic_type = 'teamsgroups'
AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
</select>
@@ -444,7 +437,7 @@
-ifnull(g.completed_quantity,0))
>
a.completed_quantity,
- 0,
+ a.completed_quantity,
(f.completed_quantity
-ifnull(g.completed_quantity,0))
) as minQuantity -- 淇敼鏈�灏忔暟
@@ -521,26 +514,30 @@
GROUP BY c.order_number,c.technology_number
</select>
<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
- select rw.reporting_work_id,
+ 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,
+ CONCAT(rw.process_id,'/',rwd.goup) as process_id,
o.project,
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,
+ round(rwd.completedArea/LENGTH(rwd.goup),2) as completedArea,
+ rwd.wornArea
# (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
+ reporting_work as rw
+ left join (
+ SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2) as completedArea ,round(sum(cc.wornArea),2) as wornArea from (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
+ sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,
+ sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)as rwd on rw.reporting_work_id=rwd.reporting_work_id
+
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 +571,7 @@
</if>
GROUP BY rw.reporting_work_id
ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize};
+ limit #{offset},#{pageSize}
</select>
<select id="getPageTotal">
@@ -952,7 +949,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="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -1002,7 +999,7 @@
on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
WHERE
fc.process_id = #{processIdStr}
- <if test="laminating != 'laminating' ">
+ <if test="laminating == ''">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
AND odpd.process = #{process}
@@ -1021,14 +1018,21 @@
<select id="getFootSum">
SELECT
SUM(rw.this_completed_quantity) AS thisCompletedQuantity,
- ROUND(SUM(ogd.child_width * ogd.child_height * rw.this_completed_quantity / 1000000), 2) AS completedArea,
+ ROUND(SUM(rwd.completedArea/length(goup)), 2) AS completedArea,
SUM(rw.this_worn_quantity) AS thisWornQuantity,
- ROUND(SUM(ogd.child_width * ogd.child_height * rw.this_worn_quantity / 1000000), 2) AS wornArea
+ ROUND(SUM(rwd.wornArea), 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
+ (SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2) as completedArea ,round(sum(cc.wornArea),2) as wornArea from (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
+ sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,
+ sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)
+ 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
+ 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}
@@ -1060,14 +1064,13 @@
<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
</if>
-
</select>
<select id="selectReviewedState">
select reviewed_state from pp.reporting_work where reporting_work_id=#{reportingWorkId};
</select>
- <select id="qualityReviewSearchMp">
+ <select id="qualityReviewSearchMp" resultMap="reportingWorkMap">
select rw.reporting_work_id,
rw.reporting_work_time,
rw.process_id,
--
Gitblit v1.8.0