Explorar o código

Merge branch '分拣库' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 分拣库

xu.lu hai 1 ano
pai
achega
4e3529ed56

+ 7 - 1
YWGC/FJK/WCS.Entity.Protocol/DataStructure/DeviceDataPack.cs

@@ -107,6 +107,12 @@ namespace WCS.Entity.Protocol.DataStructure
         [DataMember(Order = 27)]
         public ProtocolData<WCS_RGV523>[] RGV523 { get; set; }
 
+        [DataMember(Order = 28)]
+        public ProtocolData<WCS_Station222>[] Station222 { get; set; }
+
+        [DataMember(Order = 29)]
+        public ProtocolData<WCS_Station5>[] Station5 { get; set; }
+
         public Dictionary<string, ProtocolData[]> GetDeviceData()
         {
             List<Tuple<string, ProtocolData>> list = new List<Tuple<string, ProtocolData>>();
@@ -144,4 +150,4 @@ namespace WCS.Entity.Protocol.DataStructure
         [DataMember(Order = 2)]
         public T Data { get; set; }
     }
-}
+}

+ 7 - 1
YWGC/FJK/WCS.Entity.Protocol/DataStructure/StationData.cs

@@ -54,5 +54,11 @@ namespace WCS.Entity.Protocol.Protocol.DataStructure
 
         [DataMember(Order = 16)]
         public WCS_Robot531 DR531 { get; set; }
+
+        [DataMember(Order = 17)]
+        public WCS_Station222 D222 { get; set; }
+
+        [DataMember(Order = 18)]
+        public WCS_Station5 D2 { get; set; }
     }
-}
+}

+ 22 - 0
YWGC/FJK/WCS.Entity.Protocol/Station/IStation222.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel;
+
+namespace WCS.Entity.Protocol.Station
+{
+    /// <summary>
+    ///  线体状态采集
+    /// </summary>
+    public interface IStation222 : IProtocol
+    {
+        /// <summary>
+        ///  线体状态
+        /// </summary>
+        [Description("线体状态")]
+        public LineStatusEnum LineStatus { get; set; }
+
+        /// <summary>
+        ///  线体正反转
+        /// </summary>
+        [Description("线体正反转")]
+        public FwdOrRevEnum FwdOrRev { get; set; }
+    }
+}

+ 827 - 0
YWGC/FJK/WCS.Entity.Protocol/Station/IStation5.cs

