Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
This commit is contained in:
commit
41227ec816
@ -542,7 +542,7 @@ public class ScheduledTask extends BaseService {
|
||||
if (kilnReadyIn||kilnAllowIn){
|
||||
//因为readyIn在多用炉第一托盘下油后一直存在,到出炉为止.所以查询当前炉子在加工的任务,大于一条,则不再根据readyIn发起任务
|
||||
List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>()
|
||||
.eq(CurrTask.KILN_ID, kilnInfo.getId()).eq(CurrTask.IS_IN, 1));
|
||||
.eq(CurrTask.KILN_ID, kilnInfo.getId()).eq(CurrTask.IS_IN, 1).eq(CurrTask.STATUS,1));
|
||||
if (currTaskList.size()>1){
|
||||
continue;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user