From 7ee68df04b7a169d51ab95ad9955276c9aff6ee1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 22 九月 2025 09:44:34 +0800
Subject: [PATCH] 流程卡查询界面修改表格下方汇总方式
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 d600a7f..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);
@@ -98,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);
@@ -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