Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29353 -r29408
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29353)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29408)
@@ -952,7 +952,7 @@
 		$('dl[class="sed clearfix"]').each(function(){
 			var basketEle = $(this).parent().find('input').eq(0).val();
 			if(basketEle !== ''){
-				var basketJSON = JSON.parse(basketEle);
+				var basketJSON = eval('('+basketEle+')');
 				$(this).children().each(function(){
 					if($(this).attr('type') == 'hidden'){
 						var hideValue = $(this).val();
@@ -2830,9 +2830,9 @@
 			}else if(recycleAmount > 0){
 				var loadedAmount = data.amount;
 				if(row !== undefined){
-					if(recycleAmountNew > putBasketMaxAmount && loadedAmountNew == putBasketMaxAmount && putBasketMaxAmount !== 0){
+					if(recycleAmount > loadedAmount && putBasketMaxAmount !== 0){
 						alertDiv("【"+tousseName+"】的清洗装载数量上限为"+putBasketMaxAmount+"，本次入筐数量为"+recycleAmount+"，当前篮筐容量不够，请用其它篮筐装载。");
-						return 0;
+						//return 0;
 					}
 					//丢失报损器械
 					if(isIDCard == '是'){
@@ -2841,11 +2841,13 @@
 					}else {
 						$('#loadedAmount'+row).val(recycleAmountNew);
 					}
-
 					if(recycleAmountNew > putBasketMaxAmount && loadedAmountNew < putBasketMaxAmount){
 						$('#loadedAmount'+row).val(putBasketMaxAmount);
 						loadedAmount = putBasketMaxAmount-loadedAmountNew;
+					}else if(recycleAmount > loadedAmount && putBasketMaxAmount !== 0){
+						$('#loadedAmount'+row).val(loadedAmount+loadedAmountNew);
 					}
+					
 				}else {
 					var key = -1;
 					$('#tousseItemTable').children().first().children().each(function(i,element){