Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 43eaab78 由 张东亮
选项

存储机构-拍照点位增加

1 个父辈 2ec35899
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 29 行增加 和 8 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -315,8 +315,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -315,8 +315,8 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
LogInfo($"复位 {MoveInfo.SLog}：抽屉在轴上,但行走机构不在抽屉位置，请确认！"); LogInfo($"复位 {MoveInfo.SLog}：抽屉在轴上,但行走机构不在抽屉位置{MoveInfo.MoveParam.MoveP.MoveAxis_P3}, 无法进行复位,请确认！");
System.Windows.Forms.MessageBox.Show("抽屉在轴上, 但行走机构不在抽屉位置，无法进行复位，请确认！"); System.Windows.Forms.MessageBox.Show($"抽屉在轴上, 但行走机构不在抽屉位置{MoveInfo.MoveParam.MoveP.MoveAxis_P3}，无法进行复位，请确认！");
SetBoxStatus(DeviceStatus.None, RunStatus.Wait); SetBoxStatus(DeviceStatus.None, RunStatus.Wait);
MoveInfo.EndMove(); MoveInfo.EndMove();
} }
...@@ -367,7 +367,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -367,7 +367,7 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.BOX_H004_PullAxis_UpdownToMiddle: case StepEnum.BOX_H004_PullAxis_UpdownToMiddle:
MoveInfo.NextMoveStep(StepEnum.BOX_H005_PullAxis_UpdownToLow); MoveInfo.NextMoveStep(StepEnum.BOX_H005_PullAxis_UpdownToLow);
LogInfo($"入库 {MoveInfo.SLog}：放下料屉，料斗拉取升降轴到料屉提取低点P4"); LogInfo($"复位 {MoveInfo.SLog}：放下料屉，料斗拉取升降轴到料屉提取低点P4");
PullAxis_UpdownToLowP4(); PullAxis_UpdownToLowP4();
break; break;
case StepEnum.BOX_H005_PullAxis_UpdownToLow: case StepEnum.BOX_H005_PullAxis_UpdownToLow:
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_AutoFindPos.cs
...@@ -159,7 +159,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -159,7 +159,6 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(MoveType.Working, param); MoveInfo.NewMove(MoveType.Working, param);
SetBoxStatus(DeviceStatus.Debugging, RunStatus.Busy); SetBoxStatus(DeviceStatus.Debugging, RunStatus.Busy);
MoveInfo.NextMoveStep(StepEnum.SA_01_Pos_Start_Find_Pos); MoveInfo.NextMoveStep(StepEnum.SA_01_Pos_Start_Find_Pos);
//PullAxis_Inout_To_P1();
PullAxis_Inout_To_Cam(); PullAxis_Inout_To_Cam();
} }
private bool SaveDrawerPosition() private bool SaveDrawerPosition()
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
...@@ -325,8 +325,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -325,8 +325,8 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.SI_18_PutTrayDown: case StepEnum.SI_18_PutTrayDown:
MoveInfo.NextMoveStep(StepEnum.SI_19_InoutBack); MoveInfo.NextMoveStep(StepEnum.SI_19_InoutBack);
LogInfo($"入库 {MoveInfo.SLog}：料斗拉取进出轴到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：料斗拉取进出轴到拍照点[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
PullAxis_Inout_To_P1(); PullAxis_Inout_To_Cam();
break; break;
case StepEnum.SI_19_InoutBack: case StepEnum.SI_19_InoutBack:
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
...@@ -135,8 +135,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -135,8 +135,8 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.SO_12_PutTrayDown: case StepEnum.SO_12_PutTrayDown:
MoveInfo.NextMoveStep(StepEnum.SO_13_InoutBack); MoveInfo.NextMoveStep(StepEnum.SO_13_InoutBack);
LogInfo($"出库 {MoveInfo.SLog}：料斗拉取进出轴到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"出库 {MoveInfo.SLog}：料斗拉取进出轴到拍照点[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
PullAxis_Inout_To_P1(); PullAxis_Inout_To_Cam();
break; break;
case StepEnum.SO_13_InoutBack: case StepEnum.SO_13_InoutBack:
//检查另一面是否有出库任务 //检查另一面是否有出库任务
......
source/XLRStoreClient/boxForm/FrmAxisMove.cs
...@@ -112,6 +112,8 @@ namespace OnlineStore.XLRStore ...@@ -112,6 +112,8 @@ namespace OnlineStore.XLRStore
txtXAxis_A_P2.Text = boxEquip.Config.XAxis_A_P2.ToString(); txtXAxis_A_P2.Text = boxEquip.Config.XAxis_A_P2.ToString();
txtXAxis_B_P1.Text = boxEquip.Config.XAxis_B_P1.ToString(); txtXAxis_B_P1.Text = boxEquip.Config.XAxis_B_P1.ToString();
txtXAxis_B_P2.Text = boxEquip.Config.XAxis_B_P2.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) private void LoadBoxPostion(BoxPosition boxPosition)
{ {
...@@ -571,6 +573,16 @@ namespace OnlineStore.XLRStore ...@@ -571,6 +573,16 @@ namespace OnlineStore.XLRStore
boxEquip.Config.XAxis_A_P2 = FormUtil.GetIntValue(txtXAxis_A_P2); boxEquip.Config.XAxis_A_P2 = FormUtil.GetIntValue(txtXAxis_A_P2);
needUpdate = true; 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) if (needUpdate)
{ {
//更新配置 //更新配置
...@@ -885,5 +897,15 @@ namespace OnlineStore.XLRStore ...@@ -885,5 +897,15 @@ namespace OnlineStore.XLRStore
{ {
SetAllColSig(1); 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);
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!