From a00a32e331bbf32ebaf6850150977204d9de381a Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 04 八月 2025 14:44:52 +0800
Subject: [PATCH] 修改每次修变量，由0.1改为1
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 18bccd0..c6f7f0b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -582,7 +582,7 @@
AND o.create_time < #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
- and fc.quantity - odpd.reporting_work_num>0
+ and GREATEST(fc.quantity - odpd.reporting_work_num, 0)>0
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
@@ -1464,6 +1464,7 @@
rw.reviewed,
rw.examine_time,
rw.device_name,
+ o.order_type,
-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
@@ -2749,7 +2750,7 @@
AND cb.technology_number = b.technology_number
where a.processing_card>0
and a.warehousing!=2
- and (c.quantity-b.reporting_work_num_count)>0
+ and (c.quantity-b.reporting_work_num)>0
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
@@ -2839,7 +2840,7 @@
AND cb.technology_number = b.technology_number
where a.processing_card>0
and a.warehousing!=2
- and (c.quantity-b.reporting_work_num_count)>0
+ and (c.quantity-b.reporting_work_num)>0
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
@@ -2960,4 +2961,40 @@
</otherwise>
</choose>
</select>
+
+
+ <select id="processCardProgressCollectMp">
+ select * from (select b.product_name,
+ c.detail as 'glassName',
+ concat(a.process_id,'/',a.technology_number) as processID,
+ a.process_id,
+ a.quantity,
+ a.received_quantity,
+ round(sum(a.received_quantity*b.area),2) as received_area,
+
+ a.technology_number
+ from pp.flow_card as a
+ left join sd.order_detail as b
+ on a.order_id = b.order_id and a.order_number = b.order_number
+ left join sd.product_detail as c
+ on c.prod_id = b.product_id and c.glass_sort = a.technology_number
+ where a.order_id = #{orderId} group by processID
+ ) as a
+ left join (SELECT process_id,
+ technology_number,
+ sum(broken_num) as broken_num,
+ concat('{',GROUP_CONCAT(reporting_work_nums),'}') as reporting_work_num
+ from (select
+ opd.process_id,
+ opd.technology_number,
+ concat("\"", process, "\":\"", SUM(reporting_work_num), "\"") as reporting_work_nums,
+ sum(broken_num) as broken_num
+ from sd.order_process_detail as opd
+ where opd.order_id = #{orderId}
+ group by opd.process_id,opd.technology_number,opd.process) as bb
+ GROUP BY bb.process_id,bb.technology_number) as b
+ on a.process_id = b.process_id and a.technology_number = b.technology_number
+ order by a.process_id
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0