|
@@ -232,7 +232,7 @@ namespace WCS.Service.Works
|
|
|
//找到该堆垛机当前等待执行的任务
|
|
|
var q = db.Default.Set<WCS_TASK>().Where(v => v.STATUS == TaskStatus.新建)
|
|
|
.Where(v => v.DEVICE == sc)
|
|
|
- .Where(v => v.TYPE == TaskType.出库)
|
|
|
+ .Where(v => v.TYPE == TaskType.出库 && v.Priority >= 0)
|
|
|
.Where(v => !db.Default.Set<WCS_TASK>().Any(d => d.DEVICE == sc && d.STATUS == TaskStatus.堆垛机执行));
|
|
|
|
|
|
if (dev.Entity.CODE == "SC4" || dev.Entity.CODE == "SC5")
|
|
@@ -569,7 +569,7 @@ namespace WCS.Service.Works
|
|
|
|
|
|
var q = db.Default.Set<WCS_TASK>().Where(v => v.STATUS == TaskStatus.新建)
|
|
|
.Where(v => v.DEVICE == sc)
|
|
|
- .Where(v => v.TYPE == TaskType.出库)
|
|
|
+ .Where(v => v.TYPE == TaskType.出库 && v.Priority >= 0)
|
|
|
.Where(v => !db.Default.Set<WCS_TASK>().Any(d => d.DEVICE == sc && d.STATUS == TaskStatus.堆垛机执行));
|
|
|
|
|
|
if (dev.Entity.CODE == "SC4" || dev.Entity.CODE == "SC5")
|