From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 387 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 365 insertions(+), 22 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 b514fe3..8fa0fe5 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,7 +14,9 @@
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -260,6 +262,8 @@
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");
@@ -268,15 +272,80 @@
glassOptimizeMapper.addOptimizeLayout(objectMapList,projectId);
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); // 榛樿鍊�
+ }
+ }
}
}
-
+ // 鍦ㄤ繚瀛樹箣鍓嶅鐞� 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");
+ }
+ }
+ }
glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
}
glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1);
@@ -288,11 +357,71 @@
}
- 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);
+
+ 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);
+ }
+ }
+ }
+
+ 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()) {
+ glassOptimizeMapper.deleteOffcutDetails(processId);
+ 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);
+ }
+ }
+ }
+ }
+ // 鏇存柊浼樺寲缁撴灉鏂囦欢
String jsonString = mapper.writeValueAsString(object);
- glassOptimizeMapper.updateOptimizeResult(jsonString,processId);
+ glassOptimizeMapper.updateOptimizeResult(jsonString, processId);
+
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -308,26 +437,169 @@
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.materialStoreOptimizeUse(processId));
+ return result;
+ }
+
+
//宸ョ▼淇℃伅
public Map<String, Object> projectInfoSv(String projectNo,String username) {
Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
Map<String, Object> map = new HashMap<>();
- if(Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1){
- map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
- map.put("data", glassOptimizeMapper.getOptimizeDetail(projectNo));
- map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
- map.put("grindingTrimming", null);
- } else if (Integer.parseInt(stringObjectMap.get("tempering_state").toString())==1) {
- map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
- map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
- map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
- } else{
- map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
- map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
- map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+// if(Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1){
+// map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+// map.put("data", glassOptimizeMapper.getOptimizeDetail(projectNo));
+// map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+// map.put("grindingTrimming", null);
+// } else if (Integer.parseInt(stringObjectMap.get("tempering_state").toString())==1) {
+// map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+// map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
+// map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+// map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+// } else{
+// map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+// map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
+// map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+// map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+// }
+ map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+ map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
+ map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+ return map;
+ }
+
+
+
+
+ public Object optimizeInfoSv(String projectNo, String username) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> dataList = null;
+ if (Integer.parseInt(stringObjectMap.get("tempering_state").toString())==1){
+ dataList = glassOptimizeMapper.computeAndOptimization(projectNo);
+ } else {
+ dataList = glassOptimizeMapper.directOptimization(projectNo);
}
+
+ // 鑾峰彇纾ㄩ噺閰嶇疆鏁版嵁
+ List<Map<String, Object>> grindingTrimmingList = glassOptimizeMapper.getGrindingOptimize(username);
+ // 灏嗙（閲忛厤缃暟鎹嫾鎺ュ埌姣忔潯涓绘暟鎹悗闈�
+ if (dataList != null && !dataList.isEmpty() && grindingTrimmingList != null && !grindingTrimmingList.isEmpty()) {
+ // 鑾峰彇绗竴鏉＄（閲忛厤缃暟鎹紙閫氬父鍙湁涓�鏉¤褰曪級
+ Map<String, Object> grindingConfig = grindingTrimmingList.get(0);
+ // 灏嗙（閲忛厤缃坊鍔犲埌姣忔潯涓绘暟鎹腑
+ for (Map<String, Object> dataItem : dataList) {
+ // 灏嗙（閲忛厤缃殑瀛楁娣诲姞鍒版瘡鏉℃暟鎹腑
+ for (Map.Entry<String, Object> entry : grindingConfig.entrySet()) {
+ // 閬垮厤瑕嗙洊鍘熸湁瀛楁
+ if (!dataItem.containsKey(entry.getKey())) {
+ dataItem.put(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+ }
+ map.put("data", dataList);
return map;
}
@@ -411,6 +683,7 @@
else if(code==2){
glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+ glassOptimizeMapper.deleteOptimizeOffcut(projectNumber);
glassOptimizeMapper.deleteOptimizeProjectFile(projectNumber);
glassOptimizeMapper.updateOptimizeUse(projectNumber);
glassOptimizeMapper.updateProjectOptimizeStateMp(projectNumber, states);
@@ -552,11 +825,25 @@
if(projectType.equals("2")){
deleteProject(projectId,2);
}
+
+ // 鍒涘缓涓�涓槧灏勬潵瀛樺偍 (processId-technologyNumber) 缁勫悎鍒� rack 缂栧彿鐨勬槧灏�
+ Map<String, Integer> rackMap = new HashMap<>();
+ int rackCounter = 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);
+ 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();
@@ -839,4 +1126,60 @@
map.put("data", glassOptimizeMapper.getProjectByProjectNoSv(projectNo));
return map;
}
+
+
+ public Boolean issuingProjects(String projectNo) throws JsonProcessingException {
+ boolean saveState=false;
+ try {
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://localhost: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;
+ }
+
+
}
--
Gitblit v1.8.0