From 441af1b1ba6f0bc5e94e678029918f354838e9a5 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期六, 04 七月 2020 18:05:55 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Config.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index 84af1e8..cdee3bc 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -64,8 +64,8 @@
[Category("妫�娴嬭缃�")]
[Description("妫�娴嬮厤缃泦鍚�")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<MeasurementUint>), typeof(UITypeEditor))]
- public List<MeasurementUint> MeasurementUnitCollection { get; set; } = new List<MeasurementUint>();
+ [Editor(typeof(ComplexCollectionEditor<MeasurementUnit>), typeof(UITypeEditor))]
+ public List<MeasurementUnit> MeasurementUnitCollection { get; set; } = new List<MeasurementUnit>();
[Category("鍥剧墖淇濆瓨閰嶇疆")]
[Description("鍗曢敭鍥剧墖淇濆瓨閰嶇疆")]
@@ -77,5 +77,23 @@
[Description("鍗曢敭鍥剧墖淇濆瓨鐩綍璺緞")]
[Editor(typeof(FoldDialogEditor),typeof(UITypeEditor))]
public string ImageSaveFolder { get; set; } = "";
+
+ [Category("灞忚斀閰嶇疆")]
+ [Description("true锛氬睆钄藉畨鍏ㄩ棬 false锛氬惎鐢ㄥ畨鍏ㄩ棬")]
+ [ReadOnly(true)]
+ public bool IsSafetyDoorBlocked { get; set; } = false;
+
+ [Category("灞忚斀閰嶇疆")]
+ [Description("true锛氬睆钄藉畨鍏ㄥ厜绾� false锛氬惎鐢ㄥ畨鍏ㄥ厜绾�")]
+ [ReadOnly(true)]
+ public bool IsSafetyBeamBlocked { get; set; } = false;
+
+ [Category("灞忚斀閰嶇疆")]
+ [Description("true锛氬睆钄借渹楦ｅ櫒 false锛氬惎鐢ㄨ渹楦ｅ櫒")]
+ public bool IsBeepBlocked { get; set; } = false;
+
+ [Category("灞忚斀閰嶇疆")]
+ [Description("true锛氱姝㈡墜鍔ㄨ緭鍏ユ潯鐮� false锛氬厑璁告墜鍔ㄨ緭鍏ユ潯鐮�")]
+ public bool IsBarcodeManulInputBlocked { get; set; } = true;
}
}
--
Gitblit v1.8.0