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

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -45,19 +45,8 @@ 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();
             TimerProcess();
         }
         }
-                finally
-                {
-                    Monitor.Exit(lockMainTimer);
-                }
-            }
-
-        }
         public DateTime LastAlarmTime = DateTime.Now;
         public DateTime LastAlarmTime = DateTime.Now;
         public override void Alarm(LineAlarmType alarmType)
         public override void Alarm(LineAlarmType alarmType)
         {
         {
@@ -149,7 +138,10 @@ namespace OnlineStore.DeviceLibrary
         protected int TimerMaxSeconds = 3;
         protected int TimerMaxSeconds = 3;
         public  void TimerProcess()
         public  void TimerProcess()
         {
         {
-
+            if (Monitor.TryEnter(lockMainTimer))
+            {
+                try
+                {
                     TimeSpan span = DateTime.Now - lastProTimer;
                     TimeSpan span = DateTime.Now - lastProTimer;
                     if (isInPro && span.TotalSeconds < TimerMaxSeconds)
                     if (isInPro && span.TotalSeconds < TimerMaxSeconds)
                     {
                     {
@@ -159,7 +151,7 @@ namespace OnlineStore.DeviceLibrary
                     lastProTimer = DateTime.Now;
                     lastProTimer = DateTime.Now;
                     try
                     try
                     {
                     {
-                if (IsDebug&&runStatus<=LineRunStatus.Wait)
+                        if (IsDebug && runStatus <= LineRunStatus.Wait)
                         {
                         {
                             isInPro = false;
                             isInPro = false;
                             return;
                             return;
@@ -173,11 +165,17 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                     catch (Exception ex)
                     catch (Exception ex)
                     {
                     {
-                LogUtil.error(Name + "TimerProcess出错：",ex);
+                        LogUtil.error(Name + "TimerProcess出错：", ex);
                     }
                     }
 
 
                     isInPro = false;
                     isInPro = false;
                 }
                 }
+                finally
+                {
+                    Monitor.Exit(lockMainTimer);
+                }
+            }
+        } 
         protected DateTime preIoTimerOutTime = DateTime.Now;
         protected DateTime preIoTimerOutTime = DateTime.Now;
         protected virtual void  IOTimeOutProcess()
         protected virtual void  IOTimeOutProcess()
         {
         {