整理输送机相关协议

WCS.Entity.Protocol/BCR/IBCR80.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace WCS.Entity.Protocol.BCR
+{
+    /// <summary>
+    /// 扫码头协议80
+    /// </summary>
+    public interface IBCR80 : IProtocol
+    {
+        /// <summary>
+        /// 内容
+        /// </summary>
+        [StringLength(130)]
+        string Content { get; set; }
+    }
+}

WCS.Entity.Protocol/BCR/IBCR81.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace WCS.Entity.Protocol.BCR
+{
+    /// <summary>
+    /// 扫码头协议81
+    /// </summary>
+    public interface IBCR81 : IProtocol
+    {
+        /// <summary>
+        /// 内容
+        /// </summary>
+        [StringLength(130)]
+        string Content { get; set; }
+    }
+}

WCS.Entity.Protocol/BCR/WCS_BCR80.cs

@@ -0,0 +1,20 @@
+using SqlSugar;
+using System.Runtime.Serialization;
+
+namespace WCS.Entity.Protocol.BCR
+{
+    /// <summary>
+    /// 读码器读取协议
+    /// </summary>
+    [SugarTable(nameof(WCS_BCR80), "读码器读取协议")]
+    [DataContract]
+    public class WCS_BCR80 : WCS_PROTOCOLDATA, IBCR80
+    {
+        /// <summary>
+        /// 内容
+        /// </summary>
+        [SugarColumn(ColumnDescription = "内容", Length = 130)]
+        [DataMember(Order = 0)]
+        public string Content { get; set; }
+    }
+}

WCS.Entity.Protocol/BCR/WCS_BCR81.cs

@@ -0,0 +1,20 @@
+using SqlSugar;
+using System.Runtime.Serialization;
+
+namespace WCS.Entity.Protocol.BCR
+{
+    /// <summary>
+    /// 读码器写入协议81
+    /// </summary>
+    [SugarTable(nameof(WCS_BCR80), "读码器读取协议")]
+    [DataContract]
+    public class WCS_BCR81 : WCS_PROTOCOLDATA, IBCR80
+    {
+        /// <summary>
+        /// 内容
+        /// </summary>
+        [SugarColumn(ColumnDescription = "内容", Length = 130)]
+        [DataMember(Order = 0)]
+        public string Content { get; set; }
+    }
+}

WCS.Entity.Protocol/Class1.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace WCS.Entity.Protocol
-{
-    public class Class1
-    {
-
-    }
-}

WCS.Entity.Protocol/Station/IStation520.cs

@@ -29,43 +29,13 @@ namespace WCS.Entity.Protocol.Station
         /// 运行模式
         /// </summary>
         [Description("任务类型")]
-        short Mode { get; set; }
+        ModeEunm Mode { get; set; }
 
         /// <summary>
-        /// AGV放货请求
+        /// 指令类型
         /// </summary>
-        [Description("AGV放货请求")]
-        bool AGV_PUT_ASK { get; set; }
-
-        /// <summary>
-        /// AGV放货运行
-        /// </summary>
-        [Description("AGV放货运行")]
-        bool AGV_PUT_RUN { get; set; }
-
-        /// <summary>
-        /// AGV放货完成
-        /// </summary>
-        [Description("AGV放货完成")]
-        bool AGV_PUT_OK { get; set; }
-
-        /// <summary>
-        /// AGV取货请求
-        /// </summary>
-        [Description("AGV取货请求")]
-        bool AGV_GET_ASK { get; set; }
-
-        /// <summary>
-        /// AGV取货运行
-        /// </summary>
-        [Description("AGV取货运行")]
-        bool AGV_GET_RUN { get; set; }
-
-        /// <summary>
-        /// AGV取货完成
-        /// </summary>
-        [Description("AGV取货完成")]
-        bool AGV_GET_OK { get; set; }
+        [Description("指令类型")]
+        CmdTypeEnum CmdType { get; set; }
 
         /// <summary>
         /// 凭证号 每次累加

