diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs
index 489094d..3a47e9d 100644
--- a/FacOneZPStation/FrmZP.Designer.cs
+++ b/FacOneZPStation/FrmZP.Designer.cs
@@ -77,7 +77,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, 777F));
+ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 717F));
this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@@ -86,14 +86,14 @@
this.tableLayoutPanel3.Controls.Add(this.button2, 1, 1);
this.tableLayoutPanel3.Controls.Add(this.button7, 3, 1);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel3.Location = new System.Drawing.Point(7, 1400);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1224);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(2546, 423);
+ this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(2335, 371);
this.tableLayoutPanel3.TabIndex = 3;
//
// button6
@@ -102,10 +102,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(1781, 14);
- this.button6.Margin = new System.Windows.Forms.Padding(14);
+ this.button6.Location = new System.Drawing.Point(1630, 12);
+ this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(751, 183);
+ this.button6.Size = new System.Drawing.Size(692, 161);
this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false;
@@ -116,10 +116,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(578, 200);
+ this.button1.Size = new System.Drawing.Size(530, 176);
this.button1.TabIndex = 6;
this.button1.Text = "打印标签";
this.button1.UseVisualStyleBackColor = false;
@@ -131,10 +131,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(1200, 225);
- this.button5.Margin = new System.Windows.Forms.Padding(14);
+ this.button5.Location = new System.Drawing.Point(1099, 197);
+ this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(553, 184);
+ this.button5.Size = new System.Drawing.Size(505, 162);
this.button5.TabIndex = 5;
this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false;
@@ -145,10 +145,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(599, 6);
- this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.button4.Location = new System.Drawing.Point(548, 5);
+ this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(580, 199);
+ this.button4.Size = new System.Drawing.Size(532, 175);
this.button4.TabIndex = 4;
this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false;
@@ -159,10 +159,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(578, 199);
+ this.button3.Size = new System.Drawing.Size(530, 175);
this.button3.TabIndex = 3;
this.button3.Text = "上一计划";
this.button3.UseVisualStyleBackColor = false;
@@ -174,10 +174,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(606, 225);
- this.button2.Margin = new System.Windows.Forms.Padding(14);
+ this.button2.Location = new System.Drawing.Point(555, 197);
+ this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(566, 184);
+ this.button2.Size = new System.Drawing.Size(518, 162);
this.button2.TabIndex = 2;
this.button2.Text = "补打标签";
this.button2.UseVisualStyleBackColor = false;
@@ -188,10 +188,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(1774, 217);
- this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.button7.Location = new System.Drawing.Point(1623, 190);
+ this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(765, 200);
+ this.button7.Size = new System.Drawing.Size(706, 176);
this.button7.TabIndex = 8;
this.button7.Text = "补打箱单";
this.button7.UseVisualStyleBackColor = false;
@@ -203,11 +203,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(1426, 3);
+ this.label7.Location = new System.Drawing.Point(1301, 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;
//
@@ -215,10 +215,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(411, 127);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textBox2.Location = new System.Drawing.Point(375, 111);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(1008, 87);
+ this.textBox2.Size = new System.Drawing.Size(919, 77);
this.textBox2.TabIndex = 30;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
@@ -227,10 +227,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(397, 124);
+ this.label3.Size = new System.Drawing.Size(361, 108);
this.label3.TabIndex = 29;
this.label3.Text = "扫描物料条码";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -240,10 +240,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(1703, 249);
+ this.labOrderNo.Location = new System.Drawing.Point(1555, 218);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
- this.labOrderNo.Size = new System.Drawing.Size(846, 174);
+ this.labOrderNo.Size = new System.Drawing.Size(781, 151);
this.labOrderNo.TabIndex = 28;
this.labOrderNo.Text = "A64654646464";
this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -254,10 +254,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(1426, 249);
+ this.label4.Location = new System.Drawing.Point(1301, 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;
@@ -268,10 +268,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(409, 249);
+ this.labStationNo.Location = new System.Drawing.Point(373, 218);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
- this.labStationNo.Size = new System.Drawing.Size(1012, 174);
+ this.labStationNo.Size = new System.Drawing.Size(923, 151);
this.labStationNo.TabIndex = 26;
this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -282,10 +282,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(401, 174);
+ this.label2.Size = new System.Drawing.Size(365, 151);
this.label2.TabIndex = 25;
this.label2.Text = "工位名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -295,10 +295,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(1703, 428);
+ this.labPName.Location = new System.Drawing.Point(1555, 374);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
- this.labPName.Size = new System.Drawing.Size(846, 284);
+ this.labPName.Size = new System.Drawing.Size(781, 248);
this.labPName.TabIndex = 24;
this.labPName.Text = "MF253 MF S后保";
this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -309,10 +309,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(1426, 428);
+ this.label8.Location = new System.Drawing.Point(1301, 374);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(272, 284);
+ this.label8.Size = new System.Drawing.Size(249, 248);
this.label8.TabIndex = 23;
this.label8.Text = "产品名称";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -323,10 +323,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(409, 428);
+ this.labPartNo.Location = new System.Drawing.Point(373, 374);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
- this.labPartNo.Size = new System.Drawing.Size(1012, 284);
+ this.labPartNo.Size = new System.Drawing.Size(923, 248);
this.labPartNo.TabIndex = 22;
this.labPartNo.Text = "A2530822665";
this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -342,10 +342,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(401, 284);
+ this.label6.Size = new System.Drawing.Size(365, 248);
this.label6.TabIndex = 21;
this.label6.Text = "产品代码";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -356,10 +356,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(1703, 717);
+ this.labBadCount.Location = new System.Drawing.Point(1555, 627);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
- this.labBadCount.Size = new System.Drawing.Size(846, 515);
+ this.labBadCount.Size = new System.Drawing.Size(781, 451);
this.labBadCount.TabIndex = 20;
this.labBadCount.Text = "0";
this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -370,10 +370,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(409, 717);
+ this.labNum.Location = new System.Drawing.Point(373, 627);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
- this.labNum.Size = new System.Drawing.Size(1012, 515);
+ this.labNum.Size = new System.Drawing.Size(923, 451);
this.labNum.TabIndex = 18;
this.labNum.Text = "152/210";
this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -384,10 +384,10 @@
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
this.label10.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.White;
- this.label10.Location = new System.Drawing.Point(3, 717);
+ this.label10.Location = new System.Drawing.Point(3, 627);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(401, 515);
+ this.label10.Size = new System.Drawing.Size(365, 451);
this.label10.TabIndex = 17;
this.label10.Text = "计划/完成数";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -400,7 +400,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(397, 120);
+ this.label14.Size = new System.Drawing.Size(361, 105);
this.label14.TabIndex = 12;
this.label14.Text = "扫描本体条码";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -409,10 +409,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(411, 6);
- this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textBox1.Location = new System.Drawing.Point(375, 5);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(1008, 87);
+ this.textBox1.Size = new System.Drawing.Size(919, 77);
this.textBox1.TabIndex = 13;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@@ -421,11 +421,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(1705, 1);
+ this.labErrMessage.Location = new System.Drawing.Point(1557, 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(842, 245);
+ this.labErrMessage.Size = new System.Drawing.Size(777, 214);
this.labErrMessage.TabIndex = 16;
this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -437,9 +437,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, 849F));
- 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, 784F));
+ 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);
@@ -459,17 +459,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, 1235);
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 452F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 1081);
this.tableLayoutPanel4.TabIndex = 2;
//
// label12
@@ -478,10 +478,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(1426, 717);
+ this.label12.Location = new System.Drawing.Point(1301, 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;
@@ -491,10 +491,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(1919, 0);
+ this.labTime.Location = new System.Drawing.Point(1756, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
- this.labTime.Size = new System.Drawing.Size(641, 149);
+ this.labTime.Size = new System.Drawing.Size(591, 130);
this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -508,7 +508,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(347, 149);
+ this.pictureBox1.Size = new System.Drawing.Size(318, 130);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -518,10 +518,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(347, 0);
+ this.label1.Location = new System.Drawing.Point(318, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1572, 149);
+ this.label1.Size = new System.Drawing.Size(1438, 130);
this.label1.TabIndex = 1;
this.label1.Text = "装配工位信息看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -532,7 +532,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, 640F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 590F));
this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);
@@ -542,7 +542,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
@@ -559,18 +559,18 @@
this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10.69692F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 89.30308F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1829);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 380F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1600);
this.tableLayoutPanel1.TabIndex = 9;
//
// FrmZP
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2560, 1829);
+ this.ClientSize = new System.Drawing.Size(2347, 1600);
this.Controls.Add(this.tableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.Name = "FrmZP";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmZP";
diff --git a/InjectionPC/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 ced45c4..8853b44 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -221,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(2908, 1829);
+ this.panel1.Size = new System.Drawing.Size(2666, 1600);
this.panel1.TabIndex = 0;
//
// panel7
@@ -232,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(2908, 1661);
+ this.panel7.Size = new System.Drawing.Size(2666, 1453);
this.panel7.TabIndex = 1;
//
// panel23
@@ -243,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(2908, 1557);
+ this.panel23.Size = new System.Drawing.Size(2666, 1362);
this.panel23.TabIndex = 1;
//
// panel27
@@ -254,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(2908, 442);
+ this.panel27.Size = new System.Drawing.Size(2666, 386);
this.panel27.TabIndex = 1;
//
// panel29
@@ -265,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(2569, 442);
+ this.panel29.Size = new System.Drawing.Size(2355, 386);
this.panel29.TabIndex = 1;
//
// panel31
@@ -276,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(2436, 442);
+ this.panel31.Size = new System.Drawing.Size(2233, 386);
this.panel31.TabIndex = 1;
//
// panel33
@@ -287,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(2303, 442);
+ this.panel33.Size = new System.Drawing.Size(2111, 386);
this.panel33.TabIndex = 1;
//
// panel35
@@ -298,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(2170, 442);
+ this.panel35.Size = new System.Drawing.Size(1989, 386);
this.panel35.TabIndex = 1;
//
// panel37
@@ -308,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(2170, 442);
+ this.panel37.Size = new System.Drawing.Size(1989, 386);
this.panel37.TabIndex = 1;
//
// panel40
@@ -319,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(2170, 442);
+ this.panel40.Size = new System.Drawing.Size(1989, 386);
this.panel40.TabIndex = 1;
//
// panel42
@@ -330,9 +330,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(5);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(2037, 442);
+ this.panel42.Size = new System.Drawing.Size(1867, 386);
this.panel42.TabIndex = 1;
//
// panel39
@@ -352,19 +352,19 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(5);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1904, 442);
+ this.panel39.Size = new System.Drawing.Size(1745, 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(932, 273);
+ 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(378, 66);
+ this.lbDevState.Size = new System.Drawing.Size(347, 58);
this.lbDevState.TabIndex = 15;
this.lbDevState.Text = "设备已连接";
this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -374,10 +374,10 @@
//
this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbAddPrintR.Location = new System.Drawing.Point(580, 341);
+ 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(342, 66);
+ this.lbAddPrintR.Size = new System.Drawing.Size(314, 58);
this.lbAddPrintR.TabIndex = 3;
this.lbAddPrintR.Text = "右条码添打";
this.lbAddPrintR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -387,10 +387,10 @@
//
this.lbAddPrintL.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbAddPrintL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbAddPrintL.Location = new System.Drawing.Point(580, 273);
+ 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(342, 66);
+ this.lbAddPrintL.Size = new System.Drawing.Size(314, 58);
this.lbAddPrintL.TabIndex = 2;
this.lbAddPrintL.Text = "左条码添打";
this.lbAddPrintL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -402,10 +402,10 @@
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 = "打印箱码";
@@ -415,20 +415,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 = "数量：";
//
@@ -436,10 +436,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)";
//
@@ -447,20 +447,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 = "批次：";
//
@@ -470,10 +470,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);
@@ -482,10 +482,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 = "产品：";
//
@@ -493,10 +493,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1904, 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, 442);
+ this.panel43.Size = new System.Drawing.Size(122, 386);
this.panel43.TabIndex = 0;
//
// label23
@@ -507,7 +507,7 @@
this.label23.Location = new System.Drawing.Point(0, 0);
this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(133, 442);
+ this.label23.Size = new System.Drawing.Size(122, 386);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -517,10 +517,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(2037, 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, 442);
+ this.panel41.Size = new System.Drawing.Size(122, 386);
this.panel41.TabIndex = 0;
//
// label22
@@ -531,7 +531,7 @@
this.label22.Location = new System.Drawing.Point(0, 0);
this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(133, 442);
+ this.label22.Size = new System.Drawing.Size(122, 386);
this.label22.TabIndex = 1;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -541,10 +541,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(2170, 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, 442);
+ this.panel34.Size = new System.Drawing.Size(122, 386);
this.panel34.TabIndex = 0;
//
// label15
@@ -555,7 +555,7 @@
this.label15.Location = new System.Drawing.Point(0, 0);
this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(133, 442);
+ this.label15.Size = new System.Drawing.Size(122, 386);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -566,9 +566,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(5);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(133, 442);
+ this.panel32.Size = new System.Drawing.Size(122, 386);
this.panel32.TabIndex = 0;
//
// label14
@@ -579,7 +579,7 @@
this.label14.Location = new System.Drawing.Point(0, 0);
this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(133, 442);
+ this.label14.Size = new System.Drawing.Size(122, 386);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -590,9 +590,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(5);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(133, 442);
+ this.panel30.Size = new System.Drawing.Size(122, 386);
this.panel30.TabIndex = 0;
//
// label13
@@ -603,7 +603,7 @@
this.label13.Location = new System.Drawing.Point(0, 0);
this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(133, 442);
+ this.label13.Size = new System.Drawing.Size(122, 386);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -614,9 +614,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(5);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(339, 442);
+ this.panel28.Size = new System.Drawing.Size(311, 386);
this.panel28.TabIndex = 0;
//
// label12
@@ -628,7 +628,7 @@
this.label12.Location = new System.Drawing.Point(0, 0);
this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(339, 442);
+ this.label12.Size = new System.Drawing.Size(311, 386);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -639,9 +639,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(2908, 1115);
+ this.panel24.Size = new System.Drawing.Size(2666, 976);
this.panel24.TabIndex = 0;
//
// panel26
@@ -650,10 +650,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(2493, 1115);
+ this.panel26.Size = new System.Drawing.Size(2286, 976);
this.panel26.TabIndex = 1;
//
// panel45
@@ -663,19 +663,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;
@@ -684,10 +684,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;
@@ -696,20 +696,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;
@@ -721,19 +721,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;
@@ -742,10 +742,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;
@@ -754,20 +754,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;
@@ -835,17 +835,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(2493, 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;
@@ -858,9 +858,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
@@ -870,13 +870,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
@@ -888,19 +888,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(127, 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;
@@ -910,9 +910,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(127, 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;
@@ -921,10 +921,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;
@@ -933,20 +933,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;
@@ -955,10 +955,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 = "计划数量";
//
@@ -968,11 +968,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";
@@ -987,14 +987,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
@@ -1005,10 +1005,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
@@ -1016,10 +1016,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;
@@ -1029,10 +1029,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 = "/";
//
@@ -1040,10 +1040,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";
//
@@ -1051,10 +1051,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);
@@ -1064,10 +1064,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;
@@ -1078,10 +1078,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
@@ -1089,9 +1089,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
@@ -1099,10 +1099,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;
@@ -1115,10 +1115,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
@@ -1126,26 +1126,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
@@ -1153,10 +1153,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;
@@ -1167,11 +1167,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&&手打";
@@ -1186,15 +1186,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
@@ -1202,10 +1202,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;
@@ -1218,10 +1218,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
@@ -1229,10 +1229,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;
@@ -1242,10 +1242,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 = "/";
//
@@ -1253,10 +1253,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";
//
@@ -1264,10 +1264,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);
@@ -1278,10 +1278,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
@@ -1289,9 +1289,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
@@ -1299,10 +1299,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;
@@ -1315,10 +1315,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
@@ -1327,9 +1327,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(2908, 104);
+ this.panel8.Size = new System.Drawing.Size(2666, 91);
this.panel8.TabIndex = 0;
//
// panel10
@@ -1337,10 +1337,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(2493, 104);
+ this.panel10.Size = new System.Drawing.Size(2286, 91);
this.panel10.TabIndex = 2;
//
// panel12
@@ -1348,10 +1348,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(2001, 104);
+ this.panel12.Size = new System.Drawing.Size(1835, 91);
this.panel12.TabIndex = 1;
//
// panel16
@@ -1359,10 +1359,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(1492, 104);
+ this.panel16.Size = new System.Drawing.Size(1368, 91);
this.panel16.TabIndex = 1;
//
// panel20
@@ -1370,10 +1370,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(1025, 104);
+ this.panel20.Size = new System.Drawing.Size(940, 91);
this.panel20.TabIndex = 1;
//
// label10
@@ -1381,10 +1381,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(653, 104);
+ this.label10.Size = new System.Drawing.Size(599, 91);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1395,9 +1395,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
@@ -1409,7 +1409,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;
@@ -1421,9 +1421,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
@@ -1431,10 +1431,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;
@@ -1444,9 +1444,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
@@ -1458,7 +1458,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;
@@ -1470,19 +1470,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
@@ -1493,7 +1493,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;
@@ -1503,9 +1503,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
@@ -1517,7 +1517,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;
@@ -1530,19 +1530,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
@@ -1555,9 +1555,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
@@ -1565,9 +1565,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
@@ -1579,7 +1579,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;
@@ -1589,9 +1589,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
@@ -1603,7 +1603,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;
@@ -1614,9 +1614,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(2908, 168);
+ this.panel2.Size = new System.Drawing.Size(2666, 147);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1624,10 +1624,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(2569, 168);
+ this.panel4.Size = new System.Drawing.Size(2355, 147);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1636,9 +1636,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(2185, 168);
+ this.panel6.Size = new System.Drawing.Size(2003, 147);
this.panel6.TabIndex = 1;
//
// btnOnlyBarCode
@@ -1647,7 +1647,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;
@@ -1661,7 +1661,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(2185, 168);
+ this.label1.Size = new System.Drawing.Size(2003, 147);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间箱码条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1670,10 +1670,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(2185, 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
@@ -1684,7 +1684,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;
@@ -1695,19 +1695,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;
@@ -1748,12 +1748,12 @@
//
// 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(2908, 1829);
+ 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";
diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs
index 5115271..77c436d 100644
--- a/InjectionPC/FrmMain2408.cs
+++ b/InjectionPC/FrmMain2408.cs
@@ -413,8 +413,27 @@ namespace InjectionPC
}
for (int i = 1; i <= NumItems; i++)
- {
- if ((ItemValues!=null && ItemValues.GetValue(i).ToString() == "True") || IsTest ==true)
+ {
+ if (ItemValues == null)
+ {
+ _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues= null ", planID, "2408");
+ continue;
+ }
+ if (ItemValues.Length == 0)
+ {
+ _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.Length ==0 ", planID, "2408");
+ continue;
+ }
+ string val = ItemValues.GetValue(i)?.ToString();
+ if (ItemValues.GetValue(i)?.ToString() != "True")
+ {
+ _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.GetValue(i)= " + val, planID, "2408");
+
+ }
+
+
+
+ if ((ItemValues!=null && ItemValues.GetValue(i)?.ToString() == "True") || IsTest ==true)
{
//LogSysBLL.AddInfo("true" + label6.Text, MethodBase.GetCurrentMethod());
GetClass();
@@ -424,11 +443,16 @@ namespace InjectionPC
//DateTime lastTime = GetPrintTime(label6.Text);
//long ts = TimeDiff(lastTime, DateTime.Now);
+
+
+
TimeSpan span=DateTime.Now - lastTime;
if (span.TotalSeconds < Convert.ToDouble(ConfigurationManager.AppSettings["InterValT"]))
{
return;
}
+
+
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, aa, planID, "2408");
#endregion
diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs
index 4255b6f..3461fbd 100644
--- a/InjectionPC/FrmMain2411.Designer.cs
+++ b/InjectionPC/FrmMain2411.Designer.cs
@@ -28,6 +28,7 @@
///
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();
@@ -123,10 +124,10 @@
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label35 = new System.Windows.Forms.Label();
this.label39 = new System.Windows.Forms.Label();
- this.timer1 = new System.Windows.Forms.Timer();
- this.serialPort1 = new System.IO.Ports.SerialPort();
- this.timer2 = new System.Windows.Forms.Timer();
- this.timer3 = new System.Windows.Forms.Timer();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ 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.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel23.SuspendLayout();
@@ -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, 1829);
+ 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, 1661);
+ 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, 1557);
+ 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, 442);
+ 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, 442);
+ 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, 442);
+ 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, 442);
+ 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, 442);
+ 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, 442);
+ 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, 442);
+ this.panel40.Size = new System.Drawing.Size(1670, 386);
this.panel40.TabIndex = 1;
//
// panel42
@@ -292,9 +293,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(5);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1689, 442);
+ this.panel42.Size = new System.Drawing.Size(1548, 386);
this.panel42.TabIndex = 1;
//
// panel39
@@ -311,19 +312,19 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(5);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1556, 442);
+ this.panel39.Size = new System.Drawing.Size(1426, 386);
this.panel39.TabIndex = 1;
//
// lbDevState
//
this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbDevState.Location = new System.Drawing.Point(607, 333);
+ this.lbDevState.Location = new System.Drawing.Point(556, 291);
this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbDevState.Name = "lbDevState";
- this.lbDevState.Size = new System.Drawing.Size(378, 66);
+ this.lbDevState.Size = new System.Drawing.Size(347, 58);
this.lbDevState.TabIndex = 16;
this.lbDevState.Text = "设备已连接";
this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -332,20 +333,20 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(240, 333);
- this.textBox2.Margin = new System.Windows.Forms.Padding(5);
+ this.textBox2.Location = new System.Drawing.Point(220, 291);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(329, 74);
+ this.textBox2.Size = new System.Drawing.Size(302, 65);
this.textBox2.TabIndex = 13;
//
// label18
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.Location = new System.Drawing.Point(44, 347);
+ this.label18.Location = new System.Drawing.Point(40, 304);
this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(202, 58);
+ this.label18.Size = new System.Drawing.Size(178, 51);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -353,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)";
//
@@ -364,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 = "批次：";
//
@@ -386,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);
//
@@ -397,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 = "产品：";
//
@@ -408,10 +409,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1556, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(5);
+ this.panel43.Location = new System.Drawing.Point(1426, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(133, 442);
+ this.panel43.Size = new System.Drawing.Size(122, 386);
this.panel43.TabIndex = 0;
//
// label23
@@ -422,7 +423,7 @@
this.label23.Location = new System.Drawing.Point(0, 0);
this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(133, 442);
+ this.label23.Size = new System.Drawing.Size(122, 386);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -432,10 +433,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1689, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(5);
+ this.panel41.Location = new System.Drawing.Point(1548, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(133, 442);
+ this.panel41.Size = new System.Drawing.Size(122, 386);
this.panel41.TabIndex = 0;
//
// label22
@@ -446,7 +447,7 @@
this.label22.Location = new System.Drawing.Point(0, 0);
this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(133, 442);
+ this.label22.Size = new System.Drawing.Size(122, 386);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -456,10 +457,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1822, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(5);
+ this.panel34.Location = new System.Drawing.Point(1670, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(133, 442);
+ this.panel34.Size = new System.Drawing.Size(122, 386);
this.panel34.TabIndex = 0;
//
// label15
@@ -470,7 +471,7 @@
this.label15.Location = new System.Drawing.Point(0, 0);
this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(133, 442);
+ this.label15.Size = new System.Drawing.Size(122, 386);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -481,9 +482,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(5);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(133, 442);
+ this.panel32.Size = new System.Drawing.Size(122, 386);
this.panel32.TabIndex = 0;
//
// label14
@@ -494,7 +495,7 @@
this.label14.Location = new System.Drawing.Point(0, 0);
this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(133, 442);
+ this.label14.Size = new System.Drawing.Size(122, 386);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -505,9 +506,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(5);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(133, 442);
+ this.panel30.Size = new System.Drawing.Size(122, 386);
this.panel30.TabIndex = 0;
//
// label13
@@ -518,7 +519,7 @@
this.label13.Location = new System.Drawing.Point(0, 0);
this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(133, 442);
+ this.label13.Size = new System.Drawing.Size(122, 386);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -529,9 +530,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(5);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(339, 442);
+ this.panel28.Size = new System.Drawing.Size(311, 386);
this.panel28.TabIndex = 0;
//
// label12
@@ -543,7 +544,7 @@
this.label12.Location = new System.Drawing.Point(0, 0);
this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(339, 442);
+ this.label12.Size = new System.Drawing.Size(311, 386);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -554,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
@@ -565,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
@@ -578,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;
@@ -599,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;
@@ -611,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;
@@ -636,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;
@@ -657,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;
@@ -669,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;
@@ -753,14 +754,14 @@
this.glacialList1.ItemHeight = 57;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(5);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue;
this.glacialList1.ShowBorder = true;
this.glacialList1.ShowFocusRect = false;
- this.glacialList1.Size = new System.Drawing.Size(2145, 1115);
+ this.glacialList1.Size = new System.Drawing.Size(1967, 976);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -773,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
@@ -784,13 +785,13 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464);
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651);
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570);
this.tableLayoutPanel2.TabIndex = 1;
//
// panel38
@@ -800,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;
@@ -821,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;
@@ -843,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 = "计划数量";
//
@@ -855,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
@@ -867,12 +868,12 @@
this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 464F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 406F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406);
this.tableLayoutPanel1.TabIndex = 1;
//
// label11
@@ -883,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;
@@ -894,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
@@ -904,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
@@ -915,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
@@ -926,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
@@ -937,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
@@ -948,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;
@@ -962,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
@@ -976,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;
@@ -988,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
@@ -998,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;
@@ -1011,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
@@ -1025,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;
@@ -1037,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
@@ -1060,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;
@@ -1070,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
@@ -1084,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;
@@ -1096,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
@@ -1121,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
@@ -1131,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
@@ -1145,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;
@@ -1155,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
@@ -1169,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;
@@ -1180,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
@@ -1190,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
@@ -1202,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
@@ -1213,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;
@@ -1227,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;
@@ -1236,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
@@ -1250,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;
@@ -1261,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;
@@ -1314,12 +1315,12 @@
//
// FrmMain2411
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2560, 1829);
+ this.ClientSize = new System.Drawing.Size(2347, 1600);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(5);
+ this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.Name = "FrmMain2411";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMain2411.cs b/InjectionPC/FrmMain2411.cs
index e7d662a..c76f442 100644
--- a/InjectionPC/FrmMain2411.cs
+++ b/InjectionPC/FrmMain2411.cs
@@ -360,7 +360,23 @@ namespace InjectionPC
}
for (int i = 1; i <= NumItems; i++)
{
- if ((ItemValues!=null && ItemValues.GetValue(i).ToString() == "True") || IsTest ==true)
+ if(ItemValues ==null)
+ {
+ _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues= null ", planID, "2411");
+ continue;
+ }
+ if (ItemValues.Length ==0)
+ {
+ _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.Length ==0 ", planID, "2411");
+ continue;
+ }
+ string val = ItemValues.GetValue(i)?.ToString();
+ if (ItemValues.GetValue(i)?.ToString() != "True")
+ {
+ _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.GetValue(i)= " + val, planID, "2411");
+
+ }
+ if ((ItemValues!=null && ItemValues.GetValue(i)?.ToString() == "True") || IsTest ==true)
{
//LogSysBLL.AddInfo("true" + label6.Text, MethodBase.GetCurrentMethod());
@@ -1094,6 +1110,11 @@ namespace InjectionPC
initPlan();
lastTime=DateTime.Now;
}
+ else
+ {
+ //MessageBox.Show("PLC设备返回信息错误,ItemValues值为空!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ continue;
+ }
}
}
catch (Exception ex)
diff --git a/MESClassLibrary/BussinessHelper.cs b/MESClassLibrary/BussinessHelper.cs
index 25f5086..1fa5d20 100644
--- a/MESClassLibrary/BussinessHelper.cs
+++ b/MESClassLibrary/BussinessHelper.cs
@@ -47,6 +47,148 @@ namespace MESClassLibrary
}
-
+ ///
+ /// 喷涂质检,当前状态和上一次质检状态是否允许操作判断
+ ///
+ /// 当前操作状态 1 合格 2报废 9返喷 ,4喷涂其他
+ /// 上次操作状态
+ ///
+ ///
+ ///
+ //public static bool PaintStateVerify(int state, string lastState, string oneBarCode, ref string errorMssg)
+ //{
+ // //合格 1 最近一条是报废记录,可以重发. 否则不可以.
+ // if (state == 1)
+ // {
+ // //第一次合格
+ // if (string.IsNullOrEmpty(lastState))
+ // {
+ // return true;
+ // }
+ // else
+ // {
+ // //上一次是合格
+ // if (lastState.Contains("合格"))
+ // {
+ // errorMssg = $"条码[{oneBarCode}]已判定[合格],不需要重复判定为[合格].";
+ // return false;
+ // }
+ // else if (lastState.Contains("报废"))
+ // {
+ // errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[合格].";
+ // return false;
+ // }
+ // else
+ // {
+ // return true;
+ // }
+
+ // }
+
+
+ // }
+
+ // //不合格报废0 有报工记录不能重发
+ // else if (state == 2)
+ // {
+
+ // //第一次操作
+ // if (string.IsNullOrEmpty(lastState))
+ // {
+ // return true;
+ // }
+ // //上次合格,这次转报废,需要wms给true
+ // if (lastState.Contains("合格"))
+ // {
+ // bool wmsAllow = GetWmsCompleteState(oneBarCode);
+ // if (wmsAllow == false)
+ // {
+ // errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[报废].";
+ // return false;
+ // }
+ // else
+ // {
+ // return true;
+ // }
+ // }
+ // if (lastState.Contains("报废"))
+ // {
+ // errorMssg = $"条码[{oneBarCode}]已报废,不需要重复判定为[报废].";
+ // return false;
+ // }
+
+ // return true;
+
+ // }
+
+ // //其它状态
+ // else if (state == 4)
+ // {
+ // //第一次合格
+ // if (string.IsNullOrEmpty(lastState))
+ // {
+ // return true;
+ // }
+ // //上次合格,这次转其它,需要wms给true
+ // if (lastState.Contains("合格"))
+ // {
+ // bool wmsAllow = GetWmsCompleteState(oneBarCode);
+ // if (wmsAllow == false)
+ // {
+ // errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[其它].";
+ // return false;
+ // }
+ // else
+ // {
+ // return true;
+ // }
+ // }
+ // else if (lastState.Contains("报废"))
+ // {
+ // errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[其它].";
+ // return false;
+ // }
+ // if (lastState.Contains("其它"))
+ // {
+ // errorMssg = $"条码[{oneBarCode}]已判定为[其它],不需要重复判定为[其它].";
+ // return false;
+ // }
+
+ // }
+ // else if (state == 9)
+ // {
+ // //第一次合格
+ // if (string.IsNullOrEmpty(lastState))
+ // {
+ // return true;
+ // }
+ // //上次合格,这次转报废,需要wms给true
+ // if (lastState.Contains("合格"))
+ // {
+ // bool wmsAllow = GetWmsCompleteState(oneBarCode);
+ // if (wmsAllow == false)
+ // {
+ // errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[返喷].";
+ // return false;
+ // }
+ // else
+ // {
+ // return true;
+ // }
+ // }
+ // else if (lastState.Contains("报废"))
+ // {
+ // errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[返喷].";
+ // return false;
+ // }
+ // if (lastState.Contains("打磨"))
+ // {
+ // errorMssg = $"条码[{oneBarCode}]已判定为[返喷],不需要重复判定为[返喷].";
+ // return false;
+ // }
+
+ // }
+ // return true;
+ //}
}
}
diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs
index fe2ad51..5455a32 100644
--- a/PaintingPC/FrmQuality.cs
+++ b/PaintingPC/FrmQuality.cs
@@ -276,6 +276,17 @@ namespace PaintingPC
}
}
+ bool SaveBeforeVerify( string currentRst)
+ {
+ string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
+ if (lastRst.Contains("报废"))
+ {
+ MessageBox.Show($"条码已判定为报废，不能再判定为{currentRst}.");
+ Clear();
+ return false;
+ }
+ return true;
+ }
///
/// 合格
///
@@ -299,7 +310,12 @@ namespace PaintingPC
ClearControlColor(SetControlGroup());
btnAbt.BackColor = Color.Red;
- //string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
+ bool rr = SaveBeforeVerify("合格");
+ if(rr == false)
+ {
+ return;
+ }
+
//if (lastRst.Contains("合格"))
//{
// MessageBox.Show("条码已判定为合格，无需重复判定");
@@ -349,6 +365,12 @@ namespace PaintingPC
Clear();
return;
}
+
+ bool rr = SaveBeforeVerify("其它");
+ if (rr == false)
+ {
+ return;
+ }
SaveRst("其它", colorName, partName,4);
}
@@ -403,7 +425,12 @@ namespace PaintingPC
//}
string s = _isWmsQuality == false ? "打磨" : "打磨WMS";
-
+
+ bool rr = SaveBeforeVerify("返喷");
+ if (rr == false)
+ {
+ return;
+ }
SaveRst(s, colorName, partName,9);
}
@@ -470,6 +497,12 @@ namespace PaintingPC
ClearControlColor(SetControlGroup());
btnAbt.BackColor = Color.Red;
+ bool rr = SaveBeforeVerify("报废");
+ if (rr == false)
+ {
+ return;
+ }
+
SaveRst("报废", colorName, partName,2, userName);
}
diff --git a/PaintingPC/PaintingPC.csproj b/PaintingPC/PaintingPC.csproj
index 82e7620..fb4626f 100644
--- a/PaintingPC/PaintingPC.csproj
+++ b/PaintingPC/PaintingPC.csproj
@@ -313,6 +313,12 @@
True
+
+
+ {867989d8-6837-41dc-9bf1-4658f5d6cfef}
+ MESClassLibrary
+
+