From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 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 fb067b9..9175bfb 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;
 
@@ -17,8 +18,10 @@
     List<Map<String, String>> processCardProgressMp(String orderId);
 
     List<CrossProcessBreakingDTO> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
+    List<CrossProcessBreakingDTO> getNotProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
 
     Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
+    Map<String, Integer> getNotProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
 
     List<Map<String, String>> workInProgressMp(
             Integer offset, Integer pageSize,
@@ -46,17 +49,19 @@
 
     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<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);
 
     List<ProcessToBeCompletedDTO> exportProcessToBeCompletedMp(List<LocalDate> date, String process, String inputVal, String project);
 
-    List<WorkInProgressDTO> exportWorkInProgressMp( String process, String inputVal, String project);
+    List<WorkInProgressDTO> exportWorkInProgressMp( String process, String inputVal, String project,String terminationVals);
 
     List<TaskCompletionStatusDTO> exportTaskCompletionStatusMp(Map<String, Object> dates);
 
@@ -88,7 +93,7 @@
 
     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> workInProgressOrderFootSum(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses,String terminationVals, WorkInProgressDTO workInProgressDTO);
 
     Map<String,Float> processToBeCompletedFootSum(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
 
@@ -98,7 +103,7 @@
 
     String getLaminating(String selectProcesses);
 
-    List<WorkInProgressDTO> workInProgressMpdataList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, String laminating, WorkInProgressDTO workInProgressDTO);
+    List<WorkInProgressDTO> workInProgressMpdataList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, String laminating,String terminationVals, WorkInProgressDTO workInProgressDTO);
 
     List<WorkInProgressDTO> workInProgressMpdataList2(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
 
@@ -114,13 +119,13 @@
 
     Map<String,Float> workInProgressCombinationOrderFootSum(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
 
-    List<Map<String, Object>> getWorkInProgressCombination(String process, String laminating, String optionVal);
+    List<Map<String, Object>> getWorkInProgressCombination(String process, String laminating, String optionVal,String terminationVal);
 
     List<String> selectProcess();
 
-    Map<String,Object> getWorkInProgressCombinationFootSum(String process, String laminating, String optionVal);
+    Map<String,Object> getWorkInProgressCombinationFootSum(String process, String laminating, String optionVal, String terminationVal);
 
-    List<WorkInProgressCombinationDTO> exportWorkInProgressCombination(String process, String laminating, String inputVal);
+    List<WorkInProgressCombinationDTO> exportWorkInProgressCombination(String process, String laminating, String inputVal,String terminationVal);
 
     List<Map<String, String>> processCardProgressCollectMp(String orderId);
 
@@ -130,7 +135,6 @@
 
     List<Map<String, String>> selectProcessCompletedMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String laminating, Report report);
 
-    Map<String,Float> ProcessCompletedFootSum(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
 
 
 //    Map<String, Integer> getWorkInProgressTotal(

--
Gitblit v1.8.0