diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index a9c69520..0db52817 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -781,6 +781,11 @@ namespace WMS.Web.Repositories
                 //var InStockDetails = _context.Set<InStockDetails>().FromSqlInterpolated(fs).ToList();
                 //var tids = InStockDetails.GroupBy(x => x.TaskId).Select(x => x.Key).ToList();
 
+                var boxids_objs = _context.SerialNumbers.Where(x => dto.SerialNumbers.Contains(x.SerialNumber)).ToList();
+                var boxIds = boxids_objs.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
+                var tids1 = await _context.InstockTaskBox.Where(x => boxIds.Contains(x.BoxId)).GroupBy(x => x.TaskId).Select(x => x.Key).ToListAsync();
+                tids.AddRange(tids1);
+
                 if (taskIds == null)
                 {
                     taskIds = new List<int>();
@@ -788,19 +793,6 @@ namespace WMS.Web.Repositories
                 }
                 else
                     taskIds = tids.Intersect(taskIds).ToList();
-
-
-                var boxids_objs = _context.SerialNumbers.Where(x => dto.SerialNumbers.Contains(x.SerialNumber)).ToList();
-                var boxIds = boxids_objs.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
-                var tids1 = await _context.InstockTaskBox.Where(x => boxIds.Contains(x.BoxId)).GroupBy(x => x.TaskId).Select(x => x.Key).ToListAsync();
-
-                if (taskIds == null)
-                {
-                    taskIds = new List<int>();
-                    taskIds.AddRange(tids1);
-                }
-                else
-                    taskIds = tids1.Intersect(taskIds).ToList();
             }
 
             var query = _context.InStockTaskDetails