From 47eb3a7bb1e7901a6d45d9df8ea8b9c4fb28ae82 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 05 三月 2025 16:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 8dda058..06521a6 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -68,9 +68,10 @@
d.shape ,
op.process_cards ,
d.product_name ,
+ d.price,
op.remark ,
d.building_number ,
- round(((`g`.`child_width` + g.child_height) * 2 * `f`.`quantity`),2) as perimeter ,
+ round(((`g`.`child_width`/ 1000 + g.child_height / 1000) * 2 * `f`.`quantity`),2) as perimeter ,
round((`g`.`area` * `f`.`quantity`),4) AS area,
f.technology_number ,
g.glass_child ,
--
Gitblit v1.8.0