修改了出入库回退
This commit is contained in:
Binary file not shown.
@@ -220,6 +220,11 @@
|
||||
操作时间
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.BackRecordQueryRequest.MaterialNumber">
|
||||
<summary>
|
||||
物料
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:WMS.Web.Core.Dto.BackRecordQueryResponse">
|
||||
<summary>
|
||||
出入库回退-查询响应对象
|
||||
|
||||
@@ -36,5 +36,11 @@ namespace WMS.Web.Core.Dto
|
||||
/// 操作时间
|
||||
/// </summary>
|
||||
public DateTime? CreateEndDate { get; set; } = null;
|
||||
|
||||
/// <summary>
|
||||
/// 物料
|
||||
/// </summary>
|
||||
public string MaterialNumber { get; set; } = null;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,11 +63,20 @@ namespace WMS.Web.Repositories
|
||||
public async Task<(List<BackRecordQueryResponse> list,int total)> GetPagedList(BackRecordQueryRequest dto, int companyId)
|
||||
{
|
||||
//1.获取物料集合和组织集合和供应商的集合
|
||||
List<string> mNumber = new List<string>();
|
||||
var materials = new List<ErpMaterialDto>();
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (materials_result.IsSuccess)
|
||||
materials = materials_result.Data.ToList();
|
||||
|
||||
//物料集合;模糊查询后的物料集合
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
{
|
||||
if (materials != null)
|
||||
mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||
).Select(s => s.MaterialNumber).ToList();
|
||||
}
|
||||
//组织集合
|
||||
var orgs = new List<ErpOrgDto>();
|
||||
var orgs_result = await _erpService.BillQueryForOrg();
|
||||
@@ -105,6 +114,11 @@ namespace WMS.Web.Repositories
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.CreateTime.Date <= dto.CreateEndDate.Value);
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
query = query.Where(w => mNumber.Contains(w.detail.MaterialNumber));
|
||||
|
||||
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new BackRecordQueryResponse()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user