Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

2025-12-02 991673416fdeb3a4be2837bfd70ba6284ad314d5

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

@@ -1,8 +1,11 @@
锘縰sing Microsoft.AspNetCore.Authorization;
锘縰sing MailKit.Search;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
@@ -24,15 +27,38 @@
        {
        }

 
        [HttpPost, Route("AddTestTask"), AllowAnonymous, MethodParamsValidate]
        public WebResponseContent AddTest(WMSTaskDTO wMSTaskDTO)
        {
            Dt_Task task = new Dt_Task
            {
                PalletCode = wMSTaskDTO.PalletCode,
                PalletType = wMSTaskDTO.PalletType,
                Roadway = "t",
                TaskType = wMSTaskDTO.TaskType,
                TaskStatus = wMSTaskDTO.TaskStatus,
                SourceAddress = wMSTaskDTO.SourceAddress,
                TargetAddress = wMSTaskDTO.TargetAddress,
                CurrentAddress = "t",
                NextAddress = "t",
                WarehouseId = wMSTaskDTO.WarehouseId,
                OrderNo = "testt",
                Grade = wMSTaskDTO.Grade,
                Dispatchertime = DateTime.Now,

            };

            Service.AddData(task);
         
         

            return WebResponseContent.Instance.OK();
        }

        [HttpPost, Route("PalletOutboundTask"), AllowAnonymous, MethodParamsValidate]
        public async Task<WebResponseContent> PalletOutboundTask(string endStation, string palletCode = "")
        public async Task<WebResponseContent> PalletOutboundTask(int num)
        {
             
            var result = await Service.PalletOutboundTask(endStation, palletCode);

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


@@ -42,10 +68,46 @@
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
        public async Task<WebResponseContent> GenerateOutboundTasks([FromBody] int[] keys)
        public async Task<WebResponseContent> GenerateOutboundTasks([FromBody] GenerateOutboundTasksDto data)
        {
            return await Service.GenerateOutboundTasksAsync(keys);
            return await Service.GenerateOutboundTasksAsync(data.taskIds, data.outboundPlatform);
        }

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

        /// <summary>
        /// 鍒嗘壒鐢熸垚鍑哄簱浠诲姟
        /// </summary>
        /// <param name="data"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundBatchTasks"), AllowAnonymous]
        public async Task<WebResponseContent> GenerateOutboundBatchTasks([FromBody] GenerateOutboundBatchTasksDto data)
        {
            return await Service.GenerateOutboundBatchTasksAsync(data.orderDetailId,data.batchQuantity, data.outboundPlatform);
        }

        
    }
}