From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 ead2f30..6d56c23 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,7 +8,6 @@
import java.sql.Date;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -35,11 +34,11 @@
List<Map<String, String>> qualityReportMp(Date selectTime1, Date selectTime2, Report report);
- List<Map<String, String>> yieldMp(Date selectTime1, Date selectTime2, String selectProcesses, Report report);
+ List<Map<String, String>> yieldMp(String selectTime1, String selectTime2, String selectProcesses, Report report);
List<Map<String, String>> productionScheduleMp(String orderId);
- List<Map<String, String>> taskCompletionStatusMp(Date selectTime1, Date selectTime2);
+ List<Map<String, String>> taskCompletionStatusMp(Date selectTime1, Date selectTime2, String orderId);
List<Map<String, String>> orderPlanDecompositionMp(Date selectTime1, Date selectTime2, Report report);
@@ -99,7 +98,7 @@
String getLaminating(String selectProcesses);
- List<WorkInProgressDTO> workInProgressMpdataList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+ List<WorkInProgressDTO> workInProgressMpdataList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, String laminating, WorkInProgressDTO workInProgressDTO);
List<WorkInProgressDTO> workInProgressMpdataList2(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
@@ -123,6 +122,12 @@
List<WorkInProgressCombinationDTO> exportWorkInProgressCombination(String process, String laminating, String inputVal);
+ List<Map<String, String>> processCardProgressCollectMp(String orderId);
+
+ List<Map<String, String>> processCardProgressReportMp(String orderId);
+
+ List<Map<String, String>> yieldProcessMp(String selectTime1, String selectTime2, Report report);
+
// Map<String, Integer> getWorkInProgressTotal(
// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
--
Gitblit v1.8.0