浏览代码

移除枚举映射表,新增任务历史与详情表

林豪 左 2 年之前
父节点
当前提交
3ed930667f
共有 4 个文件被更改,包括 39 次插入50 次删除
  1. 1 6
      WCS.Entity/OBJ.cs
  2. 0 41
      WCS.Entity/WCS_MAPPINGENTRY.cs
  3. 3 3
      WCS.Entity/WCS_TASK_DTL.cs
  4. 35 0
      WCS.Entity/WCS_TASK_OLD.cs

+ 1 - 6
WCS.Entity/OBJ.cs

@@ -25,16 +25,11 @@ namespace WCS.Entity
 
         /// <summary>
         /// 更新用户
+        /// 仅记录用户ID
         /// </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>

+ 0 - 41
WCS.Entity/WCS_MAPPINGENTRY.cs

@@ -1,41 +0,0 @@
-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; }
-    }
-}

+ 3 - 3
WCS.Entity/WCS_TASKDtl.cs → WCS.Entity/WCS_TASK_DTL.cs

@@ -4,10 +4,10 @@ using System;
 namespace WCS.Entity
 {
     /// <summary>
-    /// 任务表
+    /// 任务详情
     /// </summary>
-    [SugarTable(nameof(WCS_TASKDtl), "任务表")]
-    public class WCS_TASKDtl : OBJ
+    [SugarTable(nameof(WCS_TASK_DTL), "任务表")]
+    public class WCS_TASK_DTL : OBJ
     {
         /// <summary>
         /// 生产编码

+ 35 - 0
WCS.Entity/WCS_TASK_OLD.cs

@@ -0,0 +1,35 @@
+using System;
+
+namespace WCS.Entity.Protocol
+{
+    /// <summary>
+    /// WCS任务表_所有已经完成的
+    /// </summary>
+    public class WCS_TASK_OLD : OBJ
+    {
+        /// <summary>
+        /// 父级任务号
+        /// </summary>
+        public int ParentTaskCode { get; set; }
+
+        /// <summary>
+        /// 当前位置
+        /// </summary>
+        public string CurPoint { get; set; }
+
+        /// <summary>
+        /// 下一个地址
+        /// </summary>
+        public string NextPoint { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Desc { get; set; }
+
+        /// <summary>
+        /// 执行时间
+        /// </summary>
+        public DateTime ExecTime { get; set; }
+    }
+}