|
|
@ -189,7 +189,7 @@ public class UdiTraceService {
|
|
|
|
pushMq(inoutTaskNotity, companyId);
|
|
|
|
pushMq(inoutTaskNotity, companyId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成
|
|
|
|
// if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成
|
|
|
|
//列出需要查询推送企业
|
|
|
|
//列出需要查询推送企业
|
|
|
|
List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId());
|
|
|
|
List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId());
|
|
|
|
if (CollUtil.isNotEmpty(traceOrderEntities)) {
|
|
|
|
if (CollUtil.isNotEmpty(traceOrderEntities)) {
|
|
|
@ -207,16 +207,16 @@ public class UdiTraceService {
|
|
|
|
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum));
|
|
|
|
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum));
|
|
|
|
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId());
|
|
|
|
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId());
|
|
|
|
if (taskNoticeEntity == null) {
|
|
|
|
if (taskNoticeEntity == null) {
|
|
|
|
taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, companyId);
|
|
|
|
taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, userCompanyEntity.getId());
|
|
|
|
pushDelayExpireTask(taskNoticeEntity);
|
|
|
|
pushDelayExpireTask(taskNoticeEntity);
|
|
|
|
pushMq(taskNoticeEntity, companyId);
|
|
|
|
pushMq(taskNoticeEntity, userCompanyEntity.getId());
|
|
|
|
} else if (taskNoticeEntity.getStatus() == 4) {
|
|
|
|
} else if (taskNoticeEntity.getStatus() == 4) {
|
|
|
|
//任务超时未处理,重新推送消息
|
|
|
|
//任务超时未处理,重新推送消息
|
|
|
|
pushMq(taskNoticeEntity, companyId);
|
|
|
|
pushMq(taskNoticeEntity, userCompanyEntity.getId());
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|