From 71f90ed3a2eeea97b20cd095cc34a1f64dac5c81 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 26 十一月 2025 11:21:39 +0800
Subject: [PATCH] 提交 计算方式进度
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 bd4fa9a..08dcd08 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
@@ -60,7 +60,7 @@
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);
@@ -92,7 +92,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);
@@ -102,7 +102,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);
@@ -118,13 +118,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);
@@ -134,7 +134,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