From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 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 a3c714a..bd27548 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
@@ -17,7 +17,12 @@
List<Map<String, Object>> firstOptimization(String projectNo);
+ List<Map<String, Object>> directOptimization(String projectNo);
+
List<Map<String, Object>> analogComputationOptimization(String projectNo);
+
+
+ List<Map<String, Object>> computeAndOptimization(String projectNo);
List<Map<String, Object>> getOptimizeDetail(String projectNo);
@@ -152,6 +157,8 @@
List<Map<String, Object>> getGrindingTrimming(String username);
+ List<Map<String, Object>> getGrindingOptimize(String username);
+
List<Map<String, Object>> getEdgeTrimming(String username);
Boolean updateOptimizeConfig(String json,Integer type,String username);
@@ -177,4 +184,49 @@
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, int stockId);
+
+ void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults);
+
+ List<Map<String, Object>> getReportDataProcessIdSv(String processId);
+
+ List<Map<String, Object>> getPeriMeterDataSv(String processId);
+
+ List<Map<String, Object>> getMaterialInfoSv(String processId);
+
+ List<Map<String, Object>> getProductListSv(String processId);
+
+ List<Map<String, Object>> selectProjectList(String processId);
+
+ List<Map<String, Object>> materialOptimizeUse(String processId);
+
+ List<Map<String, Object>> getLayoutSetSv(String processId);
}
--
Gitblit v1.8.0