fix

业务工程/分拣库/WCS.Entity.Protocol/BCR/WCS_BCR80.cs

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.BCR
     /// </summary>
     [DataContract]
     [SugarTable("FJ_BCR80")]
-    public class WCS_BCR80 :  IBCR80
+    public class WCS_BCR80 : IBCR80
     {
         /// <summary>
         /// 内容
@@ -18,7 +18,6 @@ namespace WCS.Entity.Protocol.BCR
         public string Content { get; set; }
 
         [DataMember(Order = 1)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 2)]

业务工程/分拣库/WCS.Entity.Protocol/BCR/WCS_BCR81.cs

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.BCR
     /// </summary>
     [DataContract]
     [SugarTable("FJ_BCR81")]
-    public class WCS_BCR81 :  IBCR81
+    public class WCS_BCR81 : IBCR81
     {
         /// <summary>
         /// 内容
@@ -18,7 +18,6 @@ namespace WCS.Entity.Protocol.BCR
         public string Content { get; set; }
 
         [DataMember(Order = 1)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 2)]

业务工程/分拣库/WCS.Entity.Protocol/BCR/WCS_BCR83.cs

@@ -10,7 +10,7 @@ namespace WCS.Entity.Protocol.BCR
     /// </summary>
     [DataContract]
     [SugarTable("FJ_BCR83")]
-    public class WCS_BCR83 :  IBCR83
+    public class WCS_BCR83 : IBCR83
     {
         [DataMember(Order = 0)]
         public short Index { get; set; }
@@ -67,7 +67,6 @@ namespace WCS.Entity.Protocol.BCR
         public string BcrCode11 { get; set; }
 
         [DataMember(Order = 14)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 15)]

业务工程/分拣库/WCS.Entity.Protocol/DataStructure/DeviceDataPack.cs

@@ -56,7 +56,7 @@ namespace WCS.Entity.Protocol.DataStructure
         public ProtocolData<WCS_SRM521>[] SRM521 { get; set; }
 
         [DataMember(Order = 12)]
-        public ProtocolData<WCS_SRM537>[] SRM537 { get; set; }
+        public ProtocolData<WCS_SRM523>[] SRM523 { get; set; }
 
         [DataMember(Order = 13)]
         public ProtocolData<WCS_Station520>[] Station520 { get; set; }

业务工程/分拣库/WCS.Entity.Protocol/DataStructure/SRMData.cs

@@ -25,6 +25,6 @@ namespace WCS.Entity.Protocol.DataStructure
         ///  DB523
         /// </summary>
         [DataMember(Order = 5)]
-        public WCS_SRM537 D537 { get; set; } = null!;
+        public WCS_SRM523 D537 { get; set; } = null!;
     }
 }

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

@@ -1,4 +1,5 @@
-using System;
+using SqlSugar;
+using System;
 using System.Runtime.Serialization;
 
 namespace WCS.Entity.Protocol
