From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题，在制品汇总报表添加批次
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 23d1089..abbcc7c 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
@@ -180,6 +180,17 @@
}
}
map.put("title", uniqueList);
+ for (int i=0;i<uniqueList.size();i++){
+ BasicData basicData = basicDataMapper.selectOne(
+ new QueryWrapper<BasicData>()
+ .eq("basic_category","process")
+ .eq("basic_name",uniqueList.get(i).get("process"))
+ .last("limit 1")
+ );
+ if(basicData!=null && (Objects.equals(basicData.getNickname(), "stepB") || (Objects.equals(basicData.getNickname(), "stepD")))){
+ columns.add(15+i);
+ }
+ }
List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
@@ -188,12 +199,7 @@
getRowCount.forEach(row -> {
Map<String, Integer> getRow = new HashMap<>();
// { row: 0, col: 1, rowspan: 3, colspan: 0},
- Object rowNumObj = row.get("RowNum");
- if (rowNumObj instanceof Double) {
- getRow.put("row", ((Double) rowNumObj).intValue());
- } else if (rowNumObj instanceof Integer) {
- getRow.put("row", (Integer) rowNumObj);
- }
+ getRow.put("row", row.get("RowNum"));
getRow.put("col", col);
getRow.put("rowspan", row.get("rowCount"));
getRow.put("colspan", 0);
--
Gitblit v1.8.0