From 081f2d8d356a2d25f81455552a941aeb027ce5a0 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Fri, 19 Jul 2024 13:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A5=E6=89=93=E6=8C=89?= =?UTF-8?q?=E9=92=AE,=E8=BE=93=E5=85=A5=E5=AF=86=E7=A0=81=E6=A1=86.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PunchAssemble/PunchAndWeld/BusinessHelper.cs | 48 +++++ PunchAssemble/PunchAndWeld/FrmDoorSill.cs | 29 +-- PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs | 7 +- PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs | 7 +- .../PunchAndWeld/FrmDoorSill_214_2.cs | 8 +- .../PunchAndWeld/FrmHybird.Designer.cs | 130 ++++++------- PunchAssemble/PunchAndWeld/FrmHybird.cs | 5 + PunchAssemble/PunchAndWeld/FrmHybridS.cs | 8 +- .../PunchAndWeld/FrmPassWord.Designer.cs | 38 ++-- PunchAssemble/PunchAndWeld/FrmPassWord.cs | 1 + .../PunchAndWeld/FrmPreNoPlan.Designer.cs | 51 +++-- PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs | 4 + PunchAssemble/PunchAndWeld/FrmProScreen.cs | 31 +-- .../FrmProScreenBumper.Designer.cs | 181 ++++++++++-------- .../PunchAndWeld/FrmProScreenBumper.cs | 5 + .../PunchAndWeld/FrmProScreenBumperS.cs | 7 +- PunchAssemble/PunchAndWeld/FrmProScreenS.cs | 31 +-- .../PunchAndWeld/FrmProScreen_WheelBrow.cs | 7 +- .../PunchAndWeld/PunchAndWeld.csproj | 1 + 19 files changed, 320 insertions(+), 279 deletions(-) create mode 100644 PunchAssemble/PunchAndWeld/BusinessHelper.cs diff --git a/PunchAssemble/PunchAndWeld/BusinessHelper.cs b/PunchAssemble/PunchAndWeld/BusinessHelper.cs new file mode 100644 index 0000000..3d2d4f5 --- /dev/null +++ b/PunchAssemble/PunchAndWeld/BusinessHelper.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace PunchAndWeld +{ + public class BusinessHelper + { + /// + /// 补打 + /// + /// + public static void SetRePrint(TextBox tb) + { + DialogResult result = MessageBox.Show("是否补打标签？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); + if (result == DialogResult.OK) + { + FrmPassWord pass = new FrmPassWord(); + pass.OkBtnClick += (arg1) => + { + if (!string.IsNullOrEmpty(arg1) && + arg1.ToLower() == ConfigurationManager.AppSettings["password"].ToLower()) + { + pass.Close(); + + tb.Text = ""; + tb.Visible = true; + tb.Focus(); + } + else + { + MessageBox.Show("密码错误,请重新输入！", "提示", MessageBoxButtons.OK); + return; + } + }; + pass.ShowDialog(); + tb.Focus(); + } + else + { + return; + } + } + } +} diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill.cs index e9540fe..88772b6 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill.cs @@ -547,34 +547,11 @@ namespace PunchAndWeld private void button3_Click(object sender, EventArgs e) { + BusinessHelper.SetRePrint(textBox4); + //textBox4.Visible = true; - DialogResult result = MessageBox.Show("是否补打标签？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); - if (result == DialogResult.OK) - { - FrmPassWord pass = new FrmPassWord(); - pass.OkBtnClick += (arg1) => - { - if (!string.IsNullOrEmpty(arg1) && - arg1.ToLower() == ConfigurationManager.AppSettings["password"].ToLower()) - { - pass.Close(); - textBox4.Visible = true; - } - else - { - MessageBox.Show("密码错误,请重新输入！", "提示", MessageBoxButtons.OK); - return; - } - }; - pass.ShowDialog(); - } - else - { - return; - } - } - + private void textBox4_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs b/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs index 922bb89..32f2eea 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs @@ -773,9 +773,10 @@ namespace PunchAndWeld /// private void button3_Click(object sender, EventArgs e) { - textBox4.Text = ""; - textBox4.Visible = true; - textBox4.Focus(); + BusinessHelper.SetRePrint(textBox4); + //textBox4.Text = ""; + //textBox4.Visible = true; + //textBox4.Focus(); } private void textBox4_KeyDown(object sender, KeyEventArgs e) diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs index 99c9120..a957a1c 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs @@ -965,9 +965,10 @@ namespace PunchAndWeld private void button3_Click(object sender, EventArgs e) { - textBox4.Text = ""; - textBox4.Visible = true; - textBox4.Focus(); + BusinessHelper.SetRePrint(textBox4); + //textBox4.Text = ""; + //textBox4.Visible = true; + //textBox4.Focus(); } private void textBox4_KeyDown(object sender, KeyEventArgs e) diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs index 4379a3b..9f69738 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs @@ -1047,9 +1047,11 @@ namespace PunchAndWeld private void button3_Click(object sender, EventArgs e) { - textBox4.Text = ""; - textBox4.Visible = true; - textBox4.Focus(); + BusinessHelper.SetRePrint(textBox4); + + //textBox4.Text = ""; + //textBox4.Visible = true; + //textBox4.Focus(); } private void textBox4_KeyDown(object sender, KeyEventArgs e) diff --git a/PunchAssemble/PunchAndWeld/FrmHybird.Designer.cs b/PunchAssemble/PunchAndWeld/FrmHybird.Designer.cs index f82bc29..9609d2b 100644 --- a/PunchAssemble/PunchAndWeld/FrmHybird.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmHybird.Designer.cs @@ -57,10 +57,10 @@ // this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.button7.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button7.Location = new System.Drawing.Point(1448, 968); - this.button7.Margin = new System.Windows.Forms.Padding(2); + this.button7.Location = new System.Drawing.Point(2655, 1694); + this.button7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(193, 75); + this.button7.Size = new System.Drawing.Size(354, 131); this.button7.TabIndex = 42; this.button7.Text = "计划完成"; this.button7.UseVisualStyleBackColor = false; @@ -71,10 +71,10 @@ this.label5.BackColor = System.Drawing.Color.Transparent; this.label5.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Location = new System.Drawing.Point(1418, 10); + this.label5.Location = new System.Drawing.Point(2600, 18); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(489, 40); + this.label5.Size = new System.Drawing.Size(897, 70); this.label5.TabIndex = 40; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -84,11 +84,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox3.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(780, 547); - this.textBox3.Margin = new System.Windows.Forms.Padding(2); + this.textBox3.Location = new System.Drawing.Point(1430, 957); + this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox3.Multiline = true; this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(453, 69); + this.textBox3.Size = new System.Drawing.Size(827, 118); this.textBox3.TabIndex = 39; this.textBox3.Visible = false; this.textBox3.DoubleClick += new System.EventHandler(this.textBox3_DoubleClick); @@ -100,11 +100,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(764, 533); - this.textBox2.Margin = new System.Windows.Forms.Padding(2); + this.textBox2.Location = new System.Drawing.Point(1401, 933); + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox2.Multiline = true; this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(453, 69); + this.textBox2.Size = new System.Drawing.Size(827, 118); this.textBox2.TabIndex = 38; this.textBox2.Visible = false; this.textBox2.DoubleClick += new System.EventHandler(this.textBox2_DoubleClick); @@ -120,11 +120,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox4.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox4.Location = new System.Drawing.Point(799, 562); - this.textBox4.Margin = new System.Windows.Forms.Padding(2); + this.textBox4.Location = new System.Drawing.Point(1465, 984); + this.textBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox4.Multiline = true; this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(453, 69); + this.textBox4.Size = new System.Drawing.Size(827, 118); this.textBox4.TabIndex = 41; this.textBox4.Visible = false; this.textBox4.DoubleClick += new System.EventHandler(this.textBox4_DoubleClick); @@ -134,10 +134,10 @@ // this.button6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.button6.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button6.Location = new System.Drawing.Point(1678, 869); - this.button6.Margin = new System.Windows.Forms.Padding(2); + this.button6.Location = new System.Drawing.Point(3076, 1521); + this.button6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(193, 75); + this.button6.Size = new System.Drawing.Size(354, 131); this.button6.TabIndex = 37; this.button6.Text = "计划查询"; this.button6.UseVisualStyleBackColor = false; @@ -151,10 +151,10 @@ this.label10.BackColor = System.Drawing.Color.Transparent; this.label10.Font = new System.Drawing.Font("微软雅黑", 150F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.label10.Location = new System.Drawing.Point(1413, 346); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(2591, 606); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(494, 323); + this.label10.Size = new System.Drawing.Size(906, 565); this.label10.TabIndex = 36; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -166,10 +166,10 @@ this.label9.BackColor = System.Drawing.Color.Transparent; this.label9.Font = new System.Drawing.Font("微软雅黑", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.ForeColor = System.Drawing.Color.White; - this.label9.Location = new System.Drawing.Point(1418, 66); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(2600, 116); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(489, 101); + this.label9.Size = new System.Drawing.Size(897, 177); this.label9.TabIndex = 35; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label9.Click += new System.EventHandler(this.label9_Click); @@ -182,10 +182,10 @@ this.label8.BackColor = System.Drawing.Color.Transparent; this.label8.Font = new System.Drawing.Font("微软雅黑", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(1418, 165); - this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Location = new System.Drawing.Point(2600, 289); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(489, 92); + this.label8.Size = new System.Drawing.Size(897, 161); this.label8.TabIndex = 34; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -197,10 +197,10 @@ this.label7.BackColor = System.Drawing.Color.Transparent; this.label7.Font = new System.Drawing.Font("微软雅黑", 160F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.label7.Location = new System.Drawing.Point(573, 744); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Location = new System.Drawing.Point(1051, 1302); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(827, 302); + this.label7.Size = new System.Drawing.Size(1516, 528); this.label7.TabIndex = 33; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -212,10 +212,10 @@ this.label6.BackColor = System.Drawing.Color.Transparent; this.label6.Font = new System.Drawing.Font("微软雅黑", 180F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.Blue; - this.label6.Location = new System.Drawing.Point(568, 304); - this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label6.Location = new System.Drawing.Point(1041, 532); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(832, 355); + this.label6.Size = new System.Drawing.Size(1525, 621); this.label6.TabIndex = 32; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -227,10 +227,10 @@ this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(60, 734); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(110, 1284); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(453, 79); + this.label4.Size = new System.Drawing.Size(831, 138); this.label4.TabIndex = 31; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -242,10 +242,10 @@ this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(103, 546); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(189, 956); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(380, 67); + this.label3.Size = new System.Drawing.Size(697, 117); this.label3.TabIndex = 30; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -257,10 +257,10 @@ this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(103, 346); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(189, 606); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(380, 68); + this.label2.Size = new System.Drawing.Size(697, 119); this.label2.TabIndex = 29; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -272,10 +272,10 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(103, 146); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(189, 256); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(380, 70); + this.label1.Size = new System.Drawing.Size(697, 122); this.label1.TabIndex = 28; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -285,11 +285,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(60, 940); - this.textBox1.Margin = new System.Windows.Forms.Padding(2); + this.textBox1.Location = new System.Drawing.Point(110, 1645); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(453, 69); + this.textBox1.Size = new System.Drawing.Size(827, 118); this.textBox1.TabIndex = 27; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -297,10 +297,10 @@ // this.button5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.button5.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button5.Location = new System.Drawing.Point(1678, 770); - this.button5.Margin = new System.Windows.Forms.Padding(2); + this.button5.Location = new System.Drawing.Point(3076, 1348); + this.button5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(193, 75); + this.button5.Size = new System.Drawing.Size(354, 131); this.button5.TabIndex = 26; this.button5.Text = "不良转合格"; this.button5.UseVisualStyleBackColor = false; @@ -310,10 +310,10 @@ // this.button4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.button4.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1448, 770); - this.button4.Margin = new System.Windows.Forms.Padding(2); + this.button4.Location = new System.Drawing.Point(2655, 1348); + this.button4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(193, 75); + this.button4.Size = new System.Drawing.Size(354, 131); this.button4.TabIndex = 25; this.button4.Text = "产品不良"; this.button4.UseVisualStyleBackColor = false; @@ -322,23 +322,24 @@ // button3 // this.button3.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1448, 869); - this.button3.Margin = new System.Windows.Forms.Padding(2); + this.button3.Location = new System.Drawing.Point(2655, 1521); + this.button3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(193, 75); + this.button3.Size = new System.Drawing.Size(354, 131); this.button3.TabIndex = 24; this.button3.Text = "补打标签"; this.button3.UseVisualStyleBackColor = true; this.button3.Visible = false; + this.button3.Click += new System.EventHandler(this.button3_Click); // // button2 // this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.button2.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1678, 671); - this.button2.Margin = new System.Windows.Forms.Padding(2); + this.button2.Location = new System.Drawing.Point(3076, 1174); + this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(193, 75); + this.button2.Size = new System.Drawing.Size(354, 131); this.button2.TabIndex = 23; this.button2.Text = "下一计划"; this.button2.UseVisualStyleBackColor = false; @@ -348,10 +349,10 @@ // this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); this.button1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(1448, 671); - this.button1.Margin = new System.Windows.Forms.Padding(2); + this.button1.Location = new System.Drawing.Point(2655, 1174); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(193, 75); + this.button1.Size = new System.Drawing.Size(354, 131); this.button1.TabIndex = 22; this.button1.Text = "上一计划"; this.button1.UseVisualStyleBackColor = false; @@ -359,10 +360,10 @@ // // FrmHybird // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = global::PunchAndWeld.Properties.Resources._20200428213144; - this.ClientSize = new System.Drawing.Size(1904, 1041); + this.ClientSize = new System.Drawing.Size(3491, 1822); this.Controls.Add(this.button7); this.Controls.Add(this.label5); this.Controls.Add(this.textBox3); @@ -385,6 +386,7 @@ this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmHybird"; this.Text = "FrmHybird-206"; this.Load += new System.EventHandler(this.FrmHybird_Load); diff --git a/PunchAssemble/PunchAndWeld/FrmHybird.cs b/PunchAssemble/PunchAndWeld/FrmHybird.cs index 9962d7a..5213ea9 100644 --- a/PunchAssemble/PunchAndWeld/FrmHybird.cs +++ b/PunchAssemble/PunchAndWeld/FrmHybird.cs @@ -563,6 +563,11 @@ namespace PunchAndWeld } } + private void button3_Click(object sender, EventArgs e) + { + + } + private void label9_Click(object sender, EventArgs e) { Environment.Exit(0); diff --git a/PunchAssemble/PunchAndWeld/FrmHybridS.cs b/PunchAssemble/PunchAndWeld/FrmHybridS.cs index b504041..7ce7ac1 100644 --- a/PunchAssemble/PunchAndWeld/FrmHybridS.cs +++ b/PunchAssemble/PunchAndWeld/FrmHybridS.cs @@ -1051,9 +1051,11 @@ namespace PunchAndWeld private void button3_Click(object sender, EventArgs e) { - textBox5.Text = ""; - textBox5.Visible = true; - textBox5.Focus(); + BusinessHelper.SetRePrint(textBox5); + + //textBox5.Text = ""; + //textBox5.Visible = true; + //textBox5.Focus(); } private void textBox5_DoubleClick(object sender, EventArgs e) diff --git a/PunchAssemble/PunchAndWeld/FrmPassWord.Designer.cs b/PunchAssemble/PunchAndWeld/FrmPassWord.Designer.cs index 9f96576..759146e 100644 --- a/PunchAssemble/PunchAndWeld/FrmPassWord.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmPassWord.Designer.cs @@ -37,19 +37,22 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(137, 86); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(206, 142); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.Size = new System.Drawing.Size(103, 34); this.label1.TabIndex = 7; - this.label1.Text = "密码"; + this.label1.Text = "密码:"; // // btnCancel // - this.btnCancel.Location = new System.Drawing.Point(307, 191); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2); + this.btnCancel.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancel.Location = new System.Drawing.Point(579, 303); + this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(56, 26); + this.btnCancel.Size = new System.Drawing.Size(188, 109); this.btnCancel.TabIndex = 6; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; @@ -57,10 +60,11 @@ // // btnOk // - this.btnOk.Location = new System.Drawing.Point(139, 191); - this.btnOk.Margin = new System.Windows.Forms.Padding(2); + this.btnOk.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnOk.Location = new System.Drawing.Point(232, 303); + this.btnOk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(56, 26); + this.btnOk.Size = new System.Drawing.Size(193, 109); this.btnOk.TabIndex = 5; this.btnOk.Text = "提交"; this.btnOk.UseVisualStyleBackColor = true; @@ -68,22 +72,26 @@ // // txtPass // - this.txtPass.Location = new System.Drawing.Point(178, 81); - this.txtPass.Margin = new System.Windows.Forms.Padding(2); + this.txtPass.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtPass.Location = new System.Drawing.Point(317, 139); + this.txtPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPass.Name = "txtPass"; this.txtPass.PasswordChar = '*'; - this.txtPass.Size = new System.Drawing.Size(176, 21); + this.txtPass.Size = new System.Drawing.Size(414, 45); this.txtPass.TabIndex = 4; // // FrmPassWord // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(538, 330); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(61)))), ((int)(((byte)(119)))), ((int)(((byte)(164))))); + this.ClientSize = new System.Drawing.Size(986, 578); this.Controls.Add(this.label1); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOk); this.Controls.Add(this.txtPass); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmPassWord"; this.Text = "输入密码"; this.ResumeLayout(false); diff --git a/PunchAssemble/PunchAndWeld/FrmPassWord.cs b/PunchAssemble/PunchAndWeld/FrmPassWord.cs index d110f55..58fa79b 100644 --- a/PunchAssemble/PunchAndWeld/FrmPassWord.cs +++ b/PunchAssemble/PunchAndWeld/FrmPassWord.cs @@ -16,6 +16,7 @@ namespace PunchAndWeld public FrmPassWord() { InitializeComponent(); + this.StartPosition = FormStartPosition.CenterParent; } private void btnOk_Click(object sender, EventArgs e) diff --git a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs index 14b208d..d2b22d3 100644 --- a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs @@ -56,10 +56,10 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(860, 230); - this.textBox2.Margin = new System.Windows.Forms.Padding(2); + this.textBox2.Location = new System.Drawing.Point(1577, 402); + this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(369, 39); + this.textBox2.Size = new System.Drawing.Size(673, 63); this.textBox2.TabIndex = 23; // // label2 @@ -67,9 +67,10 @@ this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 18F); this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(115)))), ((int)(((byte)(193))))); - this.label2.Location = new System.Drawing.Point(750, 219); + this.label2.Location = new System.Drawing.Point(1375, 383); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(139, 59); + this.label2.Size = new System.Drawing.Size(255, 103); this.label2.TabIndex = 22; this.label2.Text = "扫描零件"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -80,11 +81,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(389, 260); - this.textBox1.Margin = new System.Windows.Forms.Padding(2); + this.textBox1.Location = new System.Drawing.Point(713, 455); + this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(300, 84); + this.textBox1.Size = new System.Drawing.Size(547, 144); this.textBox1.TabIndex = 21; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -93,9 +94,10 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(39, 264); + this.label1.Location = new System.Drawing.Point(72, 462); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(298, 76); + this.label1.Size = new System.Drawing.Size(546, 133); this.label1.TabIndex = 20; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -108,9 +110,11 @@ this.listView2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.listView2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(115)))), ((int)(((byte)(193))))); this.listView2.GridLines = true; - this.listView2.Location = new System.Drawing.Point(33, 380); + this.listView2.HideSelection = false; + this.listView2.Location = new System.Drawing.Point(61, 665); + this.listView2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.listView2.Name = "listView2"; - this.listView2.Size = new System.Drawing.Size(655, 571); + this.listView2.Size = new System.Drawing.Size(1198, 996); this.listView2.TabIndex = 24; this.listView2.UseCompatibleStateImageBehavior = false; this.listView2.View = System.Windows.Forms.View.Details; @@ -137,9 +141,11 @@ this.listView1.FullRowSelect = true; this.listView1.GridLines = true; this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.listView1.Location = new System.Drawing.Point(756, 281); + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(1386, 492); + this.listView1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(473, 656); + this.listView1.Size = new System.Drawing.Size(864, 1145); this.listView1.TabIndex = 25; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; @@ -158,31 +164,33 @@ // this.button3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); this.button3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1019, 124); - this.button3.Margin = new System.Windows.Forms.Padding(2); + this.button3.Location = new System.Drawing.Point(1868, 217); + this.button3.Margin = new System.Windows.Forms.Padding(4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(210, 50); + this.button3.Size = new System.Drawing.Size(385, 88); this.button3.TabIndex = 26; this.button3.Text = "补打标签"; this.button3.UseVisualStyleBackColor = false; + this.button3.Click += new System.EventHandler(this.button3_Click); // // label9 // this.label9.BackColor = System.Drawing.Color.Transparent; this.label9.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.ForeColor = System.Drawing.Color.White; - this.label9.Location = new System.Drawing.Point(915, 7); + this.label9.Location = new System.Drawing.Point(1678, 12); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(338, 67); + this.label9.Size = new System.Drawing.Size(620, 117); this.label9.TabIndex = 27; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // FrmPreNoPlan // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); - this.ClientSize = new System.Drawing.Size(1264, 985); + this.ClientSize = new System.Drawing.Size(2317, 1724); this.Controls.Add(this.label9); this.Controls.Add(this.button3); this.Controls.Add(this.listView1); @@ -192,6 +200,7 @@ this.Controls.Add(this.textBox1); this.Controls.Add(this.label1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmPreNoPlan"; this.Text = "预装不下计划版本"; this.Load += new System.EventHandler(this.FrmPreNoPlan_Load); diff --git a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs index 6d25a92..b13b7c5 100644 --- a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs +++ b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs @@ -64,5 +64,9 @@ namespace PunchAndWeld } } + private void button3_Click(object sender, EventArgs e) + { + + } } } diff --git a/PunchAssemble/PunchAndWeld/FrmProScreen.cs b/PunchAssemble/PunchAndWeld/FrmProScreen.cs index 9f42abc..55dd8a1 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreen.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreen.cs @@ -816,33 +816,10 @@ namespace PunchAndWeld private void button3_Click(object sender, EventArgs e) { - DialogResult result = MessageBox.Show("是否补打标签？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); - if (result == DialogResult.OK) - { - FrmPassWord pass = new FrmPassWord(); - pass.OkBtnClick += (arg1) => - { - if (!string.IsNullOrEmpty(arg1) && - arg1.ToLower() == ConfigurationManager.AppSettings["password"].ToLower()) - { - pass.Close(); - textBox4.Text = ""; - textBox4.Visible = true; - textBox4.Focus(); - - } - else - { - MessageBox.Show("密码错误,请重新输入！", "提示", MessageBoxButtons.OK); - return; - } - }; - pass.ShowDialog(); - } - else - { - return; - } + BusinessHelper.SetRePrint(textBox4); + //textBox4.Text = ""; + //textBox4.Visible = true; + //textBox4.Focus(); } public void InsLog(string productID1, string productID2) diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenBumper.Designer.cs b/PunchAssemble/PunchAndWeld/FrmProScreenBumper.Designer.cs index c9949de..dbe37b8 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreenBumper.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreenBumper.Designer.cs @@ -70,9 +70,10 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(63, 152); + this.label1.Location = new System.Drawing.Point(116, 266); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(453, 67); + this.label1.Size = new System.Drawing.Size(831, 117); this.label1.TabIndex = 0; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -81,9 +82,10 @@ this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(63, 351); + this.label2.Location = new System.Drawing.Point(116, 614); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(453, 67); + this.label2.Size = new System.Drawing.Size(831, 117); this.label2.TabIndex = 1; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -92,9 +94,10 @@ this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(63, 551); + this.label3.Location = new System.Drawing.Point(116, 964); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(453, 67); + this.label3.Size = new System.Drawing.Size(831, 117); this.label3.TabIndex = 2; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -103,9 +106,10 @@ this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(63, 753); + this.label4.Location = new System.Drawing.Point(116, 1318); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(453, 67); + this.label4.Size = new System.Drawing.Size(831, 117); this.label4.TabIndex = 3; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -114,9 +118,10 @@ this.label6.BackColor = System.Drawing.Color.Transparent; this.label6.Font = new System.Drawing.Font("微软雅黑", 180F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.Blue; - this.label6.Location = new System.Drawing.Point(563, 301); + this.label6.Location = new System.Drawing.Point(1032, 527); + this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(831, 332); + this.label6.Size = new System.Drawing.Size(1524, 581); this.label6.TabIndex = 5; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -125,9 +130,10 @@ this.label7.BackColor = System.Drawing.Color.Transparent; this.label7.Font = new System.Drawing.Font("微软雅黑", 160F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.ForeColor = System.Drawing.Color.Lime; - this.label7.Location = new System.Drawing.Point(570, 744); + this.label7.Location = new System.Drawing.Point(1045, 1302); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(824, 288); + this.label7.Size = new System.Drawing.Size(1511, 504); this.label7.TabIndex = 6; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -136,9 +142,10 @@ this.label9.BackColor = System.Drawing.Color.Transparent; this.label9.Font = new System.Drawing.Font("微软雅黑", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.ForeColor = System.Drawing.Color.White; - this.label9.Location = new System.Drawing.Point(1430, 64); + this.label9.Location = new System.Drawing.Point(2622, 112); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(453, 67); + this.label9.Size = new System.Drawing.Size(831, 117); this.label9.TabIndex = 7; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label9.Click += new System.EventHandler(this.label9_Click); @@ -148,9 +155,10 @@ this.label8.BackColor = System.Drawing.Color.Transparent; this.label8.Font = new System.Drawing.Font("微软雅黑", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(1430, 185); + this.label8.Location = new System.Drawing.Point(2622, 324); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(453, 67); + this.label8.Size = new System.Drawing.Size(831, 117); this.label8.TabIndex = 8; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -159,9 +167,10 @@ this.label10.BackColor = System.Drawing.Color.Transparent; this.label10.Font = new System.Drawing.Font("微软雅黑", 150F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.ForeColor = System.Drawing.Color.Red; - this.label10.Location = new System.Drawing.Point(1423, 351); + this.label10.Location = new System.Drawing.Point(2609, 614); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(469, 304); + this.label10.Size = new System.Drawing.Size(860, 532); this.label10.TabIndex = 9; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -171,11 +180,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(63, 944); - this.textBox1.Margin = new System.Windows.Forms.Padding(2); + this.textBox1.Location = new System.Drawing.Point(116, 1652); + this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(453, 71); + this.textBox1.Size = new System.Drawing.Size(827, 121); this.textBox1.TabIndex = 10; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -189,11 +198,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox3.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(778, 549); - this.textBox3.Margin = new System.Windows.Forms.Padding(2); + this.textBox3.Location = new System.Drawing.Point(1426, 961); + this.textBox3.Margin = new System.Windows.Forms.Padding(4); this.textBox3.Multiline = true; this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(469, 108); + this.textBox3.Size = new System.Drawing.Size(857, 186); this.textBox3.TabIndex = 20; this.textBox3.Visible = false; this.textBox3.DoubleClick += new System.EventHandler(this.textBox3_DoubleClick); @@ -205,11 +214,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(762, 535); - this.textBox2.Margin = new System.Windows.Forms.Padding(2); + this.textBox2.Location = new System.Drawing.Point(1397, 936); + this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Multiline = true; this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(469, 108); + this.textBox2.Size = new System.Drawing.Size(857, 186); this.textBox2.TabIndex = 19; this.textBox2.Visible = false; this.textBox2.DoubleClick += new System.EventHandler(this.textBox2_DoubleClick); @@ -219,10 +228,10 @@ // this.button6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.button6.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button6.Location = new System.Drawing.Point(1759, 744); - this.button6.Margin = new System.Windows.Forms.Padding(2); + this.button6.Location = new System.Drawing.Point(3225, 1302); + this.button6.Margin = new System.Windows.Forms.Padding(4); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(154, 50); + this.button6.Size = new System.Drawing.Size(282, 88); this.button6.TabIndex = 26; this.button6.Text = "计划查询"; this.button6.UseVisualStyleBackColor = false; @@ -232,10 +241,10 @@ // this.button5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.button5.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button5.Location = new System.Drawing.Point(1572, 744); - this.button5.Margin = new System.Windows.Forms.Padding(2); + this.button5.Location = new System.Drawing.Point(2882, 1302); + this.button5.Margin = new System.Windows.Forms.Padding(4); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(180, 50); + this.button5.Size = new System.Drawing.Size(330, 88); this.button5.TabIndex = 25; this.button5.Text = "不良转合格"; this.button5.UseVisualStyleBackColor = false; @@ -245,10 +254,10 @@ // this.button4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.button4.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1411, 742); - this.button4.Margin = new System.Windows.Forms.Padding(2); + this.button4.Location = new System.Drawing.Point(2587, 1298); + this.button4.Margin = new System.Windows.Forms.Padding(4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(154, 50); + this.button4.Size = new System.Drawing.Size(282, 88); this.button4.TabIndex = 24; this.button4.Text = "产品不良"; this.button4.UseVisualStyleBackColor = false; @@ -257,22 +266,23 @@ // button3 // this.button3.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1759, 683); - this.button3.Margin = new System.Windows.Forms.Padding(2); + this.button3.Location = new System.Drawing.Point(3225, 1195); + this.button3.Margin = new System.Windows.Forms.Padding(4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(154, 50); + this.button3.Size = new System.Drawing.Size(282, 88); this.button3.TabIndex = 23; this.button3.Text = "补打标签"; this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); // // button2 // this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.button2.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1572, 683); - this.button2.Margin = new System.Windows.Forms.Padding(2); + this.button2.Location = new System.Drawing.Point(2882, 1195); + this.button2.Margin = new System.Windows.Forms.Padding(4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(180, 50); + this.button2.Size = new System.Drawing.Size(330, 88); this.button2.TabIndex = 22; this.button2.Text = "下一计划"; this.button2.UseVisualStyleBackColor = false; @@ -282,10 +292,10 @@ // this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); this.button1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(1411, 683); - this.button1.Margin = new System.Windows.Forms.Padding(2); + this.button1.Location = new System.Drawing.Point(2587, 1195); + this.button1.Margin = new System.Windows.Forms.Padding(4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(154, 50); + this.button1.Size = new System.Drawing.Size(282, 88); this.button1.TabIndex = 21; this.button1.Text = "上一计划"; this.button1.UseVisualStyleBackColor = false; @@ -294,46 +304,50 @@ // lbFinish // this.lbFinish.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbFinish.Location = new System.Drawing.Point(1572, 860); + this.lbFinish.Location = new System.Drawing.Point(2882, 1505); + this.lbFinish.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.lbFinish.Name = "lbFinish"; - this.lbFinish.Size = new System.Drawing.Size(341, 50); + this.lbFinish.Size = new System.Drawing.Size(625, 88); this.lbFinish.TabIndex = 34; this.lbFinish.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lbOK // this.lbOK.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbOK.Location = new System.Drawing.Point(1572, 919); + this.lbOK.Location = new System.Drawing.Point(2882, 1608); + this.lbOK.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.lbOK.Name = "lbOK"; - this.lbOK.Size = new System.Drawing.Size(341, 50); + this.lbOK.Size = new System.Drawing.Size(625, 88); this.lbOK.TabIndex = 33; this.lbOK.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lbmode // this.lbmode.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbmode.Location = new System.Drawing.Point(1572, 978); + this.lbmode.Location = new System.Drawing.Point(2882, 1712); + this.lbmode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.lbmode.Name = "lbmode"; - this.lbmode.Size = new System.Drawing.Size(341, 50); + this.lbmode.Size = new System.Drawing.Size(625, 88); this.lbmode.TabIndex = 32; this.lbmode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lbState // this.lbState.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbState.Location = new System.Drawing.Point(1572, 801); + this.lbState.Location = new System.Drawing.Point(2882, 1402); + this.lbState.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.lbState.Name = "lbState"; - this.lbState.Size = new System.Drawing.Size(341, 50); + this.lbState.Size = new System.Drawing.Size(625, 88); this.lbState.TabIndex = 31; this.lbState.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1411, 801); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label5.Location = new System.Drawing.Point(2587, 1402); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(154, 50); + this.label5.Size = new System.Drawing.Size(282, 88); this.label5.TabIndex = 28; this.label5.Text = "设备状态"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -341,10 +355,10 @@ // label11 // this.label11.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(1411, 860); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Location = new System.Drawing.Point(2587, 1505); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(154, 50); + this.label11.Size = new System.Drawing.Size(282, 88); this.label11.TabIndex = 27; this.label11.Text = "运行状态"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -352,10 +366,10 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(1411, 919); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(2587, 1608); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(154, 50); + this.label12.Size = new System.Drawing.Size(282, 88); this.label12.TabIndex = 29; this.label12.Text = "冲焊状态"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -363,10 +377,10 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(1411, 978); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Location = new System.Drawing.Point(2587, 1712); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(154, 50); + this.label13.Size = new System.Drawing.Size(282, 88); this.label13.TabIndex = 30; this.label13.Text = "设备模式"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -378,17 +392,19 @@ this.PanelRD.Controls.Add(this.txtBoxR); this.PanelRD.Controls.Add(this.lbBoxL); this.PanelRD.Controls.Add(this.txtBoxL); - this.PanelRD.Location = new System.Drawing.Point(716, 524); + this.PanelRD.Location = new System.Drawing.Point(1313, 917); + this.PanelRD.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.PanelRD.Name = "PanelRD"; - this.PanelRD.Size = new System.Drawing.Size(598, 114); + this.PanelRD.Size = new System.Drawing.Size(1096, 200); this.PanelRD.TabIndex = 35; // // button7 // this.button7.BackColor = System.Drawing.Color.LightCoral; - this.button7.Location = new System.Drawing.Point(497, 3); + this.button7.Location = new System.Drawing.Point(911, 5); + this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(94, 32); + this.button7.Size = new System.Drawing.Size(172, 56); this.button7.TabIndex = 13; this.button7.Text = "关闭"; this.button7.UseVisualStyleBackColor = false; @@ -397,47 +413,49 @@ // LbBoxR // this.LbBoxR.AutoSize = true; - this.LbBoxR.Location = new System.Drawing.Point(8, 87); - this.LbBoxR.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.LbBoxR.Location = new System.Drawing.Point(15, 152); + this.LbBoxR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.LbBoxR.Name = "LbBoxR"; - this.LbBoxR.Size = new System.Drawing.Size(89, 12); + this.LbBoxR.Size = new System.Drawing.Size(157, 21); this.LbBoxR.TabIndex = 12; this.LbBoxR.Text = "扫描右雷达支架"; // // txtBoxR // this.txtBoxR.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBoxR.Location = new System.Drawing.Point(116, 83); + this.txtBoxR.Location = new System.Drawing.Point(213, 145); + this.txtBoxR.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.txtBoxR.Name = "txtBoxR"; - this.txtBoxR.Size = new System.Drawing.Size(475, 23); + this.txtBoxR.Size = new System.Drawing.Size(868, 35); this.txtBoxR.TabIndex = 11; this.txtBoxR.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBoxR_KeyDown); // // lbBoxL // this.lbBoxL.AutoSize = true; - this.lbBoxL.Location = new System.Drawing.Point(8, 50); - this.lbBoxL.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lbBoxL.Location = new System.Drawing.Point(15, 88); + this.lbBoxL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbBoxL.Name = "lbBoxL"; - this.lbBoxL.Size = new System.Drawing.Size(89, 12); + this.lbBoxL.Size = new System.Drawing.Size(157, 21); this.lbBoxL.TabIndex = 10; this.lbBoxL.Text = "扫描左雷达支架"; // // txtBoxL // this.txtBoxL.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBoxL.Location = new System.Drawing.Point(116, 43); + this.txtBoxL.Location = new System.Drawing.Point(213, 75); + this.txtBoxL.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.txtBoxL.Name = "txtBoxL"; - this.txtBoxL.Size = new System.Drawing.Size(475, 23); + this.txtBoxL.Size = new System.Drawing.Size(868, 35); this.txtBoxL.TabIndex = 9; this.txtBoxL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBoxL_KeyDown); // // FrmProScreenBumper // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = global::PunchAndWeld.Properties.Resources._987654341; - this.ClientSize = new System.Drawing.Size(1920, 1080); + this.ClientSize = new System.Drawing.Size(3520, 1890); this.Controls.Add(this.PanelRD); this.Controls.Add(this.lbFinish); this.Controls.Add(this.lbOK); @@ -466,6 +484,7 @@ this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmProScreenBumper"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmProScreenBumper"; diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs b/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs index 1025236..6dc951b 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs @@ -679,6 +679,11 @@ namespace PunchAndWeld } } + private void button3_Click(object sender, EventArgs e) + { + + } + private void txtBoxR_KeyDown(object sender, KeyEventArgs e) { try diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs b/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs index 980f730..33ee595 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs @@ -1952,9 +1952,10 @@ namespace PunchAndWeld private void button3_Click(object sender, EventArgs e) { - textBox4.Text = ""; - textBox4.Visible = true; - textBox4.Focus(); + BusinessHelper.SetRePrint(textBox4); + //textBox4.Text = ""; + //textBox4.Visible = true; + //textBox4.Focus(); } private void textBox4_KeyDown(object sender, KeyEventArgs e) diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenS.cs b/PunchAssemble/PunchAndWeld/FrmProScreenS.cs index 5be69f3..cbbb68a 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreenS.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreenS.cs @@ -1018,34 +1018,11 @@ namespace PunchAndWeld private void button3_Click(object sender, EventArgs e) { - DialogResult result = MessageBox.Show("是否补打标签？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); - if (result == DialogResult.OK) - { - FrmPassWord pass = new FrmPassWord(); - pass.OkBtnClick += (arg1) => - { - if (!string.IsNullOrEmpty(arg1) && - arg1.ToLower() == ConfigurationManager.AppSettings["password"].ToLower()) - { - pass.Close(); - textBox4.Text = ""; - textBox4.Visible = true; - textBox4.Focus(); - } - else - { - MessageBox.Show("密码错误,请重新输入！", "提示", MessageBoxButtons.OK); - return; - } - }; - pass.ShowDialog(); - } - else - { - return; - } + BusinessHelper.SetRePrint(textBox4); + //textBox4.Text = ""; + //textBox4.Visible = true; + //textBox4.Focus(); - } private void textBox4_KeyDown(object sender, KeyEventArgs e) diff --git a/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs b/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs index cf9d3f3..e890533 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs @@ -468,9 +468,10 @@ namespace PunchAndWeld /// private void button3_Click(object sender, EventArgs e) { - textBox4.Text = ""; - textBox4.Visible = true; - textBox4.Focus(); + BusinessHelper.SetRePrint(textBox4); + // textBox4.Text = ""; + // textBox4.Visible = true; + // textBox4.Focus(); } private void textBox4_KeyDown(object sender, KeyEventArgs e) diff --git a/PunchAssemble/PunchAndWeld/PunchAndWeld.csproj b/PunchAssemble/PunchAndWeld/PunchAndWeld.csproj index 4662afc..ad5e5f0 100644 --- a/PunchAssemble/PunchAndWeld/PunchAndWeld.csproj +++ b/PunchAssemble/PunchAndWeld/PunchAndWeld.csproj @@ -73,6 +73,7 @@ + Form