@@ -9,6 +10,7 @@ namespace WCS.Entity.Protocol
     public class QuestDBBaseEntity
     {
         [DataMember(Order = 0)]
+        
         public DateTime Frame { get; set; }
 
         [DataMember(Order = 1)]

业务工程/分拣库/WCS.Entity.Protocol/RGV/IRGV521.cs

@@ -5,10 +5,6 @@ namespace WCS.Entity.Protocol.RGV
     /// <summary>
     ///  RGV521
     /// </summary>
-    /// <typeparam name="cmdType">任务类型</typeparam>
-    /// <typeparam name="systemStatus">RGV运行状态</typeparam>
-    /// <typeparam name="workMode">RGV运行模式</typeparam>
-    /// <typeparam name="status">RGV状态</typeparam>
     public interface IRGV521 : IProtocol
     {
         /// <summary>

业务工程/分拣库/WCS.Entity.Protocol/RGV/IRGV523.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Entity.Protocol.RGV
+{
+    /// <summary>
+    /// rgv523
+    /// </summary>
+    public interface IRGV523 : IProtocol
+    { /// <summary>
+      ///  报警内容
+      /// </summary>
+        [Description("报警内容")]
+        RgvAlarm Alarm { get; set; }
+    }
+}

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

@@ -273,4 +273,396 @@ namespace WCS.Entity.Protocol.RGV
         [Description("备用")]
         RES11 = 1 << 15,
     }
+
+    /// <summary>
+    /// RGV报警项
+    /// </summary>
+    [Description("RGV报警项")]
+    [Flags]
+    public enum RgvAlarm : ulong
+    {
+        /// <summary>
+        ///  无
+        /// </summary>
+        [Description("无")]
+        无 = 0,
+
+        /// <summary>
+        ///  输送线通讯中断
+        /// </summary>
+        [Description("输送线通讯中断")]
+        输送线通讯中断 = 1L << 0,
+
+        /// <summary>
+        ///  机械手通讯中断
+        /// </summary>
+        [Description("机械手通讯中断")]
+        机械手通讯中断 = 1L << 1,
+
+        /// <summary>
+        ///  桁架通讯中断
+        /// </summary>
+        [Description("桁架通讯中断")]
+        桁架通讯中断 = 1L << 2,
+
+        /// <summary>
+        ///  外部急停触发
+        /// </summary>
+        [Description("外部急停触发")]
+        外部急停触发 = 1L << 3,
+
+        /// <summary>
+        ///  车载控制柜急停触发
+        /// </summary>
+        [Description("车载控制柜急停触发")]
+        车载控制柜急停触发 = 1L << 4,
+
+        /// <summary>
+        ///  安全继电器故障
+        /// </summary>
+        [Description("安全继电器故障")]
+        安全继电器故障 = 1L << 5,
+
+        /// <summary>
+        /// 相序保护
+        /// </summary>
+        [Description("相序保护")]
+        相序保护 = 1L << 6,
+
+        /// <summary>
+        ///  前安全门打开
+        /// </summary>
+        [Description("前安全门打开")]
+        前安全门打开 = 1L << 7,
+
+        /// <summary>
+        ///  后安全门打开
+        /// </summary>
+        [Description("后安全门打开")]
+        后安全门打开 = 1L << 8,
+
+        /// <summary>
+        ///  行走限位触发
+        /// </summary>
+        [Description("行走限位触发")]
+        行走限位触发 = 1L << 9,
+
+        /// <summary>
+        ///  行走运动超行程
+        /// </summary>
+        [Description("行走运动超行程")]
+        行走运动超行程 = 1L << 10,
+
+        /// <summary>
+        ///  行走变频器故障
+        /// </summary>
+        [Description("行走变频器故障")]
+        行走变频器故障 = 1L << 11,
+
+        /// <summary>
+        ///  行走马达保护器
+        /// </summary>
+        [Description("行走马达保护器")]
+        行走马达保护器 = 1L << 12,
+
+        /// <summary>
+        ///  行走抱闸空开
+        /// </summary>
+        [Description("行走抱闸空开")]
+        行走抱闸空开 = 1L << 13,
+
+        /// <summary>
+        ///  行走测距信号丢失故障
+        /// </summary>
+        [Description("行走测距信号丢失故障")]
+        行走测距信号丢失故障 = 1L << 14,
+
+        /// <summary>
+        ///  行走定位失败
+        /// </summary>
+        [Description("行走定位失败")]
+        行走定位失败 = 1L << 15,
+
+        /// <summary>
+        ///  起升马达保护器
+        /// </summary>
+        [Description("起升马达保护器")]
+        起升马达保护器 = 1L << 16,
+
+        /// <summary>
+        ///  提升运行超时
+        /// </summary>
+        [Description("提升运行超时")]
+        提升运行超时 = 1L << 17,
+
+        /// <summary>
+        ///  货叉运行超时
+        /// </summary>
+        [Description("货叉运行超时")]
+        货叉运行超时 = 1L << 18,
+
+        /// <summary>
+        ///  货叉伸叉超行程
+        /// </summary>
+        [Description("货叉伸叉超行程")]
+        货叉伸叉超行程 = 1L << 19,
+
+        /// <summary>
+        ///  货叉变频器故障
+        /// </summary>
+        [Description("货叉变频器故障")]
+        货叉变频器故障 = 1L << 20,
+
+        /// <summary>
+        ///  货叉马达保护器
+        /// </summary>
+        [Description("货叉马达保护器")]
+        货叉马达保护器 = 1L << 21,
+
+        /// <summary>
+        ///  货叉抱闸空开
+        /// </summary>
+        [Description("货叉抱闸空开")]
+        货叉抱闸空开 = 1L << 22,
+
+        /// <summary>
+        ///  货叉位置错误
+        /// </summary>
+        [Description("货叉位置错误")]
+        货叉位置错误 = 1L << 23,
+
+        /// <summary>
+        ///  货叉编码器故障
+        /// </summary>
+        [Description("货叉编码器故障")]
+        货叉编码器故障 = 1L << 24,
+
+        /// <summary>
+        ///  货叉编码器故障中间位
+        /// </summary>
+        [Description("货叉编码器故障中间位")]
+        货叉编码器故障中间位 = 1L << 25,
+
+        /// <summary>
+        ///  货叉中位光电异常
+        /// </summary>
+        [Description("货叉中位光电异常")]
+        货叉中位光电异常 = 1L << 26,
+
+        /// <summary>
+        ///  组态中断报警
+        /// </summary>
+        [Description("组态中断报警")]
+        组态中断报警 = 1L << 27,
+
+        /// <summary>
+        ///  放货点有货
+        /// </summary>
+        [Description("放货点有货")]
+        放货点有货 = 1L << 28,
+
+        /// <summary>
+        ///  货叉取货点无货
+        /// </summary>
+        [Description("货叉取货点无货")]
+        货叉取货点无货 = 1L << 29,
+
+        /// <summary>
+        ///  货叉无任务有货异常
+        /// </summary>
+        [Description("货叉无任务有货异常")]
+        货叉无任务有货异常 = 1L << 30,
+
+        /// <summary>
+        ///  回中定位失败
+        /// </summary>
+        [Description("回中定位失败")]
+        回中定位失败 = 1L << 31,
+
+        /// <summary>
+        ///  货物左前超宽
+        /// </summary>
+        [Description("货物左前超宽")]
+        货物左前超宽 = 1L << 32,
+
+        /// <summary>
+        ///  货物左后超宽
+        /// </summary>
+        [Description("货物左后超宽")]
+        货物左后超宽 = 1L << 33,
+
+        /// <summary>
+        ///  货物右前超宽
+        /// </summary>
+        [Description("货物右前超宽")]
+        货物右前超宽 = 1L << 34,
+
+        /// <summary>
+        ///  货物右后超宽
+        /// </summary>
+        [Description("货物右后超宽")]
+        货物右后超宽 = 1L << 35,
+
+        /// <summary>
+        ///  货物左前坍塌
+        /// </summary>
+        [Description("货物左前坍塌")]
+        货物左前坍塌 = 1L << 36,
+
+        /// <summary>
+        ///  货物左后坍塌
+        /// </summary>
+        [Description("货物左后坍塌")]
+        货物左后坍塌 = 1L << 37,
+
+        /// <summary>
+        ///  货物右前坍塌
+        /// </summary>
+        [Description("货物右前坍塌")]
+        货物右前坍塌 = 1L << 38,
+
+        /// <summary>
+        ///  货物右后坍塌
+        /// </summary>
+        [Description("货物右后坍塌")]
+        货物右后坍塌 = 1L << 39,
+
+        /// <summary>
+        ///  货物左超高
+        /// </summary>
+        [Description("货物左超高")]
+        货物左超高 = 1L << 40,
+
+        /// <summary>
+        ///  货物右超高
+        /// </summary>
+        [Description("货物右超高")]
+        货物右超高 = 1L << 41,
+
+        /// <summary>
+        ///  货物条码读取异常
+        /// </summary>
+        [Description("货物条码读取异常")]
+        货物条码读取异常 = 1L << 42,
+
+        /// <summary>
+        ///  目标站台已禁用
+        /// </summary>
+        [Description("目标站台已禁用")]
+        目标站台已禁用 = 1L << 43,
+
+        /// <summary>
+        ///  取货站台号异常
+        /// </summary>
+        [Description("取货站台号异常")]
+        取货站台号异常 = 1L << 44,
+
+        /// <summary>
+        ///  放货站台号异常
+        /// </summary>
+        [Description("放货站台号异常")]
+        放货站台号异常 = 1L << 45,
+
+        /// <summary>
+        ///  查询站台号异常
+        /// </summary>
+        [Description("查询站台号异常")]
+        查询站台号异常 = 1L << 46,
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        备用 = 1L << 47,
+
+        /// <summary>
+        ///  备用1
+        /// </summary>
+        [Description("备用1")]
+        备用1 = 1L << 48,
+
+        /// <summary>
+        ///  备用2
+        /// </summary>
+        [Description("备用2")]
+        备用2 = 1L << 49,
+
+        /// <summary>
+        ///  备用3
+        /// </summary>
+        [Description("备用3")]
+        备用3 = 1L << 50,
+
+        /// <summary>
+        ///  货叉中位光电异常
+        /// </summary>
+        [Description("货叉中位光电异常")]
+        备用4 = 1L << 51,
+
+        /// <summary>
+        ///  载货台电源空开
+        /// </summary>
+        [Description("载货台电源空开")]
+        备用5 = 1L << 52,
+
+        /// <summary>
+        ///  按钮, 安全回路空开
+        /// </summary>
+        [Description("按钮安全回路空开")]
+        备用6 = 1L << 53,
+
+        /// <summary>
+        ///  货物左前坍塌
+        /// </summary>
+        [Description("货物左后坍塌")]
+        备用7 = 1L << 54,
+
+        /// <summary>
+        ///  货物右前坍塌
+        /// </summary>
+        [Description("货物右后坍塌")]
+        备用8 = 1L << 55,
+
+        /// <summary>
+        ///  登梯口急停
+        /// </summary>
+        [Description("登梯口急停")]
+        备用9 = 1L << 56,
+
+        /// <summary>
+        ///  货物左超高19M
+        /// </summary>
+        [Description("货物左超高19M")]
+        备用10 = 1L << 57,
+
+        /// <summary>
+        ///  货物右超高19M
+        /// </summary>
+        [Description("货物右超高19M")]
+        备用11 = 1L << 58,
+
+        /// <summary>
+        ///  松绳限位触发2
+        /// </summary>
+        [Description("松绳限位触发2")]
+        备用12 = 1L << 59,
+
+        /// <summary>
+        ///  货叉右侧超行程
+        /// </summary>
+        [Description("货叉右侧超行程")]
+        备用13 = 1L << 60,
+
+        /// <summary>
+        ///  取放货托盘总数超出限制
+        /// </summary>
+        [Description("取放货托盘总数超出限制")]
+        备用14 = 1L << 61,
+
+        /// <summary>
+        ///  安全门急停
+        /// </summary>
+        [Description("安全门急停")]
+        备用15 = 1L << 62,
+    }
 }

