diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs index aca0746..1efbfab 100644 --- a/HJGL_DS/FineUIPro.Web/Global.asax.cs +++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs @@ -262,6 +262,16 @@ materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("TiⅡ")) + { + materialType = "TiⅡ,TiⅠ"; + materialTypeName = "钛合金"; + } + else if (queProject[1].Trim().Contains("TiⅠ")) + { + materialType = "TiⅠ"; + materialTypeName = "钛合金"; + } else { materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ"; @@ -306,6 +316,16 @@ materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("TiⅡ")) + { + materialType = "TiⅡ,TiⅠ"; + materialTypeName = "钛合金"; + } + else if (queProject[1].Trim().Contains("TiⅠ")) + { + materialType = "TiⅠ"; + materialTypeName = "钛合金"; + } else { materialType = queProject[1].Trim(); @@ -329,6 +349,16 @@ materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("TiⅡ")) + { + materialType = "TiⅡ,TiⅠ"; + materialTypeName = "钛合金"; + } + else if (queProject[1].Trim().Contains("TiⅠ")) + { + materialType = "TiⅠ"; + materialTypeName = "钛合金"; + } else { materialType = queProject[1].Trim(); diff --git a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs index 64cf6bb..b5a331a 100644 --- a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs @@ -459,6 +459,16 @@ namespace FineUIPro.Web.Welder materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("TiⅡ")) + { + materialType = "TiⅡ,TiⅠ"; + materialTypeName = "钛合金"; + } + else if (queProject[1].Trim().Contains("TiⅠ")) + { + materialType = "TiⅠ"; + materialTypeName = "钛合金"; + } else { materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ"; @@ -503,6 +513,16 @@ namespace FineUIPro.Web.Welder materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("TiⅡ")) + { + materialType = "TiⅡ,TiⅠ"; + materialTypeName = "钛合金"; + } + else if (queProject[1].Trim().Contains("TiⅠ")) + { + materialType = "TiⅠ"; + materialTypeName = "钛合金"; + } else { materialType = queProject[1].Trim(); @@ -516,6 +536,16 @@ namespace FineUIPro.Web.Welder materialType = "NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ"; materialTypeName = "镍基合金"; } + else if (queProject[1].Trim().Contains("TiⅡ")) + { + materialType = "TiⅡ,TiⅠ"; + materialTypeName = "钛合金"; + } + else if (queProject[1].Trim().Contains("TiⅠ")) + { + materialType = "TiⅠ"; + materialTypeName = "钛合金"; + } else { materialType = queProject[1].Trim();