diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index d748b2e4..3c5cf51b 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -184,7 +184,7 @@ namespace WMS.Web.Api.Controllers var materialSubStocks= await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); list.ForEach(x => { - x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); + x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.OrgCode==x.OrgCode).Select(x=>x.SubStock).ToList(); }); return ResultList.ReSuccess(list); @@ -238,7 +238,7 @@ namespace WMS.Web.Api.Controllers var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); list.SelectMany(x=>x.Details).ToList().ForEach(x => { - x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); + x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList(); }); return ResultList.ReSuccess(list); diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs index c1abb3e2..5108a9c6 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs @@ -143,6 +143,6 @@ namespace WMS.Web.Core.Dto.InStockTask /// /// 物料对应的仓位有哪些 /// - public List MaterialSubStocks { get; set; } = new List(); + public List MaterialSubStocks { get; set; } = new List(); } } diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs index 7fe44e44..a3ce2b9e 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs @@ -94,7 +94,7 @@ namespace WMS.Web.Core.Dto.InStockTask /// /// 物料对应的仓位有哪些 /// - public List MaterialSubStocks { get; set; } = new List(); + public List MaterialSubStocks { get; set; } = new List(); }