From 4813462662b02b0a6a421a30ff4f94bc3f5bbfe0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 03 九月 2025 13:18:51 +0800
Subject: [PATCH] 提交合并参数修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index ba95b88..2c65ee5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -138,7 +138,7 @@
}
//娴佺▼鍗¤繘搴︽柟娉�
- public Map<String, Object> processCardProgressSv(String orderId, List<Integer> columns) {
+ public Map<String, Object> processCardProgressSv(String orderId, List<String> columns) {
Map<String, Object> map = new HashMap<>();
//鑾峰彇琛ㄦ牸鍐呭鏁版嵁
List<Map<String, String>> dataList = reportMapper.processCardProgressMp(orderId);
@@ -149,6 +149,7 @@
map.put("title", uniqueList);
Map<String,Integer> clos = new HashMap<>();
+ HashMap<String,HashMap<String,Map<String, Integer>>> rowCount = new HashMap<String,HashMap<String,Map<String, Integer>>>();
for (int i=0;i<uniqueList.size();i++){
//鏍规嵁娴佺▼鏌ヨ鍩虹鏁版嵁
BasicData basicData = basicDataMapper.selectOne(
@@ -157,6 +158,7 @@
.eq("basic_name",uniqueList.get(i).get("process"))
.last("limit 1")
);
+
//鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
//Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
@@ -165,27 +167,57 @@
//鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
//Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
- columns.add(14+i);
+ columns.add("reportWorkQuantity."+uniqueList.get(i).get("process"));
}
}
List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
- List<Map<String, Integer>> rowCount = new ArrayList<>();
- columns.forEach(col -> {
- getRowCount.forEach(row -> {
- Map<String, Integer> getRow = new HashMap<>();
- // { row: 0, col: 1, rowspan: 3, colspan: 0},
- getRow.put("row", ((Number) row.get("RowNum")).intValue());
- getRow.put("col", col);
- getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
- getRow.put("colspan", 0);
- rowCount.add(getRow);
- });
+ HashMap<Integer,Map<String, Object>> getRowCountMap = new HashMap<>();
+ getRowCount.forEach(col -> {
+ Integer getRowCountOrderNumber = ((Number) col.get("order_number")).intValue();
+ getRowCountMap.put(getRowCountOrderNumber, col);
});
- //寰幆缁撴灉
+ /*columns.forEach(col -> {
+ List<Map<String, Integer>> getRows = new ArrayList<>();
+ getRowCount.forEach(row -> {
+ Map<String, Integer> getRow = new HashMap<>();
+ getRow.put("row", ((Number) row.get("RowNum")).intValue());
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
+ getRow.put("colspan", 1);
+ getRows.add(getRow);
+ });
+ rowCount.put(col, getRows);
+ }); */
+ //寰幆缁撴灉
for (int i=0;i<dataList.size();i++ ) {
+ Integer orderNumber = Integer.parseInt(String.valueOf(dataList.get(i).get("order_number")));
+ Integer technologyNumber = Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number")));
+ int finalI1 = i;
+ columns.forEach(col -> {
+ if(rowCount.get(col) == null){
+ rowCount.put(col, new HashMap<String,Map<String,Integer>>());
+ }
+
+ if(getRowCountMap.get(orderNumber) != null){
+ Map<String,Object> row = getRowCountMap.get(orderNumber);
+ Map<String, Integer> getRow = new HashMap<>();
+ //鍒ゆ柇褰撳墠姝ゆ 鏄惁涓虹涓�琛� 骞朵笖鐩稿悓搴忓彿
+ if(technologyNumber==1){
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
+ getRow.put("colspan", 1);
+ }else{
+ getRow.put("rowspan", 0);
+ getRow.put("colspan", 0);
+ }
+ rowCount.get(col).put(finalI1+"_"+col, getRow);
+ }
+
+
+ });
+
+
Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
new TypeReference<Map<String, String>>() {
});
@@ -230,7 +262,7 @@
});
}
-
+ //澶硅兌宸ュ簭鍒ゆ柇鍚堝苟琛屾暟
if(!clos.isEmpty()){
Integer max = orderGlassDetailMapper
@@ -246,19 +278,23 @@
for (String key : clos.keySet()) {
if(data.get(key) != null){
-
+ if (rowCount.get("reportWorkQuantity."+key)==null){
+ rowCount.put("reportWorkQuantity."+key, new HashMap<String,Map<String,Integer>>());
+ }
+ Map<String, Integer> getRow = new HashMap<>();
if(min == Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number"))) ){
- Map<String, Integer> getRow = new HashMap<>();
- // { row: 0, col: 1, rowspan: 3, colspan: 0},
- getRow.put("row", i );
- getRow.put("col", clos.get(key));
- getRow.put("rowspan", max-min+1);
- getRow.put("colspan", 0);
- rowCount.add(getRow);
+
+ // { row: 0, col: 1, rowspan: 3, colspan: 0},
+ //getRow.put("row", i );
+ getRow.put("rowspan", max-min+1);
+ getRow.put("colspan", 1);
+
}else{
+ getRow.put("rowspan", 0);
+ getRow.put("colspan", 0);
data.put(key,"0");
}
-
+ rowCount.get("reportWorkQuantity."+key).put(i+"_reportWorkQuantity."+key, getRow);
}
}
}
@@ -1036,4 +1072,11 @@
return map;
}
+
+ public Map<String, Object> yieldProcessSv(String selectTime1, String selectTime2, Report report) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.yieldProcessMp(selectTime1, selectTime2, report));
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
}
--
Gitblit v1.8.0