Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r13757 -r13758
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 13757)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 13758)
@@ -259,7 +259,6 @@
 			}
 		} catch (Exception e) {
 			message = "{'success':'false'}";
-//			e.printStackTrace();
 		}
 		HttpServletResponse httpServletResponse = StrutsParamUtils
 				.getResponse();
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r13757 -r13758
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 13757)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 13758)
@@ -12,14 +12,24 @@
 		showResult("请选择要删除的清洗消毒记录！");
 		return false;
 	}
-	var ids = null;
+	
+	var ids = "";
 	for (var i = 0, len = records.length; i < len; i++) {
-		if (ids == null) {
-			ids = records[i].data['id'];
-		} else {
-			ids = ids + ';' + records[i].data['id'];
+		var washStatus = records[i].data['washStatus'];
+		if(washStatus == washed || washStatus == washfaild){
+			continue;
 		}
+		if(ids != ""){
+			ids += ";";
+		}
+		ids += records[i].data['id'];
 	}
+	
+	if(ids == ""){
+		showResult("灭菌完成或灭菌失败的记录不允许删除！");
+		return false;
+	}
+	
 	Ext.MessageBox.confirm("请确认", "是否确定要删除选中的清洗消毒记录?", function(button, text) {
 		if ("yes" == button) {
 			Ext.Ajax.request({
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r13757 -r13758
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 13757)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 13758)
@@ -882,7 +882,10 @@
 			hidden:(isWashAgain ? true : false),
 			handler : function(){
 				this.disable();
-				save();
+				var success = save();
+				if(!success){
+					this.enable();
+				}
 			}
 		},{
 			id:'washAgainBtn',
@@ -891,7 +894,10 @@
 			handler : function(){
 				this.disable();
 				top.Ext.getCmp("id").setValue("");
-				save();
+				var success = save();
+				if(!success){
+					this.enable();
+				}
 			}
 		}, {
 			text : '取消',
@@ -1062,31 +1068,27 @@
 function save() {
 	if (!formObj.form.isValid()) {
 		showResult('请正确填写表单各值');
-		this.enable();
 		setHiddenFieldsAllowBlank(false);
 		return false;
 	}
 	
 	//日期比较验证
 	if(top.Ext.getCmp('endDateStr').getValue()-top.Ext.getCmp('startDateStr').getValue() < 0){
 		showResult('开始日期不能大于结束日期！');
-		this.enable();
 		setHiddenFieldsAllowBlank(false);
 		return false;
 	}
 	
 	var root = top.Ext.getCmp('basketTreePanel').getRootNode();
 	if(materialStore.getCount() < 1 && !root.hasChildNodes()){
 		showResult('清洗消毒物品不能为空！');
-		this.enable();
 		setHiddenFieldsAllowBlank(false);
 		return false;
 	}
 	// 校验责任人
 	if(!personInChargeAllowBlank){
 		if(isAnyBasketPersonInChargeBlank()){
 			showResult('责任人不能为空！');
-			this.enable();
 			setHiddenFieldsAllowBlank(false);
 			return false;
 		}
@@ -1095,7 +1097,6 @@
 	getWashAndDisinfectGridData();
 	if(root.childNodes.length == 0){
 		showResult('请扫描篮筐或器械包！');
-		this.enable();
 		return ;
 	}
 	// 验证循环计数器是否已经存在，一个清洗机的一个循环次数应是唯一的。
@@ -1120,7 +1121,6 @@
 			DWREngine.setAsync(true);
 			if (sign) {
 				showResult("清洗机的循环次数已存在，保存失败！");
-				this.enable();
 				return false;
 			}
 		}else
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r13757 -r13758
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 13757)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 13758)
@@ -187,8 +187,8 @@
 				}
 				ClassifyBasket classifyBasket = beCleanItemManager.getClassifyBasketById(id.toString());
 				if(classifyBasket != null){
-					if(isNewRecord){
-						Container basket = (Container) barcodeManager.getBarcodeByBarcode(classifyBasket.getContainerBarcode());
+					Container basket = (Container) barcodeManager.getBarcodeByBarcode(classifyBasket.getContainerBarcode());
+					if((basket != null && Container.CONTAINER_STATUS_WASHLOADING.equals(basket.getStatus())) || isNewRecord){
 						if(rinser != null){
 							boolean isWashConfirm = rinser.sterilizerIsWashConfirm();
 							if(!isWashConfirm){
@@ -357,11 +357,27 @@
 
 	public String deleteWashAndDisinfectRecordById(String id) {
 		WashAndDisinfectRecord washAndDisinfectRecord = getWashAndDisinfectRecordById(id);
-		/*
-		 * 删除回收记录不用再去删除篮筐，因为现在已没有必要将篮筐里的物品加回待分类物品里 for(ClassifyBasket
-		 * classifyBasket : washAndDisinfectRecord.getClassifyBaskets()){
-		 * beCleanItemManager.deleteClassifyBasket(classifyBasket); }
-		 */
+		
+		if (WashAndDisinfectRecord.STATUS_WASHED.equals(washAndDisinfectRecord
+				.getWashStatus())
+				|| WashAndDisinfectRecord.STATUS_WASHFAILD
+						.equals(washAndDisinfectRecord.getWashStatus())) {
+			return "";
+		}
+		
+		//修改篮筐状态
+		for (ClassifyBasket classifyBasket : washAndDisinfectRecord
+				.getClassifyBaskets()) {
+			Container container = containerManager
+					.getContainerByBarcode(classifyBasket.getContainerBarcode());
+			if (container != null
+					&& Container.CONTAINER_STATUS_WASHING.equals(container
+							.getStatus())) {
+				container.setStatus(Container.CONTAINER_STATUS_WASHLOADING);
+			}
+
+		}
+		 
 		String message = "{'success':'true','message':'删除成功!'}";
 		String sql1 = "delete ClassifyBasket_WashRecord "
 				+ "where WashAndDisinfectRecord_ID = '"