diff --git a/src/WMS.Web.Core/Dto/Basics/SysStaffResponse.cs b/src/WMS.Web.Core/Dto/Basics/SysStaffResponse.cs new file mode 100644 index 00000000..4deab981 --- /dev/null +++ b/src/WMS.Web.Core/Dto/Basics/SysStaffResponse.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.Basics +{ + /// + /// 员工响应 + /// + public class SysStaffResponse + { + /// + /// StaffID + /// + public int Id { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 部门ID + /// + public int DeptId { get; set; } + + /// + /// 电话 + /// + public string Telephone { get; set; } + + /// + /// 是否禁用：true为禁用，false为启用 + /// + public bool Disable { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs index 7d757271..375af44f 100644 --- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs @@ -10,11 +10,11 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord public class ChangeBoxRecordQueryRequest: PaginationBaseRequestDto { /// - /// 原箱子ID + /// 原箱子 /// public string SrcBox { get; set; } /// - /// 目标箱子ID + /// 目标箱子 /// public string DestBox { get; set; } /// diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs new file mode 100644 index 00000000..8f515ad0 --- /dev/null +++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.Basics; + +namespace WMS.Web.Domain.Infrastructure +{ + /// + /// 基础数据 + /// + public interface IBasicsRepositories + { + /// + /// 获取所有人员-根据主体 + /// + /// + /// + Task> GetStaffListAsync(int CompanyId); + } +} diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs new file mode 100644 index 00000000..a0a80e18 --- /dev/null +++ b/src/WMS.Web.Repositories/BasicsRepositories.cs @@ -0,0 +1,54 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.Basics; +using WMS.Web.Core.Dto.SingleData; +using WMS.Web.Core.Internal.Results; +using WMS.Web.Domain.Infrastructure; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values; +using WMS.Web.Domain.Values.Single; +using WMS.Web.Repositories.Configuration; + +namespace WMS.Web.Repositories +{ + /// + /// 基础数据 + /// + public class BasicsRepositories : IBasicsRepositories + { + private readonly IMapper _mapper; + private readonly IServiceProvider _serviceProvider; + private RepositoryDbContext _context; + private readonly ILoginRepositories _loginService; + private readonly ISingleDataService _singleDataService; + + + public BasicsRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, + ILoginRepositories loginService, ISingleDataService singleDataService) + { + _context = context; + _mapper = mapper; + _serviceProvider = serviceProvider; + _loginService = loginService; + _singleDataService = singleDataService; + } + /// + /// 获取所有人员 + /// + /// + /// + public async Task> GetStaffListAsync(int CompanyId) + { + var result = await _singleDataService.GetSysConfigData, SingleDataRequest> + (new SingleDataRequest(CompanyId), + SysConfigAction.GetStaffByCompany); + if (!result.Success) + return null; + return result.Data.ToList(); + } + } +} diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 79d1f41c..5637de04 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -24,16 +24,17 @@ namespace WMS.Web.Repositories private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; private readonly ILoginRepositories _loginRepositories; - + private readonly IBasicsRepositories _basicsRepositories; public ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, - ISingleDataService singleDataService, ILoginRepositories loginRepositories) + ISingleDataService singleDataService, ILoginRepositories loginRepositories, IBasicsRepositories basicsRepositories) { _context = context; _mapper = mapper; _serviceProvider = serviceProvider; _singleDataService = singleDataService; _loginRepositories = loginRepositories; + _basicsRepositories = basicsRepositories; } /// /// 新增 @@ -76,14 +77,33 @@ namespace WMS.Web.Repositories /// public async Task<(List list, int total)> GetListAsync(ChangeBoxRecordQueryRequest dto) { + List ids = new List(); + if (!string.IsNullOrEmpty(dto.Creator)) + { + var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId); + ids = staffList.Where(w => EF.Functions.Like(w.Name, "%" + dto.Creator + "%")).Select(s => s.Id).ToList(); + } + var query = _context.ChangeBoxRecord .GroupJoin(_context.Box, changeBox => changeBox.SrcBoxId, srcBox => srcBox.Id, (changeBox, srcBox) => new { changeBox, srcBox }) .SelectMany(x => x.srcBox.DefaultIfEmpty(), (d, srcBox) => new { d.changeBox, srcBox }) .GroupJoin(_context.Box, d => d.changeBox.DestBoxId, destBox => destBox.Id, (d, destBox) => new { d.changeBox, d.srcBox, destBox }) - .SelectMany(x => x.destBox.DefaultIfEmpty(), (d, destBox) => new { d.changeBox,d.srcBox, destBox }) + .SelectMany(x => x.destBox.DefaultIfEmpty(), (d, destBox) => new { d.changeBox, d.srcBox, destBox }) .OrderByDescending(o => o.changeBox.Id) .Where(adv => 1 == 1); + if (ids.Count() > 0) + query = query.Where(w => ids.Contains(w.changeBox.CreatorId)); + if (!string.IsNullOrEmpty(dto.SrcBox)) + query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); + if (!string.IsNullOrEmpty(dto.DestBox)) + query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); + if (dto.StockId != null) + query = query.Where(w => w.changeBox.StockId == dto.StockId); + if (dto.SrcSubStockId != null) + query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId); + if (dto.DestSubStockId != null) + query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId); if (dto.CreateBeginDate != null) query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -103,7 +123,7 @@ namespace WMS.Web.Repositories SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.SrcSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.DestSubStockId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.changeBox.CreatorId), - CreateTime =s.changeBox.CreateTime.DateToStringSeconds() + CreateTime = s.changeBox.CreateTime.DateToStringSeconds() #endregion }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs index ee6e1fbf..4c75ff7d 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs @@ -32,7 +32,8 @@ namespace Microsoft.Extensions.DependencyInjection { services.AddHttpContextAccessor(); services.AddScoped(); - + services.AddScoped(); + services.AddTransient(); services.AddTransient();