Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMe...

wanshenmean

2026-03-30 1faef6894400be9923b24038fddb7f9218bd7b6b

 Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -1,10 +1,11 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.DirectoryServices.Protocols;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO;
using WIDESEA_DTO.GradingMachine;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -79,6 +80,17 @@
        }

        /// <summary>
        /// 移库任务完成：修改库存位置与状态，修改源/目标货位状态，删除任务数据
        /// </summary>
        /// <param name="taskDto"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("RelocationFinishTask"), AllowAnonymous]
        public async Task<WebResponseContent?> RelocationFinishTaskAsync([FromBody] CreateTaskDto taskDto)
        {
            return await Service.RelocationFinishTaskAsync(taskDto);
        }

        /// <summary>
        /// 创建空托盘出库任务
        /// </summary>
        /// <param name="taskDto"></param>
@@ -101,12 +113,56 @@
        }

        /// <summary>
        /// 修改任务状态（根据任务ID修改为指定状态）
        /// </summary>
        /// <param name="taskDto"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("UpdateTaskByStatus"), AllowAnonymous]
        public async Task<WebResponseContent?> UpdateTaskByStatusAsync([FromBody] UpdateTaskDto taskDto)
        {
            return await Service.UpdateTaskByStatusAsync(taskDto.Id, taskDto.NewStatus);
        }

        /// <summary>
        /// 创建机械手组盘任务
        /// </summary>
        /// <param name="taskDto"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("CreateRobotGroupPalletTask"), AllowAnonymous]
        public async Task<WebResponseContent?> CreateRobotGroupPalletTaskAsync([FromBody] StockDTO taskDto)
        {
            return await Service.CreateRobotGroupPalletTaskAsync(taskDto);
        }

        /// <summary>
        /// 创建机械手拆盘任务
        /// </summary>
        /// <param name="taskDto"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("CreateRobotSplitPalletTask"), AllowAnonymous]
        public async Task<WebResponseContent?> CreateRobotSplitPalletTaskAsync([FromBody] StockDTO taskDto)
        {
            return await Service.CreateRobotSplitPalletTaskAsync(taskDto);
        }

        /// <summary>
        /// 创建机械手换盘任务
        /// </summary>
        /// <param name="taskDto"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("CreateRobotChangePalletTask"), AllowAnonymous]
        public async Task<WebResponseContent?> CreateRobotChangePalletTaskAsync([FromBody] StockDTO taskDto)
        {
            return await Service.CreateRobotChangePalletTaskAsync(taskDto);
        }

        /// <summary>
        /// 堆垛机取放货完成后物流通知化成分容柜完成信号
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("InOrOutCompleted"), AllowAnonymous]
        public async Task<WebResponseContent?> InOrOutCompletedAsync([FromBody] InputDto input)
        public async Task<WebResponseContent?> InOrOutCompletedAsync([FromBody] GradingMachineInputDto input)
        {
            return await Service.InOrOutCompletedAsync(input);
        }
@@ -117,7 +173,7 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("SendLocationStatus"), AllowAnonymous]
        public async Task<WebResponseContent?> SendLocationStatusAsync([FromBody] InputDto input)
        public async Task<WebResponseContent?> SendLocationStatusAsync([FromBody] GradingMachineInputDto input)
        {
            return await Service.SendLocationStatusAsync(input);
        }
@@ -128,7 +184,7 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("RequestOutbound"), AllowAnonymous]
        public async Task<WebResponseContent?> RequestOutboundAsync([FromBody] InputDto input)
        public async Task<WebResponseContent?> RequestOutboundAsync([FromBody] GradingMachineInputDto input)
        {
            return await Service.RequestOutboundAsync(input);
        }
@@ -139,9 +195,75 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("GetPalletCodeCell"), AllowAnonymous]
        public async Task<WebResponseContent?> GetPalletCodeCellAsync([FromBody] InputDto input)
        public async Task<WebResponseContent?> GetPalletCodeCellAsync([FromBody] GradingMachineInputDto input)
        {
            return await Service.GetPalletCodeCellAsync(input);
        }

        #region 极卷库任务模块

        /// <summary>
        /// 出入库申请
        /// </summary>
        /// <param name="applyInOutDto">请求参数</param>
        /// <returns></returns>
        [HttpPost("ApplyInOut"), AllowAnonymous]
        public async Task<AGVResponse> ApplyInOutAsync([FromBody] ApplyInOutDto applyInOutDto)
        {
            return await Service.ApplyInOutAsync(applyInOutDto);
        }
        /// <summary>
        /// 手动出库完成反馈给AGV
        /// </summary>
        /// <param name="outTaskCompleteDto">请求参数</param>
        /// <returns></returns>
        [HttpPost, Route("OutTaskComplete"), AllowAnonymous]
        public async Task<WebResponseContent> OutTaskComplete([FromBody] OutTaskCompleteDto outTaskCompleteDto)
        {
            return await Service.OutTaskComplete(outTaskCompleteDto);
        }
        ///// <summary>
        ///// 任务完成
        ///// </summary>
        ///// <param name="wCSTask">请求参数</param>
        ///// <returns></returns>
        //[HttpPost, Route("TaskCompleted"), AllowAnonymous]
        //public async Task<WebResponseContent?> TaskCompleted([FromBody] WCSTaskDTO wCSTask)
        //{
        //    return await Service.TaskCompleted(wCSTask);
        //}
        /// <summary>
        /// 输送线申请进入
        /// </summary>
        /// <param name="applyEnterDto">请求参数</param>
        /// <returns></returns>
        [HttpPost("ApplyEnter"), AllowAnonymous]
        public async Task<AGVResponse?> ApplyEnterAsync([FromBody] ApplyEnterDto applyEnterDto)
        {
            return await Service.ApplyEnterAsync(applyEnterDto);
        }

        /// <summary>
        /// 取放货完成
        /// </summary>
        /// <param name="taskCompleteDto">请求参数</param>
        /// <returns></returns>
        [HttpPost("TaskComplete"), AllowAnonymous]
        public async Task<AGVResponse?> TaskCompleteAsync([FromBody] TaskCompleteDto taskCompleteDto)
        {
            return await Service.TaskCompleteAsync(taskCompleteDto);
        }

        /// <summary>
        /// 任务取消
        /// </summary>
        /// <param name="taskCancelDto">请求参数</param>
        /// <returns></returns>
        [HttpPost("TaskCancel"), AllowAnonymous]
        public async Task<AGVResponse?> TaskCancelAsync([FromBody] TaskCancelDto taskCancelDto)
        {
            return await Service.TaskCancelAsync(taskCancelDto);
        }
        #endregion 极卷库任务模块
    }
}