ERP接口代码更新，WCS代码优化，出入库分配优化

wangxinhui

4 天以前 a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9

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

@@ -4,6 +4,7 @@
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Outbound;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -21,6 +22,7 @@
        public TaskController(ITaskService service) : base(service)
        {
        }

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

        /// <summary>
        /// 
        /// å‘WMS申请出库AGV终点
        /// </summary>
        /// <param name="taskNum"></param>
        /// <param name="roadwayNo"></param>
        /// <param name="heightType"></param>
        /// <param name="taskNum">任务号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignInboundTaskLocationByHeight"), AllowAnonymous]
        public WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType)
        [HttpPost, HttpGet, Route("AssignOutTargetAddress"), AllowAnonymous]
        public WebResponseContent AssignOutTargetAddress(int taskNum)
        {
            return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
            return Service.AssignOutTargetAddress(taskNum);
        }
        

        /// <summary>
        /// æˆå“ç©ºæ¡†å›žåº“
        /// </summary>
@@ -71,16 +71,26 @@
        }

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

        /// <summary>
        /// åˆ¤æ–­æ˜¯å¦éœ€è¦ç§»åº“
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="locationCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
        public WebResponseContent IsRelocation(int taskNum, string locationCode)
        {
            return Service.IsRelocation(taskNum, locationCode);
        }
        //[HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
        //public WebResponseContent IsRelocation(int taskNum, string locationCode)
        //{
        //    return Service.IsRelocation(taskNum, locationCode);
        //}

        /// <summary>
        /// ä»»åŠ¡å®Œæˆ
@@ -104,51 +114,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 +135,7 @@
        {
            return Service.UpdateTaskInfo(task);
        }

        /// <summary>
        /// åŽŸæ–™å…¥åº“任务请求
        /// </summary>
@@ -172,6 +147,29 @@
        {
            return Service.RequestYLWMSTaskSimple(stationCode,palletCode);
        }

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

        /// <summary>
        /// åŽŸæ–™é‡‡è´­ç»‘定RFID
        /// </summary>
        /// <param name="palletCode">纸卷条码</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("PurchaseBoxing"), AllowAnonymous]
        public WebResponseContent PurchaseBoxing(string palletCode)
        {
            return Service.PurchaseBoxing(palletCode);
        }

        /// <summary>
        /// åˆ†é…åŽŸæ–™å…¥åº“巷道
        /// </summary>
@@ -190,42 +188,46 @@

        /// <summary>
        /// æˆå“å‡ºåº“任务请求
        /// <param name="targetId">
        ///一楼月台码头 = 1,
        ///一楼无纺织布 = 2,
        ///一楼无纺淋膜 = 3,
        ///一楼无纺缓存 = 4,
        ///一楼纸张淋膜 = 5,
        ///一楼印刷 = 6,
        ///一楼分切 = 7,
        ///一楼模切 = 8,
        ///一楼冲切 = 9,
        ///一楼原料 = 10,
        ///一楼成品 = 11,
        ///二楼原料 = 12,
        ///二楼成品 = 13,
        ///二楼无纺布袋 = 14,
        ///二楼纸袋 = 15,
        ///二楼纸杯 = 16,
        ///二楼雾化 = 17
        /// </param>
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("RequestCPWMSTaskOut"), AllowAnonymous]
        public WebResponseContent RequestCPWMSTaskOut(int Count)
        public WebResponseContent RequestCPWMSTaskOut(string materialCode,int outCount, string 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, outCount, targetId);
        }

        /// <summary>
        /// åŽŸæ–™å‡ºåº“任务
        /// </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="")
        public WebResponseContent RequestYLWMSTaskOut([FromBody] YLWMSTaskOutDTO yLWMSTaskOutDTO)
        {
            return Service.RequestYLWMSTaskOut(materielCode, materielWide, count, address);
            return Service.RequestYLWMSTaskOut(yLWMSTaskOutDTO);
        }

        /// <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 +243,7 @@
        {
            return Service.RelocationRoadWay(roadWay, Count);
        }

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

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

        /// <summary>
        /// å°åˆ·ä¸‹æ–™ä»»åŠ¡
        /// </summary>