From 69ce239949e32dd40ded422ea72987b4a9751add Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 05 八月 2025 17:40:32 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 70f2b4a..87b1cd4 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -243,7 +243,7 @@
<select id="getOptimizeDetail">
SELECT
h.project_no,
- h.heat_layout_id as rackNo,
+ h.rack_no as rackNo,
h.o_width AS width,
h.o_height AS height,
(h.height-h.o_height)/2 as shortGrind1,
@@ -280,14 +280,14 @@
h.project_no =#{projectNo}
GROUP BY
h.project_no,
- h.heat_layout_id,
+ h.rack_no,
h.width,
h.height,
h.process_id,
h.layer,
c.order_number
ORDER BY
- h.heat_layout_id;
+ h.rack_no;
</select>
<!--宸ョ▼淇℃伅娴佺▼鍗�-->
@@ -1118,7 +1118,8 @@
x_axis,
y_axis,
patch_state,
- mark_icon
+ mark_icon,
+ rack_no
) VALUES (
#{projectId},
#{glass.processId},
@@ -1134,7 +1135,8 @@
#{glass.x},
#{glass.y},
#{glass.patchState},
- #{glass.markIcon}
+ #{glass.markIcon},
+ #{glass.rackNo}
);
</foreach>
</insert>
--
Gitblit v1.8.0