Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
===================================================================
diff -u -r15000 -r15260
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 15000)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 15260)
@@ -131,38 +131,6 @@
 	}
 
 	/**
-	 * 保存前检查是否重复
-	 * 
-	 * @return
-	 */
-	public String validate() {
-		String id = StrutsParamUtils.getPraramValue("validateId", null);
-		String name = StrutsParamUtils.getPraramValue("valifateName", null);
-		String specification = StrutsParamUtils.getPraramValue("specification",
-				null);
-		JSONObject jsonObject = new JSONObject();
-		jsonObject.put("success", true);
-		jsonObject.put("message", "验证成功");
-		jsonObject.put("stauts", 1);
-		boolean result = materialDefinitionManager.verifyMaterialDefinition(id,
-				name, specification);
-		if (!result) {
-			jsonObject.put("success", false);
-			jsonObject.put("message", "已存在相同名称的材料");
-			jsonObject.put("stauts", 0);
-		}
-		HttpServletResponse httpServletResponse = StrutsParamUtils
-				.getResponse();
-		httpServletResponse.setContentType("text/html;charset=UTF-8");
-		try {
-			httpServletResponse.getWriter().print(jsonObject);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
 	 * 保存MaterialDefinition TODO 此处代码应该移到manager里面
 	 */
 	public String saveMaterialDefinition() {
@@ -178,7 +146,7 @@
 				idStr = id.toString();
 			}
 			boolean result = materialDefinitionManager.verifyMaterialDefinition(idStr,
-					materialDefinition.getName(), materialDefinition.getSpecification());
+					materialDefinition.getName(), materialDefinition.getSpecification(),materialDefinition.getIsForeignMaterial());
 			if (!result) {
 				throw new RuntimeException("已存在相同名称的材料!");
 			}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
===================================================================
diff -u -r15198 -r15260
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 15198)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 15260)
@@ -88,7 +88,7 @@
 	}
 
 	public boolean verifyMaterialDefinition(String id, String name,
-			String specification) {
+			String specification,String isForeignMaterial) {
 		String sql = "where po.name = '" + name + "'";
 		if (StringUtils.isNotEmpty(id)) {
 			sql += " and po.id != " + id;
@@ -98,6 +98,12 @@
 		} else {
 			sql += " and po.specification is null";
 		}
+		if(StringUtils.isBlank(isForeignMaterial)){
+			isForeignMaterial = Constants.STR_NO;
+		}
+		
+		sql += " and po.isForeignMaterial = '" + isForeignMaterial + "'";
+		
 		if (objectDao.getBySql(MaterialDefinition.class.getSimpleName(), sql) != null) {
 			return false;
 		} else {
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
===================================================================
diff -u -r14715 -r15260
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java	(.../MaterialDefinitionManager.java)	(revision 14715)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java	(.../MaterialDefinitionManager.java)	(revision 15260)
@@ -25,7 +25,7 @@
 	
 	public void deleteMaterialDefinitionById(String id);
 	
-	public boolean verifyMaterialDefinition(String id, String name,String specification);
+	public boolean verifyMaterialDefinition(String id, String name,String specification,String isForeignMaterial);
 	
 	public List<MaterialDefinition> getMaterialDefinitionByType(String type);