Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r14519 -r14559
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14519)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14559)
@@ -593,7 +593,7 @@
 							}
 						}
 						// 刷新waitPackingTreeGrid
-						reflushWaitPackingTreeGrid();
+						Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
 					}
 				},
 				failure : function(response, options) {
@@ -1018,11 +1018,15 @@
 						 var amount = taskItemArray[i].amount;
 						 Ext4.Array.each(taskNodes,function(cNode){
 							 if(cNode.get('taskId') == taskId){
-								 if(amount < cNode.get('amount')){
-									 cNode.set('amount',cNode.get('amount') - amount);
-								 }else{
-									 var len = delNodes.length;
-									 delNodes[len] = cNode;
+								 var errors = cNode.get('errors');
+								 var damages = cNode.get("damages");
+								 if((errors == null || errors.length == 0) && (damages == null || damages.length == 0)){
+									 if(amount < cNode.get('amount')){
+										 cNode.set('amount',cNode.get('amount') - amount);
+									 }else{
+										 var len = delNodes.length;
+										 delNodes[len] = cNode;
+									 }
 								 }
 							 }
 						 });
@@ -2492,6 +2496,9 @@
 																		newParentNode = true;
 																	}
 																	var cLength = taskVO.children.length;
+																	
+																	var childNodes = parentNode.childNodes;
+																	var childNodeLength = childNodes.length;
 																	for (var j = 0; j < cLength; j++) {
 																		var task = taskVO.children[j];
 																		var taskId = task.taskId;
@@ -2513,19 +2520,18 @@
 																		var taskType = task.taskType;
 																		var supplierName = task.supplierName;
 																		var sigle = true;
-																		var childNodes = parentNode.childNodes;
 																		speakBasket.addGoods(basketName, tousseName, amount);
-																		for (var m = 0; m < childNodes.length; m++) {
+																		for (var m = 0; m < childNodeLength; m++) {
 											            					var cNode = childNodes[m];
 											            					if(cNode.get('taskId') == taskId){
 																				sigle = false;
-																				return;
+																				break;
 																			}
 											            				}
 																		if(sigle){
 																			var childNode =	addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-																					taskStatus,department,tousseType, packageType, 
-																					sterilingMethod,dateTime,isTraceable,isPrint,isReview,errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount);
+																					taskStatus,department,tousseType, packageType,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
+																					errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount);
 																			parentNode.appendChild(childNode);
 																			var pNewAmount = parentNode.get('amount') + amount;
 																			parentNode.set('amount',pNewAmount);