From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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 97b7d75..717b46a 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
@@ -17,14 +17,14 @@
List<Map<String, String>> processCardProgressMp(String orderId);
- List<DamageDetails> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+ List<CrossProcessBreakingDTO> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
- Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+ Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
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);
@@ -43,6 +43,8 @@
List<Map<String, String>> orderPlanDecompositionMp(Date selectTime1, Date selectTime2, Report report);
+ List<Map<String, String>> orderReportingWorks(Date selectTime1, Date selectTime2, Report report);
+
List<Map<String, String>> rawMaterialRequisitionMp(Date selectTime1, Date selectTime2, Report report);
List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);
@@ -55,7 +57,45 @@
List<ProcessToBeCompletedDTO> exportProcessToBeCompletedMp(List<LocalDate> date, String process, String inputVal, String project);
- List<WorkInProgressDTO> exportWorkInProgressMp(List<LocalDate> date, String process, String inputVal, String project);
+ List<WorkInProgressDTO> exportWorkInProgressMp( String process, String inputVal, String project);
+
+ List<TaskCompletionStatusDTO> exportTaskCompletionStatusMp(Map<String, Object> dates);
+
+ List<RawMaterialRequisitionDTO> exportRawMaterialRequisitionMp(List<LocalDate> dates);
+
+ List<QualityReportDTO> exportQualityReportSv(List<LocalDate> dates);
+
+ List<YieldDTO> exportYieldMp(List<LocalDate> date, String process);
+
+ List<TeamOutputDTO> teamOutputMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
+
+ Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
+
+ List<Map<String, String>> workInProgressOrderMp(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+ 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);
+
+ Map<String, Integer> getScheduleProductionScheduleTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String processes, ScheduleProductionScheduleDTO scheduleProductionScheduleDTO);
+
+ 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);
+
+ List<TeamOutputDTO> exportTeamOutputMp(List<LocalDate> date, String process);
+
+ Map<String,Float> workInProgressOrderFootSum(String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+ Map<String,Float> processToBeCompletedFootSum(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
+
+ Map<String,Float> damageReportFootSum(Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);
+
+ Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
// Map<String, Integer> getWorkInProgressTotal(
--
Gitblit v1.8.0