Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js
===================================================================
diff -u -r34779 -r34784
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 34779)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 34784)
@@ -165,6 +165,8 @@
 		hiddenColumnsOfInvoiceListView:["签收人","签收时间"],
 		//启用保存时提示用户确认灭菌程序
 		enablePromptUserToConfirmSterilizationProcedureWhenSaving:true,
+		//装配时自动设置标识牌条码（前提是一个包实例只能装一个篮筐而且是整包清洗）
+		autoSetIDCardBarcodeForPacking:true,
 		//允许选择多个标识牌的包进行批量装配
 		allowSelectMultipleIDCardsForBatchPacking:true,
 		//启用监测元素可追加到监测记录备注的功能
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34779 -r34784
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34779)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34784)
@@ -4016,7 +4016,7 @@
 			return;
 		}
 
-		if(sstsConfig.allowSelectMultipleIDCardsForBatchPacking){
+		if(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking){
 			var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
 			var basketTreeGridCheckedNodes = basketTreeGrid.getView().getChecked();
 			var idCardTaskNodeArr = [];
@@ -4103,7 +4103,7 @@
 				var haveIDCard = pNode.get('haveIDCard');
 				var idCardBarcode = pNode.get('idCardBarcode');
 				//跳过有标识牌的器械包
-				if(!sstsConfig.allowSelectMultipleIDCardsForBatchPacking){
+				if(!(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking)){
 					if (haveIDCard) {
 						showResult("【" + pTousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
 						onPackingTousseBtnClickComplete();
@@ -5474,7 +5474,7 @@
 		lastSelectedTousseName = tousseName;
 		// 显示丢失报损按钮
 		showOrHideErrorAndDamageBtn();
-		if(!sstsConfig.allowSelectMultipleIDCardsForBatchPacking){
+		if(!(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking)){
 			var idCardBarcodeTemp = record.get("idCardBarcode");
 			if (record.childNodes.length > 0) {
 				idCardBarcodeTemp = record.childNodes[0].get("idCardBarcode");