From 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 04 十一月 2025 14:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 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 0f8b4bd..32d8197 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -118,7 +118,7 @@
a.id as rackNo
FROM
pp.flow_card c
- LEFT JOIN sd.order_detail o ON c.order_id = o.order_id
+ LEFT JOIN sd.order_detail o ON c.order_id = o.order_id and c.order_number = o.order_number
AND c.order_number = o.order_number
LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
AND c.order_number = d.order_number
@@ -211,7 +211,8 @@
AND c.technology_number = d.technology_number
INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
- LEFT JOIN order_detail od ON c.order_id = od.order_id
+ LEFT JOIN sd.order_detail od ON c.order_id = od.order_id
+ AND c.order_number = od.order_number
WHERE
c.project_no IS NOT NULL
and c.project_no = #{projectNo}
@@ -251,7 +252,8 @@
INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
LEFT JOIN pp.flow_card fc ON c.process_id = fc.process_id and fc.technology_number=c.technology_number
LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
- LEFT JOIN order_detail od ON c.order_id = od.order_id
+ LEFT JOIN sd.order_detail od ON fc.order_id = od.order_id
+ AND fc.order_number = od.order_number
left join
(select (@row_number := @row_number + 1) as id,process_id as process_id,technology_number as technology_number from (select process_id,technology_number from pp.flow_card tt where project_no =#{projectNo} group by process_id,technology_number) tt,(select @row_number := 0) as t) a
on a.process_id=c.process_id and a.technology_number=c.technology_number
@@ -358,7 +360,7 @@
AND c.order_number = d.order_number
AND c.technology_number = d.technology_number
LEFT JOIN sd.order o on o.order_id = c.order_id
- LEFT JOIN order_detail od on c.order_id = od.order_id
+ LEFT JOIN sd.order_detail od on c.order_id = od.order_id and c.order_number = od.order_number
WHERE
h.project_no = #{projectNo}
GROUP BY
@@ -1251,16 +1253,17 @@
order_sort,
stock_id,
polys_id,
+ o_width,
+ o_height,
p_width,
p_height,
- width,
- height,
x_axis,
y_axis,
patch_state,
mark_icon,
isRotate,
glass_point,
+ glass_id,
rack_no
) VALUES (
#{projectId},
@@ -1280,6 +1283,11 @@
#{glass.markIcon},
#{glass.isRotate},
#{glass.glassPoint},
+ CONCAT(
+ LPAD(SUBSTR(#{projectId}, 2), 8, '0'),
+ LPAD(#{glass.stockSort}, 4, '0'),
+ LPAD(#{glass.polySort}, 6, '0')
+ ),
#{glass.rackNo}
);
</foreach>
@@ -1457,7 +1465,7 @@
<update id="updateOptimizeDetail">
update pp.optimize_detail
- set heat_layout_id=#{layoutId},heat_layout_sort=#{sort},glass_id=concat(process_id,'|',#{layoutId},'|',#{sort})
+ set heat_layout_id=#{layoutId},heat_layout_sort=#{sort}
where id=#{id};
</update>
@@ -1515,6 +1523,23 @@
UPDATE pp.optimize_config set config_detail=#{json},create_time=now()
where config_type=#{type} and creater=#{username}
</update>
+ <insert id="insertOptimizeConfig">
+ INSERT INTO pp.optimize_config (
+ config_type,
+ config_name,
+ creater,
+ config_detail,
+ state,
+ create_time
+ ) VALUES (
+ #{type},
+ #{configName},
+ #{userName},
+ #{json},
+ 1,
+ now()
+ )
+ </insert>
<update id="updateFlowCardRack">
UPDATE pp.flow_card
SET rack = #{rackValue}
@@ -1897,8 +1922,8 @@
<select id="getOptimizeDetailsInfo" resultType="java.util.Map">
SELECT
0 AS isRemain,
- od.width AS realWidth,
- od.height AS realHeight,
+ od.o_width AS realWidth,
+ od.o_height AS realHeight,
od.p_width AS width,
od.p_height AS height,
od.process_id AS processId,
@@ -1907,6 +1932,7 @@
od.order_sort AS orderSort,
od.stock_id AS layoutId,
od.stock_number AS glassSort,
+ od.polys_id AS polySort,
od.x_axis AS x,
od.y_axis AS y,
od.mark_icon AS markIcon,
@@ -1919,7 +1945,7 @@
o.project AS projectName,
ord.product_name AS productName,
ord.building_number AS buildingNumber,
- COALESCE(h.layout_id, 0) as heatLayoutId,
+# COALESCE(h.layout_id, 0) as heatLayoutId,
od.rack_no AS rackNo
FROM
pp.optimize_detail od
@@ -1927,7 +1953,7 @@
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)
+# LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
WHERE
od.project_no = #{projectId}
</select>
@@ -2063,6 +2089,37 @@
WHERE
project_no = #{processId}
</select>
+ <select id="selectConfigByUserAndType" resultType="java.lang.String">
+ SELECT
+ id,
+ config_type,
+ config_detail,
+ creater
+ FROM
+ pp.optimize_config
+ WHERE creater = #{username} AND config_type = #{type}
+ </select>
+ <select id="getGlassProjectList" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no AS projectId,
+ tempering_state
+ FROM
+ pp.optimize_project
+ WHERE
+ project_no = #{projectId}
+ </select>
+ <select id="getProjectState" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no,
+ project_name,
+ state,
+ tempering_state,
+ optimize_state
+ FROM
+ pp.optimize_project
+ WHERE
+ project_no = #{projectNo}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0