agv配料

ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs

@@ -1,6 +1,8 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Extensions;
+using ZR.Model;
+using ZR.Model.MES.mm;
 using ZR.Model.MES.mm.Dto;
 using ZR.Service.mes.mm;
 using ZR.Service.mes.mm.IService;
@@ -50,9 +52,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
         /// </summary>
         /// <returns></returns>
         [HttpPost("getworkorderlist")]
-        public IActionResult Getworkorderlist([FromBody] WorkorderqueryDto  query)
+        public IActionResult Getworkorderlist([FromBody] WorkorderqueryDto query)
         {
-            if(query == null|| query.datetimespan==null)
+            if (query == null || query.datetimespan == null)
             {
                 SUCCESS(null);
             }
@@ -66,14 +68,106 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
         /// </summary>
         /// <returns></returns>
         [HttpPost("generatetask")]
-        public  IActionResult   Generatetask([FromBody] IngredientTaskDto  task)
+        public IActionResult Generatetask([FromBody] IngredientTaskDto task)
         {
-            if(task==null||task.workorders==null|| task.workorders.Count==0)
+            if (task == null || task.workorders == null || task.workorders.Count == 0)
             {
                 return SUCCESS(null);
             }
             int res = materialInputService.Generatetask(task, HttpContext.GetName());
             return SUCCESS(res);
         }
+
+        /// <summary>
+        /// 分页查询 配料任务
+        /// </summary>
+        /// <param name="queryParams"></param>
+        /// <returns></returns>
+        [HttpPost("getIngredientTask")]
+        public IActionResult GetIngredientTask([FromBody] IngredientTaskQueryDto queryTask)
+        {
+            if (queryTask == null)
+            {
+                return SUCCESS(null);
+            }
+
+            List<MmIngredientTask> response = materialInputService.GetIngredientTask(queryTask);
+
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 获取配料任务详情
+        /// </summary>
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        [HttpGet("getIngredientTask_son")]
+        public IActionResult GetIngredientTaskSon(string taskId)
+        {
+            if (string.IsNullOrEmpty(taskId))
+            {
+                return SUCCESS(null);
+            }
+            List<MmIngredientTask> response = materialInputService.GetIngredientTaskSon(taskId);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取车间上料终点
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getfabgopoints")]
+        public IActionResult Getfabgopoints()
+        {
+            string[] response = materialInputService.Getfabgopoints();
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        ///   agv从仓库到车间 进料
+        /// </summary>
+        /// <param name="start_point"></param>
+        /// <param name="end_point"></param>
+        /// <returns></returns>
+        [HttpGet("go_workshop")]
+        public IActionResult GoWorkshop(string start_point, string end_point)
+        {
+            if (string.IsNullOrEmpty(start_point) || string.IsNullOrEmpty(end_point))
+            {
+                SUCCESS(null);
+            }
+            var response = materialInputService.AGV_schedule(start_point, end_point);
+
+            return SUCCESS(response);
+        }
+        /// <summary>
+        /// 紧急停止agv
+        /// </summary>
+        /// <param name="reqCode"></param>
+        /// <returns></returns>
+        [HttpGet("emergency_stop_agv")]
+        public  IActionResult EmergencyStopAgv(string reqCode)
+        {
+            if(string.IsNullOrEmpty(reqCode))
+            {
+                SUCCESS(null);
+            }
+
+            var response = materialInputService.EmergencyStopAgv(reqCode);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("agv_final_task")]
+        public  IActionResult AgvFinalTask()
+        {
+            return null;
+        }
+
     }
 }