From e0ef8c8a3fc4b65aaf2abe07a954a88deb817bc3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 四月 2025 16:08:15 +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 | 30 ++++++++++++++++++++++++++----
1 files changed, 26 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 b997236..3b7e96b 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;
@@ -67,6 +64,10 @@
int deleteOptimizeDetail(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);
@@ -93,6 +94,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);
@@ -125,4 +128,23 @@
List<Map<String, Object>> getEdgeTrimming();
Boolean updateOptimizeConfig(String json,Integer type);
+
+
+
+
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+ 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