From bf47dca08a56dc5ce3545bc069d0081fc1eed32b Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Thu, 9 Nov 2023 14:38:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E8=AE=B0=E5=BD=95=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=BA=86=E6=89=8D=E7=94=9F=E6=88=90=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GenerateMaintainPlanTimeWorker.cs | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs b/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs index baba20a4..adfe18c8 100644 --- a/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs +++ b/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs @@ -42,15 +42,41 @@ namespace JNPF.TaskScheduler.Listener { //整除表示一个周期到了 + // foreach (var item in eqpSpotInsTemEquipHsByCirculate) + // { + // TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks); + // TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(item.start_time.ToString("yyyy-MM-dd")).Ticks); + // TimeSpan ts3 = ts1.Subtract(ts2).Duration(); + // if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0) + // { + // tobeCreateTemplets.Add(item); + // } + // } + + //按上一个保养记录来生成数据 foreach (var item in eqpSpotInsTemEquipHsByCirculate) { - TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks); - TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(item.start_time.ToString("yyyy-MM-dd")).Ticks); - TimeSpan ts3 = ts1.Subtract(ts2).Duration(); - if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0) + EqpMaintainRecordH eqpMaintainRecordH = await db.Queryable().Where(x=>x.maintain_tem_equip_id==item.id).OrderByDescending(x=>x.create_time).FirstAsync(); + if (eqpMaintainRecordH == null) { - tobeCreateTemplets.Add(item); + TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks); + TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(item.start_time.ToString("yyyy-MM-dd")).Ticks); + TimeSpan ts3 = ts1.Subtract(ts2).Duration(); + if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0) + { + tobeCreateTemplets.Add(item); + } + }else if (eqpMaintainRecordH.status!="1") + { + TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks); + TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(eqpMaintainRecordH.execute_time.Value.ToString("yyyy-MM-dd")).Ticks); + TimeSpan ts3 = ts1.Subtract(ts2).Duration(); + if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0) + { + tobeCreateTemplets.Add(item); + } } + } }