Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37131 -r37133
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37131)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37133)
@@ -4624,12 +4624,7 @@
 			onPackingTousseBtnClickComplete();
 			return;
 		}
-		// 首先处理标识牌的打印
-		var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
-		if (scanScanIDCardBarcode.isVisible(true)) {
-			printIDCardTousse();
-			return;
-		}
+
 		if (sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking) {
 			var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
 			var basketTreeGridCheckedNodes = basketTreeGrid.getView().getChecked();
@@ -4653,6 +4648,13 @@
 					return;
 				}
 			}
+		} else {
+			// 首先处理标识牌的打印
+			var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
+			if (scanScanIDCardBarcode.isVisible(true)) {
+				printIDCardTousse();
+				return;
+			}
 		}
 		if (!validateFormParamsForPack()) {
 			onPackingTousseBtnClickComplete();
@@ -6558,11 +6560,6 @@
 					if (sstsConfig.enablePackingMaterialsCheckFunction) {
 						getPackingMaterialsForCheckFun(record);
 					}
-					if (sstsConfig.autoSetIDCardBarcodeForPacking) {
-						if(record.data.idCardBarcode && record.data.idCardBarcode !== ''){
-							loadIdCardByBarcode(record.data.idCardBarcode, true, true, 'scan');
-						}
-					}
 				}, 200);
 			},
 			load: {
@@ -6782,11 +6779,6 @@
 							getPackingMaterialsForCheckFun(record);
 						}
 					}
-					if (sstsConfig.autoSetIDCardBarcodeForPacking) {
-						if(record.data.idCardBarcode && record.data.idCardBarcode !== ''){
-							loadIdCardByBarcode(record.data.idCardBarcode, true, true, 'scan');
-						}
-					}
 				}, 200);
 			},
 			load: {