From 21eed4f6a8065bb59d0aaf7481dfe145dba74f2a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 09:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 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 5b0f70e..7d37624 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -185,7 +185,7 @@
c.project_no,
d.child_width as 'width',
d.child_height as 'height',
- (d.child_width + d.child_height) * 2 as 'perimeter',
+ (d.child_width + d.child_height) * 2/ 1000 as 'perimeter',
c.quantity,
od.shape,
concat( c.process_id, '-', c.technology_number ) AS 'process_id',
@@ -229,7 +229,7 @@
c.project_no,
d.child_width as 'width',
d.child_height as 'height',
- (d.child_width + d.child_height) * 2 as 'perimeter',
+ (d.child_width + d.child_height) * 2/ 1000 as 'perimeter',
c.patch_num as quantity,
od.shape,
concat( c.process_id, '-', c.technology_number ) AS 'process_id',
@@ -343,7 +343,7 @@
# h.layout_id as heatLayoutId,
h.width AS width,
h.height AS height,
- (h.width + h.height) * 2 as 'perimeter',
+ (h.width + h.height) * 2 / 1000 as 'perimeter',
od.shape,
count( 1 ) AS quantity,
concat( h.process_id, '-', h.layer ) AS process_id,
@@ -2148,6 +2148,55 @@
WHERE
project_no = #{projectNo}
</select>
+ <select id="optimizeTemp" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no,
+ layer,
+ o_width as width,
+ o_height as height,
+ rack_no as rackNo,
+ COUNT(*) as quantity,
+ ROUND((o_width + o_height) * 2 / 1000, 2) as perimeter,
+ ROUND(o_width * o_height * COUNT(*) / 1000000, 4) as area
+ FROM
+ pp.`optimize_detail`
+ WHERE
+ project_no = #{projectNo}
+ AND process_id = ''
+ GROUP BY
+ project_no,
+ layer,
+ o_width,
+ o_height,
+ rack_no
+ ORDER BY
+ o_width,
+ o_height
+ </select>
+ <select id="selectTempProject" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no,
+ o_width as width,
+ o_height as height,
+ rack_no as order_number,
+ layer as processCard,
+ COUNT(*) as quantity,
+ ROUND(o_width * o_height * COUNT(*) / 1000000, 4) as Area
+ FROM
+ pp.`optimize_detail`
+ WHERE
+ project_no = #{processId}
+ AND process_id = ''
+ GROUP BY
+ project_no,
+ layer,
+ o_width,
+ o_height,
+ rack_no
+ ORDER BY
+ o_width,
+ o_height
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0