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/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
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);
}
--
Gitblit v1.9.3