From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +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 |   78 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 73 insertions(+), 5 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 3b7e96b..a18f3cd 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,14 @@
 
     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);
 
     List<Map<String, Object>> simulatedTypesettingUsingOpt(List<String> processId,List<Integer> technologyNumber);
 
@@ -53,6 +60,11 @@
 
     //淇敼宸ョ▼鐘舵��
     Boolean updateProjectStateMp(String projectNumber,Integer state);
+
+    Boolean updateProjectTemperingStateMp(String projectNumber,Integer states);
+
+    Boolean updateProjectOptimizeStateMp(String projectNumber,Integer states);
+
     List<Map<String, Object>> getProjectListMp();
 
     //鍒犻櫎宸ョ▼
@@ -63,6 +75,12 @@
     int deleteOptimizeHeatLayout(String projectNumber);
 
     int deleteOptimizeDetail(String projectNumber);
+
+    int deleteOptimizeLayout(String projectNumber);
+
+    int deleteOptimizeProjectFile(String projectNumber);
+
+    int updateOptimizeUse(String projectNumber);
 
     List<OptimizeHeatDetail> selectOptimizeHeatDetail(String projectNumber);
 
@@ -76,6 +94,7 @@
     //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
     List<Map<String, Object>> selectComputeDetailMp(String processId,Integer technologyNumber);
 
+
     List<Map<String, Object>> selectComputeDetailMpPatchState(String processId,Integer technologyNumber);
 
 
@@ -85,8 +104,19 @@
     void addratioResult(Map<String, Object> object);
     //妯℃嫙璁＄畻淇濆瓨 宸ョ▼淇℃伅
     void addratioProjectResult(Map<String, Object> object);
+
+    void insertOptimizeHeatDetail(String projectId,String processId,Integer technologyNumber,Integer patchState,
+                                  Integer orderNumber,Double width,Double height,Integer index,String username);
     //浼樺寲璁剧疆淇濆瓨
-    void optimizeParmsSave(String jsonString);
+    void optimizeParmsSave(String jsonString,String username);
+
+    void addOptimizeDetail(List<Map<String, Object>> object,String projectId);
+
+    void addOptimizeLayout(List<Map<String, Object>> object,String projectId);
+
+    void addOptimizeProjectFile(String object,String projectId,String name);
+
+    void addOptimizeUse(List<Map<String, Object>> object,String projectId,String name);
 
     //浼樺寲缁撴灉淇濆瓨
     void optimizeResultSave(String jsonString);
@@ -115,19 +145,25 @@
 
     Double getSelectAreaPatchLog(String processId, String technologyNumber);
 
+    Integer selectPatchLogState(String processId, Integer technologyNumber,Integer orderNumber,String projectNo);
+
     Boolean addProjectMp(String projectId, String projectNmae, String glassThickness, String glassType,
                          Integer sumQuantity, Double sumArea, String userName,Integer processIdCount, String processId, Integer type);
 
     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>> getGrindingOptimize(String username);
 
-    Boolean updateOptimizeConfig(String json,Integer type);
+    List<Map<String, Object>> getEdgeTrimming(String username);
+
+    Boolean updateOptimizeConfig(String json,Integer type,String username);
+
+    List<Map<String, Object>> getFlowCardListSimulated(String optionVal);
 
 
 
@@ -147,4 +183,36 @@
     //宸ョ▼淇℃伅娴佺▼鍗�
     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);
 }

--
Gitblit v1.8.0