根据车间筛选设备调整

hyingbo

7 小时以前 189c22920f56eccf89090197e82de8dae57c4a01

 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不为空，查询所有下级产线id
            partProduction = mdcEquipmentService.findAllProductions(productionId);
            partProduction.add(productionId);
        }

        List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(equipmentIds);
        List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(partProduction);
        return Result.ok(resultList);
    }