From b99b4b3d1c3ce067175e088b682be740f5b4b6ed Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 18 八月 2025 11:19:04 +0800
Subject: [PATCH] 入库提示语言修改
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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 fe665f2..85394a8 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1233,6 +1233,7 @@
patch_state,
mark_icon,
isRotate,
+ glass_point,
rack_no
) VALUES (
#{projectId},
@@ -1251,6 +1252,7 @@
#{glass.patchState},
#{glass.markIcon},
#{glass.isRotate},
+ #{glass.glassPoint},
#{glass.rackNo}
);
</foreach>
@@ -1281,6 +1283,8 @@
stock_id,
width,
height,
+ realwidth,
+ realheight,
usage_rate,
stock_code,
up_trim,
@@ -1296,6 +1300,8 @@
#{glass.stockId},
#{glass.width},
#{glass.height},
+ #{glass.realWidth},
+ #{glass.realHeight},
#{glass.usageRate},
#{glass.stockCode},
#{glass.upTrim},
@@ -1367,6 +1373,26 @@
#{glassThickness}
)
+ </insert>
+ <insert id="addUpdateOffcut">
+ INSERT INTO pp.optimize_offcut (
+ project_no,
+ stock_id,
+ width,
+ height,
+ x_axis,
+ y_axis,
+ model,
+ thickness
+ ) VALUES (
+ #{processId},
+ 1,
+ #{detail.width},
+ #{detail.height},
+ #{detail.x},
+ #{detail.y},
+ #{glassType},
+ #{glassThickness})
</insert>
@@ -1466,6 +1492,14 @@
UPDATE pp.flow_card
SET rack = #{rackValue}
WHERE process_id = #{processId} AND technology_number = #{technologyNumber}
+ </update>
+ <update id="updateNormalDetails">
+ UPDATE pp.optimize_detail
+ SET
+ x_axis = #{detail.x},
+ y_axis = #{detail.y}
+ WHERE
+ project_no = #{processId} AND polys_id = #{detail.polySort}
</update>
<select id="simulatedTypesettingUsingOpt">
@@ -1668,6 +1702,9 @@
WHERE
project_no = #{projectNumber}
</delete>
+ <delete id="deleteOffcutDetails">
+ delete from pp.optimize_offcut where project_no = #{processId}
+ </delete>
<select id="selectOptimizeProject">
@@ -1796,6 +1833,8 @@
SELECT
width,
height,
+ realwidth,
+ realheight,
stock_id AS stockId,
stock_code AS stockCode,
usage_rate AS usageRate,
@@ -1827,6 +1866,7 @@
y_axis AS y,
mark_icon AS markIcon,
isRotate,
+ glass_point AS glassPoint,
rack_no As rackNo
FROM
pp.optimize_detail
--
Gitblit v1.8.0