From 189c22920f56eccf89090197e82de8dae57c4a01 Mon Sep 17 00:00:00 2001 From: hyingbo <1363390067@qq.com> Date: 星期五, 12 九月 2025 17:32:08 +0800 Subject: [PATCH] 根据车间筛选设备调整 --- lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java index 49944e5..0006777 100644 --- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java +++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.dto.message.MessageDTO; @@ -634,6 +635,21 @@ } /** + * 鏌ヨ浜х嚎涓嬬殑鎵�鏈夎澶� + */ + @Override + public List<String> getEquipmentIdsProduction(String key) { + List<String> partProduction = Lists.newArrayList(); + if (StringUtils.isNotEmpty(key)) { + //key涓嶄负绌猴紝鏌ヨ鎵�鏈変笅绾т骇绾縤d + partProduction = this.findAllProductions(key); + partProduction.add(key); + } + List<String> equipmentIds = this.baseMapper.queryIdsByProductions(partProduction); + return equipmentIds; + } + + /** * 鏍规嵁璁惧id鏌ヨ璁惧鍚嶇О */ @Override @@ -687,7 +703,7 @@ /** * 鏍规嵁鐖剁骇id閫掑綊鏌ヨ鎵�鏈変笅绾d闆嗗悎 */ - private List<String> findAllProductions(String key) { + public List<String> findAllProductions(String key) { List<String> productions = new ArrayList<>(); List<MdcProduction> mdcProductions = mdcProductionService.queryProdByPid(key); if (mdcProductions != null && !mdcProductions.isEmpty()) { -- Gitblit v1.9.3