1

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, 705F));
+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 648F));
             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(6, 1401);
+            this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1225);
-            this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6);
+            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.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(2548, 423);
+            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(1855, 14);
+            this.button6.Location = new System.Drawing.Point(1699, 12);
-            this.button6.Margin = new System.Windows.Forms.Padding(14);
+            this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(679, 183);
+            this.button6.Size = new System.Drawing.Size(623, 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(6, 217);
+            this.button1.Location = new System.Drawing.Point(6, 190);
-            this.button1.Margin = new System.Windows.Forms.Padding(6);
+            this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(605, 200);
+            this.button1.Size = new System.Drawing.Size(553, 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(1250, 225);
+            this.button5.Location = new System.Drawing.Point(1145, 197);
-            this.button5.Margin = new System.Windows.Forms.Padding(14);
+            this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
             this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(577, 184);
+            this.button5.Size = new System.Drawing.Size(528, 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(623, 6);
+            this.button4.Location = new System.Drawing.Point(571, 5);
-            this.button4.Margin = new System.Windows.Forms.Padding(6);
+            this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(607, 199);
+            this.button4.Size = new System.Drawing.Size(555, 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(6, 6);
+            this.button3.Location = new System.Drawing.Point(6, 5);
-            this.button3.Margin = new System.Windows.Forms.Padding(6);
+            this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(605, 199);
+            this.button3.Size = new System.Drawing.Size(553, 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(631, 225);
+            this.button2.Location = new System.Drawing.Point(578, 197);
-            this.button2.Margin = new System.Windows.Forms.Padding(14);
+            this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(591, 184);
+            this.button2.Size = new System.Drawing.Size(541, 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(1847, 217);
+            this.button7.Location = new System.Drawing.Point(1692, 190);
-            this.button7.Margin = new System.Windows.Forms.Padding(6);
+            this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button7.Name = "button7";
-            this.button7.Size = new System.Drawing.Size(695, 200);
+            this.button7.Size = new System.Drawing.Size(637, 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(1523, 3);
+            this.label7.Location = new System.Drawing.Point(1394, 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, 243);
+            this.label7.Size = new System.Drawing.Size(249, 211);
             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(439, 127);
+            this.textBox2.Location = new System.Drawing.Point(402, 111);
             this.textBox2.Margin = new System.Windows.Forms.Padding(4);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(1077, 87);
+            this.textBox2.Size = new System.Drawing.Size(985, 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, 123);
+            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(425, 125);
+            this.label3.Size = new System.Drawing.Size(388, 109);
             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(1800, 251);
+            this.labOrderNo.Location = new System.Drawing.Point(1648, 219);
             this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
             this.labOrderNo.Name = "labOrderNo";
-            this.labOrderNo.Size = new System.Drawing.Size(749, 175);
+            this.labOrderNo.Size = new System.Drawing.Size(688, 152);
             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(1523, 251);
+            this.label4.Location = new System.Drawing.Point(1394, 219);
             this.label4.Margin = new System.Windows.Forms.Padding(2);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(272, 175);
+            this.label4.Size = new System.Drawing.Size(249, 152);
             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(437, 251);
+            this.labStationNo.Location = new System.Drawing.Point(400, 219);
             this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
             this.labStationNo.Name = "labStationNo";
-            this.labStationNo.Size = new System.Drawing.Size(1081, 175);
+            this.labStationNo.Size = new System.Drawing.Size(989, 152);
             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, 251);
+            this.label2.Location = new System.Drawing.Point(3, 219);
             this.label2.Margin = new System.Windows.Forms.Padding(2);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(429, 175);
+            this.label2.Size = new System.Drawing.Size(392, 152);
             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(1800, 431);
+            this.labPName.Location = new System.Drawing.Point(1648, 376);
             this.labPName.Margin = new System.Windows.Forms.Padding(2);
             this.labPName.Name = "labPName";
-            this.labPName.Size = new System.Drawing.Size(749, 286);
+            this.labPName.Size = new System.Drawing.Size(688, 249);
             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(1523, 431);
+            this.label8.Location = new System.Drawing.Point(1394, 376);
             this.label8.Margin = new System.Windows.Forms.Padding(2);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(272, 286);
+            this.label8.Size = new System.Drawing.Size(249, 249);
             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(437, 431);
+            this.labPartNo.Location = new System.Drawing.Point(400, 376);
             this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
             this.labPartNo.Name = "labPartNo";
-            this.labPartNo.Size = new System.Drawing.Size(1081, 286);
+            this.labPartNo.Size = new System.Drawing.Size(989, 249);
             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, 431);
+            this.label6.Location = new System.Drawing.Point(3, 376);
             this.label6.Margin = new System.Windows.Forms.Padding(2);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(429, 286);
+            this.label6.Size = new System.Drawing.Size(392, 249);
             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(1800, 722);
+            this.labBadCount.Location = new System.Drawing.Point(1648, 630);
             this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
             this.labBadCount.Name = "labBadCount";
-            this.labBadCount.Size = new System.Drawing.Size(749, 513);
+            this.labBadCount.Size = new System.Drawing.Size(688, 449);
             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(437, 722);
+            this.labNum.Location = new System.Drawing.Point(400, 630);
             this.labNum.Margin = new System.Windows.Forms.Padding(2);
             this.labNum.Name = "labNum";
-            this.labNum.Size = new System.Drawing.Size(1081, 513);
+            this.labNum.Size = new System.Drawing.Size(989, 449);
             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, 722);
+            this.label10.Location = new System.Drawing.Point(3, 630);
             this.label10.Margin = new System.Windows.Forms.Padding(2);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(429, 513);
+            this.label10.Size = new System.Drawing.Size(392, 449);
             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(425, 121);
+            this.label14.Size = new System.Drawing.Size(388, 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(439, 5);
+            this.textBox1.Location = new System.Drawing.Point(402, 5);
             this.textBox1.Margin = new System.Windows.Forms.Padding(4);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(1077, 87);
+            this.textBox1.Size = new System.Drawing.Size(985, 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(1802, 1);
+            this.labErrMessage.Location = new System.Drawing.Point(1650, 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(745, 247);
+            this.labErrMessage.Size = new System.Drawing.Size(684, 215);
             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, 253F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 752F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 691F));
-            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, 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,7 +459,7 @@
             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, 153);
+            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;
@@ -467,9 +467,9 @@
             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, 516F));
+            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, 40F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1238);
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 1082);
             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(1523, 722);
