From c27bbcc497711df8b13d096f4917b5a8f16508c9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 10:28:59 +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 | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 6 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 16ef67e..560d062 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
@@ -323,10 +323,33 @@
}
}
}
-
+ // 鍦ㄤ繚瀛樹箣鍓嶅鐞� 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);
+
+ glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -335,11 +358,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();
@@ -372,6 +475,32 @@
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) {
@@ -563,7 +692,7 @@
}
//淇敼鎺掔増鐘舵��
- 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){
@@ -582,7 +711,12 @@
}
//鍏佽鐢熶骇
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){
--
Gitblit v1.8.0