From caf4dd3c752f5982adcd3708d2e8f976f81ff49f Mon Sep 17 00:00:00 2001 From: kingno <30263@KINGNO> Date: 星期一, 23 六月 2025 09:59:57 +0800 Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M200 --- src/Bro.M141.Process/M141Config.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 52 insertions(+), 6 deletions(-) diff --git a/src/Bro.M141.Process/M141Config.cs b/src/Bro.M141.Process/M141Config.cs index 3eb2a41..f121104 100644 --- a/src/Bro.M141.Process/M141Config.cs +++ b/src/Bro.M141.Process/M141Config.cs @@ -19,17 +19,18 @@ { public class M141Config : ProcessConfigBase { + + + + + + [Category("鎵撳嵃鏈洪厤缃�")] [Description("鎵撳嵃鏈洪厤缃泦鍚�")] [DisplayName("鎵撳嵃鏈洪厤缃泦鍚�")] [TypeConverter(typeof(CollectionCountConvert))] [Editor(typeof(ComplexCollectionEditor<Printer>), typeof(UITypeEditor))] public List<Printer> Printers { get; set; } = new List<Printer>(); - - - - - @@ -72,8 +73,39 @@ [Category("妫�娴嬪紓甯告寚绀�")] [Description("閫夋嫨鏌愪釜Spec锛屽叾琛ㄧず妫�娴嬭繃绋嬩腑寮傚父")] [DisplayName("寮傚父鎸囩ず鏍囧噯")] - [TypeConverter(typeof(SpecCodeSelectorConverter))] + [TypeConverter(typeof(SpecCodeSelectorConverter))] public string CheckErrorSpecCode { get; set; } = ""; + + + [Category("鐗瑰畾缂洪櫡閰嶇疆")] + [Description("S3鍜孲5鍏卞悓鍒ゆ柇缂洪櫡")] + [DisplayName("缂洪櫡鍚嶇О")] + [TypeConverter(typeof(GlobalDefectNameConverter))] + public string defectname { get; set; } = ""; + + private class GlobalDefectNameConverter : StringConverter + { + public override bool GetStandardValuesExclusive(ITypeDescriptorContext? context) + { + return false; + } + + public override bool GetStandardValuesSupported(ITypeDescriptorContext? context) + { + return true; + } + + public override StandardValuesCollection? GetStandardValues(ITypeDescriptorContext? context) + { + using (var scope = GlobalVar.Container.BeginLifetimeScope()) + { + var config = scope.Resolve<IProcessConfig>(); + + return new StandardValuesCollection((config as IDefectSwitcher).DefectSwitchCollection.Select(u => u.DefectName).ToList()); + } + } + } + [Category("浣嶇疆搴﹁缃�")] @@ -935,6 +967,20 @@ [Description("true锛氬惎鍔ㄧ绾挎祴璇� false锛氬仠姝㈢绾挎祴璇�")] [DisplayName("娴嬭瘯寮�鍏�")] public bool IsStart { get; set; } = true; + + + [Category("妫�娴嬪姛鑳�")] + [Description("鍥剧墖鍦ㄦ壒閲忔祴璇曡繃绋嬩腑鏈�缁堝浘鐗囩粨鏋滀細瀛樺偍杈冩參闇�瑕佽缃欢鏃剁‘淇濆浘鐗囦笉琚祫婧愯嚜鍔ㄩ噴鏀�")] + [DisplayName("鍥剧墖瀛樺浘寤舵椂")] + public int SaveImageTime { get; set; } = 0; + + + + [Category("妫�娴嬪姛鑳�")] + [Description("true锛氬惎鍔∣K娴嬭瘯 false锛氬惎鍔∟G娴嬭瘯")] + [DisplayName("鏄惁娴嬭瘯OK鍥剧墖")] + public bool IsOK { get; set; } = true; + } public class RealTimeAdjustDataDetail : IComplexDisplay -- Gitblit v1.8.0