将各基础实体模型从EF迁移到sql sugar

Projects/永冠OPP/WCS.Entity.Protocol/WCS_AGVTask.cs

@@ -1,54 +1,114 @@
-using System;
+using SqlSugar;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 
 namespace WCS.Entity.Protocol
 {
+    /// <summary>
+    /// AGV任务中间表
+    /// </summary>
+    [SugarTable(nameof(WCS_AGVTask), "AGV任务中间表")]
     [DataContract]
     public class WCS_AGVTask
     {
-        [DataMember(Order = 0)]
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ID"), DataMember(Order = 0)]
         public int ID { get; set; }
 
-        [DataMember(Order = 1)]
-        [StringLength(20)]
+        /// <summary>
+        /// AGVID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "AGVID", Length = 20), DataMember(Order = 1)]
         public string AGVID { get; set; }
 
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 2)]
         public AGVTaskType TaskType { get; set; }
 
+        /// <summary>
+        /// WCS AGV任务状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 3)]
         public AGVTaskStatus Status { get; set; }
 
+        /// <summary>
+        /// AGV自身状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 4)]
         public AGVTaskStatus AGVStatus { get; set; }
 
+        /// <summary>
+        /// 车间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 5)]
         public int Workshop { get; set; }
 
+        /// <summary>
+        /// 站台
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 6)]
         [StringLength(20)]
         public string Station { get; set; }
 
+        /// <summary>
+        /// 位置
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 7)]
         [StringLength(20)]
         [Required]
         public string Position { get; set; }
 
+        /// <summary>
+        /// 货物数量(1.两个位置放1个货物，2.两个位置放2个货物）
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
+        [DataMember(Order = 11)]
+        public int Goodsnum { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 8)]
         public DateTime CreateTime { get; set; }
 
+        /// <summary>
+        /// WCS更新时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 9)]
         public DateTime? UpdateTime { get; set; }
 
+        /// <summary>
+        /// AGV更新时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "")]
         [DataMember(Order = 10)]
         public DateTime? AGVUpdateTime { get; set; }
 
         /// <summary>
-        /// 货物数量(1.两个位置放1个货物，2.两个位置放2个货物）
+        ///更新用户
         /// </summary>
+        [SugarColumn(ColumnDescription = "更新用户")]
         [DataMember(Order = 11)]
-        public int Goodsnum { get; set; }
+        public string UPDATEUSER { get; set; }
+
+        /// <summary>
+        /// 更新用户详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(UPDATEUSER))]
+        public WCS_USERS USER { get; set; }
     }
 
     public enum AGVTaskStatus
@@ -70,4 +130,4 @@ namespace WCS.Entity.Protocol
         入库 = 1,
         叫料 = 2
     }
-}
+}

Projects/永冠OPP/WCS.Entity.Protocol/WCS_SystemConfig.cs

@@ -1,37 +1,53 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using SqlSugar;
 
 namespace WCS.Entity.Protocol
 {
     /// <summary>
     /// 系统配置
     /// </summary>
+    [SugarTable(nameof(WCS_SystemConfig), "系统配置")]
     public class WCS_SystemConfig : OBJ
     {
         /// <summary>
         /// 设备编号 堆垛机/BCR
         /// </summary>
+        [SugarColumn(ColumnDescription = "设备编号")]
         public string Code { get; set; }
 
         /// <summary>
         /// 描述
         /// </summary>
+        [SugarColumn(ColumnDescription = "描述")]
         public string Describe { get; set; }
 
         /// <summary>
         /// 所属设备
         /// </summary>
+        [SugarColumn(ColumnDescription = "所属设备")]
         public string DEVICECODE { get; set; }
 
+        /// <summary>
+        /// 所属设备信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(DEVICECODE))]
+        public WCS_DEVICE DEVICE { get; set; }
+
         /// <summary>
         /// 巷道
         /// </summary>
+        [SugarColumn(ColumnDescription = "所属设备")]
         public string TUNNEL { get; set; }
 
+        /// <summary>
+        /// 所属巷道信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(TUNNEL))]
+        public WCS_DEVICE TUNNELDEVICE { get; set; }
+
         /// <summary>
         /// 方向
         /// </summary>
+        [SugarColumn(ColumnDescription = "方向")]
         public string Direction { get; set; }
     }
 }

Projects/永冠OPP/WCS.Entity.Protocol/WCS_TASK.cs

