Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r34087 -r34089 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 34087) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 34089) @@ -1136,10 +1136,12 @@ //新篮筐要判断是否可以回收 if(CssdUtils.getSystemSetConfigByNameBool("recycleClassifyBasketAfterPacked",true)){ boolean isNewClassifyBasket = true; - for (ClassifyBasket basket : record.getClassifyBaskets()) { - if (StringUtils.equals(basket.getContainerBarcode(),container.getBarcode())) { - isNewClassifyBasket = false; - break; + if(record !=null){ + for (ClassifyBasket basket : record.getClassifyBaskets()) { + if (StringUtils.equals(basket.getContainerBarcode(),container.getBarcode())) { + isNewClassifyBasket = false; + break; + } } } if(isNewClassifyBasket){