|
@@ -298,21 +298,20 @@ public class HxpStockServiceImpl implements IHxpStockService {
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public boolean RFIDCheck(InventoryTag tag) {
|
|
public boolean RFIDCheck(InventoryTag tag) {
|
|
|
- boolean b = false;
|
|
|
|
|
String rfidCode = tag.getEpc();
|
|
String rfidCode = tag.getEpc();
|
|
|
if(StringUtils.isBlank(rfidCode)){
|
|
if(StringUtils.isBlank(rfidCode)){
|
|
|
- return b;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
Date d = cacheMap.get(rfidCode);
|
|
Date d = cacheMap.get(rfidCode);
|
|
|
if(d != null && DateUtil.compare(DateUtil.offsetSecond(d, interval), DateUtils.getNowDate()) > 0){
|
|
if(d != null && DateUtil.compare(DateUtil.offsetSecond(d, interval), DateUtils.getNowDate()) > 0){
|
|
|
- return b;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
logger.info("RFID 实时检测 RFIDCheck(标签编号): " + rfidCode);
|
|
logger.info("RFID 实时检测 RFIDCheck(标签编号): " + rfidCode);
|
|
|
HxpStock hxpStock = hxpStockMapper.selectByRfidCode(rfidCode);
|
|
HxpStock hxpStock = hxpStockMapper.selectByRfidCode(rfidCode);
|
|
|
if(hxpStock == null){
|
|
if(hxpStock == null){
|
|
|
- return b;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 查询该库存数据是否处于领用状态
|
|
// 查询该库存数据是否处于领用状态
|
|
@@ -425,9 +424,9 @@ public class HxpStockServiceImpl implements IHxpStockService {
|
|
|
hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
|
|
hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- return b;
|
|
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
- return b;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void sendPhoneAlarm(String subName, String chemicalName, String phones) {
|
|
private void sendPhoneAlarm(String subName, String chemicalName, String phones) {
|