Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r21513 -r21522
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 21513)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 21522)
@@ -118,6 +118,8 @@
 				directPackingTousseDefinitionId = tousseId;
 				
 	        	Ext.getCmp('operatorBarcode').focus();
+	        	// 自动装配
+	        	directPacking_autoPacking();
 	    	}
 	    	else
 	    	{
@@ -128,6 +130,11 @@
 	    barcodeField.setValue();
 	}
 	
+	function directPacking_autoPacking(){
+		if(sstsConfig.autoPackingAfterScanIdCard){
+			submitPacking('');
+    	}
+	}
 	function loadIdCardByBarcodeForRepacking(barcodeField){
 		var barcode = barcodeField.getValue();
 		PackingTableManager.loadIdCardByBarcodeForRepacking(barcode,function(resultJsonStr){
@@ -156,6 +163,8 @@
 				directPackingTousseDefinitionId = tousseId;
 				
 	        	Ext.getCmp('operatorBarcode').focus();
+	        	// 自动装配
+	        	directPacking_autoPacking();
 	    	}
 	    	else
 	    	{
@@ -493,7 +502,8 @@
 	function loadTousseInfo(id) {
 		Ext.getCmp('sterilingType1').setValue('');
 		Ext.getCmp('packageType').setValue('');
-		Ext.Ajax.request({
+		Ext4.Ajax.request({
+		   async: false,
 		   url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinition.do',
 		   params: { id: id },
 		   success: function(response, options){
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r21495 -r21522
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21495)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21522)
@@ -6036,7 +6036,9 @@
 			
 			retObj.put("tousseInstances", tousses);
 		}
-
+//		if(true){
+//			throw new RuntimeException("自定义装配速度测试 ");
+//		}
 		updatePackingConfigSession(request);
 	}
 
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r21496 -r21522
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 21496)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 21522)
@@ -367,6 +367,10 @@
 	refreshErrorAndDamageRemark(idCardTaskNode);
 	refreshRecyclingItemRemark(idCardTaskNode);
 
+	if(manualScan){
+		// 自动装配
+		packingView_autoPacking();
+	}
 }
 
 function reSetParentNodeAmount(delNode){
@@ -2582,6 +2586,13 @@
 	 return true;
 }
 var packing = false;
+function packingView_autoPacking(){
+	if(sstsConfig.autoPackingAfterScanIdCard){
+		packing = true;
+		Ext4.getCmp('save_print').disable();
+		packingTousseBtnClick();
+	}
+}
 function onPackingTousseBtnClickComplete(){
 	Ext4.getCmp('save_print').enable();
 	Ext4.getCmp('packingLableBtn').enable();
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r21513 -r21522
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 21513)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 21522)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 禁用标识牌功能
   disableIdCard : false,
   // 审核器械包必须入篮筐（一级供应室）
@@ -238,6 +238,8 @@
   waitPackingTaskGrid_show_foreignTousse_customSplitBasketAmount: true,
   // 自定义装配，初始聚焦的域
   directPacking_initialFocusField: 'scanIdCardBarcode',
+  // 扫描标识牌条码之后自定点击装配
+  autoPackingAfterScanIdCard: true,
   //科室申领中，是否重复打印当天已经打印的申领物品
   reprintTodayPrintedTousseItem : true
 }
\ No newline at end of file