From 0c0309afae85b72746bd2431c10c7f5982e210e3 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 四月 2025 17:46:44 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs
index 0e538c0..2fc7e4e 100644
--- a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs
+++ b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs
@@ -5,11 +5,14 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using Newtonsoft.Json;
using Tiger.IBusiness;
using Tiger.Model;
using Tiger.Model.Minsun;
using FluentScheduler;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
+using Sundial;
+using Microsoft.IdentityModel.Tokens;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.MES
{
@@ -34,7 +37,7 @@
Logger.Scheduler.Info(context.Trigger.ConvertToMonitor());
try
{
- var _lastRunTime = Biz.SysParam["GetWo_LastRun", "Interface_LastRun"].PARAM_VALUE;
+ var _lastRunTime = Cache.SysParam["GetWo_LastRun", "Interface_LastRun"].PARAM_VALUE;
var LastRunTime = string.IsNullOrEmpty(_lastRunTime) ? DateTime.Now.AddMinutes(-10) : Convert.ToDateTime(_lastRunTime);
if ((DateTime.Now - LastRunTime).TotalMinutes > 10)
{
@@ -66,50 +69,54 @@
{
public string Id { get; set; }
public string Tag { get; set; }
- public string Name { get; set; } = typeof(fU9C_MES_GetWo).Name;
+ public string Name { get; set; }
public fU9C_MES_GetWo()
{
Id = Guid.NewGuid().ToString("N");
Tag = "U9C_MES_GetWo Interface Job";
+ GetJob(typeof(fU9C_MES_GetWo).Name);
+ Name = Job.JobName;
}
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
{
string msg = "";
string status = "Successed";
- var _lastRunTime = Biz.SysParam["GetWo_LastRun", "Interface_LastRun"].PARAM_VALUE;
- var LastRunTime = string.IsNullOrEmpty(_lastRunTime) ? DateTime.Now.AddMinutes(-10) : Convert.ToDateTime(_lastRunTime);
- StartTime = DateTime.Now;
- if ((DateTime.Now - LastRunTime).TotalMinutes > 10)
+ GetJob(typeof(fU9C_MES_GetWo).Name);
+ TskJobInput tskJobInput = CheckHowToDo();
+ if (tskJobInput.result)
{
- GetWoInput input = new GetWoInput
+ var result = DI.Resolve<IU9C_MES>().GetU9CBasWo(tskJobInput.input);
+ if (!result.IsSuccessed)
{
- startTime = LastRunTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = LastRunTime.AddMinutes(10).ToString("yyyy-MM-dd HH:mm:ss")
- };
- //var result = DI.Resolve<IU9C_MES>().GetU9CBasWo(input);
- //if (!result.IsSuccessed)
- //{
- // msg = $"鑾峰彇宸ュ崟淇℃伅寮傚父:{result.Message}";
- // Logger.Scheduler.Error(msg);
- // status = "Failed";
- //}
- //else
- //{
- // msg = $"浠嶶9C鑾峰彇宸ュ崟淇℃伅鎴愬姛:{result.Message}";
- //}
+ msg = $"鑾峰彇宸ュ崟淇℃伅寮傚父:{result.Message}";
+ Logger.Scheduler.Error(msg);
+ status = "Failed";
+ }
+ else
+ {
+ msg = $"浠嶶9C鑾峰彇宸ュ崟淇℃伅鎴愬姛:{result.Message}";
+ //鍥哄畾鍐欐硶
+ Trig.LastRunTime = Args.ByInterval=="Y"? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime();
+ Trig.NextRunTime = Schedule.NextRun;
+ }
}
- SaveFluentSchedulerLog(Name, status, $"{msg}");
- Logger.Scheduler.Info($"璁″垝璋冨害(鍚嶇О:{Name})瀹屾垚锛岃繑鍥炰俊鎭�:{msg}\r\n");
+ SaveFluentSchedulerLog(status, $"{msg}");
+ Logger.Scheduler.Info($"璁″垝璋冨害(鍚嶇О: {Name} )瀹屾垚锛岃繑鍥炰俊鎭�: {msg} \r\n");
}
catch (System.Exception ex)
{
Logger.Scheduler.Fatal(ex, "鑾峰彇宸ュ崟淇℃伅寮傚父");
- SaveFluentSchedulerLog(Name, "Failed", ex.Message);
+ SaveFluentSchedulerLog("Failed", ex.Message);
}
+ Logger.Scheduler.Info($"/* 璁″垝璋冨害(鍚嶇О:{Name})缁撴潫 */\r\n"); //鍥哄畾鍐欐硶
}
}//endClass
@@ -131,7 +138,7 @@
{
string msg = "";
string status = "Successed";
- var _lastRunTime = Biz.SysParam["GetWo_LastRun", "Interface_LastRun"].PARAM_VALUE;
+ var _lastRunTime = Cache.SysParam["GetWo_LastRun", "Interface_LastRun"].PARAM_VALUE;
var LastRunTime = string.IsNullOrEmpty(_lastRunTime) ? DateTime.Now.AddMinutes(-10) : Convert.ToDateTime(_lastRunTime);
StartTime = DateTime.Now;
//if ((DateTime.Now - LastRunTime).TotalMinutes > 10)
@@ -147,7 +154,7 @@
// Logger.Scheduler.Error($"鑾峰彇宸ュ崟淇℃伅寮傚父:{result.Message}");
// }
//}
- SaveFluentSchedulerLog(Name, status, "娴嬭瘯浠诲姟鎴愬姛");
+ SaveFluentSchedulerLog(status, "娴嬭瘯浠诲姟鎴愬姛");
Logger.Scheduler.Info($"璁″垝璋冨害(鍚嶇О:{Name})瀹屾垚\r\n");
}
catch (System.Exception ex)
--
Gitblit v1.9.3