Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r18149 -r18154
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 18149)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 18154)
@@ -1740,21 +1740,18 @@
 	}
 }
 
-function refreshErrorAndDamageRemark(){
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
-	var basketTreeSelNodes = basketTree.getView().getChecked();
-	var waitPackingTreeSelNodes = waitPackingTree.getView().getChecked();
-	var edRemark = getErrorDamageRemark(basketTreeSelNodes);
-	if(edRemark && (edRemark.errorRemark || edRemark.damageRemark)){
-		Ext4.getCmp('errorRemark').setValue(edRemark.errorRemark);
-		Ext4.getCmp('damageRemark').setValue(edRemark.damageRemark);
-	}else{
-		edRemark = getErrorDamageRemark(waitPackingTreeSelNodes);
-		if(edRemark && (edRemark.errorRemark || edRemark.damageRemark)){
-			Ext4.getCmp('errorRemark').setValue(edRemark.errorRemark);
-			Ext4.getCmp('damageRemark').setValue(edRemark.damageRemark);
+function refreshErrorAndDamageRemark(record){
+	if(record){
+		var errorRemark  = record.get("errorRemark");
+		var damageRemark = record.get("damageRemark");
+		if(!errorRemark){
+			errorRemark = '';
 		}
+		if(!damageRemark){
+			damageRemark = '';
+		}
+		Ext4.getCmp('errorRemark').setValue(errorRemark);
+		Ext4.getCmp('damageRemark').setValue(damageRemark);
 	}
 }
 
@@ -2730,6 +2727,7 @@
            	if(!isLeaf){
                	if(record.get('checked') == false){
                		record.set('checked', true);
+               		refreshErrorAndDamageRemark(record);
                		basketColumnTreeGrid.getView().fireEvent('checkchange');
            		}
            	}else{
@@ -2741,7 +2739,6 @@
         	 resetScanIDCardBarcodeVisibility(node);
         	 setPackageTypeReadOnlyByCondition();
         	 clearRemarkByCondition();
-        	 refreshErrorAndDamageRemark();
         	 if(!checked){
         		 deselectCheckAll();
         	 }
@@ -2996,7 +2993,8 @@
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
            		if(record.get('checked') == false){
-               		record.set('checked', true);  
+               		record.set('checked', true); 
+               		refreshErrorAndDamageRemark(record);
                		waitPackColumnTreeGrid.getView().fireEvent('checkchange');
                		}
                	}else{
@@ -3007,7 +3005,6 @@
         	resetScanIDCardBarcodeVisibilityWaitPacking(node);
         	setPackageTypeReadOnlyByCondition();
         	clearRemarkByCondition();
-        	refreshErrorAndDamageRemark();
         },
         itemcontextmenu : taskItemMenu
         },