From 215a413fa2bb598cc70c71a0c9691925f814f90b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 07 八月 2024 09:07:47 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
index b868815..f52ca17 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
@@ -22,9 +22,9 @@
Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
List<Map<String, String>> workInProgressMp(
- @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
+ Integer offset, Integer pageSize,
@Param("orderId") String orderId, @Param("inputProject") String inputProject,
- @Param("selectProcesses") String selectProcesses, Report report);
+ @Param("selectProcesses") String selectProcesses, WorkInProgressDTO workInProgressDTO);
List<Map<String, String>> processToBeCompletedMp(Date selectTime1, Date selectTime2, String orderId,
String inputProject, String selectProcesses, Report report);
@@ -69,9 +69,9 @@
Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
- List<Map<String, String>> workInProgressOrderMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
+ List<Map<String, String>> workInProgressOrderMp(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
- List<Map<String, String>> workInProgressProcessMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
+ List<Map<String, String>> workInProgressProcessMp(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
List<ScheduleProductionScheduleDTO> scheduleProductionScheduleMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String processes, ScheduleProductionScheduleDTO scheduleProductionScheduleDTO);
@@ -79,6 +79,12 @@
List<ScheduleProductionScheduleDTO> exportScheduleReportMp(List<LocalDate> date, String process);
+ Map<String, Integer> workInProgressOrderTotal(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+ Map<String, Integer> workInProgressProcessTotal(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+ Map<String, Integer> workInProgressTotal(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
// Map<String, Integer> getWorkInProgressTotal(
// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
--
Gitblit v1.8.0