Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r23251 -r23387
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 23251)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 23387)
@@ -73,6 +73,7 @@
 	#divTousseGroup ul li{height:60px; line-height:60px;}
 	#divTousseGroup ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
 	#divTousseGroup ul li a:hover{background-color:#CCC;}
+	#basketsUl li .totalnum{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;}
 </style>
 </head>
 
@@ -481,7 +482,30 @@
 	amountElement.remove();
 	delElement.remove();
 }
-
+/**
+ * 刷新对应篮筐的包与材料总数量
+ * @param liElement
+ */
+function refreshBasketTotalNum(liElement){
+	if(liElement){
+		var total = 0;
+		liElement.find('dd.num').each(function(){
+			var num = parseInt($(this).html());
+			if(num){
+				total += num;
+			}
+		});
+		liElement.find('font.totalnum').html(total);
+	}
+}
+/**
+ * 刷新所有篮筐的包与材料总数量
+ */
+function refreshAllBasketTotalNum(){
+	$("#basketsUl li").each(function(){
+		refreshBasketTotalNum($(this));
+	});
+}
 //删除篮筐中的物品
 function deleteBasketItem(deleteButton){
 	var hideElement = $(deleteButton).parent().prev().prev().prev();
@@ -490,7 +514,7 @@
 	var delElement = $(deleteButton).parent();
 	
 	var basketElement = $(deleteButton).parent().parent();
-	var basketJSON = basketElement.prev().prev().prev().prev();
+	var basketJSON = basketElement.prev().prev().prev().prev().prev();
 	var basket = JSON.parse(basketJSON.val());
 	
 	var item = JSON.parse(hideElement.val());
@@ -503,7 +527,7 @@
 		name = item.materialName;
 		tousseNameForMaterial = item.tousseName;
 		$('dl[class="sed clearfix"]').each(function(){
-			var basketEle = $(this).prev().prev().prev().prev().val();
+			var basketEle = $(this).prev().prev().prev().prev().prev().val();
 			var basketJSON = JSON.parse(basketEle);
 			$(this).children().each(function(){
 				if($(this).attr('type') == 'hidden'){
@@ -637,10 +661,11 @@
         	var basketElement = '<li>';
          	basketElement += '<input type="hidden">';
          	basketElement += '<i>';
-         	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this,\''+basketItem.containerBarcode+'\',\''+basketItem.id+'\');">删除</a>';
+         	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this,\''+basketItem.containerBarcode+'\',\''+basketItem.id+'\');refreshAllBasketTotalNum();">删除</a>';
          	basketElement += '</i>';
          	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
          	basketElement += '<font>'+basketItem.containerName+'</font>';
+         	basketElement += '<font class="totalnum">' + 0 + '</font>';
          	basketElement += '<dl class="sed clearfix"></dl>';
          	basketElement += '</li>';
         	var obj = $(basketElement);
@@ -751,7 +776,7 @@
 	var element = '<input type="hidden" value="">';
 		element += '<dd class="name">' + str + '</dd>';
 		element += '<dd class="num">' + amount + '</dd>';
-		element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);">删除</a></dd>';
+		element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);refreshAllBasketTotalNum();">删除</a></dd>';
 	
 	var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,app_id,tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount,invoicePlanVersion);
 	basketElement.prepend($(element));
@@ -890,7 +915,7 @@
                '<td><input id="recycleAmount'+row+'" name="recycleAmount'+row+'" type="text" readonly="readonly" onblur="" ' + onclickFun + ' onkeyup="validateNumber(this);" class="input-b" value="'+recycleAmount+'"/></td>'+
                '<td><input id="loadedAmount'+row+'" type="hidden" name="loadedAmount'+row+'" type="text" readonly="readonly" class="input-b" value="'+loadedAmount+'"/></td>'+
                reduceButton+
-               '<td><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putTousseInTheBasket('+row+');">入筐</a></td>'+
+               '<td><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putTousseInTheBasket('+row+');refreshAllBasketTotalNum();">入筐</a></td>'+
                '</tr>');
     $("#tousseItemTable").append(trElement);