Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r15119 -r15940
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 15119)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 15940)
@@ -116,11 +116,11 @@
 		
 		if(returnType=="basketNotFound"){//条码不存在
 			showResult("找不到该包或篮筐。");
-			Ext.getCmp('barcode').setValue('');
+			clearScanText();
 		}else if(returnType == "tousseInstanceSuccess"){//扫描的是包
 			if(Ext.getCmp('basketBarcode').getValue() == '') {
 				showResult('请先录入篮筐');
-				Ext.getCmp('barcode').setValue('');
+				clearScanText();
 				return;
 			}
 			for(var i=0;i<tousseStore.getCount();i++){
@@ -146,7 +146,7 @@
 					if(result.msg == "成功放入篮筐") {
 //						Ext.getCmp('tousseGrid').getStore().add(tousseInstance);
 						stasticsStore.load();
-						Ext.getCmp('barcode').setValue('');
+						clearScanText();
 						reviewedPanel.loader.load(reviewedPanel.root,function(){
 							reviewedPanel.expandAll();
 							var tousseGridStore = Ext.getCmp('tousseGrid').getStore();
@@ -189,15 +189,15 @@
 			});
 		}else if(returnType=="basketUsed"){//篮筐已被使用
 			showResult("无法录入篮筐，篮筐正处于[" + obj.status + "]状态");	
-			Ext.getCmp('barcode').setValue('');
+			clearScanText();
 		}else if(returnType == "containerSterilizing"){
 			showResult('该灭菌筐当前状态为灭菌中,不能进行灭菌装载!');
 		}else if(returnType == "scanBasketFoundNotDeliverTousseInContainer"){
 			Ext.MessageBox.confirm("请确认","该篮筐有未发货的器械包,是否继续",function(button, text) {
 				if ("yes" == button){
 					Ext.getCmp("basketName").setValue(obj.containerName);
 					Ext.getCmp('basketBarcode').setValue(obj.basketBarcode);
-					Ext.getCmp('barcode').setValue('');
+					clearScanText();
 					
 					tousseStore.baseParams.basketBarcode = obj.basketBarcode;
 					tousseStore.load();
@@ -208,25 +208,21 @@
 		}else if(returnType=="containerSuccess"){//扫描的是篮筐
 			Ext.getCmp("basketName").setValue(obj.containerName);
 			Ext.getCmp('basketBarcode').setValue(ObjBarcode);
-			Ext.getCmp('barcode').setValue('');
+			clearScanText();
 			
 			tousseStore.baseParams.basketBarcode = ObjBarcode;
 			tousseStore.load();
 			stasticsStore.baseParams.basketBarcode = ObjBarcode;
 			stasticsStore.load();
 		}else if (returnType == 'erroeStatus') {
 			showResult('器械包处于[' + obj.status + ']状态,不能进行灭菌装载');
-			Ext.getCmp('barcode').setValue('');
+			clearScanText();
 		}else if (returnType == 'emptyProxyDisinfection') {
 			showResult('器械包【' + obj.tousseName + '】未录入代理灭菌单，无法灭菌装载');
-			Ext.getCmp('barcode').setValue('');
+			clearScanText();
 		}
 	});
-	Ext.getCmp('barcode').setValue('');
-	
-	
-	
-	
+	clearScanText();
 }
 
 Ext.onReady(function() {
@@ -284,19 +280,21 @@
 	//条码(首)扫描监听事件函数
 	function keypressBeginBarcodeCallBack(e) {
 		if (e.getKey() == 13) {
-			var barcode = Ext.getCmp('barcode').getValue();
+			var barcode = Ext.getCmp('barcode').getValue();//console.log('barcode1='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 			if(barcode == ''){
 				showResult('条码不能为空');
 				return;
 			}
 			clearScanText();
+			//return;
 			SterileLoadingTableManager.getResultJsonStrByBarcode(barcode,getTousseStoreBarcodes(),Ext.getCmp('basketBarcode').getValue(),function(jsonStr){
+				//console.log('barcode2='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 				var obj = Ext.util.JSON.decode(jsonStr);
 				var returnType = obj.returnType;
 				var containerType = obj.containerType;
 				if(returnType=="basketNotFound"){//条码不存在
 					showResult("找不到该包或篮筐。");
-					Ext.getCmp('barcode').setValue('');
+					//Ext.getCmp('barcode').setValue('');
 				}else if(returnType == "noResult"){
 					showResult('未找到相应的结果');
 				}else if(returnType == "containerSterilizing"){
@@ -306,7 +304,7 @@
 						if ("yes" == button){
 							Ext.getCmp("basketName").setValue(obj.containerName);
 							Ext.getCmp('basketBarcode').setValue(obj.basketBarcode);
-							Ext.getCmp('barcode').setValue('');
+							//Ext.getCmp('barcode').setValue('');
 							
 							tousseStore.baseParams.basketBarcode = obj.basketBarcode;
 							tousseStore.load();
@@ -317,7 +315,7 @@
 				}else if(returnType == "tousseInstanceSuccess"){//扫描的是包
 					if(Ext.getCmp('basketBarcode').getValue() == '') {
 						showResult('请先录入篮筐');
-						Ext.getCmp('barcode').setValue('');
+						//Ext.getCmp('barcode').setValue('');
 						return;
 					}
 					for(var i=0;i<tousseStore.getCount();i++){
@@ -336,19 +334,19 @@
 						saveBarcode += tempBarcode+",";
 					}
 					
-					var basketBarcode = Ext.getCmp('basketBarcode').getValue();
+					var basketBarcode = Ext.getCmp('basketBarcode').getValue();//console.log('barcode3='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 					Ext.Ajax.request({
 						url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!addToBasket.do',
 						params : {tousseBarcode : barcode,basketBarcode : basketBarcode,saveBarcode:saveBarcode},
-						success : function(response, options) {
+						success : function(response, options) {//console.log('barcode4='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 							var result = Ext.decode(response.responseText);
 							if(result.msg == "成功放入篮筐") {
 								
 //								Ext.getCmp('tousseGrid').getStore().add(tousseInstance);
 								stasticsStore.load();
 								//如果未启用首尾篮筐时,文本框清空
 								if(enableBeginEndBarcodeScan == false || currentScanMode == 'single'){
-									Ext.getCmp('barcode').setValue('');
+									//Ext.getCmp('barcode').setValue('');
 								}else{
 									Ext.getCmp('barcodeEnd').focus();
 								}
@@ -376,8 +374,8 @@
 								    barcode: barcode
 								});
 								Ext.getCmp('tousseGrid').getStore().insert(0,currentTousseInstance);//最新扫描的器械包放到第一行
-								
-								waitSterileLoadingTousseStore.reload();
+								//console.log('barcode5='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
+								waitSterileLoadingTousseStore.reload();//console.log('barcode6='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 							} else {
 								showResult(result.msg);
 							}
@@ -391,27 +389,27 @@
 					processMultiTousseInstance(obj);
 				}else if(returnType=="basketUsed"){//篮筐已被使用
 					showResult("无法录入篮筐，篮筐正处于[" + obj.status + "]状态");	
-					Ext.getCmp('barcode').setValue('');
+					//Ext.getCmp('barcode').setValue('');
 				}else if(returnType=="containerSuccess"){//扫描的是篮筐
 					if(containerType == '灭菌筐'){
 						Ext.getCmp("basketName").setValue(obj.containerName);
 						Ext.getCmp('basketBarcode').setValue(barcode);
-						Ext.getCmp('barcode').setValue('');
+						//Ext.getCmp('barcode').setValue('');
 						
 						tousseStore.baseParams.basketBarcode = barcode;
 						tousseStore.load();
 						stasticsStore.baseParams.basketBarcode = barcode;
 						stasticsStore.load();
 					}else{
 						showResult("灭菌装载只能使用灭菌筐。");
-						Ext.getCmp('barcode').setValue('');
+						//Ext.getCmp('barcode').setValue('');
 					}
 				}else if (returnType == 'erroeStatus') {
 					showResult('器械包处于[' + obj.status + ']状态,不能进行灭菌装载');
-					Ext.getCmp('barcode').setValue('');
+					//Ext.getCmp('barcode').setValue('');
 				}else if (returnType == 'emptyProxyDisinfection') {
 					showResult('器械包【' + obj.tousseName + '】未录入代理灭菌单，无法灭菌装载');
-					Ext.getCmp('barcode').setValue('');
+					//Ext.getCmp('barcode').setValue('');
 				}else{
 					showResult(obj.message);
 				}
@@ -458,7 +456,7 @@
 		//扫描的是包
 		if(Ext.getCmp('basketBarcode').getValue() == '') {
 			showResult('请先录入篮筐');
-			Ext.getCmp('barcode').setValue('');
+			clearScanText();
 			Ext.getCmp('barcodeEnd').setValue('');
 			return;
 		}
@@ -522,7 +520,7 @@
 						addedToBasketResultAmount++;
 //								Ext.getCmp('tousseGrid').getStore().add(tousseInstance);
 						stasticsStore.load();
-						Ext.getCmp('barcode').setValue('');
+						clearScanText();
 						Ext.getCmp('barcodeEnd').setValue('');
 						//tousseGridStore.removeAll();
 						
@@ -565,7 +563,7 @@
 		}
 		if(addedToBasketResultAmount == 0){
 			//showResult("未找到对应的器械包");
-			Ext.getCmp('barcode').setValue('');
+			clearScanText();
 			Ext.getCmp('barcodeEnd').setValue('');
 			Ext.getCmp('barcode').focus();
 		}