Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
===================================================================
diff -u -r39850 -r39851
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 39850)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 39851)
@@ -177,7 +177,7 @@
 
 
 //根据条码加载材料
-function loadMaterial(barcode,callBack,idCardBarcode,isRetrospectTousse) {
+function loadMaterial(barcode,idCardBarcode,isRetrospectTousse) {
 	if(typeof(barcode) == 'undefined' || barcode == '')
 	{
 		barcode = top.Ext.getCmp('inputText').getValue();
@@ -199,6 +199,10 @@
 	var disinfectProgram = '';
 	if(sstsConfig.enableAvailableWashProgramsOfTousseFunction){
 		disinfectProgram = top.Ext.getCmp('disinfectProgram').getRawValue();
+		if(disinfectProgram == ''){
+			showResult("清洗程序不能为空");
+			return;
+		}
 	}
 	
 	if(barcode!=""){
@@ -400,6 +404,7 @@
 					showFrequency(barcode,isRetrospectTousse);
 					//重新计算篮筐数量(除了本处新扫描篮筐外,另外在删除篮筐后也应相应减掉已扫描篮筐数量)
 					resetContainerCount();
+					removePendingWashAndDisinfectGoods(barcode,idCardBarcode)
 					//清空判断退出循环的数组
 //					judge.splice(0,judge.length); 
 				}else{
@@ -1722,12 +1727,7 @@
 			}
 		}
 	}
-	var disinfectProgram = top.Ext.getCmp('disinfectProgram').getRawValue();
-	if(disinfectProgram == '' && sstsConfig.enableAvailableWashProgramsOfTousseFunction){
-		showResult("请选择清洗程序");
-		return;
-	}
-	loadMaterial(barcode,removePendingWashAndDisinfectGoods(barcode,idCardBarcode),idCardBarcode,isRetrospectTousse);
+	loadMaterial(barcode,idCardBarcode,isRetrospectTousse);
 	var type = "篮筐";
 	if(isRetrospectTousse ){
 		//日志保存清洗的是不追溯的器械包
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r39850 -r39851
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 39850)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 39851)
@@ -286,7 +286,7 @@
 
 
 //根据条码加载材料
