From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java |   69 ++++++++++++++++++++++++++++++----
 1 files changed, 60 insertions(+), 9 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 b997236..2bf47f0 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
@@ -1,10 +1,7 @@
 package com.example.erp.mapper.pp;
 
 
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.pp.OptimizeProjectMange;
-import com.example.erp.entity.pp.OptimizeUse;
-import com.example.erp.entity.pp.PatchLog;
+import com.example.erp.entity.pp.*;
 import com.example.erp.entity.sd.OrderGlassDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,6 +18,8 @@
     List<Map<String, Object>> firstOptimization(String projectNo);
 
     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);
 
@@ -56,6 +55,11 @@
 
     //淇敼宸ョ▼鐘舵��
     Boolean updateProjectStateMp(String projectNumber,Integer state);
+
+    Boolean updateProjectTemperingStateMp(String projectNumber,Integer states);
+
+    Boolean updateProjectOptimizeStateMp(String projectNumber,Integer states);
+
     List<Map<String, Object>> getProjectListMp();
 
     //鍒犻櫎宸ョ▼
@@ -67,6 +71,16 @@
 
     int deleteOptimizeDetail(String projectNumber);
 
+    int deleteOptimizeLayout(String projectNumber);
+
+    int deleteOptimizeProjectFile(String projectNumber);
+
+    int updateOptimizeUse(String projectNumber);
+
+    List<OptimizeHeatDetail> selectOptimizeHeatDetail(String projectNumber);
+
+    OptimizeDetail selectOptimizeDetailById(String projectNumber,String processId,Integer orderSort,Integer layer);
+
     //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
     List<Map<String, Object>> selectProjectComputeMp(@Param("projectNo")String projectNumber);
 
@@ -74,6 +88,7 @@
 
     //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
     List<Map<String, Object>> selectComputeDetailMp(String processId,Integer technologyNumber);
+
 
     List<Map<String, Object>> selectComputeDetailMpPatchState(String processId,Integer technologyNumber);
 
@@ -84,8 +99,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);
@@ -93,6 +119,8 @@
     List<Map<String, Object>> selectOptimizeResult(String processId);
     //浼樺寲缁撴灉璋冩暣
     void updateOptimizeResult(String jsonString,String processId);
+
+    void updateOptimizeDetail(Long id,Integer layoutId,Integer sort);
 
     List<Map<String, Object>> getProcessCardDetailmMp(String processId, Integer technologyNumber);
 
@@ -112,17 +140,40 @@
 
     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>> getEdgeTrimming(String username);
 
-    Boolean updateOptimizeConfig(String json,Integer type);
+    Boolean updateOptimizeConfig(String json,Integer type,String username);
+
+    List<Map<String, Object>> getFlowCardListSimulated(String optionVal);
+
+
+
+
+    //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+    List<Map<String, Object>> selectProjectComputeMpThirdParty(@Param("projectNo")String projectNumber);
+
+    //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+    List<Map<String, Object>> selectComputeDetailMpThirdParty(String processId,Integer technologyNumber);
+
+    int deleteOptimizeDetailThirdParty(String projectNumber);
+
+    List<Map<String, Object>> firstOptimizationThirdParty(String projectNo);
+
+    List<Map<String, Object>> analogComputationOptimizationThirdParty(String projectNo);
+
+    //宸ョ▼淇℃伅娴佺▼鍗�
+    List<Map<String, Object>> getProcessCardMpThirdParty(String projectNo);
+
 }

--
Gitblit v1.8.0