From 65bc4f64e326cb16fc99dbd3efcf1e5084b4943a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 11 Aug 2026 14:41:19 +0800
Subject: [PATCH 1/6] 1

---
 HJGL_DS/FineUIPro.Web/Global.asax.cs                      | 4 ++--
 HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs | 4 ++--
 HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index 82dc829..303919c 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs
@@ -538,8 +538,8 @@
                                 }
                                 else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
                                 {
-                                    materialType = "FeⅢ";
-                                    materialTypeName = "合金钢";
+                                    materialType = "FeⅢ,FeⅡ,FeⅠ";
+                                    materialTypeName = "合金钢,不锈钢,碳钢";
                                 }
                                 else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
                                 {
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
index b418b68..6e3daaf 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
@@ -109,8 +109,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                 if (b)
                 {
                     string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p 
-                                    WHERE p.OrderDate<CONVERT(char(10),GetDate(),120) 
-                                          AND p.IsCancel=0 AND OrderTime=@OrderTime
+                                    WHERE ((p.OrderDate<CONVERT(char(10),GetDate(),120) AND OrderTime=@OrderTime) or p.OrderDate<CONVERT(char(10),DATEADD(day, -1, GETDATE()),120))
+                                          AND p.IsCancel=0 
                                           AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0";
                     List<SqlParameter> listStr = new List<SqlParameter>();
                     listStr.Add(new SqlParameter("@OrderTime", orderTime));
diff --git a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
index cf949bf..2875e1a 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
@@ -436,8 +436,8 @@ namespace FineUIPro.Web.Welder
                                     }
                                     else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
                                     {
-                                        materialType = "FeⅢ";
-                                        materialTypeName = "合金钢";
+                                        materialType = "FeⅢ,FeⅡ,FeⅠ";
+                                        materialTypeName = "合金钢,不锈钢,碳钢";
                                     }
                                     else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
                                     {
@@ -789,8 +789,8 @@ namespace FineUIPro.Web.Welder
                                     }
                                     else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
                                     {
-                                        materialType = "FeⅢ";
-                                        materialTypeName = "合金钢";
+                                        materialType = "FeⅢ,FeⅡ,FeⅠ";
+                                        materialTypeName = "合金钢,不锈钢,碳钢";
                                     }
                                     else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
                                     {

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 2/6] 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";
+                                }
                             }
                         }
 

From 03dfc4edb8b81e8e6df6f0cdf3c2b93dbf538cf7 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 11 Aug 2026 16:07:18 +0800
Subject: [PATCH 3/6] 1

---
 HJGL_DS/FineUIPro.Web/Web.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 1b40665..070a5f8 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>

From 8885232cc2c9789cfe81655623ce997ff3d5b5e6 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 11 Aug 2026 17:14:13 +0800
Subject: [PATCH 4/6] 1

---
 HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx
index 0393ebd..7380998 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx
@@ -170,8 +170,8 @@
         Target="Top" EnableResize="true" runat="server" IsModal="true"
         Width="1024px" Height="600px">
     </f:Window>
-    <f:Window ID="Window4" Title="打印" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Self" EnableResize="true" runat="server" IsModal="true" Width="1024px"
+    <f:Window ID="Window4" Title="焊口标注" Hidden="true" EnableIFrame="true" EnableMaximize="true" 
+        Target="Parent" EnableResize="false" runat="server" IsModal="true" Maximized="true" Width="1024px"
         Height="600px">
     </f:Window>
     <f:Window ID="Window5" Title="文档名" Hidden="true" EnableIFrame="true" EnableMaximize="true"

From f066daa2fc2ae4f86475560035f7392db21a9065 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 13 Aug 2026 10:38:51 +0800
Subject: [PATCH 5/6] 20260813

---
 HJGL_DS/FineUIPro.Web/Web.config                       |  2 +-
 .../WeldMat/UsingPlan/UsingPlanEdit.aspx.cs            | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 070a5f8..3c98f31 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=.\MSSQLSERVER01;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=.\SQL2022;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/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
index 2b57ac5..ff636e1 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
@@ -285,14 +285,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                     {
                         this.txtAmount.Text = temp.Amount.ToString();
                     }
-                    if (temp.InPutDate.HasValue)
-                    {
-                        this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", temp.InPutDate);
-                    }
-                    if (temp.OrderDate.HasValue)
-                    {
-                        this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", temp.OrderDate);
-                    }
+                    this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                    this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
 
                     if (!string.IsNullOrEmpty(temp.OrderTime))
                     {

From ad24681035aec77e9321f353f6d89db54a57f050 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 18 Aug 2026 11:47:15 +0800
Subject: [PATCH 6/6] 1

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1198dea..8d34333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ bin-release/
 /HJGL_DS/FineUIPro.Web/File/PDF/Pipe
 /HJGL_DS/FineUIPro.Web/File/Fastreport/Temp
 /HJGL_DS/FineUIPro.Web/ReportPrint
+/HJGL_DS/FineUIPro.Web/FileUpload/QRCodeFile