Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28774 -r28779
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28774)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28779)
@@ -189,7 +189,7 @@
 		var t_lastTousseInstanceId = tousseArray[i].lastTousseInstanceId;
 		var t_tousseInstanceBarcode = tousseArray[i].tousseInstanceBarcode;
 		var t_itemType = tousseArray[i].itemType;
-    	if(t_basketBarcode == item.basketBarcode && itemType == t_itemType && t_tousseName == tousseName && t_tousseDefinitionID == item.tousseDefinitionID && t_idCardBarcode == idCardBarcode && t_tousseInstanceBarcode == tousseInstanceBarcode){
+		if(t_basketBarcode == item.basketBarcode && itemType == t_itemType && t_tousseName == tousseName && t_tousseDefinitionID == item.tousseDefinitionID && t_idCardBarcode == idCardBarcode && t_tousseInstanceBarcode == tousseInstanceBarcode){
     		if(itemType == '材料' && (tousseNameForMaterial != t_tousseNameForMaterial || basketGroupBarcodes != t_basketGroupBarcodes)){
     			continue;
     		}
@@ -200,10 +200,10 @@
 	    	if(tousseArray[i].amount === 0){
 	    		//如果数量为0,入筐后又移除了
 	    		deleteIndex.push(i);
-	    	}
+			}
     		sigle = false;
     	}
-    }
+	}
     for(var i = 0; i < deleteIndex.length;++i){
     	tousseArray.splice(deleteIndex[i],1);
     }
@@ -709,9 +709,7 @@
 		amount: amountLeft
 	}
 	
-	if(loadedAmount == 0){
-		deleteTousseItemArray.push(tousse);
-	}
+	deleteTousseItemArray.push(tousse);
 	//如果主绑物品被删除了，那么也删除对应的次绑物品
 	if(unrecycleTousseItemArray.length > 0){
 		for(var k = 0; k < unrecycleTousseItemArray.length; k++){
@@ -767,7 +765,7 @@
 
 function unloadStaff(tousseDefinitionID,amount,idCardBarcode){
 	$('#tousseItemTable').children().first().children().each(function(i,element){
-           if($('#tousseDefinitionID'+i).val() == tousseDefinitionID){
+           if($('#tousseDefinitionID'+i).val() == tousseDefinitionID && $('#tousseItemsTr'+i).css("display") !== 'none'){
                $('#loadedAmount'+i).val(parseInt($('#loadedAmount'+i).val(),10)-parseInt(amount,10));
                var idCard = $('#isThereIdentificationCard'+i).val();
                if(idCard == '是' && idCardBarcode == ''){
@@ -965,7 +963,6 @@
 		name = item.tousseName;
 		var amount = item.amount;
 		unloadStaff(item.tousseDefinitionID,amount,idCardBarcode);
-
 		if(sumCount == 0){
 			var basketId = basket.classifyBasketId;
 			var containerBarcode = basket.barcode;
@@ -3357,7 +3354,7 @@
         	 trElement.prependTo("#tousseItemTable");//在表格第一行追加行
 		 }
 		 for(var i=0;i<deleteTousseItemArray.length;i++){
-			 if(deleteTousseItemArray[i].tousseName == tousseName && deleteTousseItemArray[i].tousseDefinitionID == tousseDefinitionID && loadedAmount == 0){
+			 if(deleteTousseItemArray[i].tousseName == tousseName && deleteTousseItemArray[i].tousseDefinitionID == tousseDefinitionID){
 				deleteTousseItemArray.splice(i,1);
 			 }
 		 }