Skip to content

刘韬 / SO20242OutBound

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c4d42c5c 由 LN
选项

bug修改

1 个父辈 346d986b
内嵌 并排
正在显示 3 个修改的文件 包含 69 行增加 和 16 行删除
DeviceLibrary/theMachine/InReelBean.cs
...@@ -220,7 +220,6 @@ namespace DeviceLibrary ...@@ -220,7 +220,6 @@ namespace DeviceLibrary
MoveInfo.errlog("获取位置失败: " + outMsg + ", 等待3秒后重新获取"); MoveInfo.errlog("获取位置失败: " + outMsg + ", 等待3秒后重新获取");
Thread.Sleep(3000); Thread.Sleep(3000);
} }
break;
} }
} }
}); });
......
TheMachine/FormMain.Designer.cs
...@@ -49,6 +49,7 @@ namespace TheMachine ...@@ -49,6 +49,7 @@ namespace TheMachine
this.tabc = new System.Windows.Forms.TabControl(); this.tabc = new System.Windows.Forms.TabControl();
this.tabP1 = new System.Windows.Forms.TabPage(); this.tabP1 = new System.Windows.Forms.TabPage();
this.pnl = new System.Windows.Forms.Panel(); this.pnl = new System.Windows.Forms.Panel();
this.btnClearNgPos = new System.Windows.Forms.Button();
this.chbDIsAgv = new System.Windows.Forms.CheckBox(); this.chbDIsAgv = new System.Windows.Forms.CheckBox();
this.btnDownScan = new System.Windows.Forms.Button(); this.btnDownScan = new System.Windows.Forms.Button();
this.btnUpScan = new System.Windows.Forms.Button(); this.btnUpScan = new System.Windows.Forms.Button();
...@@ -63,7 +64,8 @@ namespace TheMachine ...@@ -63,7 +64,8 @@ namespace TheMachine
this.btn_IgnoreX09 = new System.Windows.Forms.Button(); this.btn_IgnoreX09 = new System.Windows.Forms.Button();
this.btn_PauseBuzzer = new System.Windows.Forms.Button(); this.btn_PauseBuzzer = new System.Windows.Forms.Button();
this.listView1 = new System.Windows.Forms.ListView(); this.listView1 = new System.Windows.Forms.ListView();
this.btnClearNgPos = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.tabc.SuspendLayout(); this.tabc.SuspendLayout();
this.tabP1.SuspendLayout(); this.tabP1.SuspendLayout();
...@@ -233,6 +235,8 @@ namespace TheMachine ...@@ -233,6 +235,8 @@ namespace TheMachine
// //
// pnl // pnl
// //
this.pnl.Controls.Add(this.button2);
this.pnl.Controls.Add(this.button1);
this.pnl.Controls.Add(this.btnClearNgPos); this.pnl.Controls.Add(this.btnClearNgPos);
this.pnl.Controls.Add(this.chbDIsAgv); this.pnl.Controls.Add(this.chbDIsAgv);
this.pnl.Controls.Add(this.btnDownScan); this.pnl.Controls.Add(this.btnDownScan);
...@@ -252,6 +256,18 @@ namespace TheMachine ...@@ -252,6 +256,18 @@ namespace TheMachine
this.pnl.Size = new System.Drawing.Size(1000, 576); this.pnl.Size = new System.Drawing.Size(1000, 576);
this.pnl.TabIndex = 273; this.pnl.TabIndex = 273;
// //
// btnClearNgPos
//
this.btnClearNgPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearNgPos.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearNgPos.Location = new System.Drawing.Point(735, 259);
this.btnClearNgPos.Name = "btnClearNgPos";
this.btnClearNgPos.Size = new System.Drawing.Size(98, 32);
this.btnClearNgPos.TabIndex = 278;
this.btnClearNgPos.Text = "清空NG库位";
this.btnClearNgPos.UseVisualStyleBackColor = true;
this.btnClearNgPos.Click += new System.EventHandler(this.btnClearNgPos_Click);
//
// chbDIsAgv // chbDIsAgv
// //
this.chbDIsAgv.AutoSize = true; this.chbDIsAgv.AutoSize = true;
...@@ -393,9 +409,9 @@ namespace TheMachine ...@@ -393,9 +409,9 @@ namespace TheMachine
// btn_IgnoreX09 // btn_IgnoreX09
// //
this.btn_IgnoreX09.BackColor = System.Drawing.Color.OrangeRed; this.btn_IgnoreX09.BackColor = System.Drawing.Color.OrangeRed;
this.btn_IgnoreX09.Location = new System.Drawing.Point(310, 254); this.btn_IgnoreX09.Location = new System.Drawing.Point(249, 254);
this.btn_IgnoreX09.Name = "btn_IgnoreX09"; this.btn_IgnoreX09.Name = "btn_IgnoreX09";
this.btn_IgnoreX09.Size = new System.Drawing.Size(301, 40); this.btn_IgnoreX09.Size = new System.Drawing.Size(240, 40);
this.btn_IgnoreX09.TabIndex = 6; this.btn_IgnoreX09.TabIndex = 6;
this.btn_IgnoreX09.Text = "忽略X23错误,并继续运行"; this.btn_IgnoreX09.Text = "忽略X23错误,并继续运行";
this.btn_IgnoreX09.UseVisualStyleBackColor = false; this.btn_IgnoreX09.UseVisualStyleBackColor = false;
...@@ -407,7 +423,7 @@ namespace TheMachine ...@@ -407,7 +423,7 @@ namespace TheMachine
this.btn_PauseBuzzer.BackColor = System.Drawing.Color.OrangeRed; this.btn_PauseBuzzer.BackColor = System.Drawing.Color.OrangeRed;
this.btn_PauseBuzzer.Location = new System.Drawing.Point(3, 254); this.btn_PauseBuzzer.Location = new System.Drawing.Point(3, 254);
this.btn_PauseBuzzer.Name = "btn_PauseBuzzer"; this.btn_PauseBuzzer.Name = "btn_PauseBuzzer";
this.btn_PauseBuzzer.Size = new System.Drawing.Size(301, 40); this.btn_PauseBuzzer.Size = new System.Drawing.Size(240, 40);
this.btn_PauseBuzzer.TabIndex = 6; this.btn_PauseBuzzer.TabIndex = 6;
this.btn_PauseBuzzer.Text = "本次暂停警报器响声"; this.btn_PauseBuzzer.Text = "本次暂停警报器响声";
this.btn_PauseBuzzer.UseVisualStyleBackColor = false; this.btn_PauseBuzzer.UseVisualStyleBackColor = false;
...@@ -429,17 +445,29 @@ namespace TheMachine ...@@ -429,17 +445,29 @@ namespace TheMachine
this.listView1.TabIndex = 2; this.listView1.TabIndex = 2;
this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.UseCompatibleStateImageBehavior = false;
// //
// btnClearNgPos // button1
// //
this.btnClearNgPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearNgPos.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearNgPos.Location = new System.Drawing.Point(710, 254); this.button1.Location = new System.Drawing.Point(521, 259);
this.btnClearNgPos.Name = "btnClearNgPos"; this.button1.Name = "button1";
this.btnClearNgPos.Size = new System.Drawing.Size(130, 32); this.button1.Size = new System.Drawing.Size(98, 32);
this.btnClearNgPos.TabIndex = 278; this.button1.TabIndex = 279;
this.btnClearNgPos.Text = "清空NG库位"; this.button1.Text = "IN_1复位";
this.btnClearNgPos.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
this.btnClearNgPos.Click += new System.EventHandler(this.btnClearNgPos_Click); this.button1.Click += new System.EventHandler(this.button1_Click);
//
// button2
//
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(628, 259);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(98, 32);
this.button2.TabIndex = 280;
this.button2.Text = "IN_2复位";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
// //
// FormMain // FormMain
// //
...@@ -506,6 +534,8 @@ namespace TheMachine ...@@ -506,6 +534,8 @@ namespace TheMachine
private System.Windows.Forms.Button btnUpScan; private System.Windows.Forms.Button btnUpScan;
private System.Windows.Forms.CheckBox chbDIsAgv; private System.Windows.Forms.CheckBox chbDIsAgv;
private System.Windows.Forms.Button btnClearNgPos; private System.Windows.Forms.Button btnClearNgPos;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button1;
} }
} }
TheMachine/FormMain.cs
...@@ -756,5 +756,29 @@ namespace TheMachine ...@@ -756,5 +756,29 @@ namespace TheMachine
{ {
LogUtil.info("用户点击了【"+btnClearNgPos.Text+"】"); LogUtil.info("用户点击了【"+btnClearNgPos.Text+"】");
} }
private void button1_Click(object sender, EventArgs e)
{
string name = "IN_1";
InReelBean InBean = RobotManage.mainMachine.getInReelBean(name);
DialogResult result = MessageBox.Show("确定复位"+ name + "?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
if (result.Equals(DialogResult.OK))
{
LogUtil.info("手动操作："+name+"复位");
InBean.Reset();
}
}
private void button2_Click(object sender, EventArgs e)
{
string name = "IN_2";
InReelBean InBean = RobotManage.mainMachine.getInReelBean(name);
DialogResult result = MessageBox.Show("确定复位" + name + "?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
if (result.Equals(DialogResult.OK))
{
LogUtil.info("手动操作：" + name + "复位");
InBean.Reset();
}
}
} }
} }
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!