Merge branch 'xiaoyang' into dev

wanshenmean

4 天以前 ff006f77f6267fc0d2c4ee810d897a85165f5b8f

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs

@@ -1,14 +1,9 @@
using Autofac.Core;

using Autofac.Core;

using Masuit.Tools;

using Microsoft.AspNetCore.Authorization;

using Microsoft.AspNetCore.Mvc;

using System.Threading.Tasks;

using WIDESEAWCS_Common.TaskEnum;

using WIDESEAWCS_Core;

using WIDESEAWCS_Core.BaseController;

using WIDESEAWCS_Core.Enums;

using WIDESEAWCS_DTO.TaskInfo;

using WIDESEAWCS_ISystemServices;

using WIDESEAWCS_ITaskInfoService;

using WIDESEAWCS_Model.Models;



@@ -20,17 +15,24 @@
    {

        public RobotTaskController(IRobotTaskService service) : base(service)

        {

            
        }



        [HttpGet, HttpPost, Route("DeleteRobotTask"), AllowAnonymous]

        public WebResponseContent DeleteRobotTask(int id)

        {

            if (Service.DeleteRobotTask(id)){

            if (Service.DeleteRobotTask(id))

            {

                return WebResponseContent.Instance.OK();

            }

            return WebResponseContent.Instance.Error();

        }





        [HttpGet, HttpPost, Route("GetRobotTaskTotalNum"), AllowAnonymous]

        public int GetRobotTaskTotalNum( int taskType, string? palletCode)

        {

            return Service.GetRobotTaskTotalNum(taskType, palletCode);

        }

        // 手动机械手任务

        [HttpGet, HttpPost, Route("CreateRobotTaskManually"), AllowAnonymous]

        public WebResponseContent CreateRobotTaskManually([FromBody] ManualRobotTaskDto request) 

@@ -38,4 +40,4 @@
            return Service.CreateRobotTaskManually(request);

        }

    }

}

}