From c988ebdc91e04c49bc0297c1ed1706ec6ae43b37 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 18 七月 2024 09:52:57 +0800
Subject: [PATCH] 提交相关报工程序
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 250 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 180 insertions(+), 70 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 3e5e592..459e971 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -64,6 +64,7 @@
</resultMap>
+<!-- 鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�-->
<select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
select o.order_id,
fc.production_id,
@@ -77,11 +78,13 @@
ifnull((rw.reviewed_state),1) as reviewed_state -- 涓嬪伐搴忓鏍哥姸鎬�
from sd.order as o
left join flow_card as fc on fc.order_id = o.order_id
- left join (select if(count(reviewed_state)>0 and process_id=null,1,0) as reviewed_state ,
- process_id
- from reporting_work
- where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}) as rw
+ left join (select reviewed_state as reviewed_state ,
+ process_id,a.reporting_work_id
+ 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 reviewed_state=0 and process_id=#{processIdStr} and b.technology_number=#{technologyStr}) as rw
on rw.process_id = fc.process_id
+ left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
where fc.process_id = #{processIdStr}
and fc.technology_number = #{technologyStr}
GROUP BY fc.process_id
@@ -104,6 +107,7 @@
select ogd.process
from sd.order_glass_detail as ogd
where ogd.production_id = LEFT(#{processIdStr}, 11)
+ and ogd.technology_number=#{technologyStr}
limit 1
</select>
@@ -124,12 +128,13 @@
fc.quantity AS quantity_card,
ogd.child_width,
ogd.child_height,
- od.shape,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as quantity,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as completedQuantity,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
+ fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as quantity,
+ fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as completedQuantity,
odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
- if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ od.other_columns
FROM
sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -145,13 +150,22 @@
AND odpd.order_number = fc.order_number
AND odpd.technology_number = fc.technology_number
and odpd.process_id = fc.process_id
- left join
- (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
- on c.process_id = fc.process_id
- and c.order_sort = fc.order_number
- and c.technology_number = fc.technology_number
+ left join (
+ select ifnull(sum(a.patch_num),0) as patch_num,a.process_id,a.technology_number,a.order_sort
+ from patch_log as a
+ right join reporting_work
+ on a.reporting_work_id=reporting_work.reporting_work_id
+ where
+ reporting_work.this_process = #{process}
+ and a.process_id=#{processIdStr}
+ and a.technology_number = #{technologyStr}
+ and a.review_status = 1
+ group by a.process_id,a.order_sort,a.technology_number
+ ) as patch
+ on patch.process_id = fc.process_id
+ and patch.order_sort = fc.order_number
+ and patch.technology_number = fc.technology_number
+
WHERE
fc.process_id = #{processIdStr}
AND fc.technology_number = #{technologyStr}
@@ -169,14 +183,18 @@
fc.quantity AS quantity_card,
ogd.child_width,
ogd.child_height,
- od.shape,
- odpds.reporting_work_num -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as quantity,
- odpds.reporting_work_num -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as completedQuantity,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
+ 0,
+ odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
+ 0,
+ odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as completedQuantity,
odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
ogd.`group`,
- if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
-
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ od.other_columns
FROM
sd.order_detail AS od
@@ -205,12 +223,23 @@
left join sd.order_process_detail as odpds
ON odpds.id = odpd.id-1
left join
- (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
+ (SELECT
+ sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,rw.order_sort,rw.technology_number,
+ rwk.this_process
+ from
+ rework as rw
+ LEFT JOIN
+ 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.process_id = #{processIdStr}
+ GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
on c.process_id = fc.process_id
and c.order_sort = fc.order_number
and c.technology_number = fc.technology_number
+
WHERE
fc.process_id = #{processIdStr}
<if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰'">
@@ -248,24 +277,24 @@
SELECT
bdp.id,
bdp.basic_type,
- bdp.basic_name,
+ 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 from
- ( select distinct rw.this_process as process
- from reporting_work as rw where rw.process_id=#{processIdStr}
- UNION
- select #{process}
- ) as t
- ) as rw
- on rw.process=bd.basic_name
+ 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
+ from reporting_work as rw where rw.process_id=#{processIdStr}
+
+ ) as t
+ ) as rw
+ on rw.process=bd.basic_name
WHERE
- bdp.basic_type = 'teamsgroups'
+ bdp.basic_type = 'teamsgroups'
+ GROUP BY rw.process,rw.teams
</select>
<select id="SelectHistoryProcessMp">
@@ -301,7 +330,10 @@
</select>
<select id="selectGlassProcessNum" resultType="java.lang.Integer">
select
- d.reporting_work_num-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)< 0,
+ 0,
+ (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
+ )
from flow_card as a
left join sd.order_process_detail as b
on
@@ -312,16 +344,25 @@
and b.process_id = a.process_id
left join sd.order_process_detail as d
on d.id=b.id-1
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
- on
- c.process_id = a.process_id
- and c.order_sort = a.order_number
- and c.technology_number = a.technology_number
+ left join (SELECT
+ sum(rw.rework_num) as 'reworkNumSum',
+ rw.process_id,rw.order_sort,rw.technology_number,
+ rwk.this_process
+ from
+ rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id =rwk.reporting_work_id
+ where rwk.this_process=#{thisProcess}
+ and rw.review_status=1
+ and rw.process_id = SUBSTR(#{processId} from 1 for 14)
+ GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
+ on c.process_id = a.process_id
+ and c.order_sort = a.order_number
+ and c.technology_number = a.technology_number
where
- a.process_id=SUBSTR(#{processId} from 1 for 13)
+ a.process_id=SUBSTR(#{processId} from 1 for 14)
and a.order_number = #{orderNumber}
and a.technology_number = #{technologyNumber}
</select>
@@ -338,14 +379,14 @@
and b.process_id = a.process_id
left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
+ group by order_sort,technology_number) as c
on
c.process_id = a.process_id
and c.order_sort = a.order_number
and c.technology_number = a.technology_number
where
- a.process_id=SUBSTR(#{processId} from 1 for 13)
+ a.process_id=SUBSTR(#{processId} from 1 for 14)
and a.order_number = #{orderNumber}
and a.technology_number = #{technologyNumber}
</select>
@@ -361,12 +402,15 @@
c.quantity as quantity_card,
d.child_width,
d.child_height,
- e.shape,
- a.completed_quantity+a.breakage_quantity as 'quantity', -- 鍙姤宸ユ暟
- a.completed_quantity as 'completedQuantity', -- 瀹屽伐鏁�
- a.breakage_quantity as 'breakageQuantity', -- 鐮存崯鏁�
- f.completed_quantity as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
+ if(e.shape=1,'鏅舰',if(e.shape=2,'寮傚舰','')) as shape,
+ if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,
+ c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),
+ ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 鍙姤宸ユ暟
+ ifnull(a.completed_quantity,0) as 'completedQuantity', -- 瀹屽伐鏁�
+ ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 鐮存崯鏁�
+ ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
+ e.other_columns,
<if test="nextProcess != null and nextProcess != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
ifnull(g.completed_quantity,0) as nextQuantitySum, -- 鍚庡伐搴忓凡瀹屾垚
if((f.completed_quantity
@@ -390,13 +434,16 @@
as minQuantity -- 淇敼鏈�灏忔暟
</if>
-- e.thisQuantitySum
- from
- reporting_work_detail as a
- left join reporting_work as b
- on a.reporting_work_id = b.reporting_work_id
- left join flow_card as c
- on c.process_id = b.process_id
- and c.technology_number = a.technology_number
+ from reporting_work as b
+
+ right join flow_card as c
+ on c.process_id = b.process_id
+
+ right join reporting_work_detail as a
+ on a.reporting_work_id = b.reporting_work_id
+ and c.order_number=a.order_number
+ and c.technology_number = a.technology_number
+
left join sd.order_glass_detail as d
on d.order_id = c.order_id
and c.order_number = d.order_number
@@ -430,6 +477,7 @@
from reporting_work as rw
left join reporting_work_detail as rwd
on rw.reporting_work_id = rwd.reporting_work_id
+ where rw.reviewed_state>=0
group by rw.process_id,
rw.this_process,
rwd.order_number,
@@ -440,7 +488,8 @@
and g.order_number = a.order_number
and g.technology_number = a.technology_number
</if>
- where a.reporting_work_id = #{reportingWorkId}
+ where b.reporting_work_id = #{reportingWorkId}
+ GROUP BY c.order_number,c.technology_number
</select>
<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
select rw.reporting_work_id,
@@ -451,9 +500,9 @@
o.batch,
rw.this_process,
rw.this_completed_quantity,
- (ogd.area * rw.this_completed_quantity) as completedArea,
+ round(ogd.area * rw.this_completed_quantity,2) as completedArea,
rw.this_worn_quantity,
- (ogd.area * rw.this_worn_quantity) as wornArea,
+ round(ogd.area * rw.this_worn_quantity,2) as wornArea,
rw.device_name,
rw.teams_groups_name,
rw.reviewed_state
@@ -486,6 +535,12 @@
<if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
and rw.this_process regexp #{reportingWork.thisProcess}
</if>
+ <if test="reportingWork.deviceName != null and reportingWork.deviceName != ''">
+ and rw.device_name regexp #{reportingWork.deviceName}
+ </if>
+ <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
+ and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
+ </if>
GROUP BY rw.reporting_work_id
ORDER BY rw.reporting_work_id desc
limit #{offset},#{pageSize};
@@ -503,6 +558,30 @@
where rw.reviewed_state != 2
and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
and rw.reviewed_state!=-1
+ <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
+ </if>
+ <if test="reportingWork.orderId != null and reportingWork.orderId != ''">
+ and o.order_id regexp #{reportingWork.orderId}
+ </if>
+ <if test="reportingWork.processId != null and reportingWork.processId != ''">
+ and rw.process_id regexp #{reportingWork.processId}
+ </if>
+ <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
+ and o.project regexp #{reportingWork.order.project}
+ </if>
+ <if test="reportingWork.order.batch != null and reportingWork.order.batch != ''">
+ and o.batch regexp #{reportingWork.order.batch}
+ </if>
+ <if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
+ and rw.this_process regexp #{reportingWork.thisProcess}
+ </if>
+ <if test="reportingWork.deviceName != null and reportingWork.deviceName != ''">
+ and rw.device_name regexp #{reportingWork.deviceName}
+ </if>
+ <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
+ and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
+ </if>
ORDER BY rw.reporting_work_id desc
limit #{offset},#{pageSize};
</select>
@@ -512,7 +591,12 @@
</select>
<!-- 鏌ヨ涓嬪伐搴忔槸鍚︽姤宸�-->
<select id="selectCountByProcessId">
- select count(reporting_work_id) from reporting_work where this_process=#{nextProcess} and process_id=#{processId}
+ select count(reporting_work_id)
+ from reporting_work
+ where
+ this_process=#{nextProcess}
+ and process_id=#{processId}
+ and reviewed_state>-1
</select>
<!-- 鏌ヨ瀹屽伐娆＄牬鏁伴噺-->
@@ -521,12 +605,10 @@
rwd.order_number,
rwd.technology_number,
rwd.completed_quantity,
- IFNULL(SUM(dd.breakage_quantity), 0) as breakage_quantity
+ rwd.breakage_quantity as breakage_quantity
from reporting_work as rw
- left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
- left join damage_details as dd
- on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number = rwd.order_number and
- dd.technology_number = rwd.technology_number
+ left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
+
where rw.reporting_work_id = #{reportingWorkId}
GROUP BY rwd.order_number, rwd.technology_number
</select>
@@ -553,7 +635,6 @@
select process
from sd.order_process_detail
where process_id = #{processId}
- and order_number = 1
and technology_number = 1
order by id desc
LIMIT 1
@@ -637,6 +718,18 @@
and position(#{processId} in rw.process_id)
and position(#{state} in dd.quality_ins_status)
and rw.reviewed_state!=-1
+ <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
+ </if>
+ <if test="reportingWork.processId != null and reportingWork.processId != ''">
+ and rw.process_id regexp #{reportingWork.processId}
+ </if>
+ <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
+ and o.project regexp #{reportingWork.order.project}
+ </if>
+ <if test="reportingWork.order.customerName != null and reportingWork.order.customerName != ''">
+ and o.customer_name regexp #{reportingWork.order.customerName}
+ </if>
ORDER BY rw.reporting_work_id desc
limit #{offset},#{pageSize};
</select>
@@ -646,7 +739,7 @@
update reporting_work as rw left join damage_details as dd on rw.reporting_work_id = dd.reporting_work_id
set dd.quality_ins_status = 2,
rw.quality_inspector=#{username},
- rw.examine_time=NOW()
+ rw.quality_ins_time=NOW()
where rw.reporting_work_id = #{reportingWorkId}
</update>
@@ -685,4 +778,21 @@
GROUP BY rwd.order_number, ogd.glass_child, rwd.technology_number, dd.id
ORDER BY rwd.order_number
</select>
+
+ <select id="selectLayerByReportingWorkId">
+ select REPLACE(GROUP_CONCAT(DISTINCT rwd.technology_number),',','') from reporting_work_detail as rwd
+ where rwd.reporting_work_id=#{reportingWorkId}
+ </select>
+
+ <update id="ReviewReportingWorkMp">
+ update reporting_work as rw
+ left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
+ set rw.reviewed_state = 1
+ where rw.process_id = #{substring} and rw.this_process=#{process}
+ and rwd.technology_number = #{result} and reviewed_state=0
+ </update>
+
+ <select id="getPatchConditionMp">
+ select count(*) from damage_details where reporting_work_id=#{reportingWorkId} and patch_status>0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0