|
|
@@ -543,9 +543,16 @@ public class ScheduledTask extends BaseService { |
|
|
|
//因为readyIn在多用炉第一托盘下油后一直存在,到出炉为止.所以查询当前炉子在加工的任务,大于一条,则不再根据readyIn发起任务 |
|
|
|
List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>() |
|
|
|
.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>() |
|
|
|
.eq(InStockInfo.TYPE, 1) |
|
|
|