|
|
@@ -34,8 +34,8 @@ namespace WCS.WorkEngineering.Systems
|
|
|
SqlSugarHelper.Do(db =>
|
|
|
{
|
|
|
//获取所有的新建任务,组盘任务不需要
|
|
|
- taskInfos = db.Default.Queryable<WCS_TaskInfo>().ReadPastUpdLock().Where(x => x.Status == 0).ToList()
|
|
|
- .Where(x => x.Type != TaskType.SetPlate || (x.Type == TaskType.SetPlate && x.AddrFrom != "Robot") && x.BusType!="芯股用空托盘入库").Select(x => x.ID).ToList();
|
|
|
+ taskInfos = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.Status == 0).ToList()
|
|
|
+ .Where(x => x.Type != TaskType.SetPlate || (x.Type == TaskType.SetPlate && x.AddrFrom != "Robot") && x.BusType!="芯股用空托盘入库" && !x.BarCode.Contains("Error")).Select(x => x.ID).ToList();
|
|
|
var time = DateTime.Now.AddMinutes(-20);
|
|
|
var time1 = DateTime.Now.AddMinutes(-40);
|
|
|
var timeOut = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "车间叫料" && x.Status < TaskStatus.StackerExecution && x.AddTime < time);
|
|
|
@@ -72,7 +72,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
{
|
|
|
SqlSugarHelper.Do(db =>
|
|
|
{
|
|
|
- var task = db.Default.Queryable<WCS_TaskInfo>().Where(t => t.ID == item).First();
|
|
|
+ var task = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.ID == item && t.Status== TaskStatus.NewBuild).First();
|
|
|
|
|
|
switch (task.Type)
|
|
|
{
|