From e5211965063b5bbd1cfcf2b9ae91e18cc9b0e3ae Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 19 八月 2024 14:14:31 +0800
Subject: [PATCH] 修改工程钢化标签打印
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 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 d85b7e4..fdc9834 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"/>
@@ -87,6 +88,7 @@
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 if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
GROUP BY fc.process_id
</select>
@@ -104,11 +106,11 @@
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
<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
+ where ogd.production_id = LEFT(#{processIdStr}, 11)
+ and ogd.technology_number=#{technologyStr}
+ limit 1),'') as process
</select>
@@ -165,11 +167,13 @@
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 odpd.process = #{process}
+ and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
order by fc.order_number
</select>
@@ -194,14 +198,15 @@
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
@@ -209,6 +214,7 @@
and technology_number =#{technologyStr}
limit 1)
</if>
+
LEFT JOIN flow_card AS fc
ON fc.order_id = ogd.order_id
@@ -242,7 +248,7 @@
WHERE
fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰'">
+ <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰' and process != '鎵撹兌鍜岀矘妗�' ">
AND fc.technology_number = #{technologyStr}
</if>
AND odpd.process = #{process}
@@ -469,7 +475,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,
@@ -495,7 +501,7 @@
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,
@@ -505,7 +511,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
@@ -591,7 +598,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>
<!-- 鏌ヨ瀹屽伐娆＄牬鏁伴噺-->
@@ -600,12 +612,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>
--
Gitblit v1.8.0