@@ -1,148 +1,344 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using SqlSugar;
+using System;
+using WCS.Entity.Protocol;
 
 namespace WCS.Entity
 {
     /// <summary>
-    /// WCS任务类型
+    /// 任务表
     /// </summary>
+    [SugarTable(nameof(WCS_TASK), "任务表")]
     public class WCS_TASK : OBJ
     {
         /// <summary>
         /// 生产编码
         /// </summary>
-        [StringLength(50)]
+        [SugarColumn(ColumnDescription = "生产编码", Length = 50)]
         public string BARCODE { get; set; }
 
         /// <summary>
         /// 任务类型
         /// </summary>
+        [SugarColumn(ColumnDescription = "任务类型")]
         public TaskType TYPE { get; set; }
 
         /// <summary>
         /// 任务状态
         /// </summary>
+        [SugarColumn(ColumnDescription = "任务状态")]
         public TaskStatus STATUS { get; set; }
 
         /// <summary>
         /// 起始地址
         /// </summary>
-        [StringLength(20)]
+        [SugarColumn(ColumnDescription = "起始地址", Length = 20)]
         public string ADDRFROM { get; set; }
 
         /// <summary>
         /// 目标地址
         /// </summary>
-        [StringLength(20)]
+        [SugarColumn(ColumnDescription = "目标地址", Length = 20)]
         public string ADDRTO { get; set; }
 
         /// <summary>
         /// 下一个地址
         /// </summary>
-        [StringLength(20)]
+        [SugarColumn(ColumnDescription = "下一个地址", Length = 20)]
         public string ADDRNEXT { get; set; }
 
         /// <summary>
         /// 巷道
         /// </summary>
-        [StringLength(10)]
+        [SugarColumn(ColumnDescription = "巷道", Length = 10)]
         public string TUNNEL { get; set; }
 
         /// <summary>
-        ///
+        /// 楼层
         /// </summary>
+        [SugarColumn(ColumnDescription = "楼层")]
         public int FLOOR { get; set; }
 
         /// <summary>
         /// 设备
         /// </summary>
-        [StringLength(20)]
+        [SugarColumn(ColumnDescription = "设备", Length = 20)]
         public string DEVICE { get; set; }
 
         /// <summary>
         /// 堆垛机放货站台
         /// </summary>
-        [StringLength(20)]
+        [SugarColumn(ColumnDescription = "堆垛机放货站台", Length = 20)]
         public string SRMSTATION { get; set; }
 
         /// <summary>
         ///创建时间
         /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间")]
         public DateTime CREATETIME { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 开始时间
         /// </summary>
+        [SugarColumn(ColumnDescription = "开始时间")]
         public DateTime? STARTTIME { get; set; }
 
         /// <summary>
         /// 结束时间
         /// </summary>
+        [SugarColumn(ColumnDescription = "结束时间")]
         public DateTime? ENDTIME { get; set; }
 
         /// <summary>
-        /// 单号 美纹中组盘时使用
+        /// 单号
         /// </summary>
+        [SugarColumn(ColumnDescription = "单号")]
         public int DOCID { get; set; }
 
         /// <summary>
-        /// 托盘类型1-4
+        /// 托盘类型
         /// </summary>
+        [SugarColumn(ColumnDescription = "托盘类型")]
         public short PALLETTYPE { get; set; }
 
         /// <summary>
-        /// 产线1-9
+        /// 产线
         /// </summary>
+        [SugarColumn(ColumnDescription = "产线")]
         public short PRODLINE { get; set; }
 
         /// <summary>
         /// 满盘数量
         /// </summary>
+        [SugarColumn(ColumnDescription = "满盘数量")]
         public short FULLQTY { get; set; }
 
         /// <summary>
         /// 高度
         /// </summary>
+        [SugarColumn(ColumnDescription = "高度")]
         public short HEIGHT { get; set; }
 
         /// <summary>
         /// WMS任务号
         /// </summary>
+        [SugarColumn(ColumnDescription = "WMS任务号")]
         public int WMSTASK { get; set; }
 
         /// <summary>
         /// 任务组ID
         /// </summary>
+        [SugarColumn(ColumnDescription = "任务组ID")]
         public string TaskGroupKey { get; set; }
 
         /// <summary>
         /// 更新状态
         /// </summary>
+        [SugarColumn(ColumnDescription = "更新状态")]
         public TaskStatus UPLOADED { get; set; }
 
         /// <summary>
         /// AGV任务号
         /// </summary>
-        public int AgvTask { get; set; }
+        [SugarColumn(ColumnDescription = "AGV任务号")]
+        public int AGVTASKID { get; set; }
+
+        /// <summary>
+        /// AGV任务详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(AGVTASKID))]
+        public WCS_AGVTask AGVTASK { get; set; }
+
+        /// <summary>
+        /// 优先级
+        /// </summary>
+        [SugarColumn(ColumnDescription = "优先级")]
+        public int Priority { get; set; }
+
+        /// <summary>
+        /// 手动处理备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "手动处理备注")]
+        public string ManualRemarks { get; set; }
+
+        /// <summary>
+        /// 产品长度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "产品长度")]
+        public decimal Length { get; set; }
+
+        /// <summary>
+        /// 产品编码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "产品编码")]
+        public string MaterialCode { get; set; }
+    }
+
+    /// <summary>
+    /// 任务表
+    /// </summary>
+    [SugarTable(nameof(WCS_TASK_OLD), "任务表")]
+    public class WCS_TASK_OLD : OBJ
+    {
+        /// <summary>
+        /// 生产编码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "生产编码", Length = 50)]
+        public string BARCODE { get; set; }
+
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "任务类型")]
+        public TaskType TYPE { get; set; }
+
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "任务状态")]
+        public TaskStatus STATUS { get; set; }
+
+        /// <summary>
+        /// 起始地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "起始地址", Length = 20)]
+        public string ADDRFROM { get; set; }
+
+        /// <summary>
+        /// 目标地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "目标地址", Length = 20)]
+        public string ADDRTO { get; set; }
+
+        /// <summary>
+        /// 下一个地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "下一个地址", Length = 20)]
+        public string ADDRNEXT { get; set; }
+
+        /// <summary>
+        /// 巷道
+        /// </summary>
+        [SugarColumn(ColumnDescription = "巷道", Length = 10)]
+        public string TUNNEL { get; set; }
+
+        /// <summary>
+        /// 楼层
+        /// </summary>
+        [SugarColumn(ColumnDescription = "楼层")]
+        public int FLOOR { get; set; }
+
+        /// <summary>
+        /// 设备
+        /// </summary>
+        [SugarColumn(ColumnDescription = "设备", Length = 20)]
+        public string DEVICE { get; set; }
+
+        /// <summary>
+        /// 堆垛机放货站台
+        /// </summary>
+        [SugarColumn(ColumnDescription = "堆垛机放货站台", Length = 20)]
+        public string SRMSTATION { get; set; }
+
+        /// <summary>
+        ///创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间")]
+        public DateTime CREATETIME { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "开始时间")]
+        public DateTime? STARTTIME { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "结束时间")]
+        public DateTime? ENDTIME { get; set; }
+
+        /// <summary>
+        /// 单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "单号")]
+        public int DOCID { get; set; }
+
+        /// <summary>
+        /// 托盘类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "托盘类型")]
+        public short PALLETTYPE { get; set; }
+
+        /// <summary>
+        /// 产线
+        /// </summary>
+        [SugarColumn(ColumnDescription = "产线")]
+        public short PRODLINE { get; set; }
+
+        /// <summary>
+        /// 满盘数量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "满盘数量")]
+        public short FULLQTY { get; set; }
+
+        /// <summary>
+        /// 高度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "高度")]
+        public short HEIGHT { get; set; }
+
+        /// <summary>
+        /// WMS任务号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "WMS任务号")]
+        public int WMSTASK { get; set; }
+
+        /// <summary>
+        /// 任务组ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "任务组ID")]
+        public string TaskGroupKey { get; set; }
+
+        /// <summary>
+        /// 更新状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新状态")]
+        public TaskStatus UPLOADED { get; set; }
+
+        /// <summary>
+        /// AGV任务号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "AGV任务号")]
+        public int AGVTASKID { get; set; }
+
+        /// <summary>
+        /// AGV任务详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(AGVTASKID))]
+        public WCS_AGVTask AGVTASK { get; set; }
 
         /// <summary>
         /// 优先级
         /// </summary>
