From 78584911d0457ad9fc26d9dfc6f374b7ef531c0f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期日, 22 十一月 2020 13:45:09 +0800
Subject: [PATCH] 1. 添加操作员输入和界面显示 2. 添加通过输入窗体 3. 添加webservice调用帮助类 4. M071添加MES数据检查和数据上传功能，添加相关界面显示和流程控制
---
src/Bro.M071.Process/M071Config.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index fa7ad15..33cba6e 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -41,11 +41,18 @@
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("鎷嶆憚鐐逛綅璁剧疆闆嗗悎")]
@@ -67,6 +74,16 @@
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<MeasurementUnit>), typeof(UITypeEditor))]
public List<MeasurementUnit> MeasurementUnitCollection { get; set; } = new List<MeasurementUnit>();
+
+ [Category("妫�娴嬭缃�")]
+ [Description("骞抽潰琛ュ伩鍊�")]
+ [DisplayName("4.骞抽潰琛ュ伩鍊�")]
+ public double PlanCompensation { get; set; }
+
+ [Category("妫�娴嬭缃�")]
+ [Description("鏁版嵁绮惧害璁剧疆")]
+ [DisplayName("5.鏁版嵁绮惧害浣嶆暟")]
+ public int Precision { get; set; } = 3;
//[Category("妫�娴嬭缃�")]
//[DisplayName("缁撴灉鏁版嵁淇濆瓨璺緞")]
@@ -115,7 +132,44 @@
[Category("MES璁剧疆")]
[Description("true锛氭暟鎹笂浼犺嚦MES false锛氭暟鎹笉涓婁紶")]
+ [DisplayName("MES涓婁紶鍚敤")]
[ReadOnly(true)]
public bool IsEnableMESUpload { get; set; } = false;
+
+ [Category("MES璁剧疆")]
+ [Description("true锛氭娴嬬敤鎴风櫥褰� false锛氫笉寮哄埗鐢ㄦ埛鐧诲綍")]
+ [DisplayName("鐢ㄦ埛鐧诲綍妫�娴�")]
+ [Browsable(false)]
+ public bool IsUserLoginCheck { get; set; } = false;
+
+ [Category("MES璁剧疆")]
+ [Description("MES涓婁紶璺緞")]
+ [DisplayName("MES涓婁紶璺緞")]
+ public string MESURL { get; set; } = "";
+
+ [Category("MES璁剧疆")]
+ [Description("绔欑偣缂栫爜")]
+ [DisplayName("绔欑偣缂栫爜")]
+ public string StationCode { get; set; } = "";
+
+ [Category("MES璁剧疆")]
+ [Description("Project缂栫爜")]
+ [DisplayName("Project缂栫爜")]
+ public string ProjectCode { get; set; } = "";
+
+ [Category("MES璁剧疆")]
+ [Description("绾夸綋缂栫爜")]
+ [DisplayName("绾夸綋缂栫爜")]
+ public string LineCode { get; set; } = "";
+
+ [Category("MES璁剧疆")]
+ [Description("楠岃瘉褰撳墠鍏佽鏂板娆℃暟[FALSE=涓嶉獙璇� TRUE=闄愬埗涓ゆ浠ヤ笅(鍖呭惈涓ゆ)]")]
+ [DisplayName("澶氭楠岃瘉寮�鍏�")]
+ public bool IsDisableMultipleCheckTimes { get; set; }
+
+ [Category("澶嶄綅璁剧疆")]
+ [Description("澶у浣嶉渶瑕佷俊鍙锋寔缁椂闂达紝澶嶄綅淇″彿鎸佺画瓒呭嚭璇ユ椂闂存墽琛屽ぇ澶嶄綅锛屽崟浣嶏細s")]
+ [DisplayName("澶у浣嶆寔缁俊鍙烽暱搴�")]
+ public int FullResetRequiredDuration { get; set; } = 3;
}
}
--
Gitblit v1.8.0