From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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/ReportService.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 0f6674b..f7c785f 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
@@ -72,7 +72,7 @@
.eq("glass_sort",dto1.getTechnologyNumber())
);
dto1.setGlassName(productDetail.getDetail());
-
+ //basicData.getNickname().equals("stepC")
}else if(basicData.getNickname().equals("stepC")){
OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper
.selectOne(new QueryWrapper<OrderGlassDetail>()
@@ -155,25 +155,27 @@
.last("limit 1")
);
//鍒ゆ柇纾ㄨ竟鍜岀（杈瑰悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
clos.put(uniqueList.get(i).get("process"), 15+i);
}
//鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
columns.add(15+i);
}
}
- List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
+ 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", row.get("RowNum"));
+ getRow.put("row", ((Number) row.get("RowNum")).intValue());
getRow.put("col", col);
- getRow.put("rowspan", row.get("rowCount"));
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
getRow.put("colspan", 0);
rowCount.add(getRow);
});
@@ -389,15 +391,15 @@
map.put("title", uniqueList);
- List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
+ 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", row.get("RowNum"));
+ getRow.put("row", ((Number) row.get("RowNum")).intValue());
getRow.put("col", col);
- getRow.put("rowspan", row.get("rowCount"));
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
getRow.put("colspan", 0);
rowCount.add(getRow);
});
--
Gitblit v1.8.0