@@ -0,0 +1,827 @@
+using System.ComponentModel;
+
+namespace WCS.Entity.Protocol.Station
+{
+    /// <summary>
+    ///  线体交互点数量采集
+    /// </summary>
+    public interface IStation5 : IProtocol
+    {
+        /// <summary>
+        ///  天
+        /// </summary>
+        [Description("天")]
+        public int Day0 { get; set; }
+
+        /// <summary>
+        /// 小时
+        /// </summary>
+        [Description("小时")]
+        public int Hour0 { get; set; }
+
+        /// <summary>
+        /// 分钟
+        /// </summary>
+        [Description("分钟")]
+        public int Minute0 { get; set; }
+
+        /// <summary>
+        ///  数量
+        /// </summary>
+        [Description("数量")]
+        public int Number0 { get; set; }
+
+        /// <summary>
+        ///  天
+        /// </summary>
+        [Description("天")]
+        public int Day1 { get; set; }
+
+        /// <summary>
+        /// 小时
+        /// </summary>
+        [Description("小时")]
+        public int Hour1 { get; set; }
+
+        /// <summary>
+        /// 分钟
+        /// </summary>
+        [Description("分钟")]
+        public int Minute1 { get; set; }
+
+        /// <summary>
+        ///  数量
+        /// </summary>
+        [Description("数量")]
+        public int Number1 { get; set; }
+
+        // 重复以上定义的模式,继续定义 Day2 到 Day59...
+
+        /// <summary>
+        ///  天
+        /// </summary>
+        [Description("天")]
+        public int Day2 { get; set; }
+
+        /// <summary>
+        /// 小时
+        /// </summary>
+        [Description("小时")]
+        public int Hour2 { get; set; }
+
+        /// <summary>
+        /// 分钟
+        /// </summary>
+        [Description("分钟")]
+        public int Minute2 { get; set; }
+
+        /// <summary>
+        ///  数量
+        /// </summary>
+        [Description("数量")]
+        public int Number2 { get; set; }
+
+        // 继续定义所有其他属性...
+
+        // Day3
+        [Description("天")]
+        public int Day3 { get; set; }
+
+        [Description("小时")]
+        public int Hour3 { get; set; }
+
+        [Description("分钟")]
+        public int Minute3 { get; set; }
+
+        [Description("数量")]
+        public int Number3 { get; set; }
+
+        // Day4
+        [Description("天")]
+        public int Day4 { get; set; }
+
+        [Description("小时")]
+        public int Hour4 { get; set; }
+
+        [Description("分钟")]
+        public int Minute4 { get; set; }
+
+        [Description("数量")]
+        public int Number4 { get; set; }
+
+        // Day5
+        [Description("天")]
+        public int Day5 { get; set; }
+
+        [Description("小时")]
+        public int Hour5 { get; set; }
+
+        [Description("分钟")]
+        public int Minute5 { get; set; }
+
+        [Description("数量")]
+        public int Number5 { get; set; }
+
+        // Day6
+        [Description("天")]
+        public int Day6 { get; set; }
+
+        [Description("小时")]
+        public int Hour6 { get; set; }
+
+        [Description("分钟")]
+        public int Minute6 { get; set; }
+
+        [Description("数量")]
+        public int Number6 { get; set; }
+
+        // Day7
+        [Description("天")]
+        public int Day7 { get; set; }
+
+        [Description("小时")]
+        public int Hour7 { get; set; }
+
+        [Description("分钟")]
+        public int Minute7 { get; set; }
+
+        [Description("数量")]
+        public int Number7 { get; set; }
+
+        // Day8
+        [Description("天")]
+        public int Day8 { get; set; }
+
+        [Description("小时")]
+        public int Hour8 { get; set; }
+
+        [Description("分钟")]
+        public int Minute8 { get; set; }
+
+        [Description("数量")]
+        public int Number8 { get; set; }
+
+        // Day9
+        [Description("天")]
+        public int Day9 { get; set; }
+
+        [Description("小时")]
+        public int Hour9 { get; set; }
+
+        [Description("分钟")]
+        public int Minute9 { get; set; }
+
+        [Description("数量")]
+        public int Number9 { get; set; }
+
+        // Day10
+        [Description("天")]
+        public int Day10 { get; set; }
+
+        [Description("小时")]
+        public int Hour10 { get; set; }
+
+        [Description("分钟")]
+        public int Minute10 { get; set; }
+
+        [Description("数量")]
+        public int Number10 { get; set; }
+
+        // Day11
+        [Description("天")]
+        public int Day11 { get; set; }
+
+        [Description("小时")]
+        public int Hour11 { get; set; }
+
+        [Description("分钟")]
+        public int Minute11 { get; set; }
+
+        [Description("数量")]
+        public int Number11 { get; set; }
+
+        // Day12
+        [Description("天")]
+        public int Day12 { get; set; }
+
+        [Description("小时")]
+        public int Hour12 { get; set; }
+
+        [Description("分钟")]
+        public int Minute12 { get; set; }
+
+        [Description("数量")]
+        public int Number12 { get; set; }
+
+        // Day13
+        [Description("天")]
+        public int Day13 { get; set; }
+
+        [Description("小时")]
+        public int Hour13 { get; set; }
+
+        [Description("分钟")]
+        public int Minute13 { get; set; }
+
+        [Description("数量")]
+        public int Number13 { get; set; }
+
+        // Day14
+        [Description("天")]
+        public int Day14 { get; set; }
+
+        [Description("小时")]
+        public int Hour14 { get; set; }
+
+        [Description("分钟")]
+        public int Minute14 { get; set; }
+
+        [Description("数量")]
+        public int Number14 { get; set; }
+
+        // Day15
+        [Description("天")]
+        public int Day15 { get; set; }
+
+        [Description("小时")]
+        public int Hour15 { get; set; }
+
+        [Description("分钟")]
+        public int Minute15 { get; set; }
+
+        [Description("数量")]
+        public int Number15 { get; set; }
+
+        // Day16
+        [Description("天")]
+        public int Day16 { get; set; }
+
+        [Description("小时")]
+        public int Hour16 { get; set; }
+
+        [Description("分钟")]
+        public int Minute16 { get; set; }
+
+        [Description("数量")]
+        public int Number16 { get; set; }
+
+        // Day17
+        [Description("天")]
+        public int Day17 { get; set; }
+
+        [Description("小时")]
+        public int Hour17 { get; set; }
+
+        [Description("分钟")]
+        public int Minute17 { get; set; }
+
+        [Description("数量")]
+        public int Number17 { get; set; }
+
+        // Day18
+        [Description("天")]
+        public int Day18 { get; set; }
+
+        [Description("小时")]
+        public int Hour18 { get; set; }
+
+        [Description("分钟")]
+        public int Minute18 { get; set; }
+
+        [Description("数量")]
+        public int Number18 { get; set; }
+
+        // Day19
+        [Description("天")]
+        public int Day19 { get; set; }
+
+        [Description("小时")]
+        public int Hour19 { get; set; }
+
+        [Description("分钟")]
+        public int Minute19 { get; set; }
+
+        [Description("数量")]
+        public int Number19 { get; set; }
+
+        // Day20
+        [Description("天")]
+        public int Day20 { get; set; }
+
+        [Description("小时")]
+        public int Hour20 { get; set; }
+
+        [Description("分钟")]
+        public int Minute20 { get; set; }
+
+        [Description("数量")]
+        public int Number20 { get; set; }
+
+        // Day21
+        [Description("天")]
+        public int Day21 { get; set; }
+
+        [Description("小时")]
+        public int Hour21 { get; set; }
+
+        [Description("分钟")]
+        public int Minute21 { get; set; }
+
+        [Description("数量")]
+        public int Number21 { get; set; }
+
+        // Day22
+        [Description("天")]
+        public int Day22 { get; set; }
+
+        [Description("小时")]
+        public int Hour22 { get; set; }
+
+        [Description("分钟")]
+        public int Minute22 { get; set; }
+
+        [Description("数量")]
+        public int Number22 { get; set; }
+
+        // Day23
+        [Description("天")]
+        public int Day23 { get; set; }
+
+        [Description("小时")]
+        public int Hour23 { get; set; }
+
+        [Description("分钟")]
+        public int Minute23 { get; set; }
+
+        [Description("数量")]
+        public int Number23 { get; set; }
+
+        // Day24
+        [Description("天")]
+        public int Day24 { get; set; }
+
+        [Description("小时")]
+        public int Hour24 { get; set; }
+
+        [Description("分钟")]
+        public int Minute24 { get; set; }
+
+        [Description("数量")]
+        public int Number24 { get; set; }
+
+        // Day25
+        [Description("天")]
+        public int Day25 { get; set; }
+
+        [Description("小时")]
+        public int Hour25 { get; set; }
+
+        [Description("分钟")]
+        public int Minute25 { get; set; }
+
+        [Description("数量")]
+        public int Number25 { get; set; }
+
+        // Day26
+        [Description("天")]
+        public int Day26 { get; set; }
+
+        [Description("小时")]
+        public int Hour26 { get; set; }
+
+        [Description("分钟")]
+        public int Minute26 { get; set; }
+
+        [Description("数量")]
+        public int Number26 { get; set; }
+
+        // Day27
+        [Description("天")]
+        public int Day27 { get; set; }
+
+        [Description("小时")]
+        public int Hour27 { get; set; }
+
+        [Description("分钟")]
+        public int Minute27 { get; set; }
+
+        [Description("数量")]
+        public int Number27 { get; set; }
+
+        // Day28
+        [Description("天")]
+        public int Day28 { get; set; }
+
+        [Description("小时")]
+        public int Hour28 { get; set; }
+
+        [Description("分钟")]
+        public int Minute28 { get; set; }
+
+        [Description("数量")]
+        public int Number28 { get; set; }
+
+        // Day29
+        [Description("天")]
+        public int Day29 { get; set; }
+
+        [Description("小时")]
+        public int Hour29 { get; set; }
+
+        [Description("分钟")]
+        public int Minute29 { get; set; }
+
+        [Description("数量")]
+        public int Number29 { get; set; }
+
+        // Day30
+        [Description("天")]
+        public int Day30 { get; set; }
+
+        [Description("小时")]
+        public int Hour30 { get; set; }
+
+        [Description("分钟")]
+        public int Minute30 { get; set; }
+
+        [Description("数量")]
+        public int Number30 { get; set; }
+
+        // Day31
+        [Description("天")]
+        public int Day31 { get; set; }
+
+        [Description("小时")]
+        public int Hour31 { get; set; }
+
+        [Description("分钟")]
+        public int Minute31 { get; set; }
+
+        [Description("数量")]
+        public int Number31 { get; set; }
+
+        // Day32
+        [Description("天")]
+        public int Day32 { get; set; }
+
+        [Description("小时")]
+        public int Hour32 { get; set; }
+
+        [Description("分钟")]
+        public int Minute32 { get; set; }
+
+        [Description("数量")]
+        public int Number32 { get; set; }
+
+        // Day33
+        [Description("天")]
+        public int Day33 { get; set; }
+
+        [Description("小时")]
+        public int Hour33 { get; set; }
+
+        [Description("分钟")]
+        public int Minute33 { get; set; }
+
+        [Description("数量")]
+        public int Number33 { get; set; }
+
+        // Day34
+        [Description("天")]
+        public int Day34 { get; set; }
+
+        [Description("小时")]
+        public int Hour34 { get; set; }
+
+        [Description("分钟")]
+        public int Minute34 { get; set; }
+
+        [Description("数量")]
+        public int Number34 { get; set; }
+
+        // Day35
+        [Description("天")]
+        public int Day35 { get; set; }
+
+        [Description("小时")]
+        public int Hour35 { get; set; }
+
+        [Description("分钟")]
+        public int Minute35 { get; set; }
+
+        [Description("数量")]
+        public int Number35 { get; set; }
+
+        // Day36
+        [Description("天")]
+        public int Day36 { get; set; }
+
+        [Description("小时")]
+        public int Hour36 { get; set; }
+
+        [Description("分钟")]
+        public int Minute36 { get; set; }
+
+        [Description("数量")]
+        public int Number36 { get; set; }
+
+        // Day37
+        [Description("天")]
+        public int Day37 { get; set; }
+
+        [Description("小时")]
+        public int Hour37 { get; set; }
+
+        [Description("分钟")]
+        public int Minute37 { get; set; }
+
+        [Description("数量")]
+        public int Number37 { get; set; }
+
+        // Day38
+        [Description("天")]
+        public int Day38 { get; set; }
+
+        [Description("小时")]
+        public int Hour38 { get; set; }
+
+        [Description("分钟")]
+        public int Minute38 { get; set; }
+
+        [Description("数量")]
+        public int Number38 { get; set; }
+
+        // Day39
+        [Description("天")]
+        public int Day39 { get; set; }
+
+        [Description("小时")]
+        public int Hour39 { get; set; }
+
+        [Description("分钟")]
+        public int Minute39 { get; set; }
+
+        [Description("数量")]
+        public int Number39 { get; set; }
+
+        // Day40
+        [Description("天")]
+        public int Day40 { get; set; }
+
+        [Description("小时")]
+        public int Hour40 { get; set; }
+
+        [Description("分钟")]
+        public int Minute40 { get; set; }
+
+        [Description("数量")]
+        public int Number40 { get; set; }
+
+        // Day41
+        [Description("天")]
+        public int Day41 { get; set; }
+
+        [Description("小时")]
+        public int Hour41 { get; set; }
+
+        [Description("分钟")]
+        public int Minute41 { get; set; }
+
+        [Description("数量")]
+        public int Number41 { get; set; }
+
+        // Day42
+        [Description("天")]
+        public int Day42 { get; set; }
+
+        [Description("小时")]
+        public int Hour42 { get; set; }
+
+        [Description("分钟")]
+        public int Minute42 { get; set; }
+
+        [Description("数量")]
+        public int Number42 { get; set; }
+
+        // Day43
+        [Description("天")]
+        public int Day43 { get; set; }
+
+        [Description("小时")]
+        public int Hour43 { get; set; }
+
+        [Description("分钟")]
+        public int Minute43 { get; set; }
+
+        [Description("数量")]
+        public int Number43 { get; set; }
+
+        // Day44
+        [Description("天")]
+        public int Day44 { get; set; }
+
+        [Description("小时")]
+        public int Hour44 { get; set; }
+
+        [Description("分钟")]
+        public int Minute44 { get; set; }
+
+        [Description("数量")]
+        public int Number44 { get; set; }
+
+        // Day45
+        [Description("天")]
+        public int Day45 { get; set; }
+
+        [Description("小时")]
+        public int Hour45 { get; set; }
+
+        [Description("分钟")]
+        public int Minute45 { get; set; }
+
+        [Description("数量")]
+        public int Number45 { get; set; }
+
+        // Day46
+        [Description("天")]
+        public int Day46 { get; set; }
+
+        [Description("小时")]
+        public int Hour46 { get; set; }
+
+        [Description("分钟")]
+        public int Minute46 { get; set; }
+
+        [Description("数量")]
+        public int Number46 { get; set; }
+
+        // Day47
+        [Description("天")]
+        public int Day47 { get; set; }
+
+        [Description("小时")]
+        public int Hour47 { get; set; }
+
+        [Description("分钟")]
+        public int Minute47 { get; set; }
+
+        [Description("数量")]
+        public int Number47 { get; set; }
+
+        // Day48
+        [Description("天")]
+        public int Day48 { get; set; }
+
+        [Description("小时")]
+        public int Hour48 { get; set; }
+
+        [Description("分钟")]
+        public int Minute48 { get; set; }
+
+        [Description("数量")]
+        public int Number48 { get; set; }
+
+        // Day49
+        [Description("天")]
+        public int Day49 { get; set; }
+
+        [Description("小时")]
+        public int Hour49 { get; set; }
+
+        [Description("分钟")]
+        public int Minute49 { get; set; }
+
+        [Description("数量")]
+        public int Number49 { get; set; }
+
+        // Day50
+        [Description("天")]
+        public int Day50 { get; set; }
+
+        [Description("小时")]
+        public int Hour50 { get; set; }
+
+        [Description("分钟")]
+        public int Minute50 { get; set; }
+
+        [Description("数量")]
+        public int Number50 { get; set; }
+
+        // Day51
+        [Description("天")]
+        public int Day51 { get; set; }
+
+        [Description("小时")]
+        public int Hour51 { get; set; }
+
+        [Description("分钟")]
+        public int Minute51 { get; set; }
+
+        [Description("数量")]
+        public int Number51 { get; set; }
+
+        // Day52
+        [Description("天")]
+        public int Day52 { get; set; }
+
+        [Description("小时")]
+        public int Hour52 { get; set; }
+
+        [Description("分钟")]
+        public int Minute52 { get; set; }
+
+        [Description("数量")]
+        public int Number52 { get; set; }
+
+        // Day53
+        [Description("天")]
+        public int Day53 { get; set; }
+
+        [Description("小时")]
+        public int Hour53 { get; set; }
+
+        [Description("分钟")]
+        public int Minute53 { get; set; }
+
+        [Description("数量")]
+        public int Number53 { get; set; }
+
+        // Day54
+        [Description("天")]
+        public int Day54 { get; set; }
+
+        [Description("小时")]
+        public int Hour54 { get; set; }
+
+        [Description("分钟")]
+        public int Minute54 { get; set; }
+
+        [Description("数量")]
+        public int Number54 { get; set; }
+
+        // Day55
+        [Description("天")]
+        public int Day55 { get; set; }
+
+        [Description("小时")]
+        public int Hour55 { get; set; }
+
+        [Description("分钟")]
+        public int Minute55 { get; set; }
+
+        [Description("数量")]
+        public int Number55 { get; set; }
+
+        // Day56
+        [Description("天")]
+        public int Day56 { get; set; }
+
+        [Description("小时")]
+        public int Hour56 { get; set; }
+
+        [Description("分钟")]
+        public int Minute56 { get; set; }
+
+        [Description("数量")]
+        public int Number56 { get; set; }
+
+        // Day57
+        [Description("天")]
+        public int Day57 { get; set; }
+
+        [Description("小时")]
+        public int Hour57 { get; set; }
+
+        [Description("分钟")]
+        public int Minute57 { get; set; }
+
+        [Description("数量")]
+        public int Number57 { get; set; }
+
+        // Day58
+        [Description("天")]
+        public int Day58 { get; set; }
+
+        [Description("小时")]
+        public int Hour58 { get; set; }
+
+        [Description("分钟")]
+        public int Minute58 { get; set; }
+
+        [Description("数量")]
+        public int Number58 { get; set; }
+
+        // Day59
+        [Description("天")]
+        public int Day59 { get; set; }
+
+        [Description("小时")]
+        public int Hour59 { get; set; }
+
+        [Description("分钟")]
+        public int Minute59 { get; set; }
+
+        [Description("数量")]
+        public int Number59 { get; set; }
+    }
+}