WCS.Entity.Protocol/Station/IStation521.cs

@@ -26,27 +26,27 @@ namespace WCS.Entity.Protocol.Station
         short GoodsEnd { get; set; }
 
         /// <summary>
-        /// 凭证号 每次累加
+        /// 运行模式
         /// </summary>
-        [Description("凭证号")]
-        short VoucherNo { get; set; }
+        [Description("运行模式")]
+        ModeEunm Mode { get; set; }
 
         /// <summary>
-        /// 请求
+        /// 指令回复
         /// </summary>
-        [Description("请求")]
-        IstationRequest Request { get; set; }
+        [Description("指令回复")]
+        CmdReplyEnum CmdType { get; set; }
 
         /// <summary>
-        /// 运行模式
+        /// 凭证号 每次累加
         /// </summary>
-        [Description("运行模式")]
-        IstationAutoStatus AutoStatus { get; set; }
+        [Description("凭证号")]
+        short VoucherNo { get; set; }
 
         /// <summary>
-        /// 状态
+        /// 请求
         /// </summary>
-        [Description("状态")]
-        IstationStatus Status { get; set; }
+        [Description("请求")]
+        short Request { get; set; }
     }
 }

WCS.Entity.Protocol/Station/IStation523.cs

@@ -5,12 +5,31 @@ namespace WCS.Entity.Protocol.Station
     /// <summary>
     /// 输送机状态读取协议
     /// </summary>
-    public interface IStation523 : IProtocol
+    public interface IStation522 : IProtocol
     {
         /// <summary>
         /// 警报
         /// </summary>
         [Description("警报")]
-        IstationFault Alarm { get; set; }
+        AlarmEunm Alarm { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        [Description("备用")]
+        short RES { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Description("状态")]
+        StatusEunm Status { get; set; }
+
+        /// <summary>
+        /// 运行时间
+        /// </summary>
+        [Description("运行时间")]
+        [IgnoreChanging]
+        float RunTime { get; set; }
     }
 }

WCS.Entity.Protocol/Station/IStation91.cs

@@ -0,0 +1,31 @@
+namespace WCS.Entity.Protocol.Station
+{
+    /// <summary>
+    /// 外检读取信息
+    /// </summary>
+    public interface IStation91 : IProtocol
+    {
+        /// <summary>
+        /// 外形检测故障
+        /// </summary>
+        ShapeAlarmEunm ShapeAlarm { get; set; }
+
+        /// <summary>
+        /// 重量
+        /// </summary>
+        [IgnoreChanging]
+        float Weight { get; set; }
+
+        /// <summary>
+        /// 长度
+        /// </summary>
+        [IgnoreChanging]
+        float Length { get; set; }
+
+        /// <summary>
+        /// 高度
+        /// </summary>
+        [IgnoreChanging]
+        float Width { get; set; }
+    }
+}

WCS.Entity.Protocol/Station/StationEunm.cs

