diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 20883aa2..e77cba8f 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs index 724b56b7..01815845 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs @@ -14,6 +14,10 @@ namespace WMS.Web.Core.Dto.OutStockTask /// public int Id { get; set; } /// + /// 明细Id + /// + public int DetailId { get; set; } + /// /// 单据编号 /// public string BillNo { get; set; } diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs index d01954f5..2d1063d2 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs @@ -9,6 +9,10 @@ namespace WMS.Web.Core.Dto.OutStockTask /// public class OutStockTaskQueryRequest : PaginationBaseRequestDto { + /// + /// 刷新 明细Id + /// + public List Ids { get; set; } = new List(); /// /// 单据类型(出库单下拉列表) /// diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index c40635d7..f2e6a1d7 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -11,6 +11,8 @@ using WMS.Web.Core.Dto.ChangeBoxRecord; 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 @@ -20,13 +22,18 @@ 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 ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider) + public ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; + _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -85,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 d19f04eb..69f2c5c9 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -6,10 +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 @@ -19,13 +22,18 @@ 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 MoveBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider) + public MoveBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; + _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -85,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 8331bb8e..36e9eb60 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -6,11 +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 @@ -20,13 +23,18 @@ 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 OutStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider) + public OutStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; + _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -84,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 bb5b46a9..9cb5086a 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -6,11 +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 @@ -20,13 +23,18 @@ 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 OutStockTaskRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider) + public OutStockTaskRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; + _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -168,14 +176,15 @@ namespace WMS.Web.Repositories var list = await query.Select(s => new OutStockTaskQueryInfoResponse() { #region dto组装 - Id = 0, - BillNo=s.order.BillNo, - Status = "", - Type = "", + Id = s.order.Id, + DetailId=s.detail.Id, + BillNo =s.order.BillNo, + 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 4a709cb9..6f90de23 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -6,26 +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) + public TakeStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, + ISingleDataService singleDataService, ILoginRepositories loginRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; + _singleDataService = singleDataService; + _loginRepositories = loginRepositories; } /// /// 新增 @@ -83,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();