横移7、14短线体放行问题

source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs

@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary
     {
         public HY_OutLine(string cid, HYEquip_Config config) : base(cid, config)
         {
-            Name = (" "+config.LineName+"HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper();
+            Name = (" " + config.LineName + "HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper();
             MoveInfo.Name = Name;
             SecondMoveInfo.Name = Name;
         }
@@ -273,25 +273,30 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.OHY05_TrayCheck))
             {
-                if(IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
+                if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
                 {
                     MoveInfo.NextMoveStep(LineMoveStep.OHY21_WaitTrayLeave);
                     CheckLog("出料线横移(长线)" + MoveInfo.SLog + "   等待托盘离开");
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
 
                 }
+                else if (IOValue(IO_Type.HY_LongL_StopCheck).Equals(IO_VALUE.LOW))
+                {
+                    LogInfo("出料线横移(长线)" + MoveInfo.SLog + "  长线前阻挡未检测到托盘,结束处理");
+                    MoveInfo.EndMove();
+                }
                 else if (MoveInfo.IsTimeOut())
                 {
                     LogInfo("出料线横移(长线)" + MoveInfo.SLog + "   60秒超时，自动复位");
                     MoveInfo.EndMove();
                     Reset();
                 }
-                else if(MoveInfo.IsTimeOut(15))
+                else if (MoveInfo.IsTimeOut(15))
                 {
-                    MoveInfo.NextMoveStep(LineMoveStep.OHY05_TrayCheck);
+                    //MoveInfo.NextMoveStep(LineMoveStep.OHY05_TrayCheck);
                     LogInfo("出料线横移(长线)" + MoveInfo.SLog + "   15秒超时，长线体阻挡下降1200");
-                    IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.HIGH,1200);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
+                    IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.HIGH, 1200);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
                 }
             }
             #endregion
@@ -338,18 +343,23 @@ namespace OnlineStore.DeviceLibrary
                     CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                     LineStop(MoveInfo);
                 }
+                else if (IOValue(IO_Type.HY_ShortL_StopCheck).Equals(IO_VALUE.LOW))
+                {
+                    LogInfo("出料线横移(短线)" + MoveInfo.SLog + "  短线前阻挡未检测到托盘,结束处理");
+                    MoveInfo.EndMove();
+                }
                 else if (MoveInfo.IsTimeOut())
                 {
                     LogInfo("出料线横移(短线)" + MoveInfo.SLog + "   60秒超时，自动复位");
                     MoveInfo.EndMove();
                     Reset();
                 }
-                else if(MoveInfo.IsTimeOut(15))
+                else if (MoveInfo.IsTimeOut(15))
                 {
-                    MoveInfo.NextMoveStep(LineMoveStep.OHY15_TrayCheck);
+                    //MoveInfo.NextMoveStep(LineMoveStep.OHY15_TrayCheck);
                     LogInfo("出料线横移(短线)" + MoveInfo.SLog + "   15秒超时，短线阻挡下降1200");
-                    IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.HIGH,1200);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
+                    IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.HIGH, 1200);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
                 }
             }
             else if (MoveInfo.IsStep(LineMoveStep.OHY16_TopDown))