Commit 9691621b 张东亮

AGV任务状态打印

1 个父辈 cd57cc73
...@@ -32,7 +32,7 @@ namespace DeviceLibrary ...@@ -32,7 +32,7 @@ namespace DeviceLibrary
/// <summary> /// <summary>
/// 等待任务执行队列 /// 等待任务执行队列
/// </summary> /// </summary>
ConcurrentQueue<AgvTask> WaitExecuteTask= new ConcurrentQueue<AgvTask>(); ConcurrentQueue<AgvTask> WaitExecuteTask = new ConcurrentQueue<AgvTask>();
/// <summary> /// <summary>
/// 任务状态 /// 任务状态
/// </summary> /// </summary>
...@@ -60,11 +60,17 @@ namespace DeviceLibrary ...@@ -60,11 +60,17 @@ namespace DeviceLibrary
{ {
return !TaskID.Equals(-1) && !TaskState.Equals(SettingString.Wait); return !TaskID.Equals(-1) && !TaskState.Equals(SettingString.Wait);
} }
string preTaskState = "";
public bool CheckTaskFinished(string name = "") public bool CheckTaskFinished(string name = "")
{ {
if(TaskState.Equals(SettingString.Done)) if (!TaskState.Equals(preTaskState))
{
preTaskState = new string(TaskState.ToArray());
LogUtil.info($"{Task?.Name ?? ""},{TaskID},{TaskState}");
}
if (TaskState.Equals(SettingString.Done))
{ {
LogUtil.info($"{Task?.Name??""},{TaskID},{SettingString.Done}");
return true; return true;
} }
return false; return false;
...@@ -77,7 +83,7 @@ namespace DeviceLibrary ...@@ -77,7 +83,7 @@ namespace DeviceLibrary
} }
public bool CheckTaskExist(AgvTask agvTask) public bool CheckTaskExist(AgvTask agvTask)
{ {
return WaitExecuteTask.Any(s => s.Name.Equals(agvTask.Name)); return WaitExecuteTask.Any(s => s.Name.Equals(agvTask.Name));
} }
public bool DeWaitTaskQueue(out AgvTask task) public bool DeWaitTaskQueue(out AgvTask task)
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!