Skip to content

李娜 / SO908-XLRStore

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

存储机构-拍照点位增加

1 个父辈 2ec35899
内嵌 并排
正在显示 6 个修改的文件 包含 128 行增加 和 29 行删除
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.Designer.cs
......@@ -63,6 +63,9 @@
this.btnUpdown_P5 = new System.Windows.Forms.Button();
this.btnUpdown_P2 = new System.Windows.Forms.Button();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.groupBox26 = new System.Windows.Forms.GroupBox();
this.txtPullAxis_Inout_CamA = new System.Windows.Forms.TextBox();
this.btnInOutAxis_A_Cam = new System.Windows.Forms.Button();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.txtMiddleAxis_A_P3 = new System.Windows.Forms.TextBox();
this.txtMiddleAxis_A_P2 = new System.Windows.Forms.TextBox();
......@@ -79,6 +82,9 @@
this.btnXAxis_A_P2 = new System.Windows.Forms.Button();
this.txtXAxis_A_P1 = new System.Windows.Forms.TextBox();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.groupBox27 = new System.Windows.Forms.GroupBox();
this.txtPullAxis_Inout_CamB = new System.Windows.Forms.TextBox();
this.btnInOutAxis_B_Cam = new System.Windows.Forms.Button();
this.groupBox11 = new System.Windows.Forms.GroupBox();
this.txtComAxis_B_P1 = new System.Windows.Forms.TextBox();
this.btnComAxis_B_P1 = new System.Windows.Forms.Button();
......@@ -104,6 +110,8 @@
this.txtComAxis_AB_P2 = new System.Windows.Forms.TextBox();
this.btnComAxis_AB_P2 = new System.Windows.Forms.Button();
this.groupBox17 = new System.Windows.Forms.GroupBox();
this.btnPullAxis_Updown_P2 = new System.Windows.Forms.Button();
this.txtPullAxis_Updown_P2 = new System.Windows.Forms.TextBox();
this.btnPullAxis_Updown_P4 = new System.Windows.Forms.Button();
this.btnPullAxis_Updown_P3 = new System.Windows.Forms.Button();
this.txtPullAxis_Updown_P4 = new System.Windows.Forms.TextBox();
......@@ -189,8 +197,6 @@
this.label1 = new System.Windows.Forms.Label();
this.combBoxPosIds = new System.Windows.Forms.ComboBox();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnPullAxis_Updown_P2 = new System.Windows.Forms.Button();
this.txtPullAxis_Updown_P2 = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout();
this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout();
......@@ -199,10 +205,12 @@
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tabPage5.SuspendLayout();
this.groupBox26.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox6.SuspendLayout();
this.tabPage6.SuspendLayout();
this.groupBox27.SuspendLayout();
this.groupBox11.SuspendLayout();
this.groupBox10.SuspendLayout();
this.groupBox9.SuspendLayout();
......@@ -556,17 +564,47 @@
//
// tabPage5
//
this.tabPage5.Controls.Add(this.groupBox26);
this.tabPage5.Controls.Add(this.groupBox7);
this.tabPage5.Controls.Add(this.groupBox8);
this.tabPage5.Controls.Add(this.groupBox6);
this.tabPage5.Location = new System.Drawing.Point(4, 26);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(1637, 352);
this.tabPage5.Size = new System.Drawing.Size(1637, 350);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "A面移栽";
this.tabPage5.UseVisualStyleBackColor = true;
//
// groupBox26
//
this.groupBox26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.groupBox26.Controls.Add(this.txtPullAxis_Inout_CamA);
this.groupBox26.Controls.Add(this.btnInOutAxis_A_Cam);
this.groupBox26.Location = new System.Drawing.Point(688, 15);
this.groupBox26.Name = "groupBox26";
this.groupBox26.Size = new System.Drawing.Size(294, 56);
this.groupBox26.TabIndex = 7;
this.groupBox26.TabStop = false;
this.groupBox26.Text = "料斗拉取进出轴";
//
// txtPullAxis_Inout_CamA
//
this.txtPullAxis_Inout_CamA.Location = new System.Drawing.Point(142, 21);
this.txtPullAxis_Inout_CamA.Name = "txtPullAxis_Inout_CamA";
this.txtPullAxis_Inout_CamA.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Inout_CamA.TabIndex = 6;
//
// btnInOutAxis_A_Cam
//
this.btnInOutAxis_A_Cam.Location = new System.Drawing.Point(4, 17);
this.btnInOutAxis_A_Cam.Name = "btnInOutAxis_A_Cam";
this.btnInOutAxis_A_Cam.Size = new System.Drawing.Size(132, 32);
this.btnInOutAxis_A_Cam.TabIndex = 1;
this.btnInOutAxis_A_Cam.Text = "A面相机拍照点";
this.btnInOutAxis_A_Cam.UseVisualStyleBackColor = true;
this.btnInOutAxis_A_Cam.Click += new System.EventHandler(this.btnInOutAxis_A_Cam_Click);
//
// groupBox7
//
this.groupBox7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
......@@ -713,17 +751,47 @@
//
// tabPage6
//
this.tabPage6.Controls.Add(this.groupBox27);
this.tabPage6.Controls.Add(this.groupBox11);
this.tabPage6.Controls.Add(this.groupBox10);
this.tabPage6.Controls.Add(this.groupBox9);
this.tabPage6.Location = new System.Drawing.Point(4, 26);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(1637, 352);
this.tabPage6.Size = new System.Drawing.Size(1637, 350);
this.tabPage6.TabIndex = 2;
this.tabPage6.Text = "B面移栽";
this.tabPage6.UseVisualStyleBackColor = true;
//
// groupBox27
//
this.groupBox27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.groupBox27.Controls.Add(this.txtPullAxis_Inout_CamB);
this.groupBox27.Controls.Add(this.btnInOutAxis_B_Cam);
this.groupBox27.Location = new System.Drawing.Point(662, 31);
this.groupBox27.Name = "groupBox27";
this.groupBox27.Size = new System.Drawing.Size(294, 56);
this.groupBox27.TabIndex = 10;
this.groupBox27.TabStop = false;
this.groupBox27.Text = "料斗拉取进出轴";
//
// txtPullAxis_Inout_CamB
//
this.txtPullAxis_Inout_CamB.Location = new System.Drawing.Point(142, 21);
this.txtPullAxis_Inout_CamB.Name = "txtPullAxis_Inout_CamB";
this.txtPullAxis_Inout_CamB.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Inout_CamB.TabIndex = 6;
//
// btnInOutAxis_B_Cam
//
this.btnInOutAxis_B_Cam.Location = new System.Drawing.Point(4, 17);
this.btnInOutAxis_B_Cam.Name = "btnInOutAxis_B_Cam";
this.btnInOutAxis_B_Cam.Size = new System.Drawing.Size(132, 32);
this.btnInOutAxis_B_Cam.TabIndex = 1;
this.btnInOutAxis_B_Cam.Text = "B面相机拍照点";
this.btnInOutAxis_B_Cam.UseVisualStyleBackColor = true;
this.btnInOutAxis_B_Cam.Click += new System.EventHandler(this.btnInOutAxis_B_Cam_Click);
//
// groupBox11
//
this.groupBox11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
......@@ -979,6 +1047,23 @@
this.groupBox17.TabStop = false;
this.groupBox17.Text = "料斗拉取升降轴";
//
// btnPullAxis_Updown_P2
//
this.btnPullAxis_Updown_P2.Location = new System.Drawing.Point(26, 61);
this.btnPullAxis_Updown_P2.Name = "btnPullAxis_Updown_P2";
this.btnPullAxis_Updown_P2.Size = new System.Drawing.Size(132, 32);
this.btnPullAxis_Updown_P2.TabIndex = 10;
this.btnPullAxis_Updown_P2.Text = "料屉提取水平点P2";
this.btnPullAxis_Updown_P2.UseVisualStyleBackColor = true;
this.btnPullAxis_Updown_P2.Click += new System.EventHandler(this.btnPullAxis_Updown_P2_Click);
//
// txtPullAxis_Updown_P2
//
this.txtPullAxis_Updown_P2.Location = new System.Drawing.Point(24, 27);
this.txtPullAxis_Updown_P2.Name = "txtPullAxis_Updown_P2";
this.txtPullAxis_Updown_P2.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Updown_P2.TabIndex = 11;
//
// btnPullAxis_Updown_P4
//
this.btnPullAxis_Updown_P4.Location = new System.Drawing.Point(241, 65);
......@@ -1839,23 +1924,6 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// btnPullAxis_Updown_P2
//
this.btnPullAxis_Updown_P2.Location = new System.Drawing.Point(26, 61);
this.btnPullAxis_Updown_P2.Name = "btnPullAxis_Updown_P2";
this.btnPullAxis_Updown_P2.Size = new System.Drawing.Size(132, 32);
this.btnPullAxis_Updown_P2.TabIndex = 10;
this.btnPullAxis_Updown_P2.Text = "料屉提取水平点P2";
this.btnPullAxis_Updown_P2.UseVisualStyleBackColor = true;
this.btnPullAxis_Updown_P2.Click += new System.EventHandler(this.btnPullAxis_Updown_P2_Click);
//
// txtPullAxis_Updown_P2
//
this.txtPullAxis_Updown_P2.Location = new System.Drawing.Point(24, 27);
this.txtPullAxis_Updown_P2.Name = "txtPullAxis_Updown_P2";
this.txtPullAxis_Updown_P2.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Updown_P2.TabIndex = 11;
//
// FrmAxisMove
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -1878,6 +1946,8 @@
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tabPage5.ResumeLayout(false);
this.groupBox26.ResumeLayout(false);
this.groupBox26.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupBox8.ResumeLayout(false);
......@@ -1885,6 +1955,8 @@
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.tabPage6.ResumeLayout(false);
this.groupBox27.ResumeLayout(false);
this.groupBox27.PerformLayout();
this.groupBox11.ResumeLayout(false);
this.groupBox11.PerformLayout();
this.groupBox10.ResumeLayout(false);
......@@ -2095,5 +2167,11 @@
private System.Windows.Forms.Button btnCloseShieldAll;
private System.Windows.Forms.Button btnPullAxis_Updown_P2;
private System.Windows.Forms.TextBox txtPullAxis_Updown_P2;
private System.Windows.Forms.GroupBox groupBox26;
private System.Windows.Forms.TextBox txtPullAxis_Inout_CamA;
private System.Windows.Forms.Button btnInOutAxis_A_Cam;
private System.Windows.Forms.GroupBox groupBox27;
private System.Windows.Forms.TextBox txtPullAxis_Inout_CamB;
private System.Windows.Forms.Button btnInOutAxis_B_Cam;
}
}
\ No newline at end of file
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);
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!