Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r16044 -r16145
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 16044)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 16145)
@@ -470,6 +470,121 @@
 	     {name: 'barcode', type: 'string'}
 	]);
 
+
+
+function processMultiTousseInstance(obj){
+	//扫描的是包
+	if(Ext.getCmp('basketBarcode').getValue() == '') {
+		showResult('请先录入篮筐');
+		clearScanText();
+		Ext.getCmp('barcodeEnd').setValue('');
+		return;
+	}
+	
+	var saveBarcode = "";
+	var tousseGridStore = Ext.getCmp('tousseGrid').getStore();
+	for(var i=0;i<tousseGridStore.getCount();i++){
+		var record = tousseGridStore.getAt(i);
+		var tempBarcode = record.get("barcode");
+		saveBarcode += tempBarcode+";";
+	}
+	
+	//返回结果
+	var tousseInstances = obj.tousseInstances;
+	var basketBarcode = Ext.getCmp('basketBarcode').getValue();
+	
+	var barcodeArray = [];
+	for(var j = 0;tousseInstances && tousseInstances.length > 0 && j < tousseInstances.length;j++){
+		var barcodeToBasket = tousseInstances[j].barcode;
+		var barcodeAddedToBasket = false;
+		for(var i=0;i<tousseStore.getCount();i++){
+			var record = tousseStore.getAt(i);
+			if(record.data.barcode.toUpperCase() == barcodeToBasket.toUpperCase()) {
+				barcodeAddedToBasket = true;
+				break;
+			}
+		}
+		if(barcodeAddedToBasket == false){
+			barcodeArray.push(tousseInstances[j].barcode);
+		}
+	}
+	
+	var mask;
+
+	if (!isIE6OrIE7){
+		createMask.call(objMask,'processMask','请求正在处理中，请稍候...',Ext.getBody(),true);
+		objMask.processMask.show();
+	}
+	else{
+		mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求，请稍候...'});
+		mask.show();
+	}
+
+
+	Ext.Ajax.request({
+		sync : true,
+		url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!batchAddToBasket.do',
+		params : {tousseBarcodes : barcodeArray.join(";"),basketBarcode : basketBarcode,saveBarcode:saveBarcode},
+		success : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			if(result.msg == "成功放入篮筐") {
+				
+				if(result.data && result.data.length > 0){
+					for(var i = 0;i < result.data.length;i++){
+						var currentTousseInstance = new tousseInstanceRecord({
+							tousseDefinitionName: result.data[i].tousseName,
+							barcode: result.data[i].barcode
+						});
+						Ext.getCmp('tousseGrid').getStore().insert(0,currentTousseInstance);//最新扫描的器械包放到第一行
+					}
+					
+					stasticsStore.load();
+					
+					//每次会调用会导致入筐器械包列表多出许多重复数据及重复统计,所以只在循环到最后一个时添加的篮筐
+					reviewedPanel.loader.load(reviewedPanel.root,function(){
+						reviewedPanel.expandAll();
+						reviewedPanel.root.eachChild( function(childNode){
+							if(childNode.attributes.objBarcode == basketBarcode){
+								childNode.eachChild(function(node){
+									
+									var tousseInstance = new tousseInstanceRecord({
+									    tousseDefinitionName: node.attributes.objName,
+									    barcode: node.attributes.objBarcode
+									});
+									
+									//Ext.getCmp('tousseGrid').getStore().add(tousseInstance);
+									//tousseGridStore.reload();//不需要重新刷新,不然会重新查询数据库导致按id大小排序
+								});
+							}
+						});
+					});
+					//待灭菌装载列表数据源重新刷新
+					waitSterileLoadingTousseStore.reload();
+				}else{
+					showResult('未找到该首尾条码范围内的器械包');
+				}
+				
+				Ext.getCmp('barcode').setValue('');
+				Ext.getCmp('barcodeEnd').setValue('');
+				Ext.getCmp('barcode').focus();
+			} else {
+				showResult(result.msg);
+			}
+			
+			if (!isIE6OrIE7){
+				objMask.processMask.hide();
+			}
+			else {
+				mask.hide();
+			}
+		},
+		failure : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			MsgTip.msg('提示', result.cause,true,3);
+		}
+	});
+}
+
 Ext.onReady(function() {
 
 	function showDelBtn(v,p,record) {
@@ -683,119 +798,7 @@
 			});
 		}
 	}
