Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r40845 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 40845)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 41022)
@@ -253,6 +253,7 @@
 var source = '${param.source}';
 var fromLogin = '${fromLogin}';
 var cleanBasketBarcodes = '${param.cleanBasketBarcodes}';
+var serverName = '<%=request.getServerName()%>';
 if(fromLogin == 'true'){
 	welcome(departName,userName);
 	<%session.removeAttribute("fromLogin");%>
@@ -598,6 +599,22 @@
         line-height:200px; 
         overflow:hidden;
     }
+    .add-form .add4,.add-form .add4:hover{
+        right: 360px;
+        background:url('./1980/images/enableSNCode.png') no-repeat; 
+        width:166px; 
+        height:64px; 
+        line-height:200px; 
+        overflow:hidden;
+    }
+    .add-form .add5,.add-form .add5:hover{
+        right: 360px;
+        background:url('./1980/images/disabledSNCode.png') no-repeat; 
+        width:166px; 
+        height:64px; 
+        line-height:200px; 
+        overflow:hidden;
+    }
     #divElement {
         right: 225px;
         top: 280px;
@@ -818,6 +835,8 @@
                 <div class="add2" id="customIntoBasketDiv" onclick="openCustomIntoBasketPage();"></div>
                 <div class="addQM"><a href="javascript:void(0);" id="add-QM" onclick="addQM();" style="${recycleAddQualityMonitoring}"></a></div>
                 <div class="add2 add3" id="openPortBtn" style="display:none" onclick="connectRFIDFun();">连接FRID设备</div>
+                <div class="add2 add4" id="enableSNCode" style="display:none" onclick="enableSNCode();">启用SN序列号识别</div>
+                <div class="add2 add5" id="disabledSNCode" style="display:none" onclick="disabledSNCode();">禁用SN序列号识别</div>
                 <div class="departmentTemplate" style="right: 365px;">
                     <label>选择模板:</label>
                     <select id="departmentTemplate">
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
===================================================================
diff -u -r38911 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 38911)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 41022)
@@ -128,6 +128,8 @@
   showAsTousseSplitAmount:true,
 	   //是否显示辅助发货按钮
   showAuxiliaryInvoiceBtn : false,
+  //启用SN序列号识别功能
+  enableSNRecognition:true,
 	    //辅助发货的物品类型
   auxiliaryInvoiceTousseTypes:"敷料包,普通器械包,外来器械包,外部带来灭菌包,消毒物品",
 	  //
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
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/disabledSNCode.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r40646 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 40646)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 41022)
@@ -296,6 +296,7 @@
 	var errorDamageRemark = '<%=HttpOption.SYSTEMSETTING_ERROR_DAMAGE_REMARK %>';
 	var urgentItems = $.parseJSON('<%=urgentItems%>');
 	var urgentItemsObj = urgentItems[0];
+	var serverName = '<%=request.getServerName()%>';
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js?version=${svnRevision}"></script>
 <script>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r40874 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 40874)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 41022)
@@ -62,6 +62,7 @@
 	var voluntarilyUrgentItems = '${param.voluntarilyUrgentItems}';
 	var imageType_qualitymonitoring = '<%=ImageFile.IMAGE_TYPE_QUALITYMONITORING%>';
 	var fromLogin = '${fromLogin}';
+	var serverName = '<%=request.getServerName()%>';
 	if(fromLogin == 'true'){
 		welcome('${orgUnitName}',userName);
 		<%session.removeAttribute("fromLogin");%>
@@ -512,6 +513,8 @@
 		<img src="./1980/images/receivingGood.png" id="receivingGoods" style="margin-left: 20px;display: none;" onclick="receivingGoods();" />
 		<img src="./1980/images/speediness.png" id="intheBox" style="margin-left: 20px;display: none;" onclick="InthebOX()" onmouseout="onmouseoutImg()">
 		<img src="./1980/images/connect_1.png" id="openPortBtn" style="margin-left: 20px;display: none;" onclick="connectRFIDFun(0);" />
+		<img src="./1980/images/enableSNCode.png" id="enableSNCode" style="margin-left: 20px;display: none;" onclick="enableSNCode();" />
+		<img src="./1980/images/disabledSNCode.png" id="disabledSNCode" style="margin-left: 20px;display: none;" onclick="disabledSNCode();" />
 		<img src="./1980/images/setRSSI.png" id="setRSSI" style="margin-left: 20px;display: none;" onclick="setRSSIFun();" />
 	</div>
   </div>
@@ -713,4 +716,10 @@
 <jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
 	<jsp:param value="<%=Workstation.TRIGGERMODULE_RECYCLING %>" name="module"/>
 </jsp:include>
+<!-- 引入websocket组件 -->
+<jsp:include page="${ctx}/disinfectsystem/websocket/websocketClient.jsp">
+	<jsp:param value="" name="module"/>
+	<jsp:param value="" name="taskGroup"/>
+	<jsp:param value="urgentNotifyWebsocket" name="websocketName"/>
+</jsp:include>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r40874 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 40874)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 41022)
@@ -1950,6 +1950,23 @@
 	}
 }
 
