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/AGVBindUnit.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/A032.Process/AGVBindUnit.cs b/src/A032.Process/AGVBindUnit.cs
index f4e06cc..5eef59f 100644
--- a/src/A032.Process/AGVBindUnit.cs
+++ b/src/A032.Process/AGVBindUnit.cs
@@ -8,10 +8,8 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
-using System.Threading;
namespace A032.Process
{
@@ -154,7 +152,7 @@
[Browsable(false)]
[JsonIgnore]
- public string WarningMsg { get; set; } = "";
+ public List<string> WarningMsg { get; set; } = new List<string>();
#endregion
#region 璁惧
@@ -203,6 +201,15 @@
public AGVBindUnit()
{
}
+
+ public void Reset()
+ {
+ WarningMsg.Clear();
+ UnitState = AGVState.Idle;
+
+ AGV.ResetAlarm();
+ Robot.ResetAlarm();
+ }
}
public class AGVDeviceConverter : ComboBoxItemTypeConvert
--
Gitblit v1.8.0