From 4af4c7b1915a555ab61a8cca3c2ab5875be8a18b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 28 十月 2025 14:36:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 14 +++++++++++++-
1 files changed, 13 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 f7ab574..bd4fa9a 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
@@ -17,8 +17,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,
@@ -34,7 +36,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);
@@ -47,6 +49,8 @@
List<Map<String, String>> rawMaterialRequisitionMp(Date selectTime1, Date selectTime2, Report report);
List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);
+
+ List<CrossProcessBreakingDTO> exportNotCrossProcessBreakingMp(List<LocalDate> dates);
Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, DamageReportDTO damageReportDTO);
@@ -124,6 +128,14 @@
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);
+
+ 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(
// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
--
Gitblit v1.8.0