Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32769 -r32794
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32769)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32794)
@@ -3410,7 +3410,7 @@
 	//刷新待装配列表
 	waitPackingTreeGrid.getStore().reload();
 	//刷新篮筐内物品
-	reloadBasketTreeGrid();
+	reloadBasketTreeGrid(false);
 	return packed;
 }
 
@@ -4343,17 +4343,8 @@
 		if(isTrue){
 			printLabelsAfterPacking(params);
 			//刷新篮筐内物品
-			reloadBasketTreeGrid();
-			var basketTree = Ext4.getCmp('basketTreeGrid');
+			reloadBasketTreeGrid(false);
 			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-			var selNodes = basketTree.getView().getChecked();
-			var selLength = selNodes.length;
-			//打印后去掉选中的钩
-			if(selLength > 0){
-				Ext4.each(selNodes, function(pNode){
-					pNode.set("checked", false);
-				});
-			}
 			//刷新待装配列表
 			waitPackingTreeGrid.getStore().reload();
 			showScanIDCardBarcode();
@@ -4629,15 +4620,55 @@
 }
 
 //刷新待装配任务的数据
-function reloadBasketTreeGrid(){
-	var basketBarcodeArr = getBasketBarcode();
-	if(basketBarcodeArr.length > 0){
-		Ext4.getCmp('basketTreeGrid').getStore().reload();
-		for(var z=0;z<basketBarcodeArr.length;z++){
-			scanBasketBarcodes(basketBarcodeArr[z],2);
+function reloadBasketTreeGrid(isReload){
+	if(isReload == true){
+		var basketBarcodeArr = getBasketBarcode();
+		if(basketBarcodeArr.length > 0){
+			Ext4.getCmp('basketTreeGrid').getStore().reload();
+			for(var z=0;z<basketBarcodeArr.length;z++){
+				scanBasketBarcodes(basketBarcodeArr[z],2);
+			}
+		}else {
+			Ext4.getCmp('basketTreeGrid').getStore().reload();
 		}
 	}else {
-		Ext4.getCmp('basketTreeGrid').getStore().reload();
+		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 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;
+					for(var i=0;i<pNode.childNodes.length;i++){
+						var lastNode = pNode.childNodes[i];
+						var amount = lastNode.get('amount');
+						sumAmount += amount;
+					}
+					pNode.set('amount',sumAmount);
+					pNode.set("checked", false);
+				}
+			});
+		}
 	}
 }
 
@@ -4677,7 +4708,7 @@
 	openCameraPhotoWindow(params,function(returnValue){
         if(flag !== returnValue){
 			//刷新篮筐内物品
-			reloadBasketTreeGrid();
+			reloadBasketTreeGrid(true);
 		}
     });
 }