调整接口

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

@@ -89,13 +89,13 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("Save")]
-        public async Task<Result> Save(SaveChangeBoxRecordRequest dto)
+        public async Task<Result> Save(List<SaveChangeBoxRecordRequest> 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 _changeMoveBoxService.ChangeBoxSave(new List<SaveChangeBoxRecordRequest>() { dto }, loginInfo, true, true, true);
+            return await _changeMoveBoxService.ChangeBoxSave(dto, loginInfo, true, true, true);
         }
     }
 }

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

@@ -106,6 +106,21 @@ namespace WMS.Web.Api.Controllers
 
             return await _inStockTaskService.Repeal(dto, loginInfo);
         }
+        /// <summary>
+        /// 反作废
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("NoRepeal")]
+        public async Task<Result> NoRepeal([FromBody] 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 _inStockTaskService.NoRepeal(dto, loginInfo);
+        }
 
         /// <summary>
         /// 金蝶-拉取数据-测试用

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

@@ -127,6 +127,21 @@ namespace WMS.Web.Api.Controllers
 
             return await _outStockTaskService.Repeal(dto, loginInfo);
         }
+        /// <summary>
+        /// 反作废
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("NoRepeal")]
+        public async Task<Result> NoRepeal(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 _outStockTaskService.NoRepeal(dto, loginInfo);
+        }
 
         /// <summary>
         /// 合并

src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml

@@ -94,7 +94,7 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Save(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest)">
+        <member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest})">
             <summary>
             改箱保存-PDA
             </summary>
@@ -228,6 +228,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.InStockTaskController.NoRepeal(WMS.Web.Core.Dto.OperateRequest)">
+            <summary>
+            反作废
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.InStockTaskController.Test(System.String)">
             <summary>
             金蝶-拉取数据-测试用
@@ -497,6 +504,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.NoRepeal(WMS.Web.Core.Dto.OperateRequest)">
+            <summary>
+            反作废
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.merge(WMS.Web.Core.Dto.OperateRequest)">
             <summary>
             合并

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -5994,6 +5994,11 @@
             物料编码
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.StockCode">
+            <summary>
+            仓位
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.SubStockCode">
             <summary>
             仓位

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -2894,7 +2894,7 @@
         </member>
         <member name="M:WMS.Web.Domain.Infrastructure.IInStockRepositories.GetInstockBoxIds(System.Collections.Generic.List{System.Int32})">
             <summary>
-            获取-已入库的箱
+            获取-非采购上将已入库的箱
             </summary>
             <param name="boxIds"></param>
             <returns></returns>
@@ -3659,6 +3659,14 @@
             <param name="loginInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.IInStockTaskService.NoRepeal(WMS.Web.Core.Dto.OperateRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            反作废
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.IService.IInventoryDetailsService">
             <summary>
             即时库存-服务接口
@@ -5319,6 +5327,15 @@
             <param name="updateCount"></param>
             <param name="addCount"></param>
         </member>
+        <member name="M:WMS.Web.Domain.Services.InStockTaskService.NoRepeal(WMS.Web.Core.Dto.OperateRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            反作废
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
         <member name="T:WMS.Web.Domain.Services.InventoryDetailsService">
             <summary>
             即时库存-服务
@@ -5414,6 +5431,15 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.OutStockTaskService.NoRepeal(WMS.Web.Core.Dto.OperateRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            反作废 
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
         <member name="M:WMS.Web.Domain.Services.OutStockTaskService.merge(WMS.Web.Core.Dto.OperateRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
             <summary>
             出库任务合并

src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs

@@ -20,6 +20,11 @@ namespace WMS.Web.Core.Dto.TakeStock
         /// </summary>
         [Required(ErrorMessage = "物料不能为空")]
         public string MaterialNumber { get; set; }
+        /// <summary>
+        /// 仓位
+        /// </summary>
+        [Required(ErrorMessage = "仓库不能为空")]
+        public string StockCode { get; set; }
         ///// <summary>
         ///// 仓位ID
         ///// </summary>

src/WMS.Web.Domain/IService/IInStockTaskService.cs

@@ -74,5 +74,12 @@ namespace WMS.Web.Domain.IService
         /// <param name="loginInfo"></param>
         /// <returns></returns>
         Task<Result> Repeal(OperateRequest dto, LoginInDto loginInfo);
+        /// <summary>
+        /// 反作废
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="loginInfo"></param>
+        /// <returns></returns>
+        Task<Result> NoRepeal(OperateRequest dto, LoginInDto loginInfo);
     }
 }

src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs

@@ -49,6 +49,8 @@ namespace WMS.Web.Domain.IService.Public
         Task<Result> BillQueryForSalOutStock(bool isTransaction, List<string> sourceBillNos = null, DateTime? beginTime = null);
         //出库任务作废
         Task<Result> Repeal(OperateRequest dto, LoginInDto loginInfo);
+        //出库任务反作废
+        Task<Result> NoRepeal(OperateRequest dto, LoginInDto loginInfo);
         //出库任务作废
         Task<Result> merge(OperateRequest dto, LoginInDto loginInfo);
         /// <summary>

src/WMS.Web.Domain/Services/InStockTaskService.cs

@@ -665,5 +665,16 @@ namespace WMS.Web.Domain.Services
         {
             _logger.LogInformation($"《{type.GetRemark()}总条数：" + totalCount + "，修改条数：" + updateCount + "，新增条数：" + addCount + "》");
         }
+        /// <summary>
+        /// 反作废
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="loginInfo"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public Task<Result> NoRepeal(OperateRequest dto, LoginInDto loginInfo)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/WMS.Web.Domain/Services/OutStockTaskService.cs

@@ -92,6 +92,17 @@ namespace WMS.Web.Domain.Services
             return Result.ReSuccess();
         }
         /// <summary>
+        /// 反作废 
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="loginInfo"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public Task<Result> NoRepeal(OperateRequest dto, LoginInDto loginInfo)
+        {
+            throw new NotImplementedException();
+        }
+        /// <summary>
         /// 出库任务合并
         /// </summary>
         /// <param name="dto"></param>