From b1067792de10efd4f6b226770182953148e9d351 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 8 Jul 2025 11:27:40 +0800
Subject: [PATCH] 1

---
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user    |  2 +-
 .../HJGL/WeldingManage/JointInfoEdit.aspx.cs       |  4 ++++
 .../PublishProfiles/FolderProfile.pubxml.user      | 14 +++++++-------
 HJGL_DS/WebAPI/WebAPI.csproj.user                  |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 8aa7c11..bf54086 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
index 9c183aa..86fc6c9 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
@@ -210,6 +210,10 @@
                 if ((batchDetail != null || hotItems.Count() > 0) && this.CurrUser.UserId != BLL.Const.GlyId)
                 {
                     this.TextIsReadOnly(true);
+                    if (this.CurrUser.UserId == BLL.Const.GlyId)
+                    {
+                        ddlJOTY_ID.Enabled = true;
+                    }
                     if (batchDetail != null)
                     {
                         //var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 5450e39..2a2d145 100644
--- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -79,13 +79,13 @@
       <publishTime>09/10/2013 16:29:20</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>04/19/2025 16:21:52</publishTime>
+      <publishTime>07/07/2025 18:58:25</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>07/03/2024 11:01:05</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>04/19/2025 16:21:52</publishTime>
+      <publishTime>07/07/2025 18:58:25</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/17/2020 21:32:28</publishTime>
@@ -115,10 +115,10 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>04/19/2025 16:21:52</publishTime>
+      <publishTime>07/07/2025 18:58:24</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>04/19/2025 16:21:52</publishTime>
+      <publishTime>07/07/2025 18:58:24</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>02/18/2018 09:44:54</publishTime>
@@ -316,10 +316,10 @@
       <publishTime>02/01/2018 12:20:56</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>04/19/2025 16:21:53</publishTime>
+      <publishTime>07/07/2025 18:58:26</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>04/19/2025 16:21:53</publishTime>
+      <publishTime>07/07/2025 18:58:26</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
@@ -445,7 +445,7 @@
       <publishTime>07/03/2024 11:01:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>04/19/2025 16:22:01</publishTime>
+      <publishTime>07/07/2025 18:58:35</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 28be9c4..a48b337 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />