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-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 6 +++---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 2 +-
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 2 +-
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 11 ++++++-----
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
index b9f2893..c0e94c7 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -60,5 +60,5 @@
ModelAndView exportLedgerStatisticsXls(HttpServletRequest request, Class<EquipmentCategoryStatistics> equipmentCategoryStatisticsClass, String 鍙拌处缁熻);
- List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> equipmentIds);
+ List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> orgIdList);
}
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 b2ae505..43ad84a 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
@@ -386,10 +386,10 @@
}
@Override
- public List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> equipmentIds) {
+ public List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> orgIdList) {
List<EquipmentSearchResult> resultList = new ArrayList<>();
- if (CollectionUtils.isNotEmpty(equipmentIds)) {
- List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getEquipmentCode, equipmentIds));
+ if (CollectionUtils.isNotEmpty(orgIdList)) {
+ List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getOrgId, orgIdList));
if (CollectionUtils.isNotEmpty(eamEquipmentList)) {
for (EamEquipment eamEquipment : eamEquipmentList) {
resultList.add(new EquipmentSearchResult(eamEquipment));
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 07915dc..cca786c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -371,12 +371,13 @@
@ApiOperation(value = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃", notes = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃")
@GetMapping(value = "/asyncLoadEquipmentByProduction")
public Result<?> asyncLoadEquipmentByProduction(@RequestParam(name="productionId",required = false) String productionId) {
- List<String> equipmentIds = Lists.newArrayList();
- if (StringUtils.isNotBlank(productionId)) {
- equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(productionId);
+ List<String> partProduction = Lists.newArrayList();
+ if (StringUtils.isNotEmpty(productionId)) {
+ //key涓嶄负绌猴紝鏌ヨ鎵�鏈変笅绾т骇绾縤d
+ partProduction = mdcEquipmentService.findAllProductions(productionId);
+ partProduction.add(productionId);
}
-
- List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(equipmentIds);
+ List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(partProduction);
return Result.ok(resultList);
}
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 82c8366..836b236 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
@@ -253,4 +253,6 @@
* @return
*/
List<MdcEquipment> getEquipmentList();
+
+ List<String> findAllProductions(String key);
}
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 2682672..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
@@ -703,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