Skip to content

李娜 / SO908-XLRStore

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

1

1 个父辈 4e882e84
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 77 行增加 和 17 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -835,6 +835,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -835,6 +835,10 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
else
{
return waitAOutStoreList.TryDequeue(out param);
}
} }
else else
{ {
...@@ -853,6 +857,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -853,6 +857,10 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
else
{
return waitBOutStoreList.TryDequeue(out param);
}
} }
}catch(Exception ex) }catch(Exception ex)
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
...@@ -41,8 +41,8 @@ namespace OnlineStore.XLRStore ...@@ -41,8 +41,8 @@ namespace OnlineStore.XLRStore
lblName.Text = boxBean.Name; lblName.Text = boxBean.Name;
this.Text = boxBean.Name; this.Text = boxBean.Name;
chbDebug.Checked = boxBean.IsDebug; chbDebug.Checked = boxBean.IsDebug;
FrmAutoFindPos frmAutoFindPos = new FrmAutoFindPos(); //FrmAutoFindPos frmAutoFindPos = new FrmAutoFindPos();
AddForm(tabControl1, " 视觉对位 ", frmAutoFindPos); //AddForm(tabControl1, " 视觉对位 ", frmAutoFindPos);
//FrmTongsLearn learn = new FrmTongsLearn(); //FrmTongsLearn learn = new FrmTongsLearn();
//AddForm(tabControl1, " 抓手训练 ", learn); //AddForm(tabControl1, " 抓手训练 ", learn);
FrmPosDebug frmPosDebug = new FrmPosDebug(); FrmPosDebug frmPosDebug = new FrmPosDebug();
......
source/XLRStoreClient/inputForm/FrmBatchMove.Designer.cs
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnScan = new System.Windows.Forms.Button(); this.btnScan = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.btnPointEnable = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.LineStop_A = new System.Windows.Forms.Button(); this.LineStop_A = new System.Windows.Forms.Button();
this.LineBack_A = new System.Windows.Forms.Button(); this.LineBack_A = new System.Windows.Forms.Button();
...@@ -73,6 +74,7 @@ ...@@ -73,6 +74,7 @@
// //
// panel2 // panel2
// //
this.panel2.Controls.Add(this.btnPointEnable);
this.panel2.Controls.Add(this.groupBox3); this.panel2.Controls.Add(this.groupBox3);
this.panel2.Controls.Add(this.groupBox2); this.panel2.Controls.Add(this.groupBox2);
this.panel2.Controls.Add(this.groupBox1); this.panel2.Controls.Add(this.groupBox1);
...@@ -85,6 +87,19 @@ ...@@ -85,6 +87,19 @@
this.panel2.Size = new System.Drawing.Size(949, 546); this.panel2.Size = new System.Drawing.Size(949, 546);
this.panel2.TabIndex = 324; this.panel2.TabIndex = 324;
// //
// btnPointEnable
//
this.btnPointEnable.BackColor = System.Drawing.Color.White;
this.btnPointEnable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPointEnable.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPointEnable.Location = new System.Drawing.Point(502, 503);
this.btnPointEnable.Name = "btnPointEnable";
this.btnPointEnable.Size = new System.Drawing.Size(135, 34);
this.btnPointEnable.TabIndex = 286;
this.btnPointEnable.Text = "启用点位编辑";
this.btnPointEnable.UseVisualStyleBackColor = false;
this.btnPointEnable.Click += new System.EventHandler(this.btnPointEnable_Click);
//
// groupBox3 // groupBox3
// //
this.groupBox3.Controls.Add(this.LineStop_A); this.groupBox3.Controls.Add(this.LineStop_A);
...@@ -308,9 +323,9 @@ ...@@ -308,9 +323,9 @@
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true; this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(322, 86); this.chbMoveStop.Location = new System.Drawing.Point(302, 86);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24); this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.TabIndex = 327; this.chbMoveStop.TabIndex = 327;
this.chbMoveStop.Text = "暂停运动"; this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
...@@ -349,9 +364,9 @@ ...@@ -349,9 +364,9 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(213, 86); this.chbDebug.Location = new System.Drawing.Point(193, 86);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 325; this.chbDebug.TabIndex = 325;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -377,7 +392,7 @@ ...@@ -377,7 +392,7 @@
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(5, 62); this.lblAgvInfo.Location = new System.Drawing.Point(5, 62);
this.lblAgvInfo.Name = "lblAgvInfo"; this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17); this.lblAgvInfo.Size = new System.Drawing.Size(75, 20);
this.lblAgvInfo.TabIndex = 282; this.lblAgvInfo.TabIndex = 282;
this.lblAgvInfo.Text = "AGV 状态"; this.lblAgvInfo.Text = "AGV 状态";
// //
...@@ -423,7 +438,7 @@ ...@@ -423,7 +438,7 @@
// //
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Location = new System.Drawing.Point(6, 128); this.axisMoveControl1.Location = new System.Drawing.Point(5, 136);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(486, 398); this.axisMoveControl1.Size = new System.Drawing.Size(486, 398);
this.axisMoveControl1.TabIndex = 219; this.axisMoveControl1.TabIndex = 219;
...@@ -435,9 +450,9 @@ ...@@ -435,9 +450,9 @@
this.chbAutoOut.Checked = true; this.chbAutoOut.Checked = true;
this.chbAutoOut.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoOut.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoOut.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoOut.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoOut.Location = new System.Drawing.Point(502, 510); this.chbAutoOut.Location = new System.Drawing.Point(725, 509);
this.chbAutoOut.Name = "chbAutoOut"; this.chbAutoOut.Name = "chbAutoOut";
this.chbAutoOut.Size = new System.Drawing.Size(168, 24); this.chbAutoOut.Size = new System.Drawing.Size(212, 28);
this.chbAutoOut.TabIndex = 280; this.chbAutoOut.TabIndex = 280;
this.chbAutoOut.Text = "入料完成自动开始出库"; this.chbAutoOut.Text = "入料完成自动开始出库";
this.chbAutoOut.UseVisualStyleBackColor = true; this.chbAutoOut.UseVisualStyleBackColor = true;
...@@ -445,7 +460,7 @@ ...@@ -445,7 +460,7 @@
// //
// FrmBatchMove // FrmBatchMove
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(949, 546); this.ClientSize = new System.Drawing.Size(949, 546);
this.Controls.Add(this.panel2); this.Controls.Add(this.panel2);
...@@ -457,6 +472,7 @@ ...@@ -457,6 +472,7 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load); this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
this.Shown += new System.EventHandler(this.FrmIOStatus_Shown); this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
this.Leave += new System.EventHandler(this.FrmBatchMove_Leave);
this.panel2.ResumeLayout(false); this.panel2.ResumeLayout(false);
this.panel2.PerformLayout(); this.panel2.PerformLayout();
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
...@@ -500,6 +516,7 @@ ...@@ -500,6 +516,7 @@
protected System.Windows.Forms.Button btnResetShelf; protected System.Windows.Forms.Button btnResetShelf;
protected System.Windows.Forms.CheckBox chbMoveStop; protected System.Windows.Forms.CheckBox chbMoveStop;
private useControl.AxisPointControl batchAxisP4; private useControl.AxisPointControl batchAxisP4;
private System.Windows.Forms.Button btnPointEnable;
} }
} }
source/XLRStoreClient/inputForm/FrmBatchMove.cs
...@@ -91,6 +91,7 @@ namespace OnlineStore.XLRStore ...@@ -91,6 +91,7 @@ namespace OnlineStore.XLRStore
lblWarnMsg.Text = moveBean.WarnMsg; lblWarnMsg.Text = moveBean.WarnMsg;
lblCurrInfo.Text = moveBean.GetMoveStr(); lblCurrInfo.Text = moveBean.GetMoveStr();
lblAgvInfo.Text = "AGV " + moveBean.Config.AgvName + " :" + AgvClient.GetAction(moveBean.Config.AgvName); lblAgvInfo.Text = "AGV " + moveBean.Config.AgvName + " :" + AgvClient.GetAction(moveBean.Config.AgvName);
PointEnable(false);
IsLoad = true; IsLoad = true;
} }
...@@ -317,6 +318,34 @@ namespace OnlineStore.XLRStore ...@@ -317,6 +318,34 @@ namespace OnlineStore.XLRStore
moveBean.MoveStop = chbMoveStop.Checked; moveBean.MoveStop = chbMoveStop.Checked;
LogUtil.info(moveBean.Name + "用户切换是否暂停： " + moveBean.MoveStop); LogUtil.info(moveBean.Name + "用户切换是否暂停： " + moveBean.MoveStop);
} }
private void btnPointEnable_Click(object sender, EventArgs e)
{
if (!IsLoad)
{
return;
}
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("打开入料机构点位调试时，没有正确输入密码");
return;
}
PointEnable(true);
}
void PointEnable(bool enable)
{
axisMoveControl1.Enabled= enable;
groupBox1.Enabled= enable;
groupBox2.Enabled= enable;
groupBox3.Enabled= enable;
}
private void FrmBatchMove_Leave(object sender, EventArgs e)
{
PointEnable(false);
}
} }
} }
......
source/XLRStoreClient/inputForm/FrmInputEquip.cs
...@@ -620,24 +620,29 @@ namespace OnlineStore.XLRStore ...@@ -620,24 +620,29 @@ namespace OnlineStore.XLRStore
groupBox9.Enabled = enable; groupBox9.Enabled = enable;
groupBox10.Enabled = enable; groupBox10.Enabled = enable;
groupBox11.Enabled = enable; groupBox11.Enabled = enable;
axisMoveControl1.Enabled= enable;
} }
private void chbPointEditEnable_CheckedChanged(object sender, EventArgs e) private void btnPointEditEnable_Click(object sender, EventArgs e)
{ {
if (!IsLoad) if (!IsLoad)
{ {
return; return;
} }
PointEditEnable(chbPointEditEnable.Checked); FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("打开入料机构点位调试时，没有正确输入密码");
return;
}
PointEditEnable(true);
} }
internal void FrmInputEquip_VisibleChanged(object sender, EventArgs e) internal void FrmInputEquip_VisibleChanged(object sender, EventArgs e)
{ {
if (!IsLoad) if (!IsLoad)
{ {
return; return;
} }
chbPointEditEnable.Checked = false;
} }
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
...@@ -646,7 +651,7 @@ namespace OnlineStore.XLRStore ...@@ -646,7 +651,7 @@ namespace OnlineStore.XLRStore
{ {
return; return;
} }
chbPointEditEnable.Checked = false; PointEditEnable(false);
} }
private void BtnInStoreTest_Click(object sender, EventArgs e) private void BtnInStoreTest_Click(object sender, EventArgs e)
...@@ -810,6 +815,7 @@ namespace OnlineStore.XLRStore ...@@ -810,6 +815,7 @@ namespace OnlineStore.XLRStore
} }
} }
#endregion #endregion
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!