+            this.label12.Location = new System.Drawing.Point(1394, 630);
             this.label12.Margin = new System.Windows.Forms.Padding(2);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(272, 513);
+            this.label12.Size = new System.Drawing.Size(249, 449);
             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(1967, 0);
+            this.labTime.Location = new System.Drawing.Point(1802, 0);
             this.labTime.Margin = new System.Windows.Forms.Padding(0);
             this.labTime.Name = "labTime";
-            this.labTime.Size = new System.Drawing.Size(593, 149);
+            this.labTime.Size = new System.Drawing.Size(545, 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(356, 149);
+            this.pictureBox1.Size = new System.Drawing.Size(326, 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(356, 0);
+            this.label1.Location = new System.Drawing.Point(326, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(1611, 149);
+            this.label1.Size = new System.Drawing.Size(1476, 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, 592F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 544F));
             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.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 380F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1830);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1601);
             this.tableLayoutPanel1.TabIndex = 9;
             // 
             // FrmZP
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(2560, 1830);
+            this.ClientSize = new System.Drawing.Size(2347, 1601);
             this.Controls.Add(this.tableLayoutPanel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(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";

InjectionPC/FrmPackageDetail.Designer.cs

@@ -55,10 +55,10 @@ namespace InjectionPC
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 3;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 52F));
             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, 60F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 52F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(2291, 967);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(2100, 846);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // panel1
