From 78ed3451273dd83a198e337aae6de2c895dae3a3 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 31 十二月 2025 13:57:50 +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 | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 0e307a8..8edde88 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);
@@ -235,4 +235,38 @@
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);
+
+ Map<String, Object> getGlassType(String projectNo);
+
+ String getRockNo(Object glassId);
+
+ Map<String, Object> getTrimInfo(String projectNo, Object stockId);
+
+ Map<String, Object> selectOptimizeDynamicProject(String projectNo);
+
+ List<Map<String,Object>> selectOptimizeDynamicLayout(String projectNo);
+
+ List<Map<String,Object>> selectOptimizeDynamicDetail(String projectNo);
+
+ List<Map<String,Object>> selectFlowCardDynamicInfoList(String projectNo);
+
+ void insertDynamicProject(Map<String, Object> dataObj);
+
+ void insertDynamicLayout(Map<String, Object> layout);
+
+ void insertDynamicDetail(List<Map<String, Object>> glassDetails, String projectNo);
+
+ void deleteOptimizeDynamicProject(String projectNo);
+
+ void deleteOptimizeDynamicLayout(String projectNo);
+
+ void deleteOptimizeDynamicDetail(String projectNo);
}
--
Gitblit v1.8.0