From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +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 | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 be7254a..63e20e9 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
@@ -214,7 +214,7 @@
void addUpdateOffcut(Map<String, Object> detail, String processId, String glassType, String glassThickness, int stockId);
- void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults);
+ void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults,double totalArea );
List<Map<String, Object>> getReportDataProcessIdSv(String processId);
@@ -230,7 +230,17 @@
List<Map<String, Object>> getLayoutSetSv(String processId);
- String selectConfigByUserAndType(String username, String type);
+ String selectConfigByUserAndType(String username, int type);
void insertOptimizeConfig(String json, int type, String userName, String configName);
+
+ Map<String, Object> getGlassProjectList(String projectId);
+
+ Map<String, Object> getProjectState(String projectNo);
+
+ void updateProjectTemperingId(String projectNumber);
+
+ List<Map<String, Object>> optimizeTemp(String projectNo);
+
+ List<Map<String, Object>> selectTempProject(String processId);
}
--
Gitblit v1.8.0