Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSparePartsInstockD.cs

@@ -33,6 +33,11 @@ public partial class EqpSparePartsInstockD : BaseEntity<string>
     /// 库位id
     /// </summary>
     public string? location_id { get; set; }
+    
+    /// <summary>
+    /// 工具仓库id
+    /// </summary>
+    public string tool_warehouse_id { get; set; }
 
     /// <summary>
     /// 质保开始时间

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);
                         }