From e4bc8d8c824b9cbe38f87a136d25e70ce34b7eff Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 07 五月 2025 16:51:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
index b952b85..d7e4ae9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
@@ -7,7 +7,9 @@
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
+import org.jeecg.modules.eam.vo.EquipmentRepairStatistics;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -30,7 +32,7 @@
* @param detailList
* @return
*/
- boolean reportRepairFromMaintenance(String equipmentId, String reportUser, List<EamWeekMaintenanceOrderDetail> detailList);
+ EamReportRepair reportRepairFromMaintenance(String equipmentId, String reportUser, List<EamWeekMaintenanceOrderDetail> detailList);
/**
@@ -38,5 +40,28 @@
* @param detailList
* @return
*/
- boolean reportRepairFromInspection(String equipmentId, String reportUser, List<EamInspectionOrderDetail> detailList);
+ EamReportRepair reportRepairFromInspection(String equipmentId, String reportUser, List<EamInspectionOrderDetail> detailList);
+
+ /**
+ * 鏁呴殰淇濅慨
+ * @param eamReportRepair
+ * @return
+ */
+ EamReportRepair add(EamReportRepair eamReportRepair);
+
+ /**
+ * 缂栬緫
+ * @param eamReportRepair
+ * @return
+ */
+ boolean edit(EamReportRepair eamReportRepair);
+
+ /**
+ * 鏌ヨ鎶ヤ慨鍒楄〃
+ * @param productionId
+ * @param firstOfMonth
+ * @param today
+ * @return
+ */
+ List<EquipmentRepairStatistics> equipmentRepairStatistics(String productionId, LocalDate firstOfMonth, LocalDate today);
}
--
Gitblit v1.9.3