From fcc929fa2888c6b06a168f1ca84344e3bf9fdce5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 28 十月 2025 11:34:14 +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 | 4 ++++
1 files changed, 4 insertions(+), 0 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 fb067b9..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,
@@ -48,6 +50,8 @@
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);
List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);
--
Gitblit v1.8.0