@@ -68,7 +68,7 @@ namespace InjectionPC
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(3, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(2285, 54);
+            this.panel1.Size = new System.Drawing.Size(2094, 46);
             this.panel1.TabIndex = 0;
             // 
             // txtPackageCode
@@ -76,18 +76,18 @@ namespace InjectionPC
             this.txtPackageCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.txtPackageCode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtPackageCode.Location = new System.Drawing.Point(1621, 5);
+            this.txtPackageCode.Location = new System.Drawing.Point(1485, 4);
             this.txtPackageCode.Name = "txtPackageCode";
-            this.txtPackageCode.Size = new System.Drawing.Size(483, 44);
+            this.txtPackageCode.Size = new System.Drawing.Size(443, 39);
             this.txtPackageCode.TabIndex = 1;
             // 
             // btnSearch
             // 
             this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnSearch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.Location = new System.Drawing.Point(2133, 0);
+            this.btnSearch.Location = new System.Drawing.Point(1954, 0);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(153, 51);
+            this.btnSearch.Size = new System.Drawing.Size(140, 45);
             this.btnSearch.TabIndex = 0;
             this.btnSearch.Text = "查 询";
             this.btnSearch.UseVisualStyleBackColor = true;
@@ -112,11 +112,11 @@ namespace InjectionPC
             dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
             this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridView1.Location = new System.Drawing.Point(3, 63);
+            this.dataGridView1.Location = new System.Drawing.Point(3, 55);
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.RowHeadersWidth = 82;
             this.dataGridView1.RowTemplate.Height = 37;
-            this.dataGridView1.Size = new System.Drawing.Size(2285, 841);
+            this.dataGridView1.Size = new System.Drawing.Size(2094, 736);
             this.dataGridView1.TabIndex = 1;
             // 
             // 箱单号
@@ -161,9 +161,9 @@ namespace InjectionPC
             // 
             // FrmPackageDetail
             // 
-            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(2291, 967);
+            this.ClientSize = new System.Drawing.Size(2100, 846);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Name = "FrmPackageDetail";
             this.Text = "箱单详细信息";

InjectionSearch/FrmBarCodeSearch2408.Designer.cs

@@ -60,33 +60,33 @@
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
-            this.comBoxSizeL = new System.Windows.Forms.ComboBox();
             this.label38 = new System.Windows.Forms.Label();
             this.lbPackageCodeL = new System.Windows.Forms.Label();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.btnChangeSizeR = new System.Windows.Forms.Button();
+            this.comBoxSizeL = new System.Windows.Forms.ComboBox();
             this.pnBoxReprint = new System.Windows.Forms.Panel();
             this.btnPrintCancel = new System.Windows.Forms.Button();
             this.btnRePrint = new System.Windows.Forms.Button();
             this.txtRePrintBoxCode = new System.Windows.Forms.TextBox();
             this.label24 = new System.Windows.Forms.Label();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.btnChangeSizeR = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.tableLayoutPanel4.SuspendLayout();
-            this.pnBoxReprint.SuspendLayout();
             this.panel2.SuspendLayout();
+            this.pnBoxReprint.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label1.Location = new System.Drawing.Point(180, 118);
+            this.label1.Location = new System.Drawing.Point(165, 103);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(202, 58);
+            this.label1.Size = new System.Drawing.Size(178, 51);
             this.label1.TabIndex = 0;
             this.label1.Text = "产品：";
             // 
@@ -94,10 +94,10 @@
             // 
             this.comboBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(444, 114);
+            this.comboBox1.Location = new System.Drawing.Point(407, 100);
-            this.comboBox1.Margin = new System.Windows.Forms.Padding(6);
+            this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(1250, 66);
+            this.comboBox1.Size = new System.Drawing.Size(1146, 59);
             this.comboBox1.TabIndex = 1;
             this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
             // 
@@ -105,10 +105,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label2.Location = new System.Drawing.Point(170, 218);
+            this.label2.Location = new System.Drawing.Point(156, 191);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(261, 58);
+            this.label2.Size = new System.Drawing.Size(230, 51);
             this.label2.TabIndex = 2;
             this.label2.Text = "零件号：";
             // 
@@ -116,30 +116,30 @@
             // 
             this.textBox1.Enabled = false;
             this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox1.Location = new System.Drawing.Point(444, 202);
+            this.textBox1.Location = new System.Drawing.Point(407, 177);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(6);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(474, 74);
+            this.textBox1.Size = new System.Drawing.Size(435, 65);
             this.textBox1.TabIndex = 3;
             // 
             // textBox2
             // 
             this.textBox2.Enabled = false;
             this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox2.Location = new System.Drawing.Point(444, 304);
+            this.textBox2.Location = new System.Drawing.Point(407, 266);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(6);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(1250, 74);
+            this.textBox2.Size = new System.Drawing.Size(1146, 65);
             this.textBox2.TabIndex = 4;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label3.Location = new System.Drawing.Point(180, 326);
+            this.label3.Location = new System.Drawing.Point(165, 285);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(202, 58);
+            this.label3.Size = new System.Drawing.Size(178, 51);
             this.label3.TabIndex = 5;
             this.label3.Text = "原料：";
             // 
@@ -160,10 +160,10 @@
             this.panel1.Controls.Add(this.textBox2);
             this.panel1.Controls.Add(this.label2);
             this.panel1.Controls.Add(this.textBox1);
-            this.panel1.Location = new System.Drawing.Point(370, 1082);
+            this.panel1.Location = new System.Drawing.Point(339, 947);
-            this.panel1.Margin = new System.Windows.Forms.Padding(6);
+            this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(2008, 634);
+            this.panel1.Size = new System.Drawing.Size(1841, 555);
             this.panel1.TabIndex = 6;
             // 
             // cboxHandBox
@@ -172,10 +172,10 @@
             this.cboxHandBox.Checked = true;
             this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cboxHandBox.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.cboxHandBox.Location = new System.Drawing.Point(1394, 32);
+            this.cboxHandBox.Location = new System.Drawing.Point(1278, 28);
             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 = 15;
             this.cboxHandBox.Tag = "true";
             this.cboxHandBox.Text = "打印箱码";
@@ -185,20 +185,20 @@
             // 
             this.comboBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
             this.comboBox2.FormattingEnabled = true;
-            this.comboBox2.Location = new System.Drawing.Point(444, 16);
+            this.comboBox2.Location = new System.Drawing.Point(407, 14);
-            this.comboBox2.Margin = new System.Windows.Forms.Padding(6);
+            this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Size = new System.Drawing.Size(408, 66);
+            this.comboBox2.Size = new System.Drawing.Size(374, 59);
             this.comboBox2.TabIndex = 12;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label7.Location = new System.Drawing.Point(180, 32);
+            this.label7.Location = new System.Drawing.Point(165, 28);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(202, 58);
+            this.label7.Size = new System.Drawing.Size(178, 51);
             this.label7.TabIndex = 11;
             this.label7.Text = "机台：";
             // 
@@ -206,10 +206,10 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(980, 420);
+            this.label16.Location = new System.Drawing.Point(898, 368);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(265, 58);
+            this.label16.Size = new System.Drawing.Size(238, 51);
             this.label16.TabIndex = 10;
             this.label16.Text = "(yyMMdd)";
             // 
@@ -217,20 +217,20 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label5.Location = new System.Drawing.Point(172, 518);
+            this.label5.Location = new System.Drawing.Point(158, 453);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(202, 58);
+            this.label5.Size = new System.Drawing.Size(178, 51);
             this.label5.TabIndex = 8;
             this.label5.Text = "数量：";
             // 
             // textBox4
             // 
             this.textBox4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox4.Location = new System.Drawing.Point(444, 518);
+            this.textBox4.Location = new System.Drawing.Point(407, 453);
-            this.textBox4.Margin = new System.Windows.Forms.Padding(6);
+            this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(474, 74);
+            this.textBox4.Size = new System.Drawing.Size(435, 65);
             this.textBox4.TabIndex = 9;
             this.textBox4.Text = "10";
             // 
@@ -238,20 +238,20 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label4.Location = new System.Drawing.Point(160, 438);
+            this.label4.Location = new System.Drawing.Point(147, 383);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(261, 58);
+            this.label4.Size = new System.Drawing.Size(230, 51);
             this.label4.TabIndex = 6;
             this.label4.Text = "批次号：";
             // 
             // textBox3
             // 
             this.textBox3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox3.Location = new System.Drawing.Point(444, 414);
+            this.textBox3.Location = new System.Drawing.Point(407, 362);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(6);
+            this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(474, 74);
+            this.textBox3.Size = new System.Drawing.Size(435, 65);
             this.textBox3.TabIndex = 7;
             // 
             // label19
@@ -259,10 +259,10 @@
             this.label19.BackColor = System.Drawing.Color.DeepSkyBlue;
             this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             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(2372, 1082);
+            this.label19.Location = new System.Drawing.Point(2174, 947);
             this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(144, 632);
+            this.label19.Size = new System.Drawing.Size(132, 553);
             this.label19.TabIndex = 17;
             this.label19.Text = "打印条码";
             this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -273,10 +273,10 @@
             this.label11.BackColor = System.Drawing.Color.DeepSkyBlue;
             this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label11.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(4, 1082);
+            this.label11.Location = new System.Drawing.Point(4, 947);
             this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(362, 632);
+            this.label11.Size = new System.Drawing.Size(332, 553);
             this.label11.TabIndex = 18;
             this.label11.Text = "打印信息：";
             this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -290,7 +290,7 @@
             this.label10.Location = new System.Drawing.Point(6, 0);
             this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(415, 596);
+            this.label10.Size = new System.Drawing.Size(379, 522);
             this.label10.TabIndex = 19;
             this.label10.Text = "打印记录：";
             this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -305,18 +305,18 @@
             this.panel3.Controls.Add(this.label6);
             this.panel3.Controls.Add(this.textBox5);
             this.panel3.Location = new System.Drawing.Point(4, 4);
-            this.panel3.Margin = new System.Windows.Forms.Padding(6);
+            this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(2498, 120);
+            this.panel3.Size = new System.Drawing.Size(2290, 105);
             this.panel3.TabIndex = 22;
             // 
             // btnBoxRePrint
             // 
             this.btnBoxRePrint.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.btnBoxRePrint.Location = new System.Drawing.Point(332, 6);
+            this.btnBoxRePrint.Location = new System.Drawing.Point(304, 5);
-            this.btnBoxRePrint.Margin = new System.Windows.Forms.Padding(6);
+            this.btnBoxRePrint.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.btnBoxRePrint.Name = "btnBoxRePrint";
-            this.btnBoxRePrint.Size = new System.Drawing.Size(310, 100);
+            this.btnBoxRePrint.Size = new System.Drawing.Size(284, 88);
             this.btnBoxRePrint.TabIndex = 8;
             this.btnBoxRePrint.Text = "箱码补打";
             this.btnBoxRePrint.UseVisualStyleBackColor = true;
@@ -325,10 +325,10 @@
             // btnPackage
             // 
             this.btnPackage.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.btnPackage.Location = new System.Drawing.Point(10, 6);
+            this.btnPackage.Location = new System.Drawing.Point(9, 5);
-            this.btnPackage.Margin = new System.Windows.Forms.Padding(6);
+            this.btnPackage.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.btnPackage.Name = "btnPackage";
-            this.btnPackage.Size = new System.Drawing.Size(310, 100);
+            this.btnPackage.Size = new System.Drawing.Size(284, 88);
             this.btnPackage.TabIndex = 7;
             this.btnPackage.Text = "不良替换";
             this.btnPackage.UseVisualStyleBackColor = true;
@@ -337,10 +337,10 @@
             // button1
             // 
             this.button1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.button1.Location = new System.Drawing.Point(2148, 20);
+            this.button1.Location = new System.Drawing.Point(1969, 18);
-            this.button1.Margin = new System.Windows.Forms.Padding(6);
+            this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(190, 86);
+            this.button1.Size = new System.Drawing.Size(174, 75);
             this.button1.TabIndex = 6;
             this.button1.Text = "查询";
             this.button1.UseVisualStyleBackColor = true;
@@ -350,20 +350,20 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label6.Location = new System.Drawing.Point(954, 24);
+            this.label6.Location = new System.Drawing.Point(875, 21);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(261, 58);
+            this.label6.Size = new System.Drawing.Size(230, 51);
             this.label6.TabIndex = 4;
             this.label6.Text = "条码号：";
             // 
             // textBox5
             // 
             this.textBox5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox5.Location = new System.Drawing.Point(1252, 18);
+            this.textBox5.Location = new System.Drawing.Point(1148, 16);
-            this.textBox5.Margin = new System.Windows.Forms.Padding(6);
+            this.textBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(826, 74);
+            this.textBox5.Size = new System.Drawing.Size(758, 65);
             this.textBox5.TabIndex = 5;
             // 
             // glacialList1
@@ -428,17 +428,17 @@
             this.glacialList1.HoverEvents = false;
             this.glacialList1.HoverTime = 1;
             this.glacialList1.ImageList = null;
-            this.glacialList1.ItemHeight = 39;
+            this.glacialList1.ItemHeight = 35;
             this.glacialList1.ItemWordWrap = false;
-            this.glacialList1.Location = new System.Drawing.Point(441, 130);
+            this.glacialList1.Location = new System.Drawing.Point(404, 114);
-            this.glacialList1.Margin = new System.Windows.Forms.Padding(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.Lime;
             this.glacialList1.ShowBorder = true;
             this.glacialList1.ShowFocusRect = false;
-            this.glacialList1.Size = new System.Drawing.Size(2077, 946);
+            this.glacialList1.Size = new System.Drawing.Size(1904, 828);
             this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
             this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
             this.glacialList1.TabIndex = 23;
@@ -450,13 +450,13 @@
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.label10, 0, 0);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 134);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 117);
             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, 63.3705F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 36.6295F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(427, 942);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(391, 824);
             this.tableLayoutPanel1.TabIndex = 24;
             // 
             // groupBox2
