林豪 左 2 жил өмнө
parent
commit
dfdd7e189b

+ 18 - 12
WCS.Entity/WCS_AgvTaskInfo.cs

@@ -133,31 +133,37 @@ namespace WCS.Entity
         Execution = 10,
 
         /// <summary>
-        /// 请求/允许1 AGV请求,WCS允许 根据任务类型判断取放货
-        /// 工位一
+        ///  走出储位
         /// </summary>
-        [Description("请求/允许1")]
+        ExitStorage = 11,
+
+        /// <summary>
+        ///  走入储位
+        /// </summary>
+        WalkIntoStorage = 12,
+
+        /// <summary>
+        ///  巷道/工位分配申请
+        /// </summary>
+        [Description("巷道/工位分配申请")]
         RequestOrPermission1 = 20,
 
         /// <summary>
-        /// 取放完成1
-        /// 工位一
+        /// 完成巷道/工位分配申请
         /// </summary>
-        [Description("取放完成1")]
+        [Description("完成巷道/工位分配申请")]
         Complete1 = 21,
 
         /// <summary>
-        /// 请求/允许 AGV请求,WCS允许 根据任务类型判断取放货
-        /// 工位二
+        ///  取放站台前安全交互申请
         /// </summary>
-        [Description("请求/允许2")]
+        [Description("取放站台前安全交互申请")]
         RequestOrPermission2 = 30,
 
         /// <summary>
-        /// 取放完成
-        /// 工位二
+        /// 完成取放站台前安全交互申请
         /// </summary>
-        [Description("取放完成2")]
+        [Description("完成取放站台前安全交互申请")]
         Complete2 = 31,
 
         /// <summary>

+ 3 - 0
WCS.WorkEngineering/WebApi/Controllers/WcsController.cs

@@ -15,6 +15,9 @@ namespace WCS.WorkEngineering.WebApi.Controllers
     [Route("api/[controller]/[action]")]
     public class WcsController : ControllerBase, IDeviceWriter
     {
+
+        
+
         /// <summary>
         ///  设备信息写入接口
         /// </summary>

+ 29 - 0
WCS.WorkEngineering/WebApi/Models/WCS/Request/HandleTaskRequest.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace WCS.WorkEngineering.WebApi.Models.WCS.Request
+{
+    /// <summary>
+    ///  处理任务请求参数
+    /// </summary>
+    public class HandleTaskRequest
+    {
+        /// <summary>
+        ///  任务号
+        /// </summary>
+        [Required]
+        public int TaskId { get; set; }
+
+        /// <summary>
+        ///  处理类型
+        /// </summary>
+        [Required]
+        public HandleTaskTypeEnum Type { get; set; }
+    }
+
+    public enum HandleTaskTypeEnum
+    {
+        //重新下发AGV任务 = 1,
+        取消任务 = 1,
+        完成任务 = 2,
+    }
+}

+ 12 - 0
WCS.WorkEngineering/WebApi/Models/WCS/Response/HandleTaskResponse.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WCS.WorkEngineering.WebApi.Models.WCS.Response
+{
+    internal class HandleTaskResponse
+    {
+    }
+}