From 16bbf8260110e2790f304e8421cf7591837ca302 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 14 七月 2025 11:16:06 +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 |   78 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 72 insertions(+), 6 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 e026297..659d3e6 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
@@ -1,12 +1,13 @@
 package com.example.erp.mapper.pp;
 
 
-import com.example.erp.entity.pp.DamageDetails;
+import com.example.erp.dto.pp.*;
 import com.example.erp.entity.pp.Report;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.sql.Date;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -15,19 +16,19 @@
 
     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);
 
-    List<Map<String, String>> selectDamageReportMp(Date selectTime1, Date selectTime2, Report report);
+    List<DamageReportDTO> selectDamageReportMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);
 
     List<Map<String, String>> splittingDetailsOutsideMp(String orderId, Report report);
 
@@ -41,8 +42,73 @@
 
     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);
+
+    Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);
+
+    List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);
+
+    List<OrderPlanDecompositionDTO> exportOrderPlanDecompositionMp(List<LocalDate> dates);
+
+    List<ProcessToBeCompletedDTO> exportProcessToBeCompletedMp(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, String laminating, TeamOutputDTO teamOutputDTO);
+
+    Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, String laminating, 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, String laminating);
+
+    Map<String,Float> workInProgressOrderFootSum(Integer offset, Integer pageSize, 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, String laminating, TeamOutputDTO teamOutputDTO);
+
+    String getLaminating(String selectProcesses);
+
+    List<WorkInProgressDTO> workInProgressMpdataList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+    List<WorkInProgressDTO> workInProgressMpdataList2(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+    List<WorkInProgressDTO> workInProgressOrderMpList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+    List<WorkInProgressDTO> workInProgressProcessMpList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+    List<WorkInProgressDTO> exportWorkInProgressMpdataList2(String process);
+
+
 //    Map<String, Integer> getWorkInProgressTotal(
 //                                                @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
 //                                                @Param("orderId") String orderId, @Param("inputProject") String inputProject,

--
Gitblit v1.8.0