+        [SugarColumn(ColumnDescription = "优先级")]
         public int Priority { get; set; }
 
         /// <summary>
         /// 手动处理备注
         /// </summary>
+        [SugarColumn(ColumnDescription = "手动处理备注")]
         public string ManualRemarks { get; set; }
 
         /// <summary>
         /// 产品长度
         /// </summary>
+        [SugarColumn(ColumnDescription = "产品长度")]
         public decimal Length { get; set; }
 
         /// <summary>
         /// 产品编码
         /// </summary>
+        [SugarColumn(ColumnDescription = "产品编码")]
         public string MaterialCode { get; set; }
     }
 
@@ -166,4 +362,4 @@ namespace WCS.Entity
         已完成 = 99,
         已取消 = 106
     }
-}
+}

Projects/永冠OPP/WCS.Entity.Protocol/WCS_TASK_OLD.cs

@@ -1,148 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace WCS.Entity.Protocol
-{
-    /// <summary>
-    /// WCS任务表_所有已经完成的
-    /// </summary>
-    public class WCS_TASK_OLD : OBJ
-    {
-        /// <summary>
-        /// 生产编码
-        /// </summary>
-        [StringLength(50)]
-        public string BARCODE { get; set; }
-
-        /// <summary>
-        /// 任务类型
-        /// </summary>
-        public TaskType TYPE { get; set; }
-
-        /// <summary>
-        /// 任务状态
-        /// </summary>
-        public TaskStatus STATUS { get; set; }
-
-        /// <summary>
-        /// 起始地址
-        /// </summary>
-        [StringLength(20)]
-        public string ADDRFROM { get; set; }
-
-        /// <summary>
-        /// 目标地址
-        /// </summary>
-        [StringLength(20)]
-        public string ADDRTO { get; set; }
-
-        /// <summary>
-        /// 下一个地址
-        /// </summary>
-        [StringLength(20)]
-        public string ADDRNEXT { get; set; }
-
-        /// <summary>
-        /// 巷道
-        /// </summary>
-        [StringLength(10)]
-        public string TUNNEL { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public int FLOOR { get; set; }
-
-        /// <summary>
-        /// 设备
-        /// </summary>
-        [StringLength(20)]
-        public string DEVICE { get; set; }
-
-        /// <summary>
-        /// 堆垛机放货站台
-        /// </summary>
-        [StringLength(20)]
-        public string SRMSTATION { get; set; }
-
-        /// <summary>
-        ///创建时间
-        /// </summary>
-        public DateTime CREATETIME { get; set; } = DateTime.Now;
-
-        /// <summary>
-        /// 开始时间
-        /// </summary>
-        public DateTime? STARTTIME { get; set; }
-
-        /// <summary>
-        /// 结束时间
-        /// </summary>
-        public DateTime? ENDTIME { get; set; }
-
-        /// <summary>
-        /// 单号 美纹中组盘时使用
-        /// </summary>
-        public int DOCID { get; set; }
-
-        /// <summary>
-        /// 托盘类型1-4
-        /// </summary>
-        public short PALLETTYPE { get; set; }
-
-        /// <summary>
-        /// 产线1-9
-        /// </summary>
-        public short PRODLINE { get; set; }
-
-        /// <summary>
-        /// 满盘数量
-        /// </summary>
-        public short FULLQTY { get; set; }
-
-        /// <summary>
-        /// 高度
-        /// </summary>
-        public short HEIGHT { get; set; }
-
-        /// <summary>
-        /// WMS任务号
-        /// </summary>
-        public int WMSTASK { get; set; }
-
-        /// <summary>
-        /// 任务组ID
-        /// </summary>
-        public string TaskGroupKey { get; set; }
-
-        /// <summary>
-        /// 更新状态
-        /// </summary>
-        public TaskStatus UPLOADED { get; set; }
-
-        /// <summary>
-        /// AGV任务号
-        /// </summary>
-        public int AgvTask { get; set; }
-
-        /// <summary>
-        /// 优先级
-        /// </summary>
-        public int Priority { get; set; }
-
-        /// <summary>
-        /// 手动处理备注
-        /// </summary>
-        public string ManualRemarks { get; set; }
-
-        /// <summary>
-        /// 产品长度
-        /// </summary>
-        public decimal Length { get; set; }
-
-        /// <summary>
-        /// 产品编码
-        /// </summary>
-        public string MaterialCode { get; set; }
-    }
-}

Projects/永冠OPP/WCS.Entity.Protocol/WCS_Users.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-
-namespace WCS.Entity.Protocol
-{
-    public class WCS_Users
-    {
-        [Key]
-        [StringLength(128)]
-        public string USER_NO { get; set; }
-
-        [Required]
-        [StringLength(128)]
-        public string USER_PWD { get; set; }
-        
-        public byte[] USER_TEXT { get; set; }
-         
-    }
-
-    public class WCS_MAPPINGENTRY
-    {
-        [Key]
-        public int MEP_ID { get; set; }
-
-        public int MEP_MAPPINGNO { get; set; }
-
-        [Required]
-        [StringLength(50)]
-        public string MEP_MAPPINGTYPE { get; set; }
-
-        [Required]
-        [StringLength(50)]
-        public string MEP_MAPPINGCHNAME { get; set; } 
-
-        public bool MEP_ISSTOP { get; set; }
-
-  
-    }
-
-}

WCS.Entity/OBJ.cs

@@ -27,9 +27,15 @@ namespace WCS.Entity
         /// <summary>
         /// 更新用户
         /// </summary>
-        [SugarColumn(ColumnDescription = "更新用户", Length = 50, IsNullable = true)]
+        [SugarColumn(ColumnDescription = "更新用户", Length = 50)]
         public string UPDATEUSER { get; set; }
 
+        /// <summary>
+        /// 更新用户详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(UPDATEUSER))]
+        public WCS_USERS USER { get; set; }
+
         /// <summary>
         /// 更新时间
         /// </summary>
@@ -44,7 +50,7 @@ namespace WCS.Entity
         public byte[] VER { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>

WCS.Entity/WCS_CMD.cs

@@ -2,24 +2,45 @@
 
 namespace WCS.Entity
 {
-    [SugarTable("WCS_CMD", "WCS用户用写入PLC记录表")]
+    /// <summary>
+    /// WCS用户用写入PLC记录表
+    /// </summary>
+    [SugarTable(nameof(WCS_CMD), "WCS用户用写入PLC记录表")]
     public class WCS_CMD : OBJ
     {
+        /// <summary>
+        /// 关联设备号
+        /// </summary>
         [SugarColumn(Length = 20, ColumnDescription = "关联设备号")]
         public string DEVICE_CODE { get; set; }
 
+        /// <summary>
+        /// 关联设备信息
+        /// </summary>
         [Navigate(NavigateType.OneToOne, "DEVICE_CODE")]
         public WCS_DEVICE DEVICE { get; set; }
 
+        /// <summary>
+        /// 协议
+        /// </summary>
         [SugarColumn(Length = 256, ColumnDescription = "协议")]
         public string PROTOCOL { get; set; }
 
+        /// <summary>
+        /// 属性
+        /// </summary>
         [SugarColumn(Length = 32, ColumnDescription = "属性")]
         public string PROPERTY { get; set; }
 
+        /// <summary>
+        /// 值
+        /// </summary>
         [SugarColumn(Length = 512, ColumnDescription = "值")]
         public string VALUE { get; set; }
 
+        /// <summary>
+        /// WCS版本号
+        /// </summary>
         [SugarColumn(ColumnDescription = "WCS版本号")]
         public int WCSVERSION { get; set; }
     }

WCS.Entity/WCS_DATABLOCK.cs

@@ -3,23 +3,39 @@ using System;
 
 namespace WCS.Entity
 {
-    [SugarTable("WCS_DATABLOCK","PLC DB块配置表")]
+    /// <summary>
+    /// PLC DB块配置表
+    /// </summary>
+    [SugarTable(nameof(WCS_DATABLOCK), "PLC DB块配置表")]
     public class WCS_DATABLOCK : OBJ
     {
-        [SugarColumn(IsIgnore = true)]
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(IsIgnore = true), Obsolete]
         public override int ID { get; set; }
 
+        /// <summary>
+        /// 编号
+        /// </summary>
         [SugarColumn(IsPrimaryKey = true, Length = 20, ColumnDescription = "编号")]
         public string CODE { get; set; }
 
+        /// <summary>
+        /// 名称
+        /// </summary>
         [SugarColumn(Length = 20, ColumnDescription = "名称")]
         public string NAME { get; set; }
 
+        /// <summary>
+        /// 关联PLC信息编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "关联PLC信息编号")]
         public string PLCCODE { get; set; }
 
-        //[Navigate(typeof(WCS_PLC), nameof(PLCCODE), nameof(WCS_PLC.CODE))]
-        //public WCS_PLC PLC { get; set; }
-
+        /// <summary>
+        /// 关联PLC信息
+        /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(PLCCODE))]
         public WCS_PLC PLC { get; set; }
 
@@ -29,16 +45,28 @@ namespace WCS.Entity
         [SugarColumn(ColumnDescription = "编号")]
         public int NO { get; set; }
 
+        /// <summary>
+        /// 总长度
+        /// </summary>
         [SugarColumn(ColumnDescription = "总长度")]
         public int LENGTH { get; set; }
 
+        /// <summary>
+        /// 结构体长度
+        /// </summary>
         [SugarColumn(ColumnDescription = "结构体长度")]
         public int DATALENGTH { get; set; }
 
+        /// <summary>
+        /// 协议类型
+        /// </summary>
         [SugarColumn(Length = 200, ColumnDescription = "协议类型")]
         public string PROTOCOL { get; set; }
 
-        [SugarColumn]
+        /// <summary>
+        /// 无更新
+        /// </summary>
+        [SugarColumn(ColumnDescription = "无更新")]
         public bool NOUPDATE { get; set; }
 
         public Type GetProtocolType()

WCS.Entity/WCS_DEVICE.cs

@@ -1,53 +1,52 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace WCS.Entity
 {
     /// <summary>
     /// 设备列表
     /// </summary>
-    [SugarTable("WCS_DEVICE", "设备列表")]
-    public class WCS_DEVICE
+    [SugarTable(nameof(WCS_DEVICE), "设备列表")]
+    public class WCS_DEVICE : OBJ
     {
+        [SugarColumn(IsIgnore = true), Obsolete]
+        public override int ID { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
         [SugarColumn(IsPrimaryKey = true, ColumnDescription = "设备编号", Length = 50)]
         public string CODE { get; set; }
 
+        /// <summary>
+        /// 设备名称
+        /// </summary>
         [SugarColumn(Length = 50, ColumnDescription = "设备名称")]
         public string NAME { get; set; }
 
-        [SugarColumn(Length = 50, ColumnDescription = "是否可用")]
-        public bool ENABLED { get; set; } = true;
-
-        [SugarColumn(Length = 50, ColumnDescription = "更新者")]
-        public string UPDATEUSER { get; set; }
-
-        [SugarColumn(ColumnDescription = "更新时间")]
-        public DateTime UPDATETIME { get; set; } = DateTime.Now;
-
-        [SugarColumn(ColumnDescription = "版本")]
-        public byte[] VER { get; set; }
-
-        [SugarColumn(ColumnDescription = "读写协议")]
-        public int DEVICEPROTOCOLIDS { get; set; }
-
-        [Navigate(NavigateType.OneToMany, nameof(DEVICEPROTOCOLIDS))]
+        /// <summary>
+        /// 设备可用协议集合
+        /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(WCS_DEVICEPROTOCOL.DATABLOCKCODE))]
         public List<WCS_DEVICEPROTOCOL> DEVICEPROTOCOLS { get; set; } = new List<WCS_DEVICEPROTOCOL>();
 
-        [SugarColumn()]
-        public int DEVICE { get; set; }
-
-        [InverseProperty("DEVICE")]
+        /// <summary>
+        /// 设备可用路由集合
+        /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(WCS_ROUTE.DEVICECODE))]
         public List<WCS_ROUTE> ROUTES { get; set; } = new List<WCS_ROUTE>();
 
-        [InverseProperty("START")]
+        /// <summary>
+        /// 设备可用路径集合
+        /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(WCS_PATH.STARTCODE))]
         public List<WCS_PATH> PATHS { get; set; } = new List<WCS_PATH>();
 
         /// <summary>
