|
|
@@ -102,10 +102,12 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
|
|
|
String electronicTag = alarmRecord.getElectronicTag();
|
|
|
QpBottleStorageRVo storageRVo = storageService.getByElectronicTag(electronicTag);
|
|
|
if (storageRVo != null) {
|
|
|
- if (hardwareRfidDto!=null){
|
|
|
+ if (hardwareRfidDto!=null && storageRVo.getStorageStatus() == 1){
|
|
|
//RFID设备报警
|
|
|
R<Boolean> alarm = remoteRfidService.alarm(hardwareRfidDto);
|
|
|
log.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
|
|
|
+ }else {
|
|
|
+ return 0;
|
|
|
}
|
|
|
Long id = storageRVo.getId();
|
|
|
String key = RFID_CODE + electronicTag + id;
|