Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r29947 -r29953
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29947)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29953)
@@ -3496,7 +3496,8 @@
 	setTimeout(packingTousseBtnClick_DeferredExecution,100);
 }
 // 装配按钮调用,延迟执行 
-function packingTousseBtnClick_DeferredExecution(){
+function packingTousseBtnClick_DeferredExecution(isConfirm){
+	isConfirm = isConfirm || '否';
 	 var basketTree = Ext4.getCmp('basketTreeGrid');
 	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
 	 var selNodes = basketTree.getView().getChecked();
@@ -3513,6 +3514,18 @@
 				}
 			}
 		});
+		if(dest.length == 1 && isConfirm == '否'){
+			var sterilingType = Ext4.getCmp('sterilingType').getValue();
+			if(dest[0].data.sterilingMethod !== sterilingType){
+				Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName')+'的灭菌程序与包定义不相同，是否继续装配？',
+					function(btn) {
+						if (btn == 'yes') {
+							packingTousseBtnClick_DeferredExecution('是')
+						}
+				});
+				return
+			}
+		}
 		for(var i=0;i<dest.length;i++){
 			var pNode = dest[i];
 			var pTousseName = pNode.get('tousseName');
@@ -4486,7 +4499,7 @@
 
 
 //点击器械包的时候触发事件
-function itemClickFunction(record,storeId,isChecked,isEnd){
+function itemClickFunction(record,storeId){
 	var tousseName = record.get('tousseName');
 	var sterilingMethod = record.get('sterilingMethod');
 	var packageType = record.get('packageType');
@@ -4510,15 +4523,12 @@
 			Ext4.getCmp('packingLableBtn').hide();
 		}
 	}
-	var isLeaf = record.get('leaf');
-	if(!isLeaf){
-		if(record.get('checked') == false){
-			record.set('checked', true);
-			if(storeId == 'basketTreeGrid'){
-				basketColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked'));
-			}else {
-				waitPackColumnTreeGrid.getView().fireEvent('checkchange', record, record.get('checked'));
-			}
+	if(record.get('checked') == false){
+		record.set('checked', true);
+		if(storeId == 'basketTreeGrid'){
+			basketColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked'));
+		}else {
+			waitPackColumnTreeGrid.getView().fireEvent('checkchange', record, record.get('checked'));
 		}
 	}
 	var root;
@@ -4528,47 +4538,55 @@
 		var waitPackingTreeGrid = Ext4.getCmp("waitPackingTreeGrid");
 		root = waitPackingTreeGrid.getRootNode();
 	}
-	var arr = [];
-	Ext4.each(root.childNodes, function(pNode){
-		if(pNode.get('checked') == true){
-			if(isChecked == true || (isChecked == false && pNode.get('tousseName') !== tousseName)){
-				arr.push(pNode)
-			}
-		}
-	})
-	if(arr.length == 1 && isEnd == false){
-		itemClickFunction(arr[0],storeId,isChecked,true);
-		return
+	updateNoteWindow(record);
+	loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
+	lastSelectTousseName = tousseName;
+	lastSelectimageTypeTousse = imageType_tousse;
+	lastSelectVedioName = vedioName;
+	lastSelectTdId = td_id;
+	if(packingPageAutoSetSterilizationProgramAfterSelectTousse){
+		Ext4.getCmp('sterilingType').setValue(sterilingMethod);
+		//根据灭菌程序设置灭菌方式的值
+		setSterilingModeValueBySterilingType(sterilingMethod);
+	}
+	Ext4.getCmp('packageType').setValue(packageType);
+	lastSelectedTousseName = tousseName;
+	// 显示丢失报损按钮
+	showOrHideErrorAndDamageBtn();
+	var idCardBarcodeTemp = record.get("idCardBarcode");
+	if(idCardBarcodeTemp != ""){
+		loadIdCardByBarcode(idCardBarcodeTemp,false);
 	}else {
-		updateNoteWindow(record);
-		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
-		lastSelectTousseName = tousseName;
-		lastSelectimageTypeTousse = imageType_tousse;
-		lastSelectVedioName = vedioName;
-		lastSelectTdId = td_id;
-		if(packingPageAutoSetSterilizationProgramAfterSelectTousse){
-			Ext4.getCmp('sterilingType').setValue(sterilingMethod);
-			//根据灭菌程序设置灭菌方式的值
-			setSterilingModeValueBySterilingType(sterilingMethod);
+		if(storeId !== 'basketTreeGrid'){
+			clearInputedIDCardInfo();
 		}
-		Ext4.getCmp('packageType').setValue(packageType);
-		lastSelectedTousseName = tousseName;
-		// 显示丢失报损按钮
-		showOrHideErrorAndDamageBtn();
-		var idCardBarcodeTemp = record.get("idCardBarcode");
-		if(idCardBarcodeTemp != ""){
-			loadIdCardByBarcode(idCardBarcodeTemp,false);
-		}else {
-			if(storeId !== 'basketTreeGrid'){
-				clearInputedIDCardInfo();
-			}
-		}
-		refreshErrorAndDamageRemark(record);
-		refreshRemarks(record);
-		refreshRecyclingItemRemark(record);
 	}
+	refreshErrorAndDamageRemark(record);
+	refreshRemarks(record);
+	refreshRecyclingItemRemark(record);
 }
 
+function updatePackageType(storeId){
+	var storeIds = Ext4.getCmp(storeId);
+	var selNodes = storeIds.getView().getChecked();
+	var selLength = selNodes.length;
+	if(selLength > 0){
+	   var map = {},dest = [];
+	   Ext4.each(selNodes, function(pNode){
+		   if(pNode.childNodes.length == 0){
+			   var ai = pNode;
+			   if(!map[ai.get('tousseName')]){
+				   dest.push(ai);
+				   map[ai.get('tousseName')] = ai;
+			   }
+		   }
+	   });
+	   if(dest.length == 1){
+			itemClickFunction(dest[0],storeId);
+	   }
+	}
+}
+
 basketColumnTreeGrid = Ext4.create('columnTreeGrid', {
 	id : 'basketTreeGrid',
 	height: (document.body.clientHeight - 30)/2,
@@ -4578,11 +4596,10 @@
 	listeners:{
 		// cellclick事件改为select事件，便于selenium进行测试
 		itemclick : function( thiz, record, index, eOpts ){
-			if(record.get('checked') == true){
-				itemClickFunction(record,'basketTreeGrid',false,false);
-				return
-			}
-			itemClickFunction(record,'basketTreeGrid',true,true);
+			itemClickFunction(record,'basketTreeGrid');
+			setTimeout(function(){
+				updatePackageType('basketTreeGrid');
+			}, 200);
 	   },
 	   load: {
 		fn: function(store){
@@ -4804,11 +4821,10 @@
 	listeners:{
 		// cellclick事件改为select事件，便于selenium进行测试
 		itemClick : function( thiz, record, index, eOpts ){
-			if(record.get('checked') == true){
-				itemClickFunction(record,'waitPackingTreeGrid',false,false);
-				return
-			}
-			itemClickFunction(record,'waitPackingTreeGrid',true,true);
+			itemClickFunction(record,'waitPackingTreeGrid');
+			setTimeout(function(){
+				updatePackageType('waitPackingTreeGrid');
+			}, 200);
 		},
 		load: {
 			fn: function(store){