业务工程/分拣库/WCS.Entity.Protocol/RGV/WCS_RGV520.cs

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.RGV
     /// </summary>
     [DataContract]
     [SugarTable("FJ_RGV520")]
-    public class WCS_RGV520 :  IRGV520
+    public class WCS_RGV520 : IRGV520
     {
         [DataMember(Order = 0)]
         public int TaskNumber { get; set; }
@@ -33,7 +33,6 @@ namespace WCS.Entity.Protocol.RGV
         public short VoucherNo { get; set; }
 
         [DataMember(Order = 7)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 8)]

业务工程/分拣库/WCS.Entity.Protocol/RGV/WCS_RGV521.cs

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.RGV
 {
     [DataContract]
     [SugarTable("FJ_RGV521")]
-    public class WCS_RGV521 :  IRGV521
+    public class WCS_RGV521 : IRGV521
     {
         [DataMember(Order = 0)]
         public int TaskNumber { get; set; }
@@ -48,7 +48,6 @@ namespace WCS.Entity.Protocol.RGV
         public RGVStatus Status { get; set; }
 
         [DataMember(Order = 13)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 14)]

业务工程/分拣库/WCS.Entity.Protocol/RGV/WCS_RGV523.cs

@@ -0,0 +1,41 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+using WCS.Entity.Protocol.SRM;
+
+namespace WCS.Entity.Protocol.RGV
+{
+    /// <summary>
+    ///  RGV523
+    /// </summary>
+    [DataContract]
+    [SugarTable("FJ_RGV523")]
+    public class WCS_RGV523 : IRGV523
+    {
+        /// <inheritdoc/>
+        [DataMember(Order = 0)]
+        public RgvAlarm Alarm { get; set; }
+
+        [DataMember(Order = 1)]
+        public new DateTime Frame { get; set; }
+
+        [DataMember(Order = 2)]
+        public new string Code { get; set; }
+    }
+
+    /// <summary>
+    ///  RGV523
+    /// </summary>
+    [DataContract]
+    [SugarTable("FJ_RGV523")]
+    public class QuestDb_RGV523
+    {
+        public string Alarm { get; set; }
+
+        public new DateTime Frame { get; set; }
+
+        public new string Code { get; set; }
+    }
+}

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

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.Robot
 {
     [DataContract]
     [SugarTable("FJ_Robot520")]
-    public class WCS_Robot520 :  IRobot520
+    public class WCS_Robot520 : IRobot520
     {
         [DataMember(Order = 0)]
         public int TaskNumber1 { get; set; }
@@ -111,7 +111,6 @@ namespace WCS.Entity.Protocol.Robot
         public short Res11 { get; set; }
 
         [DataMember(Order = 34)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 35)]

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

@@ -7,7 +7,7 @@ namespace WCS.Entity.Protocol.Robot
 {
     [DataContract]
     [SugarTable("FJ_Robot521")]
-    public class WCS_Robot521 :  IRobot521
+    public class WCS_Robot521 : IRobot521
     {
         [DataMember(Order = 0)]
         public int TaskNumber1 { get; set; }
@@ -205,7 +205,6 @@ namespace WCS.Entity.Protocol.Robot
         public short Res36 { get; set; }
 
         [DataMember(Order = 65)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 66)]

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

@@ -14,7 +14,6 @@ namespace WCS.Entity.Protocol.Robot
         public RobotAlarm Alarm { get; set; }
 
         [DataMember(Order = 1)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 2)]
@@ -29,7 +28,6 @@ namespace WCS.Entity.Protocol.Robot
         public string Alarm { get; set; }
 
         [DataMember(Order = 1)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 2)]

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

@@ -7,7 +7,7 @@ namespace WCS.Entity.Protocol.Robot
 {
     [DataContract]
     [SugarTable("FJ_Robot530")]
-    public class WCS_Robot530 :  IRobot530
+    public class WCS_Robot530 : IRobot530
     {
         [DataMember(Order = 0)]
         public short Type { get; set; }
@@ -22,7 +22,6 @@ namespace WCS.Entity.Protocol.Robot
         public short VoucherNo { get; set; }
 
         [DataMember(Order = 4)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 5)]

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

@@ -7,7 +7,7 @@ namespace WCS.Entity.Protocol.Robot
 {
     [DataContract]
     [SugarTable("FJ_Robot531")]
-    public class WCS_Robot531 :  IRobot531
+    public class WCS_Robot531 : IRobot531
     {
         [DataMember(Order = 0)]
         public int TaskNo1 { get; set; }
@@ -115,7 +115,6 @@ namespace WCS.Entity.Protocol.Robot
         public short VoucherNo { get; set; }
 
         [DataMember(Order = 35)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 36)]

业务工程/分拣库/WCS.Entity.Protocol/SRM/ISRM537.cs → 业务工程/分拣库/WCS.Entity.Protocol/SRM/ISRM523.cs

@@ -5,13 +5,18 @@ namespace WCS.Entity.Protocol.SRM
     /// <summary>
     /// 堆垛机DB523
     /// </summary>
-    /// <typeparam name="alarm">报警</typeparam>
-    public interface ISRM537 : IProtocol
+    public interface ISRM523 : IProtocol
     {
         /// <summary>
         ///  报警内容
         /// </summary>
         [Description("报警内容")]
-        SrmAlarm Alarm { get; set; }
+        SrmAlarm1 Alarm1 { get; set; }
+
+        /// <summary>
+        ///  报警内容
+        /// </summary>
+        [Description("报警内容")]
+        SrmAlarm2 Alarm2 { get; set; }
     }
 }

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

@@ -286,7 +286,7 @@ namespace WCS.Entity.Protocol.SRM
     /// </summary>
     [Description("堆垛机报警项")]
     [Flags]
-    public enum SrmAlarm : ulong
+    public enum SrmAlarm1 : ulong
     {
         /// <summary>
         ///  无
@@ -301,16 +301,16 @@ namespace WCS.Entity.Protocol.SRM
         主柜急停 = 1L << 0,
 
         /// <summary>
-        ///  分柜急停
+        ///  南侧安全门急停
         /// </summary>
-        [Description("分柜急停")]
-        分柜急停 = 1L << 1,
+        [Description("南侧安全门急停")]
+        南侧安全门急停 = 1L << 1,
 
         /// <summary>
-        ///  取货点异常双深位
+        ///  取货点异常（双伸位）
         /// </summary>
-        [Description("取货点异常双深位")]
-        取货点异常双深位 = 1L << 2,
+        [Description("取货点异常（双伸位）")]
+        取货点异常双伸位 = 1L << 2,
 
         /// <summary>
         ///  放货点有货
@@ -535,16 +535,16 @@ namespace WCS.Entity.Protocol.SRM
         备用 = 1L << 39,
 
         /// <summary>
-        ///  安全门1报警
+        ///  北侧安全门1故障
         /// </summary>
-        [Description("安全门1报警")]
-        安全门1报警 = 1L << 40,
+        [Description("北侧安全门1故障")]
+        北侧安全门1故障 = 1L << 40,
 
         /// <summary>
-        ///  安全门2报警
+        ///  南侧安全门2故障
         /// </summary>
-        [Description("安全门2报警")]
-        安全门2报警 = 1L << 41,
+        [Description("南侧安全门2故障")]
+        南侧安全门2故障 = 1L << 41,
 
         /// <summary>
         ///  行走测距信号丢失报警
@@ -670,6 +670,116 @@ namespace WCS.Entity.Protocol.SRM
         ///  安全门急停
         /// </summary>
         [Description("安全门急停")]
-        安全门急停 = 1L << 62,
+        北侧安全门急停 = 1L << 62,
+    }
+
+    /// <summary>
+    /// 堆垛机报警项
+    /// </summary>
+    [Description("堆垛机报警项")]
+    [Flags]
+    public enum SrmAlarm2 : ushort
+    {
+        /// <summary>
+        ///  无
+        /// </summary>
+        [Description("无")]
+        无 = 0,
+
+        /// <summary>
+        ///  目标库位与实际货物检测不一致
+        /// </summary>
+        [Description("目标库位与实际货物检测不一致")]
+        目标库位与实际货物检测不一致 = 1 << 0,
+
+        /// <summary>
+        ///  当前任务不合理
+        /// </summary>
+        [Description("当前任务不合理")]
+        当前任务不合理 = 1 << 1,
+
+        /// <summary>
+        ///  中间阻挡器检测异常
+        /// </summary>
+        [Description("中间阻挡器检测异常")]
+        中间阻挡器检测异常 = 1 << 2,
+
+        /// <summary>
+        ///  其他堆垛机不在检修位
+        /// </summary>
+        [Description("其他堆垛机不在检修位")]
+        其他堆垛机不在检修位 = 1 << 3,
+
+        /// <summary>
+        ///  与输送线通讯超时
+        /// </summary>
+        [Description("与输送线通讯超时")]
+        与输送线通讯超时 = 1 << 4,
+
+        /// <summary>
+        ///  备用1
+        /// </summary>
+        [Description("备用1")]
+        备用1 = 1 << 5,
+
+        /// <summary>
+        /// 备用2
+        /// </summary>
+        [Description("备用2")]
+        备用2 = 1 << 6,
+
+        /// <summary>
+        ///  备用3
+        /// </summary>
+        [Description("备用3")]
+        备用3 = 1 << 7,
+
+        /// <summary>
+        ///  备用4
+        /// </summary>
+        [Description("备用4")]
+        备用4 = 1 << 8,
+
+        /// <summary>
+        ///  备用5
+        /// </summary>
+        [Description("备用5")]
+        备用5 = 1 << 9,
+
+        /// <summary>
+        ///  备用6
+        /// </summary>
+        [Description("备用6")]
+        备用6 = 1 << 10,
+
+        /// <summary>
+        ///  备用7
+        /// </summary>
+        [Description("备用7")]
+        备用7 = 1 << 11,
+
+        /// <summary>
+        ///  备用8
+        /// </summary>
+        [Description("备用8")]
+        备用8 = 1 << 12,
+
+        /// <summary>
+        ///  备用9
+        /// </summary>
+        [Description("备用9")]
+        备用9 = 1 << 13,
+
+        /// <summary>
+        ///  备用10
+        /// </summary>
+        [Description("备用10")]
+        备用10 = 1 << 14,
+
+        /// <summary>
+        ///  备用11
+        /// </summary>
+        [Description("备用11")]
+        备用11 = 1 << 15,
     }
 }

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

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.SRM
 {
     [DataContract]
     [SugarTable("FJ_SRM520")]
-    public class WCS_SRM520 :  ISRM520
+    public class WCS_SRM520 : ISRM520
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
@@ -81,7 +81,6 @@ namespace WCS.Entity.Protocol.SRM
         public short Cmd { get; set; }
 
         [DataMember(Order = 18)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 19)]

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

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.SRM
     /// </summary>
     [DataContract]
     [SugarTable("FJ_SRM521")]
-    public class WCS_SRM521 :  ISRM521
+    public class WCS_SRM521 : ISRM521
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
@@ -128,7 +128,6 @@ namespace WCS.Entity.Protocol.SRM
         public int Res6 { get; set; }
 
         [DataMember(Order = 29)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 30)]

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

@@ -9,16 +9,20 @@ namespace WCS.Entity.Protocol.SRM
     /// </summary>
     [DataContract]
     [SugarTable("FJ_SRM537")]
-    public class WCS_SRM537 : ISRM537
+    public class WCS_SRM523 : ISRM523
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
-        public SrmAlarm Alarm { get; set; }
+        public SrmAlarm1 Alarm1 { get; set; }
 
+        /// <inheritdoc/>
         [DataMember(Order = 1)]
-        public new DateTime Frame { get; set; }
+        public SrmAlarm2 Alarm2 { get; set; }
 
         [DataMember(Order = 2)]
+        public new DateTime Frame { get; set; }
+
+        [DataMember(Order = 3)]
         public new string Code { get; set; }
     }
 
@@ -27,11 +31,10 @@ namespace WCS.Entity.Protocol.SRM
     /// </summary>
     [DataContract]
     [SugarTable("FJ_SRM537")]
-    public class QuestDb_SRM537
+    public class QuestDb_SRM523
     {
         public string Alarm { get; set; }
 
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         public new string Code { get; set; }

业务工程/分拣库/WCS.Entity.Protocol/Station/WCS_Station520.cs

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.Station
     /// </summary>
     [DataContract]
     [SugarTable("FJ_Station520")]
-    public class WCS_Station520 :  IStation520
+    public class WCS_Station520 : IStation520
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
@@ -36,7 +36,6 @@ namespace WCS.Entity.Protocol.Station
         public short VoucherNo { get; set; }
 
         [DataMember(Order = 6)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 7)]

业务工程/分拣库/WCS.Entity.Protocol/Station/WCS_Station521.cs

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.Station
     /// </summary>
     [DataContract]
     [SugarTable("FJ_Station521")]
-    public class WCS_Station521 :  IStation521
+    public class WCS_Station521 : IStation521
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
@@ -40,7 +40,6 @@ namespace WCS.Entity.Protocol.Station
         public short Request { get; set; }
 
         [DataMember(Order = 7)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 8)]

业务工程/分拣库/WCS.Entity.Protocol/Station/WCS_Station523.cs

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.Station
     /// </summary>
     [DataContract]
     [SugarTable("FJ_Station523")]
-    public class WCS_Station523 :  IStation523
+    public class WCS_Station523 : IStation523
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
@@ -32,7 +32,6 @@ namespace WCS.Entity.Protocol.Station
         public StationStatus1 Status1 { get; set; }
 
         [DataMember(Order = 5)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 6)]

业务工程/分拣库/WCS.Entity.Protocol/Station/WCS_Station524.cs

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.Station
 {
     [DataContract]
     [SugarTable("FJ_Station524")]
-    public class WCS_Station524 :  IStation524
+    public class WCS_Station524 : IStation524
     {
         [DataMember(Order = 0)]
         public int TaskNumber { get; set; }
@@ -30,7 +30,6 @@ namespace WCS.Entity.Protocol.Station
         public short Request { get; set; }
 
         [DataMember(Order = 7)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 8)]

业务工程/分拣库/WCS.Entity.Protocol/Station/WCS_Station525.cs

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.Station
 {
     [DataContract]
     [SugarTable("FJ_Station525")]
-    public class WCS_Station525 :  IStation525
+    public class WCS_Station525 : IStation525
     {
         [DataMember(Order = 1)]
         public short NextIndex { get; set; }
@@ -1062,7 +1062,6 @@ namespace WCS.Entity.Protocol.Station
         public short VoucherNo49 { get; set; }
 
         [DataMember(Order = 355)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 356)]

业务工程/分拣库/WCS.Entity.Protocol/Station/WCS_Station90.cs

@@ -9,10 +9,9 @@ namespace WCS.Entity.Protocol.Station
     /// </summary>
     [DataContract]
     [SugarTable("FJ_Station90")]
-    public class WCS_Station90 :  IStation90
+    public class WCS_Station90 : IStation90
     {
         [DataMember(Order = 0)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 1)]

业务工程/分拣库/WCS.Entity.Protocol/Station/WCS_Station91.cs

@@ -9,7 +9,7 @@ namespace WCS.Entity.Protocol.Station
     /// </summary>
     [DataContract]
     [SugarTable("FJ_Station91")]
-    public class WCS_Station91 :  IStation91
+    public class WCS_Station91 : IStation91
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
@@ -28,7 +28,6 @@ namespace WCS.Entity.Protocol.Station
         public float Width { get; set; }
 
         [DataMember(Order = 4)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 5)]

业务工程/分拣库/WCS.Entity.Protocol/Truss/WCS_Truss520.cs

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.Truss
 {
     [DataContract]
     [SugarTable("FJ_Truss520")]
-    public class WCS_Truss520 :  ITruss520
+    public class WCS_Truss520 : ITruss520
     {
         [DataMember(Order = 0)]
         public short DestPosition_1 { get; set; }
@@ -102,7 +102,6 @@ namespace WCS.Entity.Protocol.Truss
         public int PalletizingRowId2 { get; set; }
 
         [DataMember(Order = 31)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 32)]

业务工程/分拣库/WCS.Entity.Protocol/Truss/WCS_Truss521.cs

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.Truss
 {
     [DataContract]
     [SugarTable("FJ_Truss521")]
-    public class WCS_Truss521 :  ITruss521
+    public class WCS_Truss521 : ITruss521
     {
         [DataMember(Order = 0)]
         public short DestPosition_1 { get; set; }
@@ -105,7 +105,6 @@ namespace WCS.Entity.Protocol.Truss
         public int PalletizingRowId2 { get; set; }
 
         [DataMember(Order = 32)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 33)]

业务工程/分拣库/WCS.Entity.Protocol/Truss/WCS_Truss523.cs

@@ -13,7 +13,6 @@ namespace WCS.Entity.Protocol.Truss
         public TrussAlarm Alarm { get; set; }
 
         [DataMember(Order = 1)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 2)]

业务工程/分拣库/WCS.Entity.Protocol/Truss/WCS_Truss530.cs

@@ -6,7 +6,7 @@ namespace WCS.Entity.Protocol.Truss
 {
     [DataContract]
     [SugarTable("FJ_Truss530")]
-    public class WCS_Truss530 :  ITruss530
+    public class WCS_Truss530 : ITruss530
     {
         //[DataMember(Order = 0)]
         //public bool IsGoods0 { get; set; }
@@ -215,7 +215,6 @@ namespace WCS.Entity.Protocol.Truss
         public short VoucherNo { get; set; }
 
         [DataMember(Order = 10)]
-        [TimeDbSplitField(DateType.Month)]
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 11)]

业务工程/分拣库/WCS.Entity.Protocol/Truss/WCS_Truss531.cs

@@ -204,7 +204,7 @@ namespace WCS.Entity.Protocol.Truss
         public short VoucherNo { get; set; }
 
         [DataMember(Order = 65)]
-        [TimeDbSplitField(DateType.Month)]
+        
         public new DateTime Frame { get; set; }
 
         [DataMember(Order = 66)]

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

@@ -5,11 +5,11 @@ using SqlSugar;
 namespace WCS.Entity.Protocol
 {
     /// <summary>
-    ///  RGV
+    ///  FJ_Log
     /// </summary>
     [DataContract]
     [SugarTable("FJ_Log")]
-    public class WCS_Log : QuestDBBaseEntity
+    public class FJ_Log : QuestDBBaseEntity
     {
         [DataMember(Order = 0)]
         public string World { get; set; }
@@ -29,4 +29,33 @@ namespace WCS.Entity.Protocol
         [DataMember(Order = 6)]
         public int ManagedThreadId { get; set; }
     }
+
+    ///// <summary>
+    /////  FJ_HttpLog
+    ///// </summary>
+    //[DataContract]
+    //[SugarTable("FJ_HttpLog")]
+    //public class FJ_HttpLog : QuestDBBaseEntity
+    //{
+    //    /// <summary>
+    //    /// 接口名
+    //    /// </summary>
+    //    [DataMember(Order = 0)]
+    //    public string Name { get; set; }
+
+    //    [DataMember(Order = 1)]
+    //    public string  { get; set; }
+
+    //    [DataMember(Order = 2)]
+    //    public string Title { get; set; }
+
+    //    [DataMember(Order = 3)]
+    //    public string Content { get; set; }
+
+    //    [DataMember(Order = 4)]
+    //    public DateTime ExTime { get; set; }
+
+    //    [DataMember(Order = 6)]
+    //    public int ManagedThreadId { get; set; }
+    //}
 }