diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index 7397255a..51565264 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -93,7 +93,7 @@ namespace Tnb.WarehouseMgr Task.Run(() => FetchDisTasks((a, b) => a.endlocation_id == b.id, filter)) }; List[] disTasks = await Task.WhenAll(queryTasks); - if (disTasks?.Length > 0) + if (disTasks?.Length > 0 && disTasks.All(list => list?.Count > 0)) { throw new AppFriendlyException("该仓库还有未完成的任务,不允许盘点!", 500); } @@ -273,7 +273,8 @@ namespace Tnb.WarehouseMgr private Task> FetchDisTasks(Expression> joinExp, Expression> whereExp) { - return _db.Queryable().InnerJoin(joinExp).Where(whereExp).Select().ToListAsync(); + return _db.CopyNew().Queryable().InnerJoin(joinExp).Where(whereExp).Select().ToListAsync(); + } /// /// 根据盘点类型获取任务明细