diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs index ba4f404..d5e8098 100644 --- a/HJGL_DS/FineUIPro.Web/Global.asax.cs +++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs @@ -563,6 +563,11 @@ materialType = "TiⅡ,TiⅠ"; materialTypeName = "钛合金"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else if (queProject[1].Trim().Contains("TiⅠ")) { materialType = "TiⅠ"; @@ -612,6 +617,11 @@ materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else if (queProject[1].Trim().Contains("TiⅡ")) { materialType = "TiⅡ,TiⅠ"; @@ -655,6 +665,11 @@ materialType = "TiⅠ"; materialTypeName = "钛合金"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + 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 5c97280..cf949bf 100644 --- a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs @@ -469,6 +469,11 @@ namespace FineUIPro.Web.Welder materialType = "TiⅠ"; materialTypeName = "钛合金"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else { materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ"; @@ -523,6 +528,11 @@ namespace FineUIPro.Web.Welder materialType = "TiⅠ"; materialTypeName = "钛合金"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else { materialType = queProject[1].Trim(); @@ -546,6 +556,11 @@ namespace FineUIPro.Web.Welder materialType = "TiⅠ"; materialTypeName = "钛合金"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else { materialType = queProject[1].Trim(); @@ -797,6 +812,11 @@ namespace FineUIPro.Web.Welder materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else { materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ"; @@ -841,6 +861,11 @@ namespace FineUIPro.Web.Welder materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else { materialType = queProject[1].Trim(); @@ -864,6 +889,11 @@ namespace FineUIPro.Web.Welder materialType = "Zr5"; materialTypeName = "其它"; } + else if (queProject[1].Trim().Contains("Zr")) + { + materialType = "Zr"; + materialTypeName = "其它"; + } else { materialType = queProject[1].Trim();