|
|
@@ -662,7 +662,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
|
|
|
subNameMap.put(hxpStock.getSubId(),hxpStock.getSubName());
|
|
|
// 报警记录
|
|
|
HxpAlarmRecord hxpAlarmRecord = new HxpAlarmRecord();
|
|
|
- hxpAlarmRecord.setAlarmContent(hxpStock.getSubName()+"实验室,化学品("+hxpStock.getChemicalName() + ")还有3天过期,请尽快确认处理。");
|
|
|
+ hxpAlarmRecord.setAlarmContent(hxpStock.getSubName()+"实验室,化学品("+hxpStock.getChemicalName() + ")还有30天过期,请尽快确认处理。");
|
|
|
hxpAlarmRecord.setAlarmType(1);
|
|
|
hxpAlarmRecord.setHasValid(1);
|
|
|
hxpAlarmRecord.setAlarmMode(1);
|
|
|
@@ -674,13 +674,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
|
|
|
|
|
|
hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
|
|
|
}
|
|
|
- /*if(stockIds.size() > 0){
|
|
|
- hxpStockMapper.updateExpiredByIds(stockIds);
|
|
|
- }
|
|
|
- if(joinIds.size() > 0){
|
|
|
- hxpChemicalJoinCabinetMapper.updateExpiredByIds(joinIds);
|
|
|
- }*/
|
|
|
- hxpChemicalJoinCabinetMapper.updateChemicalJoinCabinetByExpired();
|
|
|
|
|
|
subMsg.forEach((k,v) -> {
|
|
|
Map<String, Object> subMsgData = new HashMap<>();
|