@@ -465,11 +465,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, 600);
+            this.groupBox2.Location = new System.Drawing.Point(4, 526);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox2.Size = new System.Drawing.Size(419, 338);
+            this.groupBox2.Size = new System.Drawing.Size(383, 294);
             this.groupBox2.TabIndex = 20;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "装箱信息";
@@ -483,42 +483,25 @@
             this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0);
             this.tableLayoutPanel4.Controls.Add(this.panel2, 1, 1);
             this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 36);
+            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, 49.99751F));
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.00249F));
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(411, 298);
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(375, 258);
             this.tableLayoutPanel4.TabIndex = 3;
             // 
-            // comBoxSizeL
-            // 
-            this.comBoxSizeL.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.comBoxSizeL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            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.Items.AddRange(new object[] {
-            "A班",
-            "B班"});
-            this.comBoxSizeL.Location = new System.Drawing.Point(0, 34);
-            this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6);
-            this.comBoxSizeL.Name = "comBoxSizeL";
-            this.comBoxSizeL.Size = new System.Drawing.Size(139, 72);
-            this.comBoxSizeL.TabIndex = 3;
-            this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSizeL_SelectedValueChanged);
-            // 
             // label38
             // 
             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(6, 165);
+            this.label38.Location = new System.Drawing.Point(6, 143);
             this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(116, 54);