+ 49 - 1
YWGC/FJK/WCS.Entity.Protocol/Station/StationEnum.cs

@@ -466,4 +466,52 @@ namespace WCS.Entity.Protocol.Station
         [Description("备用")]
         Res15 = 1 << 15,
     }
-}
+
+    /// <summary>
+    ///  线体状态枚举
+    /// </summary>
+    public enum LineStatusEnum : short
+    {
+        /// <summary>
+        ///  空闲
+        /// </summary>
+        [Description("空闲")]
+        Idle = 1,
+
+        /// <summary>
+        ///  报警
+        /// </summary>
+        [Description("报警")]
+        Alarm = 2,
+
+        /// <summary>
+        ///  手动
+        /// </summary>
+        [Description("手动")]
+        Manual = 3
+    }
+
+    /// <summary>
+    ///  线体正反转枚举
+    /// </summary>
+    public enum FwdOrRevEnum : short
+    {
+        /// <summary>
+        ///  空闲
+        /// </summary>
+        [Description("空闲")]
+        Idle = 1,
+
+        /// <summary>
+        ///  正转
+        /// </summary>
+        [Description("正转")]
+        Fwd = 2,
+
+        /// <summary>
+        ///  反转
+        /// </summary>
+        [Description("反转")]
+        Rev = 3
+    }
+}

