From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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 | 6 +++++-
1 files changed, 5 insertions(+), 1 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 f990b5a..db50185 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -190,7 +190,7 @@
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 grossArea,
+ 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,
@@ -2198,6 +2198,9 @@
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
+ <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
+ and rw.device_name regexp #{teamOutputDTO.deviceName}
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -2760,6 +2763,7 @@
where
e.id is not null
and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,
+ f.technology_number ORDER BY f.process_id, f.order_number,
f.technology_number) as g
<choose>
<when test="laminating == 'stepC' and process == '棰勫帇'">
--
Gitblit v1.8.0