Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32794 -r32798
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32794)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32798)
@@ -4634,38 +4634,75 @@
 	}else {
 		var basketTree = Ext4.getCmp('basketTreeGrid');
 		var selNodes = basketTree.getView().getChecked();
-		var selLength = selNodes.length;
-		if(selLength > 0){
-			Ext4.each(selNodes, function(pNode){
-				if(pNode.get('checked') == true){
-					if(pNode.childNodes.length == 0){
-						var amount = pNode.get('amount');
-						var maxAmount = pNode.get('maxAmount');
-						if(amount == maxAmount){
-							pNode.remove();
-						}else {
-							var newAmount = maxAmount - amount;
-							pNode.set('amount',newAmount);
-							pNode.set('maxAmount',newAmount);
-							pNode.set("checked", false);
+		var map = {},dest = [];
+		Ext4.each(selNodes, function(pNode){
+			if(pNode.childNodes.length == 0){
+				var ai = pNode;
+				if(!map[ai.get('tousseName')]){
+					dest.push(ai.parentNode);
+					map[ai.get('tousseName')] = ai;
+				}
+			}
+		});
+		if(dest.length > 0){
+			Ext4.each(dest, function(pNode){
+				var parentAmout = pNode.get('amount');
+				var parentChecked = pNode.get('checked');
+				var parentMaxAmount = pNode.get('maxAmount');
+				if(parentChecked == true){
+					var amountSum = 0;
+					for(var i=0;i<pNode.childNodes.length;i++){
+						var amount = pNode.childNodes[i].get('amount');
+						var maxAmount = pNode.childNodes[i].get('maxAmount');
+						amountSum += parseInt(maxAmount);
+					}
+					if(parentAmout >= amountSum){
+						pNode.remove();
+					}else {
+						var removeArr = [];
+						for(var i=0;i<pNode.childNodes.length;i++){
+							var maxAmount = pNode.childNodes[i].get('maxAmount');
+							var parentAmout = pNode.get('amount');
+							if(maxAmount > parentAmout){
+								var newAmount = maxAmount - parentAmout;
+								parentMaxAmount = parentMaxAmount - parentAmout;
+								pNode.childNodes[i].set('amount',newAmount);
+								pNode.childNodes[i].set('maxAmount',newAmount);
+								pNode.childNodes[i].set("checked", false);
+								for(var j=0;j<removeArr.length;j++){
+									var node = removeArr[j];
+									var amount = node.get('amount');
+									parentMaxAmount = parentMaxAmount - amount;
+									node.remove();
+								}
+								pNode.set('amount',parentMaxAmount);
+								pNode.set('checked',false);
+								return false;
+							}else {
+								removeArr.push(pNode.childNodes[i])
+								pNode.set('amount',parentAmout-maxAmount);
+							}
 						}
 					}
-				}
-			});
-			var rootNode = basketTree.getRootNode();
-			var tousseNodes = rootNode.childNodes.slice(0);
-			Ext4.each(tousseNodes, function(pNode){
-				if(pNode.childNodes.length == 0){
-					pNode.remove();
 				}else {
-					var sumAmount = 0;
+					var amountSum = 0;
 					for(var i=0;i<pNode.childNodes.length;i++){
-						var lastNode = pNode.childNodes[i];
-						var amount = lastNode.get('amount');
-						sumAmount += amount;
+						var amount = pNode.childNodes[i].get('amount');
+						var maxAmount = pNode.childNodes[i].get('maxAmount');
+						var checked = pNode.childNodes[i].get('checked');
+						if(checked == true){
+							if(amount == maxAmount){
+								pNode.childNodes[i].remove();
+							}else {
+								var newAmount = maxAmount - amount;
+								pNode.childNodes[i].set('amount',newAmount);
+								pNode.childNodes[i].set('maxAmount',newAmount);
+								pNode.childNodes[i].set("checked", false);
+							}
+						}
+						amountSum += parseInt(pNode.childNodes[i].get('amount'));
 					}
-					pNode.set('amount',sumAmount);
-					pNode.set("checked", false);
+					pNode.set('amount',amountSum);
 				}
 			});
 		}
@@ -4915,6 +4952,7 @@
 							parentNode.set('urgentLevel',urgentLevel);
 						}
 						parentNode.set('amount',pNewAmount);
+						parentNode.set('maxAmount',pNewAmount);
 						parentNode.set('urgentAmount',purgentAmount);
 						parentNode.set('unPackingAmount',pNewAmount);
 					}