From bd03748adb5b9fda8ac4b52c8de93062eaa8ee72 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 22 五月 2024 10:26:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 626010c..9718ead 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -445,7 +445,7 @@
o.processing_note,
fc.process_id,
SUM( od.quantity) as quantity,
- SUM(od.gross_area) as gross_area,
+ SUM(ogd.total_area) as gross_area,
SUM(od.weight) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id,'/',#{technologyNumber}) as processIdNumber
@@ -464,7 +464,7 @@
select fc.order_number,
concat(ogd.child_width, "*", ogd.child_height) as child_width,
od.quantity,
- ogd.total_area,
+ round(ogd.total_area,2) as total_area,
od.perimeter,
od.bend_radius,
od.remarks
--
Gitblit v1.8.0