Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -302,9 +302,10 @@ namespace OnlineStore.DeviceLibrary
                     if (GetCurLocation())
                     if (GetCurLocation())
                     {
                     {
                         MoveInfo.NextMoveStep(StepEnum.BOX_H002_PullAxis_UpdownToP3);
                         MoveInfo.NextMoveStep(StepEnum.BOX_H002_PullAxis_UpdownToP3);
+                        ComAxis_To_P2();
                         UpdownAxisTo_P6_P12();
                         UpdownAxisTo_P6_P12();
                         PullAxis_UpdownToHighP3();
                         PullAxis_UpdownToHighP3();
-                        LogInfo($"复位 {MoveInfo.SLog}：抽屉在料屉轴上,移栽升降轴到料屉上方过度点，料屉升降轴到高点P3");
+                        LogInfo($"复位 {MoveInfo.SLog}：抽屉在料屉轴上,压紧轴到压紧前点，移栽升降轴到料屉上方过度点，料屉升降轴到高点P3");
                     }
                     }
                     else
                     else
                     {
                     {

source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs

@@ -25,6 +25,10 @@ namespace OnlineStore.DeviceLibrary
         //    if()
         //    if()
         //    return false;
         //    return false;
         //}
         //}
+        //public bool CheckInputMiddleAxisInSafe()
+        //{
+        //    StoreManager.XLRStore.inputEquip.axiswo
+        //}
         /// <summary>
         /// <summary>
         /// 忽略相机检测到的抽屉误差误差
         /// 忽略相机检测到的抽屉误差误差
         /// </summary>
         /// </summary>
@@ -409,6 +413,8 @@ namespace OnlineStore.DeviceLibrary
                     atBside = true;
                     atBside = true;
                     col = i;
                     col = i;
                     PosId = $"05{side}{row.ToString().PadLeft(2, '0')}{col.ToString().PadLeft(2, '0')}0101";
                     PosId = $"05{side}{row.ToString().PadLeft(2, '0')}{col.ToString().PadLeft(2, '0')}0101";
+                    MoveInfo.MoveParam = new InOutParam(new InOutPosInfo("Reset", PosId));
+                    MoveInfo.MoveParam.MoveP = new LineMoveP(Config, MoveInfo.MoveParam.PosInfo.PosId);
                     return true;
                     return true;
                 }
                 }
             }
             }
@@ -426,6 +432,8 @@ namespace OnlineStore.DeviceLibrary
                         side = "AA";
                         side = "AA";
                         col = i;
                         col = i;
                         PosId = $"05{side}{row.ToString().PadLeft(2, '0')}{col.ToString().PadLeft(2, '0')}0101";
                         PosId = $"05{side}{row.ToString().PadLeft(2, '0')}{col.ToString().PadLeft(2, '0')}0101";
+                        MoveInfo.MoveParam = new InOutParam(new InOutPosInfo("Reset", PosId));
+                        MoveInfo.MoveParam.MoveP = new LineMoveP(Config, MoveInfo.MoveParam.PosInfo.PosId);
                         return true;
                         return true;
                     }
                     }
                 }
                 }