From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index 5e20315..f3493f9 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -210,4 +210,42 @@
List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo);
+ /**
+ * 浠庤澶囧彴璐︽彃鍏DC璁惧
+ * @param mdcEquipment
+ * @param productionId
+ */
+ void addNewEquipmentFromEam(MdcEquipment mdcEquipment, String productionId);
+
+ /**
+ * 鏍规嵁浜х嚎id闆嗗悎鏌ヨ璁惧鍒楄〃
+ * @param mdcProductionIds
+ * @return
+ */
+ List<MdcEquipment> findByProductionIds(List<String> mdcProductionIds);
+
+ /**
+ * 鏍规嵁浜х嚎id闆嗗悎鍜岄厤閫佸皬缁勬煡璇㈣澶囧垪琛�
+ * @param allProductionIds
+ * @param teamCodelist
+ * @return
+ */
+ List<MdcEquipment> findByProIdsAndTeamCode(List<String> allProductionIds, List<String> teamCodelist);
+
+ /**
+ * 鏍规嵁浜х嚎id闆嗗悎鍜岃澶囩被鍨嬫煡璇㈣澶囧垪琛�
+ * @param allProductionIds
+ * @param typeList
+ * @return
+ */
+ List<MdcEquipment> findByProIdsAndType(List<String> allProductionIds, List<String> typeList);
+
+ List<String> getEquIdsByProIds(List<String> proIds);
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛鏌ヨ璁惧鍒楄〃淇℃伅
+ * @return
+ */
+ List<MdcEquipment> getEquipmentList();
}
--
Gitblit v1.9.3