Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r34485 -r34497
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 34485)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 34497)
@@ -3773,6 +3773,9 @@
 					}else if(Container.CONTAINER_STATUS_WASHING.equals(status)){
 						List<WashAndDisinfectRecord> washRecords = objectDao.findByHql("select po from "+ WashAndDisinfectRecord.class.getSimpleName() +" po join fetch po.classifyBaskets cbs where po.washStatus='"+ status +"' and cbs.id="+ cb.getId());
 						errorMsg = "标识牌条码为"+ barcode +"的【"+ tousseDefinition.getName() +"】正在清洗，不能进行装配！";
+						if(CollectionUtils.isEmpty(washRecords)){
+							throw new RuntimeException(errorMsg);
+						}
 						WashAndDisinfectRecord washRecord = washRecords.get(0);
 						if(DatabaseUtil.isPoIdValid(washRecord.getRinserId())){
 							Rinser rinser = (Rinser)objectDao.getById(Rinser.class.getSimpleName(), washRecord.getRinserId());