Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r19292 -r19295
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19292)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19295)
@@ -2132,10 +2132,23 @@
 	
 	var basketTreeGridCheckedNodes = basketTreeGrid.getView().getChecked();
 	var waitPackingTreeCheckedNodes = waitPackingTreeGrid.getView().getChecked();
+	if(basketTreeGridCheckedNodes.length > 1){
+		return false;
+	}
+	if(waitPackingTreeCheckedNodes.length > 1){
+		return false;
+	}
 	var totalCheckedNodesLength = basketTreeGridCheckedNodes.length + waitPackingTreeCheckedNodes.length;
-	if(totalCheckedNodesLength != 1){
+	if(totalCheckedNodesLength < 1){
 		return false;
 	}
+	
+	if(totalCheckedNodesLength == 2){
+		if(basketTreeGridCheckedNodes[0].get("tousseName") != waitPackingTreeCheckedNodes[0].get("tousseName")){
+			return false;
+		}
+	}
+	
 	var basketTreeGridSelectionNodes = basketTreeGrid.getView().getSelectionModel().getSelection();
 	var waitPackingTreeSelectionNodes = waitPackingTreeGrid.getView().getSelectionModel().getSelection();
 	var totalSelectionNodesLength = basketTreeGridSelectionNodes.length + waitPackingTreeSelectionNodes.length;
@@ -2152,20 +2165,24 @@
 		checkedNode = waitPackingTreeCheckedNodes[0];
 	}
 	var tousseName = checkedNode.get("tousseName");
-	if(basketTreeGridSelectionNodes.length > 0){
-		for(var i=0;i<basketTreeGridSelectionNodes.length;++i){
-			if(tousseName != basketTreeGridSelectionNodes[i].get("tousseName")){
-				return false;
-			}
-		}
+//	if(basketTreeGridSelectionNodes.length > 0){
+//		for(var i=0;i<basketTreeGridSelectionNodes.length;++i){
+//			if(tousseName != basketTreeGridSelectionNodes[i].get("tousseName")){
+//				return false;
+//			}
+//		}
+//	}
+//	if(waitPackingTreeSelectionNodes.length > 0){
+//		for(var i=0;i<waitPackingTreeSelectionNodes.length;++i){
+//			if(tousseName != waitPackingTreeSelectionNodes[i].get("tousseName")){
+//				return false;
+//			}
+//		}
+//	}
+	var tousseName2 = Ext4.getCmp('imageName').getText();
+	if(tousseName != tousseName2){
+		return false;
 	}
-	if(waitPackingTreeSelectionNodes.length > 0){
-		for(var i=0;i<waitPackingTreeSelectionNodes.length;++i){
-			if(tousseName != waitPackingTreeSelectionNodes[i].get("tousseName")){
-				return false;
-			}
-		}
-	}
 //	var selectionNode = null;
 //	if(basketTreeGridSelectionNodes.length > 0){
 //		selectionNode = basketTreeGridSelectionNodes[0];
@@ -2513,7 +2530,7 @@
                  	if(useManualSelectPackageType()){
                  		packageType = Ext4.getCmp('packageType').getValue();
                  	}
-//                 	alert('useManualSelectPackageType='+useManualSelectPackageType())
+//                 	alert('useManualSelectPackageType='+useManualSelectPackageType());
                  	sterilingType = cNode.get("sterilingMethod");
                  	if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){
                  		sterilingType = Ext4.getCmp('sterilingType').getValue();
@@ -2621,6 +2638,7 @@
                  	if(useManualSelectPackageType()){
                  		packageType = Ext4.getCmp('packageType').getValue();
                  	}
+//                 	alert('useManualSelectPackageType='+useManualSelectPackageType());
                  	sterilingType = cNode.get("sterilingMethod");
                  	if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){
                  		sterilingType = Ext4.getCmp('sterilingType').getValue();