From 6248cfebf8aa3d39863843201512fa64aa4e2cae Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Fri, 23 Feb 2024 11:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=99=E4=BB=93=E5=A2=9E=E5=8A=A0=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs | 7 + Rs.SkyLine/SysConfig/StockControl.Designer.cs | 152 +++++++++++++++--- Rs.SkyLine/SysConfig/StockControl.cs | 10 ++ 3 files changed, 147 insertions(+), 22 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs index f3473fc..2747367 100644 --- a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs @@ -434,6 +434,13 @@ namespace Rs.AutoDischarge.V3.Flow return true; } + + public void Reset() + { + isRunning = false; + loadStep = EStockTrayLoadFlowStep.料仓缺料盘检测; + unloadStep = EStockTrayUnloadFlowStep.料仓满料检测; + } /// /// 等待搬运任务完成 /// diff --git a/Rs.SkyLine/SysConfig/StockControl.Designer.cs b/Rs.SkyLine/SysConfig/StockControl.Designer.cs index 0108e5a..a15b1b7 100644 --- a/Rs.SkyLine/SysConfig/StockControl.Designer.cs +++ b/Rs.SkyLine/SysConfig/StockControl.Designer.cs @@ -68,6 +68,12 @@ this.btnFromInput = new System.Windows.Forms.RadioButton(); this.btnFromNg = new System.Windows.Forms.RadioButton(); this.btnFromEmpty1 = new System.Windows.Forms.RadioButton(); + this.button13 = new System.Windows.Forms.Button(); + this.button14 = new System.Windows.Forms.Button(); + this.button15 = new System.Windows.Forms.Button(); + this.button16 = new System.Windows.Forms.Button(); + this.button17 = new System.Windows.Forms.Button(); + this.button18 = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -82,12 +88,13 @@ // groupBox1 // this.groupBox1.Controls.Add(this.cboxBackEmpty1); + this.groupBox1.Controls.Add(this.button13); this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.btnMove); this.groupBox1.ForeColor = System.Drawing.Color.White; this.groupBox1.Location = new System.Drawing.Point(26, 25); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(154, 105); + this.groupBox1.Size = new System.Drawing.Size(160, 140); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Empty1"; @@ -95,7 +102,7 @@ // cboxBackEmpty1 // this.cboxBackEmpty1.AutoSize = true; - this.cboxBackEmpty1.Location = new System.Drawing.Point(6, 40); + this.cboxBackEmpty1.Location = new System.Drawing.Point(6, 65); this.cboxBackEmpty1.Name = "cboxBackEmpty1"; this.cboxBackEmpty1.Size = new System.Drawing.Size(48, 16); this.cboxBackEmpty1.TabIndex = 8; @@ -135,12 +142,13 @@ // groupBox2 // this.groupBox2.Controls.Add(this.cboxBackInput); + this.groupBox2.Controls.Add(this.button14); this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button2); this.groupBox2.ForeColor = System.Drawing.Color.White; this.groupBox2.Location = new System.Drawing.Point(212, 25); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(154, 105); + this.groupBox2.Size = new System.Drawing.Size(160, 140); this.groupBox2.TabIndex = 0; this.groupBox2.TabStop = false; this.groupBox2.Text = "Input"; @@ -148,7 +156,7 @@ // cboxBackInput // this.cboxBackInput.AutoSize = true; - this.cboxBackInput.Location = new System.Drawing.Point(6, 40); + this.cboxBackInput.Location = new System.Drawing.Point(6, 64); this.cboxBackInput.Name = "cboxBackInput"; this.cboxBackInput.Size = new System.Drawing.Size(48, 16); this.cboxBackInput.TabIndex = 8; @@ -161,7 +169,7 @@ this.button3.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button3.ForeColor = System.Drawing.Color.White; - this.button3.Location = new System.Drawing.Point(53, 60); + this.button3.Location = new System.Drawing.Point(57, 60); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(90, 24); this.button3.TabIndex = 7; @@ -176,7 +184,7 @@ this.button2.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button2.ForeColor = System.Drawing.Color.White; - this.button2.Location = new System.Drawing.Point(53, 20); + this.button2.Location = new System.Drawing.Point(57, 20); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(90, 24); this.button2.TabIndex = 7; @@ -188,12 +196,13 @@ // groupBox3 // this.groupBox3.Controls.Add(this.cboxBackOk); + this.groupBox3.Controls.Add(this.button15); this.groupBox3.Controls.Add(this.button5); this.groupBox3.Controls.Add(this.button4); this.groupBox3.ForeColor = System.Drawing.Color.White; this.groupBox3.Location = new System.Drawing.Point(405, 25); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(154, 105); + this.groupBox3.Size = new System.Drawing.Size(160, 140); this.groupBox3.TabIndex = 0; this.groupBox3.TabStop = false; this.groupBox3.Text = "Ok"; @@ -201,7 +210,7 @@ // cboxBackOk // this.cboxBackOk.AutoSize = true; - this.cboxBackOk.Location = new System.Drawing.Point(6, 40); + this.cboxBackOk.Location = new System.Drawing.Point(6, 64); this.cboxBackOk.Name = "cboxBackOk"; this.cboxBackOk.Size = new System.Drawing.Size(48, 16); this.cboxBackOk.TabIndex = 8; @@ -241,12 +250,13 @@ // groupBox4 // this.groupBox4.Controls.Add(this.cboxBackNg); + this.groupBox4.Controls.Add(this.button16); this.groupBox4.Controls.Add(this.button7); this.groupBox4.Controls.Add(this.button6); this.groupBox4.ForeColor = System.Drawing.Color.White; this.groupBox4.Location = new System.Drawing.Point(593, 25); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(154, 105); + this.groupBox4.Size = new System.Drawing.Size(160, 140); this.groupBox4.TabIndex = 0; this.groupBox4.TabStop = false; this.groupBox4.Text = "Ng"; @@ -254,7 +264,7 @@ // cboxBackNg // this.cboxBackNg.AutoSize = true; - this.cboxBackNg.Location = new System.Drawing.Point(6, 40); + this.cboxBackNg.Location = new System.Drawing.Point(6, 64); this.cboxBackNg.Name = "cboxBackNg"; this.cboxBackNg.Size = new System.Drawing.Size(48, 16); this.cboxBackNg.TabIndex = 8; @@ -267,7 +277,7 @@ this.button7.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button7.ForeColor = System.Drawing.Color.White; - this.button7.Location = new System.Drawing.Point(50, 60); + this.button7.Location = new System.Drawing.Point(56, 60); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(90, 24); this.button7.TabIndex = 7; @@ -282,7 +292,7 @@ this.button6.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button6.ForeColor = System.Drawing.Color.White; - this.button6.Location = new System.Drawing.Point(50, 20); + this.button6.Location = new System.Drawing.Point(56, 20); this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(90, 24); this.button6.TabIndex = 7; @@ -294,12 +304,13 @@ // groupBox5 // this.groupBox5.Controls.Add(this.cboxBackMulti); + this.groupBox5.Controls.Add(this.button17); this.groupBox5.Controls.Add(this.button9); this.groupBox5.Controls.Add(this.button8); this.groupBox5.ForeColor = System.Drawing.Color.White; this.groupBox5.Location = new System.Drawing.Point(779, 25); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(154, 105); + this.groupBox5.Size = new System.Drawing.Size(160, 140); this.groupBox5.TabIndex = 0; this.groupBox5.TabStop = false; this.groupBox5.Text = "Multi"; @@ -307,7 +318,7 @@ // cboxBackMulti // this.cboxBackMulti.AutoSize = true; - this.cboxBackMulti.Location = new System.Drawing.Point(6, 40); + this.cboxBackMulti.Location = new System.Drawing.Point(6, 64); this.cboxBackMulti.Name = "cboxBackMulti"; this.cboxBackMulti.Size = new System.Drawing.Size(48, 16); this.cboxBackMulti.TabIndex = 8; @@ -320,7 +331,7 @@ this.button9.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button9.ForeColor = System.Drawing.Color.White; - this.button9.Location = new System.Drawing.Point(51, 60); + this.button9.Location = new System.Drawing.Point(57, 60); this.button9.Name = "button9"; this.button9.Size = new System.Drawing.Size(90, 24); this.button9.TabIndex = 7; @@ -335,7 +346,7 @@ this.button8.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button8.ForeColor = System.Drawing.Color.White; - this.button8.Location = new System.Drawing.Point(51, 20); + this.button8.Location = new System.Drawing.Point(57, 20); this.button8.Name = "button8"; this.button8.Size = new System.Drawing.Size(90, 24); this.button8.TabIndex = 7; @@ -347,12 +358,13 @@ // groupBox6 // this.groupBox6.Controls.Add(this.cboxBackEmpty2); + this.groupBox6.Controls.Add(this.button18); this.groupBox6.Controls.Add(this.button11); this.groupBox6.Controls.Add(this.button10); this.groupBox6.ForeColor = System.Drawing.Color.White; this.groupBox6.Location = new System.Drawing.Point(972, 25); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(154, 105); + this.groupBox6.Size = new System.Drawing.Size(160, 140); this.groupBox6.TabIndex = 0; this.groupBox6.TabStop = false; this.groupBox6.Text = "Empty2"; @@ -360,7 +372,7 @@ // cboxBackEmpty2 // this.cboxBackEmpty2.AutoSize = true; - this.cboxBackEmpty2.Location = new System.Drawing.Point(6, 40); + this.cboxBackEmpty2.Location = new System.Drawing.Point(6, 64); this.cboxBackEmpty2.Name = "cboxBackEmpty2"; this.cboxBackEmpty2.Size = new System.Drawing.Size(48, 16); this.cboxBackEmpty2.TabIndex = 8; @@ -373,7 +385,7 @@ this.button11.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button11.ForeColor = System.Drawing.Color.White; - this.button11.Location = new System.Drawing.Point(53, 60); + this.button11.Location = new System.Drawing.Point(59, 60); this.button11.Name = "button11"; this.button11.Size = new System.Drawing.Size(90, 24); this.button11.TabIndex = 7; @@ -388,7 +400,7 @@ this.button10.FlatAppearance.BorderColor = System.Drawing.Color.White; this.button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button10.ForeColor = System.Drawing.Color.White; - this.button10.Location = new System.Drawing.Point(53, 20); + this.button10.Location = new System.Drawing.Point(59, 20); this.button10.Name = "button10"; this.button10.Size = new System.Drawing.Size(90, 24); this.button10.TabIndex = 7; @@ -403,7 +415,7 @@ this.groupBox7.Controls.Add(this.gboxTo); this.groupBox7.Controls.Add(this.gboxFrom); this.groupBox7.ForeColor = System.Drawing.Color.White; - this.groupBox7.Location = new System.Drawing.Point(26, 172); + this.groupBox7.Location = new System.Drawing.Point(26, 289); this.groupBox7.Name = "groupBox7"; this.groupBox7.Size = new System.Drawing.Size(451, 205); this.groupBox7.TabIndex = 0; @@ -581,11 +593,101 @@ this.btnFromEmpty1.Text = "Empty1"; this.btnFromEmpty1.UseVisualStyleBackColor = true; // + // button13 + // + this.button13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.button13.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button13.ForeColor = System.Drawing.Color.White; + this.button13.Location = new System.Drawing.Point(58, 100); + this.button13.Name = "button13"; + this.button13.Size = new System.Drawing.Size(90, 24); + this.button13.TabIndex = 7; + this.button13.Tag = "Empty1"; + this.button13.Text = "初始化"; + this.button13.UseVisualStyleBackColor = false; + this.button13.Click += new System.EventHandler(this.OnbtnInitClick); + // + // button14 + // + this.button14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.button14.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button14.ForeColor = System.Drawing.Color.White; + this.button14.Location = new System.Drawing.Point(57, 100); + this.button14.Name = "button14"; + this.button14.Size = new System.Drawing.Size(90, 24); + this.button14.TabIndex = 7; + this.button14.Tag = "Input"; + this.button14.Text = "初始化"; + this.button14.UseVisualStyleBackColor = false; + this.button14.Click += new System.EventHandler(this.OnbtnInitClick); + // + // button15 + // + this.button15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.button15.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button15.ForeColor = System.Drawing.Color.White; + this.button15.Location = new System.Drawing.Point(54, 100); + this.button15.Name = "button15"; + this.button15.Size = new System.Drawing.Size(90, 24); + this.button15.TabIndex = 7; + this.button15.Tag = "Ok"; + this.button15.Text = "初始化"; + this.button15.UseVisualStyleBackColor = false; + this.button15.Click += new System.EventHandler(this.OnbtnInitClick); + // + // button16 + // + this.button16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.button16.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button16.ForeColor = System.Drawing.Color.White; + this.button16.Location = new System.Drawing.Point(56, 100); + this.button16.Name = "button16"; + this.button16.Size = new System.Drawing.Size(90, 24); + this.button16.TabIndex = 7; + this.button16.Tag = "Ng"; + this.button16.Text = "初始化"; + this.button16.UseVisualStyleBackColor = false; + this.button16.Click += new System.EventHandler(this.OnbtnInitClick); + // + // button17 + // + this.button17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.button17.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button17.ForeColor = System.Drawing.Color.White; + this.button17.Location = new System.Drawing.Point(57, 100); + this.button17.Name = "button17"; + this.button17.Size = new System.Drawing.Size(90, 24); + this.button17.TabIndex = 7; + this.button17.Tag = "Multi"; + this.button17.Text = "初始化"; + this.button17.UseVisualStyleBackColor = false; + this.button17.Click += new System.EventHandler(this.OnbtnInitClick); + // + // button18 + // + this.button18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.button18.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button18.ForeColor = System.Drawing.Color.White; + this.button18.Location = new System.Drawing.Point(59, 100); + this.button18.Name = "button18"; + this.button18.Size = new System.Drawing.Size(90, 24); + this.button18.TabIndex = 7; + this.button18.Tag = "Empty2"; + this.button18.Text = "初始化"; + this.button18.UseVisualStyleBackColor = false; + this.button18.Click += new System.EventHandler(this.OnbtnInitClick); + // // StockControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1201, 796); + this.ClientSize = new System.Drawing.Size(1369, 796); this.Controls.Add(this.groupBox6); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox5); @@ -658,5 +760,11 @@ private System.Windows.Forms.CheckBox cboxBackNg; private System.Windows.Forms.CheckBox cboxBackMulti; private System.Windows.Forms.CheckBox cboxBackEmpty2; + private System.Windows.Forms.Button button13; + private System.Windows.Forms.Button button14; + private System.Windows.Forms.Button button15; + private System.Windows.Forms.Button button16; + private System.Windows.Forms.Button button17; + private System.Windows.Forms.Button button18; } } \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/StockControl.cs b/Rs.SkyLine/SysConfig/StockControl.cs index a832f99..7f2553e 100644 --- a/Rs.SkyLine/SysConfig/StockControl.cs +++ b/Rs.SkyLine/SysConfig/StockControl.cs @@ -145,6 +145,16 @@ namespace Rs.MotionPlat.SysConfig return back; } + protected void OnbtnInitClick(object sender, EventArgs e) + { + Button btn = (Button)sender; + string trayName = btn.Tag.ToString(); + bool ok = Enum.TryParse(trayName, out ETrayType result); + if (ok) + { + StockManager.Instance.GetStock(result).Reset(); + } + } protected void btnMovetrayClick(object sender, EventArgs e) { RadioButton rbtnFrom = null;