From a7948715597725f28e396ed3a35d2129887377b6 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 30 Jan 2026 17:30:12 +0800
Subject: [PATCH] 1

---
 HJGL_DS/FineUIPro.Web/Global.asax.cs          | 10 +++++-----
 HJGL_DS/FineUIPro.Web/Web.config              |  2 +-
 .../Welder/QualifiedProject.aspx.cs           | 20 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

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 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>
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 = "镍基合金";
+                                }
                             }
                         }