bug修改

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -391,52 +391,6 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         #endregion
         #endregion
 
 
-
-        internal bool Move5CanStop2Down(int deviceId)
-        {
-
-            if (!deviceId.Equals(5))
-            {
-                return true;
-            }
-
-            if (HYEquipMap.ContainsKey(208))
-            {
-                HYEquipBase hy8 = HYEquipMap[208];
-                if (hy8.runStatus <= LineRunStatus.Wait)
-                {
-                    return true;
-                }
-                else if (hy8.MoveInfo.MoveType.Equals(LineMoveType.None))
-                {
-                    return true;
-                }
-
-            }
-            return false;
-        }
-        internal void Move5Stop2Down(int deviceId)
-        {
-            try
-            {
-                if (!deviceId.Equals(5))
-                {
-                    return;
-                }
-                if (HYEquipMap.ContainsKey(208))
-                {
-                    //HY_C1Line hy8 = (HY_C1Line)HYEquipMap[208];
-                    //if (hy8.runStatus > LineRunStatus.Wait && hy8.MoveInfo.MoveType.Equals(LineMoveType.None))
-                    //{
-                    //    LogUtil.debug("进仓05托盘离开，" + hy8.Name + "开始等待托盘检测信号 HY03_FrontStopUp");
-                    //    hy8.HY03_FrontStopUp();
-                    //}
-                }
-            }
-            catch (Exception ex)
-            {
-                LogUtil.error("Move5Stop2Down[" + deviceId + "]出错：" + ex.ToString());
-            }
-        }
+         
     }
     }
 }
 }

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -1040,8 +1040,7 @@ namespace OnlineStore.DeviceLibrary
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MO_18_WaitTime);
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MO_18_WaitTime);
                 CheckLog("托盘放行  " + SecondMoveInfo.SLog + " ， 等待300ms后阻挡2上升");
                 CheckLog("托盘放行  " + SecondMoveInfo.SLog + " ， 等待300ms后阻挡2上升");
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
-
-                LineManager.Line.Move5Stop2Down(DeviceID);
+                 
             }
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.MO_18_WaitTime))
             else if (SecondMoveInfo.IsStep(LineMoveStep.MO_18_WaitTime))
             {
             {
@@ -1060,20 +1059,12 @@ namespace OnlineStore.DeviceLibrary
             #endregion
             #endregion
         }
         }
         private void MO_16_Stop2Down()
         private void MO_16_Stop2Down()
-        {
-            if (LineManager.Line.Move5CanStop2Down(DeviceID))
-            {
-                SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
-                CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，阻挡气缸1-2下降 ");
-                IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
-                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH)); 
-            }
-            else if (SecondMoveInfo.IsTimeOut(120))
-            {
-                WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待HY8空闲[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
-                LogUtil.error(WarnMsg, DeviceID * 1000 + 12);
-                Alarm(LineAlarmType.IoSingleTimeOut);
-            }
+        { 
+            SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
+            CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，阻挡气缸1-2下降 ");
+            IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
+            SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
+          
         }
         }
 
 
         #endregion
         #endregion