挡停压到料问题修改。

RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs

@@ -50,7 +50,7 @@ namespace OnlineStore.DeviceLibrary
 
         internal bool IsInGetWare()
         {
-            if (MoveInfo.MoveStep >= StepEnum.OT07_MoveZToP2 && MoveInfo.MoveStep <= StepEnum.OT09_MoveZToP1)
+            if (MoveInfo.MoveStep >= StepEnum.OT06_MoveXToP2 && MoveInfo.MoveStep <= StepEnum.OT09_MoveZToP1)
             {
                 return true;
             }
@@ -181,7 +181,7 @@ namespace OnlineStore.DeviceLibrary
             else
             {
                 MoveInfo.NextMoveStep(StepEnum.OT03_MoveXToP2);
-                WorkLog("取料：取料X轴到P2 ", 0);
+                WorkLog("取料：取料X轴到P2 ", 0); 
                 MoveXAxis.AbsMove(MoveInfo, position, Config.MoveX_P2Speed);
             }
         }
@@ -190,7 +190,7 @@ namespace OnlineStore.DeviceLibrary
             if (MoveInfo.MoveParam.IsNgReel)
             {
                 MoveInfo.NextMoveStep(StepEnum.OT07_MoveZToP2);
-                WorkLog("取料：取料Z轴到P2 ", 0);
+                WorkLog("取料：取料Z轴到P2 ", 0); 
                 MoveZAxis.AbsMove(MoveInfo, Config.GetMoveZP2(MoveInfo.MoveParam.PlateH), Config.MoveZ_P2Speed);
             }
             else
@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
                 //MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
 
                 MoveInfo.NextMoveStep(StepEnum.OT07_MoveZToP2);
-                WorkLog("取料：取料Z轴到P2 ", 0);
+                WorkLog("取料：取料Z轴到P2 ", 0); 
                 MoveZAxis.AbsMove(MoveInfo, Config.GetMoveZP2(MoveInfo.MoveParam.PlateH), Config.MoveZ_P2Speed);
                 CheckStartLabel();
             }
@@ -232,14 +232,14 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(StepEnum.OT05_GetImage))
             { 
                 MoveInfo.NextMoveStep(StepEnum.OT07_MoveZToP2);
-                WorkLog("取料：取料Z轴到P2 ", 0);
+                WorkLog("取料：取料Z轴到P2 ", 0); 
                 MoveZAxis.AbsMove(MoveInfo, Config.GetMoveZP2(MoveInfo.MoveParam.PlateH), Config.MoveZ_P2Speed);
                 CheckStartLabel(); 
             }
             else if (MoveInfo.IsStep(StepEnum.OT06_MoveXToP2))
             {
                 MoveInfo.NextMoveStep(StepEnum.OT07_MoveZToP2);
-                WorkLog("取料：取料Z轴到P2 ", 0);
+                WorkLog("取料：取料Z轴到P2 ", 0); 
                 MoveZAxis.AbsMove(MoveInfo, Config.GetMoveZP2(MoveInfo.MoveParam.PlateH), Config.MoveZ_P2Speed);
                 CheckStartLabel();
             }
@@ -353,7 +353,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(StepEnum.OT15_MoveZToP1))
             {
                 MoveInfo.NextMoveStep(StepEnum.OT16_MoveXToP2);
-                WorkLog("放料：取料X轴回到P2 ", 0);
+                WorkLog("放料：取料X轴回到P2 ", 0); 
                 MoveXAxis.AbsMove(MoveInfo, Config.GetMoveXP2(MoveInfo.MoveParam.PlateW), Config.MoveX_P2Speed);
             }
             else if (MoveInfo.IsStep(StepEnum.OT16_MoveXToP2))

RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs

@@ -271,6 +271,7 @@ namespace OnlineStore.DeviceLibrary
                     WorkLog("料盘处理：右侧门打开，挡停放行", 0);
                     CylinderMove(MoveInfo, IO_Type.X_OutDoor_Up, IO_Type.X_OutDoor_Down);
                     CylinderMove(MoveInfo, IO_Type.X_StopCylinder_Down, IO_Type.X_StopCylinder_Up);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Out_TrayCheck, IO_VALUE.LOW));
                 }
                 else if (MoveInfo.IsTimeOut(120))
                 {
@@ -281,17 +282,29 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(StepEnum.XW22_OutDoorOpen))
             {
-                MoveInfo.NextMoveStep(StepEnum.XW23_OutLineRun);
-                WorkLog("料盘处理：中间皮带线，出口皮带线转动", 0);
-                IOMove(IO_Type.X_MLine_Run, IO_VALUE.HIGH);
-                IOMove(IO_Type.X_OLine_Run, IO_VALUE.HIGH);
+                if (IOValue(IO_Type.Out_TrayCheck).Equals(IO_VALUE.HIGH))
+                {
+                    MoveInfo.NextMoveStep(StepEnum.XW21_WaitOutNoReel);
+                    MoveInfo.TimeOutSeconds = 120;
+                    WorkLog("料盘处理：XW22_OutDoorOpen后发现出口有料，再次等待出口无料盘");
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Out_TrayCheck, IO_VALUE.LOW));
+                }
+                else
+                {
+                    MoveInfo.NextMoveStep(StepEnum.XW23_OutLineRun);
+                    WorkLog("料盘处理：中间皮带线，出口皮带线转动", 0);
+                    IOMove(IO_Type.X_MLine_Run, IO_VALUE.HIGH);
+                    IOMove(IO_Type.X_OLine_Run, IO_VALUE.HIGH);
+                    //MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_ReelCheck, IO_VALUE.LOW));
+                }
             }
             else if (MoveInfo.IsStep(StepEnum.XW23_OutLineRun))
             {
                 MoveInfo.NextMoveStep(StepEnum.XW24_WaitOutCheck);
-                WorkLog("料盘处理：等待出口皮带线检测到料盘", 0);
+                WorkLog("料盘处理：继续转动3秒后，等待出口皮带线检测到料盘", 0);
                 IOMove(IO_Type.X_MLine_Run, IO_VALUE.HIGH);
                 IOMove(IO_Type.X_OLine_Run, IO_VALUE.HIGH);
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Out_TrayCheck, IO_VALUE.HIGH));
             }
             else if (MoveInfo.IsStep(StepEnum.XW24_WaitOutCheck))