From 75624b947a4a170b11115ff66e3cb6a3e8d06229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 24 Jun 2025 15:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/TaskManager.EntityFramework/JobDbContext.cs | 12 ++++++------ .../PublishProfiles/FolderProfile.pubxml.user | 2 +- .../Controllers/TaskConifgureController.cs | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/API/TaskManager.EntityFramework/JobDbContext.cs b/API/TaskManager.EntityFramework/JobDbContext.cs index b23b456..bc699e6 100644 --- a/API/TaskManager.EntityFramework/JobDbContext.cs +++ b/API/TaskManager.EntityFramework/JobDbContext.cs @@ -66,15 +66,15 @@ namespace TaskManager.EntityFramework // // 配置SQL Server连接 // optionsBuilder.UseSqlServer("Server=192.168.1.228;Database=TaskManager;User ID=sa;Password=ChangkeTec@2021;TrustServerCertificate=True"); //} -#if DEBUG - optionsBuilder.UseSqlServer("Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"); -#else - optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); +//#if DEBUG +// optionsBuilder.UseSqlServer("Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"); +//#else +// optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); -#endif +//#endif - /// optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); + optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); diff --git a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 01e8220..cc82153 100644 --- a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -3,7 +3,7 @@ <_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\ - True|2025-06-23T09:18:30.1990173Z||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||; + True|2025-06-24T07:48:22.4116425Z||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||; \ No newline at end of file diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 0adadda..ccfb64b 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -78,6 +78,9 @@ namespace TaskManager.Controllers + await Task.Delay(1000); + + var taskcount = _context.TaskSub.Count(p => p.TaskName == taskName && p.WriteState == false && taskName!= "来料检验数据"); if (taskcount>0) {