Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32522 -r32526
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32522)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32526)
@@ -593,7 +593,7 @@
  * @param tempBarcode 条码
  * @param manualScan 扫标识牌条码时传true,篮筐条码传false
  */
-function loadIdCardByBarcode(tempBarcode,manualScan){
+function loadIdCardByBarcode(tempBarcode,manualScan,autoSetIDCardBarcodeForPacking){
     var barcode = tempBarcode;
     PackingTableManager.getIDCardInfoForPackingView(barcode,function(resultJsonStr){
     	var result = JSON.parse(resultJsonStr);
@@ -613,7 +613,7 @@
         			var lastOptions = waitPackingTaskStore.lastOptions;
         			lastOptions = Ext4.clone(lastOptions);
         			lastOptions.callback = function(){
-    	    			loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan);
+    	    			loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan,autoSetIDCardBarcodeForPacking);
     	    		};
     	    		waitPackingTaskStore.reload(lastOptions);
     	    		waitPackingTaskStore.lastOptions.callback = null;
@@ -623,7 +623,7 @@
     			showResult('不存在该标识牌对应的装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage);
     			return;
     		}else{
-    			loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan);
+    			loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan,autoSetIDCardBarcodeForPacking);
     		}
     	}
     	else
@@ -635,7 +635,7 @@
     });
 }
 //
-function loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan){
+function loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan,autoSetIDCardBarcodeForPacking){
 
 	var tousseName = result.idCard.tousseDefinition.name;
 	var taskList = result.idCard.packingTaskInfo;
@@ -689,9 +689,14 @@
 	// 取消选中所有的装配任务，只选中该标识牌的
 	uncheckAllExceptCurrentIDCardPackingTask();
 	currentIDCardInfo = result.idCard;
-	Ext4.getCmp('idCardBarcode').setValue(barcode);
-	Ext4.getCmp('idCardName').setValue(tousseName + "（条码：" + barcode + "）");
-	Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount);
+	if(autoSetIDCardBarcodeForPacking){
+		Ext4.getCmp('idCardBarcode').setValue(barcode);
+		Ext4.getCmp('idCardName').setValue(tousseName + "（条码：" + barcode + "）");
+		Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount);
+		Ext4.getCmp('operatorBarcode').focus();
+	}else {
+		Ext4.getCmp('idCardBarcode').focus();
+	}
 	var sterilingType = idCardTaskNode.get("sterilingMethod");
 	var packageType;
  	if(sstsConfig.enableIdCardDefaultPackageType){//标识牌增加包装类型
@@ -712,7 +717,6 @@
 	idCardInstanceID = result.idCard.id;
 	idCardInfo = result.idCard;
 //	alert(idCardInstanceID)
-	Ext4.getCmp('operatorBarcode').focus();
 	// 做保养器械包的处理
 	maintainTousse();
 	refreshErrorAndDamageRemark(idCardTaskNode);
@@ -1760,7 +1764,7 @@
 					if(processActionBarcode(thiz)){
 						return;
 					}
-					loadIdCardByBarcode(thiz.getValue(),true);
+					loadIdCardByBarcode(thiz.getValue(),true,true);
 					thiz.setValue();
 				}
 			}
@@ -4989,7 +4993,8 @@
 	showOrHideErrorAndDamageBtn();
 	var idCardBarcodeTemp = record.get("idCardBarcode");
 	if(idCardBarcodeTemp != ""){
-		loadIdCardByBarcode(idCardBarcodeTemp,false);
+		var autoSetIDCardBarcodeForPacking = sstsConfig.autoSetIDCardBarcodeForPacking;
+		loadIdCardByBarcode(idCardBarcodeTemp,false,autoSetIDCardBarcodeForPacking);
 	}else {
 		if(storeId !== 'basketTreeGrid'){
 			clearInputedIDCardInfo();