update

Lius

2024-04-19 5d22080b861cf7b3253005db9b817d7c3869073f

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java

@@ -474,9 +474,7 @@
        }
        String saveTableName = mdcEquipment.getSaveTableName();
        MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
        // 查询设备状态
        EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
        Integer oporation = equipmentLog.getOporation();
        if (dto != null) {
        if ("LSV2".equals(mdcEquipment.getDriveType())) {
            dto.setSpindlebeilv(dto.getSFeed());
            dto.setFeedbeilv(dto.getFFeed());
@@ -486,11 +484,17 @@
            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 {
            return null;
        }
        return dto;
    }
}