From 1d2f6686a02c9d8c6898b078e6d7cd2dc0b546d8 Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期三, 03 十二月 2025 09:05:57 +0800
Subject: [PATCH] 修改默认ip
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 136 +++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 60 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 cf806da..a3f2b8e 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
@@ -18,6 +18,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -45,6 +46,9 @@
GlassOptimizeMapper glassOptimizeMapper;
@Autowired
SysErrorService sysErrorService;
+
+ @Value("${mesIp:localhost}")
+ private String mesIp;
RabbitMQUtil rabbitMQUtil;
//妯℃嫙璁＄畻
@@ -635,6 +639,10 @@
} else {
dataList = glassOptimizeMapper.directOptimization(projectNo);
}
+ List<Map<String, Object>> tempDataList = null;
+ if (Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1) {
+ tempDataList = glassOptimizeMapper.optimizeTemp(projectNo);
+ }
// 鑾峰彇纾ㄩ噺閰嶇疆鏁版嵁
List<Map<String, Object>> grindingTrimmingList = glassOptimizeMapper.getGrindingOptimize(username);
@@ -653,7 +661,13 @@
}
}
}
+ if (tempDataList != null && !tempDataList.isEmpty()) {
+ dataList.addAll(tempDataList);
+ }
+ map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
map.put("data", dataList);
+ map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
return map;
}
@@ -913,68 +927,68 @@
int state2 = 0;
StringBuilder processId= new StringBuilder();
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("projectdetail")), FlowCard.class);
- if (!flowCardList.isEmpty()) {
- if(projectType.equals("2")){
- deleteProject(projectId,2);
+ if(projectType.equals("2")){
+ deleteProject(projectId,2);
+ }
+
+ // 鍒涘缓涓�涓槧灏勬潵瀛樺偍 (processId-technologyNumber) 缁勫悎鍒� rack 缂栧彿鐨勬槧灏�
+ Map<String, Integer> rackMap = new HashMap<>();
+ int rackCounter = 1;
+
+ // 濡傛灉涓虹┖娴佺▼鍗★紝鍒欏皢 type 璁剧疆涓� 1
+ if (flowCardList == null || flowCardList.isEmpty()) {
+ type = 1;
+ }
+ for (FlowCard flowCard : flowCardList) {
+ // 涓烘瘡涓敮涓�鐨� processId-technologyNumber 缁勫悎鍒嗛厤 rack 缂栧彿
+ String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
+ if (!rackMap.containsKey(key)) {
+ rackMap.put(key, rackCounter++);
+ }
+ int rackValue = rackMap.get(key);
+
+ if(flowCard.getPatchState().equals(0)){
+ state1=1;
+ //缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
+ Boolean a = glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+ // 鏇存柊娴佺▼鍗＄殑rack瀛楁
+ glassOptimizeMapper.updateFlowCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), rackValue);
+ 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(";");
+ }else{
+ state2=1;
+ Boolean a=glassOptimizeMapper.updatePatchLogProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+ area = glassOptimizeMapper.getSelectAreaPatchLog(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
+ sumArea = sumArea.add(BigDecimal.valueOf(area));
+ sumQuantity +=flowCard.getQuantity();
+ processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
}
- // 鍒涘缓涓�涓槧灏勬潵瀛樺偍 (processId-technologyNumber) 缁勫悎鍒� rack 缂栧彿鐨勬槧灏�
- Map<String, Integer> rackMap = new HashMap<>();
- int rackCounter = 1;
+ }
+ if(state1==1&&state2==0){
+ type=1;
+ }else if(state1==1&&state2==1){
+ type=2;
+ }
- for (FlowCard flowCard : flowCardList) {
- // 涓烘瘡涓敮涓�鐨� processId-technologyNumber 缁勫悎鍒嗛厤 rack 缂栧彿
- String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
- if (!rackMap.containsKey(key)) {
- rackMap.put(key, rackCounter++);
- }
- int rackValue = rackMap.get(key);
-
- if(flowCard.getPatchState().equals(0)){
- state1=1;
- //缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
- Boolean a = glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
- // 鏇存柊娴佺▼鍗＄殑rack瀛楁
- glassOptimizeMapper.updateFlowCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), rackValue);
- 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(";");
- }else{
- state2=1;
- Boolean a=glassOptimizeMapper.updatePatchLogProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
- area = glassOptimizeMapper.getSelectAreaPatchLog(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
- sumArea = sumArea.add(BigDecimal.valueOf(area));
- sumQuantity +=flowCard.getQuantity();
- processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
- }
-
- }
- if(state1==1&&state2==0){
- type=1;
- }else if(state1==1&&state2==1){
- type=2;
- }
- int index = optionVal.indexOf("mm");
- // 鑾峰彇 "mm" 鍓嶉潰鐨勯儴鍒�
- String glass_thickness = optionVal.substring(0, index);
- // 鑾峰彇 "mm" 鍚庨潰鐨勯儴鍒�
- String glass_type = optionVal.substring(index + 2);
- if(projectType.equals("2")){
- glassOptimizeMapper.updateProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
+ int index = optionVal.indexOf("mm");
+ // 鑾峰彇 "mm" 鍓嶉潰鐨勯儴鍒�
+ String glass_thickness = optionVal.substring(0, index);
+ // 鑾峰彇 "mm" 鍚庨潰鐨勯儴鍒�
+ String glass_type = optionVal.substring(index + 2);
+ if(projectType.equals("2")){
+ glassOptimizeMapper.updateProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
+ flowCardList.size(), String.valueOf(processId),type);
+ }else{
+ if(glassOptimizeMapper.selectProjectCount(projectId)==null){
+ glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
flowCardList.size(), String.valueOf(processId),type);
}else{
- if(glassOptimizeMapper.selectProjectCount(projectId)==null){
- glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
- flowCardList.size(), String.valueOf(processId),type);
- }else{
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- return "false1";
- }
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false1";
}
- }else {
- return "false2";
-
}
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -1242,9 +1256,9 @@
public Boolean issuingProjects(String projectNo) throws JsonProcessingException {
boolean saveState=false;
try {
+ System.out.println(mesIp);
// 1. 鍒涘缓URL瀵硅薄
- URL url = new URL("http://10.153.19.31:88/api/loadGlass/engineering/importEngineer");
-// URL url = new URL("http://localhost:88/api/loadGlass/engineering/importEngineer");
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");
// 2. 鎵撳紑杩炴帴
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -1381,6 +1395,8 @@
public Map<String, Object> getProductListSv(String processId) {
Map<String, Object> productMap = new HashMap<>();
List<Map<String, Object>> productInfo = glassOptimizeMapper.selectProjectList(processId);
+ List<Map<String, Object>> tempProductInfo = glassOptimizeMapper.selectTempProject(processId);
+ productInfo.addAll(tempProductInfo);
productMap.put("productInfo", productInfo);
Map<String, Object> map = new HashMap<>();
@@ -1388,7 +1404,7 @@
// 鎸夌収 processCard 鍒嗙粍
Map<String, List<Map<String, Object>>> groupedByProcessCard = new HashMap<>();
for (Map<String, Object> item : productInfo) {
- String processCard = (String) item.get("processCard");
+ String processCard = String.valueOf(item.get("processCard"));
if (processCard != null) {
groupedByProcessCard.computeIfAbsent(processCard, k -> new ArrayList<>()).add(item);
}
@@ -1482,7 +1498,7 @@
try {
// 1. 鍒涘缓URL瀵硅薄
- URL url = new URL("http://10.153.19.31:88/api/loadGlass/engineering/optimizeCancelTask");
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/optimizeCancelTask");
// URL url = new URL("http://localhost:88/api/loadGlass/engineering/optimizeCancelTask");
--
Gitblit v1.8.0