Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r33793 -r34493
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 33793)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 34493)
@@ -947,7 +947,6 @@
 	for (var j = 0; tousseInstances && tousseInstances.length > 0 && j < tousseInstances.length; j++) {
 		barcodeArray.push(tousseInstances[j].barcode);
 	}
-
 	//篮筐物品明细grid列表的包的灭菌方式
 	var sterilingModeFromBasketGoodsDetailGrid = getSterilingModeFromBasketGoodsDetailGrid();
 	if (sterilingModeFromBasketGoodsDetailGrid.length > 1) {
@@ -1631,7 +1630,10 @@
 	//待灭菌装载数据源
 	waitSterileLoadingTousseStore = new Ext.data.Store({
 		autoLoad: false,
-		url: WWWROOT + '/disinfectSystem/tousseInstanceAction!getWaitSterileLoadingTousseInstance.do',
+		proxy: new Ext.data.HttpProxy({   
+			url: WWWROOT + '/disinfectSystem/tousseInstanceAction!getWaitSterileLoadingTousseInstance.do',
+			timeout: 100000
+	   	}), 
 		pageSize: pageSize,
 		reader: new Ext.data.JsonReader({
 			type: 'json',
@@ -1867,15 +1869,19 @@
 							}
 						}
 					}
-
 					var selectedBarcodeArray = [];
+					var fixedBarcodeArray = [];
 					if (selectRows && selectRows.length && selectRows.length > 0) {
 						var obj = {};
 						var sterilingModeObject = {};
 						var sterilingModeArray = [];
 						var alreadyAddBlankSterilingMode = false;
 						for (var i = 0; i < selectRows.length; i++) {
-							selectedBarcodeArray.push({ "barcode": selectRows[i].data["objBarcode"] });
+							if(selectRows[i].json.isTraceable == '是'){
+								selectedBarcodeArray.push({ "barcode": selectRows[i].data["objBarcode"] });
+							}else {
+								fixedBarcodeArray.push({ "barcode": selectRows[i].data["objBarcode"] });
+							}
 							var sterilingModeData = selectRows[i].data["sterilingMode"];
 							if (sterilingModeData) {
 								if (!sterilingModeObject[sterilingModeData]) {
@@ -1893,8 +1899,46 @@
 							showResult("所选的器械包有多种不同的灭菌方式,请选择相同灭菌方式的器械入筐");
 							return false;
 						}
-						obj.tousseInstances = selectedBarcodeArray;
-						processMultiTousseInstance(obj);
+						if(fixedBarcodeArray.length > 0){
+							for(var i=0;i<fixedBarcodeArray.length;i++){
+								scanBarcodeAndAddToBasket(fixedBarcodeArray[i].barcode, 'scanBarcode');
+							}
+						}
+						if(selectedBarcodeArray.length > 0){
+							SterileLoadingTableManager.getResultJsonStrByBarcode(barcode + ";" + barcodeEnd, getTousseStoreBarcodes(), Ext.getCmp('basketBarcode').getValue(), function (jsonStr) {
+								var obj = Ext.util.JSON.decode(jsonStr);
+								var returnType = obj.returnType;
+								if (returnType == "noResult") {
+									showResult('未找到相应的结果');
+									return;
+								} else if (returnType == "multiTousseInstancesSuccess") {
+									//是否包含装载到虚拟篮筐的器械包
+									var includeTousseInVirtualBasket = obj.includeTousseInVirtualBasket;
+									if (includeTousseInVirtualBasket) {
+										Ext.MessageBox.confirm("请确认", "条码范围内有器械包已在虚拟篮筐中，是否继续装载？", function (button, text) {
+											if ("yes" == button) {
+												processMultiTousseInstance(obj);
+											} else {
+												//如果选否时,需要进行清空
+												Ext.getCmp('barcode').setValue('');
+												Ext.getCmp('barcodeEnd').setValue('');
+												Ext.getCmp('barcode').focus();
+											}
+										});
+									} else {
+										processMultiTousseInstance(obj);
+									}
+								} else {//不为器械包实例条码
+									//					showResult("条码(尾)只能扫描器械包条码");	
+									if(obj.message){
+										showResult(obj.message);
+										Ext.getCmp('barcodeEnd').setValue('');
+									}
+								}
+							});
+							obj.tousseInstances = selectedBarcodeArray;
+							processMultiTousseInstance(obj);
+						}
 					} else {
 						showResult("请选择需要载入的器械包");
 					}