bug修改

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -835,7 +835,7 @@ namespace OnlineStore.DeviceLibrary
                                 return true;
                                 return true;
                             }
                             }
 
 
-                            FeedingEquip feed5 = LineManager.Line.FeedingEquipMap[102];
+                            FeedingEquip feed5 = LineManager.Line.FeedingEquipMap[105];
                             if (!feed5.MoveInfo.MoveType.Equals(LineMoveType.InStore))
                             if (!feed5.MoveInfo.MoveType.Equals(LineMoveType.InStore))
                             {
                             {
                                 return true;
                                 return true;

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -457,8 +457,19 @@ namespace OnlineStore.DeviceLibrary
             if (MoveInfo.IsStep(LineMoveStep.JM_01_UpdownToP1))
             if (MoveInfo.IsStep(LineMoveStep.JM_01_UpdownToP1))
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.JM_02_CylinderTake);
                 MoveInfo.NextMoveStep(LineMoveStep.JM_02_CylinderTake);
-                OutLog(logName + MoveInfo.SLog + "：横移气缸取料端 ");
                 CylinderMove(MoveInfo, IO_Type.HY_MoveCylinder_Give, IO_Type.HY_MoveCylinder_Take);
                 CylinderMove(MoveInfo, IO_Type.HY_MoveCylinder_Give, IO_Type.HY_MoveCylinder_Take);
+                if (IsNgPro())
+                { 
+                    OutLog(logName + MoveInfo.SLog + "：横移气缸取料端");
+                }
+                else
+                {
+                    OutLog(logName + MoveInfo.SLog + "：横移气缸取料端 ，等待接驳台无料");
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck1, IO_VALUE.LOW));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck2, IO_VALUE.LOW));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck3, IO_VALUE.LOW));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck4, IO_VALUE.LOW));
+                }
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_02_CylinderTake))
             else if (MoveInfo.IsStep(LineMoveStep.JM_02_CylinderTake))
             {
             {
@@ -493,6 +504,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_07_ClampCheck))
             else if (MoveInfo.IsStep(LineMoveStep.JM_07_ClampCheck))
             {
             {
+                //更新托盘为空
                 if (SecondMoveInfo.IsStep(LineMoveStep.JHY_09_WaitProcessReel))
                 if (SecondMoveInfo.IsStep(LineMoveStep.JHY_09_WaitProcessReel))
                 {
                 {
                     //托盘可以离开
                     //托盘可以离开
@@ -571,7 +583,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_ClampCylinder_Check, IO_VALUE.LOW));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_ClampCylinder_Check, IO_VALUE.LOW));
                 if (!IsNgPro())
                 if (!IsNgPro())
                 {
                 {
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck1, IO_VALUE.HIGH)); 
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck1, IO_VALUE.HIGH));
                 }
                 }
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_15_ClampCheck))
             else if (MoveInfo.IsStep(LineMoveStep.JM_15_ClampCheck))