-        /// 设备组中的内容
+        /// 设备对应设备组信息
         /// </summary>
-        [InverseProperty("GROUP")]
+        [Navigate(NavigateType.OneToMany, nameof(WCS_GROUPMEMBER.GROUPCODE))]
         public List<WCS_GROUPMEMBER> DEVICEGROUP { get; set; } = new List<WCS_GROUPMEMBER>();
 
         public override string ToString()

WCS.Entity/WCS_DEVICEGROUP.cs

@@ -1,22 +1,35 @@
-using System.ComponentModel.DataAnnotations;
+using SqlSugar;
 
 namespace WCS.Entity
 {
     /// <summary>
     /// 设备组
     /// </summary>
+    [SugarTable(nameof(WCS_GROUPMEMBER), "设备组")]
     public class WCS_GROUPMEMBER : OBJ
     {
         /// <summary>
-        /// 组设备
+        /// 组设备编号
         /// </summary>
-        [Required]
+        [SugarColumn(ColumnDescription = "组设备编号")]
+        public string GROUPCODE { get; set; }
+
+        /// <summary>
+        /// 组设备信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(GROUPCODE))]
         public WCS_DEVICE GROUP { get; set; }
 
-        /// <summary>       
-        /// 组中子设备
+        /// <summary>
+        /// 子设备编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "子设备编号")]
+        public string MEMBERCODE { get; set; }
+
+        /// <summary>
+        /// 子设备信息
         /// </summary>
-        [Required]
+        [Navigate(NavigateType.OneToOne, nameof(MEMBERCODE))]
         public WCS_DEVICE MEMBER { get; set; }
     }
-}
+}