@@ -0,0 +1,381 @@
+using System;
+
+namespace WCS.Entity.Protocol.Station
+{
+    /// <summary>
+    /// 指令类型
+    /// </summary>
+    [Flags]
+    public enum CmdTypeEnum : ushort
+    {
+        /// <summary>
+        /// AGV放货请求
+        /// </summary>
+        AGV_PUT_ASK = 1 << 0,
+
+        /// <summary>
+        /// AGV放货运行
+        /// </summary>
+        AGV_PUT_RUN = 1 << 1,
+
+        /// <summary>
+        /// AGV放货完成
+        /// </summary>
+        AGV_PUT_OK = 1 << 2,
+
+        /// <summary>
+        /// AGV取货请求
+        /// </summary>
+        AGV_GET_ASK = 1 << 3,
+
+        /// <summary>
+        /// AGV取货运行
+        /// </summary>
+        AGV_GET_RUN = 1 << 4,
+
+        /// <summary>
+        /// AGV取货完成
+        /// </summary>
+        AGV_GET_OK = 1 << 5,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES1 = 1 << 6,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES2 = 1 << 7,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES3 = 1 << 8,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES4 = 1 << 9,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES5 = 1 << 10,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES6 = 1 << 11,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES7 = 1 << 12,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES8 = 1 << 13,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES9 = 1 << 14,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES10 = 1 << 15,
+    }
+
+    /// <summary>
+    /// 指令回复
+    /// </summary>
+    [Flags]
+    public enum CmdReplyEnum : ushort
+    {
+        /// <summary>
+        /// CONV允许接货
+        /// </summary>
+        CONV_PUT_ALLOW = 1 << 0,
+
+        /// <summary>
+        /// CONV接货完成
+        /// </summary>
+        CONV_PUT_ACK = 1 << 1,
+
+        /// <summary>
+        /// CONV运行取货
+        /// </summary>
+        CONV_GET_ALLOW = 1 << 2,
+
+        /// <summary>
+        /// CONV取货完成确认
+        /// </summary>
+        CONV_GET_ACK = 1 << 3,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES11 = 1 << 4,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES12 = 1 << 5,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES1 = 1 << 6,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES2 = 1 << 7,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES3 = 1 << 8,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES4 = 1 << 9,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES5 = 1 << 10,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES6 = 1 << 11,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES7 = 1 << 12,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES8 = 1 << 13,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES9 = 1 << 14,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES10 = 1 << 15,
+    }
+
+    /// <summary>
+    /// 输送机模式
+    /// </summary>
+    public enum ModeEunm : short
+    {
+        /// <summary>
+        /// 自动
+        /// </summary>
+        Automatic = 1,
+
+        /// <summary>
+        /// 手动
+        /// </summary>
+        Manual = 2,
+
+        /// <summary>
+        /// 维修
+        /// </summary>
+        Repair = 3,
+    }
+
+    /// <summary>
+    /// 输送机警报
+    /// </summary>
+    [Flags]
+    public enum AlarmEunm
+    {
+    }
+
+    /// <summary>
+    /// 输送机状态
+    /// </summary>
+    [Flags]
+    public enum StatusEunm : ulong
+    {
+        /// <summary>
+        /// 自动
+        /// </summary>
+        Auto = 1 << 0,
+
+        /// <summary>
+        /// 选中状态位
+        /// </summary>
+        Choice_Bit = 1 << 1,
+
+        /// <summary>
+        /// 任务有货
+        /// </summary>
+        OT_Status = 1 << 2,
+
+        /// <summary>
+        /// 光电有货
+        /// </summary>
+        PH_Status = 1 << 3,
+
+        /// <summary>
+        /// 运行状态位
+        /// </summary>
+        Run = 1 << 4,
+
+        /// <summary>
+        /// 正转
+        /// </summary>
+        Fwd_1 = 1 << 5,
+
+        /// <summary>
+        /// 反转
+        /// </summary>
+        Rev_1 = 1 << 6,
+
+        /// <summary>
+        /// 上升/右转/伸出（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉伸出）
+        /// </summary>
+        Up_Right_Front_2 = 1 << 7,
+
+        /// <summary>
+        /// 下降/左转/缩回（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉缩回）
+        /// </summary>
+        Down_Left_Back_2 = 1 << 8,
+
+        /// <summary>
+        /// 高位（顶升移栽升降、拆码盘机升降、提升机升降）
+        /// </summary>
+        High_Station_2 = 1 << 9,
+
+        /// <summary>
+        /// 中位（拆码盘机升降）
+        /// </summary>
+        Mid_Station_2 = 1 << 10,
+
+        /// <summary>
+        /// 低位（顶升移栽升降、拆码盘机升降、提升机升降）
+        /// </summary>
+        Low_Station_2 = 1 << 11,
+
+        /// <summary>
+        /// 前位（拆码盘机拨叉伸出）
+        /// </summary>
+        Front_Station_2 = 1 << 12,
+
+        /// <summary>
+        /// 后位（拆码盘机拨叉缩回）
+        /// </summary>
+        Back_Station_2 = 1 << 13,
+
+        /// <summary>
+        /// 手动入库
+        /// </summary>
+        ManualStorage = 1 << 14,
+
+        /// <summary>
+        /// 上位机未分配任务
+        /// </summary>
+        UnassignedTask = 1 << 15,
+    }
+
+    /// <summary>
+    /// 外形故障
+    /// </summary>
+    [Flags]
+    public enum ShapeAlarmEunm : ushort
+    {
+        /// <summary>
+        /// 外形/条码等货物故障
+        /// </summary>
+        Goods_Err = 1 >> 0,
+
+        /// <summary>
+        /// 前超长故障
+        /// </summary>
+        F_Outside = 1 >> 1,
+
+        /// <summary>
+        /// 后超长故障
+        /// </summary>
+        B_Outside = 1 >> 2,
+
+        /// <summary>
+        /// 左超宽故障
+        /// </summary>
+        L_Outside = 1 >> 3,
+
+        /// <summary>
+        /// 右超宽故障
+        /// </summary>
+        R_Outside = 1 >> 4,
+
+        /// <summary>
+        /// 超高故障
+        /// </summary>
+        H_Outside = 1 >> 5,
+
+        /// <summary>
+        /// 条码读取失败
+        /// </summary>
+        BCR_Noread = 1 >> 6,
+
+        /// <summary>
+        /// 超重
+        /// </summary>
+        Overload = 1 >> 7,
+
+        /// <summary>
+        /// 货物严重外检故障
+        /// </summary>
+        Goods_Err_1 = 1 >> 8,
+
+        /// <summary>
+        /// 二维条码未读出
+        /// </summary>
+        BCR_Noread_1 = 1 >> 9,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES1 = 1 >> 10,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES2 = 1 >> 11,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES3 = 1 >> 12,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES4 = 1 >> 13,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES5 = 1 >> 14,
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        RES6 = 1 >> 15,
+    }
+}

