添加盘点，合托流程

wankeda

2026-01-18 f7ad3416dfc1558be842f3190688adc9a5a8933d

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

@@ -5,6 +5,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
using static WIDESEA_ITaskInfoService.ITaskService;
@@ -23,17 +24,46 @@
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        [HttpGet, Route("TaskCompleted"), AllowAnonymous]
        public WebResponseContent TaskCompleted(int taskNum)
        [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
        public async Task<WebResponseContent> TaskCompleted(int taskNum)
        {
            return Service.TaskCompleted(taskNum);
            return await Service.TaskCompleted(taskNum);
        }

        [HttpPost, Route("GenerateOutboundTask"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTask(int id, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        {
            return Service.GenerateOutboundTask(id, stockSelectViews);
            return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
        }

        [HttpPost, Route("WMSGenerateOutboundTask"), AllowAnonymous]
        public WebResponseContent WMSGenerateOutboundTask([FromBody] int[] keys)
        {
            return Service.WMSGenerateOutboundTask(keys);
        }

        [HttpPost, Route("WMSGenerateNewOutboundTask"), AllowAnonymous]
        public WebResponseContent WMSGenerateNewOutboundTask([FromBody] int[] keys)
        {
            return Service.WMSGenerateNewOutboundTask(keys);
        }

        [HttpPost, Route("WMSGenerateSTOutboundTask"), AllowAnonymous]
        public WebResponseContent WMSGenerateSTOutboundTask([FromBody] int[] keys)
        {
            return Service.WMSGenerateSTOutboundTask(keys);
        }
        /// <summary>
        /// SMOM盘点任务
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, Route("SMOMGenerateSTOutboundTask"), AllowAnonymous]
        public WebResponseContent SMOMGenerateSTOutboundTask([FromBody] int[] keys)
        {
            return Service.SMOMGenerateSTOutboundTask(keys);
        }

        /// <summary>
        /// WCS申请入库任务
        /// </summary>
@@ -44,6 +74,35 @@
        {
            return Service.InboundRequest(stationCode, roadwayNo, palletCode);
        }
        /// <summary>
        /// WCS申请入库任务(不分配货位)
        /// </summary>
        /// <param name="stationCode"></param>
        /// <param name="palletCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous]
        public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode, int heightType)
        {
            return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode, heightType);
        }

        [HttpPost, HttpGet, Route("CPDeviceRequestInboundTaskSimple"), AllowAnonymous]
        public WebResponseContent CPDeviceRequestInboundTaskSimple(string stationCode, string palletCode, int heightType, string courceAddress)
        {
            return Service.CPDeviceRequestInboundTaskSimple(stationCode, palletCode, heightType, courceAddress);
        }

        /// <summary>
        /// 申请巷道
        /// </summary>
        /// <param name="palletCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("ApplyLocation"), AllowAnonymous]
        public WebResponseContent ApplyLocation(string palletCode)
        {
            return Service.ApplyLocation(palletCode);
        }

        /// <summary>
        /// 判断巷道内移库
        /// </summary>
@@ -70,7 +129,7 @@
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        [HttpPost, Route("InboundTaskCompleted"), AllowAnonymous]
        [HttpPost, HttpGet, Route("InboundTaskCompleted"), AllowAnonymous]
        public WebResponseContent InboundTaskCompleted(int taskNum)
        {
            return Service.InboundTaskCompleted(taskNum);
@@ -86,26 +145,6 @@
            return Service.OutboundTaskCompleted(taskNum);
        }
        /// <summary>
        /// WMS下发出库单据
        /// </summary>
        /// <param name="orderAddDTO"></param>
        /// <returns></returns>
        [HttpPost, Route("AddOutboundOrders"), AllowAnonymous]
        public WebResponseContent AddOutboundOrders([FromBody] Houseounbound orderAddDTO)
        {
            return Service.AddOutboundOrders(orderAddDTO);
        }
        /// <summary>
        /// 盘点任务上传
        /// </summary>
        /// <param name="houseInventoryOut"></param>
        /// <returns></returns>
        [HttpPost, Route("InventoryOut"), AllowAnonymous]
        public WebResponseContent InventoryOut([FromBody] HouseCancelOut houseInventoryOut)
        {
            return Service.InventoryOut(houseInventoryOut);
        }
        /// <summary>
        /// 盘点任务回传WMS
        /// </summary>
        /// <param name="name"></param>
@@ -117,10 +156,103 @@
            return Service.InventoryIn(name, qty);
        }

        [HttpPost,Route("UpdateTaskStatus") ,AllowAnonymous]
        [HttpPost, Route("UpdateTaskStatus"), AllowAnonymous]
        public WebResponseContent UpdateTaskStatus(int tasknum, int tasktype)
        {
            return Service.UpdateTaskStatus(tasknum, tasktype);
        }
        /// <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, int heightType)
        {
            return Service.AssignRoadway(taskNum, roadwayNos, heightType);
        }

        /// <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="task"></param>
        /// <returns></returns>
        [HttpPost, Route("UpdateTaskInfo"), AllowAnonymous]
        public WebResponseContent UpdateTaskInfo([FromBody] WCSTaskDTO task)
        {
            return Service.UpdateTaskInfo(task);
        }

        [HttpPost, Route("FeedBackInboundERP"), AllowAnonymous]
        public WebResponseContent FeedBackInboundERP(string upperOrderNo, string linId)
        {
            return Service.FeedBackInboundERP(upperOrderNo, linId);
        }

        /// <summary>
        /// 单据明细出库完成回调erp
        /// </summary>
        /// <param name="orderNO"></param>
        /// <param name="linId"></param>
        /// <returns></returns>
        [HttpPost, Route("FeedBackOutERP"), AllowAnonymous]
        public WebResponseContent FeedBackOutERP(string orderNO, string linId)
        {
            return Service.FeedBackOutERP(orderNO, linId);
        }

        /// <summary>
        /// 选定库存生成盘点单出库
        /// </summary>
        [HttpPost, Route("TakeOutbound"), AllowAnonymous]
        public WebResponseContent TakeOutbound([FromBody] List<StockViewDTO> stockViews)
        {
            return Service.TakeOutbound(stockViews);
        }

        /// <summary>
        /// SMOM下发出库单据
        /// </summary>
        /// <param name="orderAddDTO"></param>
        /// <returns></returns>
        [HttpPost, Route("AddOutboundOrders"), AllowAnonymous]
        public WebResponseContent AddOutboundOrders([FromBody] Houseounbound orderAddDTO)
        {
            return Service.AddOutboundOrders(orderAddDTO);
        }
        /// <summary>
        /// SMOM盘点任务上传
        /// </summary>
        /// <param name="houseInventoryOut"></param>
        /// <returns></returns>
        [HttpPost, Route("InventoryOut"), AllowAnonymous]
        public WebResponseContent InventoryOut([FromBody] HouseCancelOut houseInventoryOut)
        {
            return Service.InventoryOut(houseInventoryOut);
        }

        /// <summary>
        /// SMOM盘点后库存调整
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("SMOMAdjustment"), AllowAnonymous]
        public WebResponseContent SMOMAdjustment([FromBody] HouseAdjustment houseAdjustment)
        {
            return Service.SMOMAdjustment(houseAdjustment);
        }
    }
}