箱库存的优化
This commit is contained in:
tongfei
@@ -51,99 +51,7 @@ namespace WMS.Web.Repositories
|
||||
_singleDataService = singleDataService;
|
||||
_erpBasicDataExtendService = erpBasicDataExtendService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 列表-分页
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto)
|
||||
{
|
||||
//1.获取物料集合和组织集合和供应商的集合
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (!materials_result.IsSuccess)
|
||||
return (new List<InStockQueryResponse>(), 0);
|
||||
var materials = materials_result.Data.ToList();
|
||||
|
||||
//组织集合
|
||||
var orgs_result = await _erpService.BillQueryForOrg();
|
||||
if (!orgs_result.IsSuccess)
|
||||
return (new List<InStockQueryResponse>(), 0);
|
||||
var orgs = orgs_result.Data.ToList();
|
||||
|
||||
//供应商集合
|
||||
var suppliers_result = await _erpService.BillQueryForSupplier();
|
||||
if (!suppliers_result.IsSuccess)
|
||||
return (new List<InStockQueryResponse>(), 0);
|
||||
var suppliers = suppliers_result.Data.ToList();
|
||||
|
||||
//物料集合；模糊查询后的物料集合
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||
|
||||
//var query=_context.InStockDetails
|
||||
// .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
||||
// .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
||||
// .Where(adv => 1 == 1);
|
||||
var query = _context.InStockTotalDetails
|
||||
.GroupJoin(_context.Instock, detail => detail.InStockId, order => order.Id, (detail, orders) => new { detail, orders })
|
||||
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
||||
.Where(adv => 1 == 1);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.SourceBillNo))
|
||||
query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%"));
|
||||
|
||||
//物料ID在模糊后的物料
|
||||
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
{
|
||||
var mids = materials.Select(x => x.MaterialId).ToList();
|
||||
query = query.Where(w => mids.Contains(w.detail.MaterialId));
|
||||
}
|
||||
|
||||
if (dto.SupplierId.HasValue)
|
||||
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
|
||||
|
||||
if (dto.OrgId.HasValue)
|
||||
query = query.Where(w => w.order.OrgId == dto.OrgId.Value);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||
{
|
||||
var splitStrs = dto.StockCode.Split("_$");
|
||||
query = query.Where(w => w.order.StockCode == splitStrs[0] && w.order.OrgCode == splitStrs[1]);
|
||||
}
|
||||
|
||||
if (dto.Type.HasValue)
|
||||
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
|
||||
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
|
||||
|
||||
var tt= _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, "CK003" + "101");
|
||||
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new InStockQueryResponse()
|
||||
{
|
||||
Id=s.order.Id,
|
||||
DetailsId=s.detail.Id,
|
||||
BillNo=s.order.BillNo,
|
||||
Type=s.order.Type.GetRemark(),
|
||||
SourceBillNo=s.detail.SourceBillNo,
|
||||
Supplier= _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
|
||||
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgId),
|
||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
|
||||
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
|
||||
Qty =s.detail.Qty,
|
||||
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
|
||||
CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
return (list, total);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 箱是否存在于入库单明细中；（箱是否被上架了）
|
||||
@@ -300,5 +208,92 @@ namespace WMS.Web.Repositories
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 列表-分页
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto)
|
||||
{
|
||||
//1.获取物料集合和组织集合和供应商的集合
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (!materials_result.IsSuccess)
|
||||
return (new List<InStockQueryResponse>(), 0);
|
||||
var materials = materials_result.Data.ToList();
|
||||
|
||||
//组织集合
|
||||
var orgs_result = await _erpService.BillQueryForOrg();
|
||||
if (!orgs_result.IsSuccess)
|
||||
return (new List<InStockQueryResponse>(), 0);
|
||||
var orgs = orgs_result.Data.ToList();
|
||||
|
||||
//供应商集合
|
||||
var suppliers_result = await _erpService.BillQueryForSupplier();
|
||||
if (!suppliers_result.IsSuccess)
|
||||
return (new List<InStockQueryResponse>(), 0);
|
||||
var suppliers = suppliers_result.Data.ToList();
|
||||
|
||||
//物料集合；模糊查询后的物料集合
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||
|
||||
var query = _context.InStockTotalDetails
|
||||
.GroupJoin(_context.Instock, detail => detail.InStockId, order => order.Id, (detail, orders) => new { detail, orders })
|
||||
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
||||
.Where(adv => 1 == 1);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.SourceBillNo))
|
||||
query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%"));
|
||||
|
||||
//物料ID在模糊后的物料
|
||||
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
{
|
||||
var mids = materials.Select(x => x.MaterialId).ToList();
|
||||
query = query.Where(w => mids.Contains(w.detail.MaterialId));
|
||||
}
|
||||
|
||||
if (dto.SupplierId.HasValue)
|
||||
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
|
||||
|
||||
if (dto.OrgId.HasValue)
|
||||
query = query.Where(w => w.order.OrgId == dto.OrgId.Value);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||
{
|
||||
var splitStrs = dto.StockCode.Split("_$");
|
||||
query = query.Where(w => w.order.StockCode == splitStrs[0] && w.order.OrgCode == splitStrs[1]);
|
||||
}
|
||||
|
||||
if (dto.Type.HasValue)
|
||||
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
|
||||
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
|
||||
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new InStockQueryResponse()
|
||||
{
|
||||
Id = s.order.Id,
|
||||
DetailsId = s.detail.Id,
|
||||
BillNo = s.order.BillNo,
|
||||
Type = s.order.Type.GetRemark(),
|
||||
SourceBillNo = s.detail.SourceBillNo,
|
||||
Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
|
||||
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgId),
|
||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
|
||||
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
|
||||
Qty = s.detail.Qty,
|
||||
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
|
||||
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
return (list, total);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user