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

helongyang

12 小时以前 dc06f58d8ed537555fd529551180f43a0586ec3f

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

@@ -42,7 +42,14 @@
        {
            return Service.RequestInboundTask(saveModel);
        }

        /// <summary>
        /// æŸ¥è¯¢è´¨æ£€æ•°é‡
        /// </summary>
        [HttpPost, HttpGet, Route("InQualityConfirm"), AllowAnonymous]
        public WebResponseContent InQualityConfirm(string palletCode)
        {
            return Service.InQualityConfirm(palletCode);
        }
        /// <summary>
        /// ç©ºç®±å…¥åº“
        /// </summary>
@@ -75,9 +82,9 @@
        /// <param name="palletCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
        public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
        public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode,string materielBoxCode = "")
        {
            return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
            return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode, materielBoxCode);
        }

        /// <summary>
@@ -130,7 +137,11 @@
        {
            return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
        }

        [HttpPost, HttpGet, Route("RequestZHInboundTask"), AllowAnonymous]
        public WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot)
        {
            return Service.RequestZHInboundTask(agvTaskCode,palletCode,palletType,materialLot);
        }
        /// <summary>
        /// å…¥åº“任务完成
        /// </summary>
@@ -176,7 +187,57 @@
        {
            return Service.GenerateOutboundTasks(keys);
        }

        /// <summary>
        /// ç”Ÿæˆæˆå“å‡ºåº“任务
        /// </summary>
        /// <param name="ProOutNo">出库订单号</param>
        /// <param name="StationCode">站台地址</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("OutProductTask"), AllowAnonymous]
        public async Task<WebResponseContent> OutProductTask([FromBody] int[] keys, string StationCode, int Grade)
        {
            return await Service.OutProductTask(keys, StationCode, Grade);
        }
        /// <summary>
        /// æˆå“ä½™æ–™é€€åº“入仓
        /// </summary>
        /// <param name="barCode"></param>
        /// <param name="startPoint"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("BackProductTask"), AllowAnonymous]
        public WebResponseContent BackProductTask(string barCode, string startPoint)
        {
            return Service.BackProductTask(barCode, startPoint);
        }
        /// <summary>
        /// æˆå“ç©ºæ¡†å›žåº“
        /// </summary>
        /// <param name="barCode"></param>
        /// <param name="startPoint"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("EmptyBackTask"), AllowAnonymous]
        public WebResponseContent EmptyBackTask(string barCode, string startPoint)
        {
            return Service.EmptyBackTask(barCode, startPoint);
        }
        /// <summary>
        /// ç”Ÿæˆæˆå“æåº“任务
        /// </summary>
        [HttpPost, HttpGet, Route("OutProRworkTask"), AllowAnonymous]
        public async Task<WebResponseContent> OutProRworkTask([FromBody] int[] keys, string StationCode, int Grade)
        {
            return await Service.OutProductTask(keys, StationCode, Grade);
        }
        ///// <summary>
        ///// ç”ŸæˆMESPP仓大卷出库任务
        ///// </summary>
        ///// <param name="keys"></param>
        ///// <returns></returns>
        //[HttpPost, HttpGet, Route("MESPPGenerateOutboundTasks"), AllowAnonymous]
        //public WebResponseContent MESPPGenerateOutboundTasks([FromBody] int[] keys)
        //{
        //    return Service.MESPPGenerateOutboundTasks(keys);
        //}
        /// <summary>
        /// å‡ºåº“任务完成
        /// </summary>
@@ -206,11 +267,10 @@
        /// <param name="taskNum">任务号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
        public WebResponseContent TaskCompleted(int taskNum)
        public async Task<WebResponseContent> TaskCompleted(int taskNum)
        {
            return Service.TaskCompleted(taskNum);
            return await Service.TaskCompleted(taskNum);
        }

        /// <summary>
        /// å•ä¸ªä»»åŠ¡æŽ¨é€è‡³WCS
        /// </summary>
@@ -218,9 +278,9 @@
        /// <param name="agvDescription"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous]
        public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "")
        public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "")
        {
            return Service.PushTasksToWCSSingle(taskNum, agvDescription);
            return Service.PushTasksToWCSSingle(taskNum, agvDescription, agvtaskNum);
        }
        /// <summary>
        /// é€‰æ‹©åº“存生成出库任务
@@ -266,9 +326,9 @@
        /// <param name="roadwayNos"></param>
        /// <returns></returns>
        [HttpPost, Route("AssignRoadway"), AllowAnonymous]
        public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos)
        public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos,int heightType)
        {
            return Service.AssignRoadway(taskNum, roadwayNos);
            return Service.AssignRoadway(taskNum, roadwayNos, heightType);
        }

        /// <summary>
@@ -314,5 +374,31 @@
        {
            return Service.AGVTasks(saveModel);
        }
        /// <summary>
        /// æˆå“æŒ‡å®šå‡ºåº“
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        [HttpPost, Route("OutProductSelect"), AllowAnonymous]
        public WebResponseContent OutProductSelect(int orderDetailId,[FromBody] List<ProStockViewDTO> proStockViews)
        {
            return Service.OutProductSelect(orderDetailId, proStockViews);
        }
        /// <summary>
        /// é˜»ç„Šæ‰¹æ¬¡ç‰©æ–™æŸ¥è¯¢
        /// </summary>
        [HttpPost, Route("GetZHMesMaterialLot"), AllowAnonymous]
        public WebResponseContent GetZHMesMaterialLot(string materialLot)
        {
            return Service.GetZHMesMaterialLot(materialLot);
        }
        /// <summary>
        /// é€‰å®šåº“存生成盘点单出库
        /// </summary>
        [HttpPost, Route("TakeOutbound"), AllowAnonymous]
        public WebResponseContent TakeOutbound([FromBody] List<StockViewDTO> stockViews)
        {
            return Service.TakeOutbound(stockViews);
        }
    }
}