From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 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 1ed6e64..377f98d 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
@@ -348,7 +348,8 @@
}
glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
}
- glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1);
+
+ glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -357,11 +358,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();
--
Gitblit v1.8.0