Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
===================================================================
diff -u -r14794 -r14801
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 14794)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 14801)
@@ -1,7 +1,9 @@
 var ab;
 var lock = false;
-var saveBarcode = '9999999';
-var cancelBarcode = '8888888';
+var saveBarcode = '999999999';
+var cancelBarcode = '888888888';
+//提示框显示还是隐藏
+var alertShowOrHideStatus = false;
 //锁定键盘
 function lockup(e){ e.preventDefault(); }
 //高亮层不锁定
@@ -39,23 +41,26 @@
     ab = new AlertBox("idBox");
     ab.onShow = function(){
         if ( lock ) {
-            $$E.addEvent( document, "keydown", lockup );
-            $$E.addEvent( this.box, "keydown", lockout );
-            OverLay.show();
+            //$$E.addEvent( document, "keydown", lockup );
+            //$$E.addEvent( this.box, "keydown", lockout );
+            //OverLay.show();
         }
     };
     ab.onClose = function(){
-        $$E.removeEvent( document, "keydown", lockup );
-        $$E.removeEvent( this.box, "keydown", lockout );
-        OverLay.close();
+        //$$E.removeEvent( document, "keydown", lockup );
+        //$$E.removeEvent( this.box, "keydown", lockout );
+        //OverLay.close();
     };
     
     ab.center = true;
     ab.show();
+    alertShowOrHideStatus = true;
+    barcodeGloble = '';//清空后清除条码记忆的全局变量
 }
 
 function closeDiv(){
 	 ab.close();
+	 alertShowOrHideStatus = false;
 }
  
  var applicationType = null;
@@ -194,16 +199,26 @@
 
 function loadBarcodeDevice(barcodeTemp){
 	
-	var codeStr = barcodeTemp.substring(barcodeTemp.length-7,barcodeTemp.length);
+	//var codeStr = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length);
+	var codeStr = barcodeTemp;
 	if(codeStr == saveBarcode){
-    	doSaveAction();
     	barcodeGloble = '';//保存后清除条码记忆的全局变量
+    	if(alertShowOrHideStatus){
+    		closeDiv();
+    	}else{
+    		doSaveAction();
+    	}
     }else if(codeStr == cancelBarcode){
-    	cancel();
     	barcodeGloble = '';//清空后清除条码记忆的全局变量
+    	if(alertShowOrHideStatus){
+    		closeDiv();
+    	}else{
+    		cancel();
+    	}
     }else{
     	if(barcodeTemp.length >= 9){
-            var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length);
+            //var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length);
+            var barcode = barcodeTemp;
             $.ajax({
                 type:'get',
                 url:WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getBarcodeInfoForWash.do?time='+new Date()+'&barcode='+barcode+'',