From beb0f2c826515c0a2abc9ee6eb296dd5d7199b3a Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期一, 06 七月 2020 13:24:44 +0800
Subject: [PATCH] 机台暂停/继续操作
---
src/Bro.M071.Process/M071Models.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index 8c15fde..0d94bd0 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -205,9 +205,13 @@
{
public string Barcode;
- public List<MeasurementUint> Measurements = new List<MeasurementUint>();
+ public List<MeasurementUnit> Measurements = new List<MeasurementUnit>();
public List<IShapeElement> ElementList = new List<IShapeElement>();
+
+ public DateTime? StartTime = null;
+
+ public DateTime? EndTime = null;
public event PropertyChangedEventHandler PropertyChanged;
@@ -235,7 +239,7 @@
}
}
- public class MeasurementUint : IComplexDisplay, INotifyPropertyChanged, IDisposable
+ public class MeasurementUnit : IComplexDisplay, INotifyPropertyChanged, IDisposable
{
public string Id = Guid.NewGuid().ToString();
@@ -312,7 +316,7 @@
[Category("鍗曢敭閰嶇疆")]
[Description("鍗曢敭缁撴灉閰嶇疆")]
[TypeConverter(typeof(KeyUnitResultConverter))]
- public string KeyResult { get; set; } = "";
+ public string KeyResultId { get; set; } = "";
public List<HImage> KeyImages = new List<HImage>();
@@ -342,7 +346,7 @@
{
string msg = Key;
- msg += string.IsNullOrWhiteSpace(KeyResult) ? "" : $"-{KeyResult}";
+ msg += string.IsNullOrWhiteSpace(KeyResultId) ? "" : $"-{KeyResultId}";
return msg;
}
--
Gitblit v1.8.0