From 75cd095980af75d70d546f872712a0cd1140feee Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 11 Aug 2026 16:06:26 +0800
Subject: [PATCH] 1

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

diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index 303919c..27002d0 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs
@@ -743,7 +743,14 @@
                         }
                         else
                         {
-                            weldType = "1,2";
+                            if (queProject[2].Contains("6G"))
+                            {
+                                weldType = "1,2,3";
+                            }
+                            else
+                            {
+                                weldType = "1,2";
+                            }
                         }
                     }
 
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 070a5f8..1b40665 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="false" targetFramework="4.6.1">
+    <compilation debug="true" 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 2875e1a..405a0df 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
@@ -625,13 +625,20 @@ namespace FineUIPro.Web.Welder
                             }
 
                             // 1-对接，2-角焊缝，3-支管连接焊缝
-                            if (queProject[2].Contains("FG"))
+                            if (queProject[2].Contains("FG") )
                             {
                                 weldType = "2,3";
                             }
                             else
                             {
-                                weldType = "1,2";
+                                if (queProject[2].Contains("6G"))
+                                {
+                                    weldType = "1,2,3";
+                                }
+                                else
+                                {
+                                    weldType = "1,2";
+                                }
                             }
                         }
 
@@ -964,7 +971,14 @@ namespace FineUIPro.Web.Welder
                             }
                             else
                             {
-                                weldType = "1,2";
+                                if (queProject[2].Contains("6G"))
+                                {
+                                    weldType = "1,2,3";
+                                }
+                                else
+                                {
+                                    weldType = "1,2";
+                                }
                             }
                         }