-	
-	function processMultiTousseInstance(obj){
-		//扫描的是包
-		if(Ext.getCmp('basketBarcode').getValue() == '') {
-			showResult('请先录入篮筐');
-			clearScanText();
-			Ext.getCmp('barcodeEnd').setValue('');
-			return;
-		}
-		
-		var saveBarcode = "";
-		var tousseGridStore = Ext.getCmp('tousseGrid').getStore();
-		for(var i=0;i<tousseGridStore.getCount();i++){
-			var record = tousseGridStore.getAt(i);
-			var tempBarcode = record.get("barcode");
-			saveBarcode += tempBarcode+";";
-		}
-		
-		//返回结果
-		var tousseInstances = obj.tousseInstances;
-		var basketBarcode = Ext.getCmp('basketBarcode').getValue();
-		
-		var barcodeArray = [];
-		for(var j = 0;tousseInstances && tousseInstances.length > 0 && j < tousseInstances.length;j++){
-			var barcodeToBasket = tousseInstances[j].barcode;
-			var barcodeAddedToBasket = false;
-			for(var i=0;i<tousseStore.getCount();i++){
-				var record = tousseStore.getAt(i);
-				if(record.data.barcode.toUpperCase() == barcodeToBasket.toUpperCase()) {
-					barcodeAddedToBasket = true;
-					break;
-				}
-			}
-			if(barcodeAddedToBasket == false){
-				barcodeArray.push(tousseInstances[j].barcode);
-			}
-		}
-		
-		var mask;
 
-		if (!isIE6OrIE7){
-			createMask.call(objMask,'processMask','请求正在处理中，请稍候...',Ext.getBody(),true);
-			objMask.processMask.show();
-		}
-		else{
-			mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求，请稍候...'});
-			mask.show();
-		}
-
-
-		Ext.Ajax.request({
-			sync : true,
-			url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!batchAddToBasket.do',
-			params : {tousseBarcodes : barcodeArray.join(";"),basketBarcode : basketBarcode,saveBarcode:saveBarcode},
-			success : function(response, options) {
-				var result = Ext.decode(response.responseText);
-				if(result.msg == "成功放入篮筐") {
-					
-					if(result.data && result.data.length > 0){
-						for(var i = 0;i < result.data.length;i++){
-							var currentTousseInstance = new tousseInstanceRecord({
-								tousseDefinitionName: result.data[i].tousseName,
-								barcode: result.data[i].barcode
-							});
-							Ext.getCmp('tousseGrid').getStore().insert(0,currentTousseInstance);//最新扫描的器械包放到第一行
-						}
-						
-						stasticsStore.load();
-						
-						//每次会调用会导致入筐器械包列表多出许多重复数据及重复统计,所以只在循环到最后一个时添加的篮筐
-						reviewedPanel.loader.load(reviewedPanel.root,function(){
-							reviewedPanel.expandAll();
-							reviewedPanel.root.eachChild( function(childNode){
-								if(childNode.attributes.objBarcode == basketBarcode){
-									childNode.eachChild(function(node){
-										
-										var tousseInstance = new tousseInstanceRecord({
-										    tousseDefinitionName: node.attributes.objName,
-										    barcode: node.attributes.objBarcode
-										});
-										
-										//Ext.getCmp('tousseGrid').getStore().add(tousseInstance);
-										//tousseGridStore.reload();//不需要重新刷新,不然会重新查询数据库导致按id大小排序
-									});
-								}
-							});
-						});
-						//待灭菌装载列表数据源重新刷新
-						waitSterileLoadingTousseStore.reload();
-					}else{
-						showResult('未找到该首尾条码范围内的器械包');
-					}
-					
-					Ext.getCmp('barcode').setValue('');
-					Ext.getCmp('barcodeEnd').setValue('');
-					Ext.getCmp('barcode').focus();
-				} else {
-					showResult(result.msg);
-				}
-				
-				if (!isIE6OrIE7){
-					objMask.processMask.hide();
-				}
-				else {
-					mask.hide();
-				}
-			},
-			failure : function(response, options) {
-				var result = Ext.decode(response.responseText);
-				MsgTip.msg('提示', result.cause,true,3);
-			}
-		});
-	}
 	
 	var contentHeight = document.body.scrollHeight;