1

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -129,22 +129,6 @@ namespace OnlineStore.DeviceLibrary
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_StopDown, IO_VALUE.LOW));
-            ////阻挡上升
-            //if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
-            //{
-            //    LogInfo(MoveInfo.MoveType + "：" + MoveInfo.SLog + "：开始复位，放料顶升下降， 所有阻挡上升，检测到定位工位有信号，不转动链条");
-            //}
-            //else
-            //{
-            //    LogInfo(MoveInfo.MoveType + "：" + MoveInfo.SLog + "：开始复位，放料顶升下降， 所有阻挡上升，链条先转动3秒钟 ");
-            //    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
-            //    //线体开始转动
-            //    IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
-            //    IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.HIGH);
-            //    IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.HIGH);
-            //    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.HIGH));
-            //    MoveInfo.OneWaitCanEndStep = true;
-            //}
             isInPro = false;
             isInPro = false;
         }
         }
         //复位时，应该先提升伺服回原点，然后提升伺服下降到P2点，放开定位气缸，顶升气缸下降，提升伺服在上升到P1点。
         //复位时，应该先提升伺服回原点，然后提升伺服下降到P2点，放开定位气缸，顶升气缸下降，提升伺服在上升到P1点。

source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs

@@ -191,11 +191,14 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         private bool LineTurnIsStop()
         private bool LineTurnIsStop()
         {
         {
-            if (lineRun.InTurn.Equals(false))
+            if (lineRun.InTurn.Equals(false) )
             {
             {
                 if (equipBean.IOValue(LineRun_Do).Equals(IO_VALUE.LOW))
                 if (equipBean.IOValue(LineRun_Do).Equals(IO_VALUE.LOW))
                 {
                 {
-                    return true;
+                    if (lineRun.CanStart(1000))
+                    {
+                        return true;
+                    }
                 }
                 }
                 else
                 else
                 {
                 {
@@ -323,10 +326,10 @@ namespace OnlineStore.DeviceLibrary
         private string LastCheckDI = "";
         private string LastCheckDI = "";
         private int subType = 0;
         private int subType = 0;
         internal DateTime LastEndTime = DateTime.Now;
         internal DateTime LastEndTime = DateTime.Now;
-        public bool CanStart()
+        public bool CanStart(int totalMS=2000)
         {
         {
             TimeSpan span = DateTime.Now - LastEndTime;
             TimeSpan span = DateTime.Now - LastEndTime;
-            if (span.TotalSeconds > 2)
+            if (span.TotalMilliseconds > totalMS)
             {
             {
                 return true;
                 return true;
             }return false;
             }return false;
@@ -368,7 +371,7 @@ namespace OnlineStore.DeviceLibrary
             //先等待信号灭一次，然后再亮时停止
             //先等待信号灭一次，然后再亮时停止
             while (true)
             while (true)
             {
             {
-                Thread.Sleep(20);
+                Thread.Sleep(50);
                 TimeSpan span = DateTime.Now - startTime;
                 TimeSpan span = DateTime.Now - startTime;
                 if (!InTurn)
                 if (!InTurn)
                 {
                 {
@@ -403,7 +406,7 @@ namespace OnlineStore.DeviceLibrary
             isStop = false;
             isStop = false;
             while (true)
             while (true)
             {
             {
-                Thread.Sleep(20);
+                Thread.Sleep(50);
                 TimeSpan span = DateTime.Now - startTime;
                 TimeSpan span = DateTime.Now - startTime;
                 if (!InTurn)
                 if (!InTurn)
                 {
                 {