Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28468 -r28480
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28468)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28480)
@@ -1725,7 +1725,7 @@
                             		 }else{
                             			 addBasketElement(idCardClassifyBasket,true);
                             		 }
-                            	 }
+								 }
                             	 var basketHideStr = $("#basketsUl li:first").find('input').val();
                         		 if(basketHideStr == null || basketHideStr == ""){
                         			 alertDiv("请扫描篮筐条码！");
@@ -1786,13 +1786,15 @@
                             	//记住扫描的标志牌
                             	 $('#tousseItemTable').children().first().children().each(function(i,element){
                         	         if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
-                        	        	 var barcodesStr =  $('#barcodes'+i).val();
+										 var barcodesStr =  $('#barcodes'+i).val();
         	            	        	 if(barcodesStr == ""){
         	            	        		 var idCardBarcodeArray = new Array();
         	            	        		 idCardBarcodeArray[0] = {};
         	            	        		 idCardBarcodeArray[0].barcode = barcode;
-        	            	        		 idCardBarcodeArray[0].addSuccess = addSuccess;
-        	            	        		 $('#barcodes'+i).val(JSON.stringify(idCardBarcodeArray));
+											 idCardBarcodeArray[0].addSuccess = addSuccess;
+											 idCardBarcodeArray[0].containerBarcode = idCardClassifyBasket.containerBarcode;
+											 $('#barcodes'+i).val(JSON.stringify(idCardBarcodeArray));
+											 
         	            	        	 }else{
         	            	        		 var idCardBarcodeArray = JSON.parse(barcodesStr);
         	            	        		 var idCardIsExist = false;
@@ -1805,7 +1807,8 @@
         	            	        		 }
         	            	        		 if(!idCardIsExist){
         	            	        			 idCardBarcodeArray[idCardLen] = {};
-        	            	        			 idCardBarcodeArray[idCardLen].barcode = barcode;
+												 idCardBarcodeArray[idCardLen].barcode = barcode;
+												 idCardBarcodeArray[idCardLen].containerBarcode = idCardClassifyBasket.containerBarcode;
         	                	        		 idCardBarcodeArray[idCardLen].addSuccess = addSuccess;
         	                	        		 $('#barcodes'+i).val(JSON.stringify(idCardBarcodeArray));
         	            	        		 }
@@ -2617,13 +2620,31 @@
 					}
 				}
 			}
-
 			if(recycleAmount < 0){
 				var loadedAmount = parseInt($('#loadedAmount'+row).val());
 				var loadedAmountSum = 0;
 				var tousseLenght = 0;
 				var amountSum = 0;
 				if(isCleanedEntirely == '否'){
+					var msg = '';
+					$("#basketsUl li").each(function(){
+						$(this).find('dl').children().each(function(i,element){
+							if($(this).attr('type') == 'hidden'){
+								var hideStr = $(this).val();
+								var json = JSON.parse(hideStr);
+								if(json.tousseName == tousseName){
+									msg = tousseName+"已入筐，请从篮筐内删除后再入筐！";
+									return false;
+								}
+							}
+						});
+					});
+
+					if(!isUndefinedOrNullOrEmpty(msg)){
+						alertDiv(msg);
+						return false;
+					}
+					 
 					var tousseAmount = 0;
 					$('dl[class="sed clearfix"]').eq(0).each(function(){
 						var basketEle = $(this).prev().prev().prev().prev().prev().val();
@@ -2860,8 +2881,13 @@
 		var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
 		var msg = "";
 		if(isIdCard == true){
-			if(basketName.indexOf(tousseName+'(标识牌') == -1){
+			if($('#barcodes'+row).val() == ''){
 				msg = '不允许将包放入标识牌的篮筐中，请扫描其它的清洗篮筐！';
+			}else {
+				var barcodesObj = JSON.parse($('#barcodes'+row).val());
+				if(barcodesObj[0].containerBarcode == basketName.barcode){
+					msg = '不允许将包放入标识牌的篮筐中，请扫描其它的清洗篮筐！';
+				}
 			}
 		}
         //是否开启限制使用记录转换的申请单不能添加别的物品