Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29191 -r29202
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29191)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29202)
@@ -11,6 +11,7 @@
 var saveBasketsArr = [];
 var shareDepartsMap = new newMap();
 var shareDepartsArr = [];
+var basketArray = [];
 /**
  * 不回收的器械包的集合。这个是由绑定带出来的器械包,并且不回收,在回收这里本来是不做处理的。现在要能修改原来的申请数量，相关的还有装配任务
  */
@@ -1176,7 +1177,7 @@
 	var basketGroupBarcodes = basketItem.basketGroupBarcodes;
 	var putBasketMaxAmount = basketItem.putBasketMaxAmount;
 	var isExist = false;
-	var lastTousseInstanceId =  "";
+	var lastTousseInstanceId =  basketItem.lastTousseInstanceId;
 	var tousseInstanceBarcode = basketItem.tousseInstanceBarcode;
 	var washClassifyType = basketItem.washClassifyType;
 	var basketElement = $('dl[class="sed clearfix"]:eq(0)');
@@ -1364,6 +1365,10 @@
 		var sumCount = $(that).parent().parent().find('.totalAmount').text();
 		createBasketUiElement(basketBarcode,classifyBasketId,basketName,washClassifyType,undefined,false,parseInt(sumCount));
 		$(that).parent().parent().remove();
+	}else if(user == 2){
+		var sumCount = $(that).find('.totalAmount').text();
+		createBasketUiElement(basketBarcode,classifyBasketId,basketName,washClassifyType,undefined,false,parseInt(sumCount));
+		$(that).remove();
 	}else {
 		var sumCount = $(that).parent().find('.totalAmount').text();
 		createBasketUiElement(basketBarcode,classifyBasketId,basketName,washClassifyType,undefined,false,parseInt(sumCount));
@@ -1413,6 +1418,19 @@
 	}
 }
 function addBasketElement(basketItem,isIdCard,isSave){
+	if(basketArray.length > 0){
+		if(basketArray.indexOf(basketItem.containerBarcode) >= 0){
+			$("#loadingPutBasket li").each(function(){
+				var hide = $(this).find('input');
+				var item =  eval('('+hide.val()+')');
+				if(item.barcode == basketItem.containerBarcode){
+					userContainer(this,2,basketItem.containerName,basketItem.containerBarcode,basketItem.id,basketItem.washClassifyType);
+					return false;
+				}
+			});
+			return
+		}
+	}
 	isIdCard = isIdCard || false;
 	var currentNode;
 	var isBasketLoaded = false;
@@ -5743,7 +5761,6 @@
 	}
   	
   	checkLoadedAmount();
-  	
   	//如果是历史回收记录界面进入，则不显示终止按钮
   	if(canTerminateTousseItemIds.length == 0){
   		//没有可以终止的申请项,那就把终止按钮隐藏
@@ -6300,7 +6317,7 @@
 						text += name+'*'+amount+'，';
 					}
 					var basketElement = '<li>';
-					basketElement += '<input type="hidden">';
+					basketElement += '<input type="hidden" value="{classifyBasketId:\''+id+'\',barcode:\''+containerBarcode+'\',washClassifyType:\''+washClassifyType+'\',basketName:\''+containerName+'\'}">';
 					basketElement += '<i>';
 					basketElement += '<a href="javascript:void(0);" class="btn1" id="B'+containerBarcode+'" onclick="userContainer(this,1,\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\',\''+washClassifyType+'\');">使用</a>';
 					basketElement += '</i>';
@@ -6334,6 +6351,7 @@
 					basketElement += '</li>';
 					var obj = $(basketElement);
 					$("#loadingPutBasket").prepend(obj);
+					basketArray[i] = containerBarcode;
 				}
 				$("#scanContainerBarcodeTipUl").hide();
 			}else {
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r29197 -r29202
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 29197)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 29202)
@@ -1641,7 +1641,7 @@
 	$('.zhuangzai-table').css({'width':'820px','height':'1100px','bottom':'90px','right':'80px'});
 	$('.zhuangzai-table .box').css({'height':'1080px'});
 	$('.add-form').css({'top':'295px'});