WCS.Entity.Protocol/Station/WCS_Station520.cs

@@ -1,5 +1,5 @@
-using System.ComponentModel;
-using SqlSugar;
+using SqlSugar;
+using System.ComponentModel;
 using System.Runtime.Serialization;
 
 namespace WCS.Entity.Protocol.Station
@@ -36,19 +36,27 @@ namespace WCS.Entity.Protocol.Station
         public short GoodsEnd { get; set; }
 
         /// <summary>
-        /// 任务类型
+        /// 运行模式
         /// </summary>
-        [SugarColumn(ColumnDescription = "任务类型")]
-        [Description("任务类型")]
+        [SugarColumn(ColumnDescription = "运行模式")]
+        [Description("运行模式")]
         [DataMember(Order = 3)]
-        public IstationTaskType TaskType { get; set; }
+        public ModeEunm Mode { get; set; }
+
+        /// <summary>
+        /// 指令类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "指令类型")]
+        [Description("指令类型")]
+        [DataMember(Order = 4)]
+        public CmdTypeEnum CmdType { get; set; }
 
         /// <summary>
         /// 凭证号
         /// </summary>
         [SugarColumn(ColumnDescription = "凭证号")]
         [Description("凭证号")]
-        [DataMember(Order = 4)]
+        [DataMember(Order = 5)]
         public short VoucherNo { get; set; }
     }
 }

WCS.Entity.Protocol/Station/WCS_Station521.cs

@@ -33,35 +33,35 @@ namespace WCS.Entity.Protocol.Station
         public short GoodsEnd { get; set; }
 
         /// <summary>
-        /// 凭证号
+        /// 运行模式
         /// </summary>
-        [SugarColumn(ColumnDescription = "凭证号")]
-        [Description("凭证号")]
+        [SugarColumn(ColumnDescription = "运行模式")]
+        [Description("运行模式")]
         [DataMember(Order = 3)]