+ 20 - 0
YWGC/FJK/WCS.Entity.Protocol/Station/WCS_Station222.cs

@@ -0,0 +1,20 @@
+using SqlSugar;
+using System.Runtime.Serialization;
+
+namespace WCS.Entity.Protocol.Station
+{
+    /// <summary>
+    ///  线体状态采集
+    /// </summary>
+    [DataContract]
+    [SugarTable("FJ_Station222")]
+    public class WCS_Station222 : IStation222
+    {
+
+        [DataMember(Order = 0)]
+        public LineStatusEnum LineStatus { get; set; }
+
+        [DataMember(Order = 1)]
+        public FwdOrRevEnum FwdOrRev { get; set; }
+    }
+}

+ 737 - 0
YWGC/FJK/WCS.Entity.Protocol/Station/WCS_Station5.cs

@@ -0,0 +1,737 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+using SqlSugar;
+
+namespace WCS.Entity.Protocol.Station
+{
+    /// <summary>
+    ///  线体交互点数量采集
+    /// </summary>
+    [DataContract]
+    [SugarTable("FJ_Station5")]
+    public class WCS_Station5 : IStation5
+    {
+        [DataMember(Order = 0)]
+        public int Day0 { get; set; }
+
+        [DataMember(Order = 1)]
+        public int Hour0 { get; set; }
+
+        [DataMember(Order = 2)]
+        public int Minute0 { get; set; }
+
+        [DataMember(Order = 3)]
+        public int Number0 { get; set; }
+
+        [DataMember(Order = 4)]
+        public int Day1 { get; set; }
+
+        [DataMember(Order = 5)]
+        public int Hour1 { get; set; }
+
+        [DataMember(Order = 6)]
+        public int Minute1 { get; set; }
+
+        [DataMember(Order = 7)]
+        public int Number1 { get; set; }
+
+        [DataMember(Order = 8)]
+        public int Day2 { get; set; }
+
+        [DataMember(Order = 9)]
+        public int Hour2 { get; set; }
+
+        [DataMember(Order = 10)]
+        public int Minute2 { get; set; }
+
+        [DataMember(Order = 11)]
+        public int Number2 { get; set; }
+
+        [DataMember(Order = 12)]
+        public int Day3 { get; set; }
+
+        [DataMember(Order = 13)]
+        public int Hour3 { get; set; }
+
+        [DataMember(Order = 14)]
+        public int Minute3 { get; set; }
+
+        [DataMember(Order = 15)]
+        public int Number3 { get; set; }
+
+        [DataMember(Order = 16)]
+        public int Day4 { get; set; }
+
+        [DataMember(Order = 17)]
+        public int Hour4 { get; set; }
+
+        [DataMember(Order = 18)]
+        public int Minute4 { get; set; }
+
+        [DataMember(Order = 19)]
+        public int Number4 { get; set; }
+
+        [DataMember(Order = 20)]
+        public int Day5 { get; set; }
+
+        [DataMember(Order = 21)]
+        public int Hour5 { get; set; }
+
+        [DataMember(Order = 22)]
+        public int Minute5 { get; set; }
+
+        [DataMember(Order = 23)]
+        public int Number5 { get; set; }
+
+        [DataMember(Order = 24)]
+        public int Day6 { get; set; }
+
+        [DataMember(Order = 25)]
+        public int Hour6 { get; set; }
+
+        [DataMember(Order = 26)]
+        public int Minute6 { get; set; }
+
+        [DataMember(Order = 27)]
+        public int Number6 { get; set; }
+
+        [DataMember(Order = 28)]
+        public int Day7 { get; set; }
+
+        [DataMember(Order = 29)]
+        public int Hour7 { get; set; }
+
+        [DataMember(Order = 30)]
+        public int Minute7 { get; set; }
+
+        [DataMember(Order = 31)]
+        public int Number7 { get; set; }
+
+        [DataMember(Order = 32)]
+        public int Day8 { get; set; }
+
+        [DataMember(Order = 33)]
+        public int Hour8 { get; set; }
+
+        [DataMember(Order = 34)]
+        public int Minute8 { get; set; }
+
+        [DataMember(Order = 35)]
+        public int Number8 { get; set; }
+
+        [DataMember(Order = 36)]
+        public int Day9 { get; set; }
+
+        [DataMember(Order = 37)]
+        public int Hour9 { get; set; }
+
+        [DataMember(Order = 38)]
+        public int Minute9 { get; set; }
+
+        [DataMember(Order = 39)]
+        public int Number9 { get; set; }
+
+        [DataMember(Order = 40)]
+        public int Day10 { get; set; }
+
+        [DataMember(Order = 41)]
+        public int Hour10 { get; set; }
+
+        [DataMember(Order = 42)]
+        public int Minute10 { get; set; }
+
+        [DataMember(Order = 43)]
+        public int Number10 { get; set; }
+
+        [DataMember(Order = 44)]
+        public int Day11 { get; set; }
+
+        [DataMember(Order = 45)]
+        public int Hour11 { get; set; }
+
+        [DataMember(Order = 46)]
+        public int Minute11 { get; set; }
+
+        [DataMember(Order = 47)]
+        public int Number11 { get; set; }
+
+        [DataMember(Order = 48)]
+        public int Day12 { get; set; }
+
+        [DataMember(Order = 49)]
+        public int Hour12 { get; set; }
+
+        [DataMember(Order = 50)]
+        public int Minute12 { get; set; }
+
+        [DataMember(Order = 51)]
+        public int Number12 { get; set; }
+
+        [DataMember(Order = 52)]
+        public int Day13 { get; set; }
+
+        [DataMember(Order = 53)]
+        public int Hour13 { get; set; }
+
+        [DataMember(Order = 54)]
+        public int Minute13 { get; set; }
+
+        [DataMember(Order = 55)]
+        public int Number13 { get; set; }
+
+        [DataMember(Order = 56)]
+        public int Day14 { get; set; }
+
+        [DataMember(Order = 57)]
+        public int Hour14 { get; set; }
+
+        [DataMember(Order = 58)]
+        public int Minute14 { get; set; }
+
+        [DataMember(Order = 59)]
+        public int Number14 { get; set; }
+
+        [DataMember(Order = 60)]
+        public int Day15 { get; set; }
+
+        [DataMember(Order = 61)]
+        public int Hour15 { get; set; }
+
+        [DataMember(Order = 62)]
+        public int Minute15 { get; set; }
+
+        [DataMember(Order = 63)]
+        public int Number15 { get; set; }
+
+        [DataMember(Order = 64)]
+        public int Day16 { get; set; }
+
+        [DataMember(Order = 65)]
+        public int Hour16 { get; set; }
+
+        [DataMember(Order = 66)]
+        public int Minute16 { get; set; }
+
+        [DataMember(Order = 67)]
+        public int Number16 { get; set; }
+
+        [DataMember(Order = 68)]
+        public int Day17 { get; set; }
+
+        [DataMember(Order = 69)]
+        public int Hour17 { get; set; }
+
+        [DataMember(Order = 70)]
+        public int Minute17 { get; set; }
+
+        [DataMember(Order = 71)]
+        public int Number17 { get; set; }
+
+        [DataMember(Order = 72)]
+        public int Day18 { get; set; }
+
+        [DataMember(Order = 73)]
+        public int Hour18 { get; set; }
+
+        [DataMember(Order = 74)]
+        public int Minute18 { get; set; }
+
+        [DataMember(Order = 75)]
+        public int Number18 { get; set; }
+
+        [DataMember(Order = 76)]
+        public int Day19 { get; set; }
+
+        [DataMember(Order = 77)]
+        public int Hour19 { get; set; }
+
+        [DataMember(Order = 78)]
+        public int Minute19 { get; set; }
+
+        [DataMember(Order = 79)]
+        public int Number19 { get; set; }
+
+        [DataMember(Order = 80)]
+        public int Day20 { get; set; }
+
+        [DataMember(Order = 81)]
+        public int Hour20 { get; set; }
+
+        [DataMember(Order = 82)]
+        public int Minute20 { get; set; }
+
+        [DataMember(Order = 83)]
+        public int Number20 { get; set; }
+
+        [DataMember(Order = 84)]
+        public int Day21 { get; set; }
+
+        [DataMember(Order = 85)]
+        public int Hour21 { get; set; }
+
+        [DataMember(Order = 86)]
+        public int Minute21 { get; set; }
+
+        [DataMember(Order = 87)]
+        public int Number21 { get; set; }
+
+        [DataMember(Order = 88)]
+        public int Day22 { get; set; }
+
+        [DataMember(Order = 89)]
+        public int Hour22 { get; set; }
+
+        [DataMember(Order = 90)]
+        public int Minute22 { get; set; }
+
+        [DataMember(Order = 91)]
+        public int Number22 { get; set; }
+
+        [DataMember(Order = 92)]
+        public int Day23 { get; set; }
+
+        [DataMember(Order = 93)]
+        public int Hour23 { get; set; }
+
+        [DataMember(Order = 94)]
+        public int Minute23 { get; set; }
+
+        [DataMember(Order = 95)]
+        public int Number23 { get; set; }
+
+        [DataMember(Order = 96)]
+        public int Day24 { get; set; }
+
+        [DataMember(Order = 97)]
+        public int Hour24 { get; set; }
+
+        [DataMember(Order = 98)]
+        public int Minute24 { get; set; }
+
+        [DataMember(Order = 99)]
+        public int Number24 { get; set; }
+
+        [DataMember(Order = 100)]
+        public int Day25 { get; set; }
+
+        [DataMember(Order = 101)]
+        public int Hour25 { get; set; }
+
+        [DataMember(Order = 102)]
+        public int Minute25 { get; set; }
+
+        [DataMember(Order = 103)]
+        public int Number25 { get; set; }
+
+        [DataMember(Order = 104)]
+        public int Day26 { get; set; }
+
+        [DataMember(Order = 105)]
+        public int Hour26 { get; set; }
+
+        [DataMember(Order = 106)]
+        public int Minute26 { get; set; }
+
+        [DataMember(Order = 107)]
+        public int Number26 { get; set; }
+
+        [DataMember(Order = 108)]
+        public int Day27 { get; set; }
+
+        [DataMember(Order = 109)]
+        public int Hour27 { get; set; }
+
+        [DataMember(Order = 110)]
+        public int Minute27 { get; set; }
+
+        [DataMember(Order = 111)]
+        public int Number27 { get; set; }
+
+        [DataMember(Order = 112)]
+        public int Day28 { get; set; }
+
+        [DataMember(Order = 113)]
+        public int Hour28 { get; set; }
+
+        [DataMember(Order = 114)]
+        public int Minute28 { get; set; }
+
+        [DataMember(Order = 115)]
+        public int Number28 { get; set; }
+
+        [DataMember(Order = 116)]
+        public int Day29 { get; set; }
+
+        [DataMember(Order = 117)]
+        public int Hour29 { get; set; }
+
+        [DataMember(Order = 118)]
+        public int Minute29 { get; set; }
+
+        [DataMember(Order = 119)]
+        public int Number29 { get; set; }
+
+        [DataMember(Order = 120)]
+        public int Day30 { get; set; }
+
+        [DataMember(Order = 121)]
+        public int Hour30 { get; set; }
+
+        [DataMember(Order = 122)]
+        public int Minute30 { get; set; }
+
+        [DataMember(Order = 123)]
+        public int Number30 { get; set; }
+
+        [DataMember(Order = 124)]
+        public int Day31 { get; set; }
+
+        [DataMember(Order = 125)]
+        public int Hour31 { get; set; }
+
+        [DataMember(Order = 126)]
+        public int Minute31 { get; set; }
+
+        [DataMember(Order = 127)]
+        public int Number31 { get; set; }
+
+        [DataMember(Order = 128)]
+        public int Day32 { get; set; }
+
+        [DataMember(Order = 129)]
+        public int Hour32 { get; set; }
+
+        [DataMember(Order = 130)]
+        public int Minute32 { get; set; }
+
+        [DataMember(Order = 131)]
+        public int Number32 { get; set; }
+
+        [DataMember(Order = 132)]
+        public int Day33 { get; set; }
+
+        [DataMember(Order = 133)]
+        public int Hour33 { get; set; }
+
+        [DataMember(Order = 134)]
+        public int Minute33 { get; set; }
+
+        [DataMember(Order = 135)]
+        public int Number33 { get; set; }
+
+        [DataMember(Order = 136)]
+        public int Day34 { get; set; }
+
+        [DataMember(Order = 137)]
+        public int Hour34 { get; set; }
+
+        [DataMember(Order = 138)]
+        public int Minute34 { get; set; }
+
+        [DataMember(Order = 139)]
+        public int Number34 { get; set; }
+
+        [DataMember(Order = 140)]
+        public int Day35 { get; set; }
+
+        [DataMember(Order = 141)]
+        public int Hour35 { get; set; }
+
+        [DataMember(Order = 142)]
+        public int Minute35 { get; set; }
+
+        [DataMember(Order = 143)]
+        public int Number35 { get; set; }
+
+        [DataMember(Order = 144)]
+        public int Day36 { get; set; }
+
+        [DataMember(Order = 145)]
+        public int Hour36 { get; set; }
+
+        [DataMember(Order = 146)]
+        public int Minute36 { get; set; }
+
+        [DataMember(Order = 147)]
+        public int Number36 { get; set; }
+
+        [DataMember(Order = 148)]
+        public int Day37 { get; set; }
+
+        [DataMember(Order = 149)]
+        public int Hour37 { get; set; }
+
+        [DataMember(Order = 150)]
+        public int Minute37 { get; set; }
+
+        [DataMember(Order = 151)]
+        public int Number37 { get; set; }
+
+        [DataMember(Order = 152)]
+        public int Day38 { get; set; }
+
+        [DataMember(Order = 153)]
+        public int Hour38 { get; set; }
+
+        [DataMember(Order = 154)]
+        public int Minute38 { get; set; }
+
+        [DataMember(Order = 155)]
+        public int Number38 { get; set; }
+
+        [DataMember(Order = 156)]
+        public int Day39 { get; set; }
+
+        [DataMember(Order = 157)]
+        public int Hour39 { get; set; }
+
+        [DataMember(Order = 158)]
+        public int Minute39 { get; set; }
+
+        [DataMember(Order = 159)]
+        public int Number39 { get; set; }
+
+        [DataMember(Order = 160)]
+        public int Day40 { get; set; }
+
+        [DataMember(Order = 161)]
+        public int Hour40 { get; set; }
+
+        [DataMember(Order = 162)]
+        public int Minute40 { get; set; }
+
+        [DataMember(Order = 163)]
+        public int Number40 { get; set; }
+
+        [DataMember(Order = 164)]
+        public int Day41 { get; set; }
+
+        [DataMember(Order = 165)]
+        public int Hour41 { get; set; }
+
+        [DataMember(Order = 166)]
+        public int Minute41 { get; set; }
+
+        [DataMember(Order = 167)]
+        public int Number41 { get; set; }
+
+        [DataMember(Order = 168)]
+        public int Day42 { get; set; }
+
+        [DataMember(Order = 169)]
+        public int Hour42 { get; set; }
+
+        [DataMember(Order = 170)]
+        public int Minute42 { get; set; }
+
+        [DataMember(Order = 171)]
+        public int Number42 { get; set; }
+
+        [DataMember(Order = 172)]
+        public int Day43 { get; set; }
+
+        [DataMember(Order = 173)]
+        public int Hour43 { get; set; }
+
+        [DataMember(Order = 174)]
+        public int Minute43 { get; set; }
+
+        [DataMember(Order = 175)]
+        public int Number43 { get; set; }
+
+        [DataMember(Order = 176)]
+        public int Day44 { get; set; }
+
+        [DataMember(Order = 177)]
+        public int Hour44 { get; set; }
+
+        [DataMember(Order = 178)]
+        public int Minute44 { get; set; }
+
+        [DataMember(Order = 179)]
+        public int Number44 { get; set; }
+
+        [DataMember(Order = 180)]
+        public int Day45 { get; set; }
+
+        [DataMember(Order = 181)]
+        public int Hour45 { get; set; }
+
+        [DataMember(Order = 182)]
+        public int Minute45 { get; set; }
+
+        [DataMember(Order = 183)]
+        public int Number45 { get; set; }
+
+        [DataMember(Order = 184)]
+        public int Day46 { get; set; }
+
+        [DataMember(Order = 185)]
+        public int Hour46 { get; set; }
+
+        [DataMember(Order = 186)]
+        public int Minute46 { get; set; }
+
+        [DataMember(Order = 187)]
+        public int Number46 { get; set; }
+
+        [DataMember(Order = 188)]
+        public int Day47 { get; set; }
+
+        [DataMember(Order = 189)]
+        public int Hour47 { get; set; }
+
+        [DataMember(Order = 190)]
+        public int Minute47 { get; set; }
+
+        [DataMember(Order = 191)]
+        public int Number47 { get; set; }
+
+        [DataMember(Order = 192)]
+        public int Day48 { get; set; }
+
+        [DataMember(Order = 193)]
+        public int Hour48 { get; set; }
+
+        [DataMember(Order = 194)]
+        public int Minute48 { get; set; }
+
+        [DataMember(Order = 195)]
+        public int Number48 { get; set; }
+
+        [DataMember(Order = 196)]
+        public int Day49 { get; set; }
+
+        [DataMember(Order = 197)]
+        public int Hour49 { get; set; }
+
+        [DataMember(Order = 198)]
+        public int Minute49 { get; set; }
+
+        [DataMember(Order = 199)]
+        public int Number49 { get; set; }
+
+        [DataMember(Order = 200)]
+        public int Day50 { get; set; }
+
+        [DataMember(Order = 201)]
+        public int Hour50 { get; set; }
+
+        [DataMember(Order = 202)]
+        public int Minute50 { get; set; }
+
+        [DataMember(Order = 203)]
+        public int Number50 { get; set; }
+
+        [DataMember(Order = 204)]
+        public int Day51 { get; set; }
+
+        [DataMember(Order = 205)]
+        public int Hour51 { get; set; }
+
+        [DataMember(Order = 206)]
+        public int Minute51 { get; set; }
+
+        [DataMember(Order = 207)]
+        public int Number51 { get; set; }
+
+        [DataMember(Order = 208)]
+        public int Day52 { get; set; }
+
+        [DataMember(Order = 209)]
+        public int Hour52 { get; set; }
+
+        [DataMember(Order = 210)]
+        public int Minute52 { get; set; }
+
+        [DataMember(Order = 211)]
+        public int Number52 { get; set; }
+
+        [DataMember(Order = 212)]
+        public int Day53 { get; set; }
+
+        [DataMember(Order = 213)]
+        public int Hour53 { get; set; }
+
+        [DataMember(Order = 214)]
+        public int Minute53 { get; set; }
+
+        [DataMember(Order = 215)]
+        public int Number53 { get; set; }
+
+        [DataMember(Order = 216)]
+        public int Day54 { get; set; }
+
+        [DataMember(Order = 217)]
+        public int Hour54 { get; set; }
+
+        [DataMember(Order = 218)]
+        public int Minute54 { get; set; }
+
+        [DataMember(Order = 219)]
+        public int Number54 { get; set; }
+
+        [DataMember(Order = 220)]
+        public int Day55 { get; set; }
+
+        [DataMember(Order = 221)]
+        public int Hour55 { get; set; }
+
+        [DataMember(Order = 222)]
+        public int Minute55 { get; set; }
+
+        [DataMember(Order = 223)]
+        public int Number55 { get; set; }
+
+        [DataMember(Order = 224)]
+        public int Day56 { get; set; }
+
+        [DataMember(Order = 225)]
+        public int Hour56 { get; set; }
+
+        [DataMember(Order = 226)]
+        public int Minute56 { get; set; }
+
+        [DataMember(Order = 227)]
+        public int Number56 { get; set; }
+
+        [DataMember(Order = 228)]
+        public int Day57 { get; set; }
+
+        [DataMember(Order = 229)]
+        public int Hour57 { get; set; }
+
+        [DataMember(Order = 230)]
+        public int Minute57 { get; set; }
+
+        [DataMember(Order = 231)]
+        public int Number57 { get; set; }
+
+        [DataMember(Order = 232)]
+        public int Day58 { get; set; }
+
+        [DataMember(Order = 233)]
+        public int Hour58 { get; set; }
+
+        [DataMember(Order = 234)]
+        public int Minute58 { get; set; }
+
+        [DataMember(Order = 235)]
+        public int Number58 { get; set; }
+
+        [DataMember(Order = 236)]
+        public int Day59 { get; set; }
+
+        [DataMember(Order = 237)]
+        public int Hour59 { get; set; }
+
+        [DataMember(Order = 238)]
+        public int Minute59 { get; set; }
+
+        [DataMember(Order = 239)]
+        public int Number59 { get; set; }
+    }
+
+}

+ 1 - 1
YWGC/FJK/WCS.Entity.Protocol/WCS.Entity.Protocol.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SqlSugar" Version="1.0.0.2" />
+    <PackageReference Include="SqlSugar" Version="1.0.0.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>