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 @@ true - Release|Any CPU + Debug|Any CPU 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 @@ 09/10/2013 16:29:20 - 04/19/2025 16:21:52 + 07/07/2025 18:58:25 07/03/2024 11:01:05 - 04/19/2025 16:21:52 + 07/07/2025 18:58:25 12/17/2020 21:32:28 @@ -115,10 +115,10 @@ 07/25/2012 11:48:56 - 04/19/2025 16:21:52 + 07/07/2025 18:58:24 - 04/19/2025 16:21:52 + 07/07/2025 18:58:24 02/18/2018 09:44:54 @@ -316,10 +316,10 @@ 02/01/2018 12:20:56 - 04/19/2025 16:21:53 + 07/07/2025 18:58:26 - 04/19/2025 16:21:53 + 07/07/2025 18:58:26 01/23/2014 13:57:34 @@ -445,7 +445,7 @@ 07/03/2024 11:01:07 - 04/19/2025 16:22:01 + 07/07/2025 18:58:35 \ 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 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true