修改：hy9处把C4的空托盘都横移到Hy8。

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -187,6 +187,8 @@ namespace OnlineStore.DeviceLibrary
 
         private bool  preTrayIsC1Line = false;
 
+        private bool currIsOutLineTray = false;
+
         private void stopWatchCheck()
         {
             if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
@@ -291,12 +293,14 @@ namespace OnlineStore.DeviceLibrary
                     }
                     StopDownCount = 0;
                     preTrayIsC1Line = true;
+                    currIsOutLineTray = false;
                     //托盘在前阻挡处
                     frontTrayCheckWait.Stop();
                     trayCheckLowWait.Stop();
                     MoveInfo.NewMove(LineMoveType.Fixture);
                     runStatus = LineRunStatus.Busy;
                     MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
                     if (DeviceID.Equals(219))
                     {
                         LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘，前阻挡下降");
@@ -311,7 +315,6 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.LOW));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
                     CylinderMove(null, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
                     IOMove(IO_Type.HY_OL_StopDown, IO_VALUE.LOW);
                 }
                 catch (Exception ex)
@@ -341,6 +344,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.error(Name + logName + " 不在空闲中，直接返回 ");
                         return;
                     }
+                    currIsOutLineTray = false;
                     //托盘在工位阻挡处
                     MoveInfo.NewMove(LineMoveType.Fixture);
                     runStatus = LineRunStatus.Busy;
@@ -396,6 +400,7 @@ namespace OnlineStore.DeviceLibrary
                     if (CheckStopWatch(olcheckWatch, TrayWaitTime, false) && check2IsOk)
                     {
                         preTrayIsC1Line = false;
+                        currIsOutLineTray = true;
                         //托盘在前阻挡处
                         olcheckWatch.Stop();
                         trayCheckLowWait.Stop();
@@ -903,17 +908,28 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY77_OL_WaitTime))
             {
+
+                UpdateTrayNum();
+                bool isNeedHY = TrayNeedHY(currTrayNum);
+              
                 MoveInfo.NextMoveStep(LineMoveStep.HY78_OL_TopDown);
-                CheckLog("托盘阻挡" + MoveInfo.SLog + "  电机停止，顶升下降 ，出料线阻挡上升，出料线阻挡气缸上升，横移阻挡气缸上升");
                 LineStop(MoveInfo);
-                CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
+                if (isNeedHY)
+                { 
+                    CheckLog("托盘阻挡" + MoveInfo.SLog + "  电机停止，顶升不需要下降 ，出料线阻挡上升，出料线阻挡气缸上升，横移阻挡气缸上升");
+                }
+                else
+                { 
+                    CheckLog("托盘阻挡" + MoveInfo.SLog + "  电机停止，顶升下降 ，出料线阻挡上升，出料线阻挡气缸上升，横移阻挡气缸上升");
+                    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);
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY78_OL_TopDown))
             {
-                UpdateTrayNum();
+                //UpdateTrayNum();
                 //判断托盘是直接离开开始需要横移
                 if (TrayNeedHY(currTrayNum))
                 {
@@ -925,6 +941,7 @@ namespace OnlineStore.DeviceLibrary
                     //直接放盘通过
                     MoveInfo.NextMoveStep(LineMoveStep.HY91_TrayCanGo);
                     CheckLog("托盘阻挡" + MoveInfo.SLog + "  无需处理，放托盘离开");
+                    CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                 }
             }
 
@@ -1120,6 +1137,13 @@ namespace OnlineStore.DeviceLibrary
                         }
                         else
                         {
+
+                            //如果是出料口来的空托盘直接横移
+                            if (currIsOutLineTray)
+                            {
+                                return true;
+                            }
+
                             //如果进仓15，进仓16有料，空料盘直接横移
                             MoveEquip move14 = LineManager.Line.MoveEquipMap[14];
                             MoveEquip move15 = LineManager.Line.MoveEquipMap[15];