From 1f97acdb370414caa5303563f6c653a70a0e542b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 28 三月 2025 09:26:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 96 ++++++++++++++++++++++++++---------------------
1 files changed, 53 insertions(+), 43 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 a25e7bb..5a68691 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -189,56 +189,55 @@
<!-- 闈炵涓�閬撳伐搴忔姤宸ユ槑缁嗘煡璇�-->
<select id="SelectReworlDetailMp">
SELECT
- fc.order_number,
- ogd.glass_child,
- ogd.technology_number,
- ogd.glass_address,
- fc.quantity AS quantity_card,
- ogd.child_width,
- ogd.child_height,
+ fc.order_number,
+ ogd.glass_child,
+ ogd.technology_number,
+ ogd.glass_address,
+ fc.quantity AS quantity_card,
+ ogd.child_width,
+ ogd.child_height,
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,
+ 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,
+ 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, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns,
- ogd.id as 'glassId'
+ 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, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ od.other_columns,
+ ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state
FROM
- sd.order_detail AS od
+ 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
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
<if test="process == '澶硅兌'">
AND ogd.`group` = (select `group`
- from sd.order_glass_detail
- where order_id = ogd.order_id
- and order_number = ogd.order_number
- and POSITION(technology_number in #{technologyStr})
- limit 1)
+ from sd.order_glass_detail
+ where order_id = ogd.order_id
+ and order_number = ogd.order_number
+ and POSITION(technology_number in #{technologyStr})
+ limit 1)
</if>
-
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
+ 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
+ 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 sd.order_process_detail as odpds
- ON odpds.id = odpd.id-1
+ ON odpds.id = odpd.id-1
left join
- (SELECT
+ (SELECT
sum(rw.rework_num) as 'patchNumSum',
rw.process_id,rw.order_sort,rw.technology_number,
rwk.this_process
@@ -251,16 +250,27 @@
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}
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join (select reviewed_state as reviewed_state ,
+ 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'">
- AND POSITION(fc.technology_number in #{technologyStr})
+ AND POSITION(b.technology_number in #{technologyStr})
</if>
+ GROUP BY b.order_number,b.technology_number
+ ) as rws
+ 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}
+
AND odpd.process = #{process}
+ <if test="laminating != 'laminating'">
+ AND POSITION(fc.technology_number in #{technologyStr})
+ </if>
order by fc.order_number
</select>
--
Gitblit v1.8.0