顶升之后等待2秒再转动横移电机

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 TrayLCyResetCount++;
                 TrayLCyResetCount++;
                 MoveInfo.NextMoveStep(LineMoveStep.FI_14_TrayLocation_Before);
                 MoveInfo.NextMoveStep(LineMoveStep.FI_14_TrayLocation_Before);
-                InLog("料架入库" + MoveInfo.SLog + "：升降盘定位气缸第【"+TrayLCyResetCount+"】次前进 ");
+                InLog("料架入库" + MoveInfo.SLog + "：升降盘定位气缸第【" + TrayLCyResetCount + "】次前进 ");
                 if (TrayLCyResetCount <= 4)
                 if (TrayLCyResetCount <= 4)
                 {
                 {
                     TrayLCylinderBefore(null);
                     TrayLCylinderBefore(null);
@@ -408,7 +408,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.FI_23_CylinderTighten);
                 MoveInfo.NextMoveStep(LineMoveStep.FI_23_CylinderTighten);
                 InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构夹紧");
                 InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构夹紧");
-                ClampJwa.Push(MoveInfo,true,LastCodeList.ToArray());
+                ClampJwa.Push(MoveInfo, true, LastCodeList.ToArray());
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.FI_23_CylinderTighten))
             else if (MoveInfo.IsStep(LineMoveStep.FI_23_CylinderTighten))
             {
             {
@@ -519,7 +519,7 @@ namespace OnlineStore.DeviceLibrary
                     int targetPositon = Config.GetUpdownP2Detial(LastHeight, LastWidth);
                     int targetPositon = Config.GetUpdownP2Detial(LastHeight, LastWidth);
                     UpdownAxis.AbsMove(MoveInfo, targetPositon, Config.UpdownAxis_P2Speed);
                     UpdownAxis.AbsMove(MoveInfo, targetPositon, Config.UpdownAxis_P2Speed);
                     LastPosParam.TrayNumber = currTrayNum;
                     LastPosParam.TrayNumber = currTrayNum;
-                    InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P2: [" + targetPositon + "]  暂不更新托盘["+currTrayNum+"]信息");
+                    InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P2: [" + targetPositon + "]  暂不更新托盘[" + currTrayNum + "]信息");
 
 
                     if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
                     if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
                     {
                     {
@@ -586,7 +586,7 @@ namespace OnlineStore.DeviceLibrary
                 //如果批量轴还在运动中，停止运动
                 //如果批量轴还在运动中，停止运动
                 AxisManager.instance.SuddenStop(BatchAxis.Config.DeviceName, BatchAxis.Config.GetAxisValue());
                 AxisManager.instance.SuddenStop(BatchAxis.Config.DeviceName, BatchAxis.Config.GetAxisValue());
 
 
-                InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升已到位 ,料盘耗时["+FormUtil.GetSpanStr(newTrayWatch.Elapsed)+"] ");
+                InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升已到位 ,料盘耗时[" + FormUtil.GetSpanStr(newTrayWatch.Elapsed) + "] ");
                 CheckHasTray();
                 CheckHasTray();
 
 
             }
             }
@@ -643,6 +643,12 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.FI_56_TopUp))
             else if (MoveInfo.IsStep(LineMoveStep.FI_56_TopUp))
             {
             {
+                MoveInfo.NextMoveStep(LineMoveStep.FI_57_WaitTime);
+                InLog("上料完成" + MoveInfo.SLog + "， 顶升上升之后等待2秒");
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
+            }
+            else if(MoveInfo.IsStep(LineMoveStep.FI_57_WaitTime))
+            { 
                 //TODO 
                 //TODO 
                 MoveInfo.NextMoveStep(LineMoveStep.FI_57_SideWayLineRun);
                 MoveInfo.NextMoveStep(LineMoveStep.FI_57_SideWayLineRun);
                 InLog("上料完成" + MoveInfo.SLog + "， 线体横移电机运转，等待料架离开上料工位");
                 InLog("上料完成" + MoveInfo.SLog + "， 线体横移电机运转，等待料架离开上料工位");

source/DeviceLibrary/model/StoreStep.cs

@@ -666,6 +666,11 @@ namespace OnlineStore.DeviceLibrary
         FI_56_TopUp,
         FI_56_TopUp,
 
 
         /// <summary>
         /// <summary>
+        /// 上料完成，顶升上升到位之后等待2秒再转动电机
+        /// </summary>
+        FI_57_WaitTime,
+
+        /// <summary>
         ///上料完成， 线体横移电机运转，等待料架到达出口
         ///上料完成， 线体横移电机运转，等待料架到达出口
         /// </summary>
         /// </summary>
         FI_57_SideWayLineRun,
         FI_57_SideWayLineRun,