From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 106 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 41 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 5a68691..10a06e5 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 == '澶硅兌'">
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -247,7 +245,7 @@
reporting_work as rwk
on rw.reporting_work_id =rwk.reporting_work_id
where rwk.this_process=#{process}
- and rw.review_status=1
+ and rw.review_status>=0
and rw.process_id = #{processIdStr}
GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
on c.process_id = fc.process_id
@@ -257,8 +255,8 @@
process_id,a.reporting_work_id,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
- where this_process=#{previousProcess} and process_id= #{processIdStr}
- <if test="laminating != 'laminating'">
+ where this_process=#{previousProcess} and process_id= #{processIdStr} and a.reviewed_state>=0
+ <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
@@ -521,7 +519,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 +530,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 +575,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 +955,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 +1005,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}
@@ -1020,27 +1023,24 @@
<select id="getFootSum">
SELECT
- ifnull(SUM(this_completed_quantity),0) AS thisCompletedQuantity,
- ifnull(SUM(ROUND(child_width * child_height * this_completed_quantity / 1000000, 2)),0) AS completedArea,
- ifnull(SUM(this_worn_quantity),0) AS thisWornQuantity,
- ifnull(SUM(ROUND(child_width * child_height * this_worn_quantity / 1000000, 2)),0) AS wornArea
- FROM (
- -- 鍏堝 reporting_work_id 杩涜鍘婚噸
- SELECT
- rw.reporting_work_id,
- MAX(rw.this_completed_quantity) AS this_completed_quantity,
- MAX(rw.this_worn_quantity) AS this_worn_quantity,
- MAX(ogd.child_width) AS child_width,
- MAX(ogd.child_height) AS child_height
- 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}
- AND rw.reporting_work_time < #{selectTime2}
- and position(#{orderId} in rw.order_id)
- AND rw.reviewed_state != -1
- AND o.create_order > 0
+ SUM(rwd.completed_quantity) AS thisCompletedQuantity,
+ ROUND(SUM(rwd.child_width * rwd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,
+ SUM(rwd.breakage_quantity) AS thisWornQuantity,
+ 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
+ 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}
+ AND rw.reporting_work_time < #{selectTime2}
+ AND position(#{orderId} in rw.order_id)
+ AND rw.reviewed_state != -1
+ AND o.create_order > 0
<if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
</if>
@@ -1065,13 +1065,37 @@
<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
</if>
- GROUP BY rw.reporting_work_id -- 鎸� reporting_work_id 杩涜鍒嗙粍锛岀‘淇濆敮涓�
-
- ) AS subquery;
-
</select>
<select id="selectReviewedState">
select reviewed_state from pp.reporting_work where reporting_work_id=#{reportingWorkId};
</select>
+
+ <select id="qualityReviewSearchMp" resultMap="reportingWorkMap">
+ select rw.reporting_work_id,
+ rw.reporting_work_time,
+ rw.process_id,
+ o.project,
+ o.customer_name,
+ rw.this_process,
+ ifnull(rw.this_completed_quantity,0) as this_completed_quantity,
+ rw.this_worn_quantity,
+ rw.teams_groups_name,
+ rw.device_name,
+ rw.previous_process,
+ rw.next_process,
+ rw.quality_inspector,
+ rw.quality_ins_time,
+ dd.quality_ins_status
+ from sd.order as o
+ left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
+ left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
+
+ right join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
+ where rw.reviewed_state != 2
+ and dd.quality_ins_status = 1
+ and rw.reviewed_state!=-1
+ GROUP BY rw.reporting_work_id
+ ORDER BY rw.reporting_work_id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0