最新代码更新

wangxinhui

昨天 9ce6731460179c71f0f2c636b2a1598324d5194e

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

@@ -21,6 +21,7 @@
        public TaskController(ITaskService service) : base(service)
        {
        }

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

        /// <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="barCode"></param>
@@ -68,6 +56,16 @@
        public WebResponseContent EmptyBackTask(string barCode, string startPoint)
        {
            return Service.EmptyBackTask(barCode, startPoint);
        }

        /// <summary>
        /// è¾…æ–™/成品临时入库
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InboundFLTask"), AllowAnonymous]
        public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount)
        {
            return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount);
        }

        /// <summary>
@@ -104,51 +102,15 @@
        {
            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)
        [HttpPost, Route("OldYLOutbound"), AllowAnonymous]
        public WebResponseContent Outbound([FromBody] List<int> ids)
        {
            return Service.AssignRoadwayByHeight(roadwayNos, taskNum, 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);
            return Service.Outbound(ids);
        }

        /// <summary>
@@ -161,6 +123,7 @@
        {
            return Service.UpdateTaskInfo(task);
        }

        /// <summary>
        /// åŽŸæ–™å…¥åº“任务请求
        /// </summary>
@@ -172,6 +135,18 @@
        {
            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>
@@ -190,22 +165,26 @@

        /// <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(int Count)
        public WebResponseContent RequestCPWMSTaskOut(string materialCode,int Count, int targetId)
        {
            return Service.RequestCPWMSTaskOut(Count);
        }

        /// <summary>
        /// æ— çººå¸ƒå‡ºåº“
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("RequestWFBWMSTaskOut"), AllowAnonymous]
        public WebResponseContent RequestWFBWMSTaskOut(int Count)
        {
            return Service.RequestWFBWMSTaskOut(Count);
            return Service.RequestCPWMSTaskOut(materialCode, Count, targetId);
        }

        /// <summary>
@@ -213,19 +192,16 @@
        /// </summary>
        /// <param name="materielCode">物料代码</param>
        /// <param name="materielWide">物料幅宽</param>
        /// <param name="Count">卷数</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)
@@ -241,6 +217,7 @@
        {
            return Service.RelocationRoadWay(roadWay, Count);
        }

        /// <summary>
        /// åˆ†é…æˆå“å··é“
        /// </summary>
@@ -250,6 +227,7 @@
        {
            return Service.AssignCPRoadwayNo();
        }

        /// <summary>
        /// å°åˆ·ä½™æ–™é€€æ–™ä»»åŠ¡
        /// </summary>
@@ -260,6 +238,7 @@
        {
            return Service.PrintBackInbound(saveModel);
        }

        /// <summary>
        /// å°åˆ·ä¸‹æ–™ä»»åŠ¡
        /// </summary>
@@ -270,5 +249,14 @@
        {
            return Service.PrintInbound(saveModel);
        }

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