From 1b50d73935f020259c854f0931da3c8cfb82e4cf Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 30 Oct 2023 09:58:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=A1=AB?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChangeBoxRecordRepositories.cs | 9 ++++-- .../MoveBoxRecordRepositories.cs | 12 +++++--- .../OutStockRepositories.cs | 22 ++++++++------ .../OutStockTaskRepositories.cs | 20 ++++++++----- .../TakeStockRepositories.cs | 30 +++++++++++-------- 5 files changed, 56 insertions(+), 37 deletions(-) diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 222a8ca8..f2e6a1d7 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -12,6 +12,7 @@ using WMS.Web.Core.Help; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values.Single; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories @@ -22,15 +23,17 @@ namespace WMS.Web.Repositories private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; + private readonly ILoginRepositories _loginRepositories; public ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, - ISingleDataService singleDataService) + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -89,13 +92,13 @@ namespace WMS.Web.Repositories MaterialName = "", MaterialNumber = "", Specifications = "", - Stock = "", + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockId), SerialNumber = "", SrcBox = "", DestBox = "", SrcSubStock = "", DestSubStock = "", - Creator = "", + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId), CreateTime =s.CreateTime.DateToStringSeconds() #endregion diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index d3e673a5..69f2c5c9 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -6,11 +6,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using WMS.Web.Core; using WMS.Web.Core.Dto.MoveBoxRecord; using WMS.Web.Core.Help; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values.Single; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories @@ -21,15 +23,17 @@ namespace WMS.Web.Repositories private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; + private readonly ILoginRepositories _loginRepositories; public MoveBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, - ISingleDataService singleDataService) + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -89,9 +93,9 @@ namespace WMS.Web.Repositories SrcSubStock = "", Specifications = "", DestSubStock = "", - Qty = 0, - Type = "", - Creator = "", + Qty = s.Qty, + Type = s.Type.GetRemark(), + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId), CreateTime = s.CreateTime.DateToStringSeconds() #endregion diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 4bbe2ea4..36e9eb60 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -6,12 +6,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using WMS.Web.Core; using WMS.Web.Core.Dto.OutStock; using WMS.Web.Core.Help; 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.Single; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories @@ -22,15 +24,17 @@ namespace WMS.Web.Repositories private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; + private readonly ILoginRepositories _loginRepositories; public OutStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, - ISingleDataService singleDataService) + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -88,22 +92,22 @@ namespace WMS.Web.Repositories var list = await query.Select(s => new OutStockQueryInfoResponse() { #region dto组装 - Id = 0, + Id = s.order.Id, BillNo=s.order.BillNo, - Status = "", - Type = "", - Creator = "", + Status = s.order.Status.GetRemark(), + Type = s.order.Type.GetRemark(), + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), CreateTime=s.order.CreateTime.DateToStringSeconds(), SuccessSync = s.order.SuccessSync, - Stock = "", - SourceBillNo="", - SaleBillNo = "", + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), + SourceBillNo=s.detail.SourceBillNo, + SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = "", ReceiptCustomer = "", MaterialName = "", MaterialNumber = "", Specifications = "", - Qty=0 + Qty=s.detail.Qty #endregion }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 5965ce24..9cb5086a 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -6,12 +6,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using WMS.Web.Core; using WMS.Web.Core.Dto.OutStockTask; using WMS.Web.Core.Help; 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.Single; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories @@ -22,15 +24,17 @@ namespace WMS.Web.Repositories private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; + private readonly ILoginRepositories _loginRepositories; public OutStockTaskRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, - ISingleDataService singleDataService) + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -172,15 +176,15 @@ namespace WMS.Web.Repositories var list = await query.Select(s => new OutStockTaskQueryInfoResponse() { #region dto组装 - Id = 0, - DetailId=0, + Id = s.order.Id, + DetailId=s.detail.Id, BillNo =s.order.BillNo, - Status = "", - Type = "", + Status = s.order.Status.GetRemark(), + Type = s.order.Type.GetRemark(), CreateTime = s.order.OperateTime.DateToStringSeconds(), - Stock = "", - SourceBillNo = "", - SaleBillNo = "", + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), + SourceBillNo = s.detail.SourceBillNo, + SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = "", ReceiptCustomer = "", MaterialName = "", diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index f759839e..6f90de23 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -6,30 +6,34 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using WMS.Web.Core; using WMS.Web.Core.Dto.TakeStock; using WMS.Web.Core.Help; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values.Single; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories { - public class TakeStockRepositories: ITakeStockRepositories + public class TakeStockRepositories : ITakeStockRepositories { private readonly IMapper _mapper; private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; + private readonly ILoginRepositories _loginRepositories; public TakeStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, - ISingleDataService singleDataService) + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -87,19 +91,19 @@ namespace WMS.Web.Repositories var list = await query.Select(s => new TakeStockQueryInfoResponse() { #region dto组装 - Id = 0, - BillNo = "", - Unit = "", - Stock = "", + Id = s.order.Id, + BillNo = s.order.BillNo, + Unit = _singleDataService.GetSingleData(SingleAction.Units, _loginRepositories.CompanyId, s.detail.UnitId), + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), SubStock = "", - BeforeQty = 0, - AfterQty = 0, - FinalQty = 0, - ResultType="", - Remark="", - Creator = "", + BeforeQty = s.detail.BeforeQty, + AfterQty = s.detail.AfterQty, + FinalQty = s.detail.FinalQty, + ResultType = s.detail.ResultType.GetRemark(), + Remark = s.detail.Remark, + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), Date = s.order.Date.DateToStringSeconds(), - SuccessSync=s.order.SuccessSync + SuccessSync = s.order.SuccessSync #endregion }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();