Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r34497 -r34498
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 34497)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 34498)
@@ -3771,7 +3771,7 @@
 						}
 						throw new RuntimeException(errorMsg);
 					}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());
+						List<WashAndDisinfectRecord> washRecords = objectDao.findByHql("select po from "+ WashAndDisinfectRecord.class.getSimpleName() +" po join fetch po.classifyBaskets cbs where po.washStatus in('"+ WashAndDisinfectRecord.STATUS_WASHING +"','"+ WashAndDisinfectRecord.STATUS_INTERRUPT +"') and cbs.id="+ cb.getId());
 						errorMsg = "标识牌条码为"+ barcode +"的【"+ tousseDefinition.getName() +"】正在清洗，不能进行装配！";
 						if(CollectionUtils.isEmpty(washRecords)){
 							throw new RuntimeException(errorMsg);