From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 fda3062..0c92e42 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
@@ -22,7 +22,6 @@
     List<Map<String, Object>> analogComputationOptimization(String projectNo);
 
 
-    // todo 妯℃嫙璁$畻杩欏潡鍎跨殑rackNo涓虹‖缂栫爜锛屽悗缁渶瑕佹敼
     List<Map<String, Object>> computeAndOptimization(String projectNo);
 
     List<Map<String, Object>> getOptimizeDetail(String projectNo);
@@ -185,4 +184,19 @@
     List<Map<String, Object>> getProcessCardMpThirdParty(String projectNo);
 
     List<Map<String, Object>> getProjectByProjectNoSv(String projectNo);
+
+    void updateFlowCardRack(String processId, String technologyNumber, int rackValue);
+
+    Map<String,Object> selectOptimizeProject(String projectNo);
+
+    List<Map<String,Object>> selectOptimizeLayout(String projectNo);
+
+    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);
 }

--
Gitblit v1.8.0