From 1c4426810c71eead57084be8a18ade8d314dd8c4 Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期二, 10 十二月 2019 14:24:31 +0800
Subject: [PATCH] 1. 重构项目
---
src/A032.Process/ProcessControl_Task.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/A032.Process/ProcessControl_Task.cs b/src/A032.Process/ProcessControl_Task.cs
index 4bf24ed..38abffe 100644
--- a/src/A032.Process/ProcessControl_Task.cs
+++ b/src/A032.Process/ProcessControl_Task.cs
@@ -9,12 +9,9 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Drawing.Design;
using System.Linq;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -176,8 +173,9 @@
{
if (bind.UnitState == AGVState.Warning)
{
- bind.WarningMsg = "";
- bind.UnitState = AGVState.Idle;
+ //bind.WarningMsg.Clear();
+ //bind.UnitState = AGVState.Idle;
+ bind.Reset();
}
});
@@ -189,8 +187,10 @@
if (bind != null && bind.UnitState == AGVState.Warning)
{
- bind.WarningMsg = "";
- bind.UnitState = AGVState.Idle;
+ //bind.WarningMsg.Clear();
+ //bind.UnitState = AGVState.Idle;
+
+ bind.Reset();
LogAsync(DateTime.Now, "Reset", $"鎵ц{bind.AGV.Name}澶嶄綅鎿嶄綔");
}
@@ -287,7 +287,7 @@
}
else
{
- bind = Config.AGVBindCollection.FirstOrDefault(u => u.Id == unitId);
+ bind = Config.AGVBindCollection.FirstOrDefault(u => u.Id == unitId && (u.UnitState == AGVState.Idle || u.UnitState == AGVState.IdleCharge));
}
if (bind == null)
@@ -436,7 +436,7 @@
bind.CurrentTaskId = "";
if (isWarningRaised)
{
- bind.WarningMsg = warningMsg;
+ bind.WarningMsg.Add(warningMsg);
bind.UnitState = AGVState.Warning;
}
else
@@ -447,8 +447,9 @@
if (!isNotTimeout)
{
- bind.WarningMsg = $"{bind.AGV.Name}鑾峰彇鐢垫睜鐘舵�佽秴鏃�";
- new ProcessException(bind.WarningMsg);
+ string msg = $"{bind.AGV.Name}鑾峰彇鐢垫睜鐘舵�佽秴鏃�";
+ bind.WarningMsg.Add(msg);
+ new ProcessException(msg);
bind.UnitState = AGVState.Warning;
}
else
@@ -462,8 +463,9 @@
if (chargePosition == null)
{
- bind.WarningMsg = $"{bind.AGV.Name}鐩墠鏃犲彲鐢ㄥ厖鐢靛湴鍧�";
- new ProcessException(bind.WarningMsg);
+ string msg = $"{bind.AGV.Name}鐩墠鏃犲彲鐢ㄥ厖鐢靛湴鍧�";
+ bind.WarningMsg.Add(msg);
+ new ProcessException(msg);
bind.UnitState = AGVState.Warning;
}
else
--
Gitblit v1.8.0