From 3d9a46d7c0e135cf65f976cbea73f150eb12dbf8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 19 五月 2025 22:51:29 +0800
Subject: [PATCH] 优化报表管理导出和表尾求和查询方式
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 2ef6b1d..3f26344 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -62,7 +62,7 @@
c.product_name,
b.project,
sum(a.quantity) as quantity,
- sum(c.compute_gross_area) as compute_gross_area,
+ sum(a.quantity) * c.area as compute_gross_area,
a.founder,
c.processing_note,
b.customer_name,
@@ -865,7 +865,8 @@
od.bend_radius,
ifnull(od.order_number,0) as heat_layout_id,
ifnull(a.id,0) as heat_layout_sort,
- od.product_name
+ od.product_name,
+ opd.process_id
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
left join sd.order_detail od
@@ -901,7 +902,8 @@
od.bend_radius,
opd.heat_layout_id,
opd.heat_layout_sort,
- od.product_name
+ od.product_name,
+ opd.process_id
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
left join sd.order_detail od
@@ -2453,7 +2455,7 @@
ogd.technology_number = fc.technology_number
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
- group by od.order_number, width, height
+ group by fc.process_id,od.order_number, width, height
order by fc.process_id
</select>
--
Gitblit v1.8.0