Merge branch 'master' of http://120.77.11.229:3000/zuolinhao/ZT-FJ-WMS

wms.service/Service/FJService.cs

@@ -3536,7 +3536,7 @@ namespace wms.service.Service
                 //判断对应仓库中是否存在指定缓存数量的空托盘
                 var invnowCount=_billInvnowrepository.AsQueryable().With(SqlWith.NoLock).Count(x=>x.ContGrpType==FJContGrpType.EmptyPal&& x.InvStateCode== InvState.InvEcecState_In.ToString()&&x.WarehouseId==warehouse.Id);
                 //获取正在执行中的任务
-                var taskInfoCount=_taskrepository.AsQueryable().Count(x=>x.Status<TaskStatus.Finish && x.BusType==FJTaskBusType.芯股用空托盘入库.GetDescription()&&x.WarehouseCode==warehouse.Code);
+                var taskInfoCount=_taskrepository.AsQueryable().With(SqlWith.NoLock).Count(x=>x.Status<TaskStatus.Finish && x.BusType==FJTaskBusType.芯股用空托盘入库.GetDescription()&&x.WarehouseCode==warehouse.Code);
                 //创建对应任务
                 var maxNumber = Convert.ToInt32(config.SContent);
                 var now = invnowCount + taskInfoCount;