From fc28d01cfa022d0f91ec719490342d726db2e105 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 九月 2025 08:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 520bd19..941f276 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -3123,13 +3123,13 @@
a.process_id,
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, 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,
-- 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,
+ 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
--
Gitblit v1.8.0