-        public short VoucherNo { get; set; }
+        public ModeEunm Mode { get; set; }
 
         /// <summary>
-        /// 请求
+        /// 指令回复
         /// </summary>
-        [SugarColumn(ColumnDescription = "请求")]
-        [Description("请求")]
+        [SugarColumn(ColumnDescription = "指令回复")]
+        [Description("指令回复")]
         [DataMember(Order = 4)]
-        public IstationRequest Request { get; set; }
+        public CmdReplyEnum CmdType { get; set; }
 
         /// <summary>
-        /// 运行模式
+        /// 凭证号
         /// </summary>
-        [SugarColumn(ColumnDescription = "运行模式")]
-        [Description("运行模式")]
+        [SugarColumn(ColumnDescription = "凭证号")]
+        [Description("凭证号")]
         [DataMember(Order = 5)]
-        public IstationAutoStatus AutoStatus { get; set; }
+        public short VoucherNo { get; set; }
 
         /// <summary>
-        /// 状态
+        /// 请求
         /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        [Description("状态")]
+        [SugarColumn(ColumnDescription = "请求")]
+        [Description("请求")]
         [DataMember(Order = 6)]
-        public IstationStatus Status { get; set; }
+        short IStation521.Request { get; set; }
     }
 }

WCS.Entity.Protocol/Station/WCS_Station523.cs

@@ -8,13 +8,34 @@ namespace WCS.Entity.Protocol.Station
     /// </summary>
     [SugarTable(nameof(WCS_Station523), "站台状态读取记录表")]
     [DataContract]
-    public class WCS_Station523 : WCS_PROTOCOLDATA, IStation523
+    public class WCS_Station523 : WCS_PROTOCOLDATA, IStation522
     {
         /// <summary>
         /// 警报
         /// </summary>
         [SugarColumn(ColumnDescription = "警报")]
         [DataMember(Order = 0)]
-        public IstationFault Alarm { get; set; }
+        public AlarmEunm Alarm { get; set; }
+
+        /// <summary>
+        /// 备用
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备用")]
+        [DataMember(Order = 1)]
+        public short RES { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "状态")]
+        [DataMember(Order = 2)]
+        public StatusEunm Status { get; set; }
+
+        /// <summary>
+        /// 运行时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "运行时间")]
+        [DataMember(Order = 3)]
+        public float RunTime { get; set; }
     }
 }

WCS.Entity.Protocol/Station/WCS_Station91.cs

@@ -0,0 +1,41 @@
+using SqlSugar;
+using System.Runtime.Serialization;
+
+namespace WCS.Entity.Protocol.Station
+{
+    /// <summary>
+    /// 外检读取数据
+    /// </summary>
+    [SugarTable(nameof(WCS_Station91), "外检读取数据")]
+    [DataContract]
+    public class WCS_Station91 : WCS_PROTOCOLDATA, IStation91
+    {
+        /// <summary>
+        /// 外检故障
+        /// </summary>
+        [SugarColumn(ColumnDescription = "外检故障")]
+        [DataMember(Order = 0)]
+        public ShapeAlarmEunm ShapeAlarm { get; set; }
+
+        /// <summary>
+        /// 重量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "重量")]
+        [DataMember(Order = 1)]
+        public float Weight { get; set; }
+
+        /// <summary>
+        /// 长度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "长度")]
+        [DataMember(Order = 2)]
+        public float Length { get; set; }
+
+        /// <summary>
+        /// 宽度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "宽度")]
+        [DataMember(Order = 3)]
+        public float Width { get; set; }
+    }
+}

WCS.Entity.Protocol/WCS.Entity.Protocol.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WCS.Entity" Version="1.0.0.1" />
+    <PackageReference Include="WCS.Entity" Version="1.0.0.2" />
   </ItemGroup>
 
 </Project>

WCS.Entity/WCS.Entity.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>