WCS.Entity/WCS_DEVICEPROTOCOL.cs

@@ -1,27 +1,41 @@
 using SqlSugar;
-using System;
 
 namespace WCS.Entity
 {
     /// <summary>
     /// DB块读写协议
     /// </summary>
-    [SugarTable("WCS_DEVICEPROTOCOL", "DB块读写协议")]
+    [SugarTable(nameof(WCS_DEVICEPROTOCOL), "DB块读写协议")]
     public class WCS_DEVICEPROTOCOL : OBJ
     {
+        /// <summary>
+        /// 设备编号
+        /// </summary>
         [SugarColumn(ColumnDescription = "设备")]
         public string DEVICECODE { get; set; }
 
+        /// <summary>
+        /// 设备信息
+        /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(DEVICECODE))]
         public WCS_DEVICE DEVICE { get; set; }
 
+        /// <summary>
+        /// DB编号
+        /// </summary>
         [SugarColumn(ColumnDescription = "DB编号")]
         public string DATABLOCKCODE { get; set; }
 
+        /// <summary>
+        /// DB信息
+        /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(DATABLOCKCODE))]
         public WCS_DATABLOCK DB { get; set; }
 
+        /// <summary>
+        /// 起始位置
+        /// </summary>
         [SugarColumn(ColumnDescription = "起始位置")]
