From 6aeb134430e16e0dde739da0274c1d60273f0f89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 10 十月 2025 09:08:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
index 32daa6d..a18f3cd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
@@ -194,4 +194,25 @@
     List<Map<String,Object>> selectOptimizeDetail(String projectNo);
 
     List<Map<String,Object>> selectFlowCardInfoList(String projectNo);
+
+
+    Map<String, Object> getGlassInfo(String projectId);
+
+    void addOptimizeOffcut(Map<String, Object> map, String projectId, String glassType, String glassThickness);
+
+    List<Map<String, Object>> getOptimizeLayoutsInfo(String processId);
+
+    List<Map<String, Object>> getOptimizeDetailsInfo(String processId);
+
+    List<Map<String, Object>> getOptimizeOffsetsInfo(String processId);
+
+    int deleteOptimizeOffcut(String projectNumber);
+
+    void updateNormalDetails(Map<String, Object> detail, String processId);
+
+    void deleteOffcutDetails(String processId);
+
+    void addUpdateOffcut(Map<String, Object> detail, String processId, String glassType, String glassThickness, int stockId);
+
+    void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults);
 }

--
Gitblit v1.8.0