@@ -89,7 +89,8 @@ public class EnergyController extends BaseController { | |||||
@PostMapping(value = "energyList") | @PostMapping(value = "energyList") | ||||
@ApiOperation(value = "根据加工炉id获取能源消耗情况") | @ApiOperation(value = "根据加工炉id获取能源消耗情况") | ||||
public R<String> energyList(@Validated({Default.class}) @RequestBody ElectricQueryParam electricQueryParam){ | public R<String> energyList(@Validated({Default.class}) @RequestBody ElectricQueryParam electricQueryParam){ | ||||
TaskHis currTask = taskHisServiceBiz.getById(electricQueryParam.getTaskId()); | |||||
//TaskHis currTask = taskHisServiceBiz.getById(electricQueryParam.getTaskId()); | |||||
TaskHis currTask = taskHisServiceBiz.getOne(new QueryWrapper<TaskHis>().eq(TaskHis.TASK_ID, electricQueryParam.getTaskId())); | |||||
Long kilnId = currTask.getKilnId(); | Long kilnId = currTask.getKilnId(); | ||||
KilnInfo kilnInfo = kilnInfoServiceBiz.getById(kilnId); | KilnInfo kilnInfo = kilnInfoServiceBiz.getById(kilnId); | ||||
Integer kilnType = kilnInfo.getType(); | Integer kilnType = kilnInfo.getType(); | ||||
@@ -149,7 +149,7 @@ public class AsynRunTaskService extends BaseService { | |||||
if (threeSetp>0){ | if (threeSetp>0){ | ||||
//当前任务为自动任务里的第三步,先上报第二步的apms处理endProcess | //当前任务为自动任务里的第三步,先上报第二步的apms处理endProcess | ||||
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId)); | AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId)); | ||||
CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); | |||||
CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getTTaskId()); | |||||
secondCurrTask.setIsIn(2); | secondCurrTask.setIsIn(2); | ||||
secondCurrTask.setStatus(2); | secondCurrTask.setStatus(2); | ||||
currTaskServiceBiz.updateById(secondCurrTask); | currTaskServiceBiz.updateById(secondCurrTask); | ||||
@@ -543,9 +543,16 @@ public class ScheduledTask extends BaseService { | |||||
//因为readyIn在多用炉第一托盘下油后一直存在,到出炉为止.所以查询当前炉子在加工的任务,大于一条,则不再根据readyIn发起任务 | //因为readyIn在多用炉第一托盘下油后一直存在,到出炉为止.所以查询当前炉子在加工的任务,大于一条,则不再根据readyIn发起任务 | ||||
List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>() | List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>() | ||||
.eq(CurrTask.KILN_ID, kilnInfo.getId()).eq(CurrTask.IS_IN, 1).eq(CurrTask.STATUS,1)); | .eq(CurrTask.KILN_ID, kilnInfo.getId()).eq(CurrTask.IS_IN, 1).eq(CurrTask.STATUS,1)); | ||||
if (currTaskList.size()>1){ | |||||
continue; | |||||
if (kilnInfo.getType()==1){ | |||||
if (currTaskList.size()>1){ | |||||
continue; | |||||
} | |||||
}else { | |||||
if (currTaskList.size()>0){ | |||||
continue; | |||||
} | |||||
} | } | ||||
//缓存区是否有目标位置为工业炉的待加工任务 | //缓存区是否有目标位置为工业炉的待加工任务 | ||||
List<InStockInfo> inStockInfoList = inStockInfoServiceBiz.list(new QueryWrapper<InStockInfo>() | List<InStockInfo> inStockInfoList = inStockInfoServiceBiz.list(new QueryWrapper<InStockInfo>() | ||||
.eq(InStockInfo.TYPE, 1) | .eq(InStockInfo.TYPE, 1) | ||||