From 27346176f10ddcc2df668cdc76bf354132fb3dbc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 10 七月 2024 14:03:29 +0800
Subject: [PATCH] 在制品报表、班组产量报表修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 20 ++++++++++++++++++--
1 files changed, 18 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 6d65e9c..4972af8 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
@@ -124,7 +124,7 @@
return map;
}
- public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
+ public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String optionVal, Report report) {
if ("null".equals(orderId)) {
orderId = "";
@@ -132,8 +132,24 @@
if ("null".equals(inputProject)) {
inputProject = "";
}
+ if ("null".equals(optionVal)) {
+ optionVal = ("");
+ }
+
Map<String, Object> map = new HashMap<>();
- map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ if (optionVal.equals("1")){
+ /* 鏍规嵁閿�鍞崟鍙锋眹鎬�*/
+ map.put("data", reportMapper.workInProgressOrderMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+
+ }else if(optionVal.equals("2")){
+ /* 鏍规祦绋嬪崱鍙锋眹鎬�*/
+ map.put("data", reportMapper.workInProgressProcessMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ } else if (optionVal.equals("3")) {
+
+ } else {
+
+ map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ }
map.put("process", productionSchedulingMapper.selectProcess());
return map;
}
--
Gitblit v1.8.0