From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 235 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 128 insertions(+), 107 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 941f276..93643d6 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -3177,6 +3177,7 @@
b.child_width,
b.child_height,
c.quantity,
+
c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
e.reportWorkQuantity,
e.reportWorkQuantityShow,
@@ -3184,19 +3185,19 @@
e.reportWorkTime,
e.broken_num,
c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,
- c.quantity*a.area as gross_area,
- c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
- (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area as grossAreaShow,
- ifnull(f.inventory, 0) as inventoryShow,
- round(ifnull(f.inventory, 0) * a.compute_area, 2) as inventoryAreaShow, -- 搴撳瓨闈㈢Н
- ifnull(dd.quantity, 0) as shippedQuantityShow, -- 鍙戣揣鏁伴噺
- (ifnull(c.received_quantity, 0))*a.compute_area as StorageAreaShow,-- 鍏ュ簱闈㈢Н
- if(c.technology_number=1,(c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,0) as grossArea,
- if(c.technology_number=1,ifnull(f.inventory, 0) ,0) as inventory,
- if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.compute_area, 2),0) as inventoryArea,
- if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
- if(c.technology_number=1,(ifnull(c.received_quantity, 0))*a.compute_area,0) as StorageArea,
+ c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
+ round( (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2) as grossAreaShow,
+ ifnull(c.received_quantity, 0) as StorageShow,
+ ifnull(dd.quantity, 0) as shippedQuantityShow, -- 鍙戣揣鏁伴噺
+ round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedAreaShow, -- 鍙戣揣闈㈢Н
+ round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageAreaShow,-- 鍏ュ簱闈㈢Н
+
+ round((c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2)as grossArea,
+ ifnull(c.received_quantity, 0) as Storage,
+ ifnull(dd.quantity, 0) as shippedQuantity,
+ round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedArea,
+ round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageArea,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
@@ -3213,107 +3214,127 @@
and c.technology_number = b.technology_number
left join sd.`order` as d
on c.order_id = d.order_id
- left join mm.finished_goods_inventory as f
- on c.order_id = f.order_id and f.order_number = c.order_number
- left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
- left join (SELECT process_id,
- order_number,
- technology_number,
- sum(a.broken_num) as broken_num,
- concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
- '}'
- ) as reportWorkQuantity,
- concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
- '}'
- ) as reportWorkQuantityShow,
- concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
- '}'
- ) as reportWorkQuantityCount,
- concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(update_time),''), "\"")),
- '}'
- ) as reportWorkTime
- FROM sd.order_process_detail as a
- left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
- on a.process = bd.basic_name
- where a.order_id = #{orderId}
- GROUP BY process_id, a.order_number, a.technology_number
+ # left join mm.finished_goods_inventory as f
+# on c.order_id = f.order_id and f.order_number = c.order_number
+ left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
+ left join (SELECT process_id,
+ order_number,
+ technology_number,
+ sum(a.broken_num) as broken_num,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
+ '}'
+ ) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantityShow,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
+ '}'
+ ) as reportWorkQuantityCount,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(update_time),''), "\"")),
+ '}'
+ ) as reportWorkTime
+ FROM sd.order_process_detail as a
+ left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
+ on a.process = bd.basic_name
+ where a.order_id = #{orderId}
+ GROUP BY process_id, a.order_number, a.technology_number
- ) as e
- on e.process_id = c.process_id
- and e.technology_number = c.technology_number
- and e.order_number = c.order_number
+ ) as e
+ on e.process_id = c.process_id
+ and e.technology_number = c.technology_number
+ and e.order_number = c.order_number
where a.order_id = #{orderId} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
group by c.order_number,
- c.technology_number,
- c.process_id
+ c.technology_number,
+ c.process_id
order by c.process_id, c.order_number, c.technology_number
- </select>
-
- <select id="yieldProcessMp">
- select
- rw.this_process as process,
- rw.completedQuantity,
- IFNULL(dd.breakageQuantity,0) as breakageQuantity,
- rw.completedArea,
- IFNULL(dd.breakageArea,0) as breakageArea,
- CONCAT(ROUND(TRUNCATE(rw.completedArea/(rw.completedArea + IFNULL(dd.breakageArea,0)),2)*100), '%') as finished
- from
- (
- select
- tb.process as this_process,
- SUM(tb.completedQuantity) as completedQuantity,
- ROUND(SUM(completedArea),2) as completedArea
- from (
- SELECT
- rw.process_id,
- rw.this_process AS process,
- rw.teams_groups_name AS teamsGroupsName,
- rwd.order_number AS orderNumber,
- MAX(bd.nickname) AS nickname,
- /* 浠呭綋 nickname 涓虹┖鏃舵墠鏄剧ず technology_number锛屽惁鍒欎负 NULL */
- MIN(CASE WHEN bd.nickname IS NULL THEN rwd.technology_number ELSE NULL END) AS technologyNumber,
- COALESCE((rwd.completed_quantity), 0) AS completedQuantity,
- ROUND(COALESCE((rwd.child_width * rwd.child_height * rwd.completed_quantity),0)/1000000, 2)
- AS completedArea
- FROM reporting_work rw
- LEFT JOIN reporting_work_detail rwd
- ON rwd.reporting_work_id = rw.reporting_work_id
- LEFT JOIN sd.basic_data bd
- ON bd.basic_name = rw.this_process
-
- WHERE rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
- AND rw.reviewed_state >= 0
- GROUP BY
- rw.reporting_work_id,
- rw.process_id,
- rw.this_process,
- rw.teams_groups_name,
- rwd.order_number,
- CASE WHEN bd.nickname IS NULL THEN rwd.technology_number ELSE NULL END
- ORDER BY rw.process_id,
- rw.this_process, rw.teams_groups_name, rwd.order_number,
- CASE WHEN bd.nickname IS NULL THEN rwd.technology_number ELSE NULL END
- ) as tb
- GROUP BY tb.process
- ) as rw
- left join
- (
- select dd.responsible_process,sum(dd.breakage_quantity) as breakageQuantity
- ,ROUND(SUM((rwd.child_width) * (rwd.child_height) * dd.breakage_quantity / 1000000), 2) as breakageArea
- from reporting_work rw left join damage_details dd on dd.reporting_work_id = rw.reporting_work_id
- LEFT JOIN reporting_work_detail rwd on rwd.reporting_work_id = dd.reporting_work_id and rwd.order_number = dd.order_number and rwd.technology_number = dd.technology_number
- where rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
- AND rw.reviewed_state >= 0 and dd.available =0
- GROUP BY dd.responsible_process
- ) as dd on rw.this_process = dd.responsible_process
</select>
+
+ <select id="selectProcessCompletedMp">
+ SELECT
+ #{selectProcesses} as process,
+ hz.project,hz.batch,
+ SUM(quantity) as quantity,
+ SUM(childArea)as childArea,
+ SUM(actualArea) as actualArea,
+ SUM(completeNum) as completeNum,
+ SUM(completeArea) as completeArea,
+ SUM(incompleteNum) as incompleteNum,
+ SUM(incompleteArea) as incompleteArea,
+ hz.product_name
+ from (
+ select DATE(o.create_time) as create_time,
+ DATE(o.delivery_date) as delivery_date,
+ o.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.batch,
+ od.order_number,
+ ogd.technology_number,
+ ogd.glass_child,
+ ogd.child_width,
+ ogd.child_height,
+ fc.quantity - ifnull(fc.termination_quantity,0) as quantity,
+ ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
+ ROUND(ogd.child_width * ogd.child_height * (fc.quantity- ifnull(fc.termination_quantity,0)) / 1000000, 2) as actualArea,
+ odpd.reporting_work_num as completeNum,
+ ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
+ 2) as completeArea,
+ fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0) as incompleteNum,
+ ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num- ifnull(fc.termination_quantity,0)) / 1000000,
+ 2) as incompleteArea,
+ od.product_name
+
+ 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 sd.`order` as o
+ on o.order_id = od.order_id
+ where o.create_order>0
+ and odpd.process = #{selectProcesses}
+ and o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ and GREATEST(fc.quantity - odpd.reporting_work_num, 0)>0
+ and fc.quantity-ifnull(fc.termination_quantity,0)>0
+ <choose>
+ <when test="laminating != null and laminating == 'stepC'">
+ GROUP BY fc.process_id, fc.order_number, ogd.`group`
+ </when>
+ <when test="laminating != null and laminating == 'stepD'">
+ GROUP BY fc.process_id, fc.order_number
+ </when>
+ <when test="laminating != null and laminating == 'stepB'">
+ GROUP BY fc.process_id, fc.order_number
+ </when>
+ <otherwise>
+ GROUP BY fc.process_id, fc.order_number, fc.technology_number
+ </otherwise>
+ </choose>
+ order by fc.process_id, fc.order_number, fc.technology_number
+ ) as hz
+ GROUP BY hz.project,hz.batch,product_name
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0