diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 39a67bf0..c4e3b83b 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -3151,6 +3151,16 @@ 单据编号 + + + 仓库编码 + + + + + 仓库名 + + 详情 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs index ad9e095e..2e1f765d 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs @@ -18,6 +18,14 @@ namespace WMS.Web.Core.Dto.OutStockTask /// public string BillNo { get; set; } /// + /// 仓库编码 + /// + public string StockCode { get; set; } + /// + /// 仓库名 + /// + public string StockName { 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 375031f7..602f7c93 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -328,6 +328,12 @@ namespace WMS.Web.Repositories .OrderByDescending(o => o.Id) .ToListAsync(); var response = _mapper.Map>(list); + foreach (var r in response) + { + var entity = list.FirstOrDefault(f => f.Id == r.Id); + r.StockCode = entity.Details.First().StockCode; + r.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, r.StockCode); + } //获取物料信息 显示物料三件套 foreach (var r in response.SelectMany(s => s.details)) { @@ -357,6 +363,8 @@ namespace WMS.Web.Repositories if (entity == null) return new GetOutStockTaskByNoResponse(); var response = _mapper.Map(entity); + response.StockCode = entity.Details.First().StockCode; + response.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode); //获取物料信息 显示物料三件套 foreach (var r in response.details) {