fix

业务工程/分拣库/WCS.Entity.Protocol/Robot/RobotEnum.cs

@@ -178,119 +178,119 @@ namespace WCS.Entity.Protocol.Protocol.Robot
     [Flags]
     public enum RobotAlarm : ulong
     {
+        /// <summary>
+        ///  无
+        /// </summary>
+        [Description("无")]
+        无 = 0,
+
         /// <summary>
         ///  入库货位有货
         /// </summary>
         [Description("入库货位有货")]
-        入库货位有货 = 0,
+        入库货位有货 = 1L << 0,
 
         /// <summary>
         ///  出库货位无货
         /// </summary>
         [Description("出库货位无货")]
-        出库货位无货 = 1L << 0,
+        出库货位无货 = 1L << 1,
 
         /// <summary>
         ///  库位任务超出范围报错
         /// </summary>
         [Description("库位任务超出范围报错")]
-        库位任务超出范围报错 = 1L << 1,
+        库位任务超出范围报错 = 1L << 2,
 
         /// <summary>
         ///  码垛任务超出范围报错
         /// </summary>
         [Description("码垛任务超出范围报错")]
-        码垛任务超出范围报错 = 1L << 2,
+        码垛任务超出范围报错 = 1L << 3,
 
         /// <summary>
         ///  夹具1抓取货物报错
         /// </summary>
         [Description("夹具1抓取货物报错")]
-        夹具1抓取货物报错 = 1L << 3,
+        夹具1抓取货物报错 = 1L << 4,
 
         /// <summary>
         ///  夹具2抓取货物报错
         /// </summary>
         [Description("夹具2抓取货物报错")]
-        夹具2抓取货物报错 = 1L << 4,
+        夹具2抓取货物报错 = 1L << 5,
 
         /// <summary>
-        ///  夹具1压货报警
+        /// 夹具1压货报警
         /// </summary>
         [Description("夹具1压货报警")]
-        夹具1压货报警 = 1L << 5,
+        夹具1压货报警 = 1L << 6,
 
         /// <summary>
-        /// 夹具2压货报警
+        ///  夹具2压货报警
         /// </summary>
         [Description("夹具2压货报警")]
-        夹具2压货报警 = 1L << 6,
+        夹具2压货报警 = 1L << 7,
 
         /// <summary>
         ///  夹具1掉料报警
         /// </summary>
         [Description("夹具1掉料报警")]
-        夹具1掉料报警 = 1L << 7,
+        夹具1掉料报警 = 1L << 8,
 
         /// <summary>
         ///  夹具2掉料报警
         /// </summary>
         [Description("夹具2掉料报警")]
-        夹具2掉料报警 = 1L << 8,
+        夹具2掉料报警 = 1L << 9,
 
         /// <summary>
         ///  机器人限位报警
         /// </summary>
         [Description("机器人限位报警")]
-        机器人限位报警 = 1L << 9,
+        机器人限位报警 = 1L << 10,
 
         /// <summary>
         ///  机器人充磁失败报警
         /// </summary>
         [Description("机器人充磁失败报警")]
-        机器人充磁失败报警 = 1L << 10,
+        机器人充磁失败报警 = 1L << 11,
 
         /// <summary>
         ///  安全门急停报警
         /// </summary>
         [Description("安全门急停报警")]
-        安全门急停报警 = 1L << 11,
+        安全门急停报警 = 1L << 12,
 
         /// <summary>
         ///  光栅报警
         /// </summary>
         [Description("光栅报警")]
-        光栅报警 = 1L << 12,
+        光栅报警 = 1L << 13,
 
         /// <summary>
         ///  光栅误触报警
         /// </summary>
         [Description("光栅误触报警")]
-        光栅误触报警 = 1L << 13,
+        光栅误触报警 = 1L << 14,
 
         /// <summary>
         ///  托盘任务出错
         /// </summary>
         [Description("托盘任务出错")]
-        托盘任务出错 = 1L << 14,
+        托盘任务出错 = 1L << 15,
 
         /// <summary>
         ///  抓深度2在深度1有货
         /// </summary>
         [Description("抓深度2在深度1有货")]
-        抓深度2在深度1有货 = 1L << 15,
+        抓深度2在深度1有货 = 1L << 16,
 
         /// <summary>
         ///  抓深度3在深度1或者2有货
         /// </summary>
         [Description("抓深度3在深度1或者2有货")]
-        抓深度3在深度1或者2有货 = 1L << 16,
-
-        /// <summary>
-        ///  备用
-        /// </summary>
-        [Description("备用")]
-        备用1 = 1L << 17,
+        抓深度3在深度1或者2有货 = 1L << 17,
 
         /// <summary>
         ///  备用

业务工程/分拣库/WCS.Entity.Protocol/SRM/SrmEnum.cs

@@ -286,7 +286,7 @@ namespace WCS.Entity.Protocol.SRM
     /// </summary>
     [Description("堆垛机报警项")]
     [Flags]
-    public enum SrmAlarm : long
+    public enum SrmAlarm : ulong
     {
         /// <summary>
         ///  无
@@ -671,11 +671,5 @@ namespace WCS.Entity.Protocol.SRM
         /// </summary>
         [Description("安全门急停")]
         安全门急停 = 1L << 62,
-
-        /// <summary>
-        ///  安全门急停
-        /// </summary>
-        [Description("安全门急停")]
-        安全门急停1 = 1L << 63,
     }
 }

业务工程/分拣库/WCS.Entity.Protocol/SRM/WCS_SRM537.cs

@@ -22,4 +22,18 @@ namespace WCS.Entity.Protocol.SRM
         [DataMember(Order = 2)]
         public new string Code { get; set; }
     }
+
+    /// <summary>
+    ///  SRM537
+    /// </summary>
+    [DataContract]
+    [SugarTable("FJ_SRM537")]
+    public class DtoSRM537
+    {
+        public ulong Alarm { get; set; }
+
+        public new DateTime Frame { get; set; }
+
+        public new string Code { get; set; }
+    }
 }