bug修改

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -173,12 +173,12 @@ namespace OnlineStore.DeviceLibrary
             else if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.HIGH))
             else if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.HIGH))
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.FI_05_LineStart);
                 MoveInfo.NextMoveStep(LineMoveStep.FI_05_LineStart);
-                InLog("入料检测： " + MoveInfo.SLog + "   阻挡工位有新料架，清理缓存料架RFID ，进料阻挡下降500，缓冲阻挡前进1000，流水线转动 1000");
+                InLog("入料检测： " + MoveInfo.SLog + "   阻挡工位有新料架，清理缓存料架RFID ，进料阻挡下降1500，缓冲阻挡前进1000，流水线转动 1000");
                 UpdateLastShelfID();
                 UpdateLastShelfID();
-                IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH, 500);//进料阻挡下降
+                IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
+                IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH, 1500);//进料阻挡下降
                 IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH, 1000);//缓冲阻挡前进1000
                 IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH, 1000);//缓冲阻挡前进1000
                 //  IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降
                 //  IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降
-                IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
                 //等待指定时间
                 //等待指定时间
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.HIGH));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.HIGH));

source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs

@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary
                 { 
                 { 
                     LogInfo(MoveInfo.MoveType + " 完成！");
                     LogInfo(MoveInfo.MoveType + " 完成！");
                     MoveEndS();
                     MoveEndS();
-
+                    runStatus = LineRunStatus.Runing;
                 }
                 }
             }
             }
         }
         }

source/DeviceLibrary/baan/ClampJawBean.cs

@@ -62,6 +62,8 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     moveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
                     moveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
                 }
                 }
+                //有一个到位就算到位
+                moveInfo.OneWaitCanEndStep = true;
             }
             }
         }
         }
 
 

source/DeviceLibrary/deviceLibrary/IO/IOManager.cs

@@ -30,12 +30,12 @@ namespace OnlineStore.DeviceLibrary
         #region KNDIO
         #region KNDIO
 
 
         private static void IOErrorLog(string ioType, int subType, string IOType = "IO")
         private static void IOErrorLog(string ioType, int subType, string IOType = "IO")
-        { 
+        {
             if (ioType.Equals(IO_Type.HY_FrontStopCheck))
             if (ioType.Equals(IO_Type.HY_FrontStopCheck))
             {
             {
 
 
             }
             }
-            if (IOType.Equals(IO_Type.SL_Buffer_StopDown))
+            else if (IOType.Equals(IO_Type.SL_Buffer_StopDown))
             {
             {
 
 
             }
             }
@@ -49,7 +49,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             ConfigIO configIo = GetDO(ioType, subType);
             ConfigIO configIo = GetDO(ioType, subType);
             if (configIo != null)
             if (configIo != null)
-            {
+            { 
                 instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
                 instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
                 Thread.Sleep(10);
                 Thread.Sleep(10);
             }
             }