diff --git a/ControlMonitorClient/FrmControlMonitor.designer.cs b/ControlMonitorClient/FrmControlMonitor.designer.cs index 7be6a2c..8c223f1 100644 --- a/ControlMonitorClient/FrmControlMonitor.designer.cs +++ b/ControlMonitorClient/FrmControlMonitor.designer.cs @@ -96,6 +96,7 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.plAccessorial1 = new System.Windows.Forms.Panel(); + this.button95 = new System.Windows.Forms.Button(); this.label105 = new System.Windows.Forms.Label(); this.label104 = new System.Windows.Forms.Label(); this.label114 = new System.Windows.Forms.Label(); @@ -286,6 +287,21 @@ this.button77 = new System.Windows.Forms.Button(); this.button70 = new System.Windows.Forms.Button(); this.button74 = new System.Windows.Forms.Button(); + this.button101 = new System.Windows.Forms.Button(); + this.button100 = new System.Windows.Forms.Button(); + this.button99 = new System.Windows.Forms.Button(); + this.button98 = new System.Windows.Forms.Button(); + this.button97 = new System.Windows.Forms.Button(); + this.button107 = new System.Windows.Forms.Button(); + this.button106 = new System.Windows.Forms.Button(); + this.button105 = new System.Windows.Forms.Button(); + this.button104 = new System.Windows.Forms.Button(); + this.button103 = new System.Windows.Forms.Button(); + this.button102 = new System.Windows.Forms.Button(); + this.button110 = new System.Windows.Forms.Button(); + this.button109 = new System.Windows.Forms.Button(); + this.button108 = new System.Windows.Forms.Button(); + this.button96 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.label42 = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label(); @@ -429,22 +445,14 @@ this.label91 = new System.Windows.Forms.Label(); this.label43 = new System.Windows.Forms.Label(); this.label44 = new System.Windows.Forms.Label(); - this.button95 = new System.Windows.Forms.Button(); - this.button96 = new System.Windows.Forms.Button(); - this.button97 = new System.Windows.Forms.Button(); - this.button98 = new System.Windows.Forms.Button(); - this.button99 = new System.Windows.Forms.Button(); - this.button100 = new System.Windows.Forms.Button(); - this.button101 = new System.Windows.Forms.Button(); - this.button102 = new System.Windows.Forms.Button(); - this.button103 = new System.Windows.Forms.Button(); - this.button104 = new System.Windows.Forms.Button(); - this.button105 = new System.Windows.Forms.Button(); - this.button106 = new System.Windows.Forms.Button(); - this.button107 = new System.Windows.Forms.Button(); - this.button108 = new System.Windows.Forms.Button(); - this.button109 = new System.Windows.Forms.Button(); - this.button110 = new System.Windows.Forms.Button(); + this.button111 = new System.Windows.Forms.Button(); + this.button112 = new System.Windows.Forms.Button(); + this.button113 = new System.Windows.Forms.Button(); + this.button114 = new System.Windows.Forms.Button(); + this.button115 = new System.Windows.Forms.Button(); + this.button116 = new System.Windows.Forms.Button(); + this.button117 = new System.Windows.Forms.Button(); + this.button118 = new System.Windows.Forms.Button(); pictureBox14 = new System.Windows.Forms.PictureBox(); pictureBox13 = new System.Windows.Forms.PictureBox(); pictureBox12 = new System.Windows.Forms.PictureBox(); @@ -1407,6 +1415,10 @@ this.plAccessorial1.Controls.Add(this.button93); this.plAccessorial1.Controls.Add(this.button90); this.plAccessorial1.Controls.Add(this.button87); + this.plAccessorial1.Controls.Add(this.button114); + this.plAccessorial1.Controls.Add(this.button113); + this.plAccessorial1.Controls.Add(this.button112); + this.plAccessorial1.Controls.Add(this.button111); this.plAccessorial1.Controls.Add(this.button62); this.plAccessorial1.Controls.Add(this.button66); this.plAccessorial1.Controls.Add(this.button92); @@ -1493,6 +1505,10 @@ this.plAccessorial1.Controls.Add(this.button57); this.plAccessorial1.Controls.Add(this.button36); this.plAccessorial1.Controls.Add(this.label31); + this.plAccessorial1.Controls.Add(this.button118); + this.plAccessorial1.Controls.Add(this.button116); + this.plAccessorial1.Controls.Add(this.button117); + this.plAccessorial1.Controls.Add(this.button115); this.plAccessorial1.Controls.Add(this.button63); this.plAccessorial1.Controls.Add(this.button82); this.plAccessorial1.Controls.Add(this.button76); @@ -1513,6 +1529,19 @@ this.plAccessorial1.Size = new System.Drawing.Size(1910, 1022); this.plAccessorial1.TabIndex = 5825; // + // button95 + // + this.button95.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button95.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button95.Location = new System.Drawing.Point(1286, 310); + this.button95.Margin = new System.Windows.Forms.Padding(4); + this.button95.Name = "button95"; + this.button95.Size = new System.Drawing.Size(131, 11); + this.button95.TabIndex = 8358; + this.button95.Tag = "15001"; + this.button95.Text = "15001"; + this.button95.UseVisualStyleBackColor = false; + // // label105 // this.label105.AutoSize = true; @@ -3956,6 +3985,201 @@ this.button74.Text = "12014"; this.button74.UseVisualStyleBackColor = false; // + // button101 + // + this.button101.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button101.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button101.Location = new System.Drawing.Point(1718, 574); + this.button101.Margin = new System.Windows.Forms.Padding(4); + this.button101.Name = "button101"; + this.button101.Size = new System.Drawing.Size(96, 35); + this.button101.TabIndex = 5910; + this.button101.Tag = "19005"; + this.button101.Text = "安全门"; + this.button101.UseVisualStyleBackColor = false; + // + // button100 + // + this.button100.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button100.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button100.Location = new System.Drawing.Point(1277, 699); + this.button100.Margin = new System.Windows.Forms.Padding(4); + this.button100.Name = "button100"; + this.button100.Size = new System.Drawing.Size(96, 35); + this.button100.TabIndex = 5910; + this.button100.Tag = "19006"; + this.button100.Text = "安全门"; + this.button100.UseVisualStyleBackColor = false; + // + // button99 + // + this.button99.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button99.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button99.Location = new System.Drawing.Point(1491, 512); + this.button99.Margin = new System.Windows.Forms.Padding(4); + this.button99.Name = "button99"; + this.button99.Size = new System.Drawing.Size(96, 35); + this.button99.TabIndex = 5910; + this.button99.Tag = "19004"; + this.button99.Text = "安全门"; + this.button99.UseVisualStyleBackColor = false; + // + // button98 + // + this.button98.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button98.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button98.Location = new System.Drawing.Point(1718, 229); + this.button98.Margin = new System.Windows.Forms.Padding(4); + this.button98.Name = "button98"; + this.button98.Size = new System.Drawing.Size(96, 35); + this.button98.TabIndex = 5910; + this.button98.Tag = "19003"; + this.button98.Text = "安全门"; + this.button98.UseVisualStyleBackColor = false; + // + // button97 + // + this.button97.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button97.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button97.Location = new System.Drawing.Point(1718, 130); + this.button97.Margin = new System.Windows.Forms.Padding(4); + this.button97.Name = "button97"; + this.button97.Size = new System.Drawing.Size(96, 35); + this.button97.TabIndex = 5910; + this.button97.Tag = "19002"; + this.button97.Text = "安全门"; + this.button97.UseVisualStyleBackColor = false; + // + // button107 + // + this.button107.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button107.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button107.Location = new System.Drawing.Point(443, 689); + this.button107.Margin = new System.Windows.Forms.Padding(4); + this.button107.Name = "button107"; + this.button107.Size = new System.Drawing.Size(96, 35); + this.button107.TabIndex = 5910; + this.button107.Tag = "19012"; + this.button107.Text = "安全门"; + this.button107.UseVisualStyleBackColor = false; + // + // button106 + // + this.button106.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button106.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button106.Location = new System.Drawing.Point(48, 527); + this.button106.Margin = new System.Windows.Forms.Padding(4); + this.button106.Name = "button106"; + this.button106.Size = new System.Drawing.Size(96, 35); + this.button106.TabIndex = 5910; + this.button106.Tag = "19011"; + this.button106.Text = "安全门"; + this.button106.UseVisualStyleBackColor = false; + // + // button105 + // + this.button105.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button105.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button105.Location = new System.Drawing.Point(228, 455); + this.button105.Margin = new System.Windows.Forms.Padding(4); + this.button105.Name = "button105"; + this.button105.Size = new System.Drawing.Size(96, 35); + this.button105.TabIndex = 5910; + this.button105.Tag = "19010"; + this.button105.Text = "安全门"; + this.button105.UseVisualStyleBackColor = false; + // + // button104 + // + this.button104.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button104.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button104.Location = new System.Drawing.Point(48, 346); + this.button104.Margin = new System.Windows.Forms.Padding(4); + this.button104.Name = "button104"; + this.button104.Size = new System.Drawing.Size(96, 35); + this.button104.TabIndex = 5910; + this.button104.Tag = "19009"; + this.button104.Text = "安全门"; + this.button104.UseVisualStyleBackColor = false; + // + // button103 + // + this.button103.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button103.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button103.Location = new System.Drawing.Point(216, 24); + this.button103.Margin = new System.Windows.Forms.Padding(4); + this.button103.Name = "button103"; + this.button103.Size = new System.Drawing.Size(96, 35); + this.button103.TabIndex = 5910; + this.button103.Tag = "19008"; + this.button103.Text = "安全门"; + this.button103.UseVisualStyleBackColor = false; + // + // button102 + // + this.button102.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button102.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button102.Location = new System.Drawing.Point(450, 26); + this.button102.Margin = new System.Windows.Forms.Padding(4); + this.button102.Name = "button102"; + this.button102.Size = new System.Drawing.Size(96, 35); + this.button102.TabIndex = 5910; + this.button102.Tag = "19007"; + this.button102.Text = "安全门"; + this.button102.UseVisualStyleBackColor = false; + // + // button110 + // + this.button110.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button110.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button110.Location = new System.Drawing.Point(826, 793); + this.button110.Margin = new System.Windows.Forms.Padding(4); + this.button110.Name = "button110"; + this.button110.Size = new System.Drawing.Size(96, 35); + this.button110.TabIndex = 5910; + this.button110.Tag = "19017"; + this.button110.Text = "安全门"; + this.button110.UseVisualStyleBackColor = false; + // + // button109 + // + this.button109.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button109.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button109.Location = new System.Drawing.Point(826, 440); + this.button109.Margin = new System.Windows.Forms.Padding(4); + this.button109.Name = "button109"; + this.button109.Size = new System.Drawing.Size(96, 35); + this.button109.TabIndex = 5910; + this.button109.Tag = "19015"; + this.button109.Text = "安全门"; + this.button109.UseVisualStyleBackColor = false; + // + // button108 + // + this.button108.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button108.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button108.Location = new System.Drawing.Point(826, 239); + this.button108.Margin = new System.Windows.Forms.Padding(4); + this.button108.Name = "button108"; + this.button108.Size = new System.Drawing.Size(96, 35); + this.button108.TabIndex = 5910; + this.button108.Tag = "19014"; + this.button108.Text = "安全门"; + this.button108.UseVisualStyleBackColor = false; + // + // button96 + // + this.button96.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button96.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button96.Location = new System.Drawing.Point(826, 4); + this.button96.Margin = new System.Windows.Forms.Padding(4); + this.button96.Name = "button96"; + this.button96.Size = new System.Drawing.Size(96, 35); + this.button96.TabIndex = 5910; + this.button96.Tag = "19013"; + this.button96.Text = "安全门"; + this.button96.UseVisualStyleBackColor = false; + // // button1 // this.button1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; @@ -4145,7 +4369,7 @@ this.label31.BackColor = System.Drawing.Color.Transparent; this.label31.Enabled = false; this.label31.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(203, 149); + this.label31.Location = new System.Drawing.Point(212, 155); this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(22, 15); @@ -4236,7 +4460,7 @@ this.label56.BackColor = System.Drawing.Color.Transparent; this.label56.Enabled = false; this.label56.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label56.Location = new System.Drawing.Point(255, 600); + this.label56.Location = new System.Drawing.Point(254, 662); this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label56.Name = "label56"; this.label56.Size = new System.Drawing.Size(37, 15); @@ -4249,7 +4473,7 @@ this.label55.BackColor = System.Drawing.Color.Transparent; this.label55.Enabled = false; this.label55.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label55.Location = new System.Drawing.Point(384, 598); + this.label55.Location = new System.Drawing.Point(384, 662); this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label55.Name = "label55"; this.label55.Size = new System.Drawing.Size(37, 15); @@ -5615,213 +5839,109 @@ this.label44.TabIndex = 3219; this.label44.Tag = "17001"; // - // button95 - // - this.button95.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button95.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button95.Location = new System.Drawing.Point(1286, 310); - this.button95.Margin = new System.Windows.Forms.Padding(4); - this.button95.Name = "button95"; - this.button95.Size = new System.Drawing.Size(131, 11); - this.button95.TabIndex = 8358; - this.button95.Tag = "15001"; - this.button95.Text = "15001"; - this.button95.UseVisualStyleBackColor = false; - // - // button96 - // - this.button96.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button96.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button96.Location = new System.Drawing.Point(826, 4); - this.button96.Margin = new System.Windows.Forms.Padding(4); - this.button96.Name = "button96"; - this.button96.Size = new System.Drawing.Size(96, 35); - this.button96.TabIndex = 5910; - this.button96.Tag = "19013"; - this.button96.Text = "安全门"; - this.button96.UseVisualStyleBackColor = false; - // - // button97 - // - this.button97.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button97.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button97.Location = new System.Drawing.Point(1718, 122); - this.button97.Margin = new System.Windows.Forms.Padding(4); - this.button97.Name = "button97"; - this.button97.Size = new System.Drawing.Size(96, 35); - this.button97.TabIndex = 5910; - this.button97.Tag = "19002"; - this.button97.Text = "安全门"; - this.button97.UseVisualStyleBackColor = false; - // - // button98 - // - this.button98.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button98.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button98.Location = new System.Drawing.Point(1718, 257); - this.button98.Margin = new System.Windows.Forms.Padding(4); - this.button98.Name = "button98"; - this.button98.Size = new System.Drawing.Size(96, 35); - this.button98.TabIndex = 5910; - this.button98.Tag = "19003"; - this.button98.Text = "安全门"; - this.button98.UseVisualStyleBackColor = false; - // - // button99 - // - this.button99.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button99.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button99.Location = new System.Drawing.Point(1491, 512); - this.button99.Margin = new System.Windows.Forms.Padding(4); - this.button99.Name = "button99"; - this.button99.Size = new System.Drawing.Size(96, 35); - this.button99.TabIndex = 5910; - this.button99.Tag = "19004"; - this.button99.Text = "安全门"; - this.button99.UseVisualStyleBackColor = false; - // - // button100 - // - this.button100.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button100.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button100.Location = new System.Drawing.Point(1277, 699); - this.button100.Margin = new System.Windows.Forms.Padding(4); - this.button100.Name = "button100"; - this.button100.Size = new System.Drawing.Size(96, 35); - this.button100.TabIndex = 5910; - this.button100.Tag = "19006"; - this.button100.Text = "安全门"; - this.button100.UseVisualStyleBackColor = false; - // - // button101 - // - this.button101.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button101.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button101.Location = new System.Drawing.Point(1732, 610); - this.button101.Margin = new System.Windows.Forms.Padding(4); - this.button101.Name = "button101"; - this.button101.Size = new System.Drawing.Size(96, 35); - this.button101.TabIndex = 5910; - this.button101.Tag = "19005"; - this.button101.Text = "安全门"; - this.button101.UseVisualStyleBackColor = false; - // - // button102 - // - this.button102.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button102.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button102.Location = new System.Drawing.Point(450, 26); - this.button102.Margin = new System.Windows.Forms.Padding(4); - this.button102.Name = "button102"; - this.button102.Size = new System.Drawing.Size(96, 35); - this.button102.TabIndex = 5910; - this.button102.Tag = "19007"; - this.button102.Text = "安全门"; - this.button102.UseVisualStyleBackColor = false; - // - // button103 - // - this.button103.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button103.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button103.Location = new System.Drawing.Point(216, 24); - this.button103.Margin = new System.Windows.Forms.Padding(4); - this.button103.Name = "button103"; - this.button103.Size = new System.Drawing.Size(96, 35); - this.button103.TabIndex = 5910; - this.button103.Tag = "19008"; - this.button103.Text = "安全门"; - this.button103.UseVisualStyleBackColor = false; - // - // button104 - // - this.button104.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button104.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button104.Location = new System.Drawing.Point(64, 336); - this.button104.Margin = new System.Windows.Forms.Padding(4); - this.button104.Name = "button104"; - this.button104.Size = new System.Drawing.Size(96, 35); - this.button104.TabIndex = 5910; - this.button104.Tag = "19009"; - this.button104.Text = "安全门"; - this.button104.UseVisualStyleBackColor = false; - // - // button105 - // - this.button105.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button105.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button105.Location = new System.Drawing.Point(228, 455); - this.button105.Margin = new System.Windows.Forms.Padding(4); - this.button105.Name = "button105"; - this.button105.Size = new System.Drawing.Size(96, 35); - this.button105.TabIndex = 5910; - this.button105.Tag = "19010"; - this.button105.Text = "安全门"; - this.button105.UseVisualStyleBackColor = false; - // - // button106 - // - this.button106.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button106.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button106.Location = new System.Drawing.Point(48, 562); - this.button106.Margin = new System.Windows.Forms.Padding(4); - this.button106.Name = "button106"; - this.button106.Size = new System.Drawing.Size(96, 35); - this.button106.TabIndex = 5910; - this.button106.Tag = "19011"; - this.button106.Text = "安全门"; - this.button106.UseVisualStyleBackColor = false; - // - // button107 - // - this.button107.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button107.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button107.Location = new System.Drawing.Point(443, 689); - this.button107.Margin = new System.Windows.Forms.Padding(4); - this.button107.Name = "button107"; - this.button107.Size = new System.Drawing.Size(96, 35); - this.button107.TabIndex = 5910; - this.button107.Tag = "19012"; - this.button107.Text = "安全门"; - this.button107.UseVisualStyleBackColor = false; - // - // button108 - // - this.button108.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button108.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button108.Location = new System.Drawing.Point(826, 239); - this.button108.Margin = new System.Windows.Forms.Padding(4); - this.button108.Name = "button108"; - this.button108.Size = new System.Drawing.Size(96, 35); - this.button108.TabIndex = 5910; - this.button108.Tag = "19014"; - this.button108.Text = "安全门"; - this.button108.UseVisualStyleBackColor = false; - // - // button109 - // - this.button109.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button109.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button109.Location = new System.Drawing.Point(826, 440); - this.button109.Margin = new System.Windows.Forms.Padding(4); - this.button109.Name = "button109"; - this.button109.Size = new System.Drawing.Size(96, 35); - this.button109.TabIndex = 5910; - this.button109.Tag = "19015"; - this.button109.Text = "安全门"; - this.button109.UseVisualStyleBackColor = false; - // - // button110 - // - this.button110.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button110.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button110.Location = new System.Drawing.Point(826, 793); - this.button110.Margin = new System.Windows.Forms.Padding(4); - this.button110.Name = "button110"; - this.button110.Size = new System.Drawing.Size(96, 35); - this.button110.TabIndex = 5910; - this.button110.Tag = "19017"; - this.button110.Text = "安全门"; - this.button110.UseVisualStyleBackColor = false; + // button111 + // + this.button111.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button111.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button111.Location = new System.Drawing.Point(1553, 122); + this.button111.Margin = new System.Windows.Forms.Padding(4); + this.button111.Name = "button111"; + this.button111.Size = new System.Drawing.Size(148, 35); + this.button111.TabIndex = 5898; + this.button111.Tag = "30002"; + this.button111.Text = "12001AGV对接信号"; + this.button111.UseVisualStyleBackColor = false; + // + // button112 + // + this.button112.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button112.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button112.Location = new System.Drawing.Point(1562, 215); + this.button112.Margin = new System.Windows.Forms.Padding(4); + this.button112.Name = "button112"; + this.button112.Size = new System.Drawing.Size(148, 35); + this.button112.TabIndex = 5898; + this.button112.Tag = "30003"; + this.button112.Text = "12002AGV对接信号"; + this.button112.UseVisualStyleBackColor = false; + // + // button113 + // + this.button113.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button113.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button113.Location = new System.Drawing.Point(1562, 416); + this.button113.Margin = new System.Windows.Forms.Padding(4); + this.button113.Name = "button113"; + this.button113.Size = new System.Drawing.Size(148, 35); + this.button113.TabIndex = 5898; + this.button113.Tag = "30004"; + this.button113.Text = "12003AGV对接信号"; + this.button113.UseVisualStyleBackColor = false; + // + // button114 + // + this.button114.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button114.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button114.Location = new System.Drawing.Point(1562, 672); + this.button114.Margin = new System.Windows.Forms.Padding(4); + this.button114.Name = "button114"; + this.button114.Size = new System.Drawing.Size(148, 35); + this.button114.TabIndex = 5898; + this.button114.Tag = "30005"; + this.button114.Text = "12004AGV对接信号"; + this.button114.UseVisualStyleBackColor = false; + // + // button115 + // + this.button115.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button115.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button115.Location = new System.Drawing.Point(135, 211); + this.button115.Margin = new System.Windows.Forms.Padding(4); + this.button115.Name = "button115"; + this.button115.Size = new System.Drawing.Size(139, 29); + this.button115.TabIndex = 5914; + this.button115.Tag = "30007"; + this.button115.Text = "12031AGV对接信号"; + this.button115.UseVisualStyleBackColor = false; + // + // button116 + // + this.button116.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button116.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button116.Location = new System.Drawing.Point(135, 316); + this.button116.Margin = new System.Windows.Forms.Padding(4); + this.button116.Name = "button116"; + this.button116.Size = new System.Drawing.Size(139, 29); + this.button116.TabIndex = 5914; + this.button116.Tag = "30008"; + this.button116.Text = "12044AGV对接信号"; + this.button116.UseVisualStyleBackColor = false; + // + // button117 + // + this.button117.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button117.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button117.Location = new System.Drawing.Point(135, 122); + this.button117.Margin = new System.Windows.Forms.Padding(4); + this.button117.Name = "button117"; + this.button117.Size = new System.Drawing.Size(139, 29); + this.button117.TabIndex = 5914; + this.button117.Tag = "30006"; + this.button117.Text = "12029AGV对接信号"; + this.button117.UseVisualStyleBackColor = false; + // + // button118 + // + this.button118.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button118.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button118.Location = new System.Drawing.Point(152, 580); + this.button118.Margin = new System.Windows.Forms.Padding(4); + this.button118.Name = "button118"; + this.button118.Size = new System.Drawing.Size(139, 29); + this.button118.TabIndex = 5914; + this.button118.Tag = "30009"; + this.button118.Text = "12051AGV对接信号"; + this.button118.UseVisualStyleBackColor = false; // // FrmControlMonitor // @@ -6299,6 +6419,14 @@ private System.Windows.Forms.Button button110; private System.Windows.Forms.Button button109; private System.Windows.Forms.Button button108; + private System.Windows.Forms.Button button114; + private System.Windows.Forms.Button button113; + private System.Windows.Forms.Button button112; + private System.Windows.Forms.Button button111; + private System.Windows.Forms.Button button116; + private System.Windows.Forms.Button button117; + private System.Windows.Forms.Button button115; + private System.Windows.Forms.Button button118; //private System.Windows.Forms.Button button132; diff --git a/ControlMonitorClient/FrmDeviceStatus.cs b/ControlMonitorClient/FrmDeviceStatus.cs index 48dbdf0..c5fcdf9 100644 --- a/ControlMonitorClient/FrmDeviceStatus.cs +++ b/ControlMonitorClient/FrmDeviceStatus.cs @@ -289,28 +289,45 @@ namespace wcfControlMonitorClient this.gb03.Visible = false; } + if (_deviceIndex < 30002 || _deviceIndex > 3009) + { + //豸״̬ + switch (_device.RunState) + { + case 0: + lblDeviceStatus.Text = ""; + break; + case 1: + lblDeviceStatus.Text = ""; + break; + case 2: + lblDeviceStatus.Text = ""; + break; + case 3: + lblDeviceStatus.Text = ""; + break; + case 4: + lblDeviceStatus.Text = "ͣ"; + break; + case 5://20090920 + lblDeviceStatus.Text = ""; + break; + } + } + else {//AGVź - //豸״̬ - switch (_device.RunState) - { - case 0: - lblDeviceStatus.Text = ""; - break; - case 1: - lblDeviceStatus.Text = ""; - break; - case 2: - lblDeviceStatus.Text = ""; - break; - case 3: - lblDeviceStatus.Text = ""; - break; - case 4: - lblDeviceStatus.Text = "ͣ"; - break; - case 5://20090920 - lblDeviceStatus.Text = ""; - break; + switch (_device.RunState) + { + case 0: + lblDeviceStatus.Text = ""; + break; + case 1: + lblDeviceStatus.Text = ""; + break; + case 2: + lblDeviceStatus.Text = "ɻ뿪"; + break; + } } diff --git a/ControlMonitorClient/FrmDeviceStatus.designer.cs b/ControlMonitorClient/FrmDeviceStatus.designer.cs index 6892266..430b374 100644 --- a/ControlMonitorClient/FrmDeviceStatus.designer.cs +++ b/ControlMonitorClient/FrmDeviceStatus.designer.cs @@ -85,7 +85,7 @@ // this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.OutsetDouble; this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 98F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 131F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.label6, 0, 10); this.tableLayoutPanel1.Controls.Add(this.lblManTask, 0, 10); @@ -109,31 +109,33 @@ this.tableLayoutPanel1.Controls.Add(this.lblArrowLocation, 1, 3); this.tableLayoutPanel1.Controls.Add(this.lblDeviceStatus, 1, 4); this.tableLayoutPanel1.Controls.Add(this.lblDeviceIndex, 1, 0); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); + this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 15); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 11; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 15F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(492, 351); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 19F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(656, 439); this.tableLayoutPanel1.TabIndex = 0; // // label6 // this.label6.AutoSize = true; this.label6.Dock = System.Windows.Forms.DockStyle.Fill; - this.label6.Location = new System.Drawing.Point(6, 323); + this.label6.Location = new System.Drawing.Point(7, 400); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(92, 25); + this.label6.Size = new System.Drawing.Size(123, 36); this.label6.TabIndex = 29; this.label6.Text = "调度任务："; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -143,9 +145,10 @@ this.lblManTask.AutoSize = true; this.lblManTask.Dock = System.Windows.Forms.DockStyle.Fill; this.lblManTask.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblManTask.Location = new System.Drawing.Point(107, 323); + this.lblManTask.Location = new System.Drawing.Point(141, 400); + this.lblManTask.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblManTask.Name = "lblManTask"; - this.lblManTask.Size = new System.Drawing.Size(379, 25); + this.lblManTask.Size = new System.Drawing.Size(508, 36); this.lblManTask.TabIndex = 28; this.lblManTask.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -153,10 +156,11 @@ // this.lblBarcode.BackColor = System.Drawing.SystemColors.Control; this.lblBarcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lblBarcode.Location = new System.Drawing.Point(107, 171); + this.lblBarcode.Location = new System.Drawing.Point(141, 212); + this.lblBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblBarcode.MaxLength = 7; this.lblBarcode.Name = "lblBarcode"; - this.lblBarcode.Size = new System.Drawing.Size(306, 21); + this.lblBarcode.Size = new System.Drawing.Size(407, 25); this.lblBarcode.TabIndex = 24; this.lblBarcode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.lblBarcode_KeyPress); // @@ -165,9 +169,10 @@ this.lblNowY.AutoSize = true; this.lblNowY.Dock = System.Windows.Forms.DockStyle.Fill; this.lblNowY.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblNowY.Location = new System.Drawing.Point(107, 267); + this.lblNowY.Location = new System.Drawing.Point(141, 331); + this.lblNowY.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblNowY.Name = "lblNowY"; - this.lblNowY.Size = new System.Drawing.Size(379, 30); + this.lblNowY.Size = new System.Drawing.Size(508, 38); this.lblNowY.TabIndex = 27; this.lblNowY.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -176,9 +181,10 @@ this.lblNowX.AutoSize = true; this.lblNowX.Dock = System.Windows.Forms.DockStyle.Fill; this.lblNowX.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblNowX.Location = new System.Drawing.Point(107, 234); + this.lblNowX.Location = new System.Drawing.Point(141, 290); + this.lblNowX.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblNowX.Name = "lblNowX"; - this.lblNowX.Size = new System.Drawing.Size(379, 30); + this.lblNowX.Size = new System.Drawing.Size(508, 38); this.lblNowX.TabIndex = 26; this.lblNowX.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -187,9 +193,10 @@ this.lblErrorName.AutoSize = true; this.lblErrorName.Dock = System.Windows.Forms.DockStyle.Left; this.lblErrorName.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblErrorName.Location = new System.Drawing.Point(107, 201); + this.lblErrorName.Location = new System.Drawing.Point(141, 249); + this.lblErrorName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblErrorName.Name = "lblErrorName"; - this.lblErrorName.Size = new System.Drawing.Size(0, 30); + this.lblErrorName.Size = new System.Drawing.Size(0, 38); this.lblErrorName.TabIndex = 25; this.lblErrorName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -197,9 +204,10 @@ // this.label13.AutoSize = true; this.label13.Dock = System.Windows.Forms.DockStyle.Fill; - this.label13.Location = new System.Drawing.Point(6, 300); + this.label13.Location = new System.Drawing.Point(7, 372); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(92, 20); + this.label13.Size = new System.Drawing.Size(123, 25); this.label13.TabIndex = 21; this.label13.Text = "是否逻辑有物："; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -209,9 +217,10 @@ this.lblGoods.AutoSize = true; this.lblGoods.Dock = System.Windows.Forms.DockStyle.Fill; this.lblGoods.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblGoods.Location = new System.Drawing.Point(107, 300); + this.lblGoods.Location = new System.Drawing.Point(141, 372); + this.lblGoods.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblGoods.Name = "lblGoods"; - this.lblGoods.Size = new System.Drawing.Size(379, 20); + this.lblGoods.Size = new System.Drawing.Size(508, 25); this.lblGoods.TabIndex = 20; this.lblGoods.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -219,9 +228,10 @@ // this.label12.AutoSize = true; this.label12.Dock = System.Windows.Forms.DockStyle.Fill; - this.label12.Location = new System.Drawing.Point(6, 267); + this.label12.Location = new System.Drawing.Point(7, 331); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(92, 30); + this.label12.Size = new System.Drawing.Size(123, 38); this.label12.TabIndex = 18; this.label12.Text = "当前Y坐标："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -230,9 +240,10 @@ // this.label_X.AutoSize = true; this.label_X.Dock = System.Windows.Forms.DockStyle.Fill; - this.label_X.Location = new System.Drawing.Point(6, 234); + this.label_X.Location = new System.Drawing.Point(7, 290); + this.label_X.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_X.Name = "label_X"; - this.label_X.Size = new System.Drawing.Size(92, 30); + this.label_X.Size = new System.Drawing.Size(123, 38); this.label_X.TabIndex = 16; this.label_X.Text = "当前X坐标："; this.label_X.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -241,9 +252,10 @@ // this.label_ErrorInfo.AutoSize = true; this.label_ErrorInfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.label_ErrorInfo.Location = new System.Drawing.Point(6, 201); + this.label_ErrorInfo.Location = new System.Drawing.Point(7, 249); + this.label_ErrorInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_ErrorInfo.Name = "label_ErrorInfo"; - this.label_ErrorInfo.Size = new System.Drawing.Size(92, 30); + this.label_ErrorInfo.Size = new System.Drawing.Size(123, 38); this.label_ErrorInfo.TabIndex = 14; this.label_ErrorInfo.Text = "故障信息："; this.label_ErrorInfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -252,9 +264,10 @@ // this.label1.AutoSize = true; this.label1.Dock = System.Windows.Forms.DockStyle.Fill; - this.label1.Location = new System.Drawing.Point(6, 3); + this.label1.Location = new System.Drawing.Point(7, 3); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(92, 30); + this.label1.Size = new System.Drawing.Size(123, 38); this.label1.TabIndex = 0; this.label1.Text = "设备索引："; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -263,9 +276,10 @@ // this.label2.AutoSize = true; this.label2.Dock = System.Windows.Forms.DockStyle.Fill; - this.label2.Location = new System.Drawing.Point(6, 36); + this.label2.Location = new System.Drawing.Point(7, 44); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(92, 30); + this.label2.Size = new System.Drawing.Size(123, 38); this.label2.TabIndex = 1; this.label2.Text = "设备名称："; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -274,9 +288,10 @@ // this.label3.AutoSize = true; this.label3.Dock = System.Windows.Forms.DockStyle.Fill; - this.label3.Location = new System.Drawing.Point(6, 69); + this.label3.Location = new System.Drawing.Point(7, 85); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(92, 30); + this.label3.Size = new System.Drawing.Size(123, 38); this.label3.TabIndex = 2; this.label3.Text = "设备指令索引："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -285,9 +300,10 @@ // this.label4.AutoSize = true; this.label4.Dock = System.Windows.Forms.DockStyle.Fill; - this.label4.Location = new System.Drawing.Point(6, 102); + this.label4.Location = new System.Drawing.Point(7, 126); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(92, 30); + this.label4.Size = new System.Drawing.Size(123, 38); this.label4.TabIndex = 3; this.label4.Text = "目标位置："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -296,9 +312,10 @@ // this.label5.AutoSize = true; this.label5.Dock = System.Windows.Forms.DockStyle.Fill; - this.label5.Location = new System.Drawing.Point(6, 135); + this.label5.Location = new System.Drawing.Point(7, 167); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(92, 30); + this.label5.Size = new System.Drawing.Size(123, 38); this.label5.TabIndex = 4; this.label5.Text = "设备状态："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -307,9 +324,10 @@ // this.label7.AutoSize = true; this.label7.Dock = System.Windows.Forms.DockStyle.Fill; - this.label7.Location = new System.Drawing.Point(6, 168); + this.label7.Location = new System.Drawing.Point(7, 208); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(92, 30); + this.label7.Size = new System.Drawing.Size(123, 38); this.label7.TabIndex = 6; this.label7.Text = "条码："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -319,9 +337,10 @@ this.lblDeviceName.AutoSize = true; this.lblDeviceName.Dock = System.Windows.Forms.DockStyle.Fill; this.lblDeviceName.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblDeviceName.Location = new System.Drawing.Point(107, 36); + this.lblDeviceName.Location = new System.Drawing.Point(141, 44); + this.lblDeviceName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblDeviceName.Name = "lblDeviceName"; - this.lblDeviceName.Size = new System.Drawing.Size(379, 30); + this.lblDeviceName.Size = new System.Drawing.Size(508, 38); this.lblDeviceName.TabIndex = 8; this.lblDeviceName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -330,9 +349,10 @@ this.lblTaskIndex.AutoSize = true; this.lblTaskIndex.Dock = System.Windows.Forms.DockStyle.Fill; this.lblTaskIndex.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblTaskIndex.Location = new System.Drawing.Point(107, 69); + this.lblTaskIndex.Location = new System.Drawing.Point(141, 85); + this.lblTaskIndex.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblTaskIndex.Name = "lblTaskIndex"; - this.lblTaskIndex.Size = new System.Drawing.Size(379, 30); + this.lblTaskIndex.Size = new System.Drawing.Size(508, 38); this.lblTaskIndex.TabIndex = 9; this.lblTaskIndex.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -341,9 +361,10 @@ this.lblArrowLocation.AutoSize = true; this.lblArrowLocation.Dock = System.Windows.Forms.DockStyle.Fill; this.lblArrowLocation.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblArrowLocation.Location = new System.Drawing.Point(107, 102); + this.lblArrowLocation.Location = new System.Drawing.Point(141, 126); + this.lblArrowLocation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblArrowLocation.Name = "lblArrowLocation"; - this.lblArrowLocation.Size = new System.Drawing.Size(379, 30); + this.lblArrowLocation.Size = new System.Drawing.Size(508, 38); this.lblArrowLocation.TabIndex = 10; this.lblArrowLocation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -352,16 +373,18 @@ this.lblDeviceStatus.AutoSize = true; this.lblDeviceStatus.Dock = System.Windows.Forms.DockStyle.Fill; this.lblDeviceStatus.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.lblDeviceStatus.Location = new System.Drawing.Point(107, 135); + this.lblDeviceStatus.Location = new System.Drawing.Point(141, 167); + this.lblDeviceStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblDeviceStatus.Name = "lblDeviceStatus"; - this.lblDeviceStatus.Size = new System.Drawing.Size(379, 30); + this.lblDeviceStatus.Size = new System.Drawing.Size(508, 38); this.lblDeviceStatus.TabIndex = 11; this.lblDeviceStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lblDeviceIndex // this.lblDeviceIndex.BackColor = System.Drawing.SystemColors.Control; - this.lblDeviceIndex.Location = new System.Drawing.Point(107, 6); + this.lblDeviceIndex.Location = new System.Drawing.Point(141, 7); + this.lblDeviceIndex.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblDeviceIndex.Maximum = new decimal(new int[] { 999999, 0, @@ -373,7 +396,7 @@ 0, 0}); this.lblDeviceIndex.Name = "lblDeviceIndex"; - this.lblDeviceIndex.Size = new System.Drawing.Size(104, 21); + this.lblDeviceIndex.Size = new System.Drawing.Size(139, 25); this.lblDeviceIndex.TabIndex = 22; this.lblDeviceIndex.Value = new decimal(new int[] { 10000, @@ -384,9 +407,10 @@ // // btnRefresh // - this.btnRefresh.Location = new System.Drawing.Point(350, 421); + this.btnRefresh.Location = new System.Drawing.Point(467, 526); + this.btnRefresh.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnRefresh.Name = "btnRefresh"; - this.btnRefresh.Size = new System.Drawing.Size(75, 23); + this.btnRefresh.Size = new System.Drawing.Size(100, 29); this.btnRefresh.TabIndex = 1; this.btnRefresh.Text = "更新(&R)"; this.btnRefresh.UseVisualStyleBackColor = true; @@ -394,9 +418,10 @@ // // btnClose // - this.btnClose.Location = new System.Drawing.Point(431, 421); + this.btnClose.Location = new System.Drawing.Point(575, 526); + this.btnClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(75, 23); + this.btnClose.Size = new System.Drawing.Size(100, 29); this.btnClose.TabIndex = 1; this.btnClose.Text = "关闭(&E)"; this.btnClose.UseVisualStyleBackColor = true; @@ -407,16 +432,18 @@ this.label11.AutoSize = true; this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Location = new System.Drawing.Point(0, 0); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(0, 12); + this.label11.Size = new System.Drawing.Size(0, 15); this.label11.TabIndex = 21; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btLogicHaveGoods // - this.btLogicHaveGoods.Location = new System.Drawing.Point(12, 447); + this.btLogicHaveGoods.Location = new System.Drawing.Point(16, 559); + this.btLogicHaveGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btLogicHaveGoods.Name = "btLogicHaveGoods"; - this.btLogicHaveGoods.Size = new System.Drawing.Size(80, 23); + this.btLogicHaveGoods.Size = new System.Drawing.Size(107, 29); this.btLogicHaveGoods.TabIndex = 1; this.btLogicHaveGoods.Text = "逻辑有物(&H)"; this.btLogicHaveGoods.UseVisualStyleBackColor = true; @@ -424,9 +451,10 @@ // // btLogicNoneGoods // - this.btLogicNoneGoods.Location = new System.Drawing.Point(12, 472); + this.btLogicNoneGoods.Location = new System.Drawing.Point(16, 590); + this.btLogicNoneGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btLogicNoneGoods.Name = "btLogicNoneGoods"; - this.btLogicNoneGoods.Size = new System.Drawing.Size(80, 23); + this.btLogicNoneGoods.Size = new System.Drawing.Size(107, 29); this.btLogicNoneGoods.TabIndex = 1; this.btLogicNoneGoods.Text = "逻辑无物(&N)"; this.btLogicNoneGoods.UseVisualStyleBackColor = true; @@ -434,9 +462,10 @@ // // btnAnswer // - this.btnAnswer.Location = new System.Drawing.Point(251, 421); + this.btnAnswer.Location = new System.Drawing.Point(335, 526); + this.btnAnswer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnAnswer.Name = "btnAnswer"; - this.btnAnswer.Size = new System.Drawing.Size(89, 23); + this.btnAnswer.Size = new System.Drawing.Size(119, 29); this.btnAnswer.TabIndex = 1; this.btnAnswer.Text = "完成应答(&O)"; this.btnAnswer.UseVisualStyleBackColor = true; @@ -445,19 +474,21 @@ // textBox1 // this.textBox1.ForeColor = System.Drawing.SystemColors.MenuHighlight; - this.textBox1.Location = new System.Drawing.Point(95, 456); + this.textBox1.Location = new System.Drawing.Point(127, 570); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(409, 37); + this.textBox1.Size = new System.Drawing.Size(544, 45); this.textBox1.TabIndex = 23; this.textBox1.Text = "当堆垛机执行送货指令完成时，接收此托盘的输送机为逻辑有物状态，托盘在此输送机开始移动后为逻辑无物"; // // btnReset // - this.btnReset.Location = new System.Drawing.Point(152, 421); + this.btnReset.Location = new System.Drawing.Point(203, 526); + this.btnReset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnReset.Name = "btnReset"; - this.btnReset.Size = new System.Drawing.Size(89, 23); + this.btnReset.Size = new System.Drawing.Size(119, 29); this.btnReset.TabIndex = 1; this.btnReset.Text = "故障复位(&C)"; this.btnReset.UseVisualStyleBackColor = true; @@ -465,9 +496,10 @@ // // btCancelDoubleFork // - this.btCancelDoubleFork.Location = new System.Drawing.Point(12, 448); + this.btCancelDoubleFork.Location = new System.Drawing.Point(16, 560); + this.btCancelDoubleFork.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btCancelDoubleFork.Name = "btCancelDoubleFork"; - this.btCancelDoubleFork.Size = new System.Drawing.Size(89, 23); + this.btCancelDoubleFork.Size = new System.Drawing.Size(119, 29); this.btCancelDoubleFork.TabIndex = 1; this.btCancelDoubleFork.Text = "取消双叉关联"; this.btCancelDoubleFork.UseVisualStyleBackColor = true; @@ -479,9 +511,11 @@ this.gbBarcode.Controls.Add(this.lblReadedBarcode); this.gbBarcode.Controls.Add(this.label14); this.gbBarcode.Controls.Add(this.label10); - this.gbBarcode.Location = new System.Drawing.Point(13, 363); + this.gbBarcode.Location = new System.Drawing.Point(17, 454); + this.gbBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.gbBarcode.Name = "gbBarcode"; - this.gbBarcode.Size = new System.Drawing.Size(493, 54); + this.gbBarcode.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.gbBarcode.Size = new System.Drawing.Size(657, 68); this.gbBarcode.TabIndex = 24; this.gbBarcode.TabStop = false; this.gbBarcode.Text = "扫描器信息"; @@ -491,10 +525,11 @@ this.lblReportedBarcode.BackColor = System.Drawing.SystemColors.Control; this.lblReportedBarcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblReportedBarcode.Enabled = false; - this.lblReportedBarcode.Location = new System.Drawing.Point(106, 32); + this.lblReportedBarcode.Location = new System.Drawing.Point(141, 40); + this.lblReportedBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblReportedBarcode.MaxLength = 6; this.lblReportedBarcode.Name = "lblReportedBarcode"; - this.lblReportedBarcode.Size = new System.Drawing.Size(384, 21); + this.lblReportedBarcode.Size = new System.Drawing.Size(511, 25); this.lblReportedBarcode.TabIndex = 25; // // lblReadedBarcode @@ -502,27 +537,30 @@ this.lblReadedBarcode.BackColor = System.Drawing.SystemColors.Control; this.lblReadedBarcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblReadedBarcode.Enabled = false; - this.lblReadedBarcode.Location = new System.Drawing.Point(106, 10); + this.lblReadedBarcode.Location = new System.Drawing.Point(141, 12); + this.lblReadedBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblReadedBarcode.MaxLength = 6; this.lblReadedBarcode.Name = "lblReadedBarcode"; - this.lblReadedBarcode.Size = new System.Drawing.Size(384, 21); + this.lblReadedBarcode.Size = new System.Drawing.Size(511, 25); this.lblReadedBarcode.TabIndex = 25; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(5, 38); + this.label14.Location = new System.Drawing.Point(7, 48); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(101, 12); + this.label14.Size = new System.Drawing.Size(127, 15); this.label14.TabIndex = 0; this.label14.Text = "上次读到的条码："; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(6, 17); + this.label10.Location = new System.Drawing.Point(8, 21); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(101, 12); + this.label10.Size = new System.Drawing.Size(127, 15); this.label10.TabIndex = 0; this.label10.Text = "当前读到的条码："; // @@ -534,9 +572,11 @@ this.gb03.Controls.Add(this.label8); this.gb03.Controls.Add(this.textBox2); this.gb03.Controls.Add(this.label16); - this.gb03.Location = new System.Drawing.Point(13, 367); + this.gb03.Location = new System.Drawing.Point(17, 459); + this.gb03.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.gb03.Name = "gb03"; - this.gb03.Size = new System.Drawing.Size(490, 47); + this.gb03.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.gb03.Size = new System.Drawing.Size(653, 59); this.gb03.TabIndex = 29; this.gb03.TabStop = false; this.gb03.Text = "里程及运行时间"; @@ -544,60 +584,67 @@ // textBox3 // this.textBox3.Enabled = false; - this.textBox3.Location = new System.Drawing.Point(75, 20); + this.textBox3.Location = new System.Drawing.Point(100, 25); + this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(108, 21); + this.textBox3.Size = new System.Drawing.Size(143, 25); this.textBox3.TabIndex = 3; // // textBox4 // this.textBox4.Enabled = false; - this.textBox4.Location = new System.Drawing.Point(256, 20); + this.textBox4.Location = new System.Drawing.Point(341, 25); + this.textBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(108, 21); + this.textBox4.Size = new System.Drawing.Size(143, 25); this.textBox4.TabIndex = 5; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(186, 25); + this.label9.Location = new System.Drawing.Point(248, 31); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(71, 12); + this.label9.Size = new System.Drawing.Size(91, 15); this.label9.TabIndex = 4; this.label9.Text = " 时间(S）："; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(5, 25); + this.label8.Location = new System.Drawing.Point(7, 31); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(71, 12); + this.label8.Size = new System.Drawing.Size(91, 15); this.label8.TabIndex = 2; this.label8.Text = " 里程(M）："; // // textBox2 // this.textBox2.Enabled = false; - this.textBox2.Location = new System.Drawing.Point(440, 18); + this.textBox2.Location = new System.Drawing.Point(587, 22); + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(42, 21); + this.textBox2.Size = new System.Drawing.Size(55, 25); this.textBox2.TabIndex = 1; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(363, 23); + this.label16.Location = new System.Drawing.Point(484, 29); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(71, 12); + this.label16.Size = new System.Drawing.Size(91, 15); this.label16.TabIndex = 0; this.label16.Text = " 电量(%）："; this.label16.Click += new System.EventHandler(this.Label16_Click); // // btnSolutions // - this.btnSolutions.Location = new System.Drawing.Point(417, 216); + this.btnSolutions.Location = new System.Drawing.Point(556, 270); + this.btnSolutions.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSolutions.Name = "btnSolutions"; - this.btnSolutions.Size = new System.Drawing.Size(81, 23); + this.btnSolutions.Size = new System.Drawing.Size(108, 29); this.btnSolutions.TabIndex = 1; this.btnSolutions.Text = "解决方案(&S)"; this.btnSolutions.UseVisualStyleBackColor = true; @@ -609,9 +656,10 @@ this.cB_Empty.AutoSize = true; this.cB_Empty.Checked = true; this.cB_Empty.CheckState = System.Windows.Forms.CheckState.Checked; - this.cB_Empty.Location = new System.Drawing.Point(427, 186); + 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.Name = "cB_Empty"; - this.cB_Empty.Size = new System.Drawing.Size(72, 16); + this.cB_Empty.Size = new System.Drawing.Size(89, 19); this.cB_Empty.TabIndex = 25; this.cB_Empty.Text = "有货托盘"; this.cB_Empty.UseVisualStyleBackColor = true; @@ -619,9 +667,10 @@ // // deviceclear // - this.deviceclear.Location = new System.Drawing.Point(41, 421); + this.deviceclear.Location = new System.Drawing.Point(55, 526); + this.deviceclear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.deviceclear.Name = "deviceclear"; - this.deviceclear.Size = new System.Drawing.Size(98, 23); + this.deviceclear.Size = new System.Drawing.Size(131, 29); this.deviceclear.TabIndex = 26; this.deviceclear.Text = "预约锁解除(&Z)"; this.deviceclear.UseVisualStyleBackColor = true; @@ -630,9 +679,9 @@ // // FrmDeviceStatus // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(525, 495); + this.ClientSize = new System.Drawing.Size(700, 619); this.Controls.Add(this.gb03); this.Controls.Add(this.deviceclear); this.Controls.Add(this.cB_Empty); @@ -649,6 +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.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmDeviceStatus"; diff --git a/ControlMonitorClient/wcfControlMonitorClient.csproj b/ControlMonitorClient/wcfControlMonitorClient.csproj index c5d9f0d..3c71c94 100644 --- a/ControlMonitorClient/wcfControlMonitorClient.csproj +++ b/ControlMonitorClient/wcfControlMonitorClient.csproj @@ -33,7 +33,7 @@ 智能物流调度系统WCS true pub.htm - 14 + 15 1.0.0.%2a false true diff --git a/WcfControlMonitorLib/CCallService.cs b/WcfControlMonitorLib/CCallService.cs index 6c0f062..e258f99 100644 --- a/WcfControlMonitorLib/CCallService.cs +++ b/WcfControlMonitorLib/CCallService.cs @@ -1550,7 +1550,8 @@ namespace WcfControlMonitorLib if (md.RunState.ToString()!= data[i]["F_AGVStatus"].ToString())//当前状态和数据库不一样，则下发数据 { SControlMonitor sControl = new SControlMonitor(); - sControl.WriteDBDataConveyor(Convert.ToInt32(dv[i]["F_DeviceIndex"]), "DB2", dv[i]["F_AGVStatus"].ToString(), out string errtext); + sControl.WriteDBDataConveyor(Convert.ToInt32(dv[i]["F_PLCOtherDevice"]), "DB2", dv[i]["F_AGVStatus"].ToString(), out string errtext); + CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "更改AGV信息对接站台状态", Convert.ToInt32(dv[i]["F_DeviceIndex"]).ToString(), dv[i]["F_AGVStatus"].ToString()+errtext); // } } diff --git a/WcfControlMonitorLib/CControl.cs b/WcfControlMonitorLib/CControl.cs index 9889474..a7cb44f 100644 --- a/WcfControlMonitorLib/CControl.cs +++ b/WcfControlMonitorLib/CControl.cs @@ -2140,11 +2140,12 @@ namespace WcfControlMonitorLib #region ɽʱѶɨ,ҪPLCASKһ lzm - if (CONTROLTASKTYPE == 2 && order == 3&&DeviceKind==1) { //3ͻ + if (CONTROLTASKTYPE == 2 && order == 3&&DeviceKind==1 && mti==1) { //3ͻ Ӱֶ DataView data = new DataView(); // var device = Model.CGetInfo.GetDeviceInfo(dcode); data = dbo.ExceSQL(string.Format("SELECT F_BarCode FROM T_Base_PLC_Ask WHERE F_BindingDevice={0})", DeviceIdx)).Tables[0].DefaultView;//ͼȡ if (data.Count > 0) + if (data.Count > 0) { if (data[0]["F_BarCode"].ToString() != BarCode.ToString())//ɨһظ { diff --git a/WcfControlMonitorLib/SControlMonitor.cs b/WcfControlMonitorLib/SControlMonitor.cs index 69bede3..49c5be6 100644 --- a/WcfControlMonitorLib/SControlMonitor.cs +++ b/WcfControlMonitorLib/SControlMonitor.cs @@ -5712,8 +5712,8 @@ namespace WcfControlMonitorLib Model.CGetInfo.SetDeviceMessage(devinfo); sss.Remove(0, sss.Length); sss.Append("**条码：").Append(bc).Append("**读标志" + devicestates[tempdb2addr + 0]).Append("**状态" + state).Append("**任务号" + taskindex) - .Append("**列坐标" + xc).Append("**层坐标" + yc).Append("**电池电量" + devinfo.Battery_Status); - CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "收到穿梭板状态", devidx.ToString(), sss.ToString()); + .Append("**列坐标" + xc).Append("**层坐标" + yc); + CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "收到堆垛机状态", devidx.ToString(), sss.ToString()); #region 20201019_C2厂房，上报穿梭板所在位置及是否可用 //sql.Remove(0, sql.Length); @@ -5796,33 +5796,44 @@ namespace WcfControlMonitorLib { task23.Append(",3叉任务号:").Append(taskindex3).Append(",3叉条码:").Append(GetBarcodeFromMonitorIndex(taskindex3)); } + #region AGV取放货的输送线状态实时跟新 PLC断开连接后，该值不会变更，可能存在BUG,需要加以限制 有货可取货 + if (devinfo.F_IsAGVIOStation == 1) + { + var signal = devinfo.SplitByte_0 == 1 ? true : false;//1有货，0无光电感应 取货，接货时 有无货状态要不一致 + var runstate = devinfo.RunState == 0 ? true : false; //无货空闲=1，有货空闲=2 + if (!signal && runstate) + {//空闲，无货 + sql.Remove(0, sql.Length); + sql.Append("update T_AGVIOStation set F_AGVIOStatus=1 where F_DeviceIndex=").Append(devinfo.DeviceIndex); + dbo.ExecuteSql(sql.ToString()); + } + else if (signal && runstate) + {//有货空闲 + sql.Remove(0, sql.Length); + sql.Append("update T_AGVIOStation set F_AGVIOStatus=2 where F_DeviceIndex=").Append(devinfo.DeviceIndex); + dbo.ExecuteSql(sql.ToString()); + } + else + { + sql.Remove(0, sql.Length); + sql.Append("update T_AGVIOStation set F_AGVIOStatus=0 where F_DeviceIndex=").Append(devinfo.DeviceIndex); + dbo.ExecuteSql(sql.ToString()); + } + } + #endregion sss.Remove(0, sss.Length); - sss.Append("**条码：").Append(bc).Append("**读标志" + devicestates[tempdb2addr + 0]).Append("**状态" + state).Append("**任务号:" + taskindex).Append(task23); CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "收到输送机机状态", devidx.ToString(), sss.ToString()); - } - //20170212 - if (state <= 0)//20140305|| taskindex <= 0 + + + + } + //20170212 + if (state <= 0)//20140305|| taskindex <= 0 { continue; } - #region AGV取放货的输送线状态实时跟新 PLC断开连接后，改值不会变更，可能存在BUG,需要加以限制 - if (devinfo.F_IsAGVIOStation == 1) { - var signal = devinfo.SplitByte_0 == 1 ? true : false;//1有货，0无光电感应 - var runstate = devinfo.RunState == 0 ? true : false; - if (!signal && runstate) - {//空闲，无货 - sql.Remove(0, sql.Length); - sql.Append("update T_AGVIOStation set F_AGVIOStatus=1 where F_DeviceIndex=").Append(devinfo.DeviceIndex); - dbo.ExecuteSql(sql.ToString()); - } - else { - sql.Remove(0, sql.Length); - sql.Append("update T_AGVIOStation set F_AGVIOStatus=0 where F_DeviceIndex=").Append(devinfo.DeviceIndex); - dbo.ExecuteSql(sql.ToString()); - } - } - #endregion + if ((taskindex2 > 0 || taskindex3 > 0) && (state == 2) && devinfo.IfCorrelDoubleFork == "1") { #region 根据电气报告三叉关联,配三叉 @@ -8273,7 +8284,7 @@ namespace WcfControlMonitorLib { Model.MDevice md = Model.CGetInfo.GetDeviceInfo(deviceIndex); - if (DBBlock == "DB1") + if (DBBlock == "DB2") { StringBuilder[] wv = { new StringBuilder("") }; StringBuilder[] wn = { new StringBuilder("") }; @@ -8284,7 +8295,6 @@ namespace WcfControlMonitorLib sdo = CommModeCreate.CreateSendDeviceOrder(deviceIndex); sdo.WriteDBData(wn, wv, md.S7Connection); CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "写入PLC的站台出入库状态:", deviceIndex.ToString(), md.S7Connection + ";" + DBBlock + ";" + (md.Dbw1Address + 22).ToString() + ";" + Wdata); - } return true; } @@ -8938,7 +8948,7 @@ namespace WcfControlMonitorLib Model.MDevice md = Model.CGetInfo.GetDeviceInfo(Convert.ToInt32(dv[i]["Device_Index"])); if (md.RunState.ToString() != dv[i]["INOut_Value"].ToString()) { - WriteDBDataConveyor(Convert.ToInt32(dv[i]["Device_Index"]),"DB1", dv[i]["INOut_Value"].ToString(), out string errtext); + WriteDBDataConveyor(Convert.ToInt32(dv[i]["Device_Index"]),"DB2", dv[i]["INOut_Value"].ToString(), out string errtext); if (errtext != null) { CommonClassLib.CCarryConvert.WriteDarkCasket("opcclient", "设备编号：" + Convert.ToInt32(dv[i]["Device_Index"]).ToString(), diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs index 034d5f8..b10a04c 100644 --- a/webapi/WindowsFormsApp1/APIChannel.cs +++ b/webapi/WindowsFormsApp1/APIChannel.cs @@ -22,6 +22,7 @@ using System.Collections; using System.Configuration; using System.Xml; using static WcfControlMonitorLib.CCallService; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace WindowsFormsApp1 { @@ -387,8 +388,17 @@ namespace WindowsFormsApp1 msg.taskId = wms_wcs.taskId; //msg.taskId = dataBackmsg[0]["F_TaskID"].ToString(); - msg.putStatus =Convert.ToInt32(dataBackmsg[0]["F_AGVIOStatus"]); + if (wms_wcs.pickput == 1)//AGV取货 AGV取货站台要显示有货空闲才能取货 + { + msg.putStatus = Convert.ToInt32(dataBackmsg[0]["F_AGVIOStatus"]) == 2 ? 1 : 0; + } + else { + msg.putStatus = Convert.ToInt32(dataBackmsg[0]["F_AGVIOStatus"]) == 1 ? 1 : 0; + } wcs_wms.data = msg; + sql.Clear(); + sql.Append("update T_AGVIOStation set F_AGVPutPickState = ").Append(wms_wcs.pickput).Append(" where F_DeviceIndex=").Append(wms_wcs.toStation); + dbo.ExceSQL(sql.ToString()); } else { wcs_wms.code = 1; @@ -440,12 +450,28 @@ namespace WindowsFormsApp1 if (dataBackmsg.Count > 0) { int status = 0;//1AGV运动中，2AGV已离开，或者动作完成 - if (wms_wcs.agvTaskStatus == 23 || wms_wcs.agvTaskStatus == 21 || wms_wcs.agvTaskStatus == 56) + if (wms_wcs.agvTaskStatus == 56) + { + status = 5; + } + else if (wms_wcs.agvTaskStatus == 20)//开始取货 + { + status = 1; + } + else if (wms_wcs.agvTaskStatus == 21 || wms_wcs.agvTaskStatus == 24)//取货完成,24已取到货 { status = 2; } + else if (wms_wcs.agvTaskStatus == 22)//开始放货 + { + status = 3; + } + else if (wms_wcs.agvTaskStatus == 23)//放货完成 + { + status = 4; + } else { - status = 1; + status = 0; } wcs_wms.code = 0; wcs_wms.msg = "";