From 62a49c78f68579a2dd51372526bef6939aa927bb Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 12 三月 2025 14:54:18 +0800
Subject: [PATCH] 雅达-新增MES相关类以扩展项目功能
---
Tiger.Business/Services/Base/InterfaceServiceNew.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/Tiger.Business/Services/Base/InterfaceServiceNew.cs b/Tiger.Business/Services/Base/InterfaceServiceNew.cs
index d827d0a..d67e481 100644
--- a/Tiger.Business/Services/Base/InterfaceServiceNew.cs
+++ b/Tiger.Business/Services/Base/InterfaceServiceNew.cs
@@ -291,6 +291,7 @@
trig = Biz.Db.Queryable<TSK_TRIG>().Where(q => q.JobId == job.ID).First();
trig.Status = TSK_TRIG.Statuss.Running.GetValue();
trig.StartTime = DateTime.Now;
+ trig.NextRunTime = schedule.NextRun;
listTrig.Add(trig);
}
}
@@ -418,15 +419,12 @@
var jobs = Biz.Db.Queryable<TSK_JOB>().IncludesAllFirstLayer().ToList();
foreach (var job in jobs)
{
- //if (job.JobName == "fU9C_MES_GetWo" || job.JobName == "fTest")
- {
- Type type = Type.GetType($"{job.AssemblyName}.{job.JobType},{job.AssemblyName}", throwOnError: true);
- dynamic _type = Activator.CreateInstance(type);
- TrigArgs args = JsonConvert.DeserializeObject<TrigArgs>(job.Triggers[0].Args);
- Schedule schedule = Schedule(_type, job.JobName, registry);
- //鐢熸垚璁″垝
- GenerateSchedule(args, schedule);
- }
+ Type type = Type.GetType($"{job.AssemblyName}.{job.JobType},{job.AssemblyName}", throwOnError: true);
+ dynamic _type = Activator.CreateInstance(type);
+ TrigArgs args = JsonConvert.DeserializeObject<TrigArgs>(job.Triggers[0].Args);
+ Schedule schedule = Schedule(_type, job.JobName, registry);
+ //鐢熸垚璁″垝
+ GenerateSchedule(args, schedule);
}
}
catch (System.Exception ex)
@@ -553,8 +551,8 @@
{
JobManager.RemoveJob(jobname);
string guid = Guid.NewGuid().ToString("N");
- TSK_JOB job = Biz.Db.Queryable<TSK_JOB>().Where(x => x.JobName == jobname).First();
- var trigger = Biz.Db.Queryable<TSK_TRIG>().Where(x => x.JobId == job.ID).First();
+ TSK_JOB job = Biz.Db.Queryable<TSK_JOB>().Where(x => x.JobName == jobname).IncludesAllFirstLayer().First();
+ var trigger = job.Triggers[0];
TrigArgs args = JsonConvert.DeserializeObject<TrigArgs>(job.Triggers[0].Args);
args.runType = RunType.ToRunNow;
JobManager.AddJob<TJob>((s) => GenerateSchedule(args, s.WithName(jobname)));
--
Gitblit v1.9.3