diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs index 685f288..a96dadc 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, 765F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 705F)); 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, 1401); - 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(1793, 14); - this.button6.Margin = new System.Windows.Forms.Padding(14); + this.button6.Location = new System.Drawing.Point(1642, 12); + this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(739, 183); + this.button6.Size = new System.Drawing.Size(680, 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(582, 200); + this.button1.Size = new System.Drawing.Size(534, 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(1208, 225); - this.button5.Margin = new System.Windows.Forms.Padding(14); + this.button5.Location = new System.Drawing.Point(1107, 197); + this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(557, 184); + this.button5.Size = new System.Drawing.Size(509, 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(603, 6); - this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button4.Location = new System.Drawing.Point(552, 5); + this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(584, 199); + this.button4.Size = new System.Drawing.Size(536, 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(582, 199); + this.button3.Size = new System.Drawing.Size(534, 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(610, 225); - this.button2.Margin = new System.Windows.Forms.Padding(14); + this.button2.Location = new System.Drawing.Point(559, 197); + this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(570, 184); + this.button2.Size = new System.Drawing.Size(522, 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(1786, 217); - this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button7.Location = new System.Drawing.Point(1635, 190); + this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(753, 200); + this.button7.Size = new System.Drawing.Size(694, 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(1443, 3); + this.label7.Location = new System.Drawing.Point(1318, 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(416, 127); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox2.Location = new System.Drawing.Point(380, 111); + this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(1020, 87); + this.textBox2.Size = new System.Drawing.Size(931, 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(402, 124); + this.label3.Size = new System.Drawing.Size(366, 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(1720, 249); + this.labOrderNo.Location = new System.Drawing.Point(1572, 218); this.labOrderNo.Margin = new System.Windows.Forms.Padding(2); this.labOrderNo.Name = "labOrderNo"; - this.labOrderNo.Size = new System.Drawing.Size(829, 174); + this.labOrderNo.Size = new System.Drawing.Size(764, 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(1443, 249); + this.label4.Location = new System.Drawing.Point(1318, 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(414, 249); + this.labStationNo.Location = new System.Drawing.Point(378, 218); this.labStationNo.Margin = new System.Windows.Forms.Padding(2); this.labStationNo.Name = "labStationNo"; - this.labStationNo.Size = new System.Drawing.Size(1024, 174); + this.labStationNo.Size = new System.Drawing.Size(935, 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(406, 174); + this.label2.Size = new System.Drawing.Size(370, 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(1720, 428); + this.labPName.Location = new System.Drawing.Point(1572, 374); this.labPName.Margin = new System.Windows.Forms.Padding(2); this.labPName.Name = "labPName"; - this.labPName.Size = new System.Drawing.Size(829, 285); + this.labPName.Size = new System.Drawing.Size(764, 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(1443, 428); + this.label8.Location = new System.Drawing.Point(1318, 374); this.label8.Margin = new System.Windows.Forms.Padding(2); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(272, 285); + 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(414, 428); + this.labPartNo.Location = new System.Drawing.Point(378, 374); this.labPartNo.Margin = new System.Windows.Forms.Padding(2); this.labPartNo.Name = "labPartNo"; - this.labPartNo.Size = new System.Drawing.Size(1024, 285); + this.labPartNo.Size = new System.Drawing.Size(935, 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(406, 285); + this.label6.Size = new System.Drawing.Size(370, 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(1720, 718); + this.labBadCount.Location = new System.Drawing.Point(1572, 627); this.labBadCount.Margin = new System.Windows.Forms.Padding(2); this.labBadCount.Name = "labBadCount"; - this.labBadCount.Size = new System.Drawing.Size(829, 515); + this.labBadCount.Size = new System.Drawing.Size(764, 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(414, 718); + this.labNum.Location = new System.Drawing.Point(378, 627); this.labNum.Margin = new System.Windows.Forms.Padding(2); this.labNum.Name = "labNum"; - this.labNum.Size = new System.Drawing.Size(1024, 515); + this.labNum.Size = new System.Drawing.Size(935, 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, 718); + 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(406, 515); + this.label10.Size = new System.Drawing.Size(370, 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(402, 120); + this.label14.Size = new System.Drawing.Size(366, 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(416, 6); - this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox1.Location = new System.Drawing.Point(380, 5); + this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(1020, 87); + this.textBox1.Size = new System.Drawing.Size(931, 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(1722, 1); + this.labErrMessage.Location = new System.Drawing.Point(1574, 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(825, 245); + this.labErrMessage.Size = new System.Drawing.Size(760, 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, 832F)); - 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, 767F)); + 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); 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, 1236); + 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(1443, 718); + this.label12.Location = new System.Drawing.Point(1318, 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(1927, 0); + this.labTime.Location = new System.Drawing.Point(1765, 0); this.labTime.Margin = new System.Windows.Forms.Padding(0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(633, 149); + this.labTime.Size = new System.Drawing.Size(582, 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(349, 149); + this.pictureBox1.Size = new System.Drawing.Size(319, 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(349, 0); + this.label1.Location = new System.Drawing.Point(319, 0); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1578, 149); + this.label1.Size = new System.Drawing.Size(1446, 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, 632F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 581F)); 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, 1830); + 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, 1830); + 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/FrmMain.Designer.cs b/InjectionPC/FrmMain.Designer.cs index 6f343bb..e87b0d6 100644 --- a/InjectionPC/FrmMain.Designer.cs +++ b/InjectionPC/FrmMain.Designer.cs @@ -176,9 +176,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(7, 6, 7, 6); + this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2560, 1759); + this.panel1.Size = new System.Drawing.Size(2347, 1539); this.panel1.TabIndex = 0; // // panel7 @@ -187,10 +187,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(7, 6, 7, 6); + this.panel7.Location = new System.Drawing.Point(0, 147); + this.panel7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2560, 1591); + this.panel7.Size = new System.Drawing.Size(2347, 1392); this.panel7.TabIndex = 1; // // panel23 @@ -198,10 +198,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(7, 6, 7, 6); + this.panel23.Location = new System.Drawing.Point(0, 91); + this.panel23.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(2560, 1487); + this.panel23.Size = new System.Drawing.Size(2347, 1301); this.panel23.TabIndex = 1; // // panel27 @@ -209,10 +209,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, 1114); - this.panel27.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel27.Location = new System.Drawing.Point(0, 975); + this.panel27.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(2560, 373); + this.panel27.Size = new System.Drawing.Size(2347, 326); this.panel27.TabIndex = 1; // // panel29 @@ -220,10 +220,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(338, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel29.Location = new System.Drawing.Point(310, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(2222, 373); + this.panel29.Size = new System.Drawing.Size(2037, 326); this.panel29.TabIndex = 1; // // panel31 @@ -231,10 +231,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(134, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel31.Location = new System.Drawing.Point(123, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(2088, 373); + this.panel31.Size = new System.Drawing.Size(1914, 326); this.panel31.TabIndex = 1; // // panel33 @@ -242,10 +242,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(134, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel33.Location = new System.Drawing.Point(123, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(1954, 373); + this.panel33.Size = new System.Drawing.Size(1791, 326); this.panel33.TabIndex = 1; // // panel35 @@ -253,9 +253,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(7, 6, 7, 6); + this.panel35.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel35.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(1820, 373); + this.panel35.Size = new System.Drawing.Size(1668, 326); this.panel35.TabIndex = 1; // // panel37 @@ -263,9 +263,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(7, 6, 7, 6); + this.panel37.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel37.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(1820, 373); + this.panel37.Size = new System.Drawing.Size(1668, 326); this.panel37.TabIndex = 1; // // panel40 @@ -274,9 +274,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(7, 6, 7, 6); + this.panel40.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel40.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(1820, 373); + this.panel40.Size = new System.Drawing.Size(1668, 326); this.panel40.TabIndex = 1; // // panel42 @@ -285,9 +285,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(7, 6, 7, 6); + this.panel42.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel42.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(1686, 373); + this.panel42.Size = new System.Drawing.Size(1545, 326); this.panel42.TabIndex = 1; // // panel39 @@ -303,28 +303,28 @@ 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(7, 6, 7, 6); + this.panel39.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel39.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(1552, 373); + this.panel39.Size = new System.Drawing.Size(1422, 326); this.panel39.TabIndex = 1; // // 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, 334); - this.textBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.textBox2.Location = new System.Drawing.Point(220, 292); + this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(330, 74); + this.textBox2.Size = new System.Drawing.Size(303, 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, 346); - this.label18.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label18.Location = new System.Drawing.Point(40, 303); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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 = "数量:"; // @@ -332,10 +332,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(662, 202); - this.label19.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label19.Location = new System.Drawing.Point(607, 177); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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)"; // @@ -343,20 +343,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(242, 197); - this.textBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.textBox1.Location = new System.Drawing.Point(222, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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(46, 213); - this.label20.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label20.Location = new System.Drawing.Point(42, 186); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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 = "批次:"; // @@ -365,10 +365,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(242, 72); - this.comboBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.comboBox2.Location = new System.Drawing.Point(222, 63); + this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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); // @@ -376,10 +376,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(46, 80); - this.label21.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label21.Location = new System.Drawing.Point(42, 70); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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 = "产品:"; // @@ -387,10 +387,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(1552, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel43.Location = new System.Drawing.Point(1422, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(134, 373); + this.panel43.Size = new System.Drawing.Size(123, 326); this.panel43.TabIndex = 0; // // label23 @@ -399,9 +399,9 @@ this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label23.Dock = System.Windows.Forms.DockStyle.Fill; this.label23.Location = new System.Drawing.Point(0, 0); - this.label23.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(134, 373); + this.label23.Size = new System.Drawing.Size(123, 326); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -411,10 +411,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(1686, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel41.Location = new System.Drawing.Point(1545, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(134, 373); + this.panel41.Size = new System.Drawing.Size(123, 326); this.panel41.TabIndex = 0; // // label22 @@ -423,9 +423,9 @@ this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label22.Dock = System.Windows.Forms.DockStyle.Fill; this.label22.Location = new System.Drawing.Point(0, 0); - this.label22.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(134, 373); + this.label22.Size = new System.Drawing.Size(123, 326); this.label22.TabIndex = 0; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -435,10 +435,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(1820, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel34.Location = new System.Drawing.Point(1668, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(134, 373); + this.panel34.Size = new System.Drawing.Size(123, 326); this.panel34.TabIndex = 0; // // label15 @@ -447,9 +447,9 @@ this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Location = new System.Drawing.Point(0, 0); - this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(134, 373); + this.label15.Size = new System.Drawing.Size(123, 326); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -460,9 +460,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(7, 6, 7, 6); + this.panel32.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel32.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(134, 373); + this.panel32.Size = new System.Drawing.Size(123, 326); this.panel32.TabIndex = 0; // // label14 @@ -471,9 +471,9 @@ this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Location = new System.Drawing.Point(0, 0); - this.label14.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(134, 373); + this.label14.Size = new System.Drawing.Size(123, 326); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -484,9 +484,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(7, 6, 7, 6); + this.panel30.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel30.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(134, 373); + this.panel30.Size = new System.Drawing.Size(123, 326); this.panel30.TabIndex = 0; // // label13 @@ -495,9 +495,9 @@ this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label13.Dock = System.Windows.Forms.DockStyle.Fill; this.label13.Location = new System.Drawing.Point(0, 0); - this.label13.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(134, 373); + this.label13.Size = new System.Drawing.Size(123, 326); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -508,9 +508,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(7, 6, 7, 6); + this.panel28.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel28.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(338, 373); + this.panel28.Size = new System.Drawing.Size(310, 326); this.panel28.TabIndex = 0; // // label12 @@ -520,9 +520,9 @@ this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.Location = new System.Drawing.Point(0, 0); - this.label12.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(338, 373); + this.label12.Size = new System.Drawing.Size(310, 326); this.label12.TabIndex = 0; this.label12.Text = "打印信息:"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -533,9 +533,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(7, 6, 7, 6); + this.panel24.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(2560, 1114); + this.panel24.Size = new System.Drawing.Size(2347, 975); this.panel24.TabIndex = 0; // // panel26 @@ -544,10 +544,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(338, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel26.Location = new System.Drawing.Point(310, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2222, 1114); + this.panel26.Size = new System.Drawing.Size(2037, 975); this.panel26.TabIndex = 1; // // panel45 @@ -557,19 +557,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(322, 677); - this.panel45.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel45.Location = new System.Drawing.Point(295, 592); + this.panel45.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1396, 151); + this.panel45.Size = new System.Drawing.Size(1280, 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, 42); - this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button3.Location = new System.Drawing.Point(1129, 37); + this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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; @@ -578,10 +578,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(1039, 43); - this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button4.Location = new System.Drawing.Point(952, 38); + this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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; @@ -590,20 +590,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, 46); - this.textBox4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.textBox4.Location = new System.Drawing.Point(308, 40); + this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label25.Location = new System.Drawing.Point(26, 46); + this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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; @@ -615,19 +615,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(7, 6, 7, 6); + this.panel44.Location = new System.Drawing.Point(330, 318); + this.panel44.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1396, 151); + this.panel44.Size = new System.Drawing.Size(1280, 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(1198, 43); - this.button2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button2.Location = new System.Drawing.Point(1098, 38); + this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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; @@ -636,10 +636,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, 53); - this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button1.Location = new System.Drawing.Point(941, 46); + this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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; @@ -648,20 +648,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(7, 6, 7, 6); + this.textBox3.Location = new System.Drawing.Point(191, 38); + this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(738, 55); + this.textBox3.Size = new System.Drawing.Size(677, 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(26, 53); - this.label24.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label24.Location = new System.Drawing.Point(24, 46); + this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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; @@ -732,14 +732,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(7, 6, 7, 6); + this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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(2222, 1114); + this.glacialList1.Size = new System.Drawing.Size(2037, 975); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -752,9 +752,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(7, 6, 7, 6); + this.panel25.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(338, 1114); + this.panel25.Size = new System.Drawing.Size(310, 975); this.panel25.TabIndex = 0; // // panel38 @@ -765,19 +765,19 @@ this.panel38.Controls.Add(this.label17); this.panel38.Controls.Add(this.label16); this.panel38.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel38.Location = new System.Drawing.Point(0, 464); - this.panel38.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel38.Location = new System.Drawing.Point(0, 406); + this.panel38.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(338, 650); + this.panel38.Size = new System.Drawing.Size(310, 569); 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(2, 458); - this.label27.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label27.Location = new System.Drawing.Point(2, 401); + this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(334, 155); + this.label27.Size = new System.Drawing.Size(306, 136); this.label27.TabIndex = 3; this.label27.Text = "9999"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -785,20 +785,20 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(24, 374); - this.label26.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label26.Location = new System.Drawing.Point(22, 327); + this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(261, 58); + this.label26.Size = new System.Drawing.Size(230, 51); 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(2, 136); - this.label17.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label17.Location = new System.Drawing.Point(2, 119); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(334, 155); + this.label17.Size = new System.Drawing.Size(306, 136); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -806,10 +806,10 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(24, 53); - this.label16.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label16.Location = new System.Drawing.Point(22, 46); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(261, 58); + this.label16.Size = new System.Drawing.Size(230, 51); this.label16.TabIndex = 0; this.label16.Text = "计划数量"; // @@ -818,9 +818,9 @@ this.panel36.Controls.Add(this.label11); 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(7, 6, 7, 6); + this.panel36.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(338, 464); + this.panel36.Size = new System.Drawing.Size(310, 406); this.panel36.TabIndex = 0; // // label11 @@ -829,9 +829,9 @@ this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Location = new System.Drawing.Point(0, 0); - this.label11.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(338, 464); + this.label11.Size = new System.Drawing.Size(310, 406); this.label11.TabIndex = 0; this.label11.Text = "打印记录:"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -842,9 +842,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(7, 6, 7, 6); + this.panel8.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -852,10 +852,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(338, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel10.Location = new System.Drawing.Point(310, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2222, 104); + this.panel10.Size = new System.Drawing.Size(2037, 91); this.panel10.TabIndex = 1; // // panel12 @@ -863,10 +863,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(7, 6, 7, 6); + this.panel12.Location = new System.Drawing.Point(451, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1730, 104); + this.panel12.Size = new System.Drawing.Size(1586, 91); this.panel12.TabIndex = 1; // // panel16 @@ -874,10 +874,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(511, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel16.Location = new System.Drawing.Point(468, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1219, 104); + this.panel16.Size = new System.Drawing.Size(1118, 91); this.panel16.TabIndex = 1; // // panel20 @@ -885,10 +885,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(466, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel20.Location = new System.Drawing.Point(427, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(753, 104); + this.panel20.Size = new System.Drawing.Size(691, 91); this.panel20.TabIndex = 1; // // label10 @@ -896,10 +896,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.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label10.Location = new System.Drawing.Point(341, 0); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(381, 104); + this.label10.Size = new System.Drawing.Size(350, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -910,9 +910,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(7, 6, 7, 6); + this.panel22.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -922,9 +922,9 @@ this.label9.Dock = System.Windows.Forms.DockStyle.Fill; this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label9.Location = new System.Drawing.Point(0, 0); - this.label9.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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; @@ -936,9 +936,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(7, 6, 7, 6); + this.panel19.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel19.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(466, 104); + this.panel19.Size = new System.Drawing.Size(427, 91); this.panel19.TabIndex = 0; // // label8 @@ -946,10 +946,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.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label8.Location = new System.Drawing.Point(202, 0); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(246, 104); + this.label8.Size = new System.Drawing.Size(225, 91); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -959,9 +959,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(7, 6, 7, 6); + this.panel21.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -971,9 +971,9 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label7.Location = new System.Drawing.Point(0, 0); - this.label7.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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; @@ -984,19 +984,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(7, 6, 7, 6); + this.panel15.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(511, 104); + this.panel15.Size = new System.Drawing.Size(468, 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(7, 6, 7, 6); + this.panel18.Location = new System.Drawing.Point(202, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(291, 104); + this.panel18.Size = new System.Drawing.Size(266, 91); this.panel18.TabIndex = 1; // // label6 @@ -1005,9 +1005,9 @@ this.label6.Dock = System.Windows.Forms.DockStyle.Fill; this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label6.Location = new System.Drawing.Point(0, 0); - this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(291, 104); + this.label6.Size = new System.Drawing.Size(266, 91); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1017,9 +1017,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(7, 6, 7, 6); + this.panel17.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -1029,9 +1029,9 @@ this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label5.Location = new System.Drawing.Point(0, 0); - this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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; @@ -1042,19 +1042,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(7, 6, 7, 6); + this.panel11.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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(7, 6, 7, 6); + this.panel14.Location = new System.Drawing.Point(202, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -1067,9 +1067,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // @@ -1078,9 +1078,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(7, 6, 7, 6); + this.panel13.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -1090,9 +1090,9 @@ this.label4.Dock = System.Windows.Forms.DockStyle.Fill; this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label4.Location = new System.Drawing.Point(0, 0); - this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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; @@ -1102,9 +1102,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(7, 6, 7, 6); + this.panel9.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(338, 104); + this.panel9.Size = new System.Drawing.Size(310, 91); this.panel9.TabIndex = 0; // // label3 @@ -1114,9 +1114,9 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label3.Location = new System.Drawing.Point(0, 0); - this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(338, 104); + this.label3.Size = new System.Drawing.Size(310, 91); this.label3.TabIndex = 0; this.label3.Text = "用户信息:"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1127,9 +1127,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(7, 6, 7, 6); + this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -1137,10 +1137,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(338, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel4.Location = new System.Drawing.Point(310, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2222, 168); + this.panel4.Size = new System.Drawing.Size(2037, 147); this.panel4.TabIndex = 1; // // panel6 @@ -1148,9 +1148,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(7, 6, 7, 6); + this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1838, 168); + this.panel6.Size = new System.Drawing.Size(1685, 147); this.panel6.TabIndex = 1; // // label1 @@ -1159,9 +1159,9 @@ this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold); this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1838, 168); + this.label1.Size = new System.Drawing.Size(1685, 147); this.label1.TabIndex = 0; this.label1.Text = "注塑车间条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1170,10 +1170,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(1838, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.panel5.Location = new System.Drawing.Point(1685, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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 @@ -1182,9 +1182,9 @@ this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold); this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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; @@ -1195,19 +1195,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(7, 6, 7, 6); + this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(338, 168); + this.panel3.Size = new System.Drawing.Size(310, 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(7, 6); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.pictureBox1.Location = new System.Drawing.Point(6, 5); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(336, 160); + this.pictureBox1.Size = new System.Drawing.Size(308, 140); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1233,12 +1233,12 @@ // // FrmMain // - 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, 1759); + this.ClientSize = new System.Drawing.Size(2347, 1539); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmMain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index b7da3b6..c668d1a 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn5 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn6 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn7 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn8 = new GlacialComponents.Controls.GLColumn(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2408)); this.panel1 = new System.Windows.Forms.Panel(); this.panel7 = new System.Windows.Forms.Panel(); @@ -46,6 +46,8 @@ this.panel40 = new System.Windows.Forms.Panel(); this.panel42 = new System.Windows.Forms.Panel(); this.panel39 = new System.Windows.Forms.Panel(); + this.lbAddPrintR = new System.Windows.Forms.Label(); + this.lbAddPrintL = new System.Windows.Forms.Label(); this.cboxHandBox = new System.Windows.Forms.CheckBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.label18 = new System.Windows.Forms.Label(); @@ -154,6 +156,7 @@ this.serialPort1 = new System.IO.Ports.SerialPort(this.components); this.timer2 = new System.Windows.Forms.Timer(this.components); this.timer3 = new System.Windows.Forms.Timer(this.components); + this.lbDevState = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel7.SuspendLayout(); this.panel23.SuspendLayout(); @@ -218,9 +221,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(2240, 1601); + this.panel1.Size = new System.Drawing.Size(2666, 1600); this.panel1.TabIndex = 0; // // panel7 @@ -229,10 +232,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(2240, 1433); + this.panel7.Size = new System.Drawing.Size(2666, 1453); this.panel7.TabIndex = 1; // // panel23 @@ -240,10 +243,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(2240, 1329); + this.panel23.Size = new System.Drawing.Size(2666, 1362); this.panel23.TabIndex = 1; // // panel27 @@ -251,10 +254,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(2240, 214); + this.panel27.Size = new System.Drawing.Size(2666, 386); this.panel27.TabIndex = 1; // // panel29 @@ -262,10 +265,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(1901, 214); + this.panel29.Size = new System.Drawing.Size(2355, 386); this.panel29.TabIndex = 1; // // panel31 @@ -273,10 +276,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(1768, 214); + this.panel31.Size = new System.Drawing.Size(2233, 386); this.panel31.TabIndex = 1; // // panel33 @@ -284,10 +287,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(1635, 214); + this.panel33.Size = new System.Drawing.Size(2111, 386); this.panel33.TabIndex = 1; // // panel35 @@ -295,9 +298,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(1502, 214); + this.panel35.Size = new System.Drawing.Size(1989, 386); this.panel35.TabIndex = 1; // // panel37 @@ -305,9 +308,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(1502, 214); + this.panel37.Size = new System.Drawing.Size(1989, 386); this.panel37.TabIndex = 1; // // panel40 @@ -316,9 +319,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(1502, 214); + this.panel40.Size = new System.Drawing.Size(1989, 386); this.panel40.TabIndex = 1; // // panel42 @@ -327,15 +330,18 @@ 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(1369, 214); + this.panel42.Size = new System.Drawing.Size(1867, 386); this.panel42.TabIndex = 1; // // panel39 // this.panel39.BackColor = System.Drawing.Color.Aquamarine; this.panel39.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel39.Controls.Add(this.lbDevState); + this.panel39.Controls.Add(this.lbAddPrintR); + this.panel39.Controls.Add(this.lbAddPrintL); this.panel39.Controls.Add(this.cboxHandBox); this.panel39.Controls.Add(this.textBox2); this.panel39.Controls.Add(this.label18); @@ -346,21 +352,47 @@ 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(1236, 214); + this.panel39.Size = new System.Drawing.Size(1745, 386); this.panel39.TabIndex = 1; // + // lbAddPrintR + // + this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; + this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbAddPrintR.Location = new System.Drawing.Point(532, 298); + this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lbAddPrintR.Name = "lbAddPrintR"; + this.lbAddPrintR.Size = new System.Drawing.Size(269, 58); + this.lbAddPrintR.TabIndex = 3; + this.lbAddPrintR.Text = "右箱添打"; + this.lbAddPrintR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lbAddPrintR.Click += new System.EventHandler(this.lbAddPrintR_Click); + // + // lbAddPrintL + // + this.lbAddPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; + this.lbAddPrintL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbAddPrintL.Location = new System.Drawing.Point(532, 239); + this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lbAddPrintL.Name = "lbAddPrintL"; + this.lbAddPrintL.Size = new System.Drawing.Size(269, 58); + this.lbAddPrintL.TabIndex = 2; + this.lbAddPrintL.Text = "左箱添打"; + this.lbAddPrintL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lbAddPrintL.Click += new System.EventHandler(this.lbAddPrintL_Click); + // // cboxHandBox // this.cboxHandBox.AutoSize = true; this.cboxHandBox.Checked = true; this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked; this.cboxHandBox.Enabled = false; - this.cboxHandBox.Location = new System.Drawing.Point(1008, 197); - this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cboxHandBox.Location = new System.Drawing.Point(924, 172); + this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4); this.cboxHandBox.Name = "cboxHandBox"; - this.cboxHandBox.Size = new System.Drawing.Size(293, 62); + this.cboxHandBox.Size = new System.Drawing.Size(256, 55); this.cboxHandBox.TabIndex = 14; this.cboxHandBox.Tag = "true"; this.cboxHandBox.Text = "打印箱码"; @@ -370,20 +402,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 = "数量:"; // @@ -391,10 +423,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)"; // @@ -402,20 +434,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 = "批次:"; // @@ -425,10 +457,10 @@ this.comboBox2.Enabled = false; 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.SelectedValueChanged += new System.EventHandler(this.comboBox2_SelectedValueChanged); this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); @@ -437,10 +469,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 = "产品:"; // @@ -448,10 +480,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(1236, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(5); + this.panel43.Location = new System.Drawing.Point(1745, 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, 214); + this.panel43.Size = new System.Drawing.Size(122, 386); this.panel43.TabIndex = 0; // // label23 @@ -462,7 +494,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, 214); + this.label23.Size = new System.Drawing.Size(122, 386); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -472,10 +504,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(1369, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(5); + this.panel41.Location = new System.Drawing.Point(1867, 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, 214); + this.panel41.Size = new System.Drawing.Size(122, 386); this.panel41.TabIndex = 0; // // label22 @@ -486,8 +518,8 @@ 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, 214); - this.label22.TabIndex = 0; + this.label22.Size = new System.Drawing.Size(122, 386); + this.label22.TabIndex = 1; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label22.Click += new System.EventHandler(this.label22_Click); @@ -496,10 +528,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(1502, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(5); + this.panel34.Location = new System.Drawing.Point(1989, 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, 214); + this.panel34.Size = new System.Drawing.Size(122, 386); this.panel34.TabIndex = 0; // // label15 @@ -510,7 +542,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, 214); + this.label15.Size = new System.Drawing.Size(122, 386); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -521,9 +553,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, 214); + this.panel32.Size = new System.Drawing.Size(122, 386); this.panel32.TabIndex = 0; // // label14 @@ -534,7 +566,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, 214); + this.label14.Size = new System.Drawing.Size(122, 386); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -545,9 +577,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, 214); + this.panel30.Size = new System.Drawing.Size(122, 386); this.panel30.TabIndex = 0; // // label13 @@ -558,7 +590,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, 214); + this.label13.Size = new System.Drawing.Size(122, 386); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -569,9 +601,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, 214); + this.panel28.Size = new System.Drawing.Size(311, 386); this.panel28.TabIndex = 0; // // label12 @@ -583,7 +615,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, 214); + this.label12.Size = new System.Drawing.Size(311, 386); this.label12.TabIndex = 0; this.label12.Text = "打印信息:"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -594,9 +626,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(2240, 1115); + this.panel24.Size = new System.Drawing.Size(2666, 976); this.panel24.TabIndex = 0; // // panel26 @@ -605,10 +637,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(1825, 1115); + this.panel26.Size = new System.Drawing.Size(2286, 976); this.panel26.TabIndex = 1; // // panel45 @@ -618,19 +650,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; @@ -639,10 +671,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; @@ -651,20 +683,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; @@ -676,19 +708,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; @@ -697,10 +729,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; @@ -709,20 +741,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; @@ -736,43 +768,43 @@ this.glacialList1.AutoHeight = true; this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight; this.glacialList1.BackgroundStretchToFit = true; - glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn1.CheckBoxes = false; - glColumn1.ImageIndex = -1; - glColumn1.Name = "条码"; - glColumn1.NumericSort = false; - glColumn1.Text = "条码"; - glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn1.Width = 350; - glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn2.CheckBoxes = false; - glColumn2.ImageIndex = -1; - glColumn2.Name = "产品名称"; - glColumn2.NumericSort = false; - glColumn2.Text = "产品名称"; - glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn2.Width = 320; - glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn3.CheckBoxes = false; - glColumn3.ImageIndex = -1; - glColumn3.Name = "打印方式"; - glColumn3.NumericSort = false; - glColumn3.Text = "打印方式"; - glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn3.Width = 150; - glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn4.CheckBoxes = false; - glColumn4.ImageIndex = -1; - glColumn4.Name = "打印时间"; - glColumn4.NumericSort = false; - glColumn4.Text = "打印时间"; - glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn4.Width = 270; + glColumn5.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn5.CheckBoxes = false; + glColumn5.ImageIndex = -1; + glColumn5.Name = "条码"; + glColumn5.NumericSort = false; + glColumn5.Text = "条码"; + glColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn5.Width = 350; + glColumn6.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn6.CheckBoxes = false; + glColumn6.ImageIndex = -1; + glColumn6.Name = "产品名称"; + glColumn6.NumericSort = false; + glColumn6.Text = "产品名称"; + glColumn6.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn6.Width = 320; + glColumn7.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn7.CheckBoxes = false; + glColumn7.ImageIndex = -1; + glColumn7.Name = "打印方式"; + glColumn7.NumericSort = false; + glColumn7.Text = "打印方式"; + glColumn7.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn7.Width = 150; + glColumn8.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn8.CheckBoxes = false; + glColumn8.ImageIndex = -1; + glColumn8.Name = "打印时间"; + glColumn8.NumericSort = false; + glColumn8.Text = "打印时间"; + glColumn8.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn8.Width = 270; this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] { - glColumn1, - glColumn2, - glColumn3, - glColumn4}); + glColumn5, + glColumn6, + glColumn7, + glColumn8}); this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal; this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill; this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F); @@ -790,17 +822,17 @@ this.glacialList1.HoverEvents = false; this.glacialList1.HoverTime = 1; this.glacialList1.ImageList = null; - this.glacialList1.ItemHeight = 57; + this.glacialList1.ItemHeight = 50; 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(1825, 1115); + this.glacialList1.Size = new System.Drawing.Size(2286, 976); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -813,9 +845,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 @@ -825,13 +857,13 @@ this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0); this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1); 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); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 299F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); + this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -843,19 +875,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, 288); + this.panel38.Size = new System.Drawing.Size(370, 252); this.panel38.TabIndex = 1; // // btn_lastBoxPrintR // this.btn_lastBoxPrintR.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintR.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintR.Location = new System.Drawing.Point(278, 147); + this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 129); this.btn_lastBoxPrintR.Name = "btn_lastBoxPrintR"; - this.btn_lastBoxPrintR.Size = new System.Drawing.Size(126, 141); + this.btn_lastBoxPrintR.Size = new System.Drawing.Size(116, 123); this.btn_lastBoxPrintR.TabIndex = 4; this.btn_lastBoxPrintR.Text = "右侧前一箱单"; this.btn_lastBoxPrintR.UseVisualStyleBackColor = false; @@ -865,9 +897,9 @@ // this.btn_lastBoxPrintL.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintL.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintL.Location = new System.Drawing.Point(278, 0); + this.btn_lastBoxPrintL.Location = new System.Drawing.Point(255, 0); this.btn_lastBoxPrintL.Name = "btn_lastBoxPrintL"; - this.btn_lastBoxPrintL.Size = new System.Drawing.Size(126, 141); + this.btn_lastBoxPrintL.Size = new System.Drawing.Size(116, 123); this.btn_lastBoxPrintL.TabIndex = 2; this.btn_lastBoxPrintL.Text = "左侧前一箱单"; this.btn_lastBoxPrintL.UseVisualStyleBackColor = false; @@ -876,10 +908,10 @@ // 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; @@ -888,20 +920,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; @@ -910,10 +942,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 = "计划数量"; // @@ -923,11 +955,11 @@ this.groupBox1.Controls.Add(this.tableLayoutPanel3); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox1.Location = new System.Drawing.Point(4, 304); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Location = new System.Drawing.Point(4, 266); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Size = new System.Drawing.Size(407, 342); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(372, 300); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "模具2"; @@ -942,14 +974,14 @@ this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0); this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 37); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 32); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(399, 300); + this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 264); this.tableLayoutPanel3.TabIndex = 2; // // panel47 @@ -960,10 +992,10 @@ this.panel47.Controls.Add(this.lbNeedQtyR); this.panel47.Controls.Add(this.lbCurrentlQtyR); this.panel47.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel47.Location = new System.Drawing.Point(4, 204); - this.panel47.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panel47.Location = new System.Drawing.Point(4, 179); + this.panel47.Margin = new System.Windows.Forms.Padding(4); this.panel47.Name = "panel47"; - this.panel47.Size = new System.Drawing.Size(391, 91); + this.panel47.Size = new System.Drawing.Size(356, 81); this.panel47.TabIndex = 4; // // btnHandPrintR @@ -971,10 +1003,10 @@ this.btnHandPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintR.Location = new System.Drawing.Point(269, 18); - this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnHandPrintR.Location = new System.Drawing.Point(247, 16); + this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4); this.btnHandPrintR.Name = "btnHandPrintR"; - this.btnHandPrintR.Size = new System.Drawing.Size(125, 73); + this.btnHandPrintR.Size = new System.Drawing.Size(115, 64); this.btnHandPrintR.TabIndex = 3; this.btnHandPrintR.Text = "打印"; this.btnHandPrintR.UseVisualStyleBackColor = false; @@ -984,10 +1016,10 @@ // this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(94, 29); + this.label30.Location = new System.Drawing.Point(86, 25); this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(56, 59); + this.label30.Size = new System.Drawing.Size(50, 52); this.label30.TabIndex = 2; this.label30.Text = "/"; // @@ -995,10 +1027,10 @@ // this.lbNeedQtyR.AutoSize = true; this.lbNeedQtyR.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbNeedQtyR.Location = new System.Drawing.Point(175, 32); + this.lbNeedQtyR.Location = new System.Drawing.Point(160, 28); this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyR.Name = "lbNeedQtyR"; - this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59); + this.lbNeedQtyR.Size = new System.Drawing.Size(50, 52); this.lbNeedQtyR.TabIndex = 1; this.lbNeedQtyR.Text = "0"; // @@ -1006,10 +1038,10 @@ // this.lbCurrentlQtyR.AutoSize = true; this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyR.Location = new System.Drawing.Point(8, 31); + this.lbCurrentlQtyR.Location = new System.Drawing.Point(7, 27); this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyR.Name = "lbCurrentlQtyR"; - this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyR.TabIndex = 0; this.lbCurrentlQtyR.Text = "0"; this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1019,10 +1051,10 @@ this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label34.BackColor = System.Drawing.Color.Transparent; this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label34.Location = new System.Drawing.Point(5, 122); + this.label34.Location = new System.Drawing.Point(5, 108); this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(116, 53); + this.label34.Size = new System.Drawing.Size(106, 46); this.label34.TabIndex = 1; this.label34.Text = "规格:"; this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1033,10 +1065,10 @@ this.lbPackageCodeR.AutoSize = true; this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2); this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeR.Location = new System.Drawing.Point(4, 31); + this.lbPackageCodeR.Location = new System.Drawing.Point(4, 27); this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeR.Name = "lbPackageCodeR"; - this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeR.TabIndex = 5; // // panel49 @@ -1044,9 +1076,9 @@ this.panel49.Controls.Add(this.btnChangeSizeR); this.panel49.Controls.Add(this.comBoxSizeR); this.panel49.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel49.Location = new System.Drawing.Point(136, 102); + this.panel49.Location = new System.Drawing.Point(124, 90); this.panel49.Name = "panel49"; - this.panel49.Size = new System.Drawing.Size(260, 94); + this.panel49.Size = new System.Drawing.Size(237, 82); this.panel49.TabIndex = 6; // // btnChangeSizeR @@ -1054,10 +1086,10 @@ this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeR.Location = new System.Drawing.Point(139, 17); - this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeR.Location = new System.Drawing.Point(127, 15); + this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4); this.btnChangeSizeR.Name = "btnChangeSizeR"; - this.btnChangeSizeR.Size = new System.Drawing.Size(132, 73); + this.btnChangeSizeR.Size = new System.Drawing.Size(121, 64); this.btnChangeSizeR.TabIndex = 4; this.btnChangeSizeR.Text = "调整"; this.btnChangeSizeR.UseVisualStyleBackColor = false; @@ -1070,10 +1102,10 @@ this.comBoxSizeR.Enabled = false; this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeR.FormattingEnabled = true; - this.comBoxSizeR.Location = new System.Drawing.Point(0, 21); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5); + this.comBoxSizeR.Location = new System.Drawing.Point(0, 18); + this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeR.Name = "comBoxSizeR"; - this.comBoxSizeR.Size = new System.Drawing.Size(136, 72); + this.comBoxSizeR.Size = new System.Drawing.Size(125, 64); this.comBoxSizeR.TabIndex = 3; // // panel36 @@ -1081,26 +1113,26 @@ 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 // this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F)); this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); 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); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.99953F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); + this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -1108,10 +1140,10 @@ this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.BackColor = System.Drawing.Color.DeepSkyBlue; this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label11.Location = new System.Drawing.Point(5, 21); + this.label11.Location = new System.Drawing.Point(5, 18); this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(403, 95); + this.label11.Size = new System.Drawing.Size(370, 83); this.label11.TabIndex = 0; this.label11.Text = "打印记录:"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1122,11 +1154,11 @@ this.groupBox2.Controls.Add(this.tableLayoutPanel4); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold); - this.groupBox2.Location = new System.Drawing.Point(4, 121); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox2.Location = new System.Drawing.Point(4, 105); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox2.Size = new System.Drawing.Size(407, 338); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4); + this.groupBox2.Size = new System.Drawing.Size(372, 297); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "模具1&&手打"; @@ -1141,15 +1173,15 @@ this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 37); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 3; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(399, 296); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 261); this.tableLayoutPanel4.TabIndex = 3; // // label38 @@ -1157,10 +1189,10 @@ this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label38.BackColor = System.Drawing.Color.Transparent; this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(5, 120); + this.label38.Location = new System.Drawing.Point(5, 106); this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(116, 53); + this.label38.Size = new System.Drawing.Size(106, 46); this.label38.TabIndex = 1; this.label38.Text = "规格:"; this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1173,10 +1205,10 @@ this.panel46.Controls.Add(this.lbNeedQtyL); this.panel46.Controls.Add(this.lbCurrentlQtyL); this.panel46.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel46.Location = new System.Drawing.Point(4, 201); - this.panel46.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panel46.Location = new System.Drawing.Point(4, 177); + this.panel46.Margin = new System.Windows.Forms.Padding(4); this.panel46.Name = "panel46"; - this.panel46.Size = new System.Drawing.Size(391, 90); + this.panel46.Size = new System.Drawing.Size(356, 80); this.panel46.TabIndex = 4; // // btnHandPrintL @@ -1184,10 +1216,10 @@ this.btnHandPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintL.Location = new System.Drawing.Point(267, 15); - this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnHandPrintL.Location = new System.Drawing.Point(245, 13); + this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4); this.btnHandPrintL.Name = "btnHandPrintL"; - this.btnHandPrintL.Size = new System.Drawing.Size(125, 73); + this.btnHandPrintL.Size = new System.Drawing.Size(115, 64); this.btnHandPrintL.TabIndex = 3; this.btnHandPrintL.Text = "打印"; this.btnHandPrintL.UseVisualStyleBackColor = false; @@ -1197,10 +1229,10 @@ // this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(91, 29); + this.label31.Location = new System.Drawing.Point(83, 25); this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(56, 59); + this.label31.Size = new System.Drawing.Size(50, 52); this.label31.TabIndex = 2; this.label31.Text = "/"; // @@ -1208,10 +1240,10 @@ // this.lbNeedQtyL.AutoSize = true; this.lbNeedQtyL.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbNeedQtyL.Location = new System.Drawing.Point(169, 32); + this.lbNeedQtyL.Location = new System.Drawing.Point(155, 28); this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyL.Name = "lbNeedQtyL"; - this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59); + this.lbNeedQtyL.Size = new System.Drawing.Size(50, 52); this.lbNeedQtyL.TabIndex = 1; this.lbNeedQtyL.Text = "0"; // @@ -1219,10 +1251,10 @@ // this.lbCurrentlQtyL.AutoSize = true; this.lbCurrentlQtyL.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyL.Location = new System.Drawing.Point(9, 31); + this.lbCurrentlQtyL.Location = new System.Drawing.Point(8, 27); this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyL.Name = "lbCurrentlQtyL"; - this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyL.TabIndex = 0; this.lbCurrentlQtyL.Text = "0"; this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1233,10 +1265,10 @@ this.lbPackageCodeL.AutoSize = true; this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2); this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeL.Location = new System.Drawing.Point(4, 30); + this.lbPackageCodeL.Location = new System.Drawing.Point(4, 26); this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeL.Name = "lbPackageCodeL"; - this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeL.TabIndex = 5; // // panel48 @@ -1244,9 +1276,9 @@ this.panel48.Controls.Add(this.btnChangeSizeL); this.panel48.Controls.Add(this.comBoxSizeL); this.panel48.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel48.Location = new System.Drawing.Point(136, 101); + this.panel48.Location = new System.Drawing.Point(124, 89); this.panel48.Name = "panel48"; - this.panel48.Size = new System.Drawing.Size(260, 92); + this.panel48.Size = new System.Drawing.Size(237, 81); this.panel48.TabIndex = 6; // // btnChangeSizeL @@ -1254,10 +1286,10 @@ this.btnChangeSizeL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeL.Location = new System.Drawing.Point(139, 11); - this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeL.Location = new System.Drawing.Point(127, 10); + this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4); this.btnChangeSizeL.Name = "btnChangeSizeL"; - this.btnChangeSizeL.Size = new System.Drawing.Size(125, 73); + this.btnChangeSizeL.Size = new System.Drawing.Size(115, 64); this.btnChangeSizeL.TabIndex = 4; this.btnChangeSizeL.Text = "调整"; this.btnChangeSizeL.UseVisualStyleBackColor = false; @@ -1270,10 +1302,10 @@ this.comBoxSizeL.Enabled = false; this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeL.FormattingEnabled = true; - this.comBoxSizeL.Location = new System.Drawing.Point(2, 10); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5); + this.comBoxSizeL.Location = new System.Drawing.Point(2, 9); + this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(136, 72); + this.comBoxSizeL.Size = new System.Drawing.Size(125, 64); this.comBoxSizeL.TabIndex = 3; // // panel8 @@ -1282,9 +1314,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(2240, 104); + this.panel8.Size = new System.Drawing.Size(2666, 91); this.panel8.TabIndex = 0; // // panel10 @@ -1292,10 +1324,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(1825, 104); + this.panel10.Size = new System.Drawing.Size(2286, 91); this.panel10.TabIndex = 2; // // panel12 @@ -1303,10 +1335,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(1333, 104); + this.panel12.Size = new System.Drawing.Size(1835, 91); this.panel12.TabIndex = 1; // // panel16 @@ -1314,10 +1346,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(824, 104); + this.panel16.Size = new System.Drawing.Size(1368, 91); this.panel16.TabIndex = 1; // // panel20 @@ -1325,10 +1357,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(357, 104); + this.panel20.Size = new System.Drawing.Size(940, 91); this.panel20.TabIndex = 1; // // label10 @@ -1336,10 +1368,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(0, 104); + this.label10.Size = new System.Drawing.Size(599, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1350,9 +1382,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 @@ -1364,7 +1396,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; @@ -1376,9 +1408,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 @@ -1386,10 +1418,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; @@ -1399,9 +1431,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 @@ -1413,7 +1445,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; @@ -1425,19 +1457,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 @@ -1448,7 +1480,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; @@ -1458,9 +1490,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 @@ -1472,10 +1504,11 @@ 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; + this.label5.Click += new System.EventHandler(this.label5_Click); this.label5.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.label5_MouseDoubleClick); // // panel11 @@ -1484,19 +1517,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 @@ -1509,9 +1542,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 @@ -1519,9 +1552,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 @@ -1533,7 +1566,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; @@ -1543,9 +1576,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 @@ -1557,7 +1590,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; @@ -1568,9 +1601,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(2240, 168); + this.panel2.Size = new System.Drawing.Size(2666, 147); this.panel2.TabIndex = 0; // // panel4 @@ -1578,10 +1611,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(1901, 168); + this.panel4.Size = new System.Drawing.Size(2355, 147); this.panel4.TabIndex = 1; // // panel6 @@ -1590,9 +1623,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(1517, 168); + this.panel6.Size = new System.Drawing.Size(2003, 147); this.panel6.TabIndex = 1; // // btnOnlyBarCode @@ -1601,7 +1634,7 @@ this.btnOnlyBarCode.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOnlyBarCode.Location = new System.Drawing.Point(3, 1); this.btnOnlyBarCode.Name = "btnOnlyBarCode"; - this.btnOnlyBarCode.Size = new System.Drawing.Size(237, 163); + this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143); this.btnOnlyBarCode.TabIndex = 1; this.btnOnlyBarCode.Text = "条码模式"; this.btnOnlyBarCode.UseVisualStyleBackColor = false; @@ -1615,7 +1648,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(1517, 168); + this.label1.Size = new System.Drawing.Size(2003, 147); this.label1.TabIndex = 0; this.label1.Text = "注塑车间箱码条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1624,10 +1657,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(1517, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(5); + this.panel5.Location = new System.Drawing.Point(2003, 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 @@ -1638,7 +1671,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; @@ -1649,19 +1682,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; @@ -1703,14 +1736,27 @@ this.timer3.Interval = 5000; this.timer3.Tick += new System.EventHandler(this.timer3_Tick); // + // lbDevState + // + this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue; + this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbDevState.Location = new System.Drawing.Point(854, 239); + this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lbDevState.Name = "lbDevState"; + this.lbDevState.Size = new System.Drawing.Size(347, 58); + this.lbDevState.TabIndex = 15; + this.lbDevState.Text = "设备已连接"; + this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lbDevState.Click += new System.EventHandler(this.lbDevState_Click); + // // FrmMain2408 // - 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(2240, 1601); + this.ClientSize = new System.Drawing.Size(2666, 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 = "FrmMain2408"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; @@ -1830,9 +1876,7 @@ private System.Windows.Forms.Panel panel40; private System.Windows.Forms.Panel panel42; private System.Windows.Forms.Panel panel43; - private System.Windows.Forms.Label label23; private System.Windows.Forms.Panel panel41; - private System.Windows.Forms.Label label22; private System.Windows.Forms.Panel panel44; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button1; @@ -1905,5 +1949,10 @@ private System.Windows.Forms.Button btnOnlyBarCode; private System.Windows.Forms.Button btn_lastBoxPrintL; private System.Windows.Forms.Button btn_lastBoxPrintR; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label lbAddPrintR; + private System.Windows.Forms.Label lbAddPrintL; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label lbDevState; } } \ No newline at end of file diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index 22c69c3..48a3a95 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -69,6 +69,7 @@ namespace InjectionPC //零件用的打印机编号 <零件号+工位ID,打印机编号> private Dictionary _printNameDict = new Dictionary(); private PlasticBLL _plasticBLL = new PlasticBLL(); + private int _plcRate = 100; //500 #endregion public FrmMain2408() @@ -112,10 +113,28 @@ namespace InjectionPC initProduct(); textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2); //批次 + + string devRate = ConfigurationManager.AppSettings["DevRate"]; + if (!string.IsNullOrEmpty(devRate)) + { + int i = 0; + if (int.TryParse(devRate, out i) == true) + { + if (i > 0) + { + _plcRate = i; + } + } + } + + initBarCode(); label23.Enabled = false; label23.BackColor = System.Drawing.Color.Gray; + + + DataTable plasticTable = GetPlastic(); foreach(DataRow dr in plasticTable.Rows) { @@ -125,6 +144,9 @@ namespace InjectionPC _printNameDict.Add(key, dr["PrinterNo"].ToString()); } } + + + InitPackageInfo(); Ping p1 = new Ping(); @@ -205,9 +227,9 @@ namespace InjectionPC opcGroups = opcServer.OPCGroups; opcGroup1 = opcGroups.Add("Mould"); - SetGroupProperty(opcGroup1, 500); + SetGroupProperty(opcGroup1, _plcRate); opcGroup2 = opcGroups.Add("Break"); - SetGroupProperty(opcGroup2, 500); + SetGroupProperty(opcGroup2, _plcRate); #endregion @@ -2229,7 +2251,7 @@ namespace InjectionPC for (int i = 0; i < dt.Rows.Count; i++) { glacialList1.Items.Add(i.ToString()); - glacialList1.Items[i].SubItems[0].Text = dt.Rows[i]["BarCode"].ToString(); + glacialList1.Items[i].SubItems[0].Text = dt.Rows[i]["OneBarCode"].ToString(); glacialList1.Items[i].SubItems[0].Tag = dt.Rows[i]["BoxNo"].ToString(); glacialList1.Items[i].SubItems[1].Text = dt.Rows[i]["ProductName"].ToString(); glacialList1.Items[i].SubItems[2].Text = dt.Rows[i]["PrintType"].ToString(); @@ -3051,6 +3073,187 @@ namespace InjectionPC return ""; } } + /// + /// 往左箱单添加新码 + /// + /// + /// + private void lbAddPrintL_Click(object sender, EventArgs e) + { + ReAddBarCodeToBox( lbPackageCodeL, lbCurrentlQtyL, lbNeedQtyL,"左侧"); + + } + /// + /// 往右箱单添加新码 + /// + /// + /// + private void lbAddPrintR_Click(object sender, EventArgs e) + { + ReAddBarCodeToBox(lbPackageCodeR, lbCurrentlQtyR, lbNeedQtyR, "右侧"); + } + void ReAddBarCodeToBox(Label lbPackageCode, Label lbCurrentlQty, Label lbNeedQty,string hintTxt) + { + BarCodeBLL bll = new BarCodeBLL(); + InjectionBoxBLL inBoxBll = new InjectionBoxBLL(); + string boxCode = lbPackageCode.Text?.Trim(); + if (string.IsNullOrEmpty(boxCode)) + { + MessageBox.Show(hintTxt + "箱码为空,无法添加新零件."); + return; + } + string tcompletedQtyStr = lbCurrentlQty.Text?.Trim(); + string allQtyStr = lbNeedQty.Text?.Trim(); + int count1 = 0; + int count2 = 0; + int.TryParse(tcompletedQtyStr, out count1); + int.TryParse(allQtyStr, out count2); + if (count2 == 0) + { + MessageBox.Show(hintTxt + "箱码规格为空,无法添加新零件."); + return; + } + if (count1 >= count2) + { + MessageBox.Show(hintTxt + "箱码已满,无法添加新零件."); + return; + } + + DialogResult result = MessageBox.Show($"确定向"+ hintTxt +$"箱码[{boxCode}]插入一条全新数据并打印?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); + if (result == DialogResult.OK) + { + DataTable dt = bll.SearchInfoByBox(boxCode, Program.tableName); + if (dt.Rows.Count == 0) + { + MessageBox.Show($"表[{Program.tableName}]中没有找到{hintTxt}箱码[{boxCode}]关联的数据记录."); + return; + } + try + { + + inBoxBll.UpdateBoxCount(boxCode, 1, false); + BoxBarCodeReAddAndPrint(dt.Rows[0]); + InitPackageInfo(); + //试试打印数量是否更新 + int count3 = 0; + int count4 = 0; + int.TryParse(lbCurrentlQty.Text?.Trim(), out count3); + int.TryParse(allQtyStr, out count4); + + if(count3 == count4) + { + if(hintTxt == "左侧") + { + UnCompletePrintBox("手动打印箱码", "left"); + } + else + { + UnCompletePrintBox("手动打印箱码", "right"); + } + + } + } + catch (Exception ex) + { + MessageBox.Show($"向{hintTxt}箱码[{boxCode}]添加数据失败,原因:" + ex.Message); + InitPackageInfo(); + } + + } + } + bool BoxBarCodeReAddAndPrint(DataRow barCodeRow) + { + ProductBLL pbll = new ProductBLL(); + BarCodeBLL bll = new BarCodeBLL(); + string code = "", filename = "", printName = "", ManufacturerName = ""; + string IsSupply = "0"; + BarCodeModel md = new BarCodeModel(); + + + + + md.ID = Guid.NewGuid().ToString(); + md.StationID = barCodeRow["StationID"].ToString(); + md.StockNo = barCodeRow["StockNo"].ToString(); + md.PartNo = barCodeRow["PartNo"].ToString(); + md.BatchNo = barCodeRow["BatchNo"].ToString(); + string newOneCode = string.Empty; + string newBarCode = string.Empty; + GetBarCode(md.StockNo, md.BatchNo, md.PartNo, ref newOneCode, ref newBarCode); + md.OneBarCode = newOneCode; + md.BarCode = newBarCode; + md.BoxNo = barCodeRow["BoxNo"].ToString(); + + md.Des1 = barCodeRow["Des1"].ToString(); + md.PrintType = 2; + + //DataTable pdt = pbll.SearchIsImportByPartNo(md.PartNo); + + DataTable pdt = pbll.SearchInfoByPartNo(md.PartNo); + if (pdt != null && pdt.Rows.Count > 0) + { + if (pdt.Rows[0]["isImport"].ToString() == "1") + { + md.Import = "国产料Kingfa"; + } + else + { + md.Import = ""; + } + + ManufacturerName = pdt.Rows[0]["ManufacturerName"].ToString().Trim(); + IsSupply = pdt.Rows[0]["IsSupply"].ToString(); + } + + string msg = bll.ReprintSave(md, Program.tableName, "", "", Program.station); + if (!string.IsNullOrEmpty(msg)) + { + MessageBox.Show($"补打失败,原因:" + msg); + return false; + } + glacialList1.SelectedItems.Clear(); + initBarCode(); + + #region 打印条码 + + filename = ManufacturerName.Contains("蔚来") + ? AppDomain.CurrentDomain.BaseDirectory + + "wl.grf" + : AppDomain.CurrentDomain.BaseDirectory + + PrintMoudleName(IsSupply, "Print" + Program.station + "_3102"); //new + if (md.PartNo.Contains("A2146982300") || + md.PartNo.Contains("A2146982400")) + { + filename = AppDomain.CurrentDomain.BaseDirectory + + "Sill.grf"; + } + + string partName = ""; + DataTable dt2 = pbll.SearchInfoByPartNo(md.PartNo); + if (dt2 != null && dt2.Rows.Count > 0) + { + partName = dt2.Rows[0]["ProductName"].ToString(); + } + else + { + partName = ""; + } + + printName = "Printer" + _printNameDict[md.PartNo + md.StationID]; + + string reportName = ConfigurationManager.AppSettings[printName].ToString(); + DataTable headTable = GetPrintHeadTable(md.PartNo, partName, md.OneBarCode, md.BarCode); + + + ReportHelper rp = new ReportHelper(filename, headTable, null, + (int)GRPaperOrientation.grpoDefault, 1, reportName); + LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + md.OneBarCode, MethodBase.GetCurrentMethod()); + rp.Report.Print(false); + + #endregion + + return true; + } /// /// 补打条码 @@ -3089,54 +3292,53 @@ namespace InjectionPC } DataTable dt = bll.SearchInfoByBarCodeNew(code, Program.tableName); - if (dt != null && dt.Rows.Count > 0) + if (dt == null || dt.Rows.Count == 0) { - md.ID = Guid.NewGuid().ToString(); - //md.BarCode = code; - md.StationID = dt.Rows[0]["StationID"].ToString(); - md.StockNo = dt.Rows[0]["StockNo"].ToString(); - md.PartNo = dt.Rows[0]["PartNo"].ToString(); - md.BatchNo = dt.Rows[0]["BatchNo"].ToString(); - string newOneCode = string.Empty; - string newBarCode = string.Empty; - GetBarCode(md.StockNo, md.BatchNo, md.PartNo, ref newOneCode, ref newBarCode); - md.OneBarCode = newOneCode; - md.BarCode = newBarCode; - md.BoxNo = dt.Rows[0]["BoxNo"].ToString(); - if (gv.SubItems.Count > 1) - { - md.Des1 = gv.SubItems[1].Text; - } + MessageBox.Show($"补打失败,条码[{code}]在表[{ Program.tableName}]中不存在!"); + return; + } - md.PrintType = 2; - //DataTable pdt = pbll.SearchIsImportByPartNo(md.PartNo); + md.ID = Guid.NewGuid().ToString(); + //md.BarCode = code; + md.StationID = dt.Rows[0]["StationID"].ToString(); + md.StockNo = dt.Rows[0]["StockNo"].ToString(); + md.PartNo = dt.Rows[0]["PartNo"].ToString(); + md.BatchNo = dt.Rows[0]["BatchNo"].ToString(); + string newOneCode = string.Empty; + string newBarCode = string.Empty; + GetBarCode(md.StockNo, md.BatchNo, md.PartNo, ref newOneCode, ref newBarCode); + md.OneBarCode = newOneCode; + md.BarCode = newBarCode; + md.BoxNo = dt.Rows[0]["BoxNo"].ToString(); + if (gv.SubItems.Count > 1) + { + md.Des1 = gv.SubItems[1].Text; + } - DataTable pdt = pbll.SearchInfoByPartNo(md.PartNo); - if (pdt != null && pdt.Rows.Count > 0) - { - if (pdt.Rows[0]["isImport"].ToString() == "1") - { - md.Import = "国产料Kingfa"; - } - else - { - md.Import = ""; - } + md.PrintType = 2; - ManufacturerName = pdt.Rows[0]["ManufacturerName"].ToString().Trim(); - IsSupply = pdt.Rows[0]["IsSupply"].ToString(); - } + //DataTable pdt = pbll.SearchIsImportByPartNo(md.PartNo); - - } - else + DataTable pdt = pbll.SearchInfoByPartNo(md.PartNo); + if (pdt != null && pdt.Rows.Count > 0) { - MessageBox.Show($"补打失败,条码[{code}]在表[{ Program.tableName}]中不存在!"); - return; + if (pdt.Rows[0]["isImport"].ToString() == "1") + { + md.Import = "国产料Kingfa"; + } + else + { + md.Import = ""; + } + + ManufacturerName = pdt.Rows[0]["ManufacturerName"].ToString().Trim(); + IsSupply = pdt.Rows[0]["IsSupply"].ToString(); } - string msg = bll.ReprintSave(md, Program.tableName, dt.Rows[0]["OneBarCode"].ToString(), dt.Rows[0]["BarCode"].ToString(),Program.station); + + + string msg = bll.ReprintSave(md, Program.tableName, dt.Rows[0]["OneBarCode"].ToString(), dt.Rows[0]["BarCode"].ToString(), Program.station); if (!string.IsNullOrEmpty(msg)) { MessageBox.Show($"补打失败,原因:" + msg); @@ -3163,7 +3365,7 @@ namespace InjectionPC filename = AppDomain.CurrentDomain.BaseDirectory + "Sill.grf"; } - + string partName = ""; DataTable dt2 = pbll.SearchInfoByPartNo(md.PartNo); if (dt2 != null && dt2.Rows.Count > 0) @@ -3188,7 +3390,7 @@ namespace InjectionPC ReportHelper rp = new ReportHelper(filename, headTable, null, - (int) GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoDefault, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + md.OneBarCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); @@ -3676,7 +3878,7 @@ namespace InjectionPC opcGroups = opcServer.OPCGroups; opcGroup1 = opcGroups.Add("Mould"); - SetGroupProperty(opcGroup1, 500); + SetGroupProperty(opcGroup1, _plcRate); #endregion @@ -4335,38 +4537,6 @@ namespace InjectionPC lbPackageCode.Text = ""; lbCurrentlQty.Text = "0"; - - ////检查上一个箱码是否给wms传成功了, 没成功重传一次. - //if (!string.IsNullOrEmpty(_lastBoxNoL)) - //{ - // if (_wmsBll.IsSendPackageCode(_lastBoxNoL) == false) - // { - // DataTable dt2 = _injectionBoxBLL.SearchBox(_lastBoxNoL); - // if (dt2.Rows.Count > 0) - // { - // _wmsBll.SaveInterface(dt2.Rows[0], MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工); - // } - // } - // _lastBoxNoL = ""; - - //} - //if (!string.IsNullOrEmpty(_lastBoxNoR)) - //{ - // if (_wmsBll.IsSendPackageCode(_lastBoxNoR) == false) - // { - // DataTable dt2 = _injectionBoxBLL.SearchBox(_lastBoxNoR); - // if (dt2.Rows.Count > 0) - // { - // _wmsBll.SaveInterface(dt2.Rows[0], MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工); - // } - // } - // _lastBoxNoR = ""; - - //} - - ////wms接口传递 - //_wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工); - string rst = _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), _lastBoxNoL, _lastBoxNoR, MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工, Program.station); if (string.IsNullOrEmpty(rst)) { @@ -4733,13 +4903,8 @@ namespace InjectionPC FrmPackageDetail frmPackageDetail = new FrmPackageDetail(boxCode); frmPackageDetail.ShowDialog(); } + - private void tableLayoutPanel1_Paint(object sender, PaintEventArgs e) - { - - } - - /// /// 直供件条码 A2478852600#Q02#240826#001# /// @@ -4888,14 +5053,18 @@ namespace InjectionPC /// private void label5_MouseDoubleClick(object sender, MouseEventArgs e) { - timer3.Enabled = false; + string cs = ConfigurationManager.AppSettings["测试"]; + if (!string.IsNullOrEmpty(cs) && cs == "true") + { + timer3.Enabled = false; + } } /// /// 未满器具打箱码 变更规格型号,手工打印箱码,切换下一计划,手动自动切换 /// /// /// - bool UnCompletePrintBox(string lable,string leftOrRight) + bool UnCompletePrintBox(string lable,string leftOrRight,bool needConfirm = true) { string boxCodeL = lbPackageCodeL.Text?.Trim(); string boxCodeR = lbPackageCodeR.Text?.Trim(); @@ -4907,10 +5076,14 @@ namespace InjectionPC DataTable dt = _injectionBoxBLL.SearchBox(boxCodeL); if (dt.Rows.Count > 0 && dt.Rows[0]["IsPrint"].ToString() == "0" && int.Parse(dt.Rows[0]["BoxCount"].ToString()) > 0) { - if (MessageBox.Show($"当前箱码[{boxCodeL}]未满器具,执行[{lable}]操作,该箱码会被设置为完成状态,是否继续?", "未满器具提醒", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + if (needConfirm) { - return false; + if (MessageBox.Show($"当前箱码[{boxCodeL}]未满器具,执行[{lable}]操作,该箱码会被设置为完成状态,是否继续?", "未满器具提醒", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + { + return false; + } } + lbPackageCodeL.Text = ""; lbCurrentlQtyL.Text = "0"; @@ -4935,10 +5108,14 @@ namespace InjectionPC DataTable dt = _injectionBoxBLL.SearchBox(boxCodeR); if (dt.Rows.Count > 0 && dt.Rows[0]["IsPrint"].ToString() == "0" && int.Parse(dt.Rows[0]["BoxCount"].ToString()) > 0) { - if (MessageBox.Show($"当前箱码[{boxCodeR}]未满器具,执行[{lable}]操作,该箱码会被设置为完成状态,是否继续?", "未满器具提醒", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + if (needConfirm) { - return false; + if (MessageBox.Show($"当前箱码[{boxCodeR}]未满器具,执行[{lable}]操作,该箱码会被设置为完成状态,是否继续?", "未满器具提醒", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + { + return false; + } } + lbPackageCodeR.Text = ""; lbCurrentlQtyR.Text = "0"; @@ -5064,10 +5241,10 @@ namespace InjectionPC string PrintMoudleName(string isSupply = "0",string invokeInfo ="") { - if (!string.IsNullOrEmpty(invokeInfo)) - { - SaveLog2(invokeInfo); - } + //if (!string.IsNullOrEmpty(invokeInfo)) + //{ + // SaveLog2(invokeInfo); + //} if("IM05,IM08,IM10".Contains(Program.station)) //二维小条码 { @@ -5203,6 +5380,107 @@ namespace InjectionPC } } + + private void label5_Click(object sender, EventArgs e) + { + + } + /// + /// 设备状态 + /// + /// + /// + private void lbDevState_Click(object sender, EventArgs e) + { + if(lbDevState.Text == "设备已连接") + { + if (MessageBox.Show("确认断开设备连接?", "设备断开确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; + lbDevState.Text = "设备已断开"; + lbDevState.BackColor = Color.Red; + opcGroup1.DataChange -= new DIOPCGroupEvent_DataChangeEventHandler(opcGroup1_DataChange); + opcServer.OPCGroups.RemoveAll(); + opcServer.Disconnect(); + serialPort1.Close(); + timer3.Enabled = false; + } + else + { + if (MessageBox.Show("确认连接到注塑设备?", "设备连接确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; + + try + { + if (CreateServer()) + { + if (ConnectServer(strHostIP, "Kepware.KEPServerEX.V6")) + { + Connected = true; + + #region 创建组 + + opcGroups = opcServer.OPCGroups; + opcGroup1 = opcGroups.Add("Mould"); + SetGroupProperty(opcGroup1, _plcRate); + + #endregion + + #region 创建项 + + opcItems1 = opcGroup1.OPCItems; + opcItems1.DefaultIsActive = true; + + PLCMouldBLL PLCbll = new PLCMouldBLL(); + PLCBreakBLL bbll = new PLCBreakBLL(); + + DataTable PLCdt = PLCbll.SearchMould(Program.station); + if (PLCdt != null && PLCdt.Rows.Count > 0) + { + opcItemm1 = new OPCItem[PLCdt.Rows.Count]; + for (int i = 0; i < PLCdt.Rows.Count; i++) + { + opcItemm1[i] = opcItems1.AddItem(PLCdt.Rows[i]["Address"].ToString(), i); + } + } + + Thread.Sleep(200); + + opcGroup1.DataChange += new DIOPCGroupEvent_DataChangeEventHandler(opcGroup1_DataChange); + + + #endregion + } + else + { + MessageBox.Show("连接到OPC服务器失败!", "提示", MessageBoxButtons.OK); + Connected = false; + LogHelper.WriteLog("连接到OPC服务器失败!"); + return; + } + + lbDevState.Text = "设备已连接"; + lbDevState.BackColor = Color.DeepSkyBlue; + timer3.Enabled = true; + } + else + { + MessageBox.Show("创建OPC服务失败!", "提示", MessageBoxButtons.OK); + Connected = false; + LogHelper.WriteLog("创建OPC服务失败!"); + return; + } + + } + catch (Exception ex) + { + MessageBox.Show("创建OPC服务失败!", "提示", MessageBoxButtons.OK); + Connected = false; + LogHelper.WriteLog("创建OPC服务失败!"); + LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); + return; + } + + } + } + void SaveLog(string txt) { //try diff --git a/InjectionPC/FrmMain2408.resx b/InjectionPC/FrmMain2408.resx index 58c5060..2a8e8bc 100644 --- a/InjectionPC/FrmMain2408.resx +++ b/InjectionPC/FrmMain2408.resx @@ -490,4 +490,7 @@ 307, 17 + + 90 + \ No newline at end of file diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs index 49379cf..9ab5358 100644 --- a/InjectionPC/FrmMain2411.Designer.cs +++ b/InjectionPC/FrmMain2411.Designer.cs @@ -46,6 +46,7 @@ this.panel40 = new System.Windows.Forms.Panel(); this.panel42 = new System.Windows.Forms.Panel(); this.panel39 = new System.Windows.Forms.Panel(); + this.lbDevState = new System.Windows.Forms.Label(); this.textBox2 = new System.Windows.Forms.TextBox(); this.label18 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); @@ -183,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, 1830); + this.panel1.Size = new System.Drawing.Size(2347, 1600); this.panel1.TabIndex = 0; // // panel7 @@ -194,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, 1662); + this.panel7.Size = new System.Drawing.Size(2347, 1453); this.panel7.TabIndex = 1; // // panel23 @@ -205,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, 1558); + this.panel23.Size = new System.Drawing.Size(2347, 1362); this.panel23.TabIndex = 1; // // panel27 @@ -216,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, 443); + this.panel27.Size = new System.Drawing.Size(2347, 386); this.panel27.TabIndex = 1; // // panel29 @@ -227,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, 443); + this.panel29.Size = new System.Drawing.Size(2036, 386); this.panel29.TabIndex = 1; // // panel31 @@ -238,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, 443); + this.panel31.Size = new System.Drawing.Size(1914, 386); this.panel31.TabIndex = 1; // // panel33 @@ -249,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, 443); + this.panel33.Size = new System.Drawing.Size(1792, 386); this.panel33.TabIndex = 1; // // panel35 @@ -260,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, 443); + this.panel35.Size = new System.Drawing.Size(1670, 386); this.panel35.TabIndex = 1; // // panel37 @@ -270,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, 443); + this.panel37.Size = new System.Drawing.Size(1670, 386); this.panel37.TabIndex = 1; // // panel40 @@ -281,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, 443); + this.panel40.Size = new System.Drawing.Size(1670, 386); this.panel40.TabIndex = 1; // // panel42 @@ -292,15 +293,16 @@ 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, 443); + this.panel42.Size = new System.Drawing.Size(1548, 386); this.panel42.TabIndex = 1; // // panel39 // this.panel39.BackColor = System.Drawing.Color.Aquamarine; this.panel39.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel39.Controls.Add(this.lbDevState); this.panel39.Controls.Add(this.textBox2); this.panel39.Controls.Add(this.label18); this.panel39.Controls.Add(this.label19); @@ -310,28 +312,41 @@ 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, 443); + 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(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(347, 58); + this.lbDevState.TabIndex = 16; + this.lbDevState.Text = "设备已连接"; + this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lbDevState.Click += new System.EventHandler(this.lbDevState_Click); + // // 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 = "数量:"; // @@ -339,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)"; // @@ -350,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 = "批次:"; // @@ -372,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); // @@ -383,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 = "产品:"; // @@ -394,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, 443); + this.panel43.Size = new System.Drawing.Size(122, 386); this.panel43.TabIndex = 0; // // label23 @@ -408,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, 443); + this.label23.Size = new System.Drawing.Size(122, 386); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -418,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, 443); + this.panel41.Size = new System.Drawing.Size(122, 386); this.panel41.TabIndex = 0; // // label22 @@ -432,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, 443); + this.label22.Size = new System.Drawing.Size(122, 386); this.label22.TabIndex = 0; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -442,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, 443); + this.panel34.Size = new System.Drawing.Size(122, 386); this.panel34.TabIndex = 0; // // label15 @@ -456,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, 443); + this.label15.Size = new System.Drawing.Size(122, 386); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -467,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, 443); + this.panel32.Size = new System.Drawing.Size(122, 386); this.panel32.TabIndex = 0; // // label14 @@ -480,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, 443); + this.label14.Size = new System.Drawing.Size(122, 386); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -491,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, 443); + this.panel30.Size = new System.Drawing.Size(122, 386); this.panel30.TabIndex = 0; // // label13 @@ -504,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, 443); + this.label13.Size = new System.Drawing.Size(122, 386); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -515,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, 443); + this.panel28.Size = new System.Drawing.Size(311, 386); this.panel28.TabIndex = 0; // // label12 @@ -529,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, 443); + this.label12.Size = new System.Drawing.Size(311, 386); this.label12.TabIndex = 0; this.label12.Text = "打印信息:"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -540,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 @@ -551,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 @@ -564,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; @@ -585,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; @@ -597,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; @@ -622,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; @@ -643,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; @@ -655,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; @@ -736,17 +751,17 @@ this.glacialList1.HoverEvents = false; this.glacialList1.HoverTime = 1; this.glacialList1.ImageList = null; - this.glacialList1.ItemHeight = 57; + this.glacialList1.ItemHeight = 50; 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; @@ -759,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 @@ -770,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); 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 @@ -786,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; @@ -807,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; @@ -829,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 = "计划数量"; // @@ -841,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 @@ -853,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); 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 @@ -869,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; @@ -880,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 @@ -890,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 @@ -901,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 @@ -912,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 @@ -923,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 @@ -934,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; @@ -948,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 @@ -962,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; @@ -974,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 @@ -984,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; @@ -997,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 @@ -1011,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; @@ -1023,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 @@ -1046,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; @@ -1056,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 @@ -1070,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; @@ -1082,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 @@ -1107,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 @@ -1117,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 @@ -1131,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; @@ -1141,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 @@ -1155,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; @@ -1166,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 @@ -1176,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 @@ -1188,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 @@ -1199,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; @@ -1213,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; @@ -1222,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 @@ -1236,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; @@ -1247,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; @@ -1303,12 +1318,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, 1830); + 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"; @@ -1464,5 +1479,6 @@ private System.Windows.Forms.Label label35; private System.Windows.Forms.Label label39; private System.Windows.Forms.Button btnBarCodeWithBox; + private System.Windows.Forms.Label lbDevState; } } \ No newline at end of file diff --git a/InjectionPC/FrmMain2411.cs b/InjectionPC/FrmMain2411.cs index 2a791af..cd176be 100644 --- a/InjectionPC/FrmMain2411.cs +++ b/InjectionPC/FrmMain2411.cs @@ -67,6 +67,7 @@ namespace InjectionPC //零件用的打印机编号 <零件号+工位ID,打印机编号> private Dictionary _printNameDict = new Dictionary(); private PlasticBLL _plasticBLL = new PlasticBLL(); + private int _plcRate = 100; //500 #endregion public FrmMain2411() @@ -147,8 +148,18 @@ namespace InjectionPC //comBoxSizeR.DisplayMember = "describe"; //comBoxSizeR.ValueMember = "Count"; - - + string devRate = ConfigurationManager.AppSettings["DevRate"]; + if (!string.IsNullOrEmpty(devRate)) + { + int i = 0; + if(int.TryParse(devRate,out i) == true) + { + if(i>0) + { + _plcRate = i; + } + } + } comboBox2.MouseWheel += new MouseEventHandler(comboBox2_MouseWheel); @@ -204,9 +215,9 @@ namespace InjectionPC opcGroups = opcServer.OPCGroups; opcGroup1 = opcGroups.Add("Mould"); - SetGroupProperty(opcGroup1, 500); + SetGroupProperty(opcGroup1, _plcRate); opcGroup2 = opcGroups.Add("Break"); - SetGroupProperty(opcGroup2, 500); + SetGroupProperty(opcGroup2, _plcRate); #endregion @@ -2180,7 +2191,7 @@ namespace InjectionPC for (int i = 0; i < dt.Rows.Count; i++) { glacialList1.Items.Add(i.ToString()); - glacialList1.Items[i].SubItems[0].Text = dt.Rows[i]["BarCode"].ToString(); + glacialList1.Items[i].SubItems[0].Text = dt.Rows[i]["OneBarCode"].ToString(); glacialList1.Items[i].SubItems[0].Tag = dt.Rows[i]["BoxNo"].ToString(); glacialList1.Items[i].SubItems[1].Text = dt.Rows[i]["ProductName"].ToString(); glacialList1.Items[i].SubItems[2].Text = dt.Rows[i]["PrintType"].ToString(); @@ -3602,7 +3613,7 @@ namespace InjectionPC opcGroups = opcServer.OPCGroups; opcGroup1 = opcGroups.Add("Mould"); - SetGroupProperty(opcGroup1, 500); + SetGroupProperty(opcGroup1, _plcRate); #endregion @@ -4232,31 +4243,41 @@ namespace InjectionPC SaveBarCode(_lastbarCodeModel, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); } } - - _lastbarCodeModel = md; - if (SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint) == false) + _lastbarCodeModel = null; + try { - int a = 0; - for (int l = 0; l < 3; l++) + if (SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint) == false) { - // if (brbll.Add_Info_New(md, Program.tableName)) - if (SaveBarCode(md, Program.tableName, true, mould, ref errMsg, handPrint) == true) + int a = 0; + for (int l = 0; l < 3; l++) { - break; - } + // if (brbll.Add_Info_New(md, Program.tableName)) + if (SaveBarCode(md, Program.tableName, true, mould, ref errMsg, handPrint) == true) + { + break; + } - a += 1; - //Thread.Sleep(200); - Thread.Sleep(200); - } + a += 1; + //Thread.Sleep(200); + Thread.Sleep(200); + } - if (a >= 2) - { - SaveLog3(Program.station+"保存3次失败,条码" + md.OneBarCode); - return false; + if (a >= 2) + { + _lastbarCodeModel = md; + SaveLog3(Program.station + "保存3次失败,条码" + md.OneBarCode); + return false; + } } + return true; + } + catch(Exception ex) + { + _lastbarCodeModel = md; + errMsg = ex.Message; + LogErrBLL.AddInfo(Program.station + "保存异常-" + md.OneBarCode + ":" + errMsg, MethodBase.GetCurrentMethod()); + return false; } - return true; } /// @@ -4363,7 +4384,12 @@ namespace InjectionPC /// private void label5_MouseDoubleClick(object sender, MouseEventArgs e) { - timer3.Enabled = false; + string cs = ConfigurationManager.AppSettings["测试"]; + if (!string.IsNullOrEmpty(cs) && cs=="true") + { + timer3.Enabled = false; + } + } private void btnBarCodeWithBox_Click(object sender, EventArgs e) @@ -4389,6 +4415,98 @@ namespace InjectionPC } } + + + private void lbDevState_Click(object sender, EventArgs e) + { + if (lbDevState.Text == "设备已连接") + { + if (MessageBox.Show("确认断开设备连接?", "设备断开确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; + lbDevState.Text = "设备已断开"; + lbDevState.BackColor = Color.Red; + opcGroup1.DataChange -= new DIOPCGroupEvent_DataChangeEventHandler(opcGroup1_DataChange); + opcServer.OPCGroups.RemoveAll(); + opcServer.Disconnect(); + serialPort1.Close(); + timer3.Enabled = false; + } + else + { + if (MessageBox.Show("确认连接到注塑设备?", "设备连接确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; + + try + { + if (CreateServer()) + { + if (ConnectServer(strHostIP, "Kepware.KEPServerEX.V6")) + { + Connected = true; + + #region 创建组 + + opcGroups = opcServer.OPCGroups; + opcGroup1 = opcGroups.Add("Mould"); + SetGroupProperty(opcGroup1, _plcRate); + + #endregion + + #region 创建项 + + opcItems1 = opcGroup1.OPCItems; + opcItems1.DefaultIsActive = true; + + PLCMouldBLL PLCbll = new PLCMouldBLL(); + PLCBreakBLL bbll = new PLCBreakBLL(); + + DataTable PLCdt = PLCbll.SearchMould(Program.station); + if (PLCdt != null && PLCdt.Rows.Count > 0) + { + opcItemm1 = new OPCItem[PLCdt.Rows.Count]; + for (int i = 0; i < PLCdt.Rows.Count; i++) + { + opcItemm1[i] = opcItems1.AddItem(PLCdt.Rows[i]["Address"].ToString(), i); + } + } + + Thread.Sleep(200); + + opcGroup1.DataChange += new DIOPCGroupEvent_DataChangeEventHandler(opcGroup1_DataChange); + + + #endregion + } + else + { + MessageBox.Show("连接到OPC服务器失败!", "提示", MessageBoxButtons.OK); + Connected = false; + LogHelper.WriteLog("连接到OPC服务器失败!"); + return; + } + + lbDevState.Text = "设备已连接"; + lbDevState.BackColor = Color.DeepSkyBlue; + timer3.Enabled = true; + } + else + { + MessageBox.Show("创建OPC服务失败!", "提示", MessageBoxButtons.OK); + Connected = false; + LogHelper.WriteLog("创建OPC服务失败!"); + return; + } + + } + catch (Exception ex) + { + MessageBox.Show("创建OPC服务失败!", "提示", MessageBoxButtons.OK); + Connected = false; + LogHelper.WriteLog("创建OPC服务失败!"); + LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); + return; + } + + } + } string PrintMoudleName(string isSupply = "0") { diff --git a/InjectionPC/FrmQuality.cs b/InjectionPC/FrmQuality.cs index d412b81..b488772 100644 --- a/InjectionPC/FrmQuality.cs +++ b/InjectionPC/FrmQuality.cs @@ -750,14 +750,30 @@ namespace InjectionPC return reg1.IsMatch(str); } - + /// + /// 扫描条码 + /// + /// + /// private void textBox3_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) { - textBox2.Text = "1"; - _boxDetailTable = null; - BarCodeScan(txtScanBarCode.Text.Trim()); + try + { + textBox2.Text = "1"; + _boxDetailTable = null; + BarCodeScan(txtScanBarCode.Text.Trim()); + } + catch(Exception ex) + { + MessageBox.Show(ex.Message); + + } + finally + { + txtScanBarCode.SelectAll(); + } } } private string _scanPartNo = string.Empty; @@ -791,16 +807,31 @@ namespace InjectionPC MessageBox.Show("条码有误!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); return; } - - barcode = code.Split('.'); - DataTable dt = bll.SearchInfoByPartNo(barcode[0]); - if (dt != null && dt.Rows.Count > 0) + if (code.Contains("#")) + { + barcode = code.Split('#'); + DataTable dt = bll.SearchInfoByPartNo(barcode[0]); + if (dt != null && dt.Rows.Count > 0) + { + textBox4.Text = dt.Rows[0]["ProductName"].ToString(); + row = Convert.ToInt32(dt.Rows[0]["Rows"].ToString()); + col = Convert.ToInt32(dt.Rows[0]["Cols"].ToString()); + picture = dt.Rows[0]["PicturePath"].ToString(); + } + } + else { - textBox4.Text = dt.Rows[0]["ProductName"].ToString(); - row = Convert.ToInt32(dt.Rows[0]["Rows"].ToString()); - col = Convert.ToInt32(dt.Rows[0]["Cols"].ToString()); - picture = dt.Rows[0]["PicturePath"].ToString(); + barcode = code.Split('.'); + DataTable dt = bll.SearchInfoByPartNo(barcode[0]); + if (dt != null && dt.Rows.Count > 0) + { + textBox4.Text = dt.Rows[0]["ProductName"].ToString(); + row = Convert.ToInt32(dt.Rows[0]["Rows"].ToString()); + col = Convert.ToInt32(dt.Rows[0]["Cols"].ToString()); + picture = dt.Rows[0]["PicturePath"].ToString(); + } } + } else { @@ -844,36 +875,6 @@ namespace InjectionPC } } - - try - { - #region Load PictureBox - - if (!string.IsNullOrEmpty(picture)) - { - if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) - { - //string strImageURL = ConfigurationManager.AppSettings["PicturePath"] + picture; - string strImageURL = "http://10.60.101.59:8001/PDF/" + picture; - - System.Net.WebClient webClient = new System.Net.WebClient(); - webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); - } - - FileStream fs = new FileStream(Directory.GetCurrentDirectory() + "\\" + picture, FileMode.Open, - FileAccess.Read); //获取图片文件流 - Image img = Image.FromStream(fs); // 文件流转换成Image格式 - pictureBox2.Image = img; //给 图片框设置要显示的图片 - fs.Close(); // 关闭流,释放图片资源 - } - - #endregion - } - catch (Exception ex) - { - LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); - } - #region 缺陷图划分区域 Label[] lb = new Label[5]; @@ -903,6 +904,36 @@ namespace InjectionPC } #endregion + try + { + #region Load PictureBox + + if (!string.IsNullOrEmpty(picture)) + { + if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) + { + //string strImageURL = ConfigurationManager.AppSettings["PicturePath"] + picture; + string strImageURL = "http://10.60.101.59:8001/PDF/" + picture; + + System.Net.WebClient webClient = new System.Net.WebClient(); + webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); + } + + FileStream fs = new FileStream(Directory.GetCurrentDirectory() + "\\" + picture, FileMode.Open, + FileAccess.Read); //获取图片文件流 + Image img = Image.FromStream(fs); // 文件流转换成Image格式 + pictureBox2.Image = img; //给 图片框设置要显示的图片 + fs.Close(); // 关闭流,释放图片资源 + } + + #endregion + } + catch (Exception ex) + { + LogErrBLL.AddInfo(Program.station + "质检-加载图片"+ ex.ToString(), MethodBase.GetCurrentMethod()); + } + + #region 缺陷原因 @@ -1069,6 +1100,10 @@ namespace InjectionPC { LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); } + finally + { + txtBoxCode.SelectAll(); + } } private void timer2_Tick(object sender, EventArgs e) diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs index 113b13f..05823e1 100644 --- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs +++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs @@ -129,22 +129,34 @@ namespace MESClassLibrary.BLL.BasicInfo { local.BeginTrans(); //tb_barCode 更新 isDel=1 - db.DelBarCode(local, oldOneBarCode, tableName,$",Des5='条码补打,新条码[{md.OneBarCode}]'"); + if (!string.IsNullOrEmpty(oldOneBarCode)) + { + db.DelBarCode(local, oldOneBarCode, tableName, $",Des5='条码补打,新条码[{md.OneBarCode}]'"); + } + //tb_barCode 插入 printType=2 补打 db.AddInfoNew(local, md, tableName); - if(!string.IsNullOrEmpty(md.BoxNo)) + if (!string.IsNullOrEmpty(oldOneBarCode)) { - //根据箱码删除接口表tb_Injectionn_Interface中数据 - wmsDal.DeleteRecord(local, md.BoxNo, oldOneBarCode, oldBarCode); - + if (!string.IsNullOrEmpty(md.BoxNo)) + { + //根据箱码删除接口表tb_Injectionn_Interface中数据 + wmsDal.DeleteRecord(local, md.BoxNo, oldOneBarCode, oldBarCode); + } + else + { + //根据旧条码删除接口tb_Injectionn_Interface中数据 + wmsDal.DeleteInterface(local, oldOneBarCode); + } + md.Remark = "补打,原塑件码:" + oldOneBarCode; } else { - //根据旧条码删除接口tb_Injectionn_Interface中数据 - wmsDal.DeleteInterface(local, oldOneBarCode); + md.Remark = "手动箱单添加"; } - md.Remark = "补打,原塑件码:" + oldOneBarCode; + + //不绑箱码时,补打时向接口表插入 if (string.IsNullOrEmpty(md.BoxNo)) @@ -316,7 +328,17 @@ namespace MESClassLibrary.BLL.BasicInfo return null; } } - + /// + /// 根据boxcode查询barcode表相关数据 + /// + /// + /// + /// + public DataTable SearchInfoByBox(string boxNo, string tableName) + { + DataTable barCodeTable = db.SearchInfoByBox(boxNo, tableName); + return barCodeTable; + } public bool Update_Info(BarCodeModel md) { try diff --git a/MESClassLibrary/BLL/Wms/WmsBLL.cs b/MESClassLibrary/BLL/Wms/WmsBLL.cs index df5c2b7..2637a69 100644 --- a/MESClassLibrary/BLL/Wms/WmsBLL.cs +++ b/MESClassLibrary/BLL/Wms/WmsBLL.cs @@ -103,6 +103,9 @@ namespace MESClassLibrary.BLL.Injection string rst = da.SaveInterface(barCodeTable, badReason, station); return rst; } + + + /// /// 是否已传到WMS /// diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs index 46d3e45..cbfb920 100644 --- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs +++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs @@ -387,7 +387,7 @@ namespace MESClassLibrary.DAL.BasicInfo if (stationNo.Substring(2, 2) == "01" || stationNo.Substring(2, 2) == "02" || stationNo.Substring(2, 2) == "03" || stationNo.Substring(2, 2) == "04") { - sql = @"SELECT top 100 dbo.tb_BarCode1.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode1.BoxNo, + sql = @"SELECT top 100 dbo.tb_BarCode1.BarCode,dbo.tb_BarCode1.OneBarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode1.BoxNo, CASE dbo.tb_BarCode1.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType, dbo.tb_BarCode1.CreateTime FROM dbo.tb_BarCode1 with (nolock) LEFT OUTER JOIN @@ -399,7 +399,7 @@ namespace MESClassLibrary.DAL.BasicInfo if (stationNo.Substring(2, 2) == "05" || stationNo.Substring(2, 2) == "06" || stationNo.Substring(2, 2) == "07" || stationNo.Substring(2, 2) == "08") { - sql = @"SELECT top 100 dbo.tb_BarCode2.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode2.BoxNo, + sql = @"SELECT top 100 dbo.tb_BarCode2.BarCode,dbo.tb_BarCode2.OneBarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode2.BoxNo, CASE dbo.tb_BarCode2.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType, dbo.tb_BarCode2.CreateTime FROM dbo.tb_BarCode2 with (nolock) LEFT OUTER JOIN @@ -411,7 +411,7 @@ namespace MESClassLibrary.DAL.BasicInfo if (stationNo.Substring(2, 2) == "09" || stationNo.Substring(2, 2) == "10" || stationNo.Substring(2, 2) == "11" || stationNo.Substring(2, 2) == "12") { - sql = @"SELECT top 100 dbo.tb_BarCode3.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode3.BoxNo, + sql = @"SELECT top 100 dbo.tb_BarCode3.BarCode,dbo.tb_BarCode3.OneBarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode3.BoxNo, CASE dbo.tb_BarCode3.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType, dbo.tb_BarCode3.CreateTime FROM dbo.tb_BarCode3 with (nolock) LEFT OUTER JOIN @@ -423,7 +423,7 @@ namespace MESClassLibrary.DAL.BasicInfo if (stationNo.Substring(2, 2) == "13" || stationNo.Substring(2, 2) == "14" || stationNo.Substring(2, 2) == "15" || stationNo.Substring(2, 2) == "16") { - sql = @"SELECT top 100 dbo.tb_BarCode4.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode4.BoxNo, + sql = @"SELECT top 100 dbo.tb_BarCode4.BarCode,dbo.tb_BarCode4.OneBarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode4.BoxNo, CASE dbo.tb_BarCode4.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType, dbo.tb_BarCode4.CreateTime FROM dbo.tb_BarCode4 with (nolock) LEFT OUTER JOIN @@ -435,7 +435,7 @@ namespace MESClassLibrary.DAL.BasicInfo if (stationNo.Substring(2, 2) == "17" || stationNo.Substring(2, 2) == "18" || stationNo.Substring(2, 2) == "19" || stationNo.Substring(2, 2) == "20") { - sql = @"SELECT top 100 dbo.tb_BarCode5.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode5.BoxNo, + sql = @"SELECT top 100 dbo.tb_BarCode5.BarCode,dbo.tb_BarCode5.OneBarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode5.BoxNo, CASE dbo.tb_BarCode5.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType, dbo.tb_BarCode5.CreateTime FROM dbo.tb_BarCode5 with (nolock) LEFT OUTER JOIN diff --git a/MESClassLibrary/DAL/Wms/WmsDAL.cs b/MESClassLibrary/DAL/Wms/WmsDAL.cs index 52df403..f76cacd 100644 --- a/MESClassLibrary/DAL/Wms/WmsDAL.cs +++ b/MESClassLibrary/DAL/Wms/WmsDAL.cs @@ -198,6 +198,7 @@ namespace MESClassLibrary.DAL.Injection return true; } } + public bool DelRecordByBox(string boxNo) { diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index 0a4854f..6756345 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -25,6 +25,8 @@ namespace PaintingPC private bool _isWmsQuality = false ; private string _carType = string.Empty; private Dictionary _lastJustDict = new Dictionary(); + private string _foreighColor = string.Empty; + public FrmQuality(bool isWmsQuality) { InitializeComponent(); @@ -88,6 +90,10 @@ namespace PaintingPC { } } + /// + /// 初始化颜色选择框列表 + /// + /// public void InitColor(string stockNo) { try @@ -970,6 +976,7 @@ namespace PaintingPC 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; if (list.Count > 0) @@ -1056,8 +1063,9 @@ namespace PaintingPC } else { + cboxAddColor.Enabled = true; #region 没有一检结果,查询老外数据库,取产品信息 - if(_isWmsQuality == false) + if (_isWmsQuality == false) { string paintError = string.Empty; //喷涂线边质检,没有质检结果,查询老外数据库,取产品信息 @@ -1066,6 +1074,7 @@ namespace PaintingPC { ShowHint(paintError); } + _foreighColor = info[0]; labProductInfo.Text = info[0] + "," + info[1]; paintId = info[2]; labProPosition.Tag = paintId; @@ -1159,6 +1168,7 @@ namespace PaintingPC position = ""; reason = ""; lableFP.Text = ""; + _foreighColor = ""; cboxAddColor.DataSource = null; _carType = string.Empty;