From 5d5606559262e4c6366cf059cda94d28159bbbe9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 24 七月 2025 13:56:27 +0800
Subject: [PATCH] OEE条件判断
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index b508ae8..96c97ca 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -138,7 +138,12 @@
queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
}
if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
- queryWrapper.like("e.org_id", eamEquipment.getOrgId());
+ //杞﹂棿缂栫爜涓嶄负绌�
+ List<String> productIds = mdcProductionService.recursionChildren(eamEquipment.getOrgId());
+ if (CollectionUtil.isNotEmpty(productIds)) {
+ //涓嶅仛绛涢��
+ queryWrapper.in("e.org_id", productIds);
+ }
}
if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
@@ -235,6 +240,30 @@
return eamEquipmentMapper.selectOne(queryWrapper);
}
+ @Override
+ public List<EamEquipment> queryByProductionId(String productionId) {
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ //杞﹂棿涓虹┖ 鍒欐煡璇㈡墍鏈夎澶�
+ if (StringUtils.isNotBlank(productionId)) {
+ //杞﹂棿缂栫爜涓嶄负绌�
+ List<String> productIds = mdcProductionService.recursionChildren(productionId);
+ if (CollectionUtil.isEmpty(productIds)) {
+ return Collections.emptyList();
+ }
+ if(productIds.size() == 1) {
+ queryWrapper.eq("e.org_id", productIds.get(0));
+ }else {
+ queryWrapper.in("e.org_id", productIds);
+ }
+ }
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ List<EamEquipment> list = eamEquipmentMapper.queryByProductionIds(queryWrapper);
+ if(CollectionUtil.isNotEmpty(list)) {
+ return list;
+ }
+ return Collections.emptyList();
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
--
Gitblit v1.9.3