diff --git a/BPASmartClient.Device/AlarmAttribute.cs b/BPASmartClient.Device/AlarmAttribute.cs
new file mode 100644
index 00000000..3f053bbf
--- /dev/null
+++ b/BPASmartClient.Device/AlarmAttribute.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Device
+{
+ [AttributeUsage(AttributeTargets.Property)]
+ public class AlarmAttribute : Attribute
+ {
+ public AlarmAttribute(string Info)
+ {
+ AlarmInfo = Info;
+ }
+ ///
+ /// 报警信息
+ ///
+ public string AlarmInfo { get; set; }
+ }
+}
diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index aada3f1e..1889ddfc 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -23,6 +23,7 @@ namespace BPASmartClient.Device
{
}
+ #region 属性
///
/// 订单物料信息
///
@@ -48,7 +49,14 @@ namespace BPASmartClient.Device
///
public string Name { get; set; }
+ ///
+ /// 当前订单数量
+ ///
protected int OrderCount { get; set; }
+
+ ///
+ /// 设备初始化中
+ ///
protected bool Initing { get; set; }
///
@@ -70,20 +78,27 @@ namespace BPASmartClient.Device
/// 设备运行日志
///
public List