林豪 左 hai 1 ano
pai
achega
6136fb6d85

+ 5 - 4
业务工程/分拣库/WCS.Entity.Protocol/DataStructure/DeviceDataPack.cs

@@ -17,14 +17,12 @@ namespace WCS.Entity.Protocol.DataStructure
     [DataContract]
     public class DeviceDataPack
     {
-       
         [DataMember(Order = 0)]
         public ProtocolData<WCS_BCR80>[] BCR80 { get; set; }
-      
+
         [DataMember(Order = 1)]
         public ProtocolData<WCS_BCR81>[] BCR81 { get; set; }
 
-        
         [DataMember(Order = 2)]
         public ProtocolData<WCS_BCR83>[] BCR83 { get; set; }
 
@@ -106,6 +104,9 @@ namespace WCS.Entity.Protocol.DataStructure
         [DataMember(Order = 26)]
         public int PlaybackSeconds { get; set; }
 
+        [DataMember(Order = 27)]
+        public ProtocolData<WCS_RGV523>[] RGV523 { get; set; }
+
         public Dictionary<string, ProtocolData[]> GetDeviceData()
         {
             List<Tuple<string, ProtocolData>> list = new List<Tuple<string, ProtocolData>>();
@@ -132,9 +133,9 @@ namespace WCS.Entity.Protocol.DataStructure
     {
         [DataMember(Order = 0)]
         public string Code { get; set; }
+
         [DataMember(Order = 1)]
         public DateTime Frame { get; set; }
-
     }
 
     [DataContract]

+ 27 - 27
业务工程/分拣库/WCS.Entity.Protocol/RGV/RGVEnum.cs

@@ -570,10 +570,10 @@ namespace WCS.Entity.Protocol.RGV
         查询站台号异常 = 1L << 46,
 
         /// <summary>
-        ///  备用
+        ///  动作超时
         /// </summary>
-        [Description("备用")]
-        备用 = 1L << 47,
+        [Description("动作超时")]
+        动作超时 = 1L << 47,
 
         /// <summary>
         ///  备用1
@@ -594,75 +594,75 @@ namespace WCS.Entity.Protocol.RGV
         备用3 = 1L << 50,
 
         /// <summary>
-        ///  货叉中位光电异常
+        ///  备用4
         /// </summary>
-        [Description("货叉中位光电异常")]
+        [Description("备用4")]
         备用4 = 1L << 51,
 
         /// <summary>
-        ///  载货台电源空开
+        ///  备用5
         /// </summary>
-        [Description("载货台电源空开")]
+        [Description("备用5")]
         备用5 = 1L << 52,
 
         /// <summary>
-        ///  按钮, 安全回路空开
+        ///   备用6
         /// </summary>
-        [Description("按钮安全回路空开")]
+        [Description("备用6")]
         备用6 = 1L << 53,
 
         /// <summary>
-        ///  货物左前坍塌
+        ///  备用7
         /// </summary>
-        [Description("货物左后坍塌")]
+        [Description("备用7")]
         备用7 = 1L << 54,
 
         /// <summary>
-        ///  货物右前坍塌
+        ///  备用8
         /// </summary>
-        [Description("货物右后坍塌")]
+        [Description("备用8")]
         备用8 = 1L << 55,
 
         /// <summary>
-        ///  登梯口急停
+        ///  备用9
         /// </summary>
-        [Description("登梯口急停")]
+        [Description("备用9")]
         备用9 = 1L << 56,
 
         /// <summary>
-        ///  货物左超高19M
+        ///  备用10
         /// </summary>
-        [Description("货物左超高19M")]
+        [Description("备用10")]
         备用10 = 1L << 57,
 
         /// <summary>
-        ///  货物右超高19M
+        ///  备用11
         /// </summary>
-        [Description("货物右超高19M")]
+        [Description("备用11")]
         备用11 = 1L << 58,
 
         /// <summary>
-        ///  松绳限位触发2
+        ///  备用12
         /// </summary>
-        [Description("松绳限位触发2")]
+        [Description("备用12")]
         备用12 = 1L << 59,
 
         /// <summary>
-        ///  货叉右侧超行程
+        ///  备用13
         /// </summary>
-        [Description("货叉右侧超行程")]
+        [Description("备用13")]
         备用13 = 1L << 60,
 
         /// <summary>
-        ///  取放货托盘总数超出限制
+        ///  备用14
         /// </summary>
-        [Description("取放货托盘总数超出限制")]
+        [Description("备用14")]
         备用14 = 1L << 61,
 
         /// <summary>
-        ///  安全门急停
+        ///  备用15
         /// </summary>
-        [Description("安全门急停")]
+        [Description("备用15")]
         备用15 = 1L << 62,
     }
 }

+ 2 - 2
业务工程/分拣库/WCS.Entity.Protocol/SRM/WCS_SRM523.cs

@@ -8,7 +8,7 @@ namespace WCS.Entity.Protocol.SRM
     ///  SRM537
     /// </summary>
     [DataContract]
-    [SugarTable("FJ_SRM537")]
+    [SugarTable("FJ_SRM523")]
     public class WCS_SRM523 : ISRM523
     {
         /// <inheritdoc/>
@@ -30,7 +30,7 @@ namespace WCS.Entity.Protocol.SRM
     ///  SRM537
     /// </summary>
     [DataContract]
-    [SugarTable("FJ_SRM537")]
+    [SugarTable("FJ_SRM523")]
     public class QuestDb_SRM523
     {
         public string Alarm { get; set; }