From 6db03250bcbf51193b8dd71a698ea2b202c6d6ad Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:20 +0800
Subject: [PATCH] 班组产量汇总报表，客户名称不能重复创建显示
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 08dcd08..cb2eb6c 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
@@ -8,6 +8,7 @@
import java.sql.Date;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -48,13 +49,13 @@
List<Map<String, String>> rawMaterialRequisitionMp(Date selectTime1, Date selectTime2, Report report);
- List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);
+ List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<String> dates);
- List<CrossProcessBreakingDTO> exportNotCrossProcessBreakingMp(List<LocalDate> dates);
+ List<CrossProcessBreakingDTO> exportNotCrossProcessBreakingMp(List<LocalDateTime> dates);
Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, DamageReportDTO damageReportDTO);
- List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);
+ List<DamageReportDTO> exportDamageReportMp(List<LocalDateTime> dates);
List<OrderPlanDecompositionDTO> exportOrderPlanDecompositionMp(List<LocalDate> dates);
@@ -134,6 +135,11 @@
List<Map<String, String>> selectProcessCompletedMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String laminating, Report report);
+ List<TeamOutputDTO> TeamOutputSummaryMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);
+
+ Map<String, Integer> teamOutputSummaryPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);
+
+ List<TeamOutputDTO> exportTeamOutputSummaryMp(List<LocalDate> date, String selectProcesses, String laminating);
// Map<String, Integer> getWorkInProgressTotal(
--
Gitblit v1.8.0