From fa32e887b8fdcd4a2bc3326306cbc558e119a9bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 01 八月 2024 10:00:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 e3f921d..a255700 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -23,6 +23,7 @@
<result property="wornArea" column="wornArea"/>
<result property="qualityInspector" column="quality_inspector"/>
<result property="qualityInsTime" column="quality_ins_time"/>
+ <result property="notes" column="notes"/>
<association property="order" javaType="com.example.erp.entity.sd.Order">
<result property="customerId" column="customer_id"/>
@@ -194,7 +195,8 @@
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
@@ -209,6 +211,7 @@
and technology_number =#{technologyStr}
limit 1)
</if>
+
LEFT JOIN flow_card AS fc
ON fc.order_id = ogd.order_id
@@ -287,7 +290,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
@@ -469,7 +472,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,
@@ -477,6 +480,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,
@@ -504,7 +508,8 @@
round(ogd.area * rw.this_worn_quantity,2) as wornArea,
rw.device_name,
rw.teams_groups_name,
- rw.reviewed_state
+ rw.reviewed_state,
+ rw.notes
# (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
@@ -590,7 +595,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>
<!-- 鏌ヨ瀹屽伐娆＄牬鏁伴噺-->
@@ -599,12 +609,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>
@@ -787,4 +795,8 @@
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