Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -1,14 +1,19 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;

namespace WIDESEA_WMSServer.Controllers.TaskInfo
{
    /// <summary>
    /// ä»»åŠ¡
    /// </summary>
    [Route("api/Task")]
    [ApiController]
    public class TaskController : ApiBaseController<ITaskService, Dt_Task>
@@ -17,16 +22,180 @@
        {
        }

        [HttpPost, HttpGet, Route("RequestInboundTask")]
        public WebResponseContent RequestInboundTask(string palletCode, string stationCode)
        ///// <summary>
        ///// å°†WMS任务推送至WCS
        ///// </summary>
        ///// <returns></returns>
        //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
        //public WebResponseContent PushTasksToWCS()
        //{
        //    return Service.PushTasksToWCS();
        //}

        /// <summary>
        /// ç”³è¯·å…¥åº“任务
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous]
        public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel)
        {
            return Service.RequestInboundTask(palletCode, stationCode);
            return Service.RequestInboundTask(saveModel);
        }

        [HttpPost, HttpGet, Route("InboundTaskCompleted")]
        /// <summary>
        /// ç©ºç®±å…¥åº“
        /// </summary>
        /// <param name="barcode">托盘号</param>
        /// <param name="address">地址</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InEmpty"), AllowAnonymous]
        public WebResponseContent InEmpty(string barcode, string address, int WarehouseId)
        {
            return Service.InEmpty(barcode, address, WarehouseId);
        }

        /// <summary>
        /// ç©ºç®±å‡ºåº“
        /// </summary>
        /// <param name="qty">数量</param>
        /// <param name="address">地址</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("OutEmpty"), AllowAnonymous]
        public WebResponseContent OutEmpty(int qty, string address, int WarehouseId, string barcode)
        {
            return Service.OutEmpty(qty, address, WarehouseId,barcode);
        }

        [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
        public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
        {
            return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
        }

        /// <summary>
        /// å…¥åº“任务申请分配货位
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="roadwayNo">巷道号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignInboundTaskLocation"), AllowAnonymous]
        public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo)
        {
            return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
        }

        /// <summary>
        /// å…¥åº“任务完成
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InboundTaskCompleted"), AllowAnonymous]
        public WebResponseContent InboundTaskCompleted(int taskNum)
        {
            return Service.InboundTaskCompleted(taskNum);
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        {
            return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTask([FromBody] int[] keys)
        {
            return Service.GenerateOutboundTask(keys);
        }

        /// <summary>
        /// å‡ºåº“任务完成
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("OutboundTaskCompleted"), AllowAnonymous]
        public WebResponseContent OutboundTaskCompleted(int taskNum)
        {
            return Service.OutboundTaskCompleted(taskNum);
        }

        /// <summary>
        /// åˆ¤æ–­æ˜¯å¦éœ€è¦ç§»åº“
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="locationCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
        public WebResponseContent IsRelocation(int taskNum, string locationCode)
        {
            return Service.IsRelocation(taskNum, locationCode);
        }

        /// <summary>
        /// ä»»åŠ¡å®Œæˆ
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
        public WebResponseContent TaskCompleted(int taskNum)
        {
            return Service.TaskCompleted(taskNum);
        }

        /// <summary>
        /// å•ä¸ªä»»åŠ¡æŽ¨é€è‡³WCS
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="agvDescription"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous]
        public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "")
        {
            return Service.PushTasksToWCSSingle(taskNum, agvDescription);
        }
        /// <summary>
        /// é€‰æ‹©åº“存生成出库任务
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [HttpPost, Route("Outbound"), AllowAnonymous]
        public WebResponseContent Outbound(int id)
        {
            return Service.Outbound(id);
        }

        /// <summary>
        /// åˆ†é…å··é“
        /// </summary>
        /// <param name="taskNum"></param>
        /// <param name="roadwayNos"></param>
        /// <returns></returns>
        [HttpPost, Route("AssignRoadway"), AllowAnonymous]
        public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos)
        {
            return Service.AssignRoadway(taskNum, roadwayNos);
        }

        /// <summary>
        /// ä¿®æ”¹ä»»åŠ¡çŠ¶æ€
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        [HttpPost, Route("UpdateTaskInfo"), AllowAnonymous]
        public WebResponseContent UpdateTaskInfo([FromBody] WCSTaskDTO task)
        {
            return Service.UpdateTaskInfo(task);
        }
    }
}