| | |
| | | } |
| | | 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; |
| | | } |