From a974e06b567d93656dfb520e48a53f22f29b80b0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 13 三月 2025 08:51:21 +0800
Subject: [PATCH] 修改流程卡界面缓存
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 acb75f4..698716c 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);
@@ -139,17 +144,20 @@
/* 鏍规嵁閿�鍞崟鍙锋眹鎬�*/
map.put("data", reportMapper.workInProgressOrderMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
map.put("total", reportMapper.workInProgressOrderTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
-
+ map.put("footSum" ,reportMapper.workInProgressOrderFootSum(orderId, inputProject, selectProcesses, workInProgressDTO));
}else if(optionVal.equals("2")){
/* 鏍规祦绋嬪崱鍙锋眹鎬�*/
map.put("data", reportMapper.workInProgressProcessMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
map.put("total", reportMapper.workInProgressProcessTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ map.put("footSum" ,reportMapper.workInProgressOrderFootSum(orderId, inputProject, selectProcesses, workInProgressDTO));
+
} 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));
+ map.put("footSum" ,reportMapper.workInProgressOrderFootSum(orderId, inputProject, selectProcesses, workInProgressDTO));
}
map.put("process", productionSchedulingMapper.selectProcess());
@@ -166,6 +174,8 @@
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.processToBeCompletedMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
map.put("process", productionSchedulingMapper.selectProcess());
+ map.put("footSum" ,reportMapper.processToBeCompletedFootSum(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+
return map;
}
@@ -174,6 +184,7 @@
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.selectDamageReportMp(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
map.put("total", reportMapper.getDamageReportPageTotal(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
+ map.put("footSum" ,reportMapper.damageReportFootSum(selectTime1, selectTime2, damageReportDTO));
return map;
}
@@ -340,6 +351,12 @@
return map;
}
+ public Map<String, Object> orderReportingWorks(Date selectTime1, Date selectTime2, Report report) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.orderReportingWorks(selectTime1, selectTime2, report));
+ return map;
+ }
+
public Map<String, Object> rawMaterialRequisitionSv(Date selectTime1, Date selectTime2, Report report) {
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.rawMaterialRequisitionMp(selectTime1, selectTime2, report));
@@ -351,6 +368,10 @@
}
public List exportDamageReportSv(List<LocalDate> dates) {
+ if (dates != null && dates.size() > 1) {
+ dates.set(1, dates.get(1).plusDays(1)); // 灏嗙浜屼釜鏃ユ湡鍔犱竴澶�
+ }
+ System.out.println(dates);
return reportMapper.exportDamageReportMp(dates);
}
@@ -412,6 +433,7 @@
map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
map.put("process", productionSchedulingMapper.selectProcess());
map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+ map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses, teamOutputDTO));
return map;
}
--
Gitblit v1.8.0