18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓储查询条件添加

Browse Source
This commit is contained in:
18942506660
2023-10-30 14:36:50 +08:00
parent a33924648d
commit 74d62aaea7
7 changed files with 116 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -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;
}
/// <summary>
/// 新增
@@ -77,12 +79,33 @@ namespace WMS.Web.Repositories
/// <returns></returns>
public async Task<(List<OutStockQueryInfoResponse> list, int total)> GetListAsync(OutStockQueryRequest dto)
{
List<int> ids = new List<int>();
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<int> list = entitys.Select(s => s.Id).ToList();
var res = await _context.OutStock
.Include(s => s.Details)
.Where(f => list.Contains(f.Id)).ToListAsync();