From 8fb3ee9eae369f7a5c39da8ed69d0e8cea3ae2f8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 16:24:59 +0800
Subject: [PATCH] 生产加工单上显示图纸和图纸尺寸调整功能，流程卡上图纸尺寸调整功能

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java |   77 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 73 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..63e20e9 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);
 
@@ -146,13 +153,15 @@
     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);
 
@@ -174,4 +183,64 @@
     //宸ョ▼淇℃伅娴佺▼鍗�
     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,double totalArea );
+
+    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);
+
+    String selectConfigByUserAndType(String username, int type);
+
+    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);
 }

--
Gitblit v1.8.0