From 7c30e26f3cc97ebcbb2cf86e2026b10f2e23994d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 十二月 2025 16:40:26 +0800
Subject: [PATCH] 流程卡添加订单类型、补片流程卡调整样式，工序待完成报表添加厚度
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 434e004..6658d93 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1570,7 +1570,7 @@
x_axis = #{detail.x},
y_axis = #{detail.y}
WHERE
- project_no = #{processId} AND polys_id = #{detail.polySort}
+ project_no = #{processId} AND polys_id = #{detail.polySort} AND stock_id = #{detail.stockSort}
</update>
<update id="updateProjectOptimize">
update pp.optimize_project as p
@@ -2168,11 +2168,35 @@
layer,
o_width,
o_height,
- rack_no
+ REPLACE(REPLACE(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