拦截空托盘增加验证

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -20,21 +20,25 @@ namespace OnlineStore.DeviceLibrary
             {
                 return false;
             }
-           
+
             bool isFull = TrayManager.TrayIsFull(currTrayNum);
             if (isFull)
             {
                 return false;
-            }
+            }             
             bool moveOk = (IsBigStore() && MoveInfo.MoveStep >= LineMoveStep.MO_62_WaitTray) || MoveInfo.MoveStep >= LineMoveStep.MO_63_CylinderAfter;
             if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && moveOk
                  && (!MoveInfo.IsStep(LineMoveStep.MO_67_CylinderUp)))
             {
-                if (isFull.Equals(false))
+                bool checkOk = (CheckCanPutOK && (checkCanPutTask == null || checkCanPutTask.IsCompleted));
+                if (checkOk)
                 {
-                    LogInfo(" 出库中，拦截空托盘【 " + currTrayNum + "】~");
-                    return true;
-                }
+                    if (isFull.Equals(false))
+                    {
+                        LogInfo(" 出库中，拦截空托盘【 " + currTrayNum + "】~");
+                        return true;
+                    }
+                } 
             }
             return false;
         }
@@ -470,22 +474,29 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (CylinderIsOk(IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After))
                 {
-                    if (TrayIsOk())
+                    if (checkCanPutTask == null || checkCanPutTask.IsCompleted)
                     {
-                        int trayNum = SecondMoveInfo.MoveParam.TrayNumber;
-                        //去掉直接丢盘处理
-                        MoveInfo.NextMoveStep(LineMoveStep.MO_65_CylinderDown);
-                        OutLog("出库 " + MoveInfo.SLog + ": 拦截到空托盘【" + trayNum + "】， 上下气缸下降 ,顶升气缸上升");
-                        if (MoveInfo.MoveParam != null)
+                        if (TrayIsOk())
                         {
-                            MoveInfo.MoveParam.TrayNumber = trayNum;
-                        }
-                        else
-                        {
-                            MoveInfo.MoveParam = SecondMoveInfo.MoveParam;
+                            int trayNum = SecondMoveInfo.MoveParam.TrayNumber;
+                            //去掉直接丢盘处理
+                            MoveInfo.NextMoveStep(LineMoveStep.MO_65_CylinderDown);
+                            OutLog("出库 " + MoveInfo.SLog + ": 拦截到空托盘【" + trayNum + "】， 上下气缸下降 ,顶升气缸上升");
+                            if (MoveInfo.MoveParam != null)
+                            {
+                                MoveInfo.MoveParam.TrayNumber = trayNum;
+                            }
+                            else
+                            {
+                                MoveInfo.MoveParam = SecondMoveInfo.MoveParam;
+                            }
+                            UpdownDownP2Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
+                            CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
                         }
-                        UpdownDownP2Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
-                        CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
+                    }
+                    else if (MoveInfo.IsTimeOut(30))
+                    {
+                        MoveTimeOut(MoveInfo, "等待料盘可以放入托盘超时");
                     }
                 }
                 else if (MoveInfo.IsTimeOut(20))