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 | 66 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 5 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 83b14b5..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;
//妯℃嫙璁＄畻
@@ -367,8 +371,22 @@
// tempering_state 涓� 0 鏃剁殑澶勭悊閫昏緫
glassOptimizeMapper.addOptimizeDetail(allGlassDetails,projectId);
}
-
- glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults);
+ 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();
@@ -639,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;
}
@@ -718,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){
@@ -739,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){
@@ -1196,7 +1250,7 @@
boolean saveState=false;
try {
// 1. 鍒涘缓URL瀵硅薄
- URL url = new URL("http://10.153.19.31:88/api/loadGlass/engineering/importEngineer");
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");
// 2. 鎵撳紑杩炴帴
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -1434,7 +1488,9 @@
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");
+
// 2. 鎵撳紑杩炴帴
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
--
Gitblit v1.8.0