From 279fd0c8a7d0329eb1e74d6703fed8736edc9cc9 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 14 Aug 2025 13:57:54 +0800
Subject: [PATCH 1/2] 1

---
 HJGL_DS/FineUIPro.Web/Web.config                                | 2 +-
 HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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/;"/>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
index b565dfb..a50c832 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
@@ -122,7 +122,7 @@
 
                         var node = {
                            
-                            iframeUrl: './WeldMat/UsingSentMat/WelderConfirm.aspx?welderCode=' + data.d, 
+                            iframeUrl: './WeldMat/UsingSentMat/UsingMat.aspx?welderCode=' + data.d, 
                             title: "焊材领用",
                             id: "UsingMat" + getFormattedDate()
                         };

From ebff3b731a76c67918ea33383d8adea8311fec60 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sun, 17 Aug 2025 09:31:55 +0800
Subject: [PATCH 2/2] 1

---
 HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
index 69d189f..421f946 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
@@ -248,7 +248,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                 Alert.ShowInTop("请选择使用位置！", MessageBoxIcon.Warning);
                 return;
             }
-            if (this.drpUsingUnit.SelectedValue == BLL.Const._Null)
+            if (this.drpUsingUnit.SelectedValue == BLL.Const._Null && this.CurrUser.UserId != BLL.Const.GlyId)
             {
                 Alert.ShowInTop("请选择使用单位！", MessageBoxIcon.Warning);
                 return;