导出接口

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -20,7 +20,7 @@ namespace WMS.Web.Repositories
     /// <summary>
     /// wms入库单-仓储
     /// </summary>
-    public class InStockRepositories: IInStockRepositories
+    public class InStockRepositories: IAllFielRepositories<InStockQueryRequest>, IInStockRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
@@ -53,24 +53,24 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<ResultPagedList<InStockQueryResponse>> GetPagedList(InStockQueryRequest dto) 
+        public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto) 
         {
             //1.获取物料集合和组织集合和供应商的集合
             var materials_result = await _erpService.BillQueryForMaterial();
             if (!materials_result.IsSuccess)
-                return ResultPagedList<InStockQueryResponse>.ReFailure(materials_result);
+                return (new List<InStockQueryResponse>(), 0);
             var materials = materials_result.Data.ToList();
 
             //组织集合
             var orgs_result = await _erpService.BillQueryForOrg();
             if (!orgs_result.IsSuccess)
-                return ResultPagedList<InStockQueryResponse>.ReFailure(orgs_result);
+                return (new List<InStockQueryResponse>(), 0);
             var orgs = orgs_result.Data.ToList();
 
             //供应商集合
             var suppliers_result = await _erpService.BillQueryForSupplier();
             if (!suppliers_result.IsSuccess)
-                return ResultPagedList<InStockQueryResponse>.ReFailure(suppliers_result);
+                return (new List<InStockQueryResponse>(), 0);
             var suppliers = suppliers_result.Data.ToList();
 
             //物料集合；模糊查询后的物料集合
@@ -109,10 +109,8 @@ namespace WMS.Web.Repositories
             if (dto.CreateEndDate != null)
                 query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
 
-            var response = new ResultPagedList<InStockQueryResponse>();
+           
             int total = await query.CountAsync();
-            response.TotalCount = total;
-
             var list = await query.Select(s => new InStockQueryResponse() 
             {
                 Id=s.order.Id,
@@ -132,8 +130,7 @@ namespace WMS.Web.Repositories
                 SuccessSync=s.order.SuccessSync
             }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
 
-            response.Data = list;
-            return response;
+            return (list, total);
         }
 
         /// <summary>
@@ -170,5 +167,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(InStockQueryRequest dto, int companyId)
+        {
+            return await GetPagedList(dto);
+        }
     }
 }