增加搜索条件

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -34,9 +34,11 @@ namespace WMS.Web.Repositories
         private readonly IErpService _erpService;
         private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
         private readonly ILogger<OutStockTaskRepositories> _logger;
+        private readonly IOutStockRepositories _outStockRepositories;
         public OutStockTaskRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
             ISingleDataService singleDataService, ILoginRepositories loginRepositories, IErpService erpService,
-            IErpBasicDataExtendService erpBasicDataExtendService, ILogger<OutStockTaskRepositories> logger)
+            IErpBasicDataExtendService erpBasicDataExtendService, ILogger<OutStockTaskRepositories> logger,
+            IOutStockRepositories outStockRepositories)
         {
             _context = context;
             _mapper = mapper;
@@ -46,6 +48,8 @@ namespace WMS.Web.Repositories
             _erpService = erpService;
             _erpBasicDataExtendService = erpBasicDataExtendService;
             _logger = logger;
+            _outStockRepositories = outStockRepositories;
+
         }
         /// <summary>
         /// 新增
@@ -273,6 +277,19 @@ namespace WMS.Web.Repositories
             if (customer_result.IsSuccess)
                 customers = customer_result.Data.ToList();
 
+            List<int> taskIds = new List<int>();
+            //序列码出库单
+            if (dto.SerialNumbers.Count() > 0)
+            {
+                var res = await _outStockRepositories.GetEntityListBySerialNumbers(dto.SerialNumbers);
+                taskIds.AddRange(res.Select(s => s.TaskId));
+            }
+            //箱号取出库单
+            if (dto.BoxBillNos.Count() > 0)
+            {
+                var res = await _outStockRepositories.GetEntityListByBoxBillNos(dto.BoxBillNos);
+                taskIds.AddRange(res.Select(s => s.TaskId));
+            }
             #endregion
 
             var query = _context.OutStockTaskDetails.Include(x => x.ErpDetails)
@@ -315,6 +332,10 @@ namespace WMS.Web.Repositories
                 DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
                 query = query.Where(w => w.order.OperateTime <= dt_end);
             }
+            if (taskIds.Count() > 0)
+            {
+                query = query.Where(w => taskIds.Contains(w.order.Id));
+            }
             //组装
             int total = await query.CountAsync();
             var list = await query.Select(s => new OutStockTaskQueryInfoResponse()