From c0e1f7d6a9f6544559c1d707df0561eb5ab4e10d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=97=E9=93=AD=20=E5=90=95?= <896951544@qq.com> Date: Tue, 13 May 2025 08:58:51 +0800 Subject: [PATCH] =?UTF-8?q?AGV=E5=AF=B9=E6=8E=A5=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControlMonitorClient/FrmDeviceStatus.cs | 13 ++++- .../FrmDeviceStatus.designer.cs | 48 +++++++++---------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/ControlMonitorClient/FrmDeviceStatus.cs b/ControlMonitorClient/FrmDeviceStatus.cs index c5fcdf9..7ff2d9c 100644 --- a/ControlMonitorClient/FrmDeviceStatus.cs +++ b/ControlMonitorClient/FrmDeviceStatus.cs @@ -322,10 +322,19 @@ namespace wcfControlMonitorClient lblDeviceStatus.Text = "无"; break; case 1: - lblDeviceStatus.Text = "运行中"; + lblDeviceStatus.Text = "取货中(取货申请)"; break; case 2: - lblDeviceStatus.Text = "动作完成或已离开"; + lblDeviceStatus.Text = "取货完成"; + break; + case 3: + lblDeviceStatus.Text = "放货中(放货申请)"; + break; + case 4: + lblDeviceStatus.Text = "放货完成"; + break; + case 9: + lblDeviceStatus.Text = "AGV已离开"; break; } } diff --git a/ControlMonitorClient/FrmDeviceStatus.designer.cs b/ControlMonitorClient/FrmDeviceStatus.designer.cs index 430b374..ac2abea 100644 --- a/ControlMonitorClient/FrmDeviceStatus.designer.cs +++ b/ControlMonitorClient/FrmDeviceStatus.designer.cs @@ -110,7 +110,7 @@ this.tableLayoutPanel1.Controls.Add(this.lblDeviceStatus, 1, 4); this.tableLayoutPanel1.Controls.Add(this.lblDeviceIndex, 1, 0); this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 15); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 11; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); @@ -157,7 +157,7 @@ this.lblBarcode.BackColor = System.Drawing.SystemColors.Control; this.lblBarcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblBarcode.Location = new System.Drawing.Point(141, 212); - this.lblBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lblBarcode.Margin = new System.Windows.Forms.Padding(4); this.lblBarcode.MaxLength = 7; this.lblBarcode.Name = "lblBarcode"; this.lblBarcode.Size = new System.Drawing.Size(407, 25); @@ -384,7 +384,7 @@ // this.lblDeviceIndex.BackColor = System.Drawing.SystemColors.Control; this.lblDeviceIndex.Location = new System.Drawing.Point(141, 7); - this.lblDeviceIndex.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lblDeviceIndex.Margin = new System.Windows.Forms.Padding(4); this.lblDeviceIndex.Maximum = new decimal(new int[] { 999999, 0, @@ -408,7 +408,7 @@ // btnRefresh // this.btnRefresh.Location = new System.Drawing.Point(467, 526); - this.btnRefresh.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnRefresh.Margin = new System.Windows.Forms.Padding(4); this.btnRefresh.Name = "btnRefresh"; this.btnRefresh.Size = new System.Drawing.Size(100, 29); this.btnRefresh.TabIndex = 1; @@ -419,7 +419,7 @@ // btnClose // this.btnClose.Location = new System.Drawing.Point(575, 526); - this.btnClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnClose.Margin = new System.Windows.Forms.Padding(4); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(100, 29); this.btnClose.TabIndex = 1; @@ -441,7 +441,7 @@ // btLogicHaveGoods // this.btLogicHaveGoods.Location = new System.Drawing.Point(16, 559); - this.btLogicHaveGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btLogicHaveGoods.Margin = new System.Windows.Forms.Padding(4); this.btLogicHaveGoods.Name = "btLogicHaveGoods"; this.btLogicHaveGoods.Size = new System.Drawing.Size(107, 29); this.btLogicHaveGoods.TabIndex = 1; @@ -452,7 +452,7 @@ // btLogicNoneGoods // this.btLogicNoneGoods.Location = new System.Drawing.Point(16, 590); - this.btLogicNoneGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btLogicNoneGoods.Margin = new System.Windows.Forms.Padding(4); this.btLogicNoneGoods.Name = "btLogicNoneGoods"; this.btLogicNoneGoods.Size = new System.Drawing.Size(107, 29); this.btLogicNoneGoods.TabIndex = 1; @@ -463,7 +463,7 @@ // btnAnswer // this.btnAnswer.Location = new System.Drawing.Point(335, 526); - this.btnAnswer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAnswer.Margin = new System.Windows.Forms.Padding(4); this.btnAnswer.Name = "btnAnswer"; this.btnAnswer.Size = new System.Drawing.Size(119, 29); this.btnAnswer.TabIndex = 1; @@ -475,7 +475,7 @@ // this.textBox1.ForeColor = System.Drawing.SystemColors.MenuHighlight; this.textBox1.Location = new System.Drawing.Point(127, 570); - this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; @@ -486,7 +486,7 @@ // btnReset // this.btnReset.Location = new System.Drawing.Point(203, 526); - this.btnReset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnReset.Margin = new System.Windows.Forms.Padding(4); this.btnReset.Name = "btnReset"; this.btnReset.Size = new System.Drawing.Size(119, 29); this.btnReset.TabIndex = 1; @@ -497,7 +497,7 @@ // btCancelDoubleFork // this.btCancelDoubleFork.Location = new System.Drawing.Point(16, 560); - this.btCancelDoubleFork.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btCancelDoubleFork.Margin = new System.Windows.Forms.Padding(4); this.btCancelDoubleFork.Name = "btCancelDoubleFork"; this.btCancelDoubleFork.Size = new System.Drawing.Size(119, 29); this.btCancelDoubleFork.TabIndex = 1; @@ -512,9 +512,9 @@ this.gbBarcode.Controls.Add(this.label14); this.gbBarcode.Controls.Add(this.label10); this.gbBarcode.Location = new System.Drawing.Point(17, 454); - this.gbBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.gbBarcode.Margin = new System.Windows.Forms.Padding(4); this.gbBarcode.Name = "gbBarcode"; - this.gbBarcode.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.gbBarcode.Padding = new System.Windows.Forms.Padding(4); this.gbBarcode.Size = new System.Drawing.Size(657, 68); this.gbBarcode.TabIndex = 24; this.gbBarcode.TabStop = false; @@ -526,7 +526,7 @@ this.lblReportedBarcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblReportedBarcode.Enabled = false; this.lblReportedBarcode.Location = new System.Drawing.Point(141, 40); - this.lblReportedBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lblReportedBarcode.Margin = new System.Windows.Forms.Padding(4); this.lblReportedBarcode.MaxLength = 6; this.lblReportedBarcode.Name = "lblReportedBarcode"; this.lblReportedBarcode.Size = new System.Drawing.Size(511, 25); @@ -538,7 +538,7 @@ this.lblReadedBarcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblReadedBarcode.Enabled = false; this.lblReadedBarcode.Location = new System.Drawing.Point(141, 12); - this.lblReadedBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lblReadedBarcode.Margin = new System.Windows.Forms.Padding(4); this.lblReadedBarcode.MaxLength = 6; this.lblReadedBarcode.Name = "lblReadedBarcode"; this.lblReadedBarcode.Size = new System.Drawing.Size(511, 25); @@ -573,9 +573,9 @@ this.gb03.Controls.Add(this.textBox2); this.gb03.Controls.Add(this.label16); this.gb03.Location = new System.Drawing.Point(17, 459); - this.gb03.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.gb03.Margin = new System.Windows.Forms.Padding(4); this.gb03.Name = "gb03"; - this.gb03.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.gb03.Padding = new System.Windows.Forms.Padding(4); this.gb03.Size = new System.Drawing.Size(653, 59); this.gb03.TabIndex = 29; this.gb03.TabStop = false; @@ -585,7 +585,7 @@ // this.textBox3.Enabled = false; this.textBox3.Location = new System.Drawing.Point(100, 25); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox3.Margin = new System.Windows.Forms.Padding(4); this.textBox3.Name = "textBox3"; this.textBox3.Size = new System.Drawing.Size(143, 25); this.textBox3.TabIndex = 3; @@ -594,7 +594,7 @@ // this.textBox4.Enabled = false; this.textBox4.Location = new System.Drawing.Point(341, 25); - this.textBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox4.Margin = new System.Windows.Forms.Padding(4); this.textBox4.Name = "textBox4"; this.textBox4.Size = new System.Drawing.Size(143, 25); this.textBox4.TabIndex = 5; @@ -623,7 +623,7 @@ // this.textBox2.Enabled = false; this.textBox2.Location = new System.Drawing.Point(587, 22); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(55, 25); this.textBox2.TabIndex = 1; @@ -642,7 +642,7 @@ // btnSolutions // this.btnSolutions.Location = new System.Drawing.Point(556, 270); - this.btnSolutions.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnSolutions.Margin = new System.Windows.Forms.Padding(4); this.btnSolutions.Name = "btnSolutions"; this.btnSolutions.Size = new System.Drawing.Size(108, 29); this.btnSolutions.TabIndex = 1; @@ -657,7 +657,7 @@ this.cB_Empty.Checked = true; this.cB_Empty.CheckState = System.Windows.Forms.CheckState.Checked; this.cB_Empty.Location = new System.Drawing.Point(569, 232); - this.cB_Empty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cB_Empty.Margin = new System.Windows.Forms.Padding(4); this.cB_Empty.Name = "cB_Empty"; this.cB_Empty.Size = new System.Drawing.Size(89, 19); this.cB_Empty.TabIndex = 25; @@ -668,7 +668,7 @@ // deviceclear // this.deviceclear.Location = new System.Drawing.Point(55, 526); - this.deviceclear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.deviceclear.Margin = new System.Windows.Forms.Padding(4); this.deviceclear.Name = "deviceclear"; this.deviceclear.Size = new System.Drawing.Size(131, 29); this.deviceclear.TabIndex = 26; @@ -698,7 +698,7 @@ this.Controls.Add(this.btnRefresh); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmDeviceStatus";