箱库存的优化
This commit is contained in:
tongfei
@@ -54,118 +54,7 @@ namespace WMS.Web.Repositories
|
||||
_singleDataService = singleDataService;
|
||||
_loginRepositories = loginRepositories;
|
||||
_erpBasicDataExtendService = erpBasicDataExtendService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 列表-分页
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto)
|
||||
{
|
||||
//1.获取物料集合和组织集合
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (!materials_result.IsSuccess)
|
||||
return (new List<InStockTaskQueryResponse>(), 0);
|
||||
var materials = materials_result.Data.ToList();
|
||||
//组织集合
|
||||
var orgs_result = await _erpService.BillQueryForOrg();
|
||||
if (!orgs_result.IsSuccess)
|
||||
return (new List<InStockTaskQueryResponse>(), 0);
|
||||
var orgs = orgs_result.Data.ToList();
|
||||
|
||||
//供应商集合
|
||||
var suppliers_result = await _erpService.BillQueryForSupplier();
|
||||
if (!suppliers_result.IsSuccess)
|
||||
return (new List<InStockTaskQueryResponse>(), 0);
|
||||
var suppliers = suppliers_result.Data.ToList();
|
||||
|
||||
List<int> ids_Receiver = new List<int>();
|
||||
List<int> ids_Operator = new List<int>();
|
||||
if (!string.IsNullOrEmpty(dto.Receiver) || !string.IsNullOrEmpty(dto.Operator))
|
||||
{
|
||||
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
|
||||
ids_Receiver = staffList.Where(w => w.Name.Contains(dto.Receiver)).Select(s => s.Id).ToList();
|
||||
ids_Operator = staffList.Where(w => w.Name.Contains(dto.Operator)).Select(s => s.Id).ToList();
|
||||
}
|
||||
|
||||
//物料集合；模糊查询后的物料集合
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||
|
||||
var query = _context.InStockTaskDetails
|
||||
.GroupJoin(_context.InStockTask, 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);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.SourceBillNo))
|
||||
query = query.Where(w => EF.Functions.Like(w.order.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 (ids_Receiver.Count() > 0)
|
||||
query = query.Where(w => ids_Receiver.Contains(w.order.ReceiverId??0));
|
||||
if (ids_Operator.Count() > 0)
|
||||
query = query.Where(w => ids_Operator.Contains(w.order.ShelferId??0));
|
||||
|
||||
if (dto.SupplierId.HasValue)
|
||||
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
|
||||
|
||||
if (dto.OrgId.HasValue)
|
||||
query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||
{
|
||||
var splitStrs = dto.StockCode.Split("_$");
|
||||
query = query.Where(w => w.detail.StockCode == splitStrs[0] && w.detail.OrgCode == splitStrs[1]);
|
||||
}
|
||||
|
||||
if (dto.Type.HasValue)
|
||||
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
|
||||
|
||||
if (dto.Status.HasValue)
|
||||
query = query.Where(w => (int)w.order.Status == dto.Status.Value);
|
||||
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date >= dto.CreateBeginDate.Value);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w =>w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date <= dto.CreateEndDate.Value);
|
||||
|
||||
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new InStockTaskQueryResponse()
|
||||
{
|
||||
Id = s.order.Id,
|
||||
DetailsId = s.detail.Id,
|
||||
BillNo = s.order.BillNo,
|
||||
Type = s.order.Type.GetRemark(),
|
||||
Status = s.order.Status.GetRemark(),
|
||||
SourceBillNo = s.order.SourceBillNo,
|
||||
Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
|
||||
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
|
||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
|
||||
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
|
||||
FactoryPrice = s.detail.FactoryPrice,
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
|
||||
AccruedQty = s.detail.AccruedQty,
|
||||
ReceiveQty = s.detail.ReceiveQty,
|
||||
RealityQty = s.detail.RealityQty,
|
||||
Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ReceiverId.Value) : "",
|
||||
ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
||||
Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "",
|
||||
ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
||||
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
Remark=s.detail.Remark,
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
return (list, total);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 详情
|
||||
@@ -530,5 +419,116 @@ namespace WMS.Web.Repositories
|
||||
{
|
||||
return await GetPagedList(dto);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 列表-分页
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto)
|
||||
{
|
||||
//1.获取物料集合和组织集合
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (!materials_result.IsSuccess)
|
||||
return (new List<InStockTaskQueryResponse>(), 0);
|
||||
var materials = materials_result.Data.ToList();
|
||||
//组织集合
|
||||
var orgs_result = await _erpService.BillQueryForOrg();
|
||||
if (!orgs_result.IsSuccess)
|
||||
return (new List<InStockTaskQueryResponse>(), 0);
|
||||
var orgs = orgs_result.Data.ToList();
|
||||
|
||||
//供应商集合
|
||||
var suppliers_result = await _erpService.BillQueryForSupplier();
|
||||
if (!suppliers_result.IsSuccess)
|
||||
return (new List<InStockTaskQueryResponse>(), 0);
|
||||
var suppliers = suppliers_result.Data.ToList();
|
||||
|
||||
List<int> ids_Receiver = new List<int>();
|
||||
List<int> ids_Operator = new List<int>();
|
||||
if (!string.IsNullOrEmpty(dto.Receiver) || !string.IsNullOrEmpty(dto.Operator))
|
||||
{
|
||||
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
|
||||
ids_Receiver = staffList.Where(w => w.Name.Contains(dto.Receiver)).Select(s => s.Id).ToList();
|
||||
ids_Operator = staffList.Where(w => w.Name.Contains(dto.Operator)).Select(s => s.Id).ToList();
|
||||
}
|
||||
|
||||
//物料集合；模糊查询后的物料集合
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||
|
||||
var query = _context.InStockTaskDetails
|
||||
.GroupJoin(_context.InStockTask, 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);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.SourceBillNo))
|
||||
query = query.Where(w => EF.Functions.Like(w.order.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 (ids_Receiver.Count() > 0)
|
||||
query = query.Where(w => ids_Receiver.Contains(w.order.ReceiverId ?? 0));
|
||||
if (ids_Operator.Count() > 0)
|
||||
query = query.Where(w => ids_Operator.Contains(w.order.ShelferId ?? 0));
|
||||
|
||||
if (dto.SupplierId.HasValue)
|
||||
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
|
||||
|
||||
if (dto.OrgId.HasValue)
|
||||
query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||
{
|
||||
var splitStrs = dto.StockCode.Split("_$");
|
||||
query = query.Where(w => w.detail.StockCode == splitStrs[0] && w.detail.OrgCode == splitStrs[1]);
|
||||
}
|
||||
|
||||
if (dto.Type.HasValue)
|
||||
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
|
||||
|
||||
if (dto.Status.HasValue)
|
||||
query = query.Where(w => (int)w.order.Status == dto.Status.Value);
|
||||
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date >= dto.CreateBeginDate.Value);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date <= dto.CreateEndDate.Value);
|
||||
|
||||
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new InStockTaskQueryResponse()
|
||||
{
|
||||
Id = s.order.Id,
|
||||
DetailsId = s.detail.Id,
|
||||
BillNo = s.order.BillNo,
|
||||
Type = s.order.Type.GetRemark(),
|
||||
Status = s.order.Status.GetRemark(),
|
||||
SourceBillNo = s.order.SourceBillNo,
|
||||
Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
|
||||
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
|
||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
|
||||
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
|
||||
FactoryPrice = s.detail.FactoryPrice,
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
|
||||
AccruedQty = s.detail.AccruedQty,
|
||||
ReceiveQty = s.detail.ReceiveQty,
|
||||
RealityQty = s.detail.RealityQty,
|
||||
Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ReceiverId.Value) : "",
|
||||
ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
||||
Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "",
|
||||
ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
||||
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
Remark = s.detail.Remark,
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
return (list, total);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user