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){