-        public Int16 POSITION { get; set; }
+        public short POSITION { get; set; }
     }
 }

WCS.Entity/WCS_EXCEPTION.cs

@@ -1,29 +1,48 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using SqlSugar;
+using System;
 
 namespace WCS.Entity
 {
+    /// <summary>
+    /// 错误/警告
+    /// </summary>
+    [SugarTable(nameof(WCS_EXCEPTION), "错误/警告")]
     public class WCS_EXCEPTION : OBJ
     {
-        [Display(Name = "异常信息")]
-        [StringLength(1000)]
+        /// <summary>
+        /// 异常信息
+        /// </summary>
+        [SugarColumn(ColumnDescription = "异常信息", Length = 1000)]
         public string MSG { get; set; }
 
-        [Display(Name = "异常关联设备")]
-        [StringLength(1000)]
-        public string DEVICE { get; set; }
+        /// <summary>
+        /// 关联设备号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "关联设备号", Length = 50)]
+        public string DEVICECODE { get; set; }
+
+        /// <summary>
+        /// 关联设备详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(DEVICECODE))]
+        public WCS_DEVICE DEVICE { get; set; }
 
         /// <summary>
         /// 为了展示方便直接使用 WCS_EXCEPTIONTYPE 枚举的描述
         /// </summary>
-        [Display(Name = "异常设备")]
-        [StringLength(1000)]
+        [SugarColumn(ColumnDescription = "关联设备号", Length = 200)]
         public string EXCEPTIONTYPE { get; set; }
 
-        [Display(Name = "开始时间")]
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "开始时间")]
         public DateTime STARTTIME { get; set; }
 
