From f695d3fa0cf49f1d6f38e7c2f4d208745e03e48d Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Fri, 3 Nov 2023 11:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/InStockTask/InStockTaskResponse.cs | 5 +++++ src/WMS.Web.Repositories/InStockTaskRepositories.cs | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs index 40057c04..c29fd377 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs @@ -28,6 +28,11 @@ namespace WMS.Web.Core.Dto.InStockTask /// public string StockCode { get; set; } + /// + /// 仓库名称 + /// + public string StockName { get; set; } + /// /// 物料ID /// diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 63bd4776..7cbae2e0 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -12,8 +12,10 @@ using WMS.Web.Core.Dto.InStockTask; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; +using WMS.Web.Domain.IService.Public; using WMS.Web.Domain.Mappers; using WMS.Web.Domain.Values; +using WMS.Web.Domain.Values.Single; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories @@ -26,13 +28,21 @@ namespace WMS.Web.Repositories private readonly IMapper _mapper; private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; + private readonly ISingleDataService _singleDataService; + private readonly ILoginRepositories _loginRepositories; - public InStockTaskRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider) + public InStockTaskRepositories(RepositoryDbContext context, + IMapper mapper, + IServiceProvider serviceProvider, + ISingleDataService singleDataService, + ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; + _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// @@ -168,6 +178,7 @@ namespace WMS.Web.Repositories SourceBillNo=s.order.SourceBillNo, MaterialId=s.detail.MaterialId, StockCode=s.detail.StockCode, + StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), MaterialName = "", MaterialNumber = "", Specifications = "",