From 78994d1c8243018f6e37717e3ea0a0297d491bd8 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 13:10:24 +0800
Subject: [PATCH] 标签显示和列表联动修改

---
 src/Bro.M071.Process/M071Config.cs |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index ac8195a..b0944f2 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -64,8 +64,14 @@
         [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("妫�娴嬭缃�")]
+        [DisplayName("缁撴灉鏁版嵁淇濆瓨璺緞")]
+        [Description("妫�娴嬬粨鏋滄暟鎹繚瀛樿矾寰�")]
+        [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
+        public string ResultDataSaveFolder { get; set; } = "";
 
         [Category("鍥剧墖淇濆瓨閰嶇疆")]
         [Description("鍗曢敭鍥剧墖淇濆瓨閰嶇疆")]
@@ -95,5 +101,10 @@
         [Category("灞忚斀閰嶇疆")]
         [Description("true锛氱姝㈡墜鍔ㄨ緭鍏ユ潯鐮� false锛氬厑璁告墜鍔ㄨ緭鍏ユ潯鐮�")]
         public bool IsBarcodeManulInputBlocked { get; set; } = true;
+
+        [Category("MES璁剧疆")]
+        [Description("true锛氭暟鎹笂浼犺嚦MES false锛氭暟鎹笉涓婁紶")]
+        [ReadOnly(true)]
+        public bool IsEnableMESUpload { get; set; } = false;
     }
 }

--
Gitblit v1.8.0