拦截空托盘增加验证

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -30,12 +30,16 @@ namespace OnlineStore.DeviceLibrary
             if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && moveOk
             if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && moveOk
                  && (!MoveInfo.IsStep(LineMoveStep.MO_67_CylinderUp)))
                  && (!MoveInfo.IsStep(LineMoveStep.MO_67_CylinderUp)))
             {
             {
+                bool checkOk = (CheckCanPutOK && (checkCanPutTask == null || checkCanPutTask.IsCompleted));
+                if (checkOk)
+                {
                     if (isFull.Equals(false))
                     if (isFull.Equals(false))
                     {
                     {
                         LogInfo(" 出库中，拦截空托盘【 " + currTrayNum + "】~");
                         LogInfo(" 出库中，拦截空托盘【 " + currTrayNum + "】~");
                         return true;
                         return true;
                     }
                     }
                 } 
                 } 
+            }
             return false;
             return false;
         }
         }
 
 
@@ -470,6 +474,8 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (CylinderIsOk(IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After))
                 if (CylinderIsOk(IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After))
                 {
                 {
+                    if (checkCanPutTask == null || checkCanPutTask.IsCompleted)
+                    {
                         if (TrayIsOk())
                         if (TrayIsOk())
                         {
                         {
                             int trayNum = SecondMoveInfo.MoveParam.TrayNumber;
                             int trayNum = SecondMoveInfo.MoveParam.TrayNumber;
@@ -488,6 +494,11 @@ namespace OnlineStore.DeviceLibrary
                             CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
                             CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
                         }
                         }
                     }
                     }
+                    else if (MoveInfo.IsTimeOut(30))
+                    {
+                        MoveTimeOut(MoveInfo, "等待料盘可以放入托盘超时");
+                    }
+                }
                 else if (MoveInfo.IsTimeOut(20))
                 else if (MoveInfo.IsTimeOut(20))
                 {
                 {
                     MoveTimeOut(MoveInfo, "等待横移气缸后退到位超时");
                     MoveTimeOut(MoveInfo, "等待横移气缸后退到位超时");