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

wms.service/Service/FJService.cs

@@ -7233,7 +7233,7 @@ namespace wms.service.Service
             };
 
             //检查历史任务表是否有任务
-            var task = _wcstaskoldrepository.AsQueryable().With("WITH(READPAST,ROWLOCK)")
+            var task = _wcstaskoldrepository.AsQueryable().With(SqlWith.NoLock)
                 .Where(p => p.Id == reqDto.TaskNum).SplitTable(tabs => tabs.Take(2)).First();
             var isBackRewind = _wcstaskoldrepository.AsQueryable().With("WITH(READPAST,ROWLOCK)")
                 .Where(p => p.Id == reqDto.TaskNum && p.BusType == FJTaskBusType.帘线退料重绕.GetDescription()).SplitTable(tabs => tabs.Take(2)).Any();