From 30458c0bca8066d98ca901b5065832a44a7e970e Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 16 七月 2020 15:47:22 +0800
Subject: [PATCH] 测量结果 查询+导出功能
---
src/Bro.M071.Process/M071Config.cs | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index 1c1d42d..9edb448 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -1,4 +1,5 @@
-锘縰sing Bro.Common.Helper;
+锘縰sing Bro.Common.Base;
+using Bro.Common.Helper;
using Bro.Common.Model;
using Bro.Process;
using System;
@@ -22,10 +23,10 @@
public List<string> KeyNameCollection { get; set; } = new List<string>();
[Category("鍏叡瀛楀吀閰嶇疆")]
- [Description("妫�娴嬫爣鍑嗛泦鍚�")]
+ [Description("妫�娴嬬被鍨嬪拰鏍囧噯闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<Spec>), typeof(UITypeEditor))]
- public List<Spec> MeasureSpecCollection { get; set; } = new List<Spec>();
+ [Editor(typeof(ComplexCollectionEditor<MeasureType>), typeof(UITypeEditor))]
+ public List<MeasureType> MeasureTypeCollection { get; set; } = new List<MeasureType>();
[Category("鍏叡瀛楀吀閰嶇疆")]
[Description("鍗曢敭绠楁硶閰嶇疆闆嗗悎")]
@@ -40,27 +41,88 @@
public List<KeyResult> KeyResultCollection { get; set; } = new List<KeyResult>();
#endregion
- [Category("鑳屾櫙鍥剧墖璁剧疆")]
+ [Category("鏄剧ず閰嶇疆")]
[Description("杩愯鑳屾櫙鍥剧墖璺緞")]
[Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
+ [DisplayName("鑳屾櫙鍥剧墖")]
public string BackgroundImagePath { get; set; }
+
+ [Category("鏄剧ず閰嶇疆")]
+ [Description("閿洏鍏抽敭閿綅甯冨眬鏄剧ず")]
+ [TypeConverter(typeof(CollectionCountConvert))]
+ [Editor(typeof(ComplexCollectionEditor<KeyLocation>), typeof(UITypeEditor))]
+ [DisplayName("閿綅鏄剧ず")]
+ public List<KeyLocation> KeyLocationCollection { get; set; } = new List<KeyLocation>();
[Category("妫�娴嬭缃�")]
[Description("鎷嶆憚鐐逛綅璁剧疆闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<SnapshotPoint>), typeof(UITypeEditor))]
+ [DisplayName("1.杩愬姩鐐逛綅")]
public List<SnapshotPoint> SnapshotPointCollection { get; set; } = new List<SnapshotPoint>();
[Category("妫�娴嬭缃�")]
[Description("瑙嗚妫�娴嬪崟閿厤缃泦鍚�")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<KeyUnit>), typeof(UITypeEditor))]
+ [DisplayName("2.鍗曢敭閰嶇疆")]
public List<KeyUnit> KeyUnitCollection { get; set; } = new List<KeyUnit>();
[Category("妫�娴嬭缃�")]
[Description("妫�娴嬮厤缃泦鍚�")]
+ [DisplayName("3.妫�娴嬮」闆嗗悎")]
[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("鍗曢敭鍥剧墖淇濆瓨閰嶇疆")]
+ [TypeConverter(typeof(ComplexObjectConvert))]
+ [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
+ public ImageSaveOption ImageSaveOption { get; set; } = new ImageSaveOption();
+
+ [Category("鍥剧墖淇濆瓨閰嶇疆")]
+ [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;
+
+ private bool isBeepBlocked = false;
+ [Category("灞忚斀閰嶇疆")]
+ [Description("true锛氬睆钄借渹楦ｅ櫒 false锛氬惎鐢ㄨ渹楦ｅ櫒")]
+ public bool IsBeepBlocked
+ {
+ get => isBeepBlocked;
+ set => Set(ref isBeepBlocked, value);
+ }
+
+ private bool isBarcodeManualInputBlocked = true;
+ [Category("灞忚斀閰嶇疆")]
+ [Description("true锛氱姝㈡墜鍔ㄨ緭鍏ユ潯鐮� false锛氬厑璁告墜鍔ㄨ緭鍏ユ潯鐮�")]
+ public bool IsBarcodeManualInputBlocked
+ {
+ get => isBarcodeManualInputBlocked;
+ set => Set(ref isBarcodeManualInputBlocked, value);
+ }
+
+ [Category("MES璁剧疆")]
+ [Description("true锛氭暟鎹笂浼犺嚦MES false锛氭暟鎹笉涓婁紶")]
+ [ReadOnly(true)]
+ public bool IsEnableMESUpload { get; set; } = false;
}
}
--
Gitblit v1.8.0