Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r15940 -r15945
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 15940)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 15945)
@@ -286,7 +286,6 @@
 				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);
@@ -304,7 +303,6 @@
 						if ("yes" == button){
 							Ext.getCmp("basketName").setValue(obj.containerName);
 							Ext.getCmp('basketBarcode').setValue(obj.basketBarcode);
-							//Ext.getCmp('barcode').setValue('');
 							
 							tousseStore.baseParams.basketBarcode = obj.basketBarcode;
 							tousseStore.load();
@@ -315,16 +313,8 @@
 				}else if(returnType == "tousseInstanceSuccess"){//扫描的是包
 					if(Ext.getCmp('basketBarcode').getValue() == '') {
 						showResult('请先录入篮筐');
-						//Ext.getCmp('barcode').setValue('');
 						return;
 					}
-					for(var i=0;i<tousseStore.getCount();i++){
-						var record = tousseStore.getAt(i);
-						if(record.data.barcode.toUpperCase() == barcode.toUpperCase()) {
-							showResult('此物品已在此篮筐内');
-							return;
-						}
-					}
 					
 					var saveBarcode = "";
 					var tousseGridStore = Ext.getCmp('tousseGrid').getStore();
@@ -368,6 +358,14 @@
 										}
 									});
 								});
+								
+								for(var i=0;i<tousseStore.getCount();i++){
+									var record = tousseStore.getAt(i);
+									if(record.data.barcode.toUpperCase() == barcode.toUpperCase()) {
+										showResult('此物品已在此篮筐内');
+										return;
+									}
+								}
 								var currentTousseInstance = new tousseInstanceRecord({
 									depart:result.depart,
 								    tousseDefinitionName: result.tousseName,
@@ -389,12 +387,10 @@
 					processMultiTousseInstance(obj);
 				}else if(returnType=="basketUsed"){//篮筐已被使用
 					showResult("无法录入篮筐，篮筐正处于[" + obj.status + "]状态");	
-					//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('');
 						
 						tousseStore.baseParams.basketBarcode = barcode;
 						tousseStore.load();
@@ -406,10 +402,8 @@
 					}
 				}else if (returnType == 'erroeStatus') {
 					showResult('器械包处于[' + obj.status + ']状态,不能进行灭菌装载');
-					//Ext.getCmp('barcode').setValue('');
 				}else if (returnType == 'emptyProxyDisinfection') {
 					showResult('器械包【' + obj.tousseName + '】未录入代理灭菌单，无法灭菌装载');
-					//Ext.getCmp('barcode').setValue('');
 				}else{
 					showResult(obj.message);
 				}