From 1e685c19317c73c86ae0901742b54b51eeaa26ea Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 27 二月 2025 15:08:26 +0800
Subject: [PATCH] 工程物料出库删除修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 2e5958a..73d07f2 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
@@ -86,7 +86,12 @@
getRowCount.forEach(row -> {
Map<String, Integer> getRow = new HashMap<>();
// { row: 0, col: 1, rowspan: 3, colspan: 0},
- getRow.put("row", row.get("RowNum"));
+ 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("col", col);
getRow.put("rowspan", row.get("rowCount"));
getRow.put("colspan", 0);
@@ -119,7 +124,6 @@
list.add(startDate);
list.add(endDate);
map.put("selectDate", list);
-// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
return map;
}
@@ -148,7 +152,7 @@
} else if (optionVal.equals("3")) {
} else {
-
+ //娌℃湁閫夋嫨鍒嗙粍
map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
@@ -352,7 +356,6 @@
}
public List exportDamageReportSv(List<LocalDate> dates) {
-
return reportMapper.exportDamageReportMp(dates);
}
@@ -375,7 +378,6 @@
}
public List exportWorkInProgressSv(Map<String, Object> dates) {
- //List<LocalDate> date= (List<LocalDate>) dates.get("date");
String process= (String) dates.get("processes");
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
--
Gitblit v1.8.0