From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 5e9e4e8..0f8b4bd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1878,8 +1878,8 @@
SELECT
width,
height,
- realwidth,
- realheight,
+ realwidth as realWidth,
+ realheight as realHeight,
stock_id AS stockId,
stock_code AS stockCode,
usage_rate AS usageRate,
@@ -1924,7 +1924,7 @@
FROM
pp.optimize_detail od
LEFT JOIN pp.flow_card fc on (od.process_id = fc.process_id and od.layer = fc.technology_number and od.order_sort = fc.order_number )
- LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number)
+ LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number AND ogd.technology_number = fc.technology_number)
LEFT JOIN sd.ORDER o ON o.order_id = fc.order_id
LEFT JOIN sd.order_detail ord ON (fc.order_id = ord.order_id and od.order_sort = ord.order_number)
LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
@@ -2051,9 +2051,13 @@
<select id="getLayoutSetSv" resultType="java.util.Map">
SELECT
project_no,
- width,height,
- usage_rate,
- stock_code
+ stock_code as code,
+ realwidth AS width,
+ realheight AS height,
+ usage_rate as usageRate,
+ glass_count as polyQuantity,
+ glass_area AS polyArea
+
FROM
pp.optimize_layout
WHERE
--
Gitblit v1.8.0