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 @@
-
+
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";
+ }
}
}