出库任务合并和作废

src/WMS.Web.Api/Controllers/OutStockTaskController.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.OutStockTask;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Infrastructure;
@@ -50,5 +51,38 @@ namespace WMS.Web.Api.Controllers
             var result = ResultPagedList<OutStockTaskQueryInfoResponse>.ReSuccess(list, count);
             return result;
         }
+
+        /// <summary>
+        /// 作废
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Repeal")]
+        public async Task<Result> Repeal(OperateRequest dto)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            return await _outStockService.Repeal(dto,loginInfo);
+        }
+
+        /// <summary>
+        /// 合并
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("merge")]
+        public async Task<Result> merge(OperateRequest dto)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            return await _outStockService.merge(dto, loginInfo);
+        }
+
     }
 }