Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
===================================================================
diff -u -r14942 -r15000
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 14942)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 15000)
@@ -11,8 +11,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -575,7 +573,35 @@
 		}
 		return null;
 	}
+	
+	/**
+	 * 检索外来器械材料
+	 * @return
+	 */
+	public String getForeignMaterialDefinitionData() {
+		if (spell == null) {
+			return null;
+		}
+		JSONArray data = materialDefinitionManager.searchMaterialdefinitionBySpellAndWbCode(spell, "1", "10000", true);
+		
+		JSONObject result = new JSONObject();
+		result.put("totalCount", data.size());
+		result.put("data", data);
+		
+		HttpServletResponse response = StrutsParamUtils.getResponse();
+		response.setCharacterEncoding("UTF-8");
+		PrintWriter out;
+		try {
+			out = response.getWriter();
+			out.print(result.toString());
+			out.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 
+		return null;
+	}
+
 	/**
 	 * 根据拼音简拼,获取 再生材料NAME和ID不包括一次性材料 如果 tousseDefinitionId 不为空，则只查询该器械包中的材料以及数量
 	 * 
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r14989 -r15000
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 14989)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 15000)
@@ -37,6 +37,8 @@
                 	var isLeaf = record.get('leaf');
                 	if(!isLeaf && (context.colIdx == 3 || context.colIdx == 4 || context.colIdx == 6 || context.colIdx == 7)){
                 		return false;
+                	}else if(isLeaf && (context.colIdx == 1 ||　context.colIdx == 5)){
+                		return false;
                 	}
                 }
             }
@@ -474,6 +476,20 @@
 	     ]
 	});
 	
+	/*var foreignMaterialJsonStore = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getForeignMaterialDefinitionData.do',
+			reader : {
+				type : 'json',
+				root : 'data'
+			}
+		},
+		fields : [
+		  	    {name : 'name',mapping : 'name'} 
+	     ]
+	});*/
+	
 	var forigntousseTbar = [];
 	
 	if(formType == 'apply'){
@@ -781,7 +797,7 @@
 			valueField : 'companyName',
 			displayField : 'companyName',
 			store : foldersCompanyJsonStore,
-			allowBlank: true,
+			allowBlank: false,
 			forceSelection : true
         }
     },{
@@ -791,14 +807,28 @@
         sortable: true,
         dataIndex: 'tousseName',
         editor: {
-            xtype: 'textfield',
+        	
+        	xtype: 'textfield',
             allowDecimals :false,
             minValue: 0,
             listeners  : {  
                 'focus':function(){  
                     this.selectText();  
                 }  
             }  
+        
+            /*xtype: 'combo',
+            minChars : 0,
+            queryParam : 'spell',
+			valueField : 'name',
+			displayField : 'name',
+			store : foreignMaterialJsonStore,
+			forceSelection : true,
+			lazyInit : true,
+			triggerAction : 'all',
+			hideTrigger : true,
+			typeAhead : true,
+			allowBlank : false*/
         }
     },{
     	header: '是否植入物',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r14584 -r15000
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 14584)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 15000)
@@ -40,8 +40,40 @@
 		header : "材料名称",
 		dataIndex : 'name',
 		menuDisabled : true,
-		editor : new top.Ext.form.TextField({
-			allowBlank : false
+		editor : new top.Ext.form.ComboBox({
+			xtype : 'combo',
+			queryParam : 'spell',
+			minChars : 0,
+			valueField : 'id',
+			displayField : 'name',
+			store : new Ext.data.Store({
+				proxy : new Ext.data.HttpProxy({
+					url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getForeignMaterialDefinitionData.do',
+					method : 'POST'
+				}),
+				reader : new Ext.data.JsonReader({
+					totalProperty : 'totalCount',
+					root : 'data'
+				}, [
+				    {name : 'materialDefinitionId',mapping : 'materialDefinitionId'},
+				    {name : 'name',mapping : 'name'}
+				])
+			}),
+			forceSelection : true,
+			lazyInit : true,
+			triggerAction : 'all',
+			hideTrigger : true,
+			typeAhead : false,
+			allowBlank : false,
+			anchor : '97%',
+			listeners : {
+				select : function(combo, record, index) {
+					combo.setValue(record.data.name);
+				},
+				focus : function(thiz){
+					thiz.selectText();
+				}
+			}
 		})
 	}, {
 		header : "数量",
@@ -51,7 +83,12 @@
 			allowBlank : false,
 			allowNegative : false,
 			style : 'text-align: left',
-			allowDecimals : false
+			allowDecimals : false,
+			listeners : {
+				focus : function(thiz){
+					thiz.selectText();
+				}
+			}
 		})
 	}]);
 
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
===================================================================
diff -u -r14715 -r15000
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 14715)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 15000)
@@ -13,12 +13,9 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.servlet.http.HttpServletRequest;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -28,18 +25,14 @@
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
 import com.forgon.Constants;
 import com.forgon.attachfile.service.AttachFileManager;
 import com.forgon.directory.acegi.tools.AcegiHelper;
-import com.forgon.directory.model.CssdHandleTousses;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialType;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.security.tools.Util;
 import com.forgon.systemsetting.model.HttpOption;
 import com.forgon.systemsetting.service.HttpOptionManager;