From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 f755835..a3c714a 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
@@ -19,6 +19,8 @@
List<Map<String, Object>> analogComputationOptimization(String projectNo);
+ List<Map<String, Object>> getOptimizeDetail(String projectNo);
+
List<Map<String, Object>> simulatedTypesettingUsingOpt(List<String> processId,List<Integer> technologyNumber);
//宸ョ▼淇℃伅娴佺▼鍗�
@@ -146,13 +148,13 @@
Boolean updateProjectMp(String projectId, String projectNmae, String glassThickness, String glassType,
Integer sumQuantity, Double sumArea, String userName,Integer processIdCount, String processId, Integer type);
- List<Map<String, Object>> getTemperedConfiguration();
+ List<Map<String, Object>> getTemperedConfiguration(String username);
- List<Map<String, Object>> getGrindingTrimming();
+ List<Map<String, Object>> getGrindingTrimming(String username);
- List<Map<String, Object>> getEdgeTrimming();
+ List<Map<String, Object>> getEdgeTrimming(String username);
- Boolean updateOptimizeConfig(String json,Integer type);
+ Boolean updateOptimizeConfig(String json,Integer type,String username);
List<Map<String, Object>> getFlowCardListSimulated(String optionVal);
@@ -174,4 +176,5 @@
//宸ョ▼淇℃伅娴佺▼鍗�
List<Map<String, Object>> getProcessCardMpThirdParty(String projectNo);
+ List<Map<String, Object>> getProjectByProjectNoSv(String projectNo);
}
--
Gitblit v1.8.0