任务表修正

WCS.Entity/WCS_TASK.cs

@@ -172,175 +172,6 @@ namespace WCS.Entity
         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; }
-    }
-
     /// <summary>
     /// 任务类型
     /// </summary>

WCS.Entity/WCS_TASK_DTL.cs

@@ -10,183 +10,28 @@ namespace WCS.Entity
     public class WCS_TASK_DTL : OBJ
     {
         /// <summary>
-        /// 生产编码
+        /// 父级任务号
         /// </summary>
-        [SugarColumn(ColumnDescription = "生产编码", Length = 50)]
-        public string BARCODE { get; set; }
+        public int ParentTaskCode { 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; }
+        public string CurPoint { get; set; }
 
         /// <summary>
         /// 下一个地址
         /// </summary>
-        [SugarColumn(ColumnDescription = "下一个地址", Length = 20)]
-        public string ADDRNEXT { get; set; }
+        public string NextPoint { get; set; }
 
         /// <summary>
-        /// 巷道
+        /// 描述
         /// </summary>
-        [SugarColumn(ColumnDescription = "巷道", Length = 10, IsNullable = true)]
-        public string TUNNEL { get; set; }
-
-        /// <summary>
-        /// 楼层
-        /// </summary>
-        [SugarColumn(ColumnDescription = "楼层")]
-        public int FLOOR { get; set; }
-
-        /// <summary>
-        /// 设备
-        /// </summary>
-        [SugarColumn(ColumnDescription = "设备", Length = 20, IsNullable = true)]
-        public string DEVICE { get; set; }
-
-        /// <summary>
-        /// 堆垛机放货站台
-        /// </summary>
-        [SugarColumn(ColumnDescription = "堆垛机放货站台", Length = 20, IsNullable = true)]
-        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 = "结束时间", IsNullable = true)]
-        public DateTime? ENDTIME { get; set; }
-
-        /// <summary>
-        /// 单号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "单号", IsNullable = true)]
-        public int DOCID { get; set; }
-
-        /// <summary>
-        /// 托盘类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "托盘类型", IsNullable = true)]
-        public short PALLETTYPE { get; set; }
-
-        /// <summary>
-        /// 产线
-        /// </summary>
-        [SugarColumn(ColumnDescription = "产线", IsNullable = true)]
-        public short PRODLINE { get; set; }
-
-        /// <summary>
-        /// 满盘数量
-        /// </summary>
-        [SugarColumn(ColumnDescription = "满盘数量", IsNullable = true)]
-        public short FULLQTY { get; set; }
-
-        /// <summary>
-        /// 高度
-        /// </summary>
-        [SugarColumn(ColumnDescription = "高度", IsNullable = true)]
-        public short HEIGHT { get; set; }
-
-        /// <summary>
-        /// WMS任务号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "WMS任务号")]
-        public int WMSTASK { get; set; }
-
-        /// <summary>
-        /// 任务组ID
-        /// </summary>
-        [SugarColumn(ColumnDescription = "任务组ID", IsNullable = true)]
-        public string TaskGroupKey { get; set; }
-
-        /// <summary>
-        /// 更新状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "更新状态")]
-        public TaskStatus UPLOADED { get; set; }
-
-        /// <summary>
-        /// AGV任务号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "AGV任务号", IsNullable = true)]
-        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 = "手动处理备注", IsNullable = true)]
-        public string ManualRemarks { get; set; }
-
-        /// <summary>
-        /// 产品长度
-        /// </summary>
-        [SugarColumn(ColumnDescription = "产品长度", IsNullable = true)]
-        public decimal Length { get; set; }
-
-        /// <summary>
-        /// 产品编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "产品编码", IsNullable = true)]
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 更新用户
-        /// </summary>
-        [SugarColumn(ColumnDescription = "更新用户", Length = 50)]
-        public string UPDATEUSER { get; set; }
-
-        ///// <summary>
-        ///// 更新用户详细信息
-        ///// </summary>
-        //[Navigate(NavigateType.OneToOne, nameof(UPDATEUSER))]
-        //public WCS_USERS USER { get; set; }
+        public string Desc { get; set; }
 
         /// <summary>
-        /// 更新时间
+        /// 执行时间
         /// </summary>
