Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r39532 -r39577 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 39532) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 39577) @@ -1292,7 +1292,7 @@ // 等待线程执行结束 long t1 = System.currentTimeMillis(); while (!ThreadUtils.isThreadTerminated(newClassifyBasketThread)) { - Thread.sleep(500); + Thread.sleep(1000); long t2 = System.currentTimeMillis(); long runningTime = t2 - t1; if (runningTime > maxRunTime) { @@ -1302,12 +1302,10 @@ } catch (Exception e) { e.printStackTrace(); } - //线程执行后再获取 获取不到就重试 - for (int i = 0; i < 5; i++) { - classifyBasket = getOrCreateClassifyBasket(washClassifyType, containerBarcode, containerName); - if(classifyBasket != null){ - return classifyBasket; - } + //线程执行后再获取 获取不到就抛异常 + classifyBasket = classifyBasketManager.getFirstUnWashedAndTousseItemUnEndBasket(containerBarcode); + if(classifyBasket == null){ + throw new SystemException("创建篮筐中,请重试"); } } return classifyBasket;