diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 3c5cf51b..7ad77111 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 && t.OrgCode==x.OrgCode).Select(x=>x.SubStock).ToList(); + x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == x.StockCode && 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 && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList(); + x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode==x.StockCode && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList(); }); return ResultList.ReSuccess(list); diff --git a/src/WMS.Web.Core/Dto/MaterialSubStock.cs b/src/WMS.Web.Core/Dto/MaterialSubStock.cs index d34d050e..36c61b08 100644 --- a/src/WMS.Web.Core/Dto/MaterialSubStock.cs +++ b/src/WMS.Web.Core/Dto/MaterialSubStock.cs @@ -28,5 +28,10 @@ namespace WMS.Web.Core.Dto /// 组织 /// public string OrgCode { get; set; } + + /// + /// 仓库 + /// + public string StockCode { get; set; } } } diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs index 11171ae4..598bcef8 100644 --- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs @@ -242,6 +242,7 @@ namespace WMS.Web.Repositories MaterialNumber=x.MaterialNumber, SubStockCode=x.SubStockCode, OrgCode=x.OrgCode, + StockCode=x.StockCode, SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, x.SubStockCode + x.StockCode + x.OrgCode), }).ToListAsync(); }