diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index c6983023..4dfacd10 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -129,9 +129,9 @@ namespace WMS.Web.Repositories
                 query = query.Where(w => (int)w.order.Status == dto.Status.Value);
 
             if (dto.CreateBeginDate != null)
-                query = query.Where(w => w.order.CreateTime.Date >= dto.CreateBeginDate.Value);
+                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.CreateTime.Date <= dto.CreateEndDate.Value);
+                query = query.Where(w =>w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date <= dto.CreateEndDate.Value);
 
 
             int total = await query.CountAsync();
@@ -253,7 +253,7 @@ namespace WMS.Web.Repositories
             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(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.order.Status == InstockStatus.Part || w.order.Status == InstockStatus.Wait));
+                 .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.order.Status == InstockStatus.Part || w.order.Status == InstockStatus.Wait || w.order.Status== InstockStatus.WaitInStock));
 
             //仓库
             if (!string.IsNullOrEmpty(dto.StockCode))