Compare commits

..

No commits in common. "25d9354d81dccbd65b35e91aa63c8d8e9a649921" and "6eb2839b7a979d6c0696bf2f8a665e655d0e31e2" have entirely different histories.

View File

@ -81,8 +81,6 @@ public class AsynRunTaskService extends BaseService {
private AutoExeTaskServiceBiz autoExeTaskServiceBiz;
@Resource
private CurrTaskDetServiceBiz currTaskDetServiceBiz;
@Resource
private TaskHisServiceBiz taskHisServiceBiz;
//工业炉可用未满的情况下调用车辆起点为提升台终点为工业炉
@Async("asyncServiceExecutor")
@ -251,9 +249,6 @@ public class AsynRunTaskService extends BaseService {
// 记录开始加工时的消耗值
asynStartRecordConsume(currTaskId, currTask.getKilnId());
} else {
//修改缓存区存储情况表状态
inStockInfo.setStatus(0);
inStockInfoServiceBiz.updateById(inStockInfo);
runTask.setStatus(3);
runTask.setUpdateTime(LocalDateTime.now());
runTaskServiceBiz.updateById(runTask);
@ -339,8 +334,6 @@ public class AsynRunTaskService extends BaseService {
}
}
} else {
//任务失败清除缓存库位信息
inStockInfoServiceBiz.removeById(inStockInfo);
runTask.setStatus(3);
runTask.setUpdateTime(LocalDateTime.now());
runTaskServiceBiz.updateById(runTask);
@ -404,10 +397,6 @@ public class AsynRunTaskService extends BaseService {
currTask.setUpdateTime(LocalDateTime.now());
logger.info("修改currTask任务状态");
currTaskServiceBiz.updateById(currTask);
//新增历史任务表
TaskHis taskHis=new TaskHis();
BeanUtils.copyProperties(currTask,taskHis);
taskHisServiceBiz.save(taskHis);
//更新in_stock_info表
inStockInfo.setStatus(2);
inStockInfo.setInTime(LocalDateTime.now());