Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

heshaofeng

7 天以前 461524a7a1def4532b9af4ab40733f899f360db7

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -9,6 +9,7 @@
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -56,12 +57,9 @@
        }

        [HttpPost, Route("PalletOutboundTask"), AllowAnonymous, MethodParamsValidate]
        public async Task<WebResponseContent> PalletOutboundTask(string endStation, string palletCode = "")
        public async Task<WebResponseContent> PalletOutboundTask(int num, int locationType)
        {

            var result = await Service.PalletOutboundTask(endStation, palletCode);

            return result;
            return  await Service.PalletOutboundTask(num, locationType);
        }


@@ -83,9 +81,21 @@
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        public async Task<WebResponseContent> GenerateOutboundTask(int orderDetailId, string station, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        {
            return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
            return await Service.GenerateOutboundTask(orderDetailId, stockSelectViews, station);
        }

        /// <summary>
        /// 鐢熸垚鍑哄簱浠诲姟
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateAllocatOutboundTask"), AllowAnonymous]
        public async Task<WebResponseContent> GenerateAllocatOutboundTask(int orderDetailId, string station, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        {
            return await Service.GenerateAllocatOutboundTask(orderDetailId, stockSelectViews,station);
        }

        /// <summary>
@@ -99,6 +109,47 @@
            return await Service.GenerateOutboundBatchTasksAsync(data.orderDetailId,data.batchQuantity, data.outboundPlatform);
        }

        
        /// <summary>
        /// 鐩樼偣搴撳瓨鍑哄簱
        /// </summary>
        /// <param name="stockViews"></param>
        /// <param name="outStation"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("TakeOutbound"), AllowAnonymous]
        public async Task<WebResponseContent> TakeOutbound([FromBody] List<StockViewDTO> stockViews, string outStation)
        {
            return await Service.TakeOutbound(stockViews, outStation);
        }

        [HttpPost, HttpGet, Route("HandCompleteTask"), AllowAnonymous]
        public async Task<WebResponseContent> HandCompleteTask(string TaskNum)
        {
            return await Service.HandCompleteTask(TaskNum);
        }

        [HttpPost, Route("TaskCancel"), AllowAnonymous]
        public async Task<WebResponseContent> TaskCancel(List<int> taskCancel)
        {
            return await Service.TaskCancel(taskCancel);
        }

        /// <summary>
        /// 鐩樼偣搴撳瓨鍑哄簱
        /// </summary>
        /// <param name="stockViews"></param>
        /// <param name="outStation"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AreaOutbound"), AllowAnonymous]
        public async Task<WebResponseContent> AreaOutbound([FromBody] List<StockViewDTO> stockViews)
        {
            return await Service.AreaOutbound(stockViews);
        }


        [HttpPost, HttpGet, Route("CrossAreaOutbound"), AllowAnonymous]
        public async Task<WebResponseContent> CrossAreaOutbound([FromBody] List<StockViewDTO> stockViews,int targetLocationType)
        {
            return await Service.CrossAreaOutbound(stockViews,targetLocationType);
        }
    }
}