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/IEamInspectionOrderService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
index db9c878..6146862 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -7,7 +7,9 @@
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
+import org.jeecg.modules.eam.vo.EquipmentInspectionStatistics;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -66,7 +68,7 @@
* @param eamInspectionOrderRequest
* @return
*/
- Result<?> inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest);
+ EamInspectionOrder inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest);
/**
* 鍒嗛〉鏌ヨ
@@ -82,4 +84,13 @@
* @return
*/
List<EamInspectionOrder> selectUnCompleteOrder(String expiredDate);
+
+ /**
+ * 鐐规缁熻
+ * @param productionId
+ * @param firstOfMonth
+ * @param today
+ * @return
+ */
+ List<EquipmentInspectionStatistics> equipmentInspectionStatistics(String productionId, LocalDate firstOfMonth, LocalDate today);
}
--
Gitblit v1.9.3