Browse Source

fix 更新枚举

林豪 左 2 years ago
parent
commit
14f251b755
3 changed files with 154 additions and 28 deletions
  1. 70 19
      WCS.Entity/WCS_AGVTask.cs
  2. 23 4
      WCS.Entity/WCS_PLC.cs
  3. 61 5
      WCS.Entity/WCS_TASK.cs

+ 70 - 19
WCS.Entity/WCS_AGVTask.cs

@@ -94,36 +94,87 @@ namespace WCS.Entity
         public DateTime? AGVUpdateTime { get; set; }
 
         /// <summary>
-        ///更新用户
+        /// 更新用户
+        /// 记录用户ID
         /// </summary>
         [SugarColumn(ColumnDescription = "更新用户")]
         [DataMember(Order = 11)]
         public string UPDATEUSER { get; set; }
-
-        ///// <summary>
-        ///// 更新用户详细信息
-        ///// </summary>
-        //[Navigate(NavigateType.OneToOne, nameof(UPDATEUSER))]
-        //public WCS_USERS USER { get; set; }
     }
 
+    /// <summary>
+    /// AGV任务状态
+    /// </summary>
     public enum AGVTaskStatus
     {
-        新建 = 0,
-        确认 = 5,
-        执行 = 10,
-        请求_允许 = 20,
-        取放完成 = 21,
-        请求_允许2 = 30,
-        取放完成2 = 31,
-        完成 = 99,
-        完成扫码 = 100,
-        取消 = 106
+        /// <summary>
+        /// 新建
+        /// </summary>
+        NewBuild = 0,
+
+        /// <summary>
+        /// 确认
+        /// </summary>
+        Confirm = 5,
+
+        /// <summary>
+        /// 执行
+        /// </summary>
+        Execution = 10,
+
+        /// <summary>
+        /// 请求/允许 AGV请求,WCS允许 根据任务类型判断取放货
+        /// 工位一
+        /// </summary>
+        RequestOrPermission1 = 20,
+
+        /// <summary>
+        /// 取放完成
+        /// 工位一
+        /// </summary>
+        Complete1 = 21,
+
+        /// <summary>
+        /// 请求/允许 AGV请求,WCS允许 根据任务类型判断取放货
+        /// 工位二
+        /// </summary>
+        RequestOrPermission2 = 30,
+
+        /// <summary>
+        /// 取放完成
+        /// 工位二
+        /// </summary>
+        Complete2 = 31,
+
+        /// <summary>
+        /// 任务完成
+        /// </summary>
+        MissionCompleted = 99,
+
+        /// <summary>
+        /// 完成扫码
+        /// </summary>
+        CompleteScanCode = 100,
+
+        /// <summary>
+        ///  取消
+        /// </summary>
+        Cancel = 106
     }
 
+    /// <summary>
+    /// AGV任务类型
+    /// </summary>
     public enum AGVTaskType
     {
-        入库 = 1,
-        叫料 = 2
+        /// <summary>
+        /// 入库
+        /// </summary>
+        EnterDepot = 1,
+
+        /// <summary>
+        /// 叫料
+        /// </summary>
+        CallForMaterial = 2
     }
 }

+ 23 - 4
WCS.Entity/WCS_PLC.cs

@@ -67,11 +67,30 @@ namespace WCS.Entity
     /// </summary>
     public enum PLCType
     {
-        西门子 = 1,
-        三菱 = 2,
+        /// <summary>
+        /// 西门子
+        /// </summary>
+        Siemens = 1,
+
+        /// <summary>
+        /// 三菱
+        /// </summary>
+        Mitsubishi = 2,
+
+        /// <summary>
+        /// AB
+        /// </summary>
         AB = 3,
-        欧姆龙 = 4,
-        汇川 = 5, 
+
+        /// <summary>
+        /// 欧姆龙
+        /// </summary>
+        OMRON = 4,
+
+        /// <summary>
+        /// 汇川
+        /// </summary>
+        INOVANCE = 5,
     }
 
     /// <summary>

+ 61 - 5
WCS.Entity/WCS_TASK.cs

@@ -341,24 +341,80 @@ namespace WCS.Entity
         public string MaterialCode { get; set; }
     }
 
+    /// <summary>
+    /// 任务类型
+    /// </summary>
     public enum TaskType
     {
-        组盘 = 0,
-        入库 = 1,
-        出库 = 2,
-        移库 = 3,
-        输送 = 5,
+        /// <summary>
+        /// 组盘
+        /// </summary>
+        SetPlate = 0,
+
+        /// <summary>
+        /// 入库
+        /// </summary>
+        EnterDepot = 1,
+
+        /// <summary>
+        /// 出库
+        /// </summary>
+        OutDepot = 2,
+
+        /// <summary>
+        /// 移库
+        /// </summary>
+        TransferDepot = 3,
+
+        /// <summary>
+        /// 输送
+        /// </summary>
+        Delivery = 5,
     }
 
+    /// <summary>
+    /// 任务状态
+    /// </summary>
     public enum TaskStatus
     {
+        /// <summary>
+        /// 新建
+        /// </summary>
         新建 = 0,
+
+        /// <summary>
+        /// 执行中
+        /// </summary>
         执行中 = 2,
+
+        /// <summary>
+        /// 入库交管结束
+        /// </summary>
         入库交管结束 = 3,
+
+        /// <summary>
+        /// 堆垛机执行
+        /// </summary>
         堆垛机执行 = 5,
+
+        /// <summary>
+        /// 堆垛机完成
+        /// </summary>
         堆垛机完成 = 6,
+
+        /// <summary>
+        /// 出库RGV执行
+        /// </summary>
         出库RGV执行 = 9,
+
+        /// <summary>
+        /// 已完成
+        /// </summary>
         已完成 = 99,
+
+        /// <summary>
+        /// 已取消
+        /// </summary>
         已取消 = 106
     }
 }