From 12656db826e30dccbcd2dcb609f7661cf88a5bf2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 01 四月 2025 10:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 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 ce0fdb6..c08f739 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -407,6 +407,7 @@
LEFT JOIN pp.damage_details dal ON dal.order_number = g.order_number AND dal.technology_number = g.technology_number and f.process_id=dal.process_id
LEFT JOIN pp.flow_card fl ON fl.order_id = g.order_id AND fl.order_number = g.order_number AND fl.technology_number = g.technology_number
WHERE
+ p.state IN (1, 2) and
f.process_id = #{processId}
</select>
@@ -528,7 +529,7 @@
);
</foreach>
</insert>
-
+ <!--妯℃嫙璁＄畻缁撴灉淇濆瓨-->
<insert id="addratioResult" parameterType="map">
<foreach collection="projectdetail.data[0].ratioResult" item="glass">
INSERT INTO pp.optimize_heat_layout (
@@ -555,4 +556,41 @@
</foreach>
</insert>
+ <!--妯℃嫙璁＄畻宸ョ▼鏇存柊-->
+ <update id="addratioProjectResult" parameterType="map">
+ UPDATE pp.optimize_project
+ SET
+ state = 10,
+ chaos_pct = #{inputValues.chaos_pct},
+ max_load_pct = #{inputValues.max_load_pct},
+ max_area=#{inputValues.max_area},
+ max_qty=#{inputValues.max_qty},
+ load_width=#{inputValues.load_width},
+ load_length=#{inputValues.load_length},
+ x_space=#{inputValues.x_space},
+ y_space=#{inputValues.y_space},
+ load_rate=#{inputValues.load_rate}
+ WHERE
+ project_no = #{inputValues.project_no}
+
+ </update>
+<!--浼樺寲璁剧疆淇濆瓨-->
+ <update id="optimizeParmsSave">
+ update erp_user_info.user as u
+ set u.optimize_parms = #{jsonString}
+ </update>
+
+ <update id="updateOptimizeResult">
+ update pp.optimize_project_file as u
+ set u.content = #{jsonString}
+ where u.project_no=#{processId} and type='浼樺寲缁撴灉'
+ </update>
+
+
+
+ <select id="selectOptimizeResult">
+ SELECT content as Layouts
+ FROM pp.optimize_project_file
+ WHERE project_no=#{processId} and type='浼樺寲缁撴灉';
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0