-function loadMaterial(barcode, callBack, idCardBarcode, isRetrospectTousse) {
+function loadMaterial(barcode, idCardBarcode, isRetrospectTousse) {
 	if (typeof (barcode) == 'undefined' || barcode == '') {
 		barcode = top.Ext.getCmp('inputText').getValue();
 		top.Ext.getCmp('inputText').setValue("");
@@ -307,6 +307,10 @@
 	var disinfectProgram = '';
 	if(sstsConfig.enableAvailableWashProgramsOfTousseFunction){
 		disinfectProgram = top.Ext.getCmp('disinfectProgram').getRawValue();
+		if(disinfectProgram == ''){
+			showResult("清洗程序不能为空");
+			return;
+		}
 	}
 
 	if (barcode != "") {
@@ -322,40 +326,16 @@
 				if (isUndefinedOrNullOrEmpty(response.responseText)) {
 					return;
 				}
-				//				var result = response.responseText;
-				//				result = result.replace(/\r\n/g, "");
 				var basket = Ext.decode(response.responseText);
 
 				if (basket.hasOwnProperty("message")) {
 					showResult(basket.message);
 					return;
 				} else if (basket != null) {
-
-					//				}
-					//				var results=result.split(",");
-					//				if(result=="notUsed"){
-					//					showResult("该篮筐没有装载物品，不能进行清洗");
-					//				}else if(result=="notExistItemsUsed"){
-					//					showResult("该篮筐或清洗架未存放清洗物品");
-					//				}else if(result=="packed"){
-					//					showResult("该篮筐内部分物品已装配并打印标签，不能再次清洗！");
-					//				}else if(result=="nonFixedDarcode"){
-					//					showResult(barcode+"不是固定条码，请扫描固定条码！");
-					//				}else if(results[0]=="retrospect"){
-					//						showResult(results[1]+"为追溯的包，不能扫描固定条码！");
-					//				}else if (result != null && result != "null") {
-					var tousseCounts;	//扫描固定条码时，保存的器械包值
-					//					var materialCounts = [];
-					var timeOfThisFixedBarcode = 1;	//固定条码扫描次数
+					var tousseCounts;	
+					var timeOfThisFixedBarcode = 1;	
 					var repeatedly;
-					//					var materialArray = new Array();
-					//				    materialArray = result.split("#@");
-					//				    var array = new Array();
-					//后台拼接语句
-					//" " + ","+ tousseDefinition.getName() + ","+ totalGoodsAmount + ","+ tousseInstance.getBarcode()+ ""; 
-					//				    array = materialArray[0].split(",");
 					var root = top.Ext.getCmp('basketTreePanel').root;
-					//					var node = root.findChild('id', array[0]);
 					if (!isRetrospectTousse) {
 						if (node) {
 							showResult("该篮筐或清洗架已在列表中");
@@ -371,22 +351,8 @@
 
 								repeatedly = true;
 								return false;
-								//								tousseCounts.push({
-								//									count : count
-								//								});
-								//								node.eachChild(function(tousseMaterial){
-								//									var type = tousseMaterial.attributes.type
-								//										var materialCount = tousseMaterial.attributes.count
-								//										var counts = (parseInt(materialCount) / parseInt(node.attributes.count)) * (parseInt(count));
-								//										materialCounts.push({
-								//											count : counts
-								//										});
-								//								});
 							}
 						});
-						//						if(node != null){
-						//							repeatedly = true;
-						//						}
 					}
 					var personInCharge = top.Ext.getCmp('personInCharge').getValue();
 					var personInChargeCode = top.Ext.getCmp('personInChargeCode').getValue();
@@ -406,14 +372,9 @@
 					//扫描的是不追溯的器械包可以重复扫描叠加数量
 					if (repeatedly) {
 						removeTousseGrid(barcode);
-						//						for (var i = 0; i < tousseCounts.length; i++) {
-						//							var tousse = tousseCounts[i];
-						//							tousseCount = tousse.count;
-						//						}
 						tousseCount = tousseCounts;
 					}
 					var basketNode = new top.Ext.tree.TreeNode({
-						//						id : array[0],
 						classifyBasketId: isRetrospectTousse ? '' : basket.classifyBasketId,
 						name: basket.name,
 						showname: basket.name,
@@ -450,27 +411,7 @@
 							}
 							isLoadDefaultCleanMethod = false;
 						}
-						//						var showname = tempArray[0];
-						//						var type = tempArray[4];
-						//						var objectId = tempArray[5];
-						//						var materialCount = tempArray[1];
-						//						var recyclingTime = tempArray[6];
-						//						var recyclingDept = tempArray[7];
-						//扫描的是不追溯的器械包里面的材料可以重复扫描叠加数量
-						//						if(repeatedly){
-						//							for(var int = 0; int < materialCounts.length; int++) {
-						//								var material = materialCounts[int];
-						//								materialCount = material.count;
-						//								if(judge.contains(materialCount)){
-						//									continue;
-						//								}else{
-						//									judge.push(materialCount);
-						//									break;
-						//								}
-						//							}
-						//						}
 						var materialNode = new top.Ext.tree.TreeNode({
-							//							id : '',
 							name: classifiedItem.name,
 							showname: classifiedItem.name,
 							count: classifiedItem.amount * timeOfThisFixedBarcode,
@@ -517,8 +458,7 @@
 					showFrequency(barcode, isRetrospectTousse);
 					//重新计算篮筐数量(除了本处新扫描篮筐外,另外在删除篮筐后也应相应减掉已扫描篮筐数量)
 					resetContainerCount();
-					//清空判断退出循环的数组
-					//					judge.splice(0,judge.length); 
+					removePendingWashAndDisinfectGoods(barcode, idCardBarcode)
 				} else {
 					showResult("找不到该篮筐或清洗架");
 				}
@@ -1917,12 +1857,7 @@
 			}
 		}
 	}
-	var disinfectProgram = top.Ext.getCmp('disinfectProgram').getRawValue();
-	if(disinfectProgram == '' && sstsConfig.enableAvailableWashProgramsOfTousseFunction){
-		showResult("请选择清洗程序");
-		return;
-	}
-	loadMaterial(barcode, removePendingWashAndDisinfectGoods(barcode, idCardBarcode), idCardBarcode, isRetrospectTousse);
+	loadMaterial(barcode, idCardBarcode, isRetrospectTousse);
 	var type = "篮筐";
 	if (isRetrospectTousse) {
 		//日志保存清洗的是不追溯的器械包