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

---
 .../FineUIPro.Web/FineUIPro.Web.csproj.user    |  2 +-
 HJGL_DS/FineUIPro.Web/Global.asax.cs           |  9 +++++++++
 HJGL_DS/FineUIPro.Web/Web.config               |  2 +-
 .../Welder/QualifiedProject.aspx.cs            | 18 ++++++++++++++++++
 HJGL_DS/WebAPI/WebAPI.csproj.user              |  2 +-
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 72b6a27..a1d9585 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index 21fba8a..8a1bf90 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs
@@ -628,6 +628,11 @@
                                     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"))
@@ -700,6 +705,10 @@
                         {
                             location = "2FG,4FG";
                         }
+                        else if (queProject[1].Contains("5G"))
+                        {
+                            location = "1G,3G,4G,5G";
+                        }
                         else
                         {
                             location = queProject[2].Trim();
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 6bfb6c8..0066e09 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
diff --git a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
index 5390bd0..c6223cf 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
@@ -529,6 +529,11 @@ 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"))
@@ -591,6 +596,10 @@ namespace FineUIPro.Web.Welder
                             {
                                 location = "2FG,4FG";
                             }
+                            else if (queProject[1].Contains("5G"))
+                            {
+                                location = "1G,3G,4G,5G";
+                            }
                             else
                             {
                                 location = queProject[2];
@@ -838,6 +847,11 @@ 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"))
@@ -900,6 +914,10 @@ namespace FineUIPro.Web.Welder
                             {
                                 location = "2FG,4FG";
                             }
+                            else if (queProject[1].Contains("5G"))
+                            {
+                                location = "1G,3G,4G,5G";
+                            }
                             else
                             {
                                 location = queProject[2];
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index a48b337..28be9c4 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />