From a00e1b3a8ff8cdadb7f8d897742097b30a5924fc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 03 十二月 2025 17:16:16 +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 | 812 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 742 insertions(+), 70 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 f6e1d5e..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
@@ -14,8 +14,11 @@
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.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;
@@ -43,6 +46,9 @@
GlassOptimizeMapper glassOptimizeMapper;
@Autowired
SysErrorService sysErrorService;
+
+ @Value("${mesIp:localhost}")
+ private String mesIp;
RabbitMQUtil rabbitMQUtil;
//妯℃嫙璁＄畻
@@ -260,26 +266,127 @@
List<Map<String, Object>> originalFilm = (List<Map<String, Object>>) object.get("originalFilm");
glassOptimizeMapper.addOptimizeUse(originalFilm,projectId,"admin");
+ Map<String, Object> glassInfo = glassOptimizeMapper.getGlassInfo(projectId);
+
ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(optimalResults);
glassOptimizeMapper.addOptimizeProjectFile(json,projectId,"admin");
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");
- //杩唬鐜荤拑鏄庣粏闆嗗悎鍒犻櫎浣欐枡
+ //杩唬鐜荤拑鏄庣粏闆嗗悎澶勭悊浣欐枡鍜屽叾浠�
Iterator<Map<String, Object>> iterator = objectMap2.iterator();
while (iterator.hasNext()) {
Map<String, Object> map = iterator.next();
- if (map.get("isRemain").toString()=="true") {
- iterator.remove();
+ // 淇敼isRemain鍒ゆ柇閫昏緫锛屾敮鎸佹暟瀛�0/1鍜屽瓧绗︿覆"0"/"1"
+ boolean isRemain = false;
+ if (map.containsKey("isRemain")) {
+ Object isRemainObj = map.get("isRemain");
+ if (isRemainObj != null) {
+ if (isRemainObj instanceof Number) {
+ // 鏁板瓧绫诲瀷: 1琛ㄧずtrue锛�0琛ㄧずfalse
+ isRemain = ((Number) isRemainObj).intValue() == 1;
+ } else {
+ // 瀛楃涓茬被鍨�: "1"琛ㄧずtrue锛�"0"琛ㄧずfalse
+ isRemain = "1".equals(isRemainObj.toString());
+ }
+ }
+ }
+
+ if (isRemain) {
+ System.out.println( map);
+ if (glassInfo != null) {
+ String glassType = (String) glassInfo.get("glass_type");
+ String glassThickness = (String) glassInfo.get("glass_thickness");
+ // 浣欐枡瀛樺叆optimizeoffcut
+ glassOptimizeMapper.addOptimizeOffcut(map, projectId, glassType, glassThickness);
+ }
+ iterator.remove(); // 浠庡師鍒楄〃涓Щ闄�
+ }else {
+ // 澶勭悊isRotate瀛楁杞崲 (鐜板湪鏄�0/1)
+ if (map.containsKey("isRotate")) {
+ Object isRotateObj = map.get("isRotate");
+ if (isRotateObj != null) {
+ if (isRotateObj instanceof Number) {
+ // 鐩存帴浣跨敤鏁板瓧鍊�
+ map.put("isRotate", ((Number) isRotateObj).intValue());
+ } else {
+ // 瀛楃涓插舰寮忕殑"0"/"1"
+ String isRotateStr = isRotateObj.toString();
+ if ("1".equals(isRotateStr)) {
+ map.put("isRotate", 1);
+ } else {
+ map.put("isRotate", 0);
+ }
+ }
+ } else {
+ map.put("isRotate", 0); // 榛樿鍊�
+ }
+ }
}
}
-
- glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
+ // 鍦ㄤ繚瀛樹箣鍓嶅鐞� glassPoint 鏁版嵁
+ for (Map<String, Object> detail : objectMap2) {
+ if (detail.containsKey("glassPoint")) {
+ Object glassPointObj = detail.get("glassPoint");
+ if (glassPointObj != null) {
+ try {
+ // 濡傛灉 glassPointObj 宸茬粡鏄瓧绗︿覆锛屽垯涓嶉渶瑕佽浆鎹�
+ if (!(glassPointObj instanceof String)) {
+ // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
+ String glassPointStr = mapper.writeValueAsString(glassPointObj);
+ detail.put("glassPoint", glassPointStr);
+ }
+ } catch (Exception e) {
+ // 濡傛灉杞崲澶辫触锛岃褰曢敊璇苟绉婚櫎璇ュ瓧娈�
+ System.err.println("杞崲 glassPoint 澶辫触: " + e.getMessage());
+ detail.remove("glassPoint");
+ }
+ } else {
+ // 濡傛灉 glassPointObj 涓� null锛岀Щ闄よ瀛楁
+ detail.remove("glassPoint");
+ }
+ }
+ }
+ // 灏嗗綋鍓嶆壒娆＄殑鐜荤拑鏄庣粏娣诲姞鍒版�诲垪琛ㄤ腑
+ allGlassDetails.addAll(objectMap2);
}
- glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1);
+
+ 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();
@@ -288,11 +395,91 @@
}
- public Boolean updateOptimizeResult(Map<String, Object> object,String processId){
+ public Boolean updateOptimizeResult(Map<String, Object> object, String processId) {
try {
ObjectMapper mapper = new ObjectMapper();
+
+ List<Map<String, Object>> objectMapList = (List<Map<String, Object>>) object.get("layouts");
+
+ Map<String, Object> glassInfo = glassOptimizeMapper.getGlassInfo(processId);
+ glassOptimizeMapper.deleteOffcutDetails(processId);
+
+ int stockId = 1;
+ for (Map<String, Object> objectMap : objectMapList) {
+ List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails");
+
+ // 鍒嗙 glassDetails 涓轰袱閮ㄥ垎
+ List<Map<String, Object>> normalDetails = new ArrayList<>(); // isRemain 涓� false 鐨勯儴鍒�
+ List<Map<String, Object>> offCutDetails = new ArrayList<>(); // isRemain 涓� true 鐨勯儴鍒�
+
+ for (Map<String, Object> detail : objectMap2) {
+ boolean isRemain = false;
+ if (detail.containsKey("isRemain")) {
+ Object isRemainObj = detail.get("isRemain");
+ if (isRemainObj != null) {
+ if (isRemainObj instanceof Number) {
+ // 鏁板瓧绫诲瀷: 1琛ㄧずtrue锛�0琛ㄧずfalse
+ isRemain = ((Number) isRemainObj).intValue() == 1;
+ } else if (isRemainObj instanceof Boolean) {
+ // 甯冨皵绫诲瀷
+ isRemain = (Boolean) isRemainObj;
+ } else {
+ // 瀛楃涓茬被鍨�: "1"/"true"琛ㄧずtrue锛�"0"/"false"琛ㄧずfalse
+ String isRemainStr = isRemainObj.toString().toLowerCase();
+ isRemain = "1".equals(isRemainStr) || "true".equals(isRemainStr);
+ }
+ }
+ }
+ // 澶勭悊 glassPoint 搴忓垪鍖�
+ if (detail.containsKey("glassPoint")) {
+ Object glassPointObj = detail.get("glassPoint");
+ if (glassPointObj != null) {
+ try {
+ // 濡傛灉 glassPointObj 宸茬粡鏄瓧绗︿覆锛屽垯涓嶉渶瑕佽浆鎹�
+ if (!(glassPointObj instanceof String)) {
+ // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
+ String glassPointStr = mapper.writeValueAsString(glassPointObj);
+ detail.put("glassPoint", glassPointStr);
+ }
+ } catch (Exception e) {
+ // 濡傛灉杞崲澶辫触锛岃褰曢敊璇苟绉婚櫎璇ュ瓧娈�
+ System.err.println("杞崲 glassPoint 澶辫触: " + e.getMessage());
+ detail.remove("glassPoint");
+ }
+ }
+ }
+
+ if (isRemain) {
+ offCutDetails.add(detail);
+ } else {
+ normalDetails.add(detail);
+ }
+ }
+
+ // 淇濆瓨鎵�鏈夋暟鎹埌 optimize_detail
+ if (!normalDetails.isEmpty()) {
+ for (Map<String, Object> detail : normalDetails) {
+ glassOptimizeMapper.updateNormalDetails(detail, processId);
+ }
+ }
+
+ // 瀵� remainDetails 閮ㄥ垎鍏堝垹闄� offcut 鍐嶅鐞�
+ if (!offCutDetails.isEmpty()) {
+ if (glassInfo != null) {
+ String glassType = (String) glassInfo.get("glass_type");
+ String glassThickness = (String) glassInfo.get("glass_thickness");
+ // 浣欐枡瀛樺叆optimizeoffcut
+ for (Map<String, Object> detail : offCutDetails) {
+ glassOptimizeMapper.addUpdateOffcut(detail, processId, glassType, glassThickness, stockId);
+ }
+ }
+ }
+ stockId++;
+ }
+ // 鏇存柊浼樺寲缁撴灉鏂囦欢
String jsonString = mapper.writeValueAsString(object);
- glassOptimizeMapper.updateOptimizeResult(jsonString,processId);
+ glassOptimizeMapper.updateOptimizeResult(jsonString, processId);
+
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -307,6 +494,111 @@
map.put("optimizeUse", glassOptimizeMapper.materialStoreOptimizeUse(processId));
return map;
}
+
+
+
+ public Object getOptimizeInfoSv(String processId) {
+ // 鑾峰彇甯冨眬淇℃伅
+ List<Map<String, Object>> layouts = glassOptimizeMapper.getOptimizeLayoutsInfo(processId);
+ // 鑾峰彇鐜荤拑鏄庣粏淇℃伅
+ List<Map<String, Object>> glassDetails = glassOptimizeMapper.getOptimizeDetailsInfo(processId);
+ // 鑾峰彇浣欐枡淇℃伅
+ List<Map<String, Object>> offsets = glassOptimizeMapper.getOptimizeOffsetsInfo(processId);
+ // 灏嗙幓鐠冩槑缁嗗拰浣欐枡鍚堝苟鍒颁竴涓垪琛ㄤ腑
+ List<Map<String, Object>> allDetails = new ArrayList<>();
+ if (glassDetails != null) {
+ allDetails.addAll(glassDetails);
+ }
+ if (offsets != null) {
+ allDetails.addAll(offsets);
+ }
+
+ // 瑙ｆ瀽 glassPoint 瀛楃涓�
+ ObjectMapper mapper = new ObjectMapper();
+ for (Map<String, Object> detail : allDetails) {
+ if (detail.containsKey("glassPoint")) {
+ Object glassPointObj = detail.get("glassPoint");
+ if (glassPointObj instanceof String) {
+ String glassPointStr = (String) glassPointObj;
+ if (glassPointStr != null && !glassPointStr.isEmpty() && !glassPointStr.equals("null")) {
+ try {
+ // 瑙ｆ瀽 JSON 瀛楃涓蹭负瀵硅薄
+ Object parsedGlassPoint = mapper.readValue(glassPointStr, Object.class);
+ detail.put("glassPoint", parsedGlassPoint);
+ } catch (Exception e) {
+ System.err.println("瑙ｆ瀽 glassPoint 澶辫触: " + e.getMessage());
+ // 瑙ｆ瀽澶辫触鏃朵繚鐣欏師瀛楃涓叉垨璁剧疆榛樿鍊�
+ detail.put("glassPoint", new ArrayList<>());
+ }
+ } else {
+ // 绌哄瓧绗︿覆鎴� null 鏃惰缃粯璁ゅ��
+ detail.put("glassPoint", new ArrayList<>());
+ }
+ }
+ }
+ }
+
+ // 鎸夌収stockId灏嗘槑缁嗗垎缁勫苟娣诲姞鍒板搴旂殑甯冨眬涓�
+ if (layouts != null && !layouts.isEmpty()) {
+ for (Map<String, Object> layout : layouts) {
+ Object stockIdObj = layout.get("stockId");
+ if (stockIdObj != null) {
+ Integer stockId = null;
+ if (stockIdObj instanceof Number) {
+ stockId = ((Number) stockIdObj).intValue();
+ } else {
+ try {
+ stockId = Integer.valueOf(stockIdObj.toString());
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶杞崲涓烘暟瀛楋紝鍒欒烦杩囪甯冨眬
+ continue;
+ }
+ }
+ List<Map<String, Object>> matchedDetails = new ArrayList<>();
+ for (Map<String, Object> detail : allDetails) {
+ Object layoutIdObj = detail.get("layoutId");
+ Object stockSortObj = detail.get("stockSort");
+ Integer detailStockId = null;
+ if (layoutIdObj != null) {
+ if (layoutIdObj instanceof Number) {
+ detailStockId = ((Number) layoutIdObj).intValue();
+ } else {
+ try {
+ detailStockId = Integer.valueOf(layoutIdObj.toString());
+ } catch (NumberFormatException e) {
+ // 璺宠繃鏃犳晥鐨刲ayoutId
+ continue;
+ }
+ }
+ } else if (stockSortObj != null) {
+ if (stockSortObj instanceof Number) {
+ detailStockId = ((Number) stockSortObj).intValue();
+ } else {
+ try {
+ detailStockId = Integer.valueOf(stockSortObj.toString());
+ } catch (NumberFormatException e) {
+ // 璺宠繃鏃犳晥鐨剆tockSort
+ continue;
+ }
+ }
+ }
+ // 濡傛灉detail鐨剆tockId涓巐ayout鐨剆tockId鍖归厤锛屽垯娣诲姞鍒板尮閰嶅垪琛ㄤ腑
+ if (detailStockId != null && detailStockId.equals(stockId)) {
+ matchedDetails.add(detail);
+ }
+ }
+ // 灏嗗尮閰嶇殑鏄庣粏娣诲姞鍒板竷灞�鐨刧lassDetails瀛楁涓�
+ layout.put("glassDetails", matchedDetails);
+ }
+ }
+ }
+// Map<String, Object> result = new HashMap<>();
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("layouts", layouts);
+ result.put("optimizeUse", glassOptimizeMapper.materialOptimizeUse(processId));
+ return result;
+ }
+
//宸ョ▼淇℃伅
public Map<String, Object> projectInfoSv(String projectNo,String username) {
@@ -347,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);
@@ -365,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;
}
@@ -437,29 +739,68 @@
}
//淇敼鎺掔増鐘舵��
- public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) {
+ public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) throws JsonProcessingException {
if (!projectNumber.isEmpty()) {
//鎾ら攢妯℃嫙璁＄畻
if(code==1){
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){
glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+ glassOptimizeMapper.deleteOptimizeOffcut(projectNumber);
glassOptimizeMapper.deleteOptimizeProjectFile(projectNumber);
glassOptimizeMapper.updateOptimizeUse(projectNumber);
glassOptimizeMapper.updateProjectOptimizeStateMp(projectNumber, states);
}
//鍏佽鐢熶骇
else if(code==3){
- glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ Boolean isSeccess = issuingProjects(projectNumber);
+ if(isSeccess){
+ glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ }else{
+ return false;
+ }
}
//鐢熶骇涓嶅彲瑙�
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){
@@ -586,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);
@@ -682,11 +1023,30 @@
json = object.get("json").toString();
}
if(type.equals("閽㈠寲")){
- glassOptimizeMapper.updateOptimizeConfig(json,1,username);
+ String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 1);
+ if (existingConfig == null) {
+ String configName = "閽㈠寲鎺ㄨ崘";
+ glassOptimizeMapper.insertOptimizeConfig(json,1,username,configName);
+ }else {
+ glassOptimizeMapper.updateOptimizeConfig(json,1,username);
+ }
} else if (type.equals("淇竟")) {
- glassOptimizeMapper.updateOptimizeConfig(json,5,username);
+ String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 5);
+ if (existingConfig == null) {
+ String configName = "淇竟閰嶇疆";
+ glassOptimizeMapper.insertOptimizeConfig(json,5,username,configName);
+ }else {
+ glassOptimizeMapper.updateOptimizeConfig(json,5,username);
+ }
}else if (type.equals("纾ㄩ噺")) {
- glassOptimizeMapper.updateOptimizeConfig(json,4,username);
+ String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 4);
+ if (existingConfig == null) {
+ String configName = "纾ㄩ噺閰嶇疆";
+ glassOptimizeMapper.insertOptimizeConfig(json,4,username,configName);
+ }else{
+ glassOptimizeMapper.updateOptimizeConfig(json,4,username);
+ }
+
}
return true;
@@ -892,4 +1252,316 @@
return map;
}
+
+ 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");
+
+ // 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.selectOptimizeProject(projectNo);
+ optimizeProject.put("engineeringRawQueueList", glassOptimizeMapper.selectOptimizeLayout(projectNo));
+ optimizeProject.put("glassInfolList", glassOptimizeMapper.selectOptimizeDetail(projectNo));
+ optimizeProject.put("flowCardInfoList", glassOptimizeMapper.selectFlowCardInfoList(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("Response: " + 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 Map<String, Object> getReportDataSv(String processId) {
+ Map<String, Object> perimap = new HashMap<>();
+ perimap.put("peridata", glassOptimizeMapper.getPeriMeterDataSv(processId));
+
+ Map<String, Object> map = new HashMap<>();
+ Object layoutSetObj = glassOptimizeMapper.getReportDataProcessIdSv(processId);
+ map.put("reportData", layoutSetObj);
+ List<Map<String, Object>> peridata = (List<Map<String, Object>>) perimap.get("peridata");
+ double totalPerimeter = 0.0;
+ if (peridata != null && !peridata.isEmpty()) {
+ for (Map<String, Object> perimeterData : peridata) {
+ if (perimeterData.containsKey("perimeter") && perimeterData.get("perimeter") != null) {
+ try {
+ Object perimeterObj = perimeterData.get("perimeter");
+ if (perimeterObj instanceof Number) {
+ totalPerimeter += ((Number) perimeterObj).doubleValue();
+ } else {
+ totalPerimeter += Double.parseDouble(perimeterObj.toString());
+ }
+ } catch (NumberFormatException e) {
+ System.err.println("鏃犳硶瑙ｆ瀽鍛ㄩ暱鏁版嵁: " + perimeterData.get("perimeter"));
+ }
+ }
+ }
+ }
+
+ if (layoutSetObj instanceof List) {
+ List<Map<String, Object>> layoutSet = (List<Map<String, Object>>) layoutSetObj;
+ if (!layoutSet.isEmpty()) {
+ layoutSet.get(0).put("rectanglePerimeter", totalPerimeter);
+ }
+ }
+ return map;
+ }
+
+ public Map<String, Object> getMaterialInfoSv(String processId) {
+ Map<String, Object> map = new HashMap<>();
+// List<Map<String, Object>> materialList = glassOptimizeMapper.getMaterialInfoSv(processId);
+ List<Map<String, Object>> layoutSet = glassOptimizeMapper.getLayoutSetSv(processId);
+
+// // 鍒涘缓涓�涓狹ap鏉ュ瓨鍌ㄦ瘡涓猻tock_code鐨勬�婚潰绉�
+// Map<String, Double> stockCodeAreaMap = new HashMap<>();
+//
+// // 閬嶅巻layoutSet璁＄畻姣忎釜stock_code鐨勬�婚潰绉�(闈㈢Н*浣跨敤鐜�)
+// for (Map<String, Object> layout : layoutSet) {
+// Object stockCodeObj = layout.get("stock_code");
+// Object widthObj = layout.get("width");
+// Object heightObj = layout.get("height");
+// Object usageRateObj = layout.get("usage_rate");
+//
+// if (stockCodeObj != null && widthObj != null && heightObj != null && usageRateObj != null) {
+// try {
+// String stockCode = stockCodeObj.toString();
+// double width = Double.parseDouble(widthObj.toString());
+// double height = Double.parseDouble(heightObj.toString());
+// double usageRate = Double.parseDouble(usageRateObj.toString());
+//
+// // 璁＄畻鍗曟潯鏁版嵁鐨勯潰绉�(骞虫柟绫�)
+// double area = (width * height * usageRate) / 1000000.0;
+//
+// // 绱姞鍒板搴攕tock_code鐨勬�婚潰绉�
+// stockCodeAreaMap.put(stockCode, stockCodeAreaMap.getOrDefault(stockCode, 0.0) + area);
+// } catch (NumberFormatException e) {
+// System.err.println("鏁版嵁杞崲閿欒: " + e.getMessage());
+// }
+// }
+// }
+//
+// // 灏嗚绠楀嚭鐨勬�婚潰绉坊鍔犲埌materialList涓搴旂殑鐗╂枡鏁版嵁
+// for (Map<String, Object> material : materialList) {
+// Object stockCodeObj = material.get("code");
+// if (stockCodeObj != null) {
+// String stockCode = stockCodeObj.toString();
+// if (stockCodeAreaMap.containsKey(stockCode)) {
+// material.put("totalArea", stockCodeAreaMap.get(stockCode));
+// }
+// }
+// }
+
+ map.put("materialList", layoutSet);
+ return map;
+ }
+
+
+ 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<>();
+
+ if (productInfo != null && !productInfo.isEmpty()) {
+ // 鎸夌収 processCard 鍒嗙粍
+ Map<String, List<Map<String, Object>>> groupedByProcessCard = new HashMap<>();
+ for (Map<String, Object> item : productInfo) {
+ String processCard = String.valueOf(item.get("processCard"));
+ if (processCard != null) {
+ groupedByProcessCard.computeIfAbsent(processCard, k -> new ArrayList<>()).add(item);
+ }
+ }
+
+ // 涓烘瘡涓� processCard 璁＄畻缁熻淇℃伅
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Map.Entry<String, List<Map<String, Object>>> entry : groupedByProcessCard.entrySet()) {
+ String processCard = entry.getKey();
+ List<Map<String, Object>> items = entry.getValue();
+
+ // 璁＄畻缁熻淇℃伅
+ double longestSide = 0;
+ double shortestSide = Double.MAX_VALUE;
+ int specQuantity = items.size();
+ int totalQuantity = 0;
+
+ // 浣跨敤 BigDecimal 绮剧‘璁＄畻闈㈢Н
+ BigDecimal totalArea = BigDecimal.ZERO;
+
+ for (Map<String, Object> item : items) {
+ // 瀹夊叏鑾峰彇闀垮拰瀹�
+ Number widthObj = (Number) item.get("width");
+ Number heightObj = (Number) item.get("height");
+
+ if (widthObj == null || heightObj == null) {
+ continue;
+ }
+
+ double width = widthObj.doubleValue();
+ double height = heightObj.doubleValue();
+
+ // 鏇存柊鏈�闀胯竟鍜屾渶鐭竟
+ double maxSide = Math.max(width, height);
+ double minSide = Math.min(width, height);
+
+ if (maxSide > longestSide) {
+ longestSide = maxSide;
+ }
+ if (minSide < shortestSide) {
+ shortestSide = minSide;
+ }
+
+ // 瀹夊叏鑾峰彇鏁伴噺
+ Number quantityObj = (Number) item.get("quantity");
+ if (quantityObj != null) {
+ totalQuantity += quantityObj.intValue();
+ }
+
+ // 瀹夊叏鑾峰彇闈㈢Н 鈥斺�� 浣跨敤 BigDecimal 绮剧‘绱姞
+ Object areaObj = item.get("Area");
+ if (areaObj != null) {
+ // 鍏抽敭锛氶�氳繃 toString() 杞负瀛楃涓插啀鏋勯�� BigDecimal锛岄伩鍏� double 绮惧害鎹熷け
+ BigDecimal area = new BigDecimal(areaObj.toString());
+ totalArea = totalArea.add(area);
+ }
+ }
+
+ // 澶勭悊 shortestSide 鐨勮竟鐣屾儏鍐�
+ if (shortestSide == Double.MAX_VALUE) {
+ shortestSide = 0;
+ }
+
+ // 鏋勯�犺繑鍥炴暟鎹�
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("processCard", processCard);
+ resultMap.put("longestSide", longestSide);
+ resultMap.put("shortestSide", shortestSide);
+ resultMap.put("specQuantity", specQuantity);
+ resultMap.put("totalQuantity", totalQuantity);
+ resultMap.put("totalArea", totalArea);
+
+ result.add(resultMap);
+ }
+
+ map.put("productList", result);
+ }
+ return map;
+ }
+
+
+ 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