板料优化，成品流程，测试架...

wangxinhui

2025-02-28 f947d43adfe6a204b6afe920ce88a30d78015f1d

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

@@ -5,11 +5,15 @@
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>
@@ -31,18 +35,76 @@
        /// <summary>
        /// ç”³è¯·å…¥åº“任务
        /// </summary>
        /// <param name="palletCode"></param>
        /// <param name="stationCode"></param>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous]
        public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel)
        {
            return Service.RequestInboundTask(saveModel);
        }
        //public WebResponseContent RequestInboundTask(string palletCode, string stationCode)
        //{
        //    return Service.RequestInboundTask(palletCode, stationCode);
        //}

        /// <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);
        }

        /// <summary>
        /// WCS申请入库任务(分配货位)
        /// </summary>
        /// <param name="stationCode"></param>
        /// <param name="roadwayNo"></param>
        /// <param name="palletCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
        public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
        {
            return Service.DeviceRequestInboundTask(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)
        {
            return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="stationCode"></param>
        /// <param name="palletCode"></param>
        /// <param name="roadwayNos"></param>
        /// <param name="heightType"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("DeviceRequestInboundTaskByRoadways"), AllowAnonymous]
        public WebResponseContent DeviceRequestInboundTaskByRoadways(string stationCode, string palletCode, int heightType, [FromBody] List<string> roadwayNos)
        {
            return Service.DeviceRequestInboundTaskByRoadways(stationCode, palletCode, roadwayNos, heightType);
        }

        /// <summary>
        /// å…¥åº“任务申请分配货位
@@ -54,6 +116,19 @@
        public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo)
        {
            return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="taskNum"></param>
        /// <param name="roadwayNo"></param>
        /// <param name="heightType"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignInboundTaskLocationByHeight"), AllowAnonymous]
        public WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType)
        {
            return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
        }

        /// <summary>
@@ -74,9 +149,21 @@
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody]List<StockSelectViewDTO> stockSelectViews)
        public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        {
            return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
        }

        /// <summary>
        /// å¹³åº“直接出库
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GeneratePKOutboundTask"), AllowAnonymous]
        public WebResponseContent GeneratePKOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        {
            return Service.GeneratePKOutboundTask(orderDetailId, stockSelectViews);
        }

        /// <summary>
@@ -85,9 +172,9 @@
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTask(int[] keys)
        public WebResponseContent GenerateOutboundTasks([FromBody] int[] keys)
        {
            return Service.GenerateOutboundTask(keys);
            return Service.GenerateOutboundTasks(keys);
        }

        /// <summary>
@@ -135,5 +222,86 @@
        {
            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="roadwayNos"></param>
        /// <param name="taskNum"></param>
        /// <param name="heightType"></param>
        /// <returns></returns>
        [HttpPost, Route("AssignRoadwayByHeight"), AllowAnonymous]
        public WebResponseContent AssignRoadwayByHeight([FromBody] List<string> roadwayNos, int taskNum, int heightType = 0)
        {
            return Service.AssignRoadwayByHeight(roadwayNos, taskNum, heightType);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="roadwayNos"></param>
        /// <param name="palletCode"></param>
        /// <param name="heightType"></param>
        /// <returns></returns>
        [HttpPost, Route("AssignRoadwayByHeightAndCode"), AllowAnonymous]
        public WebResponseContent AssignRoadwayByHeightAndCode([FromBody] List<string> roadwayNos, string palletCode, int heightType = 0)
        {
            return Service.AssignRoadwayByHeightAndCode(roadwayNos, palletCode, heightType);
        }

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

        /// <summary>
        /// 
        /// </summary>
        /// <param name="orderId"></param>
        /// <returns></returns>
        [HttpPost, Route("HandSubstrateOut")]
        public WebResponseContent HandSubstrateOut(int orderId)
        {
            return Service.HandSubstrateOut(orderId);
        }

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