From 9cf6783836fcee8afd5519b7bde82e10eadec4df Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 08 八月 2025 13:05:16 +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 | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 c6f7f0b..97815ad 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -174,22 +174,23 @@
c.technology_number,
b.child_width,
b.child_height,
- if(c.technology_number=1,c.quantity,0) as quantity,
-# c.quantity,
- c.quantity as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
+ if(c.technology_number=1,c.quantity-ifnull(c.termination_quantity,0),0) as quantity,
+
+ c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
e.reportWorkQuantity,
e.reportWorkQuantityShow,
e.reportWorkQuantityCount,
e.reportWorkTime,
e.broken_num,
- c.quantity as glassQuantity,
+ c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,
-# c.quantity*a.area as gross_area,
-# ifnull(f.inventory, 0) as inventory,
-# round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
-# ifnull(dd.quantity, 0) as shippedQuantity,
+ c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
+ (c.quantity-ifnull(c.termination_quantity,0))*a.area as grossAreaShow,
+ ifnull(f.inventory, 0) as inventoryShow,
+ round(ifnull(f.inventory, 0) * a.area, 2) as inventoryAreaShow,
+ ifnull(dd.quantity, 0) as shippedQuantityShow,
- if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
+ if(c.technology_number=1,(c.quantity-ifnull(c.termination_quantity,0))*a.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.area, 2),0) as inventoryArea,
if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
@@ -221,7 +222,7 @@
'}'
) as reportWorkQuantity,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
'}'
) as reportWorkQuantityShow,
concat('{',
@@ -243,7 +244,7 @@
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
+ 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
@@ -549,14 +550,14 @@
ogd.glass_child,
ogd.child_width,
ogd.child_height,
- fc.quantity,
+ 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 / 1000000, 2) as actualArea,
+ 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 as incompleteNum,
- ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num) / 1000000,
+ 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
@@ -583,6 +584,7 @@
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
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
@@ -817,7 +819,7 @@
a.product_name,
b.child_width,
b.child_height,
- c.quantity,
+ c.quantity - ifnull(c.termination_quantity,0) as quantity,
c.technology_number,
b.glass_child,
ifnull(e.reportWorkQuantity, 0) as reportWorkQuantity,
@@ -860,7 +862,7 @@
and e.order_number=c.order_number
and e.technology_number = c.technology_number
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
- where a.order_id = #{orderId} and d.create_order>0
+ 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
ORDER BY a.order_number
</select>
--
Gitblit v1.8.0