From 40f8e9bb2f54532d9538afe97eed5486492fc946 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 13 Aug 2024 16:18:19 +0800 Subject: [PATCH] BUG --- .../Tnb.EquipMgr.Entities/Entity/EqpSparePartsInstockD.cs | 5 +++++ .../Listener/GenerateSpotInspectionPlanTimeWorker.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSparePartsInstockD.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSparePartsInstockD.cs index 384b9c7a..e13ab149 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSparePartsInstockD.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSparePartsInstockD.cs @@ -33,6 +33,11 @@ public partial class EqpSparePartsInstockD : BaseEntity /// 库位id /// public string? location_id { get; set; } + + /// + /// 工具仓库id + /// + public string tool_warehouse_id { get; set; } /// /// 质保开始时间 diff --git a/taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs b/taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs index 58cd7eca..594d2565 100644 --- a/taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs +++ b/taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs @@ -73,7 +73,7 @@ namespace JNPF.TaskScheduler.Listener TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(now.ToString("yyyy-MM-dd HH:mm")).Ticks); TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(item.start_time.ToString("yyyy-MM-dd HH:mm")).Ticks); TimeSpan ts3 = ts1.Subtract(ts2).Duration(); - if ((ts3.TotalMinutes + offsetMinute) * 10 / 60 % (10 * (double)item.plan_cycle) == 0) + if (ts3.TotalMinutes * 10 / 60 % (10 * (double)item.plan_cycle) == 0) { tobeCreateTemplets.Add(item); }