From ff7cab72419729ce2c5adc46350ef45d89a5d1e5 Mon Sep 17 00:00:00 2001 From: patrick.xu <patrick.xu@broconcentric.com> Date: 星期六, 24 七月 2021 10:31:41 +0800 Subject: [PATCH] MES动作添加异常捕捉和重试机制 --- src/Bro.M071.Process/M071Models.cs | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs index ed4c138..790745a 100644 --- a/src/Bro.M071.Process/M071Models.cs +++ b/src/Bro.M071.Process/M071Models.cs @@ -52,7 +52,6 @@ } } - public class KeyAlgorithem : IComplexDisplay { [Browsable(false)] @@ -84,6 +83,10 @@ [Description("妫�娴嬬畻娉曡矾寰�")] [Editor(typeof(FileDialogEditor), typeof(UITypeEditor))] public string AlgorithemPath { get; set; } + + [Category("涓婁紶NG浠g爜")] + [Description("涓婁紶NG浠g爜")] + public string NGCode { get; set; } [Category("鏄剧ず閰嶇疆")] [Description("鏄剧ず鍖哄煙澶у皬")] @@ -277,7 +280,7 @@ Measurements?.ForEach(m => m?.Dispose()); Measurements = null; ElementList = null; - Barcode = null; + //Barcode = null; GC.Collect(); } @@ -509,6 +512,23 @@ } } + public class KeyCodeMap : IComplexDisplay + { + [Category("閿悕鏄犲皠閰嶇疆")] + [Description("閿悕")] + [TypeConverter(typeof(KeyNameDictConverter))] + public string Key { get; set; } + + [Category("閿悕鏄犲皠閰嶇疆")] + [Description("涓婁紶瀵瑰簲閿唬鐮丆ode")] + public string KeyCode { get; set; } + + public string GetDisplayText() + { + return $"{Key}--{KeyCode}"; + } + } + //public class NoticedDictionary<T1, T2> : Dictionary<T1, T2>, INotifyPropertyChanged //{ // public event PropertyChangedEventHandler PropertyChanged; -- Gitblit v1.8.0