推送最新代码

wangxinhui

9 天以前 2aec0a99e559fb11b7046b148e5f357b3208cb66

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -22,64 +22,6 @@
        {
        }

        ///// <summary>
        ///// å°†WMS任务推送至WCS
        ///// </summary>
        ///// <returns></returns>
        //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
        //public WebResponseContent PushTasksToWCS()
        //{
        //    return Service.PushTasksToWCS();
        //}

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

        /// <summary>
        /// WCS申请入库任务(不分配货位)
        /// </summary>
@@ -93,20 +35,6 @@
        }

        /// <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>
        /// å…¥åº“任务申请分配货位
        /// </summary>
        /// <param name="taskNum">任务号</param>
@@ -117,87 +45,7 @@
        {
            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>
        /// å…¥åº“任务完成
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InboundTaskCompleted"), AllowAnonymous]
        public WebResponseContent InboundTaskCompleted(int taskNum)
        {
            return Service.InboundTaskCompleted(taskNum);
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
        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>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTasks([FromBody] int[] keys)
        {
            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>
@@ -209,33 +57,15 @@
        {
            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>
        /// <param name="taskNum">任务号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("OutboundTaskCompleted"), AllowAnonymous]
        public WebResponseContent OutboundTaskCompleted(int taskNum)
        [HttpPost, HttpGet, Route("InboundFLTask"), AllowAnonymous]
        public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount)
        {
            return Service.OutboundTaskCompleted(taskNum);
            return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount);
        }

        /// <summary>
@@ -272,6 +102,7 @@
        {
            return Service.PushTasksToWCSSingle(taskNum, agvDescription);
        }

        /// <summary>
        /// é€‰æ‹©åº“存生成出库任务
        /// </summary>
@@ -281,66 +112,6 @@
        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>
@@ -355,24 +126,141 @@
        }

        /// <summary>
        /// PP仓AGV搬运任务
        /// åŽŸæ–™å…¥åº“任务请求
        /// </summary>
        /// <param name="task"></param>
        /// <param name="stationCode">起点</param>
        /// <param name="palletCode">托盘</param>
        /// <returns></returns>
        [HttpPost, Route("AGVTasks"), AllowAnonymous]
        public WebResponseContent AGVTasks([FromBody] SaveModel saveModel)
        [HttpPost,HttpGet, Route("RequestYLWMSTaskSimple"), AllowAnonymous]
        public WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode)
        {
            return Service.AGVTasks(saveModel);
            return Service.RequestYLWMSTaskSimple(stationCode,palletCode);
        }

        /// <summary>
        /// åŽŸæ–™å…¥åº“申请(平台/老厂区)
        /// </summary>
        /// <param name="palletCode">条码</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("YLPurchaseBoxing"), AllowAnonymous]
        public WebResponseContent YLPurchaseBoxing(string palletCode)
        {
            return Service.YLPurchaseBoxing(palletCode);
        }

        /// <summary>
        /// åˆ†é…åŽŸæ–™å…¥åº“巷道
        /// </summary>
        /// <param name="palletCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignYLRoadwayNo"), AllowAnonymous]
        public WebResponseContent AssignYLRoadwayNo(string palletCode)
        {
            string roadWay= Service.AssignYLRoadwayNo(palletCode);
            if (string.IsNullOrEmpty(roadWay))
            {
                return WebResponseContent.Instance.Error("未找到可分配巷道");
            }
            return WebResponseContent.Instance.OK(data: roadWay);
        }

        /// <summary>
        /// æˆå“å‡ºåº“任务请求
        /// <param name="targetId">
        /// 1 æœˆå°åŒº<br/>
        /// 2 å…¥åº“区<br/>
        /// 3 ç»‡å¸ƒåŒº<br/>
        /// 4 æ·‹è†œåŒº<br/>
        /// 5 æš‚存区<br/>
        /// 6 å°åˆ·åŒº<br/>
        /// 7 å†²åˆ‡åŒº<br/>
        /// 8 åŽŸæ–™åŒº<br/>
        /// 9 çº¸è¢‹åŒº<br/>
        /// 10 å¸ƒè¢‹åŒº<br/>
        /// 11 çº¸æ¯åŒº<br/>
        /// 12 é›¾åŒ–区<br/>
        /// </param>
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("RequestCPWMSTaskOut"), AllowAnonymous]
        public WebResponseContent RequestCPWMSTaskOut(string materialCode,int Count, int targetId)
        {
            return Service.RequestCPWMSTaskOut(materialCode, Count, targetId);
        }

        /// <summary>
        /// åŽŸæ–™å‡ºåº“任务
        /// </summary>
        /// <param name="materielCode">物料代码</param>
        /// <param name="materielWide">物料幅宽</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("RequestYLWMSTaskOut"), AllowAnonymous]
        public WebResponseContent RequestYLWMSTaskOut(string materielCode,int materielWide, int count,string address="")
        {
            return Service.RequestYLWMSTaskOut(materielCode, materielWide, count, address);
        }

        /// <summary>
        /// åŽŸæ–™ç§»åº“任务
        /// </summary>
        /// <param name="startAddress"></param>
        /// <param name="endAddress"></param>
        /// <param name="roadWay"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("Relocation"), AllowAnonymous]
        public WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay)
        {
            return Service.IsRelocation(startAddress, endAddress, roadWay);
        }
        /// <summary>
        /// æˆå“æŒ‡å®šå‡ºåº“
        /// åŽŸæ–™å··é“间移库任务
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        [HttpPost, Route("OutProductSelect"), AllowAnonymous]
        public WebResponseContent OutProductSelect(int orderDetailId,[FromBody] List<ProStockViewDTO> proStockViews)
        [HttpPost, HttpGet, Route("RelocationRoadWay"), AllowAnonymous]
        public WebResponseContent RelocationRoadWay(string roadWay,int Count)
        {
            return Service.OutProductSelect(orderDetailId, proStockViews);
            return Service.RelocationRoadWay(roadWay, Count);
        }

        /// <summary>
        /// åˆ†é…æˆå“å··é“
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignCPRoadwayNo"), AllowAnonymous]
        public string AssignCPRoadwayNo()
        {
            return Service.AssignCPRoadwayNo();
        }

        /// <summary>
        /// å°åˆ·ä½™æ–™é€€æ–™ä»»åŠ¡
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("PrintBackInbound"), AllowAnonymous]
        public WebResponseContent PrintBackInbound([FromBody]SaveModel saveModel)
        {
            return Service.PrintBackInbound(saveModel);
        }

        /// <summary>
        /// å°åˆ·ä¸‹æ–™ä»»åŠ¡
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("PrintInbound"), AllowAnonymous]
        public WebResponseContent PrintInbound([FromBody] SaveModel saveModel)
        {
            return Service.PrintInbound(saveModel);
        }

        /// <summary>
        /// åˆ›å»ºåŽŸçº¸ç”Ÿäº§æŽ’程出库任务
        /// </summary>
        [HttpPost, HttpGet, Route("CreateBSTOutboundTasks"), AllowAnonymous]
        public WebResponseContent CreateBSTOutboundTasks([FromBody] int[] keys)
        {
            return Service.CreateBSTOutboundTasks(keys);
        }
    }
}