diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 5d0834e9..def21d15 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -6,7 +6,10 @@ using System.Linq; using System.Threading.Tasks; using WMS.Web.Core; using WMS.Web.Core.Dto; +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; namespace WMS.Web.Api.Controllers @@ -18,8 +21,12 @@ namespace WMS.Web.Api.Controllers [ApiController] public class SysConfigController : ControllerBase { - public SysConfigController() + private readonly ILoginService _loginService; + private readonly IBasicsRepositories _basicsRepositories; + public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories) { + _loginService = loginService; + _basicsRepositories = basicsRepositories; } /// @@ -55,5 +62,38 @@ namespace WMS.Web.Api.Controllers //1 return Task.FromResult(Result.ReSuccess(response)); } + + /// + /// 获取仓库 + /// + /// 仓库模糊匹配 不必填 + /// + [HttpGet] + [Route("GetUcStock")] + public async Task> GetUcStock([FromQuery] string name) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); + var r = await _basicsRepositories.GetUcStockAsync(name, loginInfo.UserInfo.CompanyId); + return ResultList.ReSuccess(r); + } + + /// + /// 根据仓库获取仓位 + /// + /// 仓库id + /// 仓库模糊匹配 不必填 + /// + [HttpGet] + [Route("GetSubUcStock/{id}")] + public async Task>> GetSubUcStock([FromRoute] int id, [FromQuery] string name) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result>.ReFailure(ResultCodes.Token_Invalid_Error); + var r = await _basicsRepositories.GetSubUcStockAsync(id, name); + return Result>.ReSuccess(r); + } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 956e9988..b513b2b9 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -182,6 +182,21 @@ + + + 获取仓库 + + 仓库模糊匹配 不必填 + + + + + 根据仓库获取仓位 + + 仓库id + 仓库模糊匹配 不必填 + + 盘点单 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 8f107fe2..e5b83843 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -92,12 +92,12 @@ - 原箱子ID + 原箱子 - 目标箱子ID + 目标箱子 @@ -1480,6 +1480,16 @@ 每页条数 不传默认每页10 条 + + + 名称请求对象 + + + + + 名称 + + 单点数据-请求统一对象 @@ -1520,6 +1530,71 @@ 是否禁用：true为禁用，false为启用 + + + 仓位 + + + + + 仓库ID + + + + + 员工响应 + + + + + StaffID + + + + + 名称 + + + + + 部门ID + + + + + 电话 + + + + + 是否禁用：true为禁用，false为启用 + + + + + 仓库响应 + + + + + id + + + + + 名称 + + + + + 编码 + + + + + 是否禁用：true为禁用，false为启用 + + 盘点单明细 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index ebe851ea..de00d3e5 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -980,6 +980,31 @@ 备注 + + + 基础数据 + + + + + 获取所有人员-根据主体 + + + + + + + 根据仓库获取子仓库 + + 仓库id + + + + + 获取仓库 + + + wms入库单-仓储接口 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.Core/Dto/SingleData/NameRequest.cs b/src/WMS.Web.Core/Dto/SingleData/NameRequest.cs new file mode 100644 index 00000000..e0f1d7ac --- /dev/null +++ b/src/WMS.Web.Core/Dto/SingleData/NameRequest.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.SingleData +{ + /// + /// 名称请求对象 + /// + public class NameRequest:SingleDataRequest + { + public NameRequest() { } + + public NameRequest(string name,int companyId) + { + this.Name = name; + this.CompanyId = companyId; + } + + /// + /// 名称 + /// + public string Name { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs b/src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs new file mode 100644 index 00000000..1973b991 --- /dev/null +++ b/src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.SingleData +{ + /// + /// 仓位 + /// + public class SubStockRequest:NameRequest + { + + public SubStockRequest() { } + public SubStockRequest(int stockId,string name,int companyId) + { + this.StockId = stockId; + this.Name = name; + this.CompanyId = companyId; + } + + /// + /// 仓库ID + /// + public int StockId { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/SingleData/SysStaffResponse.cs b/src/WMS.Web.Core/Dto/SingleData/SysStaffResponse.cs new file mode 100644 index 00000000..6dc1b790 --- /dev/null +++ b/src/WMS.Web.Core/Dto/SingleData/SysStaffResponse.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.SingleData +{ + /// + /// 员工响应 + /// + 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/SingleData/UcStockResponse.cs b/src/WMS.Web.Core/Dto/SingleData/UcStockResponse.cs new file mode 100644 index 00000000..80258981 --- /dev/null +++ b/src/WMS.Web.Core/Dto/SingleData/UcStockResponse.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace WMS.Web.Core.Dto.SingleData +{ + /// + /// 仓库响应 + /// + public class UcStockResponse + { + /// + /// id + /// + public int Id { get; set; } + /// + /// 名称 + /// + public string Name { get; set; } + /// + /// 编码 + /// + public string Code { get; set; } + /// + /// 是否禁用：true为禁用，false为启用 + /// + public bool Disable { get; set; } + + + } +} diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs index 1df14a5a..497f2c8e 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStock.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -28,7 +28,7 @@ namespace WMS.Web.Domain.Entitys /// 盘点日期 /// [Column("Date")] - public DateTime Date { get; set; } + public DateTime Date { get; set; } = DateTime.Now; /// /// 盘点人员 /// diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs new file mode 100644 index 00000000..d059a4d0 --- /dev/null +++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.SingleData; + +namespace WMS.Web.Domain.Infrastructure +{ + /// + /// 基础数据 + /// + public interface IBasicsRepositories + { + /// + /// 获取所有人员-根据主体 + /// + /// + /// + Task> GetStaffListAsync(int CompanyId); + /// + /// 根据仓库获取子仓库 + /// + /// 仓库id + /// + Task> GetSubUcStockAsync(int id, string name); + /// + /// 获取仓库 + /// + /// + Task> GetUcStockAsync(string name, int companyId); + } +} diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs new file mode 100644 index 00000000..c73b0b20 --- /dev/null +++ b/src/WMS.Web.Repositories/BasicsRepositories.cs @@ -0,0 +1,73 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +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(); + } + + public async Task> GetSubUcStockAsync(int id, string name) + { + var result = await _singleDataService.GetSysConfigData, SubStockRequest> + (new SubStockRequest(id, name, _loginService.CompanyId), + SysConfigAction.GetWareouseByCustomerAndCompany); + if (!result.Success) + return null; + return result.Data.ToList(); + } + + public async Task> GetUcStockAsync(string name, int companyId) + { + var result = await _singleDataService.GetSysConfigData, NameRequest> + (new NameRequest(name, companyId), + SysConfigAction.GetWarehouseByNameAndCompany); + 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(); diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index b4ac8967..f8b2d37a 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -12,28 +12,30 @@ 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; using WMS.Web.Domain.Values.Single; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories { - public class MoveBoxRecordRepositories: IMoveBoxRecordRepositories + public class MoveBoxRecordRepositories : IMoveBoxRecordRepositories { private readonly IMapper _mapper; private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; private readonly ILoginRepositories _loginRepositories; - + private readonly IBasicsRepositories _basicsRepositories; public MoveBoxRecordRepositories(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,12 +78,25 @@ namespace WMS.Web.Repositories /// public async Task<(List list, int total)> GetListAsync(MoveBoxRecordQueryRequest 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.MoveBoxRecord .GroupJoin(_context.Box, moveBox => moveBox.BoxId, box => box.Id, (moveBox, box) => new { moveBox, box }) .SelectMany(x => x.box.DefaultIfEmpty(), (d, box) => new { d.moveBox, box }) .OrderByDescending(o => o.moveBox.Id) .Where(adv => 1 == 1); + if (ids.Count() > 0) + query = query.Where(w => ids.Contains(w.moveBox.CreatorId)); + if (!string.IsNullOrEmpty(dto.Box)) + query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.Box + "%")); + if (dto.Type != null) + query = query.Where(w => w.moveBox.Type == (MoveBoxType)dto.Type); if (dto.CreateBeginDate != null) query = query.Where(w => w.moveBox.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 884c6bef..fccd7462 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -13,28 +13,30 @@ 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 { - public class OutStockRepositories: IOutStockRepositories + public class OutStockRepositories : IOutStockRepositories { private readonly IMapper _mapper; private readonly IServiceProvider _serviceProvider; private readonly RepositoryDbContext _context; private readonly ISingleDataService _singleDataService; private readonly ILoginRepositories _loginRepositories; - + private readonly IBasicsRepositories _basicsRepositories; public OutStockRepositories(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; } /// /// 新增 @@ -77,12 +79,33 @@ namespace WMS.Web.Repositories /// public async Task<(List list, int total)> GetListAsync(OutStockQueryRequest 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.OutStockDetails .GroupJoin(_context.OutStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .OrderByDescending(o => o.order.Id) .Where(adv => 1 == 1); + //if (!string.IsNullOrEmpty(dto.ReceiptCustomer)) + //if (!string.IsNullOrEmpty(dto.MaterialNumber)) + if (ids.Count() > 0) + query = query.Where(w => ids.Contains(w.order.CreatorId)); + if (!string.IsNullOrEmpty(dto.SourceBillNo)) + query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%")); + if (dto.Type != null) + query = query.Where(w => w.order.Type == (OrderType)dto.Type); + if (dto.SuccessSync != null) + query = query.Where(w => w.order.SuccessSync == dto.SuccessSync); + if (dto.DeliveryOrgId != null) + query = query.Where(w => w.detail.DeliveryOrgId == dto.DeliveryOrgId); + if (dto.StockId != null) + query = query.Where(w => w.detail.StockId == dto.StockId); if (dto.CreateBeginDate != null) query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -93,21 +116,21 @@ namespace WMS.Web.Repositories { #region dto组装 Id = s.order.Id, - BillNo=s.order.BillNo, + BillNo = s.order.BillNo, 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(), + CreateTime = s.order.CreateTime.DateToStringSeconds(), SuccessSync = s.order.SuccessSync, Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), - SourceBillNo=s.detail.SourceBillNo, + SourceBillNo = s.detail.SourceBillNo, SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = "", ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.detail.ReceiptCustomerId), MaterialName = "", MaterialNumber = "", Specifications = "", - Qty=s.detail.Qty + Qty = s.detail.Qty #endregion }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); @@ -127,7 +150,7 @@ namespace WMS.Web.Repositories try { List list = entitys.Select(s => s.Id).ToList(); - + var res = await _context.OutStock .Include(s => s.Details) .Where(f => list.Contains(f.Id)).ToListAsync(); diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 50b1db01..34826398 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -13,6 +13,7 @@ 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; @@ -167,6 +168,20 @@ namespace WMS.Web.Repositories .OrderByDescending(o => o.order.Id) .Where(adv => 1 == 1); + //if (!string.IsNullOrEmpty(dto.ReceiptCustomer)) + //if (!string.IsNullOrEmpty(dto.MaterialNumber)) + if (dto.Ids.Count() > 0) + query = query.Where(w => dto.Ids.Contains(w.detail.Id)); + if (!string.IsNullOrEmpty(dto.SourceBillNo)) + query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%")); + if (dto.Type != null) + query = query.Where(w => w.order.Type == (OrderType)dto.Type); + if (dto.Status != null) + query = query.Where(w => w.order.Status == (OutStockStatus)dto.Status); + if (dto.DeliveryOrgId != null) + query = query.Where(w => w.detail.DeliveryOrgId == dto.DeliveryOrgId); + if (dto.StockId != null) + query = query.Where(w => w.detail.StockId == dto.StockId); if (dto.CreateBeginDate != null) query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 370185ea..1b4cf13b 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.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; using WMS.Web.Domain.Values.Single; using WMS.Web.Repositories.Configuration; @@ -82,6 +83,12 @@ namespace WMS.Web.Repositories .OrderByDescending(o => o.order.Id) .Where(adv => 1 == 1); + if (dto.ResultType != null) + query = query.Where(w => w.detail.ResultType == (TakeStockType)dto.ResultType); + if (!string.IsNullOrEmpty(dto.BillNo)) + query = query.Where(w => EF.Functions.Like(w.order.BillNo, "%" + dto.BillNo + "%")); + if (dto.StockId != null) + query = query.Where(w => w.detail.StockId == dto.StockId); if (dto.DateBeginDate != null) query = query.Where(w => w.order.Date >= dto.DateBeginDate); if (dto.DateEndDate != null)