-        [SugarColumn(ColumnDescription = "更新时间")]
-        public DateTime UPDATETIME { get; set; } = DateTime.Now;
+        public DateTime ExecTime { get; set; }
     }
 }

WCS.Entity/WCS_TASK_OLD.cs

@@ -1,4 +1,5 @@
-using System;
+using SqlSugar;
+using System;
 
 namespace WCS.Entity.Protocol
 {
@@ -8,28 +9,183 @@ namespace WCS.Entity.Protocol
     public class WCS_TASK_OLD : OBJ
     {
         /// <summary>
-        /// 父级任务号
+        /// 生产编码
         /// </summary>
-        public int ParentTaskCode { get; set; }
+        [SugarColumn(ColumnDescription = "生产编码", Length = 50)]
+        public string BARCODE { get; set; }
 
         /// <summary>
-        /// 当前位置
+        /// 任务类型
         /// </summary>
-        public string CurPoint { get; set; }
+        [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>
-        public string NextPoint { get; set; }
+        [SugarColumn(ColumnDescription = "下一个地址", Length = 20)]
+        public string ADDRNEXT { get; set; }
 
         /// <summary>
-        /// 描述
+        /// 巷道
         /// </summary>
-        public string Desc { get; set; }
+        [SugarColumn(ColumnDescription = "巷道", Length = 10, IsNullable = true)]
+        public string TUNNEL { get; set; }
+
+        /// <summary>
+        /// 楼层
+        /// </summary>
+        [SugarColumn(ColumnDescription = "楼层")]
+        public int FLOOR { get; set; }
+
+        /// <summary>
+        /// 设备
+        /// </summary>
+        [SugarColumn(ColumnDescription = "设备", Length = 20, IsNullable = true)]
+        public string DEVICE { get; set; }
+
+        /// <summary>
+        /// 堆垛机放货站台
+        /// </summary>
+        [SugarColumn(ColumnDescription = "堆垛机放货站台", Length = 20, IsNullable = true)]
+        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 = "结束时间", IsNullable = true)]
+        public DateTime? ENDTIME { get; set; }
+
+        /// <summary>
+        /// 单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "单号", IsNullable = true)]
+        public int DOCID { get; set; }
+
+        /// <summary>
+        /// 托盘类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "托盘类型", IsNullable = true)]
+        public short PALLETTYPE { get; set; }
+
+        /// <summary>
+        /// 产线
+        /// </summary>
+        [SugarColumn(ColumnDescription = "产线", IsNullable = true)]
+        public short PRODLINE { get; set; }
+
+        /// <summary>
+        /// 满盘数量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "满盘数量", IsNullable = true)]
+        public short FULLQTY { get; set; }
+
+        /// <summary>
+        /// 高度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "高度", IsNullable = true)]
+        public short HEIGHT { get; set; }
+
+        /// <summary>
+        /// WMS任务号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "WMS任务号")]
+        public int WMSTASK { get; set; }
+
+        /// <summary>
+        /// 任务组ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "任务组ID", IsNullable = true)]
+        public string TaskGroupKey { get; set; }
+
+        /// <summary>
+        /// 更新状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新状态")]
+        public TaskStatus UPLOADED { get; set; }
+
+        /// <summary>
+        /// AGV任务号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "AGV任务号", IsNullable = true)]
+        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 = "手动处理备注", IsNullable = true)]
+        public string ManualRemarks { get; set; }
+
+        /// <summary>
+        /// 产品长度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "产品长度", IsNullable = true)]
+        public decimal Length { get; set; }
+
+        /// <summary>
+        /// 产品编码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "产品编码", IsNullable = true)]
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 更新用户
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新用户", Length = 50)]
+        public string UPDATEUSER { get; set; }
+
+        ///// <summary>
+        ///// 更新用户详细信息
+        ///// </summary>
+        //[Navigate(NavigateType.OneToOne, nameof(UPDATEUSER))]
+        //public WCS_USERS USER { get; set; }
 
         /// <summary>
-        /// 执行时间
+        /// 更新时间
         /// </summary>
-        public DateTime ExecTime { get; set; }
+        [SugarColumn(ColumnDescription = "更新时间")]
+        public DateTime UPDATETIME { get; set; } = DateTime.Now;
     }
 }