From 569c889395ebe14caf48820e7bfb0551357ec0d2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 九月 2025 08:59:52 +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 | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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..6502aa7 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,35 @@
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);
+
+ 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);
+
+ void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults);
}
--
Gitblit v1.8.0