From b5a9dccccaf5bed064891a05ec8ff3f21de9cff0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 25 九月 2024 16:31:14 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 204 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 167 insertions(+), 37 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 6633131..7f8fbb5 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -16,13 +16,14 @@
<result property="thisWornQuantity" column="this_worn_quantity"/>
<result property="deviceName" column="device_name"/>
<result property="teamsGroupsName" column="teams_groups_name"/>
- <result property="reviewedState" column="reviewed_state"/>
<result property="reportingWorkId" column="reporting_work_id"/>
<result property="processId" column="process_id"/>
<result property="completedArea" column="completedArea"/>
<result property="wornArea" column="wornArea"/>
<result property="qualityInspector" column="quality_inspector"/>
<result property="qualityInsTime" column="quality_ins_time"/>
+ <result property="notes" column="notes"/>
+ <result property="reviewed" column="reviewed"/>
<association property="order" javaType="com.example.erp.entity.sd.Order">
<result property="customerId" column="customer_id"/>
@@ -82,11 +83,14 @@
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
+ where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}
+ and POSITION(b.technology_number in #{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}
+ and POSITION(fc.technology_number in #{technologyStr})
+ and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
GROUP BY fc.process_id
</select>
@@ -104,11 +108,14 @@
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
<select id="SelectTechnologicalProcess">
- 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 ifnull((select ogd.process
+ from sd.order_glass_detail as ogd
+ left join sd.`order` as o on o.order_id=ogd.order_id
+ left join flow_card as fc on fc.order_id=o.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
+ where fc.process_id = #{processIdStr}
+ and o.create_order>0
+ and POSITION(fc.technology_number in #{technologyStr})
+ limit 1),'') as process
</select>
@@ -129,8 +136,8 @@
ogd.child_width,
ogd.child_height,
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,
+ fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as quantity,
+ fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num 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, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
@@ -153,20 +160,27 @@
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
- where a.process_id=#{processIdStr}
- and a.technology_number = #{technologyStr}
- and a.patch_processes = #{process}
+ 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 POSITION(a.technology_number in #{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
+ left join sd.`order` as o on o.order_id=od.order_id
WHERE
fc.process_id = #{processIdStr}
- AND fc.technology_number = #{technologyStr}
+ AND POSITION(fc.technology_number in #{technologyStr})
AND odpd.process = #{process}
+ and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
+ group by fc.order_number,
+ ogd.technology_number
order by fc.order_number
</select>
@@ -191,21 +205,23 @@
odpd.broken_num as onceBroken,
ogd.`group`,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns
+ od.other_columns,
+ ogd.id as 'glassId'
FROM
sd.order_detail AS od
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="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
and order_number = ogd.order_number
- and technology_number =#{technologyStr}
+ and POSITION(technology_number in #{technologyStr})
limit 1)
</if>
+
LEFT JOIN flow_card AS fc
ON fc.order_id = ogd.order_id
@@ -239,8 +255,8 @@
WHERE
fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰'">
- AND fc.technology_number = #{technologyStr}
+ <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰' and process != '鎵撹兌鍜岀矘妗�' ">
+ AND POSITION(fc.technology_number in #{technologyStr})
</if>
AND odpd.process = #{process}
order by fc.order_number
@@ -284,7 +300,7 @@
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}
+ from reporting_work as rw where rw.process_id=#{processIdStr} and rw.reviewed_state>=0
) as t
) as rw
@@ -365,7 +381,7 @@
</select>
<select id="selectFlowCardNum" resultType="java.lang.Integer">
select
- a.quantity-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ a.quantity +ifnull(c.patchNumSum,0)-b.reporting_work_num-b.broken_num
from flow_card as a
left join sd.order_process_detail as b
on
@@ -374,14 +390,14 @@
and b.order_id = SUBSTR(#{processId} from 1 for 10)
and b.process = #{thisProcess}
and b.process_id = a.process_id
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
+ left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id,patch_processes
from patch_log
- group by order_sort,technology_number) as c
+ group by process_id,order_sort,technology_number,patch_processes) as c
on
c.process_id = a.process_id
and c.order_sort = a.order_number
and c.technology_number = a.technology_number
-
+ and c.patch_processes= #{thisProcess}
where
a.process_id=SUBSTR(#{processId} from 1 for 14)
and a.order_number = #{orderNumber}
@@ -408,6 +424,8 @@
ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
e.other_columns,
+ IF(count(pl.id)>0,'宸茶ˉ鐗�','') as patchStatusOther,
+
<if test="nextProcess != null and nextProcess != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
ifnull(g.completed_quantity,0) as nextQuantitySum, -- 鍚庡伐搴忓凡瀹屾垚
if((f.completed_quantity
@@ -447,6 +465,8 @@
and d.technology_number = c.technology_number
left join sd.order_detail as e
on e.order_id = d.order_id and e.order_number = d.order_number
+ left join patch_log as pl on pl.reporting_work_id=b.reporting_work_id
+ and pl.order_sort=a.order_number and pl.technology_number=a.technology_number
left join (select sum(completed_quantity) as completed_quantity ,
rw.process_id,
@@ -466,7 +486,7 @@
and f.order_number = a.order_number
and f.technology_number = a.technology_number
<if test="nextProcess != null and nextProcess != ''">
- left join (select ifnull(sum(completed_quantity),0) as completed_quantity ,
+ left join (select sum(ifnull(completed_quantity,0)+ifnull(breakage_quantity,0)) as completed_quantity ,
rw.process_id,
rwd.order_number,
rwd.technology_number,
@@ -474,6 +494,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,
@@ -491,17 +512,19 @@
select rw.reporting_work_id,
(rw.reporting_work_time) as reporting_work_time,
o.order_id,
- rw.process_id,
+ CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct rwd.technology_number SEPARATOR '')) as process_id,
o.project,
o.batch,
rw.this_process,
rw.this_completed_quantity,
- round(ogd.area * rw.this_completed_quantity,2) as completedArea,
+ round(ogd.child_width*ogd.child_height * rw.this_completed_quantity/1000000,2) as completedArea,
rw.this_worn_quantity,
- round(ogd.area * rw.this_worn_quantity,2) as wornArea,
+ 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.reviewed_state,
+ rw.notes,
+ rw.reviewed
# (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
from sd.order as o
left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
@@ -513,6 +536,7 @@
and rw.reporting_work_time between #{selectTime1} and #{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>
@@ -554,6 +578,7 @@
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
+ and o.create_order>0
<if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
</if>
@@ -587,7 +612,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>
<!-- 鏌ヨ瀹屽伐娆＄牬鏁伴噺-->
@@ -596,12 +626,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>
@@ -780,8 +808,110 @@
<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
+ set rw.reviewed_state = 1 ,rw.reviewed=#{userName}
where rw.process_id = #{substring} and rw.this_process=#{process}
- and rwd.technology_number = #{result} and reviewed_state=0
+ and POSITION(rwd.technology_number in #{result}) and reviewed_state=0
</update>
+
+ <select id="getPatchConditionMp">
+ select count(*) from damage_details where reporting_work_id=#{reportingWorkId} and patch_status>0
+ </select>
+
+ <select id="getFirstStep">
+ SELECT
+
+ fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as quantity
+ FROM
+ sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ 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 = #{interceptProcess}
+ and a.process_id=#{processId}
+ and a.order_sort=#{orderSort}
+ and POSITION(a.technology_number in #{technologyNumber})
+ 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
+ left join sd.`order` as o on o.order_id=od.order_id
+
+ WHERE
+ fc.process_id = #{processId}
+ and fc.order_number=#{orderSort}
+ AND POSITION(fc.technology_number in #{technologyNumber})
+ AND odpd.process = #{interceptProcess}
+ group by fc.order_number,
+ ogd.technology_number
+ order by fc.order_number
+ </select>
+
+ <update id="updateReplenishWorkProcess">
+ update sd.order_process_detail
+ set
+ broken_num=broken_num - #{patchNum}
+ where process_id = #{processId}
+ and order_number = #{orderSort}
+ and technology_number = #{technologyNumber}
+ and process = #{patchProcesses}
+ </update>
+
+ <update id="updateRWPatchNum">
+ update reporting_work
+ set this_worn_quantity=this_worn_quantity-#{patchNum}
+ where reporting_work_id=#{reportingWorkId}
+ </update>
+
+ <update id="updateRWDPatchNum">
+ update reporting_work_detail
+ set breakage_quantity=breakage_quantity-#{patchNum}
+ where reporting_work_id=#{reportingWorkId} and order_number = #{orderSort}
+ and technology_number = #{technologyNumber}
+ </update>
+
+ <select id="selectUserProcess">
+ select address from erp_user_info.user where login_name=#{userId}
+ </select>
+
+ <select id="getSelectProcessJiajiao">
+ SELECT * FROM (
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='澶硅兌'
+
+ UNION
+
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='鍧囪川'
+ ) AS combined_results;
+ </select>
+
+ <select id="getSelectProcessDuoqu">
+ SELECT * FROM (
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='鎶�鏈儴澶氭洸'
+
+ UNION
+
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='閽㈠寲'
+ ) AS combined_results;
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0