diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs index 8a1bf90..ba4f404 100644 --- a/HJGL_DS/FineUIPro.Web/Global.asax.cs +++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs @@ -628,11 +628,6 @@ materialTypeName = "其它"; } } - else if (queProject[1].Trim().Contains("5G")) - { - materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ"; - materialTypeName = "镍基合金"; - } else { if (queProject[1].Trim().Contains("Ni")) @@ -666,6 +661,11 @@ materialTypeName = "其它"; } } + if (queProject[1].Trim().Contains("5G")) + { + materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ"; + materialTypeName = "镍基合金"; + } } } diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 0066e09..3f81ed7 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs index c6223cf..5c97280 100644 --- a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs @@ -529,11 +529,6 @@ namespace FineUIPro.Web.Welder materialTypeName = "其它"; } } - else if (queProject[1].Trim().Contains("5G")) - { - materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ"; - materialTypeName = "镍基合金"; - } else { if (queProject[1].Trim().Contains("Ni")) @@ -557,6 +552,11 @@ namespace FineUIPro.Web.Welder materialTypeName = "其它"; } } + if (queProject[1].Trim().Contains("5G")) + { + materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ"; + materialTypeName = "镍基合金"; + } } } @@ -847,11 +847,6 @@ namespace FineUIPro.Web.Welder materialTypeName = "其它"; } } - else if (queProject[1].Trim().Contains("5G")) - { - materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ"; - materialTypeName = "镍基合金"; - } else { if (queProject[1].Trim().Contains("Ni")) @@ -875,6 +870,11 @@ namespace FineUIPro.Web.Welder materialTypeName = "其它"; } } + if (queProject[1].Trim().Contains("5G")) + { + materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ"; + materialTypeName = "镍基合金"; + } } }