diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 13fd813d..4dcc26dc 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -229,6 +229,16 @@ namespace WMS.Web.Api.Controllers return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); var list = await _inStockTaskRepositories.GetListInfoBy(dto); + + //获取物料对应的仓位 + var materialNumbers = list.SelectMany(x=>x.Details).GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList(); + var stockCodes = list.SelectMany(x => x.Details).GroupBy(x => x.StockCode).Select(x => x.Key).ToList(); + var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId); + list.SelectMany(x=>x.Details).ToList().ForEach(x => + { + x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); + }); + return ResultList.ReSuccess(list); } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 13be7259..803c34ca 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2072,6 +2072,11 @@ 明细备注 + + + 物料对应的仓位有哪些 + + 来源单号模糊查询响应对象 diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs index e7c2d2aa..c1abb3e2 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs @@ -139,5 +139,10 @@ namespace WMS.Web.Core.Dto.InStockTask /// 明细备注 /// public string Remark { get; set; } + + /// + /// 物料对应的仓位有哪些 + /// + public List MaterialSubStocks { get; set; } = new List(); } }