Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r40927 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40927)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41022)
@@ -30,6 +30,8 @@
 var showSterileField = false;
 var sterileFieldAllowBlank = true;
 
+var enableSNCode;
+
 var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试
 var packedToussesArray = [];// 用于一次打印所有装配的包
 var tousseesToPrint = [];
@@ -3998,6 +4000,37 @@
 							}
 						});
 					}
+				},{
+					xtype: 'button',
+					margin: '0 0 0 10',
+					id: 'enableSNCode',
+					hidden: !sstsConfig.enableSNRecognition,
+					text: '<span style="font-weight: bold;">' + '启用SN序列号识别' + '</span>',
+					handler: function () {
+						enableSNCode = setInterval(function () {
+							var title = windowLocalStorage('get', 'title');
+							if (title.indexOf('装配') > -1) {
+								var idCardBarcode = Ext4.getCmp('idCardBarcode').getValue();
+								if (idCardBarcode !== snText) {
+									Ext4.getCmp('idCardBarcode').setValue(snText)
+									loadIdCardByBarcode(snText, true, true, 'scan');
+								}
+							}
+						}, 2000);
+						Ext4.getCmp('enableSNCode').hide();
+						Ext4.getCmp('disabledSNCode').show();
+					}
+				},{
+					xtype: 'button',
+					margin: '0 0 0 10',
+					id: 'disabledSNCode',
+					hidden: true,
+					text: '<span style="font-weight: bold;">' + '禁用SN序列号识别' + '</span>',
+					handler: function () {
+						clearInterval(enableSNCode);
+						Ext4.getCmp('enableSNCode').show();
+						Ext4.getCmp('disabledSNCode').hide();
+					}
 				}]
 			}
 		]
@@ -9886,4 +9919,18 @@
 		});
 		reflushWaitPackingTreeGrid();
 	}
+}
+
+//ZSYKEQ-8：识别器械SN序列号
+var snText = '';
+function websocketBySNDataCallBack(obj) {
+	if(sstsConfig.enableSNRecognition && obj){
+		if(obj.status == 'success'){
+			var text = obj.text || '';
+			var ClientIp = obj.ClientIp || '';
+			if(text !== ''&& ClientIp == serverName){
+				snText = text;
+			}
+		}
+	}
 }
\ No newline at end of file