托盘逻辑修改

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -413,18 +413,18 @@ namespace OnlineStore.DeviceLibrary
 
 
                         if (!wait.IsEnd)
                         if (!wait.IsEnd)
                         {
                         {
-                            if (wait.IoType.Equals(IO_Type.ClampCylinder_Slack) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 6000)
-                            {
-                                LogInfo("未检测到：ClampCylinder_Slack=HIGH，超过6秒钟，默认下一步骤");
-                                wait.IsEnd = true;
-                            }
-                            else if (wait.IoType.Equals(IO_Type.SL_MoveCylinder_Tighten) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 6000)
-                            {
-                                LogInfo("未检测到：SL_MoveCylinder_Tighten=HIGH，超过6秒钟，默认下一步骤");
-                                wait.IsEnd = true;
-                            }
-                            else
-                            {
+                            //if (wait.IoType.Equals(IO_Type.ClampCylinder_Slack) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 6000)
+                            //{
+                            //    LogInfo("未检测到：ClampCylinder_Slack=HIGH，超过6秒钟，默认下一步骤");
+                            //    wait.IsEnd = true;
+                            //}
+                            //else if (wait.IoType.Equals(IO_Type.SL_MoveCylinder_Tighten) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 6000)
+                            //{
+                            //    LogInfo("未检测到：SL_MoveCylinder_Tighten=HIGH，超过6秒钟，默认下一步骤");
+                            //    wait.IsEnd = true;
+                            //}
+                            //else
+                            //{
                             TimeSpan rwSpan = DateTime.Now - preRWTime;
                             TimeSpan rwSpan = DateTime.Now - preRWTime;
                             //一分钟还未检测到
                             //一分钟还未检测到
                             if (span.TotalSeconds > LineManager.Config.IOSingle_TimerOut && NoAlarm())
                             if (span.TotalSeconds > LineManager.Config.IOSingle_TimerOut && NoAlarm())
@@ -456,7 +456,7 @@ namespace OnlineStore.DeviceLibrary
                             isOk = false;
                             isOk = false;
                             break;
                             break;
                         }
                         }
-                        }
+                        //    }
                     }
                     }
                     else if (wait.WaitType.Equals(WaitEnum.W003_Time))
                     else if (wait.WaitType.Equals(WaitEnum.W003_Time))
                     {
                     {

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -50,7 +50,7 @@ namespace OnlineStore.DeviceLibrary
         private InOutParam CheckParam = new InOutParam();
         private InOutParam CheckParam = new InOutParam();
 
 
          
          
-        private DateTime lastStopDown = DateTime.Now; 
+        internal DateTime lastStopDown = DateTime.Now; 
         private Stopwatch swWaitWatch = new Stopwatch();
         private Stopwatch swWaitWatch = new Stopwatch();
 
 
         private void StartCheckFixture()
         private void StartCheckFixture()
@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                 }
                 }
                 else if (Config.SidesWayNum.Equals(2) && IOValue(IO_Type.SW_StopCheck).Equals(IO_VALUE.HIGH) && canProcess
                 else if (Config.SidesWayNum.Equals(2) && IOValue(IO_Type.SW_StopCheck).Equals(IO_VALUE.HIGH) && canProcess
-                     && (DateTime.Now - lastStopDown).TotalSeconds > 4)
+                     && (DateTime.Now - lastStopDown).TotalSeconds > 2.5)
                 {
                 {
                     if (TrayManager.checkWatch(swWaitWatch, TrayManager.SwTrayWaitTime, true))
                     if (TrayManager.checkWatch(swWaitWatch, TrayManager.SwTrayWaitTime, true))
                     {
                     {