入库未验证成功时需要停留3秒等待验证

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -403,16 +403,14 @@ namespace OnlineStore.DeviceLibrary
                             //判断是否验证成功，如果验证失败，不入库
                             if (LineServer.RightInPosId(DeviceID, cc.PosId))
                             {
+                                SecondMoveInfo.MoveParam = new InOutParam(cc.TrayNumber, cc.WareCode, cc.PosId, cc.PlateH, cc.PlateW, cc.InStoreNg);
                                 return true;
                             }
                             else
                             {
+                                SecondMoveInfo.MoveParam = new InOutParam(cc.TrayNumber, cc.WareCode, cc.PosId, cc.PlateH, cc.PlateW, cc.InStoreNg);
                                 LogUtil.error(Name + "托盘号【"+currTrayNum+"】入库信息【"+cc.ToStr()+ "】料仓未验证成功，重新发送验证消息");
                                 LineServer.CheckInStorePos(DeviceID, cc);  
-                                //TrayManager.UpdateInStoreNG(currTrayNum, true,"Box验证入库失败");
-                                //needRemove = true;
-                                //break;
-
                                 return true;
                             }
                         }
@@ -674,7 +672,7 @@ namespace OnlineStore.DeviceLibrary
                     }
                     else
                     {
-                        LogUtil.debug(Name+ SecondMoveInfo.MoveNum + "***************上个托盘号【" + preTrayNum + "】，当前" + (isFull ? "有料托盘" : "空托盘") + "【" + currTrayNum + "】没有出入库任务，放盘通过~");
+                        LogUtil.debug(Name + SecondMoveInfo.MoveNum + "***************上个托盘号【" + preTrayNum + "】，当前" + (isFull ? "有料托盘" : "空托盘") + "【" + currTrayNum + "】没有出入库任务，放盘通过~");
                         //  preTrayNum = currMoveTrayNum;
                         if (TrayManager.ErrorDeviceId.Equals(DeviceID))
                         {
@@ -687,17 +685,33 @@ namespace OnlineStore.DeviceLibrary
                 }
                 catch (Exception ex)
                 {
-                    LogUtil.error("判断托盘是否需要顶升出错：",ex);
+                    LogUtil.error("判断托盘是否需要顶升出错：", ex);
                 }
             }
             else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_05_WaitTime))
             {
                 //如果是出库，且盘高大于30，暂不顶升
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopUp);
-                if ( MoveInfo.MoveParam.PlateH >= 30)
+
+                if (MoveInfo.MoveType.Equals(LineMoveType.OutStore))
+                {
+                    if (MoveInfo.MoveParam != null && MoveInfo.MoveParam.PlateH >= 30)
+                    {
+                        CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "  高度>30，暂不顶升上升");
+                    }
+                }
+                else if (SecondMoveInfo.MoveParam != null)
+                {
+                    if (!LineServer.RightInPosId(DeviceID, SecondMoveInfo.MoveParam.PosId))
+                    {
+                        LogUtil.error(Name + " " + SecondMoveInfo.SLog + "[" + SecondMoveInfo.MoveParam.PosId + "]料仓未验证成功，等待3秒");
+                        SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
+                    }
+                    if (SecondMoveInfo.MoveParam.PlateH >= 30)
                     {
                         CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "  高度>30，暂不顶升上升");
                     }
+                }
                 else
                 {
                     CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "  顶升气缸上 升 ）");