From 8052785b8f8c423b3ba62b2c546d628b801b18dc Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 30 十二月 2025 08:41:31 +0800
Subject: [PATCH] 新增 动态补片功能
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 659 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 592 insertions(+), 67 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 39a31c0..b3bab2d 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
@@ -4,17 +4,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.common.RabbitMQUtil;
+import com.example.erp.dto.pp.MesCalculateDTO;
import com.example.erp.entity.pp.*;
-import com.example.erp.entity.sd.Delivery;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.GlassOptimizeMapper;
import com.example.erp.service.userInfo.SysErrorService;
import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,18 +21,15 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.sql.Date;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
import java.util.*;
-import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
@Service
@@ -47,7 +41,7 @@
@Autowired
SysErrorService sysErrorService;
- @Value("${mesIp:localhost}") // 娉ㄥ叆mesIp閰嶇疆锛岄粯璁ゅ�间负10.153.19.31
+ @Value("${mesIp:localhost}")
private String mesIp;
RabbitMQUtil rabbitMQUtil;
@@ -927,68 +921,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);
@@ -1256,6 +1250,7 @@
public Boolean issuingProjects(String projectNo) throws JsonProcessingException {
boolean saveState=false;
try {
+ System.out.println(mesIp);
// 1. 鍒涘缓URL瀵硅薄
URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");
@@ -1394,6 +1389,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<>();
@@ -1401,7 +1398,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);
}
@@ -1560,5 +1557,533 @@
}
+ public void processExternalOptimizeRequest(MesCalculateDTO mesCalculateDTO){
+ // 浣跨敤鍙嶅皠灏嗗璞¤浆鎹负 Map锛屼娇鐢� Java 瀛楁鍚�
+ List<Map<String, Object>> materialDetailList = new ArrayList<>();
+ if (mesCalculateDTO.getEngineeringRawQueueList() != null) {
+ for (MesCalculateDTO.EngineeringRawQueue materialDetail : mesCalculateDTO.getEngineeringRawQueueList()) {
+ Map<String, Object> materialMap = objectToMapUsingFields(materialDetail);
+ materialDetailList.add(materialMap);
+ }
+ }
+ List<Map<String, Object>> glassDetailList = new ArrayList<>();
+ if (mesCalculateDTO.getGlassInfoList() != null) {
+ for (MesCalculateDTO.GlassInfo glassDetail : mesCalculateDTO.getGlassInfoList()) {
+ Map<String, Object> glassMap = objectToMapUsingFields(glassDetail);
+ glassDetailList.add(glassMap);
+ }
+ }
+
+ List<Map<String, Object>> glassDamageList = new ArrayList<>();
+ if (mesCalculateDTO.getDamageList() != null) {
+ for (MesCalculateDTO.DamageList damageInfo : mesCalculateDTO.getDamageList()) {
+ Map<String, Object> damageMap = objectToMapUsingFields(damageInfo);
+ glassDamageList.add(damageMap);
+ }
+ }
+
+ List<Map<String, Object>> glassDamageTempList = new ArrayList<>();
+ if (mesCalculateDTO.getDamageList() != null) {
+ for (MesCalculateDTO.DamageList damageInfo : mesCalculateDTO.getDamageList()) {
+ Map<String, Object> damageMap = objectToMapUsingFields(damageInfo);
+ // 鍒涘缓鏂扮殑Map鍙繚鐣檊lassId瀛楁骞舵坊鍔爎eportState瀛楁
+ Map<String, Object> filteredDamageMap = new HashMap<>();
+ if (damageMap.containsKey("glassId")) {
+ filteredDamageMap.put("glassId", damageMap.get("glassId"));
+ }
+ filteredDamageMap.put("reportState", 10);
+ glassDamageTempList.add(filteredDamageMap);
+ }
+ }
+
+ String projectNo = mesCalculateDTO.getEngineerId();
+ System.out.println("projectNo: " + projectNo);
+
+ for (Map<String, Object> materialDetail : materialDetailList) {
+ Object stockId = materialDetail.get("rawSequence");
+ Map<String, Object> trimInfo = glassOptimizeMapper.getTrimInfo(projectNo, stockId);
+ if (trimInfo != null) {
+ materialDetail.putAll(trimInfo);
+ }
+ }
+
+ Map<String, Object> glassOptimaizeMap = new HashMap<>();
+ Map<String, Object> optimizeProperty = glassOptimizeMapper.getGlassType(projectNo);
+
+ glassOptimaizeMap.put("requestSource", "ERP");
+ glassOptimaizeMap.put("usageRate", mesCalculateDTO.getUsageRate());
+ glassOptimaizeMap.put("optimizeProperty", optimizeProperty);
+ glassOptimaizeMap.put("engineeringRawQueueList", materialDetailList);
+ glassOptimaizeMap.put("glassInfoList", glassDetailList);
+
+ try {
+ ObjectMapper objectMapper = new ObjectMapper();
+
+ String glassDamageListJson = objectMapper.writeValueAsString(glassDamageList);
+ System.out.println("damageList JSON: " + glassDamageListJson);
+
+ String glassDamageTempListJson = objectMapper.writeValueAsString(glassDamageTempList);
+ System.out.println("glassDamageTempListJson: " + glassDamageTempListJson);
+
+ String optimizeJsonString = objectMapper.writeValueAsString(glassOptimaizeMap);
+ System.out.println("glassTypeMap JSON: " + optimizeJsonString);
+
+ // 鑾峰彇骞惰緭鍑哄姩鎬佷紭鍖栬繑鍥炵粨鏋�
+ String optimizeResult = callDynamicOptimizeApi(optimizeJsonString);
+ System.out.println("鍔ㄦ�佷紭鍖栬繑鍥炵粨鏋�: " + optimizeResult);
+
+ // 灏嗙粨鏋滆浆鎹负JSON鏍煎紡
+ Object optimaizeResultJson = null;
+ try {
+ // 灏濊瘯瑙ｆ瀽涓篔SON瀵硅薄
+ optimaizeResultJson = objectMapper.readValue(optimizeResult, Object.class);
+ } catch (Exception e) {
+ // 濡傛灉涓嶆槸鏈夋晥鐨凧SON瀛楃涓诧紝鍒涘缓涓�涓寘鍚師濮嬪瓧绗︿覆鐨凪ap
+ Map<String, String> errorResult = new HashMap<>();
+ errorResult.put("result", optimizeResult);
+ optimaizeResultJson = errorResult;
+ }
+
+ // 杈撳嚭JSON鏍煎紡鐨勭粨鏋�
+ String jsonOptimizeResult = objectMapper.writeValueAsString(optimaizeResultJson);
+ System.out.println("鍔ㄦ�佷紭鍖栬繑鍥炵粨鏋淛SON鏍煎紡: " + jsonOptimizeResult);
+
+ // 璋冪敤issuingDamageDynamicProjects鎺ュ彛
+ Boolean MESResult = issuingDamageDynamicProjects(projectNo, glassDamageTempList);
+ System.out.println("MES杩斿洖缁撴灉: " + MESResult);
+
+
+ // 妫�鏌ssuingDamageDynamicProjects鎺ュ彛璋冪敤缁撴灉锛屽鏋滃け璐ュ垯鍋滄鍚庣画鎿嶄綔
+ if (!MESResult) {
+ System.out.println("issuingDamageDynamicProjects鎺ュ彛璋冪敤澶辫触锛屽仠姝㈠悗缁搷浣�");
+ return;
+ }
+
+ // 璋冪敤cutFiles鎺ュ彛
+ Boolean cutFileResult = callCutFilesApi(jsonOptimizeResult);
+ System.out.println("璋冪敤cutFiles鎺ュ彛杩斿洖缁撴灉: " + cutFileResult);
+
+ // 妫�鏌utFiles鎺ュ彛璋冪敤缁撴灉锛屽鏋滃け璐ュ垯鍋滄鍚庣画鎿嶄綔
+ if (!cutFileResult) {
+ System.out.println("cutFiles鎺ュ彛璋冪敤澶辫触锛屽仠姝㈠悗缁搷浣�");
+ return;
+ }
+
+ // 璋冪敤issuingDynamicProjects鎺ュ彛
+ Boolean MESTwiceResult = issuingDynamicProjects(projectNo);
+ System.out.println("MES浜屾杩斿洖缁撴灉: " + MESTwiceResult);
+
+ // 妫�鏌ssuingDynamicProjects鎺ュ彛璋冪敤缁撴灉锛屽鏋滃け璐ュ垯鍋滄鍚庣画鎿嶄綔
+ if (!MESTwiceResult) {
+ System.out.println("issuingDynamicProjects鎺ュ彛璋冪敤澶辫触锛屽仠姝㈠悗缁搷浣�");
+ }
+
+ } catch (JsonProcessingException e) {
+ System.err.println("杞崲JSON澶辫触: " + e.getMessage());
+ }
+ }
+
+
+
+
+ // 浣跨敤鍙嶅皠灏嗗璞¤浆鎹负 Map锛屼娇鐢� Java 瀛楁鍚�
+ private Map<String, Object> objectToMapUsingFields(Object obj) {
+ Map<String, Object> map = new HashMap<>();
+ if (obj == null) return map;
+
+ Class<?> clazz = obj.getClass();
+ Field[] fields = clazz.getDeclaredFields();
+
+ for (Field field : fields) {
+ try {
+ field.setAccessible(true);
+ Object value = field.get(obj);
+ // 浣跨敤 Java 瀛楁鍚嶄綔涓� key
+ map.put(field.getName(), value);
+ } catch (IllegalAccessException e) {
+ // 璁板綍鎴栧鐞嗗紓甯�
+ System.err.println("璁块棶瀛楁澶辫触: " + field.getName() + ", 閿欒: " + e.getMessage());
+ }
+ }
+ return map;
+ }
+
+ private String callDynamicOptimizeApi(String jsonData) {
+ try {
+ URL url = new URL("http://" + mesIp + ":8078/api/dynamicOptimize");
+
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+
+ // 璁剧疆璇锋眰鏂规硶
+ conn.setRequestMethod("POST");
+
+ // 璁剧疆璇锋眰澶�
+ conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+ conn.setRequestProperty("Accept", "application/json");
+
+ // 鍏佽杈撳嚭
+ conn.setDoOutput(true);
+
+ // 璁剧疆瓒呮椂鏃堕棿
+ conn.setConnectTimeout(10000); // 10绉掕繛鎺ヨ秴鏃�
+ conn.setReadTimeout(30000); // 30绉掕鍙栬秴鏃�
+
+ // 鍙戦�丣SON鏁版嵁
+ try (OutputStream os = conn.getOutputStream()) {
+ byte[] input = jsonData.getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ // 璇诲彇鍝嶅簲
+ StringBuilder response = new StringBuilder();
+ try (BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+ }
+
+ String responseResult = response.toString();
+ System.out.println("浼樺寲杞欢鍝嶅簲缁撴灉: " + responseResult);
+ // 鏂紑杩炴帴
+ conn.disconnect();
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ // 鍚敤绫诲瀷杞崲鍔熻兘锛屽厑璁稿皢娴偣鏁拌浆鎹负鏁存暟
+ objectMapper.configure(DeserializationFeature.ACCEPT_FLOAT_AS_INT, true);
+ Map<String, Object> responseMap = objectMapper.readValue(responseResult, Map.class);
+
+ // 妫�鏌ode鏄惁涓�200
+ Object codeObj = responseMap.get("code");
+ int code = -1;
+ if (codeObj instanceof Integer) {
+ code = (Integer) codeObj;
+ } else if (codeObj instanceof String) {
+ try {
+ code = Integer.parseInt((String) codeObj);
+ } catch (NumberFormatException e) {
+ System.err.println("鏃犳硶瑙ｆ瀽code瀛楁: " + codeObj);
+ }
+ }
+
+ if (code == 200) {
+ // 璁剧疆鍥炴粴鐐癸紝鐢ㄤ簬浜嬪姟澶勭悊
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
+ // 杩斿洖data瀛楁鐨勫唴瀹逛綔涓篔SON瀛楃涓�
+ Object dataObj = responseMap.get("data");
+ if (dataObj != null) {
+ // 纭繚 dataObj 鏄� Map 绫诲瀷骞堕獙璇� projectNo 瀛楁
+ if (dataObj instanceof Map) {
+ Map<String, Object> dataMap = (Map<String, Object>) dataObj;
+
+ // 楠岃瘉 projectNo 鏄惁瀛樺湪
+ Object projectNoObj = dataMap.get("projectNo");
+ if (projectNoObj == null) {
+ throw new RuntimeException("projectNo 涓嶈兘涓虹┖");
+ }
+
+ String projectNo = projectNoObj.toString();
+ dataMap.put("projectNo", projectNo);
+
+ // 鍒犻櫎宸插瓨鍦ㄧ殑鐩稿叧鏁版嵁
+ glassOptimizeMapper.deleteOptimizeDynamicProject(projectNo);
+ glassOptimizeMapper.deleteOptimizeDynamicLayout(projectNo);
+ glassOptimizeMapper.deleteOptimizeDynamicDetail(projectNo);
+
+ // 鎻掑叆鍔ㄦ�侀」鐩�
+ glassOptimizeMapper.insertDynamicProject(dataMap);
+
+ // 澶勭悊 layouts 鏁扮粍骞舵彃鍏�
+ Object layoutsObj = dataMap.get("layouts");
+ if (layoutsObj instanceof List) {
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> layouts = (List<Map<String, Object>>) layoutsObj;
+
+ for (Map<String, Object> layout : layouts) {
+ // 涓烘瘡涓� layout 娣诲姞 projectNo
+ layout.put("projectNo", projectNo);
+
+ // 鑾峰彇褰撳墠 layout 鐨� glassDetails
+ Object glassDetailsObj = layout.get("glassDetails");
+ if (glassDetailsObj instanceof List) {
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> glassDetails = (List<Map<String, Object>>) glassDetailsObj;
+
+ // 涓烘瘡涓� glassDetail 娣诲姞 projectNo 鍜屽鐞� glassPoint
+ for (Map<String, Object> detail : glassDetails) {
+ detail.put("projectNo", projectNo);
+
+
+ // 澶勭悊 isRotate 涓� 1 鏃朵氦鎹� width 鍜� height 鐨勯�昏緫
+ if (detail.containsKey("isRotate")) {
+ Object isRotateObj = detail.get("isRotate");
+ int isRotate = 0;
+ if (isRotateObj instanceof Number) {
+ isRotate = ((Number) isRotateObj).intValue();
+ } else if (isRotateObj instanceof String) {
+ isRotate = Integer.parseInt(isRotateObj.toString());
+ }
+
+ if (isRotate == 1) {
+ // 浜ゆ崲 width 鍜� height
+ Object widthObj = detail.get("width");
+ Object heightObj = detail.get("height");
+ detail.put("width", heightObj);
+ detail.put("height", widthObj);
+
+
+ }
+ }
+
+ // 澶勭悊 glassPoint 瀛楁杞崲
+ if (detail.containsKey("glassPoint")) {
+ Object glassPointObj = detail.get("glassPoint");
+ if (glassPointObj != null) {
+ try {
+ // 濡傛灉 glassPointObj 宸茬粡鏄瓧绗︿覆锛屽垯涓嶉渶瑕佽浆鎹�
+ if (!(glassPointObj instanceof String)) {
+ // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
+ String glassPointStr = objectMapper.writeValueAsString(glassPointObj);
+ detail.put("glassPoint", glassPointStr);
+ }
+ } catch (Exception e) {
+ // 濡傛灉杞崲澶辫触锛岃褰曢敊璇苟绉婚櫎璇ュ瓧娈�
+ System.err.println("杞崲 glassPoint 澶辫触: " + e.getMessage());
+ detail.remove("glassPoint");
+ }
+ } else {
+ // 濡傛灉 glassPointObj 涓� null锛岀Щ闄よ瀛楁
+ detail.remove("glassPoint");
+ }
+ }
+ }
+
+ glassOptimizeMapper.insertDynamicDetail(glassDetails, projectNo);
+ }
+
+ // 鎻掑叆 layout 鍒� optimize_dynamic_layout 琛�
+ glassOptimizeMapper.insertDynamicLayout(layout);
+ }
+ }
+ }
+ return responseResult;
+ } else {
+ return "{}"; // 濡傛灉data瀛楁涓虹┖锛岃繑鍥炵┖JSON瀵硅薄
+ }
+ } catch (Exception e) {
+ // 鍙戠敓寮傚父鏃跺洖婊氫簨鍔�
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ throw e; // 閲嶆柊鎶涘嚭寮傚父
+ }
+ } else {
+ // 褰揷ode涓嶆槸200鏃讹紝杩斿洖閿欒淇℃伅
+ Object messageObj = responseMap.get("message");
+ String errorMessage = "鎺ュ彛杩斿洖閿欒鐮�: " + code;
+ if (messageObj != null) {
+ errorMessage = messageObj.toString();
+ }
+ return errorMessage;
+ }
+
+ } catch (Exception e) {
+ System.err.println("璋冪敤鍔ㄦ�佷紭鍖栨帴鍙ｅけ璐�: " + e.getMessage());
+ e.printStackTrace();
+ return "璋冪敤鍔ㄦ�佷紭鍖栨帴鍙ｅけ璐�: " + e.getMessage();
+ }
+ }
+
+
+ public Boolean issuingDamageDynamicProjects(String projectNo, List<Map<String, Object>> glassDamageTempList){
+ boolean saveState=false;
+ try {
+ System.out.println(mesIp);
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/engineerOptimizeImport");
+
+ // 2. 鎵撳紑杩炴帴
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ // 3. 鍑嗗璇锋眰浣�
+
+ // 鑾峰彇glassInfolList鏁版嵁
+ List<Map<String, Object>> glassInfolList = glassOptimizeMapper.selectOptimizeDynamicDetail(projectNo);
+
+ // 澶勭悊damageList锛屽glassInfolList涓瓨鍦ㄧ殑glassId璁剧疆reportState涓�10锛屼笉瀛樺湪鐨勮缃负1
+ List<Map<String, Object>> processedDamageList = new ArrayList<>();
+ Set<String> glassIdSet = new HashSet<>();
+
+ // 鏀堕泦glassInfolList涓殑鎵�鏈塯lassId
+ for (Map<String, Object> glassInfo : glassInfolList) {
+ if (glassInfo.containsKey("glassId") && glassInfo.get("glassId") != null) {
+ glassIdSet.add(glassInfo.get("glassId").toString());
+ }
+ }
+
+ // 澶勭悊glassDamageTempList锛屾牴鎹甮lassId鏄惁鍦╣lassInfolList涓瓨鍦ㄦ潵璁剧疆reportState
+ for (Map<String, Object> damageItem : glassDamageTempList) {
+ if (damageItem.containsKey("glassId") && damageItem.get("glassId") != null) {
+ String glassId = damageItem.get("glassId").toString();
+ Map<String, Object> processedItem = new HashMap<>(damageItem);
+
+ // 濡傛灉glassId鍦╣lassInfolList涓瓨鍦紝reportState淇濇寔涓�10锛屽惁鍒欐敼涓�1
+ if (glassIdSet.contains(glassId)) {
+ // glassId瀛樺湪锛屼繚鎸乺eportState涓�10锛堝凡鍦╣lassDamageTempList涓缃級
+ processedItem.put("reportState", 10);
+ } else {
+ // glassId涓嶅瓨鍦紝灏唕eportState鏀逛负1
+ processedItem.put("reportState", 6);
+ }
+
+ processedDamageList.add(processedItem);
+ }
+ }
+
+ Map<String, Object> optimizeProject=glassOptimizeMapper.selectOptimizeDynamicProject(projectNo);
+ optimizeProject.put("engineeringRawQueueList", glassOptimizeMapper.selectOptimizeDynamicLayout(projectNo));
+ optimizeProject.put("glassInfolList", glassOptimizeMapper.selectOptimizeDynamicDetail(projectNo));
+ optimizeProject.put("flowCardInfoList", glassOptimizeMapper.selectFlowCardDynamicInfoList(projectNo));
+ optimizeProject.put("damageList", processedDamageList);
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.registerModule(new JavaTimeModule());
+ String jsonInputString = mapper.writeValueAsString(optimizeProject);
+ System.out.println("浼犵粰MES鐨勬暟鎹�"+ 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());
+ }
+ System.out.println("MES绗竴娆¤繑鍥炰俊鎭細 " + response.toString());
+ JSONObject obj = JSONObject.parseObject(response.toString());
+ if(obj.get("code").equals(200)&&obj.get("data").equals(true)){
+ saveState=true;
+ }
+
+ }
+
+ //鍏抽棴杩炴帴
+ conn.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ saveState= false;
+ }
+ return saveState;
+ }
+
+
+ public Boolean issuingDynamicProjects(String projectNo){
+ boolean saveState=false;
+ try {
+ System.out.println(mesIp);
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");
+
+ // 2. 鎵撳紑杩炴帴
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ // 3. 鍑嗗璇锋眰浣�
+ Map<String, Object> optimizeProject=glassOptimizeMapper.selectOptimizeDynamicProject(projectNo);
+ optimizeProject.put("engineeringRawQueueList", glassOptimizeMapper.selectOptimizeDynamicLayout(projectNo));
+ optimizeProject.put("glassInfolList", glassOptimizeMapper.selectOptimizeDynamicDetail(projectNo));
+ optimizeProject.put("flowCardInfoList", glassOptimizeMapper.selectFlowCardDynamicInfoList(projectNo));
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.registerModule(new JavaTimeModule());
+ String jsonInputString = mapper.writeValueAsString(optimizeProject);
+
+ //鍙戦�佽姹�
+ 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());
+ }
+ System.out.println("MES绗簩娆¤繑鍥炰俊鎭�: " + response.toString());
+ JSONObject obj = JSONObject.parseObject(response.toString());
+ if(obj.get("code").equals(200)&&obj.get("data").equals(true)){
+ saveState=true;
+ }
+
+ }
+
+ //鍏抽棴杩炴帴
+ conn.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ saveState= false;
+ }
+ return saveState;
+ }
+
+
+ private Boolean callCutFilesApi(String jsonOptimizeResult) {
+ boolean saveState = false;
+ try {
+ System.out.println(mesIp);
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://" + mesIp + ":8078/api/resultToCutFiles");
+
+ // 2. 鎵撳紑杩炴帴
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ // 3. 鍙戦�佽姹備綋
+ try(OutputStream os = conn.getOutputStream()) {
+ byte[] input = jsonOptimizeResult.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());
+ }
+ System.out.println("淇濆瓨鍒囧壊鏂囦欢绔彛杩斿洖鏁版嵁: " + response.toString());
+ JSONObject obj = JSONObject.parseObject(response.toString());
+ if(obj.get("code").equals(200)){
+ saveState = true;
+ }
+
+ }
+
+ //鍏抽棴杩炴帴
+ conn.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ saveState = false;
+ }
+ return saveState;
+ }
}
--
Gitblit v1.8.0