From ad03e69a942f88e8c7d0c4002532a6ec18360f4e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 09 五月 2024 11:14:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 19 +++++++++++++++----
1 files changed, 15 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 2e1e171..286703a 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
@@ -2,9 +2,7 @@
import com.example.erp.entity.pp.DamageDetails;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.pp.Report;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,5 +17,18 @@
List<DamageDetails> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
- Map<String,Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+ Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+
+ List<Map<String, String>> workInProgressMp(
+ @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
+ @Param("orderId") String orderId, @Param("inputProject") String inputProject,
+ @Param("selectProcesses") String selectProcesses, Report report);
+
+ List<Map<String, String>> processToBeCompletedMp(Date selectTime1, Date selectTime2, String orderId,
+ String inputProject, String selectProcesses, Report report);
+
+// Map<String, Integer> getWorkInProgressTotal(
+// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
+// @Param("orderId") String orderId, @Param("inputProject") String inputProject,
+// @Param("selectProcesses") String selectProcesses, Report report);
}
--
Gitblit v1.8.0