Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r28372 -r28375
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 28372)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 28375)
@@ -1388,45 +1388,15 @@
 					foreignToussePrintAmount = record.get('foreignToussePrintAmount');
 					splitNumber = record.get('splitNumber');
 				}
-				
-				//2、获取外来器械包的材料信息
-				Ext4.Ajax.request({
-					url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadForeignTousseIncludeMaterials.do',
-					params : {id : tousseDefinitionId},
-					async : false,
-					success : function(response, options) {
-						var result = Ext4.JSON.decode(response.responseText);
-						if(result.success){
-							var materialsJson = result.data;
-							for(var i = 0;i < materialsJson.length;i++){
-								materials.push({
-									id : materialsJson[i].id,  //材料实例的id
-									tousseName : materialsJson[i].materialName,
-									includeImplant : materialsJson[i].includeImplant,
-									amount : materialsJson[i].amount,
-									usedAmountOfIncludeImplant : 0,
-									implantAmountOfUseRecord  : 0,
-									minDismantleAmount : materialsJson[i].minDismantleAmount,
-									washClassifyType:materialsJson[i].washClassifyType,
-									type : 'material',
-									leaf : true
-								});
-							}
-							
-						}
-					},
-					failure : function(response, opts) {
-						showResult(response.responseText);
-					}
-				});
 
 				Ext4.Ajax.request({
-					url : WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadComboTousseByForeignTousseId.do?foreignTousseId='+tousseDefinitionId+'&showForeignTousseAncestorDefinition='+isShowForeignTousseAncestorDefinitionForApply,
+					url : WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadComboTousseByForeignTousseId.do?foreignTousseId='+tousseDefinitionId+'&isShowForeignTousseAncestorDefinitionForApply='+isShowForeignTousseAncestorDefinitionForApply,
 					success : function(response, options) {
 						var result = top.Ext4.decode(response.responseText);
 						if(result.success){
 							if(result.data.length > 0){
 								for(var i=0;i<result.data.length;i++){
+									var materials = []
 									for(var j=0;j<result.data[i].materials.length;j++){
 										var materialsJson = result.data[i].materials;
 										materials.push({
@@ -1473,34 +1443,6 @@
 								return;
 							}
 						}
-
-						var tousseItem = Ext4.create('foreignTousseItemModel',{
-							id : 0,
-							tousseDefinitionId : tousseDefinitionId,
-							oldTousseName: foreignTousseName,
-							tousseName: foreignTousseName,
-							weight:"",
-							oldSupplierName : suppler,
-							supplierName : suppler,
-							packageSize : (packageSize ? packageSize : defaultPackageSize),
-							foreignToussePrintAmount : (foreignToussePrintAmount ? foreignToussePrintAmount : defaultforeignToussePrintAmount),
-							splitNumber : (splitNumber ? splitNumber : defaultSplitNumber),
-							amount : 1,
-							includeImplant : '',
-							price : foreignToussePriceOfSysParams,
-							urgentLevel:urgentLevel,
-							urgentLevelId:urgentLevelId,
-							type : 'tousse',
-							usedAmountOfIncludeImplant : 0,
-							implantAmountOfUseRecord : 0,
-							minDismantleAmount : 0,
-							leaf : false,
-							expanded : true,
-							children : materials 
-						});
-						var rootNode = foreignTousseStore.getRootNode();
-						rootNode.appendChild(tousseItem);
-						top.Ext4.getCmp('foreignTousseName1').setValue('');
 					},
 					failure : function(response, options) {
 						showResult('对不起！服务器正忙，加载失败');