From eb6c8328231985b96ad11b38b38ae1ec926beb9a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 19 五月 2025 22:51:46 +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 | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 f42eb72..f755835 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
@@ -53,6 +53,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 +68,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 +87,7 @@
//妯℃嫙璁＄畻娴佺▼鍗¤鎯�
List<Map<String, Object>> selectComputeDetailMp(String processId,Integer technologyNumber);
+
List<Map<String, Object>> selectComputeDetailMpPatchState(String processId,Integer technologyNumber);
@@ -85,8 +97,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,6 +138,8 @@
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);
--
Gitblit v1.8.0