同时启动环形线和单个移栽或者模块时，模块使用自己的定时器。避免与环行线定时器冲突

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -45,18 +45,7 @@ namespace OnlineStore.DeviceLibrary
         protected abstract void CheckFixtureProcess();
         protected abstract void CheckFixtureProcess();
         protected override void mainTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         protected override void mainTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
         {
-            if(Monitor.TryEnter(lockMainTimer))
-            {
-                try
-                {
-                    TimerProcess();
-                }
-                finally
-                {
-                    Monitor.Exit(lockMainTimer);
-                }
-            }
-
+            TimerProcess();
         }
         }
         public DateTime LastAlarmTime = DateTime.Now;
         public DateTime LastAlarmTime = DateTime.Now;
         public override void Alarm(LineAlarmType alarmType)
         public override void Alarm(LineAlarmType alarmType)
@@ -149,34 +138,43 @@ namespace OnlineStore.DeviceLibrary
         protected int TimerMaxSeconds = 3;
         protected int TimerMaxSeconds = 3;
         public  void TimerProcess()
         public  void TimerProcess()
         {
         {
-
-            TimeSpan span = DateTime.Now - lastProTimer;
-            if (isInPro && span.TotalSeconds < TimerMaxSeconds)
-            {
-                return;
-            }
-            isInPro = true;
-            lastProTimer = DateTime.Now;
-            try
+            if (Monitor.TryEnter(lockMainTimer))
             {
             {
-                if (IsDebug&&runStatus<=LineRunStatus.Wait)
+                try
                 {
                 {
+                    TimeSpan span = DateTime.Now - lastProTimer;
+                    if (isInPro && span.TotalSeconds < TimerMaxSeconds)
+                    {
+                        return;
+                    }
+                    isInPro = true;
+                    lastProTimer = DateTime.Now;
+                    try
+                    {
+                        if (IsDebug && runStatus <= LineRunStatus.Wait)
+                        {
+                            isInPro = false;
+                            return;
+                        }
+                        BaseTimerProcess();
+
+                        if (TimerMaxSeconds > 3 && runStatus >= LineRunStatus.Runing)
+                        {
+                            TimerMaxSeconds = 3;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogUtil.error(Name + "TimerProcess出错：", ex);
+                    }
+
                     isInPro = false;
                     isInPro = false;
-                    return;
                 }
                 }
-                BaseTimerProcess();
-
-                if (TimerMaxSeconds > 3 && runStatus >= LineRunStatus.Runing)
+                finally
                 {
                 {
-                    TimerMaxSeconds = 3;
+                    Monitor.Exit(lockMainTimer);
                 }
                 }
             }
             }
-            catch (Exception ex)
-            {
-                LogUtil.error(Name + "TimerProcess出错：",ex);
-            }
-
-            isInPro = false;
         } 
         } 
         protected DateTime preIoTimerOutTime = DateTime.Now;
         protected DateTime preIoTimerOutTime = DateTime.Now;
         protected virtual void  IOTimeOutProcess()
         protected virtual void  IOTimeOutProcess()