From bf90cf8568301edb38920e8b0a0ce7e137a668ef Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 21 八月 2025 09:51:55 +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 | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 bde52d5..2d019f6 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -2973,30 +2973,50 @@
<select id="processCardProgressCollectMp">
- select * from (select b.product_name,
- c.detail as 'glassName',
+ select * from (select
+ a.order_id,
+ a.order_number,
+ c.glass_group as 'group',
+ a.technology_number,
+ b.product_name,
+ c.detail as glass_child,
+ d.order_type,
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,
+ if(a.technology_number=1,sum(a.quantity-ifnull(a.termination_quantity,0)),0) as quantity,
+ sum(a.quantity)-ifnull(a.termination_quantity,0) as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
+ if(a.technology_number=1, round(sum((a.quantity-ifnull(a.termination_quantity,0)))*b.compute_area,2),0) as gross_area,
+ if(a.technology_number=1, sum(a.received_quantity),0) as inventory,
+ if(a.technology_number=1, round(sum(a.received_quantity*b.area),2),0) as inventoryArea,
- a.technology_number
+ -- show
+ sum(a.quantity-ifnull(a.termination_quantity,0)) as quantityShow ,
+ round(sum((a.quantity-ifnull(a.termination_quantity,0)))*b.compute_area,2) as gross_areaShow,
+ sum(a.received_quantity) as inventoryShow,
+ round(sum(a.received_quantity*b.area),2) as inventoryAreaShow
+
+
+
+
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
+ LEFT JOIN sd.`order` as d
+ on a.order_id = d.order_id
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
+ concat('{',GROUP_CONCAT(reporting_work_nums),'}') as reportWorkQuantity,
+ concat('{',GROUP_CONCAT(reporting_work_counts),'}') as reportWorkQuantityCount
from (select
opd.process_id,
opd.technology_number,
concat("\"", process, "\":\"", SUM(reporting_work_num), "\"") as reporting_work_nums,
+ concat("\"", process, "\":\"", SUM(reporting_work_num_count), "\"") as reporting_work_counts,
sum(broken_num) as broken_num
from sd.order_process_detail as opd
where opd.order_id = #{orderId}
--
Gitblit v1.8.0