From a3ad909e75ddb7a6271d95704dc002cc70337fd5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 27 十月 2025 11:07:45 +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 | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 200 insertions(+), 4 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 59d39b7..dabfe6f 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
@@ -365,7 +365,9 @@
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");
@@ -391,6 +393,24 @@
}
}
}
+ // 澶勭悊 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);
@@ -406,18 +426,18 @@
}
}
- // 渚嬪瀵� remainDetails 閮ㄥ垎鍏堝垹闄� offcut 鍐嶅鐞�
+ // 瀵� 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);
+ glassOptimizeMapper.addUpdateOffcut(detail, processId, glassType, glassThickness, stockId);
}
}
}
+ stockId++;
}
// 鏇存柊浼樺寲缁撴灉鏂囦欢
String jsonString = mapper.writeValueAsString(object);
@@ -538,7 +558,7 @@
// Map<String, Object> result = new HashMap<>();
Map<String, Object> result = new LinkedHashMap<>();
result.put("layouts", layouts);
- result.put("optimizeUse", glassOptimizeMapper.materialStoreOptimizeUse(processId));
+ result.put("optimizeUse", glassOptimizeMapper.materialOptimizeUse(processId));
return result;
}
@@ -1188,4 +1208,180 @@
}
+ 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);
+ 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) 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;
+ }
+
+
}
--
Gitblit v1.8.0