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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 a31ada5..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
@@ -34,7 +34,7 @@
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);
@@ -122,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