From 756e6c531d49a4565e47949120cb33bae431566e Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期四, 24 四月 2025 09:45:22 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs index 5aeef52..301a957 100644 --- a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs +++ b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs @@ -30,15 +30,17 @@ public void Execute() { - Logger.Scheduler.Info($"杩涘叆璁″垝璋冨害(鍚嶇О:{Name})...\r\n"); + #region 鍥哄畾鍐欐硶 + Logger.Scheduler.Info($"/**\r\n *杩涘叆璁″垝璋冨害(鍚嶇О: {Name} )....\r\n */\r\n"); //鍥哄畾鍐欐硶 + Schedule = JobManager.GetSchedule(Name); //鍥哄畾鍐欐硶 + StartTime = DateTime.Now; //鍥哄畾鍐欐硶 + #endregion try { - Schedule = JobManager.GetSchedule(Name); - StartTime = DateTime.Now; string msg = ""; string status = "Successed"; GetJob(typeof(U9C_MES_GetCustomer).Name); - TskJobInput tskJobInput = CheckIFCanGo(); + TskJobInput tskJobInput = CheckHowToDo(); if (tskJobInput.result) { var result = DI.Resolve<IU9C_MES>().GetCustomer(tskJobInput.input); @@ -51,17 +53,20 @@ else { msg = $"浠嶶9C鑾峰彇瀹㈡埛淇℃伅鎴愬姛:{result.Message}"; - Trig.LastRunTime = (tskJobInput.input.endTime.ToDateTime() - DateTime.Now).TotalMinutes > 0 ? Trig.LastRunTime : tskJobInput.input.endTime.ToDateTime(); + //鍥哄畾鍐欐硶 + Trig.LastRunTime = Args.ByInterval == "Y" ? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime(); + Trig.NextRunTime = Schedule.NextRun; } } SaveFluentSchedulerLog(status, $"{msg}"); - Logger.Scheduler.Info($"璁″垝璋冨害(鍚嶇О:{Name})瀹屾垚锛岃繑鍥炰俊鎭�:{msg}\r\n"); + Logger.Scheduler.Info($"璁″垝璋冨害(鍚嶇О:{Name})瀹屾垚锛岃繑鍥炰俊鎭�:{msg}\r\n"); } catch (System.Exception ex) { Logger.Scheduler.Fatal(ex, "鑾峰彇瀹㈡埛淇℃伅寮傚父"); SaveFluentSchedulerLog("Failed", ex.Message); } + Logger.Scheduler.Info($"/* 璁″垝璋冨害(鍚嶇О:{Name})缁撴潫 */\r\n"); //鍥哄畾鍐欐硶 } } } -- Gitblit v1.9.3