+            this.label38.Size = new System.Drawing.Size(106, 47);
             this.label38.TabIndex = 1;
             this.label38.Text = "规格:";
             this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -529,12 +512,53 @@
             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, 45);
+            this.lbPackageCodeL.Location = new System.Drawing.Point(4, 39);
             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;
             // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.btnChangeSizeR);
+            this.panel2.Controls.Add(this.comBoxSizeL);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Location = new System.Drawing.Point(128, 114);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(244, 105);
+            this.panel2.TabIndex = 6;
+            // 
+            // btnChangeSizeR
+            // 
+            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(130, 30);
+            this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnChangeSizeR.Name = "btnChangeSizeR";
+            this.btnChangeSizeR.Size = new System.Drawing.Size(113, 64);
+            this.btnChangeSizeR.TabIndex = 5;
+            this.btnChangeSizeR.Text = "调整";
+            this.btnChangeSizeR.UseVisualStyleBackColor = false;
+            this.btnChangeSizeR.Click += new System.EventHandler(this.btnChangeSizeR_Click);
+            // 
+            // comBoxSizeL
+            // 
+            this.comBoxSizeL.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.comBoxSizeL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            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.Items.AddRange(new object[] {
+            "A班",
+            "B班"});
+            this.comBoxSizeL.Location = new System.Drawing.Point(0, 29);
+            this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.comBoxSizeL.Name = "comBoxSizeL";
+            this.comBoxSizeL.Size = new System.Drawing.Size(128, 64);
+            this.comBoxSizeL.TabIndex = 3;
+            this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSizeL_SelectedValueChanged);
+            // 
             // pnBoxReprint
             // 
             this.pnBoxReprint.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -542,20 +566,20 @@
             this.pnBoxReprint.Controls.Add(this.btnRePrint);
             this.pnBoxReprint.Controls.Add(this.txtRePrintBoxCode);
             this.pnBoxReprint.Controls.Add(this.label24);
