diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 09ace893..c34e4523 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -142,7 +142,8 @@ namespace WMS.Web.Api.Controllers //获取物料对应的仓位 var materialNumbers = res.SelectMany(s => s.details).GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList(); var stockCodes = res.Select(s => s.StockCode).ToList(); - var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId); + var orgCodes = res.Select(s => s.OrgCode).ToList(); + var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); foreach (var r in res) { @@ -201,7 +202,8 @@ namespace WMS.Web.Api.Controllers //获取物料对应的仓位 var materialNumbers = res.details.GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList(); var stockCodes = new List() { res.StockCode }; - var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId); + var orgCodes = new List() { res.OrgCode }; + var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); res.details.ForEach(x => { x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs index f6ecc1b2..f3bfced4 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs @@ -26,6 +26,10 @@ namespace WMS.Web.Core.Dto.OutStockTask /// public string StockName { get; set; } /// + /// 组织编码 + /// + public string OrgCode { get; set; } + /// /// 详情 /// public List details { get; set; } = new List(); diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 5a3a9fa9..3fab6d47 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -388,6 +388,7 @@ namespace WMS.Web.Repositories foreach (var r in response) { var entity = list.FirstOrDefault(f => f.Id == r.Id); + r.OrgCode = entity.OrgCode; r.StockCode = entity.StockCode; r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode); } @@ -420,6 +421,7 @@ namespace WMS.Web.Repositories if (entity == null) return new GetOutStockTaskByNoResponse(); var response = _mapper.Map(entity); + response.OrgCode = entity.OrgCode; response.StockCode = entity.StockCode; response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode); //获取物料信息 显示物料三件套