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/service/pp/GlassOptimizeService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index 9b4db66..20adb88 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -14,6 +14,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.math.BigDecimal;
import java.sql.Date;
import java.util.HashMap;
import java.util.List;
@@ -149,7 +150,14 @@
//宸ョ▼鏌ヨ娴佺▼鍗�
public Map<String, Object> getFlowCardList(String optionVal, Integer radio) {
Map<String, Object> map = new HashMap<>();
- map.put("data", glassOptimizeMapper.getFlowCardListMp(optionVal, radio));
+ if(radio==1){
+ map.put("data", glassOptimizeMapper.getFlowCardListWhole(optionVal));
+ }else if(radio==2){
+ map.put("data", glassOptimizeMapper.getFlowCardListNormal(optionVal));
+ }else{
+ map.put("data", glassOptimizeMapper.getFlowCardListPatch(optionVal));
+ }
+
return map;
}
@@ -172,10 +180,22 @@
}
//鍒犻櫎宸ョ▼
- public Map<String, Object> deleteProject(String projectNumber) {
- Map<String, Object> map = new HashMap<>();
- map.put("data", glassOptimizeMapper.deleteProjectMp(projectNumber));
- return map;
+ public boolean deleteProject(String projectNumber) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
+ if(stringObjectMap.get("state").equals(10)){
+ glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
+ glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
+ }else if(stringObjectMap.get("state").equals(20)){
+ glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
+ glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
+ glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
+ }
+ List<FlowCard> flowCardList =glassOptimizeMapper.getFlowCardList(projectNumber);
+ for (FlowCard flowCard:flowCardList){
+ glassOptimizeMapper.updateFlowCardProjectReturn(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectNumber);
+ }
+ glassOptimizeMapper.deleteProjectMp(projectNumber);
+ return true;
}
@@ -189,6 +209,7 @@
public Map<String, Object>selectProjectComputeSv(String projectNumber) {
Map<String, Object> map = new HashMap<>();
map.put("data", glassOptimizeMapper.selectProjectComputeMp(projectNumber));
+ //map.put("project", glassOptimizeMapper.selectProjectCount(projectNumber));
return map;
}
@@ -226,24 +247,28 @@
if ("null".equals(projectNmae)) {
projectNmae = "";
}
- Double sumArea = (double) 0;
- Double area = (double) 0;
+ BigDecimal sumArea = new BigDecimal(0);
+ double area = 0;
Integer sumQuantity = 0;
+ Integer type = 1;
+ StringBuilder processId= new StringBuilder();
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("projectdetail")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
//缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
- area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber());
- sumArea += area;
+ area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
+ sumArea = sumArea.add(BigDecimal.valueOf(area));
sumQuantity +=flowCard.getQuantity();
+ processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
}
int index = optionVal.indexOf("mm");
// 鑾峰彇 "mm" 鍓嶉潰鐨勯儴鍒�
String glass_thickness = optionVal.substring(0, index);
// 鑾峰彇 "mm" 鍚庨潰鐨勯儴鍒�
String glass_type = optionVal.substring(index + 2);
- glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea,userName);
+ glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
+ flowCardList.size(), String.valueOf(processId),type);
return true;
}
else {
@@ -251,4 +276,17 @@
}
}
+
+ public Map<String, Object> getConfiguration(String type) {
+ Map<String, Object> map = new HashMap<>();
+ if(type.equals("閽㈠寲")){
+ map.put("data", glassOptimizeMapper.getTemperedConfiguration());
+ }else if(type.equals("纾ㄩ噺")){
+ map.put("data", glassOptimizeMapper.getTemperedConfiguration());
+ }else if(type.equals("淇竟")){
+ map.put("data", glassOptimizeMapper.getTemperedConfiguration());
+ }
+
+ return map;
+ }
}
--
Gitblit v1.8.0