Skip to content

刘韬 / SO827-AutoScanAndLabel

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

更改AGV界面显示

1 个父辈 53684f1c
内嵌 并排
正在显示 2 个修改的文件 包含 67 行增加 和 67 行删除
AutoScanAndLabel/UC/AgvControl.Designer.cs
......@@ -42,6 +42,9 @@ namespace AutoScanAndLabel.UC
this.lblMissionRunstate = new System.Windows.Forms.Label();
this.lblCurRunMissionId = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.button2 = new System.Windows.Forms.Button();
this.txtStandbyId = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
this.txtMissionId = new System.Windows.Forms.TextBox();
......@@ -54,9 +57,6 @@ namespace AutoScanAndLabel.UC
this.txtMoveLSTId = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.txtStandbyId = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.groupBox_right.SuspendLayout();
this.groupBox_left.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -72,7 +72,7 @@ namespace AutoScanAndLabel.UC
this.groupBox_right.Size = new System.Drawing.Size(233, 226);
this.groupBox_right.TabIndex = 0;
this.groupBox_right.TabStop = false;
this.groupBox_right.Text = "右侧";
this.groupBox_right.Text = "入口";
//
// button_rightleavefull
//
......@@ -80,7 +80,7 @@ namespace AutoScanAndLabel.UC
this.button_rightleavefull.Name = "button_rightleavefull";
this.button_rightleavefull.Size = new System.Drawing.Size(175, 61);
this.button_rightleavefull.TabIndex = 0;
this.button_rightleavefull.Text = "请求取空料串";
this.button_rightleavefull.Text = "空料串取出";
this.button_rightleavefull.UseVisualStyleBackColor = true;
this.button_rightleavefull.Click += new System.EventHandler(this.button_rightleavefull_Click);
//
......@@ -90,7 +90,7 @@ namespace AutoScanAndLabel.UC
this.button_rightneedempty.Name = "button_rightneedempty";
this.button_rightneedempty.Size = new System.Drawing.Size(175, 61);
this.button_rightneedempty.TabIndex = 0;
this.button_rightneedempty.Text = "请求送满料串";
this.button_rightneedempty.Text = "满料串送入";
this.button_rightneedempty.UseVisualStyleBackColor = true;
this.button_rightneedempty.Click += new System.EventHandler(this.button_rightneedempty_Click);
//
......@@ -103,7 +103,7 @@ namespace AutoScanAndLabel.UC
this.groupBox_left.Size = new System.Drawing.Size(233, 226);
this.groupBox_left.TabIndex = 0;
this.groupBox_left.TabStop = false;
this.groupBox_left.Text = "左侧";
this.groupBox_left.Text = "出口";
//
// button_leftneedempty
//
......@@ -111,7 +111,7 @@ namespace AutoScanAndLabel.UC
this.button_leftneedempty.Name = "button_leftneedempty";
this.button_leftneedempty.Size = new System.Drawing.Size(175, 61);
this.button_leftneedempty.TabIndex = 0;
this.button_leftneedempty.Text = "请求送空料串";
this.button_leftneedempty.Text = "空料串送入";
this.button_leftneedempty.UseVisualStyleBackColor = true;
this.button_leftneedempty.Click += new System.EventHandler(this.button_leftneedempty_Click);
//
......@@ -121,7 +121,7 @@ namespace AutoScanAndLabel.UC
this.button_Leftleavefull.Name = "button_Leftleavefull";
this.button_Leftleavefull.Size = new System.Drawing.Size(175, 61);
this.button_Leftleavefull.TabIndex = 0;
this.button_Leftleavefull.Text = "请求取满料串";
this.button_Leftleavefull.Text = "满料串取出";
this.button_Leftleavefull.UseVisualStyleBackColor = true;
this.button_Leftleavefull.Click += new System.EventHandler(this.button_Leftleavefull_Click);
//
......@@ -136,7 +136,7 @@ namespace AutoScanAndLabel.UC
this.groupBox2.Size = new System.Drawing.Size(358, 226);
this.groupBox2.TabIndex = 4;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "AGV状态";
this.groupBox2.Text = "任务状态";
//
// lblCurMissionId
//
......@@ -190,17 +190,44 @@ namespace AutoScanAndLabel.UC
this.groupBox3.Controls.Add(this.label3);
this.groupBox3.Controls.Add(this.txtMoveLSTId);
this.groupBox3.Controls.Add(this.label4);
this.groupBox3.Location = new System.Drawing.Point(277, 266);
this.groupBox3.Location = new System.Drawing.Point(136, 266);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(636, 219);
this.groupBox3.Size = new System.Drawing.Size(777, 237);
this.groupBox3.TabIndex = 5;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "手动发送任务";
this.groupBox3.Text = "手动任务";
//
// button2
//
this.button2.Location = new System.Drawing.Point(451, 114);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(169, 41);
this.button2.TabIndex = 14;
this.button2.Text = "重置呼叫";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// txtStandbyId
//
this.txtStandbyId.Enabled = false;
this.txtStandbyId.Location = new System.Drawing.Point(286, 118);
this.txtStandbyId.Name = "txtStandbyId";
this.txtStandbyId.Size = new System.Drawing.Size(100, 23);
this.txtStandbyId.TabIndex = 13;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 127);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(133, 14);
this.label1.TabIndex = 12;
this.label1.Text = "去待机点任务编号：";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(47, 186);
this.label7.Location = new System.Drawing.Point(8, 185);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(77, 14);
this.label7.TabIndex = 11;
......@@ -208,17 +235,17 @@ namespace AutoScanAndLabel.UC
//
// button1
//
this.button1.Location = new System.Drawing.Point(264, 159);
this.button1.Location = new System.Drawing.Point(451, 172);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(122, 41);
this.button1.Size = new System.Drawing.Size(169, 41);
this.button1.TabIndex = 10;
this.button1.Text = "手动任务测试";
this.button1.Text = "任务测试";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// txtMissionId
//
this.txtMissionId.Location = new System.Drawing.Point(130, 182);
this.txtMissionId.Location = new System.Drawing.Point(286, 182);
this.txtMissionId.Name = "txtMissionId";
this.txtMissionId.Size = new System.Drawing.Size(100, 23);
this.txtMissionId.TabIndex = 9;
......@@ -226,7 +253,7 @@ namespace AutoScanAndLabel.UC
// txtLeaveId
//
this.txtLeaveId.Enabled = false;
this.txtLeaveId.Location = new System.Drawing.Point(459, 81);
this.txtLeaveId.Location = new System.Drawing.Point(658, 81);
this.txtLeaveId.Name = "txtLeaveId";
this.txtLeaveId.Size = new System.Drawing.Size(100, 23);
this.txtLeaveId.TabIndex = 8;
......@@ -234,16 +261,16 @@ namespace AutoScanAndLabel.UC
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(285, 78);
this.label5.Location = new System.Drawing.Point(412, 81);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(168, 14);
this.label5.Size = new System.Drawing.Size(126, 14);
this.label5.TabIndex = 7;
this.label5.Text = "料串流出AGV的任务编号：";
this.label5.Text = "流出AGV任务编号：";
//
// txtEnterId
//
this.txtEnterId.Enabled = false;
this.txtEnterId.Location = new System.Drawing.Point(459, 29);
this.txtEnterId.Location = new System.Drawing.Point(658, 26);
this.txtEnterId.Name = "txtEnterId";
this.txtEnterId.Size = new System.Drawing.Size(100, 23);
this.txtEnterId.TabIndex = 6;
......@@ -251,16 +278,16 @@ namespace AutoScanAndLabel.UC
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(285, 32);
this.label6.Location = new System.Drawing.Point(412, 29);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(168, 14);
this.label6.Size = new System.Drawing.Size(126, 14);
this.label6.TabIndex = 5;
this.label6.Text = "料串流入AGV的任务编号：";
this.label6.Text = "流入AGV任务编号：";
//
// txtMoveRSTId
//
this.txtMoveRSTId.Enabled = false;
this.txtMoveRSTId.Location = new System.Drawing.Point(166, 81);
this.txtMoveRSTId.Location = new System.Drawing.Point(286, 72);
this.txtMoveRSTId.Name = "txtMoveRSTId";
this.txtMoveRSTId.Size = new System.Drawing.Size(100, 23);
this.txtMoveRSTId.TabIndex = 4;
......@@ -270,14 +297,14 @@ namespace AutoScanAndLabel.UC
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(8, 81);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(161, 14);
this.label3.Size = new System.Drawing.Size(119, 14);
this.label3.TabIndex = 3;
this.label3.Text = "移动到右侧的任务编号：";
this.label3.Text = "去入口任务编号：";
//
// txtMoveLSTId
//
this.txtMoveLSTId.Enabled = false;
this.txtMoveLSTId.Location = new System.Drawing.Point(166, 32);
this.txtMoveLSTId.Location = new System.Drawing.Point(286, 26);
this.txtMoveLSTId.Name = "txtMoveLSTId";
this.txtMoveLSTId.Size = new System.Drawing.Size(100, 23);
this.txtMoveLSTId.TabIndex = 2;
......@@ -285,50 +312,23 @@ namespace AutoScanAndLabel.UC
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(8, 35);
this.label4.Location = new System.Drawing.Point(6, 29);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(161, 14);
this.label4.Size = new System.Drawing.Size(119, 14);
this.label4.TabIndex = 1;
this.label4.Text = "移动到左侧的任务编号：";
this.label4.Text = "去出口任务编号：";
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(22, 266);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(82, 18);
this.checkBox1.Size = new System.Drawing.Size(54, 18);
this.checkBox1.TabIndex = 7;
this.checkBox1.Text = "手动操作";
this.checkBox1.Text = "手动";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// txtStandbyId
//
this.txtStandbyId.Enabled = false;
this.txtStandbyId.Location = new System.Drawing.Point(187, 124);
this.txtStandbyId.Name = "txtStandbyId";
this.txtStandbyId.Size = new System.Drawing.Size(100, 23);
this.txtStandbyId.TabIndex = 13;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 127);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(175, 14);
this.label1.TabIndex = 12;
this.label1.Text = "移动到待机点的任务编号：";
//
// button2
//
this.button2.Location = new System.Drawing.Point(449, 159);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(122, 41);
this.button2.TabIndex = 14;
this.button2.Text = "重置呼叫状态";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// AgvControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
AutoScanAndLabel/UC/AgvControl.cs
......@@ -25,7 +25,7 @@ namespace AutoScanAndLabel.UC
serverIp = ConfigHelper.Config.Get(Setting_Init.STD_IP, "127.0.0.1");
AGVManager.Connect(serverIp);
load();
groupBox2.Text = crc.GetString("Res0029","AGV状态")+"["+ serverIp + "]";
groupBox2.Text = "任务状态"+"["+ serverIp + "]";
AGVManager.Register(MissionStateChanged);
endit(false);
}
......@@ -51,10 +51,10 @@ namespace AutoScanAndLabel.UC
{
try
{
lblCurMissionId.Text = crc.GetString("Res0030","当前任务编号：")+state.MissionId;
lblCurRunMissionId.Text = crc.GetString("Res0031","运行任务编号：")+state.RunMissionId;
lblMissionRunstate.Text = crc.GetString("Res0032","任务运行状态：")+state.MissionRunState;
lblMissionResult.Text = crc.GetString("Res0033","任务运行结果：")+state.MissionResult;
lblCurMissionId.Text = "任务编号:"+state.MissionId;
lblCurRunMissionId.Text = "运行编号:"+state.RunMissionId;
lblMissionRunstate.Text = "任务状态:"+state.MissionRunState;
lblMissionResult.Text = "运行结果:"+state.MissionResult;
}
catch
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!