From b499a7e1dbcc4b9dbcdcaa46bbf5c24271bf6698 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 11 八月 2025 16:54:05 +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 | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 6 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 b8e3b09..81b7d6e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -746,7 +746,7 @@
from pp.optimize_project as p
left join pp.optimize_admin as a on p.creater = a.Id
where (`p`.`state` > 0)
- and (tempering_state>0 or optimize_state>0)
+# and (tempering_state>0 or optimize_state>0)
and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
<if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
and p.project_no regexp #{optimizeProjectMange.projectNumber}
@@ -1224,14 +1224,16 @@
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,
rack_no
) VALUES (
#{projectId},
@@ -1249,6 +1251,8 @@
#{glass.y},
#{glass.patchState},
#{glass.markIcon},
+ #{glass.isRotate},
+ #{glass.glassPoint},
#{glass.rackNo}
);
</foreach>
@@ -1285,6 +1289,7 @@
down_trim,
left_trim,
right_trim,
+ count,
glass_count,
glass_area,
create_time
@@ -1299,7 +1304,8 @@
#{glass.downTrim},
#{glass.leftTrim},
#{glass.rightTrim},
- #{glass.glassCount},
+ #{glass.count},
+ #{glass.glassQuantity},
#{glass.glassArea},
now()
);
@@ -1341,6 +1347,28 @@
now()
);
</foreach>
+ </insert>
+ <insert id="addOptimizeOffcut">
+ INSERT INTO pp.optimize_offcut (
+ project_no,
+ stock_id,
+ width,
+ height,
+ x_axis,
+ y_axis,
+ model,
+ thickness
+ ) VALUES (
+ #{projectId},
+ #{map.stockSort},
+ #{map.width},
+ #{map.height},
+ #{map.x},
+ #{map.y},
+ #{glassType},
+ #{glassThickness}
+
+ )
</insert>
@@ -1635,6 +1663,13 @@
delete from pp.other_flow_card
where project_no = #{projectNumber}
</delete>
+ <delete id="deleteOptimizeOffcut">
+ DELETE
+ FROM
+ pp.optimize_offcut
+ WHERE
+ project_no = #{projectNumber}
+ </delete>
<select id="selectOptimizeProject">
@@ -1749,8 +1784,76 @@
where
project_no =#{projectNo}
</select>
-
-
+ <select id="getGlassInfo" resultType="java.util.Map">
+ select
+ project_no,
+ glass_type,
+ glass_thickness
+ from
+ pp.optimize_project
+ where
+ project_no = #{projectId}
+ </select>
+ <select id="getOptimizeLayoutsInfo" resultType="java.util.Map">
+ SELECT
+ width,
+ height,
+ stock_id AS stockId,
+ stock_code AS stockCode,
+ usage_rate AS usageRate,
+ up_trim AS upTrim,
+ down_trim AS downTrim,
+ left_trim AS leftTrim,
+ right_trim AS rightTrim,
+ count AS quantity,
+ glass_count AS glassQuantity
+ FROM
+ pp.optimize_layout
+ where
+ project_no = #{projectId}
+ </select>
+ <select id="getOptimizeDetailsInfo" resultType="java.util.Map">
+ SELECT
+ 0 As isRemain,
+ width AS realWidth,
+ height AS realHeight,
+ p_width AS width,
+ p_height AS height,
+ process_id AS processId,
+ layer,
+ total_layer AS totalLayer,
+ order_sort As orderSort,
+ stock_id AS layoutId,
+ stock_number AS glassSort,
+ x_axis AS x,
+ y_axis AS y,
+ mark_icon AS markIcon,
+ isRotate,
+ glass_point AS glassPoint,
+ rack_no As rackNo
+ FROM
+ pp.optimize_detail
+ WHERE
+ project_no = #{projectId}
+ </select>
+ <select id="getOptimizeOffsetsInfo" resultType="java.util.Map">
+ SELECT
+ 1 AS isRemain,
+ 0 AS isRotate,
+ width AS realWidth,
+ height AS realHeight,
+ width AS width,
+ height AS height,
+ stock_id AS stockSort,
+ x_axis AS x,
+ y_axis AS y,
+ model AS glassType,
+ thickness AS glassThickness
+ FROM
+ pp.optimize_offcut
+ WHERE
+ project_no = #{projectId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0