|
@@ -32,7 +32,7 @@ namespace WCS.WorkEngineering.Systems
|
|
{
|
|
{
|
|
//获取所有的新建任务,组盘任务不需要
|
|
//获取所有的新建任务,组盘任务不需要
|
|
taskInfos = db.Default.Queryable<WCS_TaskInfo>().ReadPastUpdLock().Where(x => x.Status == 0).ToList()
|
|
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();
|
|
|
|
|
|
+ .Where(x => x.Type != TaskType.SetPlate || (x.Type == TaskType.SetPlate && x.AddrFrom != "Robot")).Where(x => x.BusType != "人工满托入库").Select(x => x.ID).ToList();
|
|
var time = DateTime.Now.AddMinutes(-20);
|
|
var time = DateTime.Now.AddMinutes(-20);
|
|
var time1 = DateTime.Now.AddMinutes(-40);
|
|
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);
|
|
var timeOut = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "车间叫料" && x.Status < TaskStatus.StackerExecution && x.AddTime < time);
|
|
@@ -62,6 +62,7 @@ namespace WCS.WorkEngineering.Systems
|
|
SqlSugarHelper.Do(db =>
|
|
SqlSugarHelper.Do(db =>
|
|
{
|
|
{
|
|
var task = db.Default.Queryable<WCS_TaskInfo>().Where(t => t.ID == item).First();
|
|
var task = db.Default.Queryable<WCS_TaskInfo>().Where(t => t.ID == item).First();
|
|
|
|
+
|
|
switch (task.Type)
|
|
switch (task.Type)
|
|
{
|
|
{
|
|
case TaskType.SetPlate:
|
|
case TaskType.SetPlate:
|
|
@@ -247,6 +248,7 @@ namespace WCS.WorkEngineering.Systems
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
catch (Exception ex)
|
|
{
|
|
{
|
|
|
|
+ if (ex.Message.Contains("Index")) World.Log($"{ex.Message}:{ex.StackTrace}");
|
|
if (ex.Message.Contains("SqlTransaction")) World.Log($"{ex.Message}:{ex.StackTrace}");
|
|
if (ex.Message.Contains("SqlTransaction")) World.Log($"{ex.Message}:{ex.StackTrace}");
|
|
World.Log(ex.Message, LogLevelEnum.Mid);
|
|
World.Log(ex.Message, LogLevelEnum.Mid);
|
|
}
|
|
}
|