接驳台增加日志，使用单独定时器。

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -710,6 +710,13 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 levle = 1;
                 levle = 1;
             }
             }
+            List<int> jHy = new List<int>() { 210, 212 };
+            if (jHy.Contains(DeviceID)) 
+            {
+                //三个接驳台打印日志
+                levle = 1;
+            }
+
             if (levle.Equals(1))
             if (levle.Equals(1))
             {
             {
                 LogUtil.info(Name + "  " + posId + msg);
                 LogUtil.info(Name + "  " + posId + msg);

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs

@@ -48,9 +48,11 @@ namespace OnlineStore.DeviceLibrary
             runStatus = LineRunStatus.HomeMoving;
             runStatus = LineRunStatus.HomeMoving;
             MoveInfo.NewMove(LineMoveType.RHome);
             MoveInfo.NewMove(LineMoveType.RHome);
             StartReset();
             StartReset();
-            if (isDebug)
+            //if (isDebug)
             {
             {
+                mainTimer.Interval = 180;
                 mainTimer.Enabled = true;
                 mainTimer.Enabled = true;
+                LogInfo("StartRun 设置 Interval=180 ，启动定时器");
             }
             }
             return true;
             return true;
         }
         }
@@ -118,6 +120,8 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (MoveInfo.IsStep(LineMoveStep.JHY_R05_ClampCheck))
                 else if (MoveInfo.IsStep(LineMoveStep.JHY_R05_ClampCheck))
                 {
                 {
+                    mainTimer.Interval = 180;
+                    LogInfo("复位完成 设置 Interval=180 ");
                     LogInfo(MoveInfo.MoveType + " 完成！");
                     LogInfo(MoveInfo.MoveType + " 完成！");
                     MoveEndS();
                     MoveEndS();
                 }
                 }

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -699,7 +699,10 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         if (!moveEquip.IsDebug)
                         if (!moveEquip.IsDebug)
                         {
                         {
-                            moveEquip.TimerProcess();
+                            if (!moveEquip.mainTimerStart)
+                            {
+                                moveEquip.TimerProcess();
+                            }
                         }
                         }
                     }
                     }
 
 

source/DeviceLibrary/baan/AxisBean.cs

@@ -140,6 +140,11 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (errorCount <= axis.CanErrorCountMax)
                 if (errorCount <= axis.CanErrorCountMax)
                 {
                 {
+                    if (axisNo.Equals((short)19) || axisNo.Equals((short)21))
+                    {
+                        LogUtil.info($"ACAxisMoveIsEnd {MoveInfo.Name} {axis.DisplayStr}-{axisNo} 目标位置：{targetPosition}，速度：{targetSpeed} 运动完成 ");
+                    }
+                    //System.Diagnostics.Debug.WriteLine($"ACAxisMoveIsEnd {MoveInfo.Name} {axis.DisplayStr}-{axisNo} 目标位置：{targetPosition}，速度：{targetSpeed} 运动完成 ");
                     return true;
                     return true;
                 }
                 }
                 //轴不报警时才重新运动，否则直接报警
                 //轴不报警时才重新运动，否则直接报警

source/DeviceLibrary/model/KTK_Store.cs

@@ -27,6 +27,9 @@ namespace OnlineStore.DeviceLibrary
 
 
         private bool isInit = false;
         private bool isInit = false;
 
 
+        public bool mainTimerStart { get => mainTimer.Enabled; }
+            
+
         /// <summary>
         /// <summary>
         /// 托盘检测信号需要持续时间
         /// 托盘检测信号需要持续时间
         /// </summary>
         /// </summary>