From 46964bace341e98f238a0a3fd29f6adc643312c7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 24 十一月 2025 13:14:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 155 insertions(+), 4 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 e74206f..14e87e4 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}") // 娉ㄥ叆mesIp閰嶇疆锛岄粯璁ゅ�间负10.153.19.31
+ private String mesIp;
RabbitMQUtil rabbitMQUtil;
//妯℃嫙璁＄畻
@@ -270,6 +274,9 @@
List<Map<String, Object>> objectMapList = (List<Map<String, Object>>) optimalResults.get("layouts");
glassOptimizeMapper.addOptimizeLayout(objectMapList,projectId);
+ // 鏀堕泦鎵�鏈夐渶瑕佷繚瀛樼殑鐜荤拑鏄庣粏鏁版嵁
+ List<Map<String, Object>> allGlassDetails = new ArrayList<>();
+
for(Map<String, Object> objectMap:objectMapList){
List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails");
//杩唬鐜荤拑鏄庣粏闆嗗悎澶勭悊浣欐枡鍜屽叾浠�
@@ -346,10 +353,40 @@
}
}
}
- glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
+ // 灏嗗綋鍓嶆壒娆＄殑鐜荤拑鏄庣粏娣诲姞鍒版�诲垪琛ㄤ腑
+ allGlassDetails.addAll(objectMap2);
}
- glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults);
+ Map<String, Object> projectInfo = glassOptimizeMapper.getGlassProjectList(projectId);
+ if (projectInfo != null && Integer.parseInt(projectInfo.get("tempering_state").toString()) == 1) {
+ // tempering_state 涓� 1 鏃剁殑澶勭悊閫昏緫
+ glassOptimizeMapper.addOptimizeDetail(allGlassDetails,projectId);
+ List<OptimizeHeatDetail> optimizeHeatDetail = glassOptimizeMapper.selectOptimizeHeatDetail(projectId);
+ for (OptimizeHeatDetail projectdetail:optimizeHeatDetail){
+ OptimizeDetail optimizeDetail=glassOptimizeMapper.selectOptimizeDetailById(projectId,projectdetail.getProcessId(),
+ projectdetail.getOrderSort(),projectdetail.getLayer());
+ glassOptimizeMapper.updateOptimizeDetail(optimizeDetail.getId(),projectdetail.getLayoutId(),projectdetail.getSort());
+ }
+ } else {
+ // tempering_state 涓� 0 鏃剁殑澶勭悊閫昏緫
+ glassOptimizeMapper.addOptimizeDetail(allGlassDetails,projectId);
+ }
+ List<Map<String, Object>> materialStoreList = glassOptimizeMapper.materialStoreOptimizeUse(projectId);
+ double totalUseArea = 0.0;
+ for (Map<String, Object> material : materialStoreList) {
+ if (material.containsKey("totalArea")) {
+ Object totalAreaObj = material.get("totalArea");
+ if (totalAreaObj != null) {
+ try {
+ double area = Double.parseDouble(totalAreaObj.toString());
+ totalUseArea += area;
+ } catch (NumberFormatException e) {
+ System.err.println("鏃犳硶瑙ｆ瀽鎬婚潰绉暟鎹�: " + totalAreaObj);
+ }
+ }
+ }
+ }
+ glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults, totalUseArea);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -620,7 +657,10 @@
}
}
}
+ 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;
}
@@ -699,6 +739,22 @@
glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
glassOptimizeMapper.updateProjectTemperingStateMp(projectNumber, states);
+ Map<String, Object> temperingState = glassOptimizeMapper.getProjectState(projectNumber);
+
+ if (temperingState != null && temperingState.containsKey("optimize_state")) {
+ Object optimizeStateObj = temperingState.get("optimize_state");
+ if (optimizeStateObj != null) {
+ try {
+ int optimizeState = Integer.parseInt(optimizeStateObj.toString());
+ if (optimizeState == 1) {
+ glassOptimizeMapper.updateProjectTemperingId(projectNumber);
+ }
+ } catch (NumberFormatException e) {
+ // 澶勭悊杞崲寮傚父锛岃褰曟棩蹇楁垨閲囧彇鍏朵粬閫傚綋鎺柦
+ System.err.println("瑙ｆ瀽 optimize_state 澶辫触: " + e.getMessage());
+ }
+ }
+ }
}
//鎾ら攢浼樺寲鎺掔増
else if(code==2){
@@ -720,7 +776,24 @@
}
//鐢熶骇涓嶅彲瑙�
else if(code==4){
- glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ Map<String, Object> cancelResult = issuingCancelProject(projectNumber);
+ // 鑾峰彇杩斿洖缁撴灉涓殑data瀛楁
+ Map<String, Object> responseData = (Map<String, Object>) cancelResult.get("data");
+ // 妫�鏌ュ搷搴斾腑鐨刢ode瀛楁锛屽彧鏈夊綋code涓�200鎴�202鏃舵墠鍏佽鏇存柊鐘舵��
+ if (responseData != null && responseData.containsKey("code")) {
+ Object responseCode = responseData.get("code");
+ if (responseCode.equals(200) || responseCode.equals(202)) {
+ glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ } else if (responseCode.equals(201)) {
+ // 褰撹繑鍥�201鏃讹紝鎶涘嚭鑷畾涔夊紓甯告垨杩斿洖閿欒淇℃伅
+ throw new RuntimeException(responseData.get("message").toString());
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+
}
//鍒濆鍖栧伐绋�
else if(code==5){
@@ -1177,7 +1250,7 @@
boolean saveState=false;
try {
// 1. 鍒涘缓URL瀵硅薄
- 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();
@@ -1403,4 +1476,82 @@
}
+ public Map<String, Object> getProjectState(String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProjectState(projectNo));
+ return map;
+ }
+
+ public Map<String, Object> issuingCancelProject(String projectNo){
+ Map<String, Object> result = new HashMap<>();
+ Map<String, Object> responseData = new HashMap<>();
+
+ try {
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/optimizeCancelTask");
+// URL url = new URL("http://localhost:88/api/loadGlass/engineering/optimizeCancelTask");
+
+
+ // 2. 鎵撳紑杩炴帴
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ // 3. 鍑嗗璇锋眰浣� - 灏唒rojectNo杞崲涓篹ngineerId鏍煎紡
+ String engineerId = projectNo;
+ // 濡傛灉浼犲叆鐨勬槸JSON瀛楃涓诧紝闇�瑕佹彁鍙栫湡姝ｇ殑projectNo鍊�
+ if (projectNo.startsWith("{") && projectNo.contains("\"projectNo\"")) {
+ try {
+ JSONObject jsonObject = JSONObject.parseObject(projectNo);
+ engineerId = jsonObject.getString("projectNo");
+ } catch (Exception e) {
+ // 瑙ｆ瀽澶辫触鏃朵娇鐢ㄥ師濮嬪��
+ System.err.println("瑙ｆ瀽projectNo JSON澶辫触: " + e.getMessage());
+ }
+ }
+
+ // 鏋勫缓鏂扮殑JSON璇锋眰浣擄紝浣跨敤engineerId瀛楁
+ String jsonInputString = "{\"engineerId\":\"" + engineerId + "\"}";
+ System.out.println("engineerId: " + engineerId);
+ System.out.println("Request: " + jsonInputString);
+
+ //鍙戦�佽姹�
+ try(OutputStream os = conn.getOutputStream()) {
+ byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ // 鑾峰彇鍝嶅簲
+ try(BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+ StringBuilder response = new StringBuilder();
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+ String fullResponse = response.toString();
+ System.out.println("Response: " + fullResponse);
+
+ // 鐩存帴灏嗗搷搴斿唴瀹硅В鏋愪负Map
+ responseData = JSONObject.parseObject(fullResponse, Map.class);
+ }
+
+ //鍏抽棴杩炴帴
+ conn.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ // 寮傚父鎯呭喌涓嬪皢寮傚父淇℃伅鏀惧叆data
+ responseData.put("error", e.getMessage());
+ }
+
+ // 鏋勯�犳渶缁堣繑鍥炵粨鏋�
+ result.put("data", responseData);
+
+ return result;
+ }
+
+
+
}
--
Gitblit v1.8.0