Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u -r28978 -r28980
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 28978)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 28980)
@@ -642,8 +642,9 @@
 }
 
 //将器械包放入篮筐中
-function putMaterialInBasket(row,batchToBasket,thisAmount){
+function putMaterialInBasket(row,batchToBasket,thisAmount,isAll){
 	var inputSuccess = false;
+	isAll = isAll || false;
     if($('#basketsUl').children().length > 0){
         var tousseName = $('#tousseName'+row).val();
         var isCleanedEntirely = $('#isCleanedEntirely'+row).val();
@@ -667,7 +668,7 @@
 
 		var basketItem = $('#basketsUl').find('li').eq(0).find('input[type=hidden]').val();
 
-		if(sstsConfig.enableMaterialWashclasifyInCustomRecycle){
+		if(sstsConfig.enableMaterialWashclasifyInCustomRecycle && isAll){
 			if(JSON.parse(basketItem).washClassifyType !== washClassifyType){
 				if(washClassifyType == ''){
 					alertDiv('【'+materialName+'】的清洗分类类型为空，缺少该类型的篮筐，请扫描加载篮筐后再入筐！');
@@ -1009,7 +1010,7 @@
         	var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10);
         	
         	if(amount > 0){
-        		putMaterialInBasket(row,true);
+        		putMaterialInBasket(row,true,'',true);
         		//var success = putMaterialInBasket(row);
             	//if(!success){
             		//return false;