From 80779e662c51601328e8e4054ebd169f5360d12c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 11 八月 2025 16:12:55 +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 | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 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 b6adbf0..16ef67e 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
@@ -355,6 +355,85 @@
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);
+ }
+ // 鎸夌収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);
@@ -496,6 +575,7 @@
else if(code==2){
glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+ glassOptimizeMapper.deleteOptimizeOffcut(projectNumber);
glassOptimizeMapper.deleteOptimizeProjectFile(projectNumber);
glassOptimizeMapper.updateOptimizeUse(projectNumber);
glassOptimizeMapper.updateProjectOptimizeStateMp(projectNumber, states);
@@ -993,4 +1073,5 @@
return saveState;
}
+
}
--
Gitblit v1.8.0