From 815291db624a99110ae2788efbecd4639fa2ee87 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 07 四月 2025 16:47:49 +0800
Subject: [PATCH] 优化部分样式修改,工程创建后端修改,创建工程根据膜系查询数据修改,模拟计算钢化参数后台获取,删除工程修改

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java |   21 ++++++++++++++++++++-
 1 files changed, 20 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 31bd51d..a2f73b3 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,6 +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.sd.OrderGlassDetail;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,6 +19,8 @@
     //宸ョ▼淇℃伅娴佺▼鍗�
     List<Map<String, Object>> getProcessCardMp(String projectNo);
 
+    List<FlowCard> getFlowCardList(String projectNo);
+
     //搴撳瓨淇℃伅
     List<Map<String, Object>>  materialStoreMp(String thickness, String model);
 
@@ -26,6 +29,9 @@
 
     //鍒涘缓宸ョ▼鑶滅郴鏌ヨ
     List<Map<String, Object>> getFlowCardListMp(String optionVal, Integer radio);
+    List<Map<String, Object>> getFlowCardListWhole(String optionVal);
+    List<Map<String, Object>> getFlowCardListNormal(String optionVal);
+    List<Map<String, Object>> getFlowCardListPatch(String optionVal);
 
     //宸ョ▼绠$悊宸ョ▼鍙锋煡璇�
     List<OptimizeProjectMange> optimizeProjectMangeMp(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange);
@@ -37,8 +43,16 @@
     //鍒犻櫎宸ョ▼
     int deleteProjectMp(String projectNumber);
 
+    int deleteOptimizeHeatDetail(String projectNumber);
+
+    int deleteOptimizeHeatLayout(String projectNumber);
+
+    int deleteOptimizeDetail(String projectNumber);
+
     //妯℃嫙璁$畻宸ョ▼鍙锋煡璇�
     List<Map<String, Object>> selectProjectComputeMp(@Param("projectNo")String projectNumber);
+
+    Map<String, Object> selectProjectCount(@Param("projectNo")String projectNumber);
 
     //妯℃嫙璁$畻娴佺▼鍗¤鎯�
     List<Map<String, Object>> selectComputeDetailMp(String processId);
@@ -68,7 +82,12 @@
 
     Boolean updateFlowCardProject(String processId, String technologyNumber, String projectId);
 
+    Boolean updateFlowCardProjectReturn(String processId, String technologyNumber, String projectId);
+
     Double getSelectArea(String processId, String technologyNumber);
 
-    Boolean addProjectMp(String projectId, String projectNmae, String glassThickness, String glassType, Integer sumQuantity, Double sumArea, String userName);
+    Boolean addProjectMp(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();
 }

--
Gitblit v1.8.0