From 7d1dcd74604d8a1b4369cf2f966cc6b628893fc7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 17 七月 2024 11:13:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 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..d1ebdee 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
@@ -4,6 +4,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.dto.pp.DamageReportDTO;
+import com.example.erp.dto.pp.ScheduleProductionScheduleDTO;
import com.example.erp.dto.pp.TeamOutputDTO;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.Report;
@@ -124,7 +125,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 +133,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;
}
@@ -395,4 +412,19 @@
map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
return map;
}
+
+ public Map<String, Object> scheduleProductionScheduleSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String processes, ScheduleProductionScheduleDTO scheduleProductionScheduleDTO) {
+ Integer offset = (pageNum - 1) * pageSize;
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.scheduleProductionScheduleMp(offset, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
+ map.put("total", reportMapper.getScheduleProductionScheduleTotal(offset, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
+
+ public List exportScheduleReportSv(Map<String, Object> dates) {
+ List<LocalDate> date= (List<LocalDate>) dates.get("date1");
+ String process= (String) dates.get("processes");
+ return reportMapper.exportScheduleReportMp(date,process);
+ }
}
--
Gitblit v1.8.0