存储机构-拍照点位增加

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -315,8 +315,8 @@ namespace OnlineStore.DeviceLibrary
                         }
                         else
                         {
-                            LogInfo($"复位 {MoveInfo.SLog}：抽屉在轴上,但行走机构不在抽屉位置，请确认！");
-                            System.Windows.Forms.MessageBox.Show("抽屉在轴上, 但行走机构不在抽屉位置，无法进行复位，请确认！");
+                            LogInfo($"复位 {MoveInfo.SLog}：抽屉在轴上,但行走机构不在抽屉位置{MoveInfo.MoveParam.MoveP.MoveAxis_P3}, 无法进行复位,请确认！");
+                            System.Windows.Forms.MessageBox.Show($"抽屉在轴上, 但行走机构不在抽屉位置{MoveInfo.MoveParam.MoveP.MoveAxis_P3}，无法进行复位，请确认！");
                             SetBoxStatus(DeviceStatus.None, RunStatus.Wait);
                             MoveInfo.EndMove();
                         }
@@ -367,7 +367,7 @@ namespace OnlineStore.DeviceLibrary
                     break;
                 case StepEnum.BOX_H004_PullAxis_UpdownToMiddle:
                     MoveInfo.NextMoveStep(StepEnum.BOX_H005_PullAxis_UpdownToLow);
-                    LogInfo($"入库 {MoveInfo.SLog}：放下料屉，料斗拉取升降轴到料屉提取低点P4");
+                    LogInfo($"复位 {MoveInfo.SLog}：放下料屉，料斗拉取升降轴到料屉提取低点P4");
                     PullAxis_UpdownToLowP4();
                     break;
                 case StepEnum.BOX_H005_PullAxis_UpdownToLow:

source/DeviceLibrary/storeBean/boxBean/BoxEquip_AutoFindPos.cs

@@ -159,7 +159,6 @@ namespace OnlineStore.DeviceLibrary
             MoveInfo.NewMove(MoveType.Working, param);
             SetBoxStatus(DeviceStatus.Debugging, RunStatus.Busy);
             MoveInfo.NextMoveStep(StepEnum.SA_01_Pos_Start_Find_Pos);
-            //PullAxis_Inout_To_P1();
             PullAxis_Inout_To_Cam();
         }
         private bool SaveDrawerPosition()

source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs

@@ -325,8 +325,8 @@ namespace OnlineStore.DeviceLibrary
                     break;
                 case StepEnum.SI_18_PutTrayDown:
                     MoveInfo.NextMoveStep(StepEnum.SI_19_InoutBack);
-                    LogInfo($"入库 {MoveInfo.SLog}：料斗拉取进出轴到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
-                    PullAxis_Inout_To_P1();
+                    LogInfo($"入库 {MoveInfo.SLog}：料斗拉取进出轴到拍照点[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
+                    PullAxis_Inout_To_Cam();
                     break;
                 case StepEnum.SI_19_InoutBack:
 

source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs

@@ -135,8 +135,8 @@ namespace OnlineStore.DeviceLibrary
                     break;
                 case StepEnum.SO_12_PutTrayDown:
                     MoveInfo.NextMoveStep(StepEnum.SO_13_InoutBack);
-                    LogInfo($"出库 {MoveInfo.SLog}：料斗拉取进出轴到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
-                    PullAxis_Inout_To_P1();
+                    LogInfo($"出库 {MoveInfo.SLog}：料斗拉取进出轴到拍照点[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
+                    PullAxis_Inout_To_Cam();
                     break;
                 case StepEnum.SO_13_InoutBack:
                     //检查另一面是否有出库任务

source/XLRStoreClient/boxForm/FrmAxisMove.cs

@@ -112,6 +112,8 @@ namespace OnlineStore.XLRStore
             txtXAxis_A_P2.Text = boxEquip.Config.XAxis_A_P2.ToString();
             txtXAxis_B_P1.Text = boxEquip.Config.XAxis_B_P1.ToString();
             txtXAxis_B_P2.Text = boxEquip.Config.XAxis_B_P2.ToString();
+            txtPullAxis_Inout_CamA.Text = boxEquip.Config.PullAxis_Inout_CamA.ToString();
+            txtPullAxis_Inout_CamB.Text = boxEquip.Config.PullAxis_Inout_CamB.ToString();
         }
         private void LoadBoxPostion(BoxPosition boxPosition)
         {
@@ -571,6 +573,16 @@ namespace OnlineStore.XLRStore
                 boxEquip.Config.XAxis_A_P2 = FormUtil.GetIntValue(txtXAxis_A_P2);
                 needUpdate = true;
             }
+            if (boxEquip.Config.PullAxis_Inout_CamA != FormUtil.GetIntValue(txtPullAxis_Inout_CamA))
+            {
+                boxEquip.Config.PullAxis_Inout_CamA = FormUtil.GetIntValue(txtPullAxis_Inout_CamA);
+                needUpdate = true;
+            }
+            if (boxEquip.Config.PullAxis_Inout_CamB != FormUtil.GetIntValue(txtPullAxis_Inout_CamB))
+            {
+                boxEquip.Config.PullAxis_Inout_CamB = FormUtil.GetIntValue(txtPullAxis_Inout_CamB);
+                needUpdate = true;
+            }
             if (needUpdate)
             {
                 //更新配置
@@ -885,5 +897,15 @@ namespace OnlineStore.XLRStore
         {
             SetAllColSig(1);
         }
+
+        private void btnInOutAxis_A_Cam_Click(object sender, EventArgs e)
+        {
+            AxisABSMove(boxEquip.PullAxis_Inout, txtPullAxis_Inout_CamA, boxEquip.Config.PullAxis_Inout_P1_Speed);
+        }
+
+        private void btnInOutAxis_B_Cam_Click(object sender, EventArgs e)
+        {
+            AxisABSMove(boxEquip.PullAxis_Inout, txtPullAxis_Inout_CamB, boxEquip.Config.PullAxis_Inout_P1_Speed);
+        }
     }
 }