Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r13758 -r13761
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 13758)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 13761)
@@ -69,7 +69,11 @@
 		return false;
 	}
 	id = records[0].data['id'];
-	addAndEditWashAndDisinfectRecord(id,false);
+	var isWashAgain = false;
+	if(records[0].data['washStatus'] == washfaild){
+		isWashAgain = true;
+	}
+	addAndEditWashAndDisinfectRecord(id,isWashAgain);
 	top.Ext.getCmp('washAndDisinfectRecordWin').setTitle('清洗消毒记录');
 };
 
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r13758 -r13761
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 13758)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 13761)
@@ -187,14 +187,18 @@
 				}
 				ClassifyBasket classifyBasket = beCleanItemManager.getClassifyBasketById(id.toString());
 				if(classifyBasket != null){
-					Container basket = (Container) barcodeManager.getBarcodeByBarcode(classifyBasket.getContainerBarcode());
-					if((basket != null && Container.CONTAINER_STATUS_WASHLOADING.equals(basket.getStatus())) || isNewRecord){
+					Container container = (Container) barcodeManager.getBarcodeByBarcode(classifyBasket.getContainerBarcode());
+					if((container != null && Container.CONTAINER_STATUS_WASHLOADING.equals(container.getStatus())) || isNewRecord){
 						if(rinser != null){
 							boolean isWashConfirm = rinser.sterilizerIsWashConfirm();
 							if(!isWashConfirm){
-								basket.setStatus(Container.CONTAINER_STATUS_WASHED);
+								container.setStatus(Container.CONTAINER_STATUS_WASHED);
 							}else{
-								basket.setStatus(Container.CONTAINER_STATUS_WASHING);
+								if(WashAndDisinfectRecord.STATUS_WASHED.equals(washRecord.getWashStatus())){
+									container.setStatus(Container.CONTAINER_STATUS_WASHED);
+								}else{
+									container.setStatus(Container.CONTAINER_STATUS_WASHING);
+								}
 							}
 						}
 						
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
===================================================================
diff -u -r13549 -r13761
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 13549)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 13761)
@@ -872,6 +872,10 @@
 		if (Container.CONTAINER_STATUS_WASHLOADING
 				.equals(container.getStatus())) {
 			classifyBasket = getUnWashedBasketByBarcode(barcode);
+			//清洗失败后篮筐状态改为清洗装载，但篮筐有关联的清洗记录
+			if(classifyBasket == null){
+				classifyBasket = getLatestWashedBasketByBarcode(barcode);
+			}
 		} else if (Container.CONTAINER_STATUS_WASHED.equals(container
 				.getStatus())) {
 			classifyBasket = getLatestWashedBasketByBarcode(barcode);