存储机构-出库时检测到另一面料叉有料到缓存区高点

source/DeviceLibrary/storeBean/EquipBase.cs

@@ -304,13 +304,13 @@ namespace OnlineStore.DeviceLibrary
                         }
                         else
                         {
-                            if(wait.AxisInfo.DeviceName.Equals("移栽升降轴"))
-                            {
-                                string deviceName = wait.AxisInfo.DeviceName;
-                                short axisNo = wait.AxisInfo.GetAxisValue();
-                                int outCount = AxisManager.instance.GetActualtPosition(deviceName, axisNo);
-                                LogInfo($"移栽升降轴 目标位置：{wait.TargetPosition},当前位置：{outCount}");
-                            }
+                            //if(wait.AxisInfo.DeviceName.Equals("移栽升降轴"))
+                            //{
+                            //    string deviceName = wait.AxisInfo.DeviceName;
+                            //    short axisNo = wait.AxisInfo.GetAxisValue();
+                            //    int outCount = AxisManager.instance.GetActualtPosition(deviceName, axisNo);
+                            //    LogInfo($"移栽升降轴 目标位置：{wait.TargetPosition},当前位置：{outCount}");
+                            //}
                             wait.IsEnd = AxisBean.ACAxisMoveIsEnd(moveInfo, wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
                         }
                         if (!msg.Equals(""))

source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs

@@ -257,11 +257,14 @@ namespace OnlineStore.DeviceLibrary
                     else
                     {
                         MoveInfo.NextMoveStep(StepEnum.SO_14_GetReels_Ready);
-                        LogInfo($"出库 {MoveInfo.SLog}：另一面料叉有料，开始出库[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
+                        LogInfo($"出库 {MoveInfo.SLog}：另一面料叉有料，开始出库，准备送往出料口。行走机构到待机点P1，料屉升降轴到P1点，移栽升降轴到下暂存区放料高点P4/P10[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                         MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                         MoveInfo.MoveParam.PosInfo = MoveInfo.MoveParam.PosInfoBack.ToCopy();
                         MoveInfo.MoveParam.MoveP = new LineMoveP(Config, MoveInfo.MoveParam.PosInfoBack.PosId);
                         MoveInfo.MoveParam.PosInfoBack = null;
+                        MoveAxisToP1();
+                        PullAxis_UpdownToP1();
+                        UpdownAxisTo_P4_P10();
                     }
                     break;
                 case StepEnum.SO_20_Finish: