出入库回退导出
This commit is contained in:
@@ -21,7 +21,7 @@ namespace WMS.Web.Repositories
|
||||
/// <summary>
|
||||
/// 出入库回退记录-仓储
|
||||
/// </summary>
|
||||
public class BackRecordRepositories: IBackRecordRepositories
|
||||
public class BackRecordRepositories : IAllFielRepositories<BackRecordQueryRequest>, IBackRecordRepositories
|
||||
{
|
||||
private readonly IMapper _mapper;
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
@@ -46,6 +46,7 @@ namespace WMS.Web.Repositories
|
||||
_serviceProvider = serviceProvider;
|
||||
_loginRepositories = loginRepositories;
|
||||
_singleDataService = singleDataService;
|
||||
_erpBasicDataExtendService = erpBasicDataExtendService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -53,12 +54,12 @@ namespace WMS.Web.Repositories
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ResultPagedList<BackRecordQueryResponse>> GetPagedList(BackRecordQueryRequest dto)
|
||||
public async Task<(List<BackRecordQueryResponse> list,int total)> GetPagedList(BackRecordQueryRequest dto)
|
||||
{
|
||||
//1.获取物料集合和组织集合和供应商的集合
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (!materials_result.IsSuccess)
|
||||
return ResultPagedList<BackRecordQueryResponse>.ReFailure(materials_result);
|
||||
return (new List<BackRecordQueryResponse>(), 0);
|
||||
var materials = materials_result.Data.ToList();
|
||||
|
||||
var query = _context.BackRecordDetails
|
||||
@@ -74,10 +75,7 @@ namespace WMS.Web.Repositories
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
|
||||
|
||||
var response = new ResultPagedList<BackRecordQueryResponse>();
|
||||
int total = await query.CountAsync();
|
||||
response.TotalCount = total;
|
||||
|
||||
var list = await query.Select(s => new BackRecordQueryResponse()
|
||||
{
|
||||
Id = s.order.Id,
|
||||
@@ -95,8 +93,7 @@ namespace WMS.Web.Repositories
|
||||
SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
response.Data = list;
|
||||
return response;
|
||||
return (list,total);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -132,5 +129,16 @@ namespace WMS.Web.Repositories
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 导出
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <param name="companyId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<(object obj, int total)> GetListField(BackRecordQueryRequest dto, int companyId)
|
||||
{
|
||||
return await GetPagedList(dto);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@ namespace Microsoft.Extensions.DependencyInjection
|
||||
services.AddTransient<IAllFielRepositories<InventoryDetailsQueryRequest>, InventoryDetailsRepositories>();
|
||||
services.AddTransient<IAllFielRepositories<InventoryInOutDetailsQueryRequest>, InventoryInOutDetailsRepositories>();
|
||||
services.AddTransient<IAllFielRepositories<BoxInventoryQueryRequest>, BoxInventoryRepositories>();
|
||||
services.AddTransient<IAllFielRepositories<BackRecordQueryRequest>, BackRecordRepositories>();
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user