From a1b3331ed09364e68323ba8ff683f0ef60af9049 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Mon, 4 Aug 2025 11:08:15 +0800 Subject: [PATCH] 111 --- FacOneZPStation/FrmZP.Designer.cs | 166 +++++----- InjectionPC/FrmMain2411.Designer.cs | 396 ++++++++++++------------ PaintingPC/FrmQuality.Designer.cs | 54 ++-- PaintingPC/FrmQuality.cs | 246 +++++++++------ PaintingPC/Function.cs | 14 +- PunchingMistake/FrmAssemble.Designer.cs | 325 ++++++++++--------- PunchingMistake/FrmAssemble.cs | 2 +- PunchingMistake/FrmLogin.cs | 14 +- PunchingMistake/FrmQualityNew.cs | 132 ++++---- PunchingMistake/FrmQualityNew1.cs | 10 +- PunchingMistake/Function2.cs | 184 ++++++++++- PunchingMistake/Function3.cs | 2 +- PunchingMistake/Program.cs | 2 + 13 files changed, 893 insertions(+), 654 deletions(-) diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs index 06c2c67..64bc74b 100644 --- a/FacOneZPStation/FrmZP.Designer.cs +++ b/FacOneZPStation/FrmZP.Designer.cs @@ -76,7 +76,7 @@ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 807F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 744F)); this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0); this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1); this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1); @@ -85,14 +85,14 @@ this.tableLayoutPanel3.Controls.Add(this.button2, 1, 1); this.tableLayoutPanel3.Controls.Add(this.button7, 3, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(7, 1400); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1224); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(2546, 423); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(2335, 371); this.tableLayoutPanel3.TabIndex = 3; // // button6 @@ -101,10 +101,10 @@ this.button6.Dock = System.Windows.Forms.DockStyle.Fill; this.button6.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button6.ForeColor = System.Drawing.Color.Black; - this.button6.Location = new System.Drawing.Point(1751, 14); - this.button6.Margin = new System.Windows.Forms.Padding(14); + this.button6.Location = new System.Drawing.Point(1602, 12); + this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(781, 183); + this.button6.Size = new System.Drawing.Size(720, 161); this.button6.TabIndex = 7; this.button6.Text = "手动打印箱单"; this.button6.UseVisualStyleBackColor = false; @@ -115,10 +115,10 @@ this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button1.Dock = System.Windows.Forms.DockStyle.Fill; this.button1.Font = new System.Drawing.Font("黑体", 16F); - this.button1.Location = new System.Drawing.Point(7, 217); - this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button1.Location = new System.Drawing.Point(6, 190); + this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(568, 200); + this.button1.Size = new System.Drawing.Size(521, 176); this.button1.TabIndex = 6; this.button1.Text = "打印标签"; this.button1.UseVisualStyleBackColor = false; @@ -130,10 +130,10 @@ this.button5.Dock = System.Windows.Forms.DockStyle.Fill; this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button5.ForeColor = System.Drawing.Color.Black; - this.button5.Location = new System.Drawing.Point(1180, 225); - this.button5.Margin = new System.Windows.Forms.Padding(14); + this.button5.Location = new System.Drawing.Point(1080, 197); + this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(543, 184); + this.button5.Size = new System.Drawing.Size(496, 162); this.button5.TabIndex = 5; this.button5.Text = "不合格"; this.button5.UseVisualStyleBackColor = false; @@ -144,10 +144,10 @@ this.button4.BackColor = System.Drawing.Color.RoyalBlue; this.button4.Dock = System.Windows.Forms.DockStyle.Fill; this.button4.Font = new System.Drawing.Font("黑体", 16F); - this.button4.Location = new System.Drawing.Point(589, 6); - this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button4.Location = new System.Drawing.Point(539, 5); + this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(570, 199); + this.button4.Size = new System.Drawing.Size(522, 175); this.button4.TabIndex = 4; this.button4.Text = "下一计划"; this.button4.UseVisualStyleBackColor = false; @@ -158,10 +158,10 @@ this.button3.BackColor = System.Drawing.Color.Aqua; this.button3.Dock = System.Windows.Forms.DockStyle.Fill; this.button3.Font = new System.Drawing.Font("黑体", 16F); - this.button3.Location = new System.Drawing.Point(7, 6); - this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button3.Location = new System.Drawing.Point(6, 5); + this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(568, 199); + this.button3.Size = new System.Drawing.Size(521, 175); this.button3.TabIndex = 3; this.button3.Text = "上一计划"; this.button3.UseVisualStyleBackColor = false; @@ -173,10 +173,10 @@ this.button2.Dock = System.Windows.Forms.DockStyle.Fill; this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button2.ForeColor = System.Drawing.Color.Black; - this.button2.Location = new System.Drawing.Point(596, 225); - this.button2.Margin = new System.Windows.Forms.Padding(14); + this.button2.Location = new System.Drawing.Point(546, 197); + this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(556, 184); + this.button2.Size = new System.Drawing.Size(508, 162); this.button2.TabIndex = 2; this.button2.Text = "补打标签"; this.button2.UseVisualStyleBackColor = false; @@ -187,10 +187,10 @@ this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button7.Dock = System.Windows.Forms.DockStyle.Fill; this.button7.Font = new System.Drawing.Font("黑体", 16F); - this.button7.Location = new System.Drawing.Point(1744, 217); - this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button7.Location = new System.Drawing.Point(1595, 190); + this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(795, 200); + this.button7.Size = new System.Drawing.Size(734, 176); this.button7.TabIndex = 8; this.button7.Text = "补打箱单"; this.button7.UseVisualStyleBackColor = false; @@ -202,11 +202,11 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.ForeColor = System.Drawing.Color.White; - this.label7.Location = new System.Drawing.Point(1385, 3); + this.label7.Location = new System.Drawing.Point(1264, 3); this.label7.Margin = new System.Windows.Forms.Padding(2); this.label7.Name = "label7"; this.tableLayoutPanel4.SetRowSpan(this.label7, 2); - this.label7.Size = new System.Drawing.Size(272, 241); + this.label7.Size = new System.Drawing.Size(249, 210); this.label7.TabIndex = 32; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -214,10 +214,10 @@ // this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox2.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(399, 127); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox2.Location = new System.Drawing.Point(365, 111); + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(979, 87); + this.textBox2.Size = new System.Drawing.Size(892, 77); this.textBox2.TabIndex = 30; this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown); // @@ -226,10 +226,10 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(5, 122); + this.label3.Location = new System.Drawing.Point(5, 107); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(385, 124); + this.label3.Size = new System.Drawing.Size(351, 108); this.label3.TabIndex = 29; this.label3.Text = "扫描物料条码"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -239,10 +239,10 @@ this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labOrderNo.ForeColor = System.Drawing.Color.White; - this.labOrderNo.Location = new System.Drawing.Point(1662, 249); + this.labOrderNo.Location = new System.Drawing.Point(1518, 218); this.labOrderNo.Margin = new System.Windows.Forms.Padding(2); this.labOrderNo.Name = "labOrderNo"; - this.labOrderNo.Size = new System.Drawing.Size(887, 174); + this.labOrderNo.Size = new System.Drawing.Size(818, 151); this.labOrderNo.TabIndex = 28; this.labOrderNo.Text = "A64654646464"; this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -253,10 +253,10 @@ this.label4.Dock = System.Windows.Forms.DockStyle.Fill; this.label4.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(1385, 249); + this.label4.Location = new System.Drawing.Point(1264, 218); this.label4.Margin = new System.Windows.Forms.Padding(2); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(272, 174); + this.label4.Size = new System.Drawing.Size(249, 151); this.label4.TabIndex = 27; this.label4.Text = "计划编号"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -267,10 +267,10 @@ this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labStationNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labStationNo.ForeColor = System.Drawing.Color.White; - this.labStationNo.Location = new System.Drawing.Point(397, 249); + this.labStationNo.Location = new System.Drawing.Point(363, 218); this.labStationNo.Margin = new System.Windows.Forms.Padding(2); this.labStationNo.Name = "labStationNo"; - this.labStationNo.Size = new System.Drawing.Size(983, 174); + this.labStationNo.Size = new System.Drawing.Size(896, 151); this.labStationNo.TabIndex = 26; this.labStationNo.Text = "V253-MF-S后保下部延伸焊接"; this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -281,10 +281,10 @@ this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(3, 249); + this.label2.Location = new System.Drawing.Point(3, 218); this.label2.Margin = new System.Windows.Forms.Padding(2); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(389, 174); + this.label2.Size = new System.Drawing.Size(355, 151); this.label2.TabIndex = 25; this.label2.Text = "工位名称"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -294,10 +294,10 @@ this.labPName.Dock = System.Windows.Forms.DockStyle.Fill; this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labPName.ForeColor = System.Drawing.Color.White; - this.labPName.Location = new System.Drawing.Point(1662, 428); + this.labPName.Location = new System.Drawing.Point(1518, 374); this.labPName.Margin = new System.Windows.Forms.Padding(2); this.labPName.Name = "labPName"; - this.labPName.Size = new System.Drawing.Size(887, 284); + this.labPName.Size = new System.Drawing.Size(818, 248); this.labPName.TabIndex = 24; this.labPName.Text = "MF253 MF S后保"; this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -308,10 +308,10 @@ this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(1385, 428); + this.label8.Location = new System.Drawing.Point(1264, 374); this.label8.Margin = new System.Windows.Forms.Padding(2); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(272, 284); + this.label8.Size = new System.Drawing.Size(249, 248); this.label8.TabIndex = 23; this.label8.Text = "产品名称"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -322,10 +322,10 @@ this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labPartNo.Font = new System.Drawing.Font("黑体", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labPartNo.ForeColor = System.Drawing.Color.White; - this.labPartNo.Location = new System.Drawing.Point(397, 428); + this.labPartNo.Location = new System.Drawing.Point(363, 374); this.labPartNo.Margin = new System.Windows.Forms.Padding(2); this.labPartNo.Name = "labPartNo"; - this.labPartNo.Size = new System.Drawing.Size(983, 284); + this.labPartNo.Size = new System.Drawing.Size(896, 248); this.labPartNo.TabIndex = 22; this.labPartNo.Text = "A2530822665"; this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -341,10 +341,10 @@ this.label6.Dock = System.Windows.Forms.DockStyle.Fill; this.label6.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Location = new System.Drawing.Point(3, 428); + this.label6.Location = new System.Drawing.Point(3, 374); this.label6.Margin = new System.Windows.Forms.Padding(2); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(389, 284); + this.label6.Size = new System.Drawing.Size(355, 248); this.label6.TabIndex = 21; this.label6.Text = "产品代码"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -355,10 +355,10 @@ this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill; this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labBadCount.ForeColor = System.Drawing.Color.Lime; - this.labBadCount.Location = new System.Drawing.Point(1662, 717); + this.labBadCount.Location = new System.Drawing.Point(1518, 627); this.labBadCount.Margin = new System.Windows.Forms.Padding(2); this.labBadCount.Name = "labBadCount"; - this.labBadCount.Size = new System.Drawing.Size(887, 515); + this.labBadCount.Size = new System.Drawing.Size(818, 451); this.labBadCount.TabIndex = 20; this.labBadCount.Text = "0"; this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -369,10 +369,10 @@ this.labNum.Dock = System.Windows.Forms.DockStyle.Fill; this.labNum.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labNum.ForeColor = System.Drawing.Color.Lime; - this.labNum.Location = new System.Drawing.Point(397, 717); + this.labNum.Location = new System.Drawing.Point(363, 627); this.labNum.Margin = new System.Windows.Forms.Padding(2); this.labNum.Name = "labNum"; - this.labNum.Size = new System.Drawing.Size(983, 515); + this.labNum.Size = new System.Drawing.Size(896, 451); this.labNum.TabIndex = 18; this.labNum.Text = "152/210"; this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -383,10 +383,10 @@ this.label10.Dock = System.Windows.Forms.DockStyle.Fill; this.label10.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(3, 717); + this.label10.Location = new System.Drawing.Point(3, 627); this.label10.Margin = new System.Windows.Forms.Padding(2); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(389, 515); + this.label10.Size = new System.Drawing.Size(355, 451); this.label10.TabIndex = 17; this.label10.Text = "计划/完成数"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -399,7 +399,7 @@ this.label14.Location = new System.Drawing.Point(5, 1); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(385, 120); + this.label14.Size = new System.Drawing.Size(351, 105); this.label14.TabIndex = 12; this.label14.Text = "扫描本体条码"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -408,10 +408,10 @@ // this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox1.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(399, 6); - this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox1.Location = new System.Drawing.Point(365, 5); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(979, 87); + this.textBox1.Size = new System.Drawing.Size(892, 77); this.textBox1.TabIndex = 13; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -420,11 +420,11 @@ this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill; this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labErrMessage.ForeColor = System.Drawing.Color.Red; - this.labErrMessage.Location = new System.Drawing.Point(1664, 1); + this.labErrMessage.Location = new System.Drawing.Point(1520, 1); this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labErrMessage.Name = "labErrMessage"; this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2); - this.labErrMessage.Size = new System.Drawing.Size(883, 245); + this.labErrMessage.Size = new System.Drawing.Size(814, 214); this.labErrMessage.TabIndex = 16; this.labErrMessage.Text = "条码与产品不匹配，重新扫描"; this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -436,9 +436,9 @@ this.tableLayoutPanel4.ColumnCount = 4; this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.52292F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.47708F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 276F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 890F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 253F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 821F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F)); this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0); this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1); this.tableLayoutPanel4.Controls.Add(this.label3, 0, 1); @@ -458,17 +458,17 @@ this.tableLayoutPanel4.Controls.Add(this.textBox1, 1, 0); this.tableLayoutPanel4.Controls.Add(this.labErrMessage, 3, 0); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 154); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 134); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 5; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.8932F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17.47573F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40.52419F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 517F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1235); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 452F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 1081); this.tableLayoutPanel4.TabIndex = 2; // // label12 @@ -477,10 +477,10 @@ this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.ForeColor = System.Drawing.Color.White; - this.label12.Location = new System.Drawing.Point(1385, 717); + this.label12.Location = new System.Drawing.Point(1264, 627); this.label12.Margin = new System.Windows.Forms.Padding(2); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(272, 515); + this.label12.Size = new System.Drawing.Size(249, 451); this.label12.TabIndex = 19; this.label12.Text = "不合格数"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -490,10 +490,10 @@ this.labTime.BackColor = System.Drawing.Color.Transparent; this.labTime.Dock = System.Windows.Forms.DockStyle.Fill; this.labTime.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTime.Location = new System.Drawing.Point(1898, 0); + this.labTime.Location = new System.Drawing.Point(1737, 0); this.labTime.Margin = new System.Windows.Forms.Padding(0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(662, 149); + this.labTime.Size = new System.Drawing.Size(610, 130); this.labTime.TabIndex = 7; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -507,7 +507,7 @@ this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(343, 149); + this.pictureBox1.Size = new System.Drawing.Size(314, 130); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -517,10 +517,10 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(343, 0); + this.label1.Location = new System.Drawing.Point(314, 0); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1555, 149); + this.label1.Size = new System.Drawing.Size(1423, 130); this.label1.TabIndex = 1; this.label1.Text = "装配工位信息看板"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -531,7 +531,7 @@ this.tableLayoutPanel2.ColumnCount = 3; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 661F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 609F)); this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0); this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0); @@ -541,7 +541,7 @@ this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 149); + this.tableLayoutPanel2.Size = new System.Drawing.Size(2347, 130); this.tableLayoutPanel2.TabIndex = 0; // // tableLayoutPanel1 @@ -558,18 +558,18 @@ this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10.69692F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 89.30308F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1829); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 380F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1600); this.tableLayoutPanel1.TabIndex = 9; // // FrmZP // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2560, 1829); + this.ClientSize = new System.Drawing.Size(2347, 1600); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmZP"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmZP"; diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs index c5c1068..3461fbd 100644 --- a/InjectionPC/FrmMain2411.Designer.cs +++ b/InjectionPC/FrmMain2411.Designer.cs @@ -184,9 +184,9 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(5); + this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2560, 1829); + this.panel1.Size = new System.Drawing.Size(2347, 1600); this.panel1.TabIndex = 0; // // panel7 @@ -195,10 +195,10 @@ this.panel7.Controls.Add(this.panel8); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.panel7.Location = new System.Drawing.Point(0, 168); - this.panel7.Margin = new System.Windows.Forms.Padding(5); + this.panel7.Location = new System.Drawing.Point(0, 147); + this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2560, 1661); + this.panel7.Size = new System.Drawing.Size(2347, 1453); this.panel7.TabIndex = 1; // // panel23 @@ -206,10 +206,10 @@ this.panel23.Controls.Add(this.panel27); this.panel23.Controls.Add(this.panel24); this.panel23.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel23.Location = new System.Drawing.Point(0, 104); - this.panel23.Margin = new System.Windows.Forms.Padding(5); + this.panel23.Location = new System.Drawing.Point(0, 91); + this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(2560, 1557); + this.panel23.Size = new System.Drawing.Size(2347, 1362); this.panel23.TabIndex = 1; // // panel27 @@ -217,10 +217,10 @@ this.panel27.Controls.Add(this.panel29); this.panel27.Controls.Add(this.panel28); this.panel27.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel27.Location = new System.Drawing.Point(0, 1115); - this.panel27.Margin = new System.Windows.Forms.Padding(5); + this.panel27.Location = new System.Drawing.Point(0, 976); + this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(2560, 442); + this.panel27.Size = new System.Drawing.Size(2347, 386); this.panel27.TabIndex = 1; // // panel29 @@ -228,10 +228,10 @@ this.panel29.Controls.Add(this.panel31); this.panel29.Controls.Add(this.panel30); this.panel29.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel29.Location = new System.Drawing.Point(339, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(5); + this.panel29.Location = new System.Drawing.Point(311, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(2221, 442); + this.panel29.Size = new System.Drawing.Size(2036, 386); this.panel29.TabIndex = 1; // // panel31 @@ -239,10 +239,10 @@ this.panel31.Controls.Add(this.panel33); this.panel31.Controls.Add(this.panel32); this.panel31.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel31.Location = new System.Drawing.Point(133, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(5); + this.panel31.Location = new System.Drawing.Point(122, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(2088, 442); + this.panel31.Size = new System.Drawing.Size(1914, 386); this.panel31.TabIndex = 1; // // panel33 @@ -250,10 +250,10 @@ this.panel33.Controls.Add(this.panel35); this.panel33.Controls.Add(this.panel34); this.panel33.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel33.Location = new System.Drawing.Point(133, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(5); + this.panel33.Location = new System.Drawing.Point(122, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(1955, 442); + this.panel33.Size = new System.Drawing.Size(1792, 386); this.panel33.TabIndex = 1; // // panel35 @@ -261,9 +261,9 @@ this.panel35.Controls.Add(this.panel37); this.panel35.Dock = System.Windows.Forms.DockStyle.Fill; this.panel35.Location = new System.Drawing.Point(0, 0); - this.panel35.Margin = new System.Windows.Forms.Padding(5); + this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel35.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(1822, 442); + this.panel35.Size = new System.Drawing.Size(1670, 386); this.panel35.TabIndex = 1; // // panel37 @@ -271,9 +271,9 @@ this.panel37.Controls.Add(this.panel40); this.panel37.Dock = System.Windows.Forms.DockStyle.Fill; this.panel37.Location = new System.Drawing.Point(0, 0); - this.panel37.Margin = new System.Windows.Forms.Padding(5); + this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel37.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(1822, 442); + this.panel37.Size = new System.Drawing.Size(1670, 386); this.panel37.TabIndex = 1; // // panel40 @@ -282,9 +282,9 @@ this.panel40.Controls.Add(this.panel41); this.panel40.Dock = System.Windows.Forms.DockStyle.Fill; this.panel40.Location = new System.Drawing.Point(0, 0); - this.panel40.Margin = new System.Windows.Forms.Padding(5); + this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel40.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(1822, 442); + this.panel40.Size = new System.Drawing.Size(1670, 386); this.panel40.TabIndex = 1; // // panel42 @@ -293,9 +293,9 @@ this.panel42.Controls.Add(this.panel43); this.panel42.Dock = System.Windows.Forms.DockStyle.Fill; this.panel42.Location = new System.Drawing.Point(0, 0); - this.panel42.Margin = new System.Windows.Forms.Padding(5); + this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel42.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(1689, 442); + this.panel42.Size = new System.Drawing.Size(1548, 386); this.panel42.TabIndex = 1; // // panel39 @@ -312,19 +312,19 @@ this.panel39.Controls.Add(this.label21); this.panel39.Dock = System.Windows.Forms.DockStyle.Fill; this.panel39.Location = new System.Drawing.Point(0, 0); - this.panel39.Margin = new System.Windows.Forms.Padding(5); + this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel39.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(1556, 442); + this.panel39.Size = new System.Drawing.Size(1426, 386); this.panel39.TabIndex = 1; // // lbDevState // this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbDevState.Location = new System.Drawing.Point(607, 333); + this.lbDevState.Location = new System.Drawing.Point(556, 291); this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbDevState.Name = "lbDevState"; - this.lbDevState.Size = new System.Drawing.Size(378, 66); + this.lbDevState.Size = new System.Drawing.Size(347, 58); this.lbDevState.TabIndex = 16; this.lbDevState.Text = "设备已连接"; this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -333,20 +333,20 @@ // textBox2 // this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(240, 333); - this.textBox2.Margin = new System.Windows.Forms.Padding(5); + this.textBox2.Location = new System.Drawing.Point(220, 291); + this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(329, 74); + this.textBox2.Size = new System.Drawing.Size(302, 65); this.textBox2.TabIndex = 13; // // label18 // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(44, 347); + this.label18.Location = new System.Drawing.Point(40, 304); this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(202, 58); + this.label18.Size = new System.Drawing.Size(178, 51); this.label18.TabIndex = 12; this.label18.Text = "数量："; // @@ -354,10 +354,10 @@ // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(661, 203); + this.label19.Location = new System.Drawing.Point(606, 178); this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(265, 58); + this.label19.Size = new System.Drawing.Size(238, 51); this.label19.TabIndex = 11; this.label19.Text = "(yyMMdd)"; // @@ -365,20 +365,20 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(243, 197); - this.textBox1.Margin = new System.Windows.Forms.Padding(5); + this.textBox1.Location = new System.Drawing.Point(223, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(328, 74); + this.textBox1.Size = new System.Drawing.Size(301, 65); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(45, 213); + this.label20.Location = new System.Drawing.Point(41, 186); this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(202, 58); + this.label20.Size = new System.Drawing.Size(178, 51); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -387,10 +387,10 @@ this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(243, 72); - this.comboBox2.Margin = new System.Windows.Forms.Padding(5); + this.comboBox2.Location = new System.Drawing.Point(223, 63); + this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(928, 56); + this.comboBox2.Size = new System.Drawing.Size(851, 50); this.comboBox2.TabIndex = 8; this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); // @@ -398,10 +398,10 @@ // this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(45, 80); + this.label21.Location = new System.Drawing.Point(41, 70); this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(202, 58); + this.label21.Size = new System.Drawing.Size(178, 51); this.label21.TabIndex = 7; this.label21.Text = "产品："; // @@ -409,10 +409,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(1556, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(5); + this.panel43.Location = new System.Drawing.Point(1426, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(133, 442); + this.panel43.Size = new System.Drawing.Size(122, 386); this.panel43.TabIndex = 0; // // label23 @@ -423,7 +423,7 @@ this.label23.Location = new System.Drawing.Point(0, 0); this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(133, 442); + this.label23.Size = new System.Drawing.Size(122, 386); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -433,10 +433,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(1689, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(5); + this.panel41.Location = new System.Drawing.Point(1548, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(133, 442); + this.panel41.Size = new System.Drawing.Size(122, 386); this.panel41.TabIndex = 0; // // label22 @@ -447,7 +447,7 @@ this.label22.Location = new System.Drawing.Point(0, 0); this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(133, 442); + this.label22.Size = new System.Drawing.Size(122, 386); this.label22.TabIndex = 0; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -457,10 +457,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(1822, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(5); + this.panel34.Location = new System.Drawing.Point(1670, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(133, 442); + this.panel34.Size = new System.Drawing.Size(122, 386); this.panel34.TabIndex = 0; // // label15 @@ -471,7 +471,7 @@ this.label15.Location = new System.Drawing.Point(0, 0); this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(133, 442); + this.label15.Size = new System.Drawing.Size(122, 386); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -482,9 +482,9 @@ this.panel32.Controls.Add(this.label14); this.panel32.Dock = System.Windows.Forms.DockStyle.Left; this.panel32.Location = new System.Drawing.Point(0, 0); - this.panel32.Margin = new System.Windows.Forms.Padding(5); + this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel32.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(133, 442); + this.panel32.Size = new System.Drawing.Size(122, 386); this.panel32.TabIndex = 0; // // label14 @@ -495,7 +495,7 @@ this.label14.Location = new System.Drawing.Point(0, 0); this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(133, 442); + this.label14.Size = new System.Drawing.Size(122, 386); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -506,9 +506,9 @@ this.panel30.Controls.Add(this.label13); this.panel30.Dock = System.Windows.Forms.DockStyle.Left; this.panel30.Location = new System.Drawing.Point(0, 0); - this.panel30.Margin = new System.Windows.Forms.Padding(5); + this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel30.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(133, 442); + this.panel30.Size = new System.Drawing.Size(122, 386); this.panel30.TabIndex = 0; // // label13 @@ -519,7 +519,7 @@ this.label13.Location = new System.Drawing.Point(0, 0); this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(133, 442); + this.label13.Size = new System.Drawing.Size(122, 386); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -530,9 +530,9 @@ this.panel28.Controls.Add(this.label12); this.panel28.Dock = System.Windows.Forms.DockStyle.Left; this.panel28.Location = new System.Drawing.Point(0, 0); - this.panel28.Margin = new System.Windows.Forms.Padding(5); + this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel28.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(339, 442); + this.panel28.Size = new System.Drawing.Size(311, 386); this.panel28.TabIndex = 0; // // label12 @@ -544,7 +544,7 @@ this.label12.Location = new System.Drawing.Point(0, 0); this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(339, 442); + this.label12.Size = new System.Drawing.Size(311, 386); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -555,9 +555,9 @@ this.panel24.Controls.Add(this.panel25); this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); - this.panel24.Margin = new System.Windows.Forms.Padding(5); + this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(2560, 1115); + this.panel24.Size = new System.Drawing.Size(2347, 976); this.panel24.TabIndex = 0; // // panel26 @@ -566,10 +566,10 @@ this.panel26.Controls.Add(this.panel44); this.panel26.Controls.Add(this.glacialList1); this.panel26.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel26.Location = new System.Drawing.Point(415, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5); + this.panel26.Location = new System.Drawing.Point(380, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2145, 1115); + this.panel26.Size = new System.Drawing.Size(1967, 976); this.panel26.TabIndex = 1; // // panel45 @@ -579,19 +579,19 @@ this.panel45.Controls.Add(this.button4); this.panel45.Controls.Add(this.textBox4); this.panel45.Controls.Add(this.label25); - this.panel45.Location = new System.Drawing.Point(323, 677); - this.panel45.Margin = new System.Windows.Forms.Padding(5); + this.panel45.Location = new System.Drawing.Point(296, 592); + this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1397, 151); + this.panel45.Size = new System.Drawing.Size(1281, 132); this.panel45.TabIndex = 2; // // button3 // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1232, 43); - this.button3.Margin = new System.Windows.Forms.Padding(5); + this.button3.Location = new System.Drawing.Point(1129, 38); + this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(160, 59); + this.button3.Size = new System.Drawing.Size(147, 52); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -600,10 +600,10 @@ // button4 // this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1037, 43); - this.button4.Margin = new System.Windows.Forms.Padding(5); + this.button4.Location = new System.Drawing.Point(951, 38); + this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(160, 59); + this.button4.Size = new System.Drawing.Size(147, 52); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -612,20 +612,20 @@ // textBox4 // this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox4.Location = new System.Drawing.Point(336, 45); - this.textBox4.Margin = new System.Windows.Forms.Padding(5); + this.textBox4.Location = new System.Drawing.Point(308, 39); + this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(660, 55); + this.textBox4.Size = new System.Drawing.Size(605, 49); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(28, 53); + this.label25.Location = new System.Drawing.Point(26, 46); this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(319, 42); + this.label25.Size = new System.Drawing.Size(283, 37); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -637,19 +637,19 @@ this.panel44.Controls.Add(this.button1); this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); - this.panel44.Location = new System.Drawing.Point(360, 363); - this.panel44.Margin = new System.Windows.Forms.Padding(5); + this.panel44.Location = new System.Drawing.Point(330, 318); + this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1397, 151); + this.panel44.Size = new System.Drawing.Size(1281, 132); this.panel44.TabIndex = 1; // // button2 // this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1197, 43); - this.button2.Margin = new System.Windows.Forms.Padding(5); + this.button2.Location = new System.Drawing.Point(1097, 38); + this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(160, 59); + this.button2.Size = new System.Drawing.Size(147, 52); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -658,10 +658,10 @@ // button1 // this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(1027, 40); - this.button1.Margin = new System.Windows.Forms.Padding(5); + this.button1.Location = new System.Drawing.Point(941, 35); + this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(160, 59); + this.button1.Size = new System.Drawing.Size(147, 52); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -670,20 +670,20 @@ // textBox3 // this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(208, 43); - this.textBox3.Margin = new System.Windows.Forms.Padding(5); + this.textBox3.Location = new System.Drawing.Point(191, 38); + this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(737, 55); + this.textBox3.Size = new System.Drawing.Size(676, 49); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(27, 53); + this.label24.Location = new System.Drawing.Point(25, 46); this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(190, 42); + this.label24.Size = new System.Drawing.Size(169, 37); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -754,14 +754,14 @@ this.glacialList1.ItemHeight = 57; this.glacialList1.ItemWordWrap = false; this.glacialList1.Location = new System.Drawing.Point(0, 0); - this.glacialList1.Margin = new System.Windows.Forms.Padding(5); + this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2145, 1115); + this.glacialList1.Size = new System.Drawing.Size(1967, 976); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -774,9 +774,9 @@ this.panel25.Controls.Add(this.panel36); this.panel25.Dock = System.Windows.Forms.DockStyle.Left; this.panel25.Location = new System.Drawing.Point(0, 0); - this.panel25.Margin = new System.Windows.Forms.Padding(5); + this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(415, 1115); + this.panel25.Size = new System.Drawing.Size(380, 976); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -785,13 +785,13 @@ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -801,19 +801,19 @@ this.panel38.Controls.Add(this.label26); this.panel38.Controls.Add(this.label17); this.panel38.Controls.Add(this.label16); - this.panel38.Location = new System.Drawing.Point(5, 5); - this.panel38.Margin = new System.Windows.Forms.Padding(5); + this.panel38.Location = new System.Drawing.Point(5, 4); + this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(404, 641); + this.panel38.Size = new System.Drawing.Size(370, 561); this.panel38.TabIndex = 1; // // label27 // this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(-3, 195); + this.label27.Location = new System.Drawing.Point(-3, 171); this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(317, 83); + this.label27.Size = new System.Drawing.Size(291, 73); this.label27.TabIndex = 3; this.label27.Text = "9999"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -822,20 +822,20 @@ // this.label26.AutoSize = true; this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label26.Location = new System.Drawing.Point(0, 155); + this.label26.Location = new System.Drawing.Point(0, 136); this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(169, 37); + this.label26.Size = new System.Drawing.Size(151, 33); this.label26.TabIndex = 2; this.label26.Text = "完成数量"; // // label17 // this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(-3, 56); + this.label17.Location = new System.Drawing.Point(-3, 49); this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(317, 85); + this.label17.Size = new System.Drawing.Size(291, 74); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -844,10 +844,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(0, 11); + this.label16.Location = new System.Drawing.Point(0, 10); this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(169, 37); + this.label16.Size = new System.Drawing.Size(151, 33); this.label16.TabIndex = 0; this.label16.Text = "计划数量"; // @@ -856,9 +856,9 @@ this.panel36.Controls.Add(this.tableLayoutPanel1); this.panel36.Dock = System.Windows.Forms.DockStyle.Top; this.panel36.Location = new System.Drawing.Point(0, 0); - this.panel36.Margin = new System.Windows.Forms.Padding(5); + this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(415, 464); + this.panel36.Size = new System.Drawing.Size(380, 406); this.panel36.TabIndex = 0; // // tableLayoutPanel1 @@ -868,12 +868,12 @@ this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 464F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 406F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -884,7 +884,7 @@ this.label11.Location = new System.Drawing.Point(5, 0); this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(403, 464); + this.label11.Size = new System.Drawing.Size(370, 406); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -895,9 +895,9 @@ this.panel8.Controls.Add(this.panel9); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Margin = new System.Windows.Forms.Padding(5); + this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(2560, 104); + this.panel8.Size = new System.Drawing.Size(2347, 91); this.panel8.TabIndex = 0; // // panel10 @@ -905,10 +905,10 @@ this.panel10.Controls.Add(this.panel12); this.panel10.Controls.Add(this.panel11); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel10.Location = new System.Drawing.Point(415, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5); + this.panel10.Location = new System.Drawing.Point(380, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2145, 104); + this.panel10.Size = new System.Drawing.Size(1967, 91); this.panel10.TabIndex = 2; // // panel12 @@ -916,10 +916,10 @@ this.panel12.Controls.Add(this.panel16); this.panel12.Controls.Add(this.panel15); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel12.Location = new System.Drawing.Point(492, 0); - this.panel12.Margin = new System.Windows.Forms.Padding(5); + this.panel12.Location = new System.Drawing.Point(451, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1653, 104); + this.panel12.Size = new System.Drawing.Size(1516, 91); this.panel12.TabIndex = 1; // // panel16 @@ -927,10 +927,10 @@ this.panel16.Controls.Add(this.panel20); this.panel16.Controls.Add(this.panel19); this.panel16.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel16.Location = new System.Drawing.Point(509, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(5); + this.panel16.Location = new System.Drawing.Point(467, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1144, 104); + this.panel16.Size = new System.Drawing.Size(1049, 91); this.panel16.TabIndex = 1; // // panel20 @@ -938,10 +938,10 @@ this.panel20.Controls.Add(this.label10); this.panel20.Controls.Add(this.panel22); this.panel20.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel20.Location = new System.Drawing.Point(467, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(5); + this.panel20.Location = new System.Drawing.Point(428, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(677, 104); + this.panel20.Size = new System.Drawing.Size(621, 91); this.panel20.TabIndex = 1; // // label10 @@ -949,10 +949,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(372, 0); + this.label10.Location = new System.Drawing.Point(341, 0); this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(305, 104); + this.label10.Size = new System.Drawing.Size(280, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -963,9 +963,9 @@ this.panel22.Controls.Add(this.label9); this.panel22.Dock = System.Windows.Forms.DockStyle.Left; this.panel22.Location = new System.Drawing.Point(0, 0); - this.panel22.Margin = new System.Windows.Forms.Padding(5); + this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel22.Name = "panel22"; - this.panel22.Size = new System.Drawing.Size(372, 104); + this.panel22.Size = new System.Drawing.Size(341, 91); this.panel22.TabIndex = 0; // // label9 @@ -977,7 +977,7 @@ this.label9.Location = new System.Drawing.Point(0, 0); this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(372, 104); + this.label9.Size = new System.Drawing.Size(341, 91); this.label9.TabIndex = 0; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -989,9 +989,9 @@ this.panel19.Controls.Add(this.panel21); this.panel19.Dock = System.Windows.Forms.DockStyle.Left; this.panel19.Location = new System.Drawing.Point(0, 0); - this.panel19.Margin = new System.Windows.Forms.Padding(5); + this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel19.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(467, 104); + this.panel19.Size = new System.Drawing.Size(428, 91); this.panel19.TabIndex = 0; // // label8 @@ -999,10 +999,10 @@ this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label8.Location = new System.Drawing.Point(220, 0); + this.label8.Location = new System.Drawing.Point(202, 0); this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(247, 104); + this.label8.Size = new System.Drawing.Size(226, 91); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1012,9 +1012,9 @@ this.panel21.Controls.Add(this.label7); this.panel21.Dock = System.Windows.Forms.DockStyle.Left; this.panel21.Location = new System.Drawing.Point(0, 0); - this.panel21.Margin = new System.Windows.Forms.Padding(5); + this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(220, 104); + this.panel21.Size = new System.Drawing.Size(202, 91); this.panel21.TabIndex = 0; // // label7 @@ -1026,7 +1026,7 @@ this.label7.Location = new System.Drawing.Point(0, 0); this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(220, 104); + this.label7.Size = new System.Drawing.Size(202, 91); this.label7.TabIndex = 0; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1038,19 +1038,19 @@ this.panel15.Controls.Add(this.panel17); this.panel15.Dock = System.Windows.Forms.DockStyle.Left; this.panel15.Location = new System.Drawing.Point(0, 0); - this.panel15.Margin = new System.Windows.Forms.Padding(5); + this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(509, 104); + this.panel15.Size = new System.Drawing.Size(467, 91); this.panel15.TabIndex = 0; // // panel18 // this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(220, 0); - this.panel18.Margin = new System.Windows.Forms.Padding(5); + this.panel18.Location = new System.Drawing.Point(202, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(289, 104); + this.panel18.Size = new System.Drawing.Size(265, 91); this.panel18.TabIndex = 1; // // label6 @@ -1061,7 +1061,7 @@ this.label6.Location = new System.Drawing.Point(0, 0); this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(289, 104); + this.label6.Size = new System.Drawing.Size(265, 91); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1071,9 +1071,9 @@ this.panel17.Controls.Add(this.label5); this.panel17.Dock = System.Windows.Forms.DockStyle.Left; this.panel17.Location = new System.Drawing.Point(0, 0); - this.panel17.Margin = new System.Windows.Forms.Padding(5); + this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(220, 104); + this.panel17.Size = new System.Drawing.Size(202, 91); this.panel17.TabIndex = 0; // // label5 @@ -1085,7 +1085,7 @@ this.label5.Location = new System.Drawing.Point(0, 0); this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(220, 104); + this.label5.Size = new System.Drawing.Size(202, 91); this.label5.TabIndex = 0; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1097,19 +1097,19 @@ this.panel11.Controls.Add(this.panel13); this.panel11.Dock = System.Windows.Forms.DockStyle.Left; this.panel11.Location = new System.Drawing.Point(0, 0); - this.panel11.Margin = new System.Windows.Forms.Padding(5); + this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(492, 104); + this.panel11.Size = new System.Drawing.Size(451, 91); this.panel11.TabIndex = 0; // // panel14 // this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(220, 0); - this.panel14.Margin = new System.Windows.Forms.Padding(5); + this.panel14.Location = new System.Drawing.Point(202, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(272, 104); + this.panel14.Size = new System.Drawing.Size(249, 91); this.panel14.TabIndex = 1; // // comboBox1 @@ -1122,9 +1122,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(5); + this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(272, 93); + this.comboBox1.Size = new System.Drawing.Size(249, 83); this.comboBox1.TabIndex = 0; // // panel13 @@ -1132,9 +1132,9 @@ this.panel13.Controls.Add(this.label4); this.panel13.Dock = System.Windows.Forms.DockStyle.Left; this.panel13.Location = new System.Drawing.Point(0, 0); - this.panel13.Margin = new System.Windows.Forms.Padding(5); + this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(220, 104); + this.panel13.Size = new System.Drawing.Size(202, 91); this.panel13.TabIndex = 0; // // label4 @@ -1146,7 +1146,7 @@ this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(220, 104); + this.label4.Size = new System.Drawing.Size(202, 91); this.label4.TabIndex = 0; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1156,9 +1156,9 @@ this.panel9.Controls.Add(this.label3); this.panel9.Dock = System.Windows.Forms.DockStyle.Left; this.panel9.Location = new System.Drawing.Point(0, 0); - this.panel9.Margin = new System.Windows.Forms.Padding(5); + this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(415, 104); + this.panel9.Size = new System.Drawing.Size(380, 91); this.panel9.TabIndex = 0; // // label3 @@ -1170,7 +1170,7 @@ this.label3.Location = new System.Drawing.Point(0, 0); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(415, 104); + this.label3.Size = new System.Drawing.Size(380, 91); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1181,9 +1181,9 @@ this.panel2.Controls.Add(this.panel3); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(5); + this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2560, 168); + this.panel2.Size = new System.Drawing.Size(2347, 147); this.panel2.TabIndex = 0; // // panel4 @@ -1191,10 +1191,10 @@ this.panel4.Controls.Add(this.panel6); this.panel4.Controls.Add(this.panel5); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(339, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(5); + this.panel4.Location = new System.Drawing.Point(311, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2221, 168); + this.panel4.Size = new System.Drawing.Size(2036, 147); this.panel4.TabIndex = 1; // // panel6 @@ -1203,9 +1203,9 @@ this.panel6.Controls.Add(this.label1); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Margin = new System.Windows.Forms.Padding(5); + this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1837, 168); + this.panel6.Size = new System.Drawing.Size(1684, 147); this.panel6.TabIndex = 1; // // btnBarCodeWithBox @@ -1214,7 +1214,7 @@ this.btnBarCodeWithBox.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBarCodeWithBox.Location = new System.Drawing.Point(0, 1); this.btnBarCodeWithBox.Name = "btnBarCodeWithBox"; - this.btnBarCodeWithBox.Size = new System.Drawing.Size(237, 163); + this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143); this.btnBarCodeWithBox.TabIndex = 2; this.btnBarCodeWithBox.Text = "箱码模式"; this.btnBarCodeWithBox.UseVisualStyleBackColor = false; @@ -1228,7 +1228,7 @@ this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1837, 168); + this.label1.Size = new System.Drawing.Size(1684, 147); this.label1.TabIndex = 0; this.label1.Text = "注塑车间条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1237,10 +1237,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(1837, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(5); + this.panel5.Location = new System.Drawing.Point(1684, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(384, 168); + this.panel5.Size = new System.Drawing.Size(352, 147); this.panel5.TabIndex = 0; // // label2 @@ -1251,7 +1251,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(384, 168); + this.label2.Size = new System.Drawing.Size(352, 147); this.label2.TabIndex = 0; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1262,19 +1262,19 @@ this.panel3.Controls.Add(this.pictureBox1); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(5); + this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(339, 168); + this.panel3.Size = new System.Drawing.Size(311, 147); this.panel3.TabIndex = 0; // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(5, 5); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(5); + this.pictureBox1.Location = new System.Drawing.Point(5, 4); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(335, 159); + this.pictureBox1.Size = new System.Drawing.Size(307, 139); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1315,12 +1315,12 @@ // // FrmMain2411 // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2560, 1829); + this.ClientSize = new System.Drawing.Size(2347, 1600); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(5); + this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.Name = "FrmMain2411"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/PaintingPC/FrmQuality.Designer.cs b/PaintingPC/FrmQuality.Designer.cs index b8a9fa2..2efc2a1 100644 --- a/PaintingPC/FrmQuality.Designer.cs +++ b/PaintingPC/FrmQuality.Designer.cs @@ -55,6 +55,7 @@ this.panel1 = new System.Windows.Forms.Panel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panelAttchColor = new System.Windows.Forms.Panel(); + this.btnAllowChangeColor = new System.Windows.Forms.Button(); this.lbForeig = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.cboxAddColor = new System.Windows.Forms.ComboBox(); @@ -63,7 +64,7 @@ this.btnRepair = new System.Windows.Forms.Button(); this.btnAbt = new System.Windows.Forms.Button(); this.lableFP = new System.Windows.Forms.Label(); - this.btnAllowChangeColor = new System.Windows.Forms.Button(); + this.btnPointRepair = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panel1.SuspendLayout(); @@ -297,6 +298,17 @@ this.panelAttchColor.Size = new System.Drawing.Size(1829, 176); this.panelAttchColor.TabIndex = 0; // + // btnAllowChangeColor + // + this.btnAllowChangeColor.Location = new System.Drawing.Point(1658, 13); + this.btnAllowChangeColor.Name = "btnAllowChangeColor"; + this.btnAllowChangeColor.Size = new System.Drawing.Size(168, 81); + this.btnAllowChangeColor.TabIndex = 73; + this.btnAllowChangeColor.Text = "颜色变更"; + this.btnAllowChangeColor.UseVisualStyleBackColor = true; + this.btnAllowChangeColor.Visible = false; + this.btnAllowChangeColor.Click += new System.EventHandler(this.btnAllowChangeColor_Click); + // // lbForeig // this.lbForeig.AutoSize = true; @@ -327,7 +339,7 @@ this.cboxAddColor.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboxAddColor.FormattingEnabled = true; this.cboxAddColor.Location = new System.Drawing.Point(297, 18); - this.cboxAddColor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cboxAddColor.Margin = new System.Windows.Forms.Padding(4); this.cboxAddColor.Name = "cboxAddColor"; this.cboxAddColor.Size = new System.Drawing.Size(1248, 76); this.cboxAddColor.TabIndex = 0; @@ -337,9 +349,9 @@ // this.btnOk.BackColor = System.Drawing.Color.LawnGreen; this.btnOk.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOk.Location = new System.Drawing.Point(1852, 760); + this.btnOk.Location = new System.Drawing.Point(1852, 719); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(491, 197); + this.btnOk.Size = new System.Drawing.Size(491, 163); this.btnOk.TabIndex = 67; this.btnOk.Text = "合 格"; this.btnOk.UseVisualStyleBackColor = false; @@ -349,9 +361,9 @@ // this.btnNok.BackColor = System.Drawing.Color.Yellow; this.btnNok.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnNok.Location = new System.Drawing.Point(1852, 1626); + this.btnNok.Location = new System.Drawing.Point(1852, 1633); this.btnNok.Name = "btnNok"; - this.btnNok.Size = new System.Drawing.Size(491, 160); + this.btnNok.Size = new System.Drawing.Size(491, 153); this.btnNok.TabIndex = 68; this.btnNok.Text = "其 它"; this.btnNok.UseVisualStyleBackColor = false; @@ -361,9 +373,9 @@ // this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue; this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRepair.Location = new System.Drawing.Point(1848, 1039); + this.btnRepair.Location = new System.Drawing.Point(1852, 940); this.btnRepair.Name = "btnRepair"; - this.btnRepair.Size = new System.Drawing.Size(491, 197); + this.btnRepair.Size = new System.Drawing.Size(491, 168); this.btnRepair.TabIndex = 69; this.btnRepair.Text = "返 喷"; this.btnRepair.UseVisualStyleBackColor = false; @@ -373,9 +385,9 @@ // this.btnAbt.BackColor = System.Drawing.Color.OrangeRed; this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAbt.Location = new System.Drawing.Point(1848, 1339); + this.btnAbt.Location = new System.Drawing.Point(1852, 1173); this.btnAbt.Name = "btnAbt"; - this.btnAbt.Size = new System.Drawing.Size(491, 190); + this.btnAbt.Size = new System.Drawing.Size(491, 155); this.btnAbt.TabIndex = 70; this.btnAbt.Text = "报 废"; this.btnAbt.UseVisualStyleBackColor = false; @@ -394,22 +406,25 @@ this.lableFP.Tag = "存在返喷"; this.lableFP.Text = " "; // - // btnAllowChangeColor + // btnPointRepair // - this.btnAllowChangeColor.Location = new System.Drawing.Point(1658, 13); - this.btnAllowChangeColor.Name = "btnAllowChangeColor"; - this.btnAllowChangeColor.Size = new System.Drawing.Size(168, 81); - this.btnAllowChangeColor.TabIndex = 73; - this.btnAllowChangeColor.Text = "颜色变更"; - this.btnAllowChangeColor.UseVisualStyleBackColor = true; - this.btnAllowChangeColor.Visible = false; - this.btnAllowChangeColor.Click += new System.EventHandler(this.btnAllowChangeColor_Click); + this.btnPointRepair.BackColor = System.Drawing.Color.Black; + this.btnPointRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnPointRepair.ForeColor = System.Drawing.Color.White; + this.btnPointRepair.Location = new System.Drawing.Point(1852, 1405); + this.btnPointRepair.Name = "btnPointRepair"; + this.btnPointRepair.Size = new System.Drawing.Size(491, 160); + this.btnPointRepair.TabIndex = 72; + this.btnPointRepair.Text = "点 修"; + this.btnPointRepair.UseVisualStyleBackColor = false; + this.btnPointRepair.Click += new System.EventHandler(this.btnPointRepair_Click); // // FrmQuality // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(2351, 1789); + this.Controls.Add(this.btnPointRepair); this.Controls.Add(this.lableFP); this.Controls.Add(this.btnAbt); this.Controls.Add(this.btnRepair); @@ -479,5 +494,6 @@ private System.Windows.Forms.Label lableFP; private System.Windows.Forms.Label lbForeig; private System.Windows.Forms.Button btnAllowChangeColor; + private System.Windows.Forms.Button btnPointRepair; } } \ No newline at end of file diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index eee5c92..ed8db19 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -14,6 +14,7 @@ using System.Threading; using System.Windows.Forms; using MESClassLibrary.BLL.BasicInfo; using static System.Windows.Forms.AxHost; +using System.Diagnostics; namespace PaintingPC { @@ -41,6 +42,7 @@ namespace PaintingPC private bool _colorHandChanged = false; private bool _isSingleStation = false; private string _isTest = "false"; + private string _stationNo = string.Empty; public FrmQuality(bool isWmsQuality) { @@ -48,6 +50,7 @@ namespace PaintingPC //WindowState = FormWindowState.Normal; this.Size = new Size(1280, 1020); this._isWmsQuality = isWmsQuality; + _stationNo = ConfigurationManager.AppSettings["Station"].Trim(); _lineCode = ConfigurationManager.AppSettings["LineCode"].ToString(); if(_lineCode == "1") { @@ -67,6 +70,12 @@ namespace PaintingPC _stations = stationTable.AsEnumerable().Select(p => p.Field("StationNo")).ToList(); if(_stations.Count ==0 ) ShowHint("产线[" + _lineCodeSys + "]不存在关联工位,请先进行配置.", false); + + if(_stations.Contains(_stationNo) == false) + { + + } + } @@ -115,6 +124,7 @@ namespace PaintingPC if (_stationType == "下线点修补") { btnNok.Visible = false; + btnPointRepair.Visible = false; } // } } @@ -421,7 +431,8 @@ namespace PaintingPC } else { - + MessageBox.Show("配置文件LineCode未配置,无法区分上件接口数据源查询路径."); + return; } if (count == 0) @@ -487,7 +498,32 @@ namespace PaintingPC ClearTxtBarcode(); txtBarCode.TabIndex = 0; } - + + /// + /// 点修只能有一次 点修执行其它状态 缺陷原因为点修补.只能有一次 + /// + /// + /// + private void btnPointRepair_Click(object sender, EventArgs e) + { + + + try + { + if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) + { + MessageBox.Show("请先扫描数据,然后操作."); + return; + } + OtherSave("点修"); + } + catch (Exception ex) + { + ShowHint("执行点修判定发生异常,异常原因:" + ex.Message); + MessageBox.Show("执行点修判定发生异常,异常原因:" + ex.Message); + Clear(); + } + } /// /// 其它 /// @@ -502,95 +538,103 @@ namespace PaintingPC MessageBox.Show("请先扫描数据,然后操作."); return; } - - #region 返喷下线数据验证 - if (lableFP.Text.Contains("[返喷]")) + OtherSave("其它"); + } + catch(Exception ex) + { + ShowHint("执行其它判定发生异常,异常原因:" + ex.Message); + MessageBox.Show("执行其它判定发生异常,异常原因:" + ex.Message); + Clear(); + } + } + void OtherSave(string type) + { + #region 返喷下线数据验证 + if (lableFP.Text.Contains("[返喷]")) + { + string barcode = txtBarCode.Text.Trim(); + DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); + if (dtInspect != null && dtInspect.Rows.Count > 0) { - string barcode = txtBarCode.Text.Trim(); - DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); - if (dtInspect != null && dtInspect.Rows.Count > 0) + string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果 + string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色 + if (inspectResult.Contains("打磨")) { - string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果 - string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色 - if (inspectResult.Contains("打磨")) + string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间 + int count = 0; + string colorInfo = ""; + if (_lineCode == "2") { - string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间 - int count = 0; - string colorInfo = ""; - if (_lineCode == "2") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo); - } - else if (_lineCode == "1") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo); - - } - else - { + count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo); + } + else if (_lineCode == "1") + { + count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo); - } + } + else + { + MessageBox.Show("配置文件LineCode未配置,无法区分上件接口数据源查询路径."); + return; + } - if (count == 0) + if (count == 0) + { + MessageBox.Show("未发现返喷下线数据！，无法进行质量判定"); + return; + } + else + { + if (inspectColorInfo != colorInfo) { - MessageBox.Show("未发现返喷下线数据！，无法进行质量判定"); + btnOk.Enabled = false; + btnRepair.Enabled = false; + btnNok.Enabled = false; + + MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！"); return; } - else - { - if (inspectColorInfo != colorInfo) - { - btnOk.Enabled = false; - btnRepair.Enabled = false; - btnNok.Enabled = false; - MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！"); - return; - } - - } } } - } - #endregion - if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行[其它]判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; - ShowHint(""); - #region 必须选择缺陷位置与缺陷原因，否则无法保存 - if (CheckDefect() == false) return; - #endregion + } + #endregion - #region 判断产品是否有颜色 - string colorName = string.Empty; - string partName = string.Empty; - if (CheckColor(ref colorName, ref partName) == false) return; - #endregion + if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行[{type}]判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; + ShowHint(""); + #region 必须选择缺陷位置与缺陷原因，否则无法保存 + if (CheckDefect() == false) return; + #endregion + + #region 判断产品是否有颜色 + string colorName = string.Empty; + string partName = string.Empty; + if (CheckColor(ref colorName, ref partName) == false) return; + #endregion + if(type == "点修") + { int cs = Function.OtherTimes(txtBarCode.Text.Trim()); if (cs > 0) { - MessageBox.Show("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次."); - ShowHint("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次."); + MessageBox.Show("条码" + txtBarCode.Text.Trim() + $"已存在判定为{type}的记录，只允许判定1次."); + ShowHint("条码" + txtBarCode.Text.Trim() + $"已存在判定为{type}的记录，只允许判定1次."); Clear(); return; } - - bool rr = SaveBeforeVerify("其它"); - if (rr == false) - { - return; - } - SaveRst("其它", colorName, partName, 4); + reason = "点修补;" + reason; } - catch(Exception ex) + + + bool rr = SaveBeforeVerify("其它"); + if (rr == false) { - ShowHint("执行其它判定发生异常,异常原因:" + ex.Message); - MessageBox.Show("执行其它判定发生异常,异常原因:" + ex.Message); - Clear(); + return; } + SaveRst("其它", colorName, partName, 4); } - /// /// 返喷按钮 /// @@ -712,7 +756,8 @@ namespace PaintingPC } else { - + MessageBox.Show("配置文件LineCode未配置,无法区分上件接口数据源查询路径."); + return; } if (count == 0) @@ -792,7 +837,7 @@ namespace PaintingPC /// /// /// - /// 0-不合格;1-合格；9-返喷 8-其他 + /// 2-报废;1-合格；9-返喷 4-其它 void SaveRst(string state, string colorName, string partName,int isOK,string userName="") { if (string.IsNullOrEmpty(userName)) @@ -1128,6 +1173,7 @@ namespace PaintingPC { try { + btnOk.Enabled = true; btnRepair.Enabled = true; btnNok.Enabled = true; @@ -1136,6 +1182,8 @@ namespace PaintingPC lbForeig.Text = ""; ClearPage(); LoadPage(); + + } catch (Exception ex) { @@ -1158,7 +1206,7 @@ namespace PaintingPC { barcode = Function.TransToBarCodeOne(barcode); } - + #region 判断条码有效性 if (! Function.BarCodeValid(barcode)) @@ -1235,13 +1283,13 @@ namespace PaintingPC DataTable dt3 = Function.SearchDefectInfo(ConfigurationManager.AppSettings["Station"].Trim()); if (dt3 != null && dt3.Rows.Count > 0) { - if(_stationType != "下线点修补") - { - DataRow newRow = dt3.NewRow(); - newRow.ItemArray = dt3.Rows[0].ItemArray; - newRow["DefectName"] = "点修补"; - dt3.Rows.InsertAt(newRow, 0); - } + //if(_stationType != "下线点修补") + //{ + //DataRow newRow = dt3.NewRow(); + //newRow.ItemArray = dt3.Rows[0].ItemArray; + //newRow["DefectName"] = "点修补"; + //dt3.Rows.InsertAt(newRow, 0); + //} drow = Convert.ToInt32(Math.Ceiling((double)dt3.Rows.Count / dcol)); @@ -1269,13 +1317,13 @@ namespace PaintingPC dLb[i].BackColor = Color.Transparent; dLb[i].TextAlign = ContentAlignment.MiddleCenter; - if (dLb[i].Text.Contains("点修补")) - { - dLb[i].Font = new Font(dLb[i].Font.FontFamily, 36, FontStyle.Bold); - dLb[i].Size = new Size(170, 60); - dLb[i].ForeColor = Color.Red; - //dLb[i].BackColor = Color.Red; - } + //if (dLb[i].Text.Contains("点修补")) + //{ + // dLb[i].Font = new Font(dLb[i].Font.FontFamily, 36, FontStyle.Bold); + // dLb[i].Size = new Size(170, 60); + // dLb[i].ForeColor = Color.Red; + // //dLb[i].BackColor = Color.Red; + //} panel2.Controls.Add(dLb[i]); dLb[i].Click += new EventHandler(dLbRoom_Click); } @@ -1292,8 +1340,10 @@ namespace PaintingPC #endregion + + #region 加载图片 - + try { DataTable dt = Function.SearchInfoByBarCode(barcode); @@ -1361,11 +1411,15 @@ namespace PaintingPC } #endregion + + + //不是补打的条码，根据条码查询产品信息、检验信息，选中缺陷位置及原因 DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); if (dtInspect != null && dtInspect.Rows.Count > 0) { + cboxAddColor.Enabled = false; List list = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("打磨")).ToList(); string state = string.Empty; @@ -1399,10 +1453,10 @@ namespace PaintingPC position= dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置 reason= dtInspect.Rows[0]["reason"].ToString(); //原因 - if (_stationType == "下线点修补" && reason.Contains("点修补;")) - { - reason = reason.Replace("点修补;", ""); - } + //if (_stationType == "下线点修补" && reason.Contains("点修补;")) + //{ + // reason = reason.Replace("点修补;", ""); + //} paintId = dtInspect.Rows[0]["remark3"].ToString(); //原因 @@ -1413,6 +1467,7 @@ namespace PaintingPC MessageBox.Show(em); ShowHint(em, false); txtBarCode.Text = ""; + labProductInfo.Text = ""; txtBarCode.TabIndex = 0; txtBarCode.Select(); return; @@ -1446,10 +1501,12 @@ namespace PaintingPC labProPosition.Text = Function.GetFirstInsPosition2(dtInspect); #endregion + + } else { - + cboxAddColor.Enabled = true; #region 没有一检结果，查询老外数据库，取产品信息 if (_isWmsQuality == false &&(_isSingleStation==true || _stationType=="下线一检")) @@ -1468,7 +1525,9 @@ namespace PaintingPC } else { - foreignVal = Function.GetProductInfo2(barcode, ref paintError); + MessageBox.Show("配置文件LineCode未配置,无法区分上件接口数据源查询路径."); + return; + //foreignVal = Function.GetProductInfo2(barcode, ref paintError); } if (!string.IsNullOrEmpty(paintError)) { @@ -1487,7 +1546,7 @@ namespace PaintingPC labProductInfo.Text = info[0] + "，" + info[1]; paintId = info[2]; labProPosition.Tag = paintId; - labProductInfo.Tag = Function.GetSide(barcode, paintId); + labProductInfo.Tag = "A侧"; // Function.GetSide(barcode, paintId); labProPosition.Text = _stationType + " " + labProductInfo.Tag.ToString().Replace(';', ' '); if (info.Length == 4) { @@ -1506,9 +1565,11 @@ namespace PaintingPC #endregion - } + + } + txtBarCode.SelectAll(); } catch (Exception ex) @@ -1901,6 +1962,7 @@ namespace PaintingPC } } + private void txtBarCode_DoubleClick(object sender, EventArgs e) { txtBarCode.SelectAll(); diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs index a54a970..a28a7e0 100644 --- a/PaintingPC/Function.cs +++ b/PaintingPC/Function.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Configuration; using System.Data; +using System.Diagnostics; using System.Drawing; using System.IO; using System.Linq; @@ -1205,7 +1206,7 @@ namespace PaintingPC select count(0) from tb_InspectResult where barcode = '" + barcode + @"' - and inspectResult = '其它' + and inspectResult = '其它' and reason like '点修补%' "; object aa = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql, null); @@ -2089,7 +2090,8 @@ namespace PaintingPC } else { - + Stopwatch sw5 = new Stopwatch(); + sw5.Start(); #region 从WMS系统获得喷涂上件的颜色信息 string wmsSql = $"select TypeCode,WMSColor as paintcode from {tableName} where ProductBarcode='{barcode}'"; @@ -2106,7 +2108,8 @@ namespace PaintingPC { errorMsg = $"WmsDB 没有条码[{barcode}]对应的数据"; } - + sw5.Stop(); + LogHelper.WriteLog("单独读取wms接口占用的时间"+sw5.Elapsed); //if (!string.IsNullOrEmpty(typeCode) && paintCode.ToLower() != "na") //{ // string stockNo1 = barcode.Substring(0, 10); @@ -2135,6 +2138,8 @@ namespace PaintingPC //} //根据颜色代码查颜色 + Stopwatch sw6= new Stopwatch(); + sw6.Start(); if (!string.IsNullOrWhiteSpace(paintCode) && paintCode.ToLower() != "na") { //DataTable dt = new DataTable(); @@ -2187,6 +2192,9 @@ namespace PaintingPC #endregion colorInfo = colorInfo + "，" + productName + "，" + paintID; + + sw6.Stop(); + LogHelper.WriteLog("读取wms接口后其他处理时间:" + sw6.Elapsed); } res = colorInfo; diff --git a/PunchingMistake/FrmAssemble.Designer.cs b/PunchingMistake/FrmAssemble.Designer.cs index 7b0e5c6..af0ebdf 100644 --- a/PunchingMistake/FrmAssemble.Designer.cs +++ b/PunchingMistake/FrmAssemble.Designer.cs @@ -29,7 +29,6 @@ namespace PunchingMistake /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAssemble)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new System.Windows.Forms.Panel(); @@ -46,6 +45,7 @@ namespace PunchingMistake this.label13 = new System.Windows.Forms.Label(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.panel9 = new System.Windows.Forms.Panel(); + this.txtBarCode = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.panel8 = new System.Windows.Forms.Panel(); this.lbPartDesc = new System.Windows.Forms.Label(); @@ -99,10 +99,9 @@ namespace PunchingMistake this.label8 = new System.Windows.Forms.Label(); this.lbScrewL = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.showHintTimer = new System.Windows.Forms.Timer(this.components); - this.LoadScrewTimer = new System.Windows.Forms.Timer(this.components); - this.txtBarCode = new System.Windows.Forms.TextBox(); - this.txtBoxFocusTimer = new System.Windows.Forms.Timer(this.components); + this.showHintTimer = new System.Windows.Forms.Timer(); + this.LoadScrewTimer = new System.Windows.Forms.Timer(); + this.txtBoxFocusTimer = new System.Windows.Forms.Timer(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.panel12.SuspendLayout(); @@ -139,27 +138,27 @@ namespace PunchingMistake this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(2125, 1538); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1948, 1346); this.tableLayoutPanel1.TabIndex = 0; // // panel1 // this.panel1.BackColor = System.Drawing.Color.DarkCyan; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(575, 69); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 69, 3, 34); + this.panel1.Location = new System.Drawing.Point(527, 60); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 60, 3, 30); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1, 1435); + this.panel1.Size = new System.Drawing.Size(1, 1256); this.panel1.TabIndex = 0; // // panel2 // this.panel2.BackColor = System.Drawing.Color.DarkCyan; this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(1552, 69); - this.panel2.Margin = new System.Windows.Forms.Padding(3, 69, 3, 34); + this.panel2.Location = new System.Drawing.Point(1423, 60); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 60, 3, 30); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1, 1435); + this.panel2.Size = new System.Drawing.Size(1, 1256); this.panel2.TabIndex = 1; // // tableLayoutPanel2 @@ -171,23 +170,23 @@ namespace PunchingMistake this.tableLayoutPanel2.Controls.Add(this.panel12, 0, 1); this.tableLayoutPanel2.Controls.Add(this.panel13, 0, 3); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(577, 3); + this.tableLayoutPanel2.Location = new System.Drawing.Point(529, 3); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 4; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 126F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 2F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(969, 1532); + this.tableLayoutPanel2.Size = new System.Drawing.Size(888, 1340); this.tableLayoutPanel2.TabIndex = 2; // // panel3 // this.panel3.BackColor = System.Drawing.Color.DarkCyan; this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(3, 831); + this.panel3.Location = new System.Drawing.Point(3, 727); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(963, 1); + this.panel3.Size = new System.Drawing.Size(882, 1); this.panel3.TabIndex = 0; // // panel4 @@ -197,7 +196,7 @@ namespace PunchingMistake this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(3, 3); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(963, 120); + this.panel4.Size = new System.Drawing.Size(882, 104); this.panel4.TabIndex = 1; // // panel12 @@ -206,9 +205,9 @@ namespace PunchingMistake this.panel12.Controls.Add(this.lbPlanQty); this.panel12.Controls.Add(this.label12); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel12.Location = new System.Drawing.Point(3, 129); + this.panel12.Location = new System.Drawing.Point(3, 113); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(963, 696); + this.panel12.Size = new System.Drawing.Size(882, 608); this.panel12.TabIndex = 2; // // lbDisplay @@ -216,9 +215,9 @@ namespace PunchingMistake this.lbDisplay.AutoSize = true; this.lbDisplay.Font = new System.Drawing.Font("宋体", 108F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbDisplay.ForeColor = System.Drawing.Color.LimeGreen; - this.lbDisplay.Location = new System.Drawing.Point(309, 384); + this.lbDisplay.Location = new System.Drawing.Point(283, 336); this.lbDisplay.Name = "lbDisplay"; - this.lbDisplay.Size = new System.Drawing.Size(410, 289); + this.lbDisplay.Size = new System.Drawing.Size(357, 252); this.lbDisplay.TabIndex = 4; this.lbDisplay.Text = "OK"; this.lbDisplay.Visible = false; @@ -231,9 +230,9 @@ namespace PunchingMistake this.lbPlanQty.BackColor = System.Drawing.Color.Transparent; this.lbPlanQty.Font = new System.Drawing.Font("宋体", 128.1429F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbPlanQty.ForeColor = System.Drawing.Color.LightSeaGreen; - this.lbPlanQty.Location = new System.Drawing.Point(164, 223); + this.lbPlanQty.Location = new System.Drawing.Point(150, 195); this.lbPlanQty.Name = "lbPlanQty"; - this.lbPlanQty.Size = new System.Drawing.Size(656, 342); + this.lbPlanQty.Size = new System.Drawing.Size(575, 300); this.lbPlanQty.TabIndex = 3; this.lbPlanQty.Text = "150"; // @@ -243,9 +242,9 @@ namespace PunchingMistake this.label12.BackColor = System.Drawing.Color.Transparent; this.label12.Font = new System.Drawing.Font("宋体", 21.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.ForeColor = System.Drawing.Color.White; - this.label12.Location = new System.Drawing.Point(142, 22); + this.label12.Location = new System.Drawing.Point(130, 19); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(741, 59); + this.label12.Size = new System.Drawing.Size(642, 51); this.label12.TabIndex = 2; this.label12.Text = "计划数量/PlannedQuantity"; // @@ -254,9 +253,9 @@ namespace PunchingMistake this.panel13.Controls.Add(this.lbCompleteQty); this.panel13.Controls.Add(this.label13); this.panel13.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel13.Location = new System.Drawing.Point(3, 833); + this.panel13.Location = new System.Drawing.Point(3, 729); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(963, 696); + this.panel13.Size = new System.Drawing.Size(882, 608); this.panel13.TabIndex = 3; // // lbCompleteQty @@ -267,9 +266,9 @@ namespace PunchingMistake this.lbCompleteQty.BackColor = System.Drawing.Color.Transparent; this.lbCompleteQty.Font = new System.Drawing.Font("宋体", 128.1429F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbCompleteQty.ForeColor = System.Drawing.Color.LimeGreen; - this.lbCompleteQty.Location = new System.Drawing.Point(164, 205); + this.lbCompleteQty.Location = new System.Drawing.Point(150, 179); this.lbCompleteQty.Name = "lbCompleteQty"; - this.lbCompleteQty.Size = new System.Drawing.Size(656, 342); + this.lbCompleteQty.Size = new System.Drawing.Size(575, 300); this.lbCompleteQty.TabIndex = 4; this.lbCompleteQty.Text = "695"; // @@ -279,9 +278,9 @@ namespace PunchingMistake this.label13.BackColor = System.Drawing.Color.Transparent; this.label13.Font = new System.Drawing.Font("宋体", 21.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label13.ForeColor = System.Drawing.Color.White; - this.label13.Location = new System.Drawing.Point(152, 25); + this.label13.Location = new System.Drawing.Point(139, 22); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(771, 59); + this.label13.Size = new System.Drawing.Size(668, 51); this.label13.TabIndex = 3; this.label13.Text = "完成数量/FinishedQuantity"; // @@ -295,8 +294,8 @@ namespace PunchingMistake this.tableLayoutPanel3.Controls.Add(this.panel6, 0, 1); this.tableLayoutPanel3.Controls.Add(this.panel5, 0, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 57); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 57, 3, 3); + this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 50); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 50, 3, 3); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 5; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); @@ -304,7 +303,7 @@ namespace PunchingMistake this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(566, 1478); + this.tableLayoutPanel3.Size = new System.Drawing.Size(518, 1293); this.tableLayoutPanel3.TabIndex = 3; // // panel9 @@ -314,21 +313,30 @@ namespace PunchingMistake this.panel9.Controls.Add(this.txtBarCode); this.panel9.Controls.Add(this.label6); this.panel9.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel9.Location = new System.Drawing.Point(33, 1183); - this.panel9.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34); + this.panel9.Location = new System.Drawing.Point(30, 1035); + this.panel9.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(500, 261); + this.panel9.Size = new System.Drawing.Size(458, 228); this.panel9.TabIndex = 4; // + // txtBarCode + // + this.txtBarCode.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtBarCode.Location = new System.Drawing.Point(30, 125); + this.txtBarCode.Name = "txtBarCode"; + this.txtBarCode.Size = new System.Drawing.Size(390, 47); + this.txtBarCode.TabIndex = 6; + this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown); + // // label6 // this.label6.AutoSize = true; this.label6.BackColor = System.Drawing.Color.Transparent; this.label6.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.DarkCyan; - this.label6.Location = new System.Drawing.Point(25, 58); + this.label6.Location = new System.Drawing.Point(23, 51); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(291, 43); + this.label6.Size = new System.Drawing.Size(253, 37); this.label6.TabIndex = 4; this.label6.Text = "条码/BarCode"; // @@ -339,10 +347,10 @@ namespace PunchingMistake this.panel8.Controls.Add(this.lbPartDesc); this.panel8.Controls.Add(this.label5); this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel8.Location = new System.Drawing.Point(33, 888); - this.panel8.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34); + this.panel8.Location = new System.Drawing.Point(30, 777); + this.panel8.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(500, 258); + this.panel8.Size = new System.Drawing.Size(458, 225); this.panel8.TabIndex = 3; // // lbPartDesc @@ -351,9 +359,9 @@ namespace PunchingMistake this.lbPartDesc.BackColor = System.Drawing.Color.Transparent; this.lbPartDesc.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbPartDesc.ForeColor = System.Drawing.Color.White; - this.lbPartDesc.Location = new System.Drawing.Point(35, 131); + this.lbPartDesc.Location = new System.Drawing.Point(32, 115); this.lbPartDesc.Name = "lbPartDesc"; - this.lbPartDesc.Size = new System.Drawing.Size(367, 43); + this.lbPartDesc.Size = new System.Drawing.Size(317, 37); this.lbPartDesc.TabIndex = 4; this.lbPartDesc.Text = "X247MF S后保冲孔"; // @@ -363,9 +371,9 @@ namespace PunchingMistake this.label5.BackColor = System.Drawing.Color.Transparent; this.label5.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.ForeColor = System.Drawing.Color.DarkCyan; - this.label5.Location = new System.Drawing.Point(25, 58); + this.label5.Location = new System.Drawing.Point(23, 51); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(471, 43); + this.label5.Size = new System.Drawing.Size(409, 37); this.label5.TabIndex = 3; this.label5.Text = "零件描述/Description"; // @@ -376,10 +384,10 @@ namespace PunchingMistake this.panel7.Controls.Add(this.lbPart); this.panel7.Controls.Add(this.label4); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel7.Location = new System.Drawing.Point(33, 593); - this.panel7.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34); + this.panel7.Location = new System.Drawing.Point(30, 519); + this.panel7.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(500, 258); + this.panel7.Size = new System.Drawing.Size(458, 225); this.panel7.TabIndex = 2; // // lbPart @@ -388,9 +396,9 @@ namespace PunchingMistake this.lbPart.BackColor = System.Drawing.Color.Transparent; this.lbPart.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbPart.ForeColor = System.Drawing.Color.White; - this.lbPart.Location = new System.Drawing.Point(35, 130); + this.lbPart.Location = new System.Drawing.Point(32, 114); this.lbPart.Name = "lbPart"; - this.lbPart.Size = new System.Drawing.Size(367, 43); + this.lbPart.Size = new System.Drawing.Size(317, 37); this.lbPart.TabIndex = 3; this.lbPart.Text = "X247MF S后保冲孔"; // @@ -400,9 +408,9 @@ namespace PunchingMistake this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.DarkCyan; - this.label4.Location = new System.Drawing.Point(25, 54); + this.label4.Location = new System.Drawing.Point(23, 47); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(404, 43); + this.label4.Size = new System.Drawing.Size(351, 37); this.label4.TabIndex = 2; this.label4.Text = "零件号/PartNumber"; // @@ -413,10 +421,10 @@ namespace PunchingMistake this.panel6.Controls.Add(this.lbPlan); this.panel6.Controls.Add(this.label3); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel6.Location = new System.Drawing.Point(33, 298); - this.panel6.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34); + this.panel6.Location = new System.Drawing.Point(30, 261); + this.panel6.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(500, 258); + this.panel6.Size = new System.Drawing.Size(458, 225); this.panel6.TabIndex = 1; // // lbPlan @@ -425,9 +433,9 @@ namespace PunchingMistake this.lbPlan.BackColor = System.Drawing.Color.Transparent; this.lbPlan.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbPlan.ForeColor = System.Drawing.Color.White; - this.lbPlan.Location = new System.Drawing.Point(35, 134); + this.lbPlan.Location = new System.Drawing.Point(32, 117); this.lbPlan.Name = "lbPlan"; - this.lbPlan.Size = new System.Drawing.Size(367, 43); + this.lbPlan.Size = new System.Drawing.Size(317, 37); this.lbPlan.TabIndex = 2; this.lbPlan.Text = "X247MF S后保冲孔"; // @@ -437,9 +445,9 @@ namespace PunchingMistake this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.DarkCyan; - this.label3.Location = new System.Drawing.Point(25, 53); + this.label3.Location = new System.Drawing.Point(23, 46); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(448, 43); + this.label3.Size = new System.Drawing.Size(389, 37); this.label3.TabIndex = 1; this.label3.Text = "计划编号/PlanNumber"; // @@ -450,10 +458,10 @@ namespace PunchingMistake this.panel5.Controls.Add(this.lbStation); this.panel5.Controls.Add(this.label1); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(33, 3); - this.panel5.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34); + this.panel5.Location = new System.Drawing.Point(30, 3); + this.panel5.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(500, 258); + this.panel5.Size = new System.Drawing.Size(458, 225); this.panel5.TabIndex = 0; // // lbStation @@ -462,9 +470,9 @@ namespace PunchingMistake this.lbStation.BackColor = System.Drawing.Color.Transparent; this.lbStation.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbStation.ForeColor = System.Drawing.Color.White; - this.lbStation.Location = new System.Drawing.Point(25, 123); + this.lbStation.Location = new System.Drawing.Point(23, 108); this.lbStation.Name = "lbStation"; - this.lbStation.Size = new System.Drawing.Size(367, 43); + this.lbStation.Size = new System.Drawing.Size(317, 37); this.lbStation.TabIndex = 1; this.lbStation.Text = "X247MF S后保冲孔"; // @@ -474,9 +482,9 @@ namespace PunchingMistake this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.DarkCyan; - this.label1.Location = new System.Drawing.Point(25, 41); + this.label1.Location = new System.Drawing.Point(23, 36); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(471, 43); + this.label1.Size = new System.Drawing.Size(409, 37); this.label1.TabIndex = 0; this.label1.Text = "生产工位/StationCode"; // @@ -492,8 +500,8 @@ namespace PunchingMistake this.tableLayoutPanel4.Controls.Add(this.panel17, 0, 3); this.tableLayoutPanel4.Controls.Add(this.panel18, 0, 2); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(1554, 57); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(3, 57, 3, 3); + this.tableLayoutPanel4.Location = new System.Drawing.Point(1425, 50); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(3, 50, 3, 3); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 7; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F)); @@ -503,7 +511,7 @@ namespace PunchingMistake this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 28.57143F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 2F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 28.57143F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(568, 1478); + this.tableLayoutPanel4.Size = new System.Drawing.Size(520, 1293); this.tableLayoutPanel4.TabIndex = 4; // // panel10 @@ -514,9 +522,9 @@ namespace PunchingMistake this.panel10.Controls.Add(this.btnPlanDown); this.panel10.Controls.Add(this.btnPlanUp); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel10.Location = new System.Drawing.Point(3, 1059); + this.panel10.Location = new System.Drawing.Point(3, 926); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(562, 416); + this.panel10.Size = new System.Drawing.Size(514, 364); this.panel10.TabIndex = 0; // // lbHint @@ -526,9 +534,9 @@ namespace PunchingMistake | System.Windows.Forms.AnchorStyles.Right))); this.lbHint.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbHint.ForeColor = System.Drawing.Color.Red; - this.lbHint.Location = new System.Drawing.Point(10, 267); + this.lbHint.Location = new System.Drawing.Point(9, 234); this.lbHint.Name = "lbHint"; - this.lbHint.Size = new System.Drawing.Size(545, 146); + this.lbHint.Size = new System.Drawing.Size(499, 128); this.lbHint.TabIndex = 29; this.lbHint.Text = " "; // @@ -537,10 +545,10 @@ namespace PunchingMistake this.btnPlanFinish.BackColor = System.Drawing.Color.Red; this.btnPlanFinish.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnPlanFinish.ForeColor = System.Drawing.Color.White; - this.btnPlanFinish.Location = new System.Drawing.Point(293, 152); - this.btnPlanFinish.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnPlanFinish.Location = new System.Drawing.Point(269, 133); + this.btnPlanFinish.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPlanFinish.Name = "btnPlanFinish"; - this.btnPlanFinish.Size = new System.Drawing.Size(262, 101); + this.btnPlanFinish.Size = new System.Drawing.Size(240, 88); this.btnPlanFinish.TabIndex = 28; this.btnPlanFinish.Text = "结束计划"; this.btnPlanFinish.UseVisualStyleBackColor = false; @@ -550,10 +558,10 @@ namespace PunchingMistake // this.btnPlanSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.btnPlanSearch.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPlanSearch.Location = new System.Drawing.Point(17, 152); - this.btnPlanSearch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnPlanSearch.Location = new System.Drawing.Point(16, 133); + this.btnPlanSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPlanSearch.Name = "btnPlanSearch"; - this.btnPlanSearch.Size = new System.Drawing.Size(262, 101); + this.btnPlanSearch.Size = new System.Drawing.Size(240, 88); this.btnPlanSearch.TabIndex = 27; this.btnPlanSearch.Text = "计划查询"; this.btnPlanSearch.UseVisualStyleBackColor = false; @@ -563,10 +571,10 @@ namespace PunchingMistake // this.btnPlanDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.btnPlanDown.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPlanDown.Location = new System.Drawing.Point(293, 21); - this.btnPlanDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnPlanDown.Location = new System.Drawing.Point(269, 18); + this.btnPlanDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPlanDown.Name = "btnPlanDown"; - this.btnPlanDown.Size = new System.Drawing.Size(262, 101); + this.btnPlanDown.Size = new System.Drawing.Size(240, 88); this.btnPlanDown.TabIndex = 23; this.btnPlanDown.Text = "下一计划"; this.btnPlanDown.UseVisualStyleBackColor = false; @@ -576,10 +584,10 @@ namespace PunchingMistake // this.btnPlanUp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); this.btnPlanUp.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPlanUp.Location = new System.Drawing.Point(17, 21); - this.btnPlanUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnPlanUp.Location = new System.Drawing.Point(16, 18); + this.btnPlanUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPlanUp.Name = "btnPlanUp"; - this.btnPlanUp.Size = new System.Drawing.Size(262, 101); + this.btnPlanUp.Size = new System.Drawing.Size(240, 88); this.btnPlanUp.TabIndex = 22; this.btnPlanUp.Text = "上一计划"; this.btnPlanUp.UseVisualStyleBackColor = false; @@ -592,7 +600,7 @@ namespace PunchingMistake this.panel11.Dock = System.Windows.Forms.DockStyle.Fill; this.panel11.Location = new System.Drawing.Point(3, 3); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(562, 204); + this.panel11.Size = new System.Drawing.Size(514, 177); this.panel11.TabIndex = 1; // // lbClass @@ -601,9 +609,9 @@ namespace PunchingMistake this.lbClass.BackColor = System.Drawing.Color.Transparent; this.lbClass.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbClass.ForeColor = System.Drawing.Color.White; - this.lbClass.Location = new System.Drawing.Point(193, 108); + this.lbClass.Location = new System.Drawing.Point(177, 94); this.lbClass.Name = "lbClass"; - this.lbClass.Size = new System.Drawing.Size(135, 70); + this.lbClass.Size = new System.Drawing.Size(120, 62); this.lbClass.TabIndex = 4; this.lbClass.Text = "A班"; // @@ -613,9 +621,9 @@ namespace PunchingMistake this.label10.BackColor = System.Drawing.Color.Transparent; this.label10.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(73, 22); + this.label10.Location = new System.Drawing.Point(67, 19); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(437, 43); + this.label10.Size = new System.Drawing.Size(378, 37); this.label10.TabIndex = 3; this.label10.Text = "2025-07-15 11:15:14"; this.label10.DoubleClick += new System.EventHandler(this.label10_DoubleClick); @@ -625,9 +633,9 @@ namespace PunchingMistake this.panel14.Controls.Add(this.lbBadQty); this.panel14.Controls.Add(this.label14); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(3, 637); + this.panel14.Location = new System.Drawing.Point(3, 557); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(562, 414); + this.panel14.Size = new System.Drawing.Size(514, 361); this.panel14.TabIndex = 2; // // lbBadQty @@ -638,9 +646,9 @@ namespace PunchingMistake this.lbBadQty.BackColor = System.Drawing.Color.Transparent; this.lbBadQty.Font = new System.Drawing.Font("宋体", 99.85715F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbBadQty.ForeColor = System.Drawing.Color.Red; - this.lbBadQty.Location = new System.Drawing.Point(130, 106); + this.lbBadQty.Location = new System.Drawing.Point(119, 93); this.lbBadQty.Name = "lbBadQty"; - this.lbBadQty.Size = new System.Drawing.Size(246, 267); + this.lbBadQty.Size = new System.Drawing.Size(215, 234); this.lbBadQty.TabIndex = 5; this.lbBadQty.Text = "0"; // @@ -650,9 +658,9 @@ namespace PunchingMistake this.label14.BackColor = System.Drawing.Color.Transparent; this.label14.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.ForeColor = System.Drawing.Color.DarkCyan; - this.label14.Location = new System.Drawing.Point(8, 19); + this.label14.Location = new System.Drawing.Point(7, 17); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(560, 40); + this.label14.Size = new System.Drawing.Size(503, 35); this.label14.TabIndex = 1; this.label14.Text = "不良数/UnqualifiedQuantity"; // @@ -660,27 +668,27 @@ namespace PunchingMistake // this.panel15.BackColor = System.Drawing.Color.DarkCyan; this.panel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel15.Location = new System.Drawing.Point(3, 213); + this.panel15.Location = new System.Drawing.Point(3, 186); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(562, 1); + this.panel15.Size = new System.Drawing.Size(514, 1); this.panel15.TabIndex = 3; // // panel16 // this.panel16.BackColor = System.Drawing.Color.DarkCyan; this.panel16.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel16.Location = new System.Drawing.Point(3, 1057); + this.panel16.Location = new System.Drawing.Point(3, 924); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(562, 1); + this.panel16.Size = new System.Drawing.Size(514, 1); this.panel16.TabIndex = 4; // // panel17 // this.panel17.BackColor = System.Drawing.Color.DarkCyan; this.panel17.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel17.Location = new System.Drawing.Point(3, 635); + this.panel17.Location = new System.Drawing.Point(3, 555); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(562, 1); + this.panel17.Size = new System.Drawing.Size(514, 1); this.panel17.TabIndex = 5; // // panel18 @@ -709,9 +717,9 @@ namespace PunchingMistake this.panel18.Controls.Add(this.lbScrewL); this.panel18.Controls.Add(this.label2); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(3, 215); + this.panel18.Location = new System.Drawing.Point(3, 188); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(562, 414); + this.panel18.Size = new System.Drawing.Size(514, 361); this.panel18.TabIndex = 6; // // lbScanState @@ -719,9 +727,9 @@ namespace PunchingMistake this.lbScanState.AutoSize = true; this.lbScanState.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbScanState.ForeColor = System.Drawing.Color.White; - this.lbScanState.Location = new System.Drawing.Point(37, 373); + this.lbScanState.Location = new System.Drawing.Point(34, 326); this.lbScanState.Name = "lbScanState"; - this.lbScanState.Size = new System.Drawing.Size(97, 37); + this.lbScanState.Size = new System.Drawing.Size(87, 33); this.lbScanState.TabIndex = 22; this.lbScanState.Text = " "; // @@ -730,9 +738,9 @@ namespace PunchingMistake this.txtLinkState.AutoSize = true; this.txtLinkState.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtLinkState.ForeColor = System.Drawing.Color.White; - this.txtLinkState.Location = new System.Drawing.Point(233, 318); + this.txtLinkState.Location = new System.Drawing.Point(214, 278); this.txtLinkState.Name = "txtLinkState"; - this.txtLinkState.Size = new System.Drawing.Size(97, 37); + this.txtLinkState.Size = new System.Drawing.Size(87, 33); this.txtLinkState.TabIndex = 21; this.txtLinkState.Text = " "; // @@ -741,9 +749,9 @@ namespace PunchingMistake this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label30.ForeColor = System.Drawing.Color.White; - this.label30.Location = new System.Drawing.Point(37, 318); + this.label30.Location = new System.Drawing.Point(34, 278); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(169, 37); + this.label30.Size = new System.Drawing.Size(151, 33); this.label30.TabIndex = 20; this.label30.Text = "连接状态"; // @@ -752,9 +760,9 @@ namespace PunchingMistake this.lbIrlsAll.AutoSize = true; this.lbIrlsAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbIrlsAll.ForeColor = System.Drawing.Color.White; - this.lbIrlsAll.Location = new System.Drawing.Point(349, 256); + this.lbIrlsAll.Location = new System.Drawing.Point(320, 224); this.lbIrlsAll.Name = "lbIrlsAll"; - this.lbIrlsAll.Size = new System.Drawing.Size(37, 37); + this.lbIrlsAll.Size = new System.Drawing.Size(33, 33); this.lbIrlsAll.TabIndex = 19; this.lbIrlsAll.Text = "0"; // @@ -763,9 +771,9 @@ namespace PunchingMistake this.label27.AutoSize = true; this.label27.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label27.ForeColor = System.Drawing.Color.White; - this.label27.Location = new System.Drawing.Point(289, 256); + this.label27.Location = new System.Drawing.Point(265, 224); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(37, 37); + this.label27.Size = new System.Drawing.Size(33, 33); this.label27.TabIndex = 18; this.label27.Text = "/"; // @@ -774,9 +782,9 @@ namespace PunchingMistake this.lbIrls.AutoSize = true; this.lbIrls.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbIrls.ForeColor = System.Drawing.Color.White; - this.lbIrls.Location = new System.Drawing.Point(233, 256); + this.lbIrls.Location = new System.Drawing.Point(214, 224); this.lbIrls.Name = "lbIrls"; - this.lbIrls.Size = new System.Drawing.Size(37, 37); + this.lbIrls.Size = new System.Drawing.Size(33, 33); this.lbIrls.TabIndex = 17; this.lbIrls.Text = "0"; // @@ -785,9 +793,9 @@ namespace PunchingMistake this.label29.AutoSize = true; this.label29.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label29.ForeColor = System.Drawing.Color.White; - this.label29.Location = new System.Drawing.Point(90, 256); + this.label29.Location = new System.Drawing.Point(83, 224); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(93, 37); + this.label29.Size = new System.Drawing.Size(83, 33); this.label29.TabIndex = 16; this.label29.Text = "虹膜"; // @@ -796,9 +804,9 @@ namespace PunchingMistake this.lbRivetRAll.AutoSize = true; this.lbRivetRAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbRivetRAll.ForeColor = System.Drawing.Color.White; - this.lbRivetRAll.Location = new System.Drawing.Point(351, 188); + this.lbRivetRAll.Location = new System.Drawing.Point(322, 164); this.lbRivetRAll.Name = "lbRivetRAll"; - this.lbRivetRAll.Size = new System.Drawing.Size(37, 37); + this.lbRivetRAll.Size = new System.Drawing.Size(33, 33); this.lbRivetRAll.TabIndex = 15; this.lbRivetRAll.Text = "0"; // @@ -807,9 +815,9 @@ namespace PunchingMistake this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label19.ForeColor = System.Drawing.Color.White; - this.label19.Location = new System.Drawing.Point(291, 188); + this.label19.Location = new System.Drawing.Point(267, 164); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(37, 37); + this.label19.Size = new System.Drawing.Size(33, 33); this.label19.TabIndex = 14; this.label19.Text = "/"; // @@ -818,9 +826,9 @@ namespace PunchingMistake this.lbRivetR.AutoSize = true; this.lbRivetR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbRivetR.ForeColor = System.Drawing.Color.White; - this.lbRivetR.Location = new System.Drawing.Point(235, 188); + this.lbRivetR.Location = new System.Drawing.Point(215, 164); this.lbRivetR.Name = "lbRivetR"; - this.lbRivetR.Size = new System.Drawing.Size(37, 37); + this.lbRivetR.Size = new System.Drawing.Size(33, 33); this.lbRivetR.TabIndex = 13; this.lbRivetR.Text = "0"; // @@ -829,9 +837,9 @@ namespace PunchingMistake this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label21.ForeColor = System.Drawing.Color.White; - this.label21.Location = new System.Drawing.Point(35, 188); + this.label21.Location = new System.Drawing.Point(32, 164); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(171, 37); + this.label21.Size = new System.Drawing.Size(153, 33); this.label21.TabIndex = 12; this.label21.Text = "铆钉(右)"; // @@ -840,9 +848,9 @@ namespace PunchingMistake this.lbRivetLAll.AutoSize = true; this.lbRivetLAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbRivetLAll.ForeColor = System.Drawing.Color.White; - this.lbRivetLAll.Location = new System.Drawing.Point(351, 139); + this.lbRivetLAll.Location = new System.Drawing.Point(322, 122); this.lbRivetLAll.Name = "lbRivetLAll"; - this.lbRivetLAll.Size = new System.Drawing.Size(37, 37); + this.lbRivetLAll.Size = new System.Drawing.Size(33, 33); this.lbRivetLAll.TabIndex = 11; this.lbRivetLAll.Text = "0"; // @@ -851,9 +859,9 @@ namespace PunchingMistake this.label23.AutoSize = true; this.label23.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label23.ForeColor = System.Drawing.Color.White; - this.label23.Location = new System.Drawing.Point(291, 139); + this.label23.Location = new System.Drawing.Point(267, 122); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(37, 37); + this.label23.Size = new System.Drawing.Size(33, 33); this.label23.TabIndex = 10; this.label23.Text = "/"; // @@ -862,9 +870,9 @@ namespace PunchingMistake this.lbRivetL.AutoSize = true; this.lbRivetL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbRivetL.ForeColor = System.Drawing.Color.White; - this.lbRivetL.Location = new System.Drawing.Point(235, 139); + this.lbRivetL.Location = new System.Drawing.Point(215, 122); this.lbRivetL.Name = "lbRivetL"; - this.lbRivetL.Size = new System.Drawing.Size(37, 37); + this.lbRivetL.Size = new System.Drawing.Size(33, 33); this.lbRivetL.TabIndex = 9; this.lbRivetL.Text = "0"; // @@ -873,9 +881,9 @@ namespace PunchingMistake this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label25.ForeColor = System.Drawing.Color.White; - this.label25.Location = new System.Drawing.Point(35, 139); + this.label25.Location = new System.Drawing.Point(32, 122); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(171, 37); + this.label25.Size = new System.Drawing.Size(153, 33); this.label25.TabIndex = 8; this.label25.Text = "铆钉(左)"; // @@ -884,9 +892,9 @@ namespace PunchingMistake this.lbScrewRAll.AutoSize = true; this.lbScrewRAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbScrewRAll.ForeColor = System.Drawing.Color.White; - this.lbScrewRAll.Location = new System.Drawing.Point(351, 70); + this.lbScrewRAll.Location = new System.Drawing.Point(322, 61); this.lbScrewRAll.Name = "lbScrewRAll"; - this.lbScrewRAll.Size = new System.Drawing.Size(37, 37); + this.lbScrewRAll.Size = new System.Drawing.Size(33, 33); this.lbScrewRAll.TabIndex = 7; this.lbScrewRAll.Text = "0"; // @@ -895,9 +903,9 @@ namespace PunchingMistake this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label15.ForeColor = System.Drawing.Color.White; - this.label15.Location = new System.Drawing.Point(291, 70); + this.label15.Location = new System.Drawing.Point(267, 61); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(37, 37); + this.label15.Size = new System.Drawing.Size(33, 33); this.label15.TabIndex = 6; this.label15.Text = "/"; // @@ -906,9 +914,9 @@ namespace PunchingMistake this.lbScrewR.AutoSize = true; this.lbScrewR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbScrewR.ForeColor = System.Drawing.Color.White; - this.lbScrewR.Location = new System.Drawing.Point(235, 70); + this.lbScrewR.Location = new System.Drawing.Point(215, 61); this.lbScrewR.Name = "lbScrewR"; - this.lbScrewR.Size = new System.Drawing.Size(37, 37); + this.lbScrewR.Size = new System.Drawing.Size(33, 33); this.lbScrewR.TabIndex = 5; this.lbScrewR.Text = "0"; // @@ -917,9 +925,9 @@ namespace PunchingMistake this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label17.ForeColor = System.Drawing.Color.White; - this.label17.Location = new System.Drawing.Point(35, 70); + this.label17.Location = new System.Drawing.Point(32, 61); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(171, 37); + this.label17.Size = new System.Drawing.Size(153, 33); this.label17.TabIndex = 4; this.label17.Text = "螺钉(右)"; // @@ -928,9 +936,9 @@ namespace PunchingMistake this.lbScrewLAll.AutoSize = true; this.lbScrewLAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbScrewLAll.ForeColor = System.Drawing.Color.White; - this.lbScrewLAll.Location = new System.Drawing.Point(351, 17); + this.lbScrewLAll.Location = new System.Drawing.Point(322, 15); this.lbScrewLAll.Name = "lbScrewLAll"; - this.lbScrewLAll.Size = new System.Drawing.Size(37, 37); + this.lbScrewLAll.Size = new System.Drawing.Size(33, 33); this.lbScrewLAll.TabIndex = 3; this.lbScrewLAll.Text = "0"; // @@ -939,9 +947,9 @@ namespace PunchingMistake this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(291, 17); + this.label8.Location = new System.Drawing.Point(267, 15); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(37, 37); + this.label8.Size = new System.Drawing.Size(33, 33); this.label8.TabIndex = 2; this.label8.Text = "/"; // @@ -950,9 +958,9 @@ namespace PunchingMistake this.lbScrewL.AutoSize = true; this.lbScrewL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbScrewL.ForeColor = System.Drawing.Color.White; - this.lbScrewL.Location = new System.Drawing.Point(235, 17); + this.lbScrewL.Location = new System.Drawing.Point(215, 15); this.lbScrewL.Name = "lbScrewL"; - this.lbScrewL.Size = new System.Drawing.Size(37, 37); + this.lbScrewL.Size = new System.Drawing.Size(33, 33); this.lbScrewL.TabIndex = 1; this.lbScrewL.Text = "0"; // @@ -961,9 +969,9 @@ namespace PunchingMistake this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(35, 17); + this.label2.Location = new System.Drawing.Point(32, 15); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(171, 37); + this.label2.Size = new System.Drawing.Size(153, 33); this.label2.TabIndex = 0; this.label2.Text = "螺钉(左)"; // @@ -978,15 +986,6 @@ namespace PunchingMistake this.LoadScrewTimer.Interval = 1000; this.LoadScrewTimer.Tick += new System.EventHandler(this.LoadScrewTimer_Tick); // - // txtBarCode - // - this.txtBarCode.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBarCode.Location = new System.Drawing.Point(33, 143); - this.txtBarCode.Name = "txtBarCode"; - this.txtBarCode.Size = new System.Drawing.Size(425, 53); - this.txtBarCode.TabIndex = 6; - this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown); - // // txtBoxFocusTimer // this.txtBoxFocusTimer.Enabled = true; @@ -995,9 +994,9 @@ namespace PunchingMistake // // FrmAssemble // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2125, 1538); + this.ClientSize = new System.Drawing.Size(1948, 1346); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "FrmAssemble"; diff --git a/PunchingMistake/FrmAssemble.cs b/PunchingMistake/FrmAssemble.cs index d4432b0..141067f 100644 --- a/PunchingMistake/FrmAssemble.cs +++ b/PunchingMistake/FrmAssemble.cs @@ -475,7 +475,7 @@ namespace PunchingMistake ScanAll.barCode4, ScanAll.barCode5, ScanAll.barCode6, _stationNo, ConfigurationManager.AppSettings["StationDescription"]); Function2.SaveZcCode(barcode, partNo1); - Function2.AddCompleteCount(this.Tag?.ToString()); + Function2.AddCompleteCount(this.Tag?.ToString(),"合格"); PrintAssembleBarCode(assembleBarCode, partNo1, lbPartDesc.Text, serailNo); diff --git a/PunchingMistake/FrmLogin.cs b/PunchingMistake/FrmLogin.cs index 5445fd8..f1c25ef 100644 --- a/PunchingMistake/FrmLogin.cs +++ b/PunchingMistake/FrmLogin.cs @@ -91,8 +91,18 @@ namespace PunchingMistake this.Visible = false; Program.UserName = textBox1.Text.Trim(); //Form fr = new FrmQualityNew(); - Form fr = new FrmAssemble(); - fr.Show(); + + if (ConfigurationManager.AppSettings["LoadPage"]?.ToString() == "QA") + { + Form fr = new FrmQualityNew(); + fr.Show(); + } + else + { + Form fr = new FrmAssemble(); + fr.Show(); + } + } else diff --git a/PunchingMistake/FrmQualityNew.cs b/PunchingMistake/FrmQualityNew.cs index 6e61d12..cd31a71 100644 --- a/PunchingMistake/FrmQualityNew.cs +++ b/PunchingMistake/FrmQualityNew.cs @@ -25,12 +25,12 @@ namespace PunchingMistake private static string position = "", reason = "", responsible = ""; - private string _stationType = "上线前质检"; + private string _stationType = "总成质检"; private string _isTest = "false"; //责任方 private List _selectResponsibles = new List(); //扫描的喷涂行数据 - private DataRow _scanPaintRow = null; + private DataRow _scanAssembleRow = null; public FrmQualityNew() { InitializeComponent(); @@ -181,7 +181,7 @@ namespace PunchingMistake { try { - if (_scanPaintRow == null) + if (_scanAssembleRow == null) { MessageBox.Show("请先扫描数据,然后操作."); return; @@ -189,7 +189,7 @@ namespace PunchingMistake ShowHint(""); - SaveRst("合格", _scanPaintRow); + SaveRst("合格", _scanAssembleRow); } catch(Exception ex) { @@ -208,7 +208,7 @@ namespace PunchingMistake /// - /// 点修补按钮 + /// 返修按钮 /// /// /// @@ -216,7 +216,7 @@ namespace PunchingMistake { try { - if (_scanPaintRow == null) + if (_scanAssembleRow == null) { MessageBox.Show("请先扫描数据,然后操作."); return; @@ -232,12 +232,12 @@ namespace PunchingMistake btnRepair.BackColor = Color.Yellow; - SaveRst("点修补", _scanPaintRow); + SaveRst("返修", _scanAssembleRow); } catch (Exception ex) { - ShowHint("判定点修补操作发生异常,异常原因:" + ex.Message); - MessageBox.Show("判定点修补操作发生异常,异常原因:" + ex.Message); + ShowHint("判定返修操作发生异常,异常原因:" + ex.Message); + MessageBox.Show("判定返修操作发生异常,异常原因:" + ex.Message); Clear(); } @@ -246,24 +246,21 @@ namespace PunchingMistake { try { - if (_scanPaintRow == null) + if (_scanAssembleRow == null) { MessageBox.Show("请先扫描数据,然后操作."); return; } ShowHint(""); - #region 必须选择缺陷位置与缺陷原因，否则无法保存 - if (CheckDefect() == false) return; - #endregion - - SaveRst("抛光", _scanPaintRow); + + SaveRst("返修合格", _scanAssembleRow); } catch (Exception ex) { - ShowHint("执行报废操作发生异常,异常原因:" + ex.Message); - MessageBox.Show("执行报废操作发生异常,异常原因:" + ex.Message); + ShowHint("执行返修合格操作发生异常,异常原因:" + ex.Message); + MessageBox.Show("执行返修合格操作发生异常,异常原因:" + ex.Message); Clear(); } } @@ -276,7 +273,7 @@ namespace PunchingMistake { try { - if (_scanPaintRow == null) + if (_scanAssembleRow == null) { MessageBox.Show("请先扫描数据,然后操作."); return; @@ -290,7 +287,7 @@ namespace PunchingMistake #endregion - SaveRst("报废", _scanPaintRow); + SaveRst("报废", _scanAssembleRow); } catch(Exception ex) @@ -316,10 +313,10 @@ namespace PunchingMistake } string bcode = txtBarCode.Text.Trim(); //保存 - string id = SaveInspect(state, _scanPaintRow, userName); + string id = SaveInspect(state, _scanAssembleRow, userName); if (!string.IsNullOrEmpty(id)) { - _scanPaintRow = null; + _scanAssembleRow = null; ShowHint("操作成功", true); ClearPage(); } @@ -392,7 +389,7 @@ namespace PunchingMistake { try { - if (!string.IsNullOrWhiteSpace(txtBarCode.Text.Trim())) + if (scanPaintRow !=null) { InspectModel model1 = new InspectModel(); @@ -406,9 +403,9 @@ namespace PunchingMistake model1.Responsible = responsible;// string.Join(",", _selectResponsibles); - model1.remark3 = scanPaintRow["remark3"].ToString(); - model1.ForeignPartCode = scanPaintRow["ForeignPartCode"].ToString(); - model1.CarType = scanPaintRow["CarType"].ToString(); + //model1.remark3 = scanPaintRow["remark3"].ToString(); + model1.ForeignPartCode = scanPaintRow["ZcPartNo"].ToString(); + //model1.CarType = scanPaintRow["CarType"].ToString(); if (inspectResult != "合格") @@ -419,19 +416,33 @@ namespace PunchingMistake return ""; } } - model1.productInfo = scanPaintRow["productInfo"].ToString(); - model1.side = scanPaintRow["side"].ToString(); + model1.productInfo = labProductInfo.Text; + //model1.side = scanPaintRow["side"].ToString(); model1.InspectTimes = "1"; - model1.remark1 = scanPaintRow["remark1"].ToString(); - model1.remark2 = scanPaintRow["remark2"].ToString(); + //model1.remark1 = scanPaintRow["remark1"].ToString(); + //model1.remark2 = scanPaintRow["remark2"].ToString(); - model1.remark3 = scanPaintRow["remark3"].ToString(); + //model1.remark3 = scanPaintRow["remark3"].ToString(); model1.AddMan = userName; - return Function2.InsertInspect3(model1); + Function2.InsertInspect3(model1, scanPaintRow["ZcBarCode"].ToString(), scanPaintRow["ID"].ToString(), scanPaintRow["PlanID"].ToString()); + } + if(inspectResult == "报废") + { + //更新计划的报废数量 + Function2.AddCompleteCount(scanPaintRow["PlanID"].ToString(), "报废"); + Function2.UpdateRecordFlag(scanPaintRow["ID"].ToString().ToString(), "0"); } + if (inspectResult == "返修") + { + Function2.AddCompleteCount(scanPaintRow["PlanID"].ToString(), "返修"); + Function2.UpdateRecordFlag(scanPaintRow["ID"].ToString().ToString(), "1"); + } + //更新tb_Punch_Code_Record数据的状态 + + return ""; } catch (Exception ex) @@ -527,14 +538,20 @@ namespace PunchingMistake #endregion - _scanPaintRow = GetRecentRstInfo(barcode); - if(_scanPaintRow["inspectResult"].ToString().Contains("合格") == false) - { - MessageBox.Show("扫描的条码号：" + barcode + "喷涂线不是合格状态，请重新扫描！"); - txtBarCode.Text = ""; - return; - } - labProductInfo.Text = _scanPaintRow["productInfo"].ToString(); + _scanAssembleRow = GetRecentRstInfo(barcode); + + string zcPartNo = _scanAssembleRow["ZcPartNo"].ToString(); + string partName = Function2.GetProductName(zcPartNo); + labProductInfo.Text = partName+"["+ zcPartNo+"]"; + + + //if (_scanAssembleRow["inspectResult"].ToString().Contains("合格") == false) + //{ + // MessageBox.Show("扫描的条码号：" + barcode + "喷涂线不是合格状态，请重新扫描！"); + // txtBarCode.Text = ""; + // return; + //} + //labProductInfo.Text = _scanAssembleRow["productInfo"].ToString(); //根据条码查询，加载图片及原因 @@ -585,14 +602,7 @@ namespace PunchingMistake dLb[i].BorderStyle = BorderStyle.FixedSingle; dLb[i].BackColor = Color.Transparent; dLb[i].TextAlign = ContentAlignment.MiddleCenter; - - if (dLb[i].Text.Contains("点修补")) - { - dLb[i].Font = new Font(dLb[i].Font.FontFamily, 36, FontStyle.Bold); - dLb[i].Size = new Size(170, 60); - dLb[i].ForeColor = Color.Red; - //dLb[i].BackColor = Color.Red; - } + panel2.Controls.Add(dLb[i]); dLb[i].Click += new EventHandler(dLbRoom_Click); } @@ -612,7 +622,7 @@ namespace PunchingMistake try { - DataTable dt2 = Function2.SearchInfoByBarCode(barcode); + DataTable dt2 = Function2.SearchInfoByBarCode(zcPartNo); if (dt2 != null && dt2.Rows.Count > 0) { @@ -697,30 +707,12 @@ namespace PunchingMistake DataTable dt = Function2.GetLastResult(barcode); if(dt.Rows.Count == 0) { - throw new Exception("塑件条码没有喷涂质检记录"); + throw new Exception("扫描条码没有装配记录,无法质检"); } - DataRow dr = dt.Rows[0]; + //写到这 - if(_isTest == "false") - { - string errorMsg = string.Empty; - //wms是否喷涂下线 - bool isExsit = Function2.GetPointRepairFrWms(barcode, ref errorMsg); - if (isExsit == false) - { - if (!string.IsNullOrEmpty(errorMsg)) - { - throw new Exception("在wms系统的查询返修入库记录时发生错误,错误原因:" + errorMsg); - - } - else - { - throw new Exception("没有在wms系统的返修入库记录,无法进行点修补."); - - } - - } - } + DataRow dr = dt.Rows[0]; + return dr; } diff --git a/PunchingMistake/FrmQualityNew1.cs b/PunchingMistake/FrmQualityNew1.cs index fdb5f38..d9a3006 100644 --- a/PunchingMistake/FrmQualityNew1.cs +++ b/PunchingMistake/FrmQualityNew1.cs @@ -378,15 +378,7 @@ namespace PunchingMistake if (CheckColor(ref colorName, ref partName) == false) return; #endregion - int cs = Function.OtherTimes(txtBarCode.Text.Trim()); - if (cs > 0) - { - MessageBox.Show("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次."); - ShowHint("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次."); - Clear(); - return; - } - + bool rr = SaveBeforeVerify("其它"); if (rr == false) { diff --git a/PunchingMistake/Function2.cs b/PunchingMistake/Function2.cs index 71ef956..9dc42e3 100644 --- a/PunchingMistake/Function2.cs +++ b/PunchingMistake/Function2.cs @@ -438,12 +438,42 @@ namespace PunchingMistake return res; } } - public static int AddCompleteCount(string ID) + public static int AddCompleteCount(string ID,string state) { int res = 0; try { - string sql = " update tb_ZP_MK_Plan set OKCount = OKCount + 1 where ID = '" + ID + "' "; + string sql = string.Empty; + if(state == "合格") + { + sql = " update tb_ZP_MK_Plan set OKCount = OKCount + 1 where ID = '" + ID + "' "; + } + else if (state == "报废") + { + sql = " update tb_ZP_MK_Plan set BadCount = BadCount + 1 where ID = '" + ID + "' "; + } + else if (state == "返修") + { + sql = " update tb_ZP_MK_Plan set RepairCount = RepairCount + 1 where ID = '" + ID + "' "; + } + + res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null); + return res; + } + catch (Exception ex) + { + //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + public static int UpdateRecordFlag(string ID, string state) + { + int res = 0; + try + { + string sql = string.Empty; + sql = $" update tb_Punch_Code_Record set Flag = {state} where ID = '" + ID + "' "; + res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null); return res; } @@ -908,7 +938,7 @@ namespace PunchingMistake } return res; } - + public static DataTable GetPunchRecord(string planID,string barcode,string date1,string date2) { DataTable res = null; @@ -987,30 +1017,158 @@ namespace PunchingMistake return false; } - public static string InsertInspect3(InspectModel model1) + public static string InsertInspect3(InspectModel model,string zcBarCode, string planID, string recordID) { - return ""; + int res = 0; string sql = string.Empty; + try + { + sql = @" INSERT INTO [dbo].[tb_Punch_Quality] + ( + [barcode] + ,[side] + ,[position] + ,[stationNo] + ,[workClass] + ,[inspectResult] + ,[damnPosition] + ,[defectID] + ,[reason] + ,[productInfo] + ,[productOption] + ,[createTime] + ,[InspectTimes] + ,[remark1] + ,[remark2] + ,[remark3] + ,[CarType] + ,[AddMan] + ,[ZcPartCode] + ,[Responsible] + ,[ZcBarCode] + ,[RecordID] + ,[PlanID] + ) + VALUES + ('" + model.barcode + @"' + ,'" + model.side + @"' + ,'" + model.position + @"' + ,'" + model.stationNo + @"' + ,'" + model.workClass + @"' + ,'" + model.inspectResult + @"' + ,'" + model.damnPosition + @"' + ,'" + model.defectID + @"' + ,'" + model.reason + @"' + ,'" + model.productInfo + @"' + ,'" + model.productOption + @"' + ,(select getdate()), '" + model.InspectTimes + @"' + ,'" + model.remark1 + @"' + ,'" + model.remark2 + @"' + ,'" + model.remark3 + @"' + ,'" + model.CarType + @"' + ,'" + model.AddMan + @"' + ,'" + model.ForeignPartCode + @"' + ,'" + model.Responsible + @"' + ,'" + zcBarCode + @"' + ,'" + planID + @"' + ,'" + recordID + @"' + );select @@Identity "; + DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (dt.Rows.Count > 0) + { + return dt.Rows[0][0].ToString(); + } + return ""; + } + catch (Exception ex) + { + LogHelper.WriteLog($"插入tb_Punch_Quality表错误，sql ='{sql}' ,异常信息:" + ex.Message); + return ""; + } } public static DataTable SearchDefectInfo(string stationNo) { - return null; + DataTable res = new DataTable(); + try + { + string sql = @" select * from tb_Defect where LineID = (select LineID from tb_Station where StationNo = '" + stationNo + @"') "; + res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + //LogHelper.WriteSysLogBase("[入参：]stationNo=" + stationNo + "[sql：]" + sql, MethodBase.GetCurrentMethod().Name); + return res; + } + catch (Exception ex) + { + //LogHelper.WriteLogManager(ex); + //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + LogHelper.WriteLog($"查询tb_Defect表错误，StationNo ='{stationNo}' ,异常信息:" + ex.Message); + return res; + } } - public static DataTable SearchInfoByBarCode(string barcode) + public static DataTable SearchInfoByBarCode(string partNo) { - return null; + DataTable res = new DataTable(); + try + { + string sql = ""; + if (!string.IsNullOrWhiteSpace(partNo)) + { + sql = " select * from tb_Product where PartNo = '" + partNo.Trim() + @"'"; + res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + } + //LogHelper.WriteSysLogBase("[入参：]barcode=" + barcode+"[sql：]"+ sql, MethodBase.GetCurrentMethod().Name); + return res; + } + catch (Exception ex) + { + LogHelper.WriteLog($"查询tb_Product表错误，PartNo ='{partNo}' ,异常信息:" + ex.Message); + return res; + } } public static string GetImgPath() { - return ""; + string res = ""; + try + { + string sql_imgPath = " select top 1 value from tb_Config where name = 'ImgPath' "; + object aa = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql_imgPath, null); + if (aa != null) + { + res = aa.ToString(); + } + } + catch (Exception ex) + { + LogHelper.WriteLog($"查询tb_Config表错误，name ='ImgPath' ,异常信息:" + ex.Message); + } + return res; } public static DataTable GetLastResult(string barcode) { + + DataTable res = null; + try + { + string sql = string.Empty; + if (barcode.Contains(".")) + { + sql = $"select top 1 * from tb_Punch_Code_Record where ZcBarCode ='{barcode}' order by id desc "; + } + else + { + sql = $"select top 1 * from tb_Punch_Code_Record where barcode ='{barcode}' order by id desc "; + + } + + res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + return res; + } + catch (Exception ex) + { + //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + LogHelper.WriteLog($"查询tb_Punch_Code_Record表错误，barcode ='{barcode}' ,异常信息:" + ex.Message); + } return null; } - public static bool GetPointRepairFrWms(string barcode ,ref string errorMsg) - { - return true; - } + } diff --git a/PunchingMistake/Function3.cs b/PunchingMistake/Function3.cs index 4d95beb..c6ba8cc 100644 --- a/PunchingMistake/Function3.cs +++ b/PunchingMistake/Function3.cs @@ -63,7 +63,7 @@ namespace PunchingMistake bool res = false; if (!string.IsNullOrWhiteSpace(barcode)) { - if (barcode.Contains(".")) + if (barcode.Contains(".")&& barcode.Contains(";")) { res = true; } diff --git a/PunchingMistake/Program.cs b/PunchingMistake/Program.cs index 5f2383f..0e81b9d 100644 --- a/PunchingMistake/Program.cs +++ b/PunchingMistake/Program.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Configuration; using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; @@ -21,6 +22,7 @@ namespace PunchingMistake Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new FrmLogin()); + } } }