Lius
2024-04-19 5d22080b861cf7b3253005db9b817d7c3869073f
update
已修改1个文件
34 ■■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -474,22 +474,26 @@
        }
        String saveTableName = mdcEquipment.getSaveTableName();
        MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
        // 查询设备状态
        EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
        Integer oporation = equipmentLog.getOporation();
        if ("LSV2".equals(mdcEquipment.getDriveType())) {
            dto.setSpindlebeilv(dto.getSFeed());
            dto.setFeedbeilv(dto.getFFeed());
            dto.setRapidfeed(dto.getRapidfeed());
            dto.setNCVersion(dto.getNCVersion());
            dto.setTNCVersion(dto.getTNCVersion());
            dto.setOPTVersion(dto.getOPTVersion());
            dto.setPLCVersion(dto.getPLCVersion());
        }
        if (oporation == 22) {
            dto.setALRMstate(equipmentLog.getAlarm());
        if (dto != null) {
            if ("LSV2".equals(mdcEquipment.getDriveType())) {
                dto.setSpindlebeilv(dto.getSFeed());
                dto.setFeedbeilv(dto.getFFeed());
                dto.setRapidfeed(dto.getRapidfeed());
                dto.setNCVersion(dto.getNCVersion());
                dto.setTNCVersion(dto.getTNCVersion());
                dto.setOPTVersion(dto.getOPTVersion());
                dto.setPLCVersion(dto.getPLCVersion());
            }
            // 查询设备状态
            EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
            Integer oporation = equipmentLog.getOporation();
            if (oporation == 22) {
                dto.setALRMstate(equipmentLog.getAlarm());
            } else {
                dto.setALRMstate("无");
            }
        } else {
            dto.setALRMstate("无");
            return null;
        }
        return dto;
    }