From a0c8f54db48a4d80b10316e446789af6c7b80d02 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 25 Sep 2025 14:25:34 +0800
Subject: [PATCH] 1

---
 .../FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs    | 4 ++--
 HJGL_DS/FineUIPro.Web/Web.config                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
index 31e9dbe..8c10333 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
@@ -232,7 +232,7 @@
                             btnCopy.Enabled = false;   // 不能引用
                         }
                     }
-                    if (batch.BatchIsClosed == true)  //批关闭则不能修改焊口号
+                    if (batch != null && batch.BatchIsClosed == true)  //批关闭则不能修改焊口号
                     {
 
                     }
@@ -1244,7 +1244,7 @@
             {
                 if (this.txtJointNo.Text.Trim().Last() == 'G')
                 {
-                    this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G","");
+                    this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", "");
                 }
             }
         }
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 5c46a5b..e233efb 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/;"/>