调试bug修改

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -569,12 +569,12 @@ namespace OnlineStore.DeviceLibrary
 
         protected void CheckLog(string msg)
         {
-            if (DeviceID.Equals(201) || DeviceID.Equals(201))
-            {
+            //if (DeviceID.Equals(201) || DeviceID.Equals(202))
+            //{
 
-                LogUtil.info(Name + "" + msg);
-            }
-            else
+            //    LogUtil.info(Name + "" + msg);
+            //}
+            //else
             {
                 LogUtil.debug(Name + "" + msg);
             }

source/DeviceLibrary/assemblyLine/HY/HYEquipBase.cs

@@ -187,6 +187,18 @@ namespace OnlineStore.DeviceLibrary
         {
         }
 
+        internal virtual bool CanStartMove()
+        {
+            if (MoveInfo.MoveType.Equals(LineMoveType.None) && runStatus.Equals(LineRunStatus.Runing))
+            {
+                if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.LOW))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         #region 定位气缸升降 ，链条转动
         public void LocationCylinderUp(LineMoveInfo moveinfo = null)
         {

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -180,7 +180,7 @@ namespace OnlineStore.DeviceLibrary
             }
         }
 
-
+         
         private Stopwatch trayCheckWait = new Stopwatch();//检测到托盘的时间
         private Stopwatch trayCheck2LowWait = new Stopwatch();//上一个托盘离开的时间
         private object lockObj = "";
@@ -394,7 +394,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
             {
                 HYEquipBase hyout = GetHyOutEquip();
-                if (hyout.MoveInfo.MoveType.Equals(LineMoveType.None)&&hyout.runStatus.Equals(LineRunStatus.Runing))
+                if (hyout.CanStartMove())
                 {
                     MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
                     CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) ");
@@ -551,7 +551,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 MoveInfo.NextMoveStep(LineMoveStep.HY73_OL_TopUp);
                 CheckLog("托盘阻挡" + MoveInfo.SLog + "  开始横移，顶升上升，出料线阻挡气缸下降,横移阻挡气缸上升");
-                CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
+                CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
                 OL_StopCylinderDown(MoveInfo);
                 HY_StopCylinderUp(MoveInfo);
             }
@@ -587,7 +587,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.HY78_OL_TopDown);
                 CheckLog("托盘阻挡" + MoveInfo.SLog + "  电机停止，顶升下降 ，出料线阻挡上升，出料线阻挡气缸上升，横移阻挡气缸上升");
                 LineStop(MoveInfo);
-                CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.TopCylinder_Down);
+                CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                 IOMove(IO_Type.HY_OL_StopDown, IO_VALUE.LOW);
                 OL_StopCylinderUp(MoveInfo);
                 HY_StopCylinderUp(MoveInfo);

source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs

@@ -363,7 +363,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
             {
                 HYEquipBase hyOut = GetHyOutEquip();
-                if (hyOut.MoveInfo.MoveType.Equals(LineMoveType.None)&&hyOut.runStatus.Equals(LineRunStatus.Runing))
+                if (hyOut.CanStartMove())
                 { 
                     MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
                     CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待"+ hyOut.Name + "准备完成(顶升上升，定位下降) ");