-        [Display(Name = "发生次数")]
+        /// <summary>
+        /// 触发次数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "触发次数")]
         public int TIMES { get; set; }
     }
 
@@ -37,4 +56,4 @@ namespace WCS.Entity
         逻辑异常 = 20,
         操作记录 = 30,
     }
-}
+}

WCS.Entity/WCS_MAPPINGENTRY.cs

@@ -0,0 +1,41 @@
+using SqlSugar;
+
+namespace WCS.Entity
+{
+    /// <summary>
+    /// 枚举映射表
+    /// </summary>
+    [SugarTable(nameof(WCS_MAPPINGENTRY), "枚举映射表")]
+    public class WCS_MAPPINGENTRY
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, ColumnDescription = "ID")]
+        public int MEP_ID { get; set; }
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "编号")]
+        public int MEP_MAPPINGNO { get; set; }
+
+        /// <summary>
+        /// 枚举类
+        /// </summary>
+        [SugarColumn(Length = 50, ColumnDescription = "枚举类")]
+        public string MEP_MAPPINGTYPE { get; set; }
+
+        /// <summary>
+        /// 枚举名称
+        /// </summary>
+        [SugarColumn(Length = 50, ColumnDescription = "枚举名称")]
+        public string MEP_MAPPINGCHNAME { get; set; }
+
+        /// <summary>
+        /// 是否停用
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否停用")]
+        public bool MEP_ISSTOP { get; set; }
+    }
+}

WCS.Entity/WCS_PATH.cs

@@ -1,19 +1,41 @@
-using System.ComponentModel.DataAnnotations;
+using SqlSugar;
 
 namespace WCS.Entity
 {
+    /// <summary>
+    /// 设备路径信息
+    /// </summary>
+    [SugarTable(nameof(WCS_PATH), "路径")]
     public class WCS_PATH : OBJ
     {
-        [Display(Name = "起点")]
-        [Required]
+        /// <summary>
+        /// 起点地址编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "起点")]
+        public string STARTCODE { get; set; }
+
+        /// <summary>
+        /// 起始点设备信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, "STARTCODE")]
         public WCS_DEVICE START { get; set; }
 
-        [Display(Name = "终点")]
-        [Required]
+        /// <summary>
+        /// 终点设备编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "终点")]
+        public string ENDCODE { get; set; }
+
+        /// <summary>
+        /// 终点设备信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, "ENDCODE")]
         public WCS_DEVICE END { get; set; }
 
-        [Display(Name = "路径")]
-        [Required]
+        /// <summary>
+        /// 路径
+        /// </summary>
+        [SugarColumn(ColumnDescription = "路径")]
         public string PATH { get; set; }
     }
-}
+}

WCS.Entity/WCS_PATHPOINT.cs

@@ -1,30 +1,71 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using SqlSugar;
 
 namespace WCS.Entity
 {
+    /// <summary>
+    /// 路径详细信息
+    /// </summary>
+    [SugarTable(nameof(WCS_PATHPOINT), "路径详细信息")]
     public class WCS_PATHPOINT : OBJ
     {
-        [Display(Name = "起点")]
-        [Required]
+        /// <summary>
+        /// 起始地址设备号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "起始地址设备号")]
+        public string STARTCODE { get; set; }
+
+        /// <summary>
+        /// 起点设备详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(STARTCODE))]
         public WCS_DEVICE START { get; set; }
 
-        [Display(Name = "终点")]
-        [Required]
-        public WCS_DEVICE END { get; set; } 
+        /// <summary>
+        /// 终点地址设备号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "终点地址设备号")]
+        public string ENDCODE { get; set; }
+
+        /// <summary>
+        /// 终点设备详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(ENDCODE))]
+        public WCS_DEVICE END { get; set; }
+
+        /// <summary>
+        /// 路径点设备号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "路径点设备号")]
+        public string DEVICECODE { get; set; }
 
-        [Display(Name = "路径点")]
-        [Required]
+        /// <summary>
+        /// 路径点详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(DEVICECODE))]
         public WCS_DEVICE DEVICE { get; set; }
 
-        [Display(Name = "前路径点")]
+        /// <summary>
+        /// 前路径点设备号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "前路径点设备号")]
+        public string PREVCODE { get; set; }
+
+        /// <summary>
+        /// 前路径点详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(PREVCODE))]
         public WCS_DEVICE PREV { get; set; }
 
-        [Display(Name = "后路径点")]
+        /// <summary>
+        /// 后路径点设备号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "后路径点设备号")]
+        public string NEXTCODE { get; set; }
+
+        /// <summary>
+        /// 后路径点详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(NEXTCODE))]
         public WCS_DEVICE NEXT { get; set; }
     }
 }

