Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r15994 -r16007
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 15994)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 16007)
@@ -420,24 +420,6 @@
 		amountElement.remove();
 		delElement.remove();
 	}
-	
-	//相关器械包样式变更以区分是否已入筐
-	$("input[id^=showTousseName]").each(function(item){
-		if(type == '材料'){
-			if($(this).val() == tousseNameForMaterial){
-				var elementId = $(this).attr("id");
-				$("#loadedAmount" + elementId.substring(elementId.length - 1)).css("background","#FFFFFF");
-				return false;
-			}
-		}else{
-			if($(this).val() == name){
-				var elementId = $(this).attr("id");
-				$("#loadedAmount" + elementId.substring(elementId.length - 1)).css("background","#FFFFFF");
-				return false;
-			}
-		}
-		
-	});
 	checkLoadedAmount();
 }
 
@@ -627,8 +609,6 @@
    			basketGroupBarcodes: basketGroupBarcodes
    	}
 	addOrDelTousse(tousse);
-
-	checkLoadedAmount();
 }
 
 function setIdCardErrorIntoBasketAmount(row,amount){
@@ -2030,7 +2010,7 @@
 		               if(idCard == '是' && tousseIdCardBarcode == ''){
 		            	   setIdCardErrorIntoBasketAmount(i,recycleAmount);
 		               }
-		   	       	   $('#loadedAmount'+i).css("background","#b7d9a5");
+		               setTousseItemLoadedAmountCss(i);
 		               return false;
 		           }
 		    });
@@ -2199,17 +2179,6 @@
     	$("#scanContainerBarcodeTipUl").show();
   	}else{
   		$("#scanContainerBarcodeTipUl").hide();
-  		//查询篮筐下的器械包与器械包列表中是否一致
-		$("#basketsUl > li > dl > input[type=hidden]").each(function(index , item){
-			var basketTousseItemJson = JSON.parse($(this).val());
-			//相关器械包样式变更以区分是否已入筐
-			$("input[id^=showTousseName]").each(function(index1 , item1){
-				if(basketTousseItemJson.tousseName == $(this).val()){
-					var elementId = $(this).attr("id");
-					$("#loadedAmount" + elementId.substring(elementId.length - 1)).css("background","#b7d9a5");
-				}
-			});
-		});
   	}
   	
   	checkLoadedAmount();
@@ -2222,15 +2191,17 @@
 
 //装载数量根据其值更新背景色
 function checkLoadedAmount(){
-  	//注册装载数量文本框的值改变事件,当数量大于0时,背景颜色改为浅绿色,否则恢复为原色
-  	$("input[id^=loadedAmount]").each(function(item){
-  		var intValue = parseInt($(this).val());
-  		if(intValue > 0){
-  			$(this).css("background","#b7d9a5");
-  		}else{
-  			$(this).css("background","#FFFFFF");
-  		}
-  	});
+  	$('#tousseItemTable').children().first().children().each(function(i,element){
+  		var recycleAmount = parseInt($('#recycleAmount' + i).val(),10);
+  		var loadedAmount = parseInt($('#loadedAmount' + i).val(),10);
+  		if(loadedAmount > 0 && recycleAmount > loadedAmount){
+  	   		$("#loadedAmount" + i).css("background","#FFE66F");//黄色
+  	   	}else if(recycleAmount == loadedAmount){
+  	   		$("#loadedAmount" + i).css("background","#b7d9a5");//绿色
+  	   	}else{
+  	   		$("#loadedAmount" + i).css("background","#FFFFFF");//默认白色
+  	   	}
+   });
 }
 
 function loadRecyclingRecordById(id){