代码更新

wangxinhui

昨天 011ca316e6ec2ed93e31c45a9ebd9d3c66664871

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

@@ -1,9 +1,13 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics.CodeAnalysis;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Outbound;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -26,12 +30,11 @@
        /// WCS申请入库任务(不分配货位)
        /// </summary>
        /// <param name="stationCode"></param>
        /// <param name="palletCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous]
        public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode)
        public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode)
        {
            return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode);
            return Service.DeviceRequestInboundTaskSimple(stationCode);
        }

        /// <summary>
@@ -45,17 +48,28 @@
        {
            return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
        }
        

        /// <summary>
        /// æˆå“ç©ºæ¡†å›žåº“
        /// å‘WMS申请出库AGV终点
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignOutTargetAddress"), AllowAnonymous]
        public WebResponseContent AssignOutTargetAddress(int taskNum)
        {
            return Service.AssignOutTargetAddress(taskNum);
        }

        /// <summary>
        /// æˆå“ç©ºæ‰˜å›žåº“
        /// </summary>
        /// <param name="barCode"></param>
        /// <param name="startPoint"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("EmptyBackTask"), AllowAnonymous]
        public WebResponseContent EmptyBackTask(string barCode, string startPoint)
        public WebResponseContent EmptyBackTask(string barCode, string startPoint,int target)
        {
            return Service.EmptyBackTask(barCode, startPoint);
            return Service.EmptyBackTask(barCode, startPoint, target);
        }

        /// <summary>
@@ -63,10 +77,21 @@
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InboundFLTask"), AllowAnonymous]
        public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount)
        public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount, int oneCount)
        {
            return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount);
            return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount,oneCount);
        }

        /// <summary>
        /// è¾…æ–™(成品)采购/期初入库
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InboundOrderInTask"), AllowAnonymous]
        public WebResponseContent InboundOrderInTask([NotNull] string bindCode, [NotNull] string barCode, [NotNull] string startPoint, int orderType = 0)
        {
            return Service.InboundOrderInTask(bindCode, barCode, startPoint, orderType);
        }


        /// <summary>
        /// åˆ¤æ–­æ˜¯å¦éœ€è¦ç§»åº“
@@ -74,11 +99,11 @@
        /// <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,16 +129,35 @@
        }

        /// <summary>
        /// é€‰æ‹©åº“存生成出库任务
        /// é€‰æ‹©åº“存生成老厂出库任务
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [HttpPost, Route("Outbound"), AllowAnonymous]
        public WebResponseContent Outbound(int id)
        [HttpPost, Route("OldYLOutbound"), AllowAnonymous]
        public WebResponseContent Outbound([FromBody] List<int> ids)
        {
            return Service.Outbound(id);
            return Service.Outbound(ids);
        }

        /// <summary>
        /// åˆ›å»ºç”Ÿç®¡æ‰‹åŠ¨å‡ºåº“
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        [HttpPost, Route("CreateSGManualTasks"), AllowAnonymous]
        public WebResponseContent CreateSGManualTasks([FromBody] List<int> ids)
        {
            return Service.CreateSGManualTasks(ids);
        }
        /// <summary>
        /// åˆ›å»ºé”€å”®å‡ºåº“
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        [HttpPost, Route("CreateSGManualTasks"), AllowAnonymous]
        public WebResponseContent CreateProDeliveryTasks([FromBody] List<int> ids)
        {
            return Service.CreateProDeliveryTasks(ids);
        }
        /// <summary>
        /// ä¿®æ”¹ä»»åŠ¡çŠ¶æ€
        /// </summary>
@@ -143,9 +187,20 @@
        /// <param name="palletCode">条码</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("YLPurchaseBoxing"), AllowAnonymous]
        public WebResponseContent YLPurchaseBoxing(string palletCode)
        public WebResponseContent YLPurchaseBoxing(string palletCode,decimal weight=0,decimal thickness = 0, decimal wide = 0, string stationCode = "")
        {
            return Service.YLPurchaseBoxing(palletCode);
            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, int orderType=0)
        {
            return Service.PurchaseBoxing(palletCode, orderType);
        }

        /// <summary>
@@ -154,9 +209,9 @@
        /// <param name="palletCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignYLRoadwayNo"), AllowAnonymous]
        public WebResponseContent AssignYLRoadwayNo(string palletCode)
        public WebResponseContent AssignYLRoadwayNo(string palletCode,int wide = 0, int thickness = 0, int weight = 0)
        {
            string roadWay= Service.AssignYLRoadwayNo(palletCode);
            string roadWay= Service.AssignYLRoadwayNo(palletCode, wide, thickness, wide);
            if (string.IsNullOrEmpty(roadWay))
            {
                return WebResponseContent.Instance.Error("未找到可分配巷道");
@@ -167,50 +222,50 @@
        /// <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/>
        ///一楼月台码头 = 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(string materialCode,int Count, int targetId)
        public WebResponseContent RequestCPWMSTaskOut(string materialCode,int outCount, string targetId)
        {
            return Service.RequestCPWMSTaskOut(materialCode, Count, targetId);
            return Service.RequestCPWMSTaskOut(materialCode, outCount, 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="")
        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)
        public WebResponseContent IsRelocation([FromBody] RelocationDTO relocationDTO)
        {
            return Service.IsRelocation(startAddress, endAddress, roadWay);
            return Service.IsRelocation(relocationDTO);
        }
        /// <summary>
        /// åŽŸæ–™å··é“间移库任务
@@ -255,12 +310,56 @@
        }

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

        /// <summary>
        /// å¯ç”¨AGV站点
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("EnableStatus")]
        public WebResponseContent EnableStatus([FromBody] int[] keys)
        {
            return Service.EnableStatus(keys);
        }
        [HttpPost, HttpGet, Route("DisableStatus")]
        public WebResponseContent DisableStatus([FromBody] int[] keys)
        {
            return Service.DisableStatus(keys);
        }
        /// <summary>
        /// æˆå“ç»„盘
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("BoxingInBound"), AllowAnonymous]
        public WebResponseContent BoxingInBound(string stationCode, [FromBody] List<string> barCodes)
        {
            return Service.BoxingInBound(stationCode, barCodes);
        }
        /// <summary>
        /// æˆå“å…¥åº“扫码请求更新托盘条码
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InBoundPalletCode"), AllowAnonymous]
        public WebResponseContent InBoundPalletCode(int taskNum, string barCode)
        {
            return Service.InBoundPalletCode(taskNum, barCode);
        }
        /// <summary>
        /// åŠæˆå“æ‰˜ç›˜æ¬è¿å…¥åº“
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("SemiProIn"), AllowAnonymous]
        public WebResponseContent SemiProIn(string barcode, string palletCode, string address)
        {
            return Service.SemiProIn(barcode, palletCode, address);
        }
    }
}