WCS.Entity/WCS_PLC.cs

@@ -1,34 +1,62 @@
 using SqlSugar;
+using System;
 
 namespace WCS.Entity
 {
-    [SugarTable("WCS_PLC")]
+    /// <summary>
+    /// WCS_PLC
+    /// </summary>
+    [SugarTable(nameof(WCS_PLC), "PLC信息")]
     public class WCS_PLC : OBJ
     {
-        [SugarColumn(IsIgnore = true)]
+        [SugarColumn(IsIgnore = true), Obsolete]
         public override int ID { get; set; }
 
+        /// <summary>
+        /// 编号
+        /// </summary>
         [SugarColumn(IsPrimaryKey = true, ColumnDescription = "编号", Length = 20)]
         public string CODE { get; set; }
 
+        /// <summary>
+        /// 名称
+        /// </summary>
         [SugarColumn(ColumnDescription = "名称", Length = 20)]
         public string NAME { get; set; }
 
+        /// <summary>
+        /// IP
+        /// </summary>
         [SugarColumn(ColumnDescription = "IP", Length = 20)]
         public string IP { get; set; }
 
+        /// <summary>
+        /// 端口
+        /// </summary>
         [SugarColumn(ColumnDescription = "端口", Length = 20)]
         public int PORT { get; set; } = 102;
 
+        /// <summary>
+        /// 插槽号
+        /// </summary>
         [SugarColumn(ColumnDescription = "插槽号", Length = 20)]
         public int SLOT { get; set; }
 
+        /// <summary>
+        /// 机架号
+        /// </summary>
         [SugarColumn(ColumnDescription = "机架号", Length = 20)]
         public int RACK { get; set; }
 
+        /// <summary>
+        /// 厂商
+        /// </summary>
         [SugarColumn(ColumnDescription = "厂商", Length = 20)]
         public PLCType TYPE { get; set; }
 
+        /// <summary>
+        /// 型号
+        /// </summary>
         [SugarColumn(ColumnDescription = "型号", Length = 10)]
         public string MODEL { get; set; }
     }

WCS.Entity/WCS_PROTOCOLDATA.cs

@@ -1,19 +1,41 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using SqlSugar;
+using System;
 
 namespace WCS.Entity
 {
+    /// <summary>
+    /// 协议数据抽象类，所有的设备具体协议信息都需继承该类
+    /// </summary>
     public abstract class WCS_PROTOCOLDATA : OBJ
     {
-        [Display(Name = "设备")]
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "设备编号")]
+        public string DEVICECOD { get; set; }
+
+        /// <summary>
+        /// 设备详细信息
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(DEVICECOD))]
         public WCS_DEVICE DEVICE { get; set; }
+
+        /// <summary>
+        /// 确认时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "确认时间")]
         public DateTime FRAME { get; set; }
 
-        [Display(Name = "当前数据")]
+        /// <summary>
+        /// 最后更新
+        /// </summary>
+        [SugarColumn(ColumnDescription = "最后更新")]
         public bool ISLAST { get; set; }
 
+        /// <summary>
+        /// WCS版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "WCS版本号")]
         public int WCSVERSION { get; set; }
     }
 }

WCS.Entity/WCS_ROUTE.cs

@@ -5,7 +5,7 @@ namespace WCS.Entity
     /// <summary>
     /// 设备路由表
     /// </summary>
-    [SugarTable("WCS_ROUTE", "设备路由表")]
+    [SugarTable(nameof(WCS_ROUTE), "设备路由表")]
     public class WCS_ROUTE : OBJ
     {
         /// <summary>

WCS.Entity/WCS_Users.cs

@@ -0,0 +1,31 @@
+using SqlSugar;
+
+namespace WCS.Entity
+{
+    /// <summary>
+    /// 用户
+    /// </summary>
+    [SugarTable(nameof(WCS_USERS), "用户")]
+    public class WCS_USERS
+    {
+        /// <summary>
+        /// 用户账号
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, Length = 128, ColumnDescription = "用户账号")]
+        public string USER_NO { get; set; }
+
+        /// <summary>
+        /// 密码
+        /// </summary>
+        [SugarColumn(Length = 128, ColumnDescription = "密码")]
+        public string USER_PWD { get; set; }
+
+        /// <summary>
+        /// 文本
+        /// </summary>
+        [SugarColumn(ColumnDescription = "文本")]
+        public byte[] USER_TEXT { get; set; }
+    }
+
+  
+}