-            this.pnBoxReprint.Location = new System.Drawing.Point(560, 426);
+            this.pnBoxReprint.Location = new System.Drawing.Point(513, 373);
-            this.pnBoxReprint.Margin = new System.Windows.Forms.Padding(5);
+            this.pnBoxReprint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.pnBoxReprint.Name = "pnBoxReprint";
-            this.pnBoxReprint.Size = new System.Drawing.Size(1397, 150);
+            this.pnBoxReprint.Size = new System.Drawing.Size(1281, 132);
             this.pnBoxReprint.TabIndex = 25;
             this.pnBoxReprint.Visible = false;
             // 
             // btnPrintCancel
             // 
             this.btnPrintCancel.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnPrintCancel.Location = new System.Drawing.Point(1197, 44);
+            this.btnPrintCancel.Location = new System.Drawing.Point(1097, 38);
-            this.btnPrintCancel.Margin = new System.Windows.Forms.Padding(5);
+            this.btnPrintCancel.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.btnPrintCancel.Name = "btnPrintCancel";
-            this.btnPrintCancel.Size = new System.Drawing.Size(160, 60);
+            this.btnPrintCancel.Size = new System.Drawing.Size(147, 52);
             this.btnPrintCancel.TabIndex = 3;
             this.btnPrintCancel.Text = "取消";
             this.btnPrintCancel.UseVisualStyleBackColor = true;
@@ -564,10 +588,10 @@
             // btnRePrint
             // 
             this.btnRePrint.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRePrint.Location = new System.Drawing.Point(1027, 40);
+            this.btnRePrint.Location = new System.Drawing.Point(941, 35);
-            this.btnRePrint.Margin = new System.Windows.Forms.Padding(5);
+            this.btnRePrint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.btnRePrint.Name = "btnRePrint";
-            this.btnRePrint.Size = new System.Drawing.Size(160, 60);
+            this.btnRePrint.Size = new System.Drawing.Size(147, 52);
             this.btnRePrint.TabIndex = 2;
             this.btnRePrint.Text = "确定";
             this.btnRePrint.UseVisualStyleBackColor = true;
@@ -576,51 +600,29 @@
             // txtRePrintBoxCode
             // 
             this.txtRePrintBoxCode.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtRePrintBoxCode.Location = new System.Drawing.Point(208, 44);
+            this.txtRePrintBoxCode.Location = new System.Drawing.Point(191, 38);
-            this.txtRePrintBoxCode.Margin = new System.Windows.Forms.Padding(5);
+            this.txtRePrintBoxCode.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.txtRePrintBoxCode.Name = "txtRePrintBoxCode";
-            this.txtRePrintBoxCode.Size = new System.Drawing.Size(737, 55);
+            this.txtRePrintBoxCode.Size = new System.Drawing.Size(676, 49);
             this.txtRePrintBoxCode.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, 52);
+            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;
             // 
-            // panel2
-            // 
-            this.panel2.Controls.Add(this.btnChangeSizeR);
-            this.panel2.Controls.Add(this.comBoxSizeL);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2.Location = new System.Drawing.Point(139, 131);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(269, 123);
-            this.panel2.TabIndex = 6;
-            // 
-            // btnChangeSizeR
-            // 
-            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(142, 34);
-            this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.btnChangeSizeR.Name = "btnChangeSizeR";
-            this.btnChangeSizeR.Size = new System.Drawing.Size(123, 72);
-            this.btnChangeSizeR.TabIndex = 5;
-            this.btnChangeSizeR.Text = "调整";
-            this.btnChangeSizeR.UseVisualStyleBackColor = true;
-            this.btnChangeSizeR.Click += new System.EventHandler(this.btnChangeSizeR_Click);
-            // 
             // FrmBarCodeSearch2408
             // 
-            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(2528, 1638);
+            this.ClientSize = new System.Drawing.Size(2317, 1433);
             this.Controls.Add(this.pnBoxReprint);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Controls.Add(this.glacialList1);
@@ -628,7 +630,7 @@
             this.Controls.Add(this.label11);
             this.Controls.Add(this.label19);
             this.Controls.Add(this.panel1);
-            this.Margin = new System.Windows.Forms.Padding(6);
+            this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.Name = "FrmBarCodeSearch2408";
             this.Text = "条码信息";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBarCodeSearch_FormClosing);
@@ -641,9 +643,9 @@
             this.groupBox2.ResumeLayout(false);
             this.tableLayoutPanel4.ResumeLayout(false);
             this.tableLayoutPanel4.PerformLayout();
+            this.panel2.ResumeLayout(false);
             this.pnBoxReprint.ResumeLayout(false);
             this.pnBoxReprint.PerformLayout();
-            this.panel2.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }

