diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 3cb05e5c..49a10ff2 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -151,23 +151,6 @@ namespace WMS.Web.Api.Controllers return ResultList.ReSuccess(list); } - /// - /// 来源单-编号模糊查询-非采购上架使用-pad - /// - /// - /// - [HttpGet] - [Route("GetSourceOrderNoPurchase/{sourceBillNo}")] - public async Task> GetSourceOrderNoPurchase([FromRoute] string sourceBillNo) - { - var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); - if (loginInfo == null || loginInfo.UserInfo == null) - return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); - - var list = await _inStockTaskRepositories.GetListInfoBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo }); - return ResultList.ReSuccess(list); - } - /// /// 来源单-编号模糊查询-非采购上架使用-pad /// @@ -186,7 +169,7 @@ namespace WMS.Web.Api.Controllers } /// - /// 来源单的信息校准-采购上架使用-对应金蝶-pad + /// 校准-来源单-采购上架使用-对应金蝶-pad /// /// /// @@ -210,31 +193,7 @@ namespace WMS.Web.Api.Controllers } /// - /// 来源单的信息校准-非采购上架使用-对应金蝶-pad - /// - /// - /// - [HttpGet] - [Route("AdjustNoPurchase/{sourceBillNo}")] - public async Task> AdjustNoPurchase([FromRoute] string sourceBillNo) - { - var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); - if (loginInfo == null || loginInfo.UserInfo == null) - return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); - - //校准 - var result = await _inStockTaskService.Adjust(sourceBillNo); - if (!result.IsSuccess) - return ResultList.ReFailure(result); - - //再一次查询新的数据:并返回最后的结果 - var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo }; - var list = await _inStockTaskRepositories.GetListInfoBy(request); - return ResultList.ReSuccess(list); - } - - /// - /// 来源单的信息校准-非采购上架使用-对应金蝶-pad + /// 校准-来源单-非采购上架使用-对应金蝶-pad /// /// /// diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index af82acd0..b3743ba3 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -182,13 +182,6 @@ 来源单号 - - - 来源单-编号模糊查询-非采购上架使用-pad - - - - 来源单-编号模糊查询-非采购上架使用-pad @@ -198,21 +191,14 @@ - 来源单的信息校准-采购上架使用-对应金蝶-pad - - - - - - - 来源单的信息校准-非采购上架使用-对应金蝶-pad + 校准-来源单-采购上架使用-对应金蝶-pad - 来源单的信息校准-非采购上架使用-对应金蝶-pad + 校准-来源单-非采购上架使用-对应金蝶-pad diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index 15b0492e..dcc5812f 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -1246,6 +1246,21 @@ namespace WMS.Web.Domain.Services var addEntity = _mapper.Map(dto); addEntity.Details = _mapper.Map>(dto.Details); add_entitys.Add(addEntity); + + //3.3.遍历:dto明细;组装即时库存数据 + foreach (var dtoItem in dto.Details) + { + //4.1组装即时库存dto + var inventoryDet = new InventoryDetailsGenerateDto(); + inventoryDet.MaterialId = dtoItem.MaterialId; + inventoryDet.OrgCode = dto.OrgCode; + inventoryDet.StockCode = dto.StockCode; + inventoryDet.SubStockId = dto.SubStockId ?? 0; + inventoryDet.Qty = dtoItem.Qty; + inventoryDet.InventoryInOutType = (int)InventoryInOutType.In; + //4.2即时库存:修改箱库存的集合 + InventoryDetailsGenerateDto.Add(inventoryDet); + } } else {