Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r20660 -r20781
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 20660)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 20781)
@@ -1647,9 +1647,8 @@
 		});
 		node.eachChild(function(tousseMaterial){
 			var type = tousseMaterial.attributes.type
-			if(type=="器械包固定条码"){
+			if(type=="器械包固定条码"){  //如果是器械包固定条码就保存里面的材料
 			washMaterials.push({
-				id: " ",
 				name: tousseMaterial.attributes.name,
 				amount: tousseMaterial.attributes.count
  			});
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
===================================================================
diff -u -r20590 -r20781
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 20590)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 20781)
@@ -136,7 +136,7 @@
 	$(deleteButton).parent().parent().remove();
 	var ids = $(deleteButton).parent().parent().attr('id');
 	$('#'+ ids +'').remove();
-	if(type == 'containerStatus'){ //判断是篮筐还是器械包，器械包不加载
+	if(type == 'containerStatus'){ //判断是篮筐还是器械包，器械包删除后不加载在待清洗篮筐
 	  toCleanTheBasketDatas(ids);
 	}
 }
@@ -281,12 +281,12 @@
 }
 
 //判定器械包是否已扫描
-function isTousseExist(classifyBasketId){
+function isTousseExist(tousseBarcode){
 	var isExist = false;
 	$("#basketsUl li").each(function(){
 		var hide = $(this).find('input');
 		var item =  JSON.parse(hide.val());
-        if(item.classifyBasketId == classifyBasketId){
+        if(item.barcode == tousseBarcode){
         	isExist = true;
             return false;
         }
@@ -450,12 +450,11 @@
 	                			var personInChargeCode = $("#personInChargeCode").val();
 	                			var tousseName = result.data.container.name;
 	                			var amount = result.data.container.amount;
-	                			var classifyBasketId = result.data.id;
 	                			var tousseBarcode = result.data.container.barcode;
 	                			var itemsInfo = result.data.itemAmountInfos;
-	                			var isExist = isTousseExist(classifyBasketId);
+	                			var isExist = isTousseExist(tousseBarcode);//判定这器械包有没有扫描过
 	                			if(!isExist){
-	                				createBasketUiElement(tousseBarcode,classifyBasketId,type,tousseName,amount,position,personInCharge,personInChargeCode,itemsInfo);
+	                				createBasketUiElement(tousseBarcode,null,type,tousseName,amount,position,personInCharge,personInChargeCode,itemsInfo);
 	                				$("#scanContainerBarcodeTipUl").hide();
 	                				barcodeGloble = '';//清空后清除条码记忆的全局变量
 	                			}else{
@@ -466,9 +465,9 @@
 	            			  		for(var i = 0;i < itemsInfo.length ; i++){
 	            			  			itemsInfo[i].amount = itemsInfo[i].materialAmount * amount;//包定义材料数量叠加
 	            			  		}
-	                				createBasketUiElement(tousseBarcode,classifyBasketId,type,tousseName,amount,position,personInCharge,personInChargeCode,itemsInfo);
+	                				createBasketUiElement(tousseBarcode,null,type,tousseName,amount,position,personInCharge,personInChargeCode,itemsInfo);
 	                				$("#scanContainerBarcodeTipUl").hide();
-	                				barcodeGloble = '';//清空后清
+	                				barcodeGloble = '';//清空后清除条码记忆的全局变量
 	                			}
                     	      }else{
                     	    	  alertDiv(" 找不到该条码所对应的信息！",false,false,false);