Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28813 -r28819
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28813)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28819)
@@ -1651,9 +1651,11 @@
 						var td = ti.tousseDefinition;
 						if(sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero){
 							var basketHideStr = $("#basketsUl li:first").find('input').val();
-							if(basketHideStr == null || basketHideStr == ""){
-								newAlert("请扫描篮筐条码!");
-							    return false;
+							if(sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode){
+								if(basketHideStr == null || basketHideStr == ""){
+									newAlert("请扫描篮筐条码!");
+									return false;
+								}
 							}
 							
 							if(!sstsConfig.disableIdCard && td.isDisableIDCard == "否"){//配置项开启和包定义中启用标识牌功能后，必须扫描标识牌回收
@@ -1700,8 +1702,11 @@
 							//未补充的丢失报损
 							loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
 							var orgUnitName = $('#depart').val();
-							var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
-							
+							if(sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode){
+								var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
+							}else {
+								addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle);
+							}
 						}
 					}else{  //扫描标识牌实例条码
 						barcode = msg.idCardInstance.barcode;
@@ -1768,10 +1773,12 @@
                             		 }
 								 }
                             	 var basketHideStr = $("#basketsUl li:first").find('input').val();
-                        		 if(basketHideStr == null || basketHideStr == ""){
-                        			 alertDiv("请扫描篮筐条码！");
-                        			 return false;
-                        		 }
+                        		 if(sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode){
+									if(basketHideStr == null || basketHideStr == ""){
+										alertDiv("请扫描篮筐条码!");
+										return false;
+									}
+								}
                             	 
                             	 var loadedAmount = tousseIntoBasketFunction("",td.id,td.name,1,td.isCleanedEntirely,orgUnitName,barcode,"",td.tousseType,-1,'否',3,msg);