-	$('#allIntoBasket').css({'top':'415px','left':'770px'});
+	$('#allIntoBasket').css({'top':'195px','left':'1234px'});
 	$('#divTousseGroup').css({'left':'50px'});
 	$('#divselect').css({'left':'1060px'});
 }else if(screenWidth>1270 && screenWidth<1300){
@@ -1652,7 +1652,7 @@
 		$('#tousseItemTable').css({'width':'1350px'});
 		$('.zhuangzai-table').css({'width':'880px','height':'840px','bottom':'90px','right':'80px'});
 		$('.zhuangzai-table .box').css({'height':'840px'});
-		$('#allIntoBasket').css({'top':'315px','left':'800px'});
+		$('#allIntoBasket').css({'top':'160px','left':'1234px'});
 		$('#divTousseGroup').css({'left':'50px'});
 		$('#divselect').css({'left':'1060px'});
 	}else if(screenHeight>730 && screenHeight<780){
@@ -1662,7 +1662,7 @@
 		$('#tousseItemTable').css({'width':'1350px'});
 		$('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
 		$('.zhuangzai-table .box').css({'height':'890px'});
-		$('#allIntoBasket').css({'top':'340px','left':'770px'});
+		$('#allIntoBasket').css({'top':'160px','left':'1234px'});
 		$('#divTousseGroup').css({'left':'50px'});
 		$('#divselect').css({'left':'1060px'});
 	}else if(screenHeight>790 && screenHeight<810){
@@ -1672,7 +1672,7 @@
 		$('#tousseItemTable').css({'width':'1350px'});
 		$('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
 		$('.zhuangzai-table .box').css({'height':'890px'});
-		$('#allIntoBasket').css({'top':'460px','left':'770px'});
+		$('#allIntoBasket').css({'top':'160px','left':'1234px'});
 		$('#divTousseGroup').css({'left':'50px'});
 		$('#divselect').css({'left':'1060px'});
 	}else {
@@ -1683,7 +1683,7 @@
 		$('.zhuangzai-table').css({'width':'840px','height':'1200px','bottom':'115px','right':'70px'});
 		$('.zhuangzai-table .box').css({'height':'1200px'});
 		$('.add-form').css({'top':'335px'});
-		$('#allIntoBasket').css({'top':'460px','left':'770px'});
+		$('#allIntoBasket').css({'top':'215px','left':'1234px'});
 		$('#divTousseGroup').css({'left':'50px'});
 		$('#divselect').css({'left':'1060px'});
 	}
@@ -1694,7 +1694,7 @@
 	$('#tousseItemTable').css({'width':'1350px'});
 	$('.zhuangzai-table').css({'width':'880px','height':'850px','bottom':'90px','right':'90px'});
 	$('.zhuangzai-table .box').css({'height':'855px'});
-	$('#allIntoBasket').css({'top':'315px','left':'800px'});
+	$('#allIntoBasket').css({'top':'160px','left':'1234px'});
 	$('#divTousseGroup').css({'left':'50px'});
 	$('#divselect').css({'left':'1060px'});
 }else if(screenWidth>1390 && screenWidth<1450){
@@ -1704,7 +1704,7 @@
 	$('#tousseItemTable').css({'width':'1350px'});
 	$('.zhuangzai-table').css({'width':'830px','height':'920px','bottom':'90px','right':'80px'});
 	$('.zhuangzai-table .box').css({'height':'920px'});
-	$('#allIntoBasket').css({'top':'350px','left':'800px'});
+	$('#allIntoBasket').css({'top':'160px','left':'1234px'});
 	$('#divTousseGroup').css({'left':'50px'});
 	$('#divselect').css({'left':'1060px'});
 }else if(screenWidth>1590 && screenWidth<1610){
@@ -1714,7 +1714,7 @@
 	$('#tousseItemTable').css({'width':'1350px'});
 	$('.zhuangzai-table').css({'width':'875px','height':'875px','bottom':'90px','right':'80px'});
 	$('.zhuangzai-table .box').css({'height':'870px'});
-	$('#allIntoBasket').css({'top':'335px','left':'800px'});
+	$('#allIntoBasket').css({'top':'160px','left':'1234px'});
 	$('#divTousseGroup').css({'left':'50px'});
 	$('#divselect').css({'left':'1060px'});
 }else if(screenWidth>1910 && screenWidth<1930){
@@ -1726,7 +1726,7 @@
 	$('.zhuangzai-table .box').css({'height':'890px'});
 	$('#basketsUl').find('.sed').css({'width':'600px'});
 	$('#basketsUl .sed .num').css({'width':'120px'});
-	$('#allIntoBasket').css({'top':'335px','left':'800px'});
+	$('#allIntoBasket').css({'top':'160px','left':'1234px'});
 	$('#divTousseGroup').css({'left':'50px'});
 	$('#divselect').css({'left':'1060px'});
 }