InjectionSearch/FrmBarCodeSearch2408.cs

@@ -238,7 +238,8 @@ namespace InjectionSearch
                     #region 打印条码
                     PlasticBLL plbll = new PlasticBLL();
 
-                    filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+                    //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+                    filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName();
                     DataTable headTable = new DataTable();
                     headTable.Columns.Add("PrintTime");
                     headTable.Columns.Add("PartNo");
@@ -400,7 +401,7 @@ namespace InjectionSearch
 
                         if(i > 0)
                         {
-                            msg = $"最后一箱数量为[{i}],不能满箱打印,是否确定手工打印条码？";
+                            msg = $"标包数为[{packageSize}],最后一箱数量为[{i}],不能满箱打印,是否确定手工打印条码？";
 
                         }
                     }
@@ -522,7 +523,8 @@ namespace InjectionSearch
                             {
                                 #region 打印条码
 
-                                filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+                                //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+                                filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName();
                                 DataTable headTable = new DataTable();
                                 headTable.Columns.Add("PrintTime");
                                 headTable.Columns.Add("PartNo");
@@ -812,8 +814,8 @@ namespace InjectionSearch
                             {
                                 #region 打印条码
 
-                                filename = System.AppDomain.CurrentDomain.BaseDirectory +
+                                //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf";
-                                           "单个条码1.grf";
+                                filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName();
 
                                 DataTable headTable = new DataTable();
                                 headTable.Columns.Add("PrintTime");
@@ -1004,6 +1006,7 @@ namespace InjectionSearch
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
             }
         }
+       
         string SaveBoxInfo(DataTable pdt, string partNo, string batch,string packageSize)
         {
             string  packageCode = _uniqueBll.GetPackageCodeSerialNo(partNo, textBox3.Text.Trim(), packageSize.ToString());
@@ -1369,5 +1372,33 @@ namespace InjectionSearch
         {
             comBoxSizeL.Enabled = false;
         }
+
+        string PrintMoudleName()
+        {
+            string stationName = comboBox2.Text.Trim();
+
+            if ("IM05,IM08,IM10".Contains(stationName)) //二维小条码
+            {
+                return "单个条码2.grf";
+            }
+            else if ("IM06,IM07,IM09,IM11,IM12,".Contains(stationName)) //一维条码
+            {
+                return "单个条码.grf";
+            }
+
+            else if ("IM01,IM02,IM03,IM04,IM15,IM18,IM20".Contains(stationName)) //小米大条码
+            {
+                return "Sill.grf";
+            }
+            else if ("IM13,IM14".Contains(stationName)) //直供条码
+            {
+                return "单个条码1.grf";
+            }
+            else
+            {
+                return "单个条码2.grf";
+            }
+
+        }
     }
 }

PaintingPC/FrmQuality.cs

@@ -350,6 +350,8 @@ namespace PaintingPC
                 MessageBox.Show("请先扫描数据,然后操作.");
                 return;
             }
+            if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行不良判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
             #region 必须选择缺陷位置与缺陷原因，否则无法保存
             if (CheckDefect() == false) return;
             #endregion
@@ -379,6 +381,8 @@ namespace PaintingPC
                 MessageBox.Show("请先扫描数据,然后操作.");
                 return;
             }
+            if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行返喷操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
             string barcode = Function.UniteBarCodeToOne(txtBarCode.Text.Trim());
             int cs = Function.YiDaMoCiShu(barcode);
             //if (cs >= 1)
@@ -440,6 +444,8 @@ namespace PaintingPC
                 MessageBox.Show("请先扫描数据,然后操作.");
                 return;
             }
+            if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行报废操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
             #region 必须选择缺陷位置与缺陷原因，否则无法保存
             if (CheckDefect() == false) return;
             #endregion

PaintingPC/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.2")]

喷涂上线/Code/PaintingPC/Function.cs

@@ -86,7 +86,7 @@ namespace PaintingPC
                 DataTable dt = new DataTable();
                 if (!string.IsNullOrWhiteSpace(stockNo) )
                 {
-                    sql = " select ProductName from tb_Product where StockNo = '" + stockNo + @"' ";
+                    sql = " select ProductName,PartNo from tb_Product where StockNo = '" + stockNo + @"' ";
                     dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
                 }
                 if (dt != null && dt.Rows.Count > 0)