+var enableSNCodeTime = null;
+function enableSNCode(){
+	enableSNCodeTime = setInterval(function () {
+		if(snText !== ''){
+			loadBarcodeDevice(snText);
+		}
+	}, 2000);
+	$("#enableSNCode").hide();
+	$("#disabledSNCode").show();
+}
+
+function disabledSNCode(){
+	clearInterval(enableSNCodeTime);
+	$("#enableSNCode").show();
+	$("#disabledSNCode").hide();
+}
+
 function setRSSIFun(){
 	Ext.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/rssiRecordAction!loadRssiRecordByIp.do',
@@ -1998,6 +2015,20 @@
 	});
 }
 
+//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;
+			}
+		}
+	}
+}
+
 $(document).ready(function () {
 	/*Annie 快速入框权限*/
 	if (sstsConfig.enableExpressIntoContainer) {
@@ -2085,6 +2116,11 @@
 		connectRFIDFun();
 	}
 
+	//ZSYKEQ-8：识别器械SN序列号
+	if(sstsConfig.enableSNRecognition){
+		$("#enableSNCode").show();
+	}
+
 	//点击checkBox事件
 	$("#rememberCheckBox").click(function () {
 		var isChecked = $("#rememberCheckBox").attr("checked");
Index: ssts-web/src/main/webapp/disinfectsystem/websocket/websocketClient.js
===================================================================
diff -u -r41018 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/websocket/websocketClient.js	(.../websocketClient.js)	(revision 41018)
+++ ssts-web/src/main/webapp/disinfectsystem/websocket/websocketClient.js	(.../websocketClient.js)	(revision 41022)
@@ -115,6 +115,16 @@
 	//调用业务方法(比如装配、审核等模块接收通知函数)
 	try{
 		var webSocketSessionJson = JSON.parse(webSocketSession);
+		if(webSocketSessionJson.type == 'scrData'){
+			if(websocketBySNDataCallBack){
+				try{
+					websocketBySNDataCallBack(webSocketSessionJson);
+					return
+				}catch(e){
+					throw e;
+				}
+			}
+		}
 		if(websocketName == 'urgentNotifyWebsocket'){
 			var msgArr = [];
 			for(var i=0;i<webSocketSessionJson.data.length;i++){
@@ -164,14 +174,6 @@
 					}
 				}
 			}
-		}else if(webSocketSessionJson.type == 'scrData'){
-			if(websocketBySNDataCallBack){
-				try{
-					websocketBySNDataCallBack();
-				}catch(e){
-					throw e;
-				}
-			}
 		}
 	}catch(e){
 		
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/enableSNCode.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r41021 -r41022
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 41021)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 41022)
@@ -8661,6 +8661,37 @@
 	}
 }
 
+var enableSNCodeTime = null;
+function enableSNCode(){
+	enableSNCodeTime = setInterval(function () {
+		if(snText !== ''){
+			loadBarcodeDevice(snText);
+		}
+	}, 2000);
+	$("#enableSNCode").hide();
+	$("#disabledSNCode").show();
+}
+
+function disabledSNCode(){
+	clearInterval(enableSNCodeTime);
+	$("#enableSNCode").show();
+	$("#disabledSNCode").hide();
+}
+
+//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;
+			}
+		}
+	}
+}
+
 $(function () {
 	// 是否开启根据科室加载模板
 	openLoadTemplateByUnit();
@@ -8692,6 +8723,10 @@
 		connectRFIDFun();
 	}
 
+	//ZSYKEQ-8：识别器械SN序列号
+	if(sstsConfig.enableSNRecognition){
+		$("#enableSNCode").show();
+	}
 	if (sstsConfig.isShowTaskGroupOfRecyclingModule) {
 		PackingTableManager.getAllTaskGroup(setTaskGroup);
 		function setTaskGroup(taskGroup) {