diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs
index 459c269..78d6d24 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, 662F));
+ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 726F));
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, 1225);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(7, 1401);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
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, 35F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(2335, 371);
+ 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.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(1684, 12);
- this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button6.Location = new System.Drawing.Point(1832, 14);
+ this.button6.Margin = new System.Windows.Forms.Padding(14);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(638, 161);
+ this.button6.Size = new System.Drawing.Size(700, 183);
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, 190);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button1.Location = new System.Drawing.Point(7, 217);
+ this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(548, 176);
+ this.button1.Size = new System.Drawing.Size(595, 200);
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(1135, 197);
- this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button5.Location = new System.Drawing.Point(1234, 225);
+ this.button5.Margin = new System.Windows.Forms.Padding(14);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(523, 162);
+ this.button5.Size = new System.Drawing.Size(570, 184);
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(566, 5);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button4.Location = new System.Drawing.Point(616, 6);
+ this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(550, 175);
+ this.button4.Size = new System.Drawing.Size(597, 199);
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, 5);
- this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button3.Location = new System.Drawing.Point(7, 6);
+ this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(548, 175);
+ this.button3.Size = new System.Drawing.Size(595, 199);
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(573, 197);
- this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button2.Location = new System.Drawing.Point(623, 225);
+ this.button2.Margin = new System.Windows.Forms.Padding(14);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(536, 162);
+ this.button2.Size = new System.Drawing.Size(583, 184);
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(1677, 190);
- this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button7.Location = new System.Drawing.Point(1825, 217);
+ this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(652, 176);
+ this.button7.Size = new System.Drawing.Size(714, 200);
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(1374, 3);
+ this.label7.Location = new System.Drawing.Point(1495, 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(249, 211);
+ this.label7.Size = new System.Drawing.Size(272, 241);
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(396, 111);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Location = new System.Drawing.Point(431, 127);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(971, 77);
+ this.textBox2.Size = new System.Drawing.Size(1057, 87);
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, 107);
+ this.label3.Location = new System.Drawing.Point(5, 122);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(382, 109);
+ this.label3.Size = new System.Drawing.Size(417, 124);
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(1628, 219);
+ this.labOrderNo.Location = new System.Drawing.Point(1772, 249);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
- this.labOrderNo.Size = new System.Drawing.Size(708, 152);
+ this.labOrderNo.Size = new System.Drawing.Size(777, 174);
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(1374, 219);
+ this.label4.Location = new System.Drawing.Point(1495, 249);
this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(249, 152);
+ this.label4.Size = new System.Drawing.Size(272, 174);
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(394, 219);
+ this.labStationNo.Location = new System.Drawing.Point(429, 249);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
- this.labStationNo.Size = new System.Drawing.Size(975, 152);
+ this.labStationNo.Size = new System.Drawing.Size(1061, 174);
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, 219);
+ this.label2.Location = new System.Drawing.Point(3, 249);
this.label2.Margin = new System.Windows.Forms.Padding(2);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(386, 152);
+ this.label2.Size = new System.Drawing.Size(421, 174);
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(1628, 376);
+ this.labPName.Location = new System.Drawing.Point(1772, 428);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
- this.labPName.Size = new System.Drawing.Size(708, 249);
+ this.labPName.Size = new System.Drawing.Size(777, 285);
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(1374, 376);
+ this.label8.Location = new System.Drawing.Point(1495, 428);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(249, 249);
+ this.label8.Size = new System.Drawing.Size(272, 285);
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(394, 376);
+ this.labPartNo.Location = new System.Drawing.Point(429, 428);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
- this.labPartNo.Size = new System.Drawing.Size(975, 249);
+ this.labPartNo.Size = new System.Drawing.Size(1061, 285);
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, 376);
+ this.label6.Location = new System.Drawing.Point(3, 428);
this.label6.Margin = new System.Windows.Forms.Padding(2);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(386, 249);
+ this.label6.Size = new System.Drawing.Size(421, 285);
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(1628, 630);
+ this.labBadCount.Location = new System.Drawing.Point(1772, 718);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
- this.labBadCount.Size = new System.Drawing.Size(708, 449);
+ this.labBadCount.Size = new System.Drawing.Size(777, 515);
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(394, 630);
+ this.labNum.Location = new System.Drawing.Point(429, 718);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
- this.labNum.Size = new System.Drawing.Size(975, 449);
+ this.labNum.Size = new System.Drawing.Size(1061, 515);
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, 630);
+ this.label10.Location = new System.Drawing.Point(3, 718);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(386, 449);
+ this.label10.Size = new System.Drawing.Size(421, 515);
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(382, 105);
+ this.label14.Size = new System.Drawing.Size(417, 120);
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(396, 5);
- this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Location = new System.Drawing.Point(431, 6);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(971, 77);
+ this.textBox1.Size = new System.Drawing.Size(1057, 87);
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(1630, 1);
+ this.labErrMessage.Location = new System.Drawing.Point(1774, 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(704, 215);
+ this.labErrMessage.Size = new System.Drawing.Size(773, 245);
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, 253F));
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 711F));
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
+ 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, 780F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F));
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, 134);
- this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 154);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
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, 452F));
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 1082);
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 517F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1236);
this.tableLayoutPanel4.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(1374, 630);
+ this.label12.Location = new System.Drawing.Point(1495, 718);
this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(249, 449);
+ this.label12.Size = new System.Drawing.Size(272, 515);
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(1792, 0);
+ this.labTime.Location = new System.Drawing.Point(1953, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
- this.labTime.Size = new System.Drawing.Size(555, 130);
+ this.labTime.Size = new System.Drawing.Size(607, 149);
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(324, 130);
+ this.pictureBox1.Size = new System.Drawing.Size(353, 149);
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(324, 0);
+ this.label1.Location = new System.Drawing.Point(353, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1468, 130);
+ this.label1.Size = new System.Drawing.Size(1600, 149);
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, 554F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 606F));
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(2347, 130);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 149);
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, 380F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1601);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1830);
this.tableLayoutPanel1.TabIndex = 9;
//
// FrmZP
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1601);
+ this.ClientSize = new System.Drawing.Size(2560, 1830);
this.Controls.Add(this.tableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
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 b6f2a47..6f343bb 100644
--- a/InjectionPC/FrmMain.Designer.cs
+++ b/InjectionPC/FrmMain.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();
@@ -117,10 +118,10 @@
this.label2 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
- 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();
@@ -175,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(6, 5, 6, 5);
+ this.panel1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1539);
+ this.panel1.Size = new System.Drawing.Size(2560, 1759);
this.panel1.TabIndex = 0;
//
// panel7
@@ -186,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, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1392);
+ this.panel7.Size = new System.Drawing.Size(2560, 1591);
this.panel7.TabIndex = 1;
//
// panel23
@@ -197,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, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1301);
+ this.panel23.Size = new System.Drawing.Size(2560, 1487);
this.panel23.TabIndex = 1;
//
// panel27
@@ -208,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, 975);
- this.panel27.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel27.Location = new System.Drawing.Point(0, 1114);
+ this.panel27.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 326);
+ this.panel27.Size = new System.Drawing.Size(2560, 373);
this.panel27.TabIndex = 1;
//
// panel29
@@ -219,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(310, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel29.Location = new System.Drawing.Point(338, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2037, 326);
+ this.panel29.Size = new System.Drawing.Size(2222, 373);
this.panel29.TabIndex = 1;
//
// panel31
@@ -230,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(123, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel31.Location = new System.Drawing.Point(134, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1914, 326);
+ this.panel31.Size = new System.Drawing.Size(2088, 373);
this.panel31.TabIndex = 1;
//
// panel33
@@ -241,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(123, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel33.Location = new System.Drawing.Point(134, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1791, 326);
+ this.panel33.Size = new System.Drawing.Size(1954, 373);
this.panel33.TabIndex = 1;
//
// panel35
@@ -252,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(6, 5, 6, 5);
+ this.panel35.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1668, 326);
+ this.panel35.Size = new System.Drawing.Size(1820, 373);
this.panel35.TabIndex = 1;
//
// panel37
@@ -262,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(6, 5, 6, 5);
+ this.panel37.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1668, 326);
+ this.panel37.Size = new System.Drawing.Size(1820, 373);
this.panel37.TabIndex = 1;
//
// panel40
@@ -273,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(6, 5, 6, 5);
+ this.panel40.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1668, 326);
+ this.panel40.Size = new System.Drawing.Size(1820, 373);
this.panel40.TabIndex = 1;
//
// panel42
@@ -284,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(6, 5, 6, 5);
+ this.panel42.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1545, 326);
+ this.panel42.Size = new System.Drawing.Size(1686, 373);
this.panel42.TabIndex = 1;
//
// panel39
@@ -302,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(6, 5, 6, 5);
+ this.panel39.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1422, 326);
+ this.panel39.Size = new System.Drawing.Size(1552, 373);
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(220, 292);
- this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox2.Location = new System.Drawing.Point(240, 334);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(303, 65);
+ this.textBox2.Size = new System.Drawing.Size(330, 74);
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(40, 303);
- this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label18.Location = new System.Drawing.Point(44, 346);
+ this.label18.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -331,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(607, 177);
- this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label19.Location = new System.Drawing.Point(662, 202);
+ this.label19.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -342,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(222, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox1.Location = new System.Drawing.Point(242, 197);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
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(42, 186);
- this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label20.Location = new System.Drawing.Point(46, 213);
+ this.label20.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -364,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(222, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox2.Location = new System.Drawing.Point(242, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -375,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(42, 70);
- this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label21.Location = new System.Drawing.Point(46, 80);
+ this.label21.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -386,10 +387,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1422, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel43.Location = new System.Drawing.Point(1552, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(123, 326);
+ this.panel43.Size = new System.Drawing.Size(134, 373);
this.panel43.TabIndex = 0;
//
// label23
@@ -398,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(6, 0, 6, 0);
+ this.label23.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(123, 326);
+ this.label23.Size = new System.Drawing.Size(134, 373);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -410,10 +411,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1545, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel41.Location = new System.Drawing.Point(1686, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(123, 326);
+ this.panel41.Size = new System.Drawing.Size(134, 373);
this.panel41.TabIndex = 0;
//
// label22
@@ -422,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(6, 0, 6, 0);
+ this.label22.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(123, 326);
+ this.label22.Size = new System.Drawing.Size(134, 373);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -434,10 +435,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1668, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel34.Location = new System.Drawing.Point(1820, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(123, 326);
+ this.panel34.Size = new System.Drawing.Size(134, 373);
this.panel34.TabIndex = 0;
//
// label15
@@ -446,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(6, 0, 6, 0);
+ this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(123, 326);
+ this.label15.Size = new System.Drawing.Size(134, 373);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -459,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(6, 5, 6, 5);
+ this.panel32.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(123, 326);
+ this.panel32.Size = new System.Drawing.Size(134, 373);
this.panel32.TabIndex = 0;
//
// label14
@@ -470,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(6, 0, 6, 0);
+ this.label14.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(123, 326);
+ this.label14.Size = new System.Drawing.Size(134, 373);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -483,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(6, 5, 6, 5);
+ this.panel30.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(123, 326);
+ this.panel30.Size = new System.Drawing.Size(134, 373);
this.panel30.TabIndex = 0;
//
// label13
@@ -494,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(6, 0, 6, 0);
+ this.label13.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(123, 326);
+ this.label13.Size = new System.Drawing.Size(134, 373);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -507,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(6, 5, 6, 5);
+ this.panel28.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(310, 326);
+ this.panel28.Size = new System.Drawing.Size(338, 373);
this.panel28.TabIndex = 0;
//
// label12
@@ -519,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(6, 0, 6, 0);
+ this.label12.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(310, 326);
+ this.label12.Size = new System.Drawing.Size(338, 373);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -532,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(6, 5, 6, 5);
+ this.panel24.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 975);
+ this.panel24.Size = new System.Drawing.Size(2560, 1114);
this.panel24.TabIndex = 0;
//
// panel26
@@ -543,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(310, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel26.Location = new System.Drawing.Point(338, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(2037, 975);
+ this.panel26.Size = new System.Drawing.Size(2222, 1114);
this.panel26.TabIndex = 1;
//
// panel45
@@ -556,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(295, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel45.Location = new System.Drawing.Point(322, 677);
+ this.panel45.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1280, 132);
+ this.panel45.Size = new System.Drawing.Size(1396, 151);
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(1129, 37);
- this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button3.Location = new System.Drawing.Point(1232, 42);
+ this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 59);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -577,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(952, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button4.Location = new System.Drawing.Point(1039, 43);
+ this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 59);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -589,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(308, 40);
- this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox4.Location = new System.Drawing.Point(336, 46);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
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(26, 46);
- this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label25.Location = new System.Drawing.Point(28, 53);
+ this.label25.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -614,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(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel44.Location = new System.Drawing.Point(360, 363);
+ this.panel44.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1280, 132);
+ this.panel44.Size = new System.Drawing.Size(1396, 151);
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(1098, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button2.Location = new System.Drawing.Point(1198, 43);
+ this.button2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 59);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -635,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(941, 46);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button1.Location = new System.Drawing.Point(1027, 53);
+ this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 59);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -647,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(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox3.Location = new System.Drawing.Point(208, 43);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(677, 49);
+ this.textBox3.Size = new System.Drawing.Size(738, 55);
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(24, 46);
- this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label24.Location = new System.Drawing.Point(26, 53);
+ this.label24.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -731,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(6, 5, 6, 5);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
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(2037, 975);
+ this.glacialList1.Size = new System.Drawing.Size(2222, 1114);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -751,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(6, 5, 6, 5);
+ this.panel25.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(310, 975);
+ this.panel25.Size = new System.Drawing.Size(338, 1114);
this.panel25.TabIndex = 0;
//
// panel38
@@ -764,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, 406);
- this.panel38.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel38.Location = new System.Drawing.Point(0, 464);
+ this.panel38.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(310, 569);
+ this.panel38.Size = new System.Drawing.Size(338, 650);
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, 401);
- this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label27.Location = new System.Drawing.Point(2, 458);
+ this.label27.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(306, 136);
+ this.label27.Size = new System.Drawing.Size(334, 155);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -784,20 +785,20 @@
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(22, 327);
- this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label26.Location = new System.Drawing.Point(24, 374);
+ this.label26.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(230, 51);
+ this.label26.Size = new System.Drawing.Size(261, 58);
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, 119);
- this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label17.Location = new System.Drawing.Point(2, 136);
+ this.label17.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(306, 136);
+ this.label17.Size = new System.Drawing.Size(334, 155);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -805,10 +806,10 @@
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(22, 46);
- this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label16.Location = new System.Drawing.Point(24, 53);
+ this.label16.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(230, 51);
+ this.label16.Size = new System.Drawing.Size(261, 58);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -817,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(6, 5, 6, 5);
+ this.panel36.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(310, 406);
+ this.panel36.Size = new System.Drawing.Size(338, 464);
this.panel36.TabIndex = 0;
//
// label11
@@ -828,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(6, 0, 6, 0);
+ this.label11.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(310, 406);
+ this.label11.Size = new System.Drawing.Size(338, 464);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -841,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(6, 5, 6, 5);
+ this.panel8.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -851,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(310, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel10.Location = new System.Drawing.Point(338, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(2037, 91);
+ this.panel10.Size = new System.Drawing.Size(2222, 104);
this.panel10.TabIndex = 1;
//
// panel12
@@ -862,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(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1586, 91);
+ this.panel12.Size = new System.Drawing.Size(1730, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -873,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(468, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel16.Location = new System.Drawing.Point(511, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1118, 91);
+ this.panel16.Size = new System.Drawing.Size(1219, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -884,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(427, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel20.Location = new System.Drawing.Point(466, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(691, 91);
+ this.panel20.Size = new System.Drawing.Size(753, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -895,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(341, 0);
- this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(350, 91);
+ this.label10.Size = new System.Drawing.Size(381, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -909,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(6, 5, 6, 5);
+ this.panel22.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -921,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(6, 0, 6, 0);
+ this.label9.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -935,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(6, 5, 6, 5);
+ this.panel19.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(427, 91);
+ this.panel19.Size = new System.Drawing.Size(466, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -945,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(202, 0);
- this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
+ this.label8.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(225, 91);
+ this.label8.Size = new System.Drawing.Size(246, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -958,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(6, 5, 6, 5);
+ this.panel21.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -970,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(6, 0, 6, 0);
+ this.label7.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -983,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(6, 5, 6, 5);
+ this.panel15.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(468, 91);
+ this.panel15.Size = new System.Drawing.Size(511, 104);
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(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(266, 91);
+ this.panel18.Size = new System.Drawing.Size(291, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1004,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(6, 0, 6, 0);
+ this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(266, 91);
+ this.label6.Size = new System.Drawing.Size(291, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1016,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(6, 5, 6, 5);
+ this.panel17.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1028,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(6, 0, 6, 0);
+ this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1041,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(6, 5, 6, 5);
+ this.panel11.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
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(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1066,9 +1067,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
@@ -1077,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(6, 5, 6, 5);
+ this.panel13.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1089,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(6, 0, 6, 0);
+ this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1101,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(6, 5, 6, 5);
+ this.panel9.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(310, 91);
+ this.panel9.Size = new System.Drawing.Size(338, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1113,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(6, 0, 6, 0);
+ this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(310, 91);
+ this.label3.Size = new System.Drawing.Size(338, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1126,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(6, 5, 6, 5);
+ this.panel2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1136,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(310, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel4.Location = new System.Drawing.Point(338, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2037, 147);
+ this.panel4.Size = new System.Drawing.Size(2222, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1147,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(6, 5, 6, 5);
+ this.panel6.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1685, 147);
+ this.panel6.Size = new System.Drawing.Size(1838, 168);
this.panel6.TabIndex = 1;
//
// label1
@@ -1158,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(6, 0, 6, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1685, 147);
+ this.label1.Size = new System.Drawing.Size(1838, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1169,10 +1170,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1685, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel5.Location = new System.Drawing.Point(1838, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1181,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(6, 0, 6, 0);
+ this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1194,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(6, 5, 6, 5);
+ this.panel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(310, 147);
+ this.panel3.Size = new System.Drawing.Size(338, 168);
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(6, 5);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.pictureBox1.Location = new System.Drawing.Point(7, 6);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(308, 140);
+ this.pictureBox1.Size = new System.Drawing.Size(336, 160);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1232,12 +1233,12 @@
//
// FrmMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1539);
+ this.ClientSize = new System.Drawing.Size(2560, 1759);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
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 35f380e..70a5ce2 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -29,10 +29,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- GlacialComponents.Controls.GLColumn glColumn5 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn6 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn7 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn8 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2408));
this.panel1 = new System.Windows.Forms.Panel();
this.panel7 = new System.Windows.Forms.Panel();
@@ -216,9 +216,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, 4, 5, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1601);
+ this.panel1.Size = new System.Drawing.Size(2560, 1830);
this.panel1.TabIndex = 0;
//
// panel7
@@ -227,10 +227,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, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(5);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1454);
+ this.panel7.Size = new System.Drawing.Size(2560, 1662);
this.panel7.TabIndex = 1;
//
// panel23
@@ -238,10 +238,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, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(5);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1363);
+ this.panel23.Size = new System.Drawing.Size(2560, 1558);
this.panel23.TabIndex = 1;
//
// panel27
@@ -249,10 +249,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, 976);
- this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel27.Location = new System.Drawing.Point(0, 1115);
+ this.panel27.Margin = new System.Windows.Forms.Padding(5);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 387);
+ this.panel27.Size = new System.Drawing.Size(2560, 443);
this.panel27.TabIndex = 1;
//
// panel29
@@ -260,10 +260,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(311, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel29.Location = new System.Drawing.Point(339, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(5);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2036, 387);
+ this.panel29.Size = new System.Drawing.Size(2221, 443);
this.panel29.TabIndex = 1;
//
// panel31
@@ -271,10 +271,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(122, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel31.Location = new System.Drawing.Point(133, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(5);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1914, 387);
+ this.panel31.Size = new System.Drawing.Size(2088, 443);
this.panel31.TabIndex = 1;
//
// panel33
@@ -282,10 +282,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(122, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel33.Location = new System.Drawing.Point(133, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(5);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1792, 387);
+ this.panel33.Size = new System.Drawing.Size(1955, 443);
this.panel33.TabIndex = 1;
//
// panel35
@@ -293,9 +293,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, 4, 5, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1670, 387);
+ this.panel35.Size = new System.Drawing.Size(1822, 443);
this.panel35.TabIndex = 1;
//
// panel37
@@ -303,9 +303,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, 4, 5, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1670, 387);
+ this.panel37.Size = new System.Drawing.Size(1822, 443);
this.panel37.TabIndex = 1;
//
// panel40
@@ -314,9 +314,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, 4, 5, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1670, 387);
+ this.panel40.Size = new System.Drawing.Size(1822, 443);
this.panel40.TabIndex = 1;
//
// panel42
@@ -325,9 +325,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, 4, 5, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1548, 387);
+ this.panel42.Size = new System.Drawing.Size(1689, 443);
this.panel42.TabIndex = 1;
//
// panel39
@@ -344,9 +344,9 @@
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, 4, 5, 4);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1426, 387);
+ this.panel39.Size = new System.Drawing.Size(1556, 443);
this.panel39.TabIndex = 1;
//
// cboxHandBox
@@ -355,10 +355,10 @@
this.cboxHandBox.Checked = true;
this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
this.cboxHandBox.Enabled = false;
- this.cboxHandBox.Location = new System.Drawing.Point(924, 172);
- this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4);
+ this.cboxHandBox.Location = new System.Drawing.Point(1008, 197);
+ this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cboxHandBox.Name = "cboxHandBox";
- this.cboxHandBox.Size = new System.Drawing.Size(256, 55);
+ this.cboxHandBox.Size = new System.Drawing.Size(293, 62);
this.cboxHandBox.TabIndex = 14;
this.cboxHandBox.Tag = "true";
this.cboxHandBox.Text = "打印箱码";
@@ -368,20 +368,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(220, 291);
- this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox2.Location = new System.Drawing.Point(240, 333);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(302, 65);
+ this.textBox2.Size = new System.Drawing.Size(329, 74);
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(40, 304);
+ this.label18.Location = new System.Drawing.Point(44, 347);
this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -389,10 +389,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(606, 178);
+ this.label19.Location = new System.Drawing.Point(661, 203);
this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -400,20 +400,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(223, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox1.Location = new System.Drawing.Point(243, 197);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
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(41, 186);
+ this.label20.Location = new System.Drawing.Point(45, 213);
this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -422,10 +422,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(223, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox2.Location = new System.Drawing.Point(243, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(5);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -433,10 +433,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(41, 70);
+ this.label21.Location = new System.Drawing.Point(45, 80);
this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -444,10 +444,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1426, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel43.Location = new System.Drawing.Point(1556, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(5);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(122, 387);
+ this.panel43.Size = new System.Drawing.Size(133, 443);
this.panel43.TabIndex = 0;
//
// label23
@@ -458,7 +458,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(122, 387);
+ this.label23.Size = new System.Drawing.Size(133, 443);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -468,22 +468,21 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1548, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel41.Location = new System.Drawing.Point(1689, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(5);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(122, 387);
+ this.panel41.Size = new System.Drawing.Size(133, 443);
this.panel41.TabIndex = 0;
//
// label22
//
- this.label22.BackColor = System.Drawing.Color.Gray;
+ this.label22.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label22.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label22.Enabled = false;
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(122, 387);
+ this.label22.Size = new System.Drawing.Size(133, 443);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -493,10 +492,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1670, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel34.Location = new System.Drawing.Point(1822, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(5);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(122, 387);
+ this.panel34.Size = new System.Drawing.Size(133, 443);
this.panel34.TabIndex = 0;
//
// label15
@@ -507,7 +506,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(122, 387);
+ this.label15.Size = new System.Drawing.Size(133, 443);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -518,9 +517,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, 4, 5, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(122, 387);
+ this.panel32.Size = new System.Drawing.Size(133, 443);
this.panel32.TabIndex = 0;
//
// label14
@@ -531,7 +530,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(122, 387);
+ this.label14.Size = new System.Drawing.Size(133, 443);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -542,9 +541,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, 4, 5, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(122, 387);
+ this.panel30.Size = new System.Drawing.Size(133, 443);
this.panel30.TabIndex = 0;
//
// label13
@@ -555,7 +554,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(122, 387);
+ this.label13.Size = new System.Drawing.Size(133, 443);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -566,9 +565,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, 4, 5, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(311, 387);
+ this.panel28.Size = new System.Drawing.Size(339, 443);
this.panel28.TabIndex = 0;
//
// label12
@@ -580,7 +579,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(311, 387);
+ this.label12.Size = new System.Drawing.Size(339, 443);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -591,9 +590,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, 4, 5, 4);
+ this.panel24.Margin = new System.Windows.Forms.Padding(5);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 976);
+ this.panel24.Size = new System.Drawing.Size(2560, 1115);
this.panel24.TabIndex = 0;
//
// panel26
@@ -602,10 +601,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(380, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel26.Location = new System.Drawing.Point(415, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(5);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(1967, 976);
+ this.panel26.Size = new System.Drawing.Size(2145, 1115);
this.panel26.TabIndex = 1;
//
// panel45
@@ -615,19 +614,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(296, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel45.Location = new System.Drawing.Point(323, 677);
+ this.panel45.Margin = new System.Windows.Forms.Padding(5);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1281, 132);
+ this.panel45.Size = new System.Drawing.Size(1397, 151);
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(1129, 38);
- this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button3.Location = new System.Drawing.Point(1232, 43);
+ this.button3.Margin = new System.Windows.Forms.Padding(5);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 59);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -636,10 +635,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(951, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button4.Location = new System.Drawing.Point(1037, 43);
+ this.button4.Margin = new System.Windows.Forms.Padding(5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 59);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -648,20 +647,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(308, 39);
- this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox4.Location = new System.Drawing.Point(336, 45);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(5);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
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(26, 46);
+ this.label25.Location = new System.Drawing.Point(28, 53);
this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -673,19 +672,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(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel44.Location = new System.Drawing.Point(360, 363);
+ this.panel44.Margin = new System.Windows.Forms.Padding(5);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1281, 132);
+ this.panel44.Size = new System.Drawing.Size(1397, 151);
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(1097, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button2.Location = new System.Drawing.Point(1197, 43);
+ this.button2.Margin = new System.Windows.Forms.Padding(5);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 59);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -694,10 +693,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(941, 35);
- this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button1.Location = new System.Drawing.Point(1027, 40);
+ this.button1.Margin = new System.Windows.Forms.Padding(5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 59);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -706,20 +705,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(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox3.Location = new System.Drawing.Point(208, 43);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(5);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(676, 49);
+ this.textBox3.Size = new System.Drawing.Size(737, 55);
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(25, 46);
+ this.label24.Location = new System.Drawing.Point(27, 53);
this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -733,43 +732,43 @@
this.glacialList1.AutoHeight = true;
this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.glacialList1.BackgroundStretchToFit = true;
- glColumn5.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn5.CheckBoxes = false;
- glColumn5.ImageIndex = -1;
- glColumn5.Name = "条码";
- glColumn5.NumericSort = false;
- glColumn5.Text = "条码";
- glColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn5.Width = 350;
- glColumn6.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn6.CheckBoxes = false;
- glColumn6.ImageIndex = -1;
- glColumn6.Name = "产品名称";
- glColumn6.NumericSort = false;
- glColumn6.Text = "产品名称";
- glColumn6.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn6.Width = 320;
- glColumn7.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn7.CheckBoxes = false;
- glColumn7.ImageIndex = -1;
- glColumn7.Name = "打印方式";
- glColumn7.NumericSort = false;
- glColumn7.Text = "打印方式";
- glColumn7.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn7.Width = 150;
- glColumn8.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn8.CheckBoxes = false;
- glColumn8.ImageIndex = -1;
- glColumn8.Name = "打印时间";
- glColumn8.NumericSort = false;
- glColumn8.Text = "打印时间";
- glColumn8.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn8.Width = 270;
+ glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn1.CheckBoxes = false;
+ glColumn1.ImageIndex = -1;
+ glColumn1.Name = "条码";
+ glColumn1.NumericSort = false;
+ glColumn1.Text = "条码";
+ glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn1.Width = 350;
+ glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn2.CheckBoxes = false;
+ glColumn2.ImageIndex = -1;
+ glColumn2.Name = "产品名称";
+ glColumn2.NumericSort = false;
+ glColumn2.Text = "产品名称";
+ glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn2.Width = 320;
+ glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn3.CheckBoxes = false;
+ glColumn3.ImageIndex = -1;
+ glColumn3.Name = "打印方式";
+ glColumn3.NumericSort = false;
+ glColumn3.Text = "打印方式";
+ glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn3.Width = 150;
+ glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn4.CheckBoxes = false;
+ glColumn4.ImageIndex = -1;
+ glColumn4.Name = "打印时间";
+ glColumn4.NumericSort = false;
+ glColumn4.Text = "打印时间";
+ glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn4.Width = 270;
this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] {
- glColumn5,
- glColumn6,
- glColumn7,
- glColumn8});
+ glColumn1,
+ glColumn2,
+ glColumn3,
+ glColumn4});
this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal;
this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F);
@@ -787,17 +786,17 @@
this.glacialList1.HoverEvents = false;
this.glacialList1.HoverTime = 1;
this.glacialList1.ImageList = null;
- this.glacialList1.ItemHeight = 50;
+ 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, 4, 5, 4);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(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(1967, 976);
+ this.glacialList1.Size = new System.Drawing.Size(2145, 1115);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -810,9 +809,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, 4, 5, 4);
+ this.panel25.Margin = new System.Windows.Forms.Padding(5);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(380, 976);
+ this.panel25.Size = new System.Drawing.Size(415, 1115);
this.panel25.TabIndex = 0;
//
// tableLayoutPanel2
@@ -822,13 +821,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, 406);
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
- 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.Absolute, 299F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651);
this.tableLayoutPanel2.TabIndex = 1;
//
// panel38
@@ -838,19 +837,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, 4);
- this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel38.Location = new System.Drawing.Point(5, 5);
+ this.panel38.Margin = new System.Windows.Forms.Padding(5);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(370, 252);
+ this.panel38.Size = new System.Drawing.Size(404, 288);
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, 171);
+ this.label27.Location = new System.Drawing.Point(-3, 195);
this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(291, 73);
+ this.label27.Size = new System.Drawing.Size(317, 83);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -859,20 +858,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, 136);
+ this.label26.Location = new System.Drawing.Point(0, 155);
this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(151, 33);
+ this.label26.Size = new System.Drawing.Size(169, 37);
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, 49);
+ this.label17.Location = new System.Drawing.Point(-3, 56);
this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(291, 74);
+ this.label17.Size = new System.Drawing.Size(317, 85);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -881,10 +880,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, 10);
+ this.label16.Location = new System.Drawing.Point(0, 11);
this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(151, 33);
+ this.label16.Size = new System.Drawing.Size(169, 37);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -894,11 +893,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, 266);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Location = new System.Drawing.Point(4, 304);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(372, 300);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBox1.Size = new System.Drawing.Size(407, 342);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "模具2";
@@ -913,14 +912,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, 32);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 37);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
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(364, 264);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(399, 300);
this.tableLayoutPanel3.TabIndex = 2;
//
// panel47
@@ -931,10 +930,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, 179);
- this.panel47.Margin = new System.Windows.Forms.Padding(4);
+ this.panel47.Location = new System.Drawing.Point(4, 204);
+ this.panel47.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel47.Name = "panel47";
- this.panel47.Size = new System.Drawing.Size(356, 81);
+ this.panel47.Size = new System.Drawing.Size(391, 91);
this.panel47.TabIndex = 4;
//
// btnHandPrintR
@@ -942,10 +941,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(247, 16);
- this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintR.Location = new System.Drawing.Point(269, 18);
+ this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnHandPrintR.Name = "btnHandPrintR";
- this.btnHandPrintR.Size = new System.Drawing.Size(115, 64);
+ this.btnHandPrintR.Size = new System.Drawing.Size(125, 73);
this.btnHandPrintR.TabIndex = 3;
this.btnHandPrintR.Text = "打印";
this.btnHandPrintR.UseVisualStyleBackColor = false;
@@ -955,10 +954,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(71, 25);
+ this.label30.Location = new System.Drawing.Point(77, 29);
this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(50, 52);
+ this.label30.Size = new System.Drawing.Size(56, 59);
this.label30.TabIndex = 2;
this.label30.Text = "/";
//
@@ -966,10 +965,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(128, 28);
+ this.lbNeedQtyR.Location = new System.Drawing.Point(140, 32);
this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbNeedQtyR.Name = "lbNeedQtyR";
- this.lbNeedQtyR.Size = new System.Drawing.Size(50, 52);
+ this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59);
this.lbNeedQtyR.TabIndex = 1;
this.lbNeedQtyR.Text = "0";
//
@@ -977,10 +976,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(7, 27);
+ this.lbCurrentlQtyR.Location = new System.Drawing.Point(8, 31);
this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbCurrentlQtyR.Name = "lbCurrentlQtyR";
- this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52);
+ this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59);
this.lbCurrentlQtyR.TabIndex = 0;
this.lbCurrentlQtyR.Text = "0";
this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click);
@@ -990,10 +989,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, 108);
+ this.label34.Location = new System.Drawing.Point(5, 122);
this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(106, 46);
+ this.label34.Size = new System.Drawing.Size(116, 53);
this.label34.TabIndex = 1;
this.label34.Text = "规格:";
this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1004,10 +1003,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, 27);
+ this.lbPackageCodeR.Location = new System.Drawing.Point(4, 31);
this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPackageCodeR.Name = "lbPackageCodeR";
- this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33);
+ this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37);
this.lbPackageCodeR.TabIndex = 5;
//
// panel49
@@ -1015,9 +1014,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(124, 90);
+ this.panel49.Location = new System.Drawing.Point(136, 102);
this.panel49.Name = "panel49";
- this.panel49.Size = new System.Drawing.Size(237, 82);
+ this.panel49.Size = new System.Drawing.Size(260, 94);
this.panel49.TabIndex = 6;
//
// btnChangeSizeR
@@ -1025,10 +1024,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(127, 15);
- this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4);
+ this.btnChangeSizeR.Location = new System.Drawing.Point(139, 17);
+ this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnChangeSizeR.Name = "btnChangeSizeR";
- this.btnChangeSizeR.Size = new System.Drawing.Size(121, 64);
+ this.btnChangeSizeR.Size = new System.Drawing.Size(132, 73);
this.btnChangeSizeR.TabIndex = 4;
this.btnChangeSizeR.Text = "调整";
this.btnChangeSizeR.UseVisualStyleBackColor = false;
@@ -1044,10 +1043,10 @@
this.comBoxSizeR.Items.AddRange(new object[] {
"A班",
"B班"});
- this.comBoxSizeR.Location = new System.Drawing.Point(0, 16);
- this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comBoxSizeR.Location = new System.Drawing.Point(0, 19);
+ this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5);
this.comBoxSizeR.Name = "comBoxSizeR";
- this.comBoxSizeR.Size = new System.Drawing.Size(125, 64);
+ this.comBoxSizeR.Size = new System.Drawing.Size(136, 72);
this.comBoxSizeR.TabIndex = 3;
//
// panel36
@@ -1055,26 +1054,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, 4, 5, 4);
+ this.panel36.Margin = new System.Windows.Forms.Padding(5);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(380, 406);
+ this.panel36.Size = new System.Drawing.Size(415, 464);
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, 18F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
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);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
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(380, 406);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464);
this.tableLayoutPanel1.TabIndex = 1;
//
// label11
@@ -1082,10 +1081,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, 18);
+ this.label11.Location = new System.Drawing.Point(5, 21);
this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(370, 83);
+ this.label11.Size = new System.Drawing.Size(403, 95);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -1096,11 +1095,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, 105);
- this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Location = new System.Drawing.Point(4, 121);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox2.Size = new System.Drawing.Size(372, 297);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBox2.Size = new System.Drawing.Size(407, 338);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "模具1&&手打";
@@ -1115,15 +1114,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, 32);
- this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 37);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
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, 18F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 261);
+ 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.TabIndex = 3;
//
// label38
@@ -1131,10 +1130,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, 106);
+ this.label38.Location = new System.Drawing.Point(5, 120);
this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(106, 46);
+ this.label38.Size = new System.Drawing.Size(116, 53);
this.label38.TabIndex = 1;
this.label38.Text = "规格:";
this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1147,10 +1146,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, 177);
- this.panel46.Margin = new System.Windows.Forms.Padding(4);
+ this.panel46.Location = new System.Drawing.Point(4, 201);
+ this.panel46.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel46.Name = "panel46";
- this.panel46.Size = new System.Drawing.Size(356, 80);
+ this.panel46.Size = new System.Drawing.Size(391, 90);
this.panel46.TabIndex = 4;
//
// btnHandPrintL
@@ -1158,10 +1157,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(245, 13);
- this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintL.Location = new System.Drawing.Point(267, 15);
+ this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnHandPrintL.Name = "btnHandPrintL";
- this.btnHandPrintL.Size = new System.Drawing.Size(115, 64);
+ this.btnHandPrintL.Size = new System.Drawing.Size(125, 73);
this.btnHandPrintL.TabIndex = 3;
this.btnHandPrintL.Text = "打印";
this.btnHandPrintL.UseVisualStyleBackColor = false;
@@ -1171,10 +1170,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(71, 25);
+ this.label31.Location = new System.Drawing.Point(77, 29);
this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(50, 52);
+ this.label31.Size = new System.Drawing.Size(56, 59);
this.label31.TabIndex = 2;
this.label31.Text = "/";
//
@@ -1182,10 +1181,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(128, 28);
+ this.lbNeedQtyL.Location = new System.Drawing.Point(140, 32);
this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbNeedQtyL.Name = "lbNeedQtyL";
- this.lbNeedQtyL.Size = new System.Drawing.Size(50, 52);
+ this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59);
this.lbNeedQtyL.TabIndex = 1;
this.lbNeedQtyL.Text = "0";
//
@@ -1193,10 +1192,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(8, 27);
+ this.lbCurrentlQtyL.Location = new System.Drawing.Point(9, 31);
this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbCurrentlQtyL.Name = "lbCurrentlQtyL";
- this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52);
+ this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59);
this.lbCurrentlQtyL.TabIndex = 0;
this.lbCurrentlQtyL.Text = "0";
this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click);
@@ -1207,10 +1206,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, 26);
+ this.lbPackageCodeL.Location = new System.Drawing.Point(4, 30);
this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPackageCodeL.Name = "lbPackageCodeL";
- this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33);
+ this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37);
this.lbPackageCodeL.TabIndex = 5;
//
// panel48
@@ -1218,9 +1217,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(124, 89);
+ this.panel48.Location = new System.Drawing.Point(136, 101);
this.panel48.Name = "panel48";
- this.panel48.Size = new System.Drawing.Size(237, 81);
+ this.panel48.Size = new System.Drawing.Size(260, 92);
this.panel48.TabIndex = 6;
//
// btnChangeSizeL
@@ -1228,10 +1227,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(127, 10);
- this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4);
+ this.btnChangeSizeL.Location = new System.Drawing.Point(139, 11);
+ this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnChangeSizeL.Name = "btnChangeSizeL";
- this.btnChangeSizeL.Size = new System.Drawing.Size(115, 64);
+ this.btnChangeSizeL.Size = new System.Drawing.Size(125, 73);
this.btnChangeSizeL.TabIndex = 4;
this.btnChangeSizeL.Text = "调整";
this.btnChangeSizeL.UseVisualStyleBackColor = false;
@@ -1247,10 +1246,10 @@
this.comBoxSizeL.Items.AddRange(new object[] {
"A班",
"B班"});
- this.comBoxSizeL.Location = new System.Drawing.Point(2, 9);
- this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comBoxSizeL.Location = new System.Drawing.Point(2, 10);
+ this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5);
this.comBoxSizeL.Name = "comBoxSizeL";
- this.comBoxSizeL.Size = new System.Drawing.Size(125, 64);
+ this.comBoxSizeL.Size = new System.Drawing.Size(136, 72);
this.comBoxSizeL.TabIndex = 3;
//
// panel8
@@ -1259,9 +1258,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, 4, 5, 4);
+ this.panel8.Margin = new System.Windows.Forms.Padding(5);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -1269,10 +1268,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(380, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel10.Location = new System.Drawing.Point(415, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(5);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(1967, 91);
+ this.panel10.Size = new System.Drawing.Size(2145, 104);
this.panel10.TabIndex = 2;
//
// panel12
@@ -1280,10 +1279,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(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(5);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1516, 91);
+ this.panel12.Size = new System.Drawing.Size(1653, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -1291,10 +1290,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(467, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel16.Location = new System.Drawing.Point(509, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(5);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1049, 91);
+ this.panel16.Size = new System.Drawing.Size(1144, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -1302,10 +1301,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(428, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel20.Location = new System.Drawing.Point(467, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(5);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(621, 91);
+ this.panel20.Size = new System.Drawing.Size(677, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -1313,10 +1312,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(341, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(280, 91);
+ this.label10.Size = new System.Drawing.Size(305, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1327,9 +1326,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, 4, 5, 4);
+ this.panel22.Margin = new System.Windows.Forms.Padding(5);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -1341,7 +1340,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(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1353,9 +1352,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, 4, 5, 4);
+ this.panel19.Margin = new System.Windows.Forms.Padding(5);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(428, 91);
+ this.panel19.Size = new System.Drawing.Size(467, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -1363,10 +1362,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(202, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(226, 91);
+ this.label8.Size = new System.Drawing.Size(247, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1376,9 +1375,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, 4, 5, 4);
+ this.panel21.Margin = new System.Windows.Forms.Padding(5);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -1390,7 +1389,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(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1402,19 +1401,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, 4, 5, 4);
+ this.panel15.Margin = new System.Windows.Forms.Padding(5);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(467, 91);
+ this.panel15.Size = new System.Drawing.Size(509, 104);
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(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(5);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(265, 91);
+ this.panel18.Size = new System.Drawing.Size(289, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1425,7 +1424,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(265, 91);
+ this.label6.Size = new System.Drawing.Size(289, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1435,9 +1434,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, 4, 5, 4);
+ this.panel17.Margin = new System.Windows.Forms.Padding(5);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1449,7 +1448,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(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1461,19 +1460,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, 4, 5, 4);
+ this.panel11.Margin = new System.Windows.Forms.Padding(5);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
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(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(5);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1486,9 +1485,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(5);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
//
// panel13
@@ -1496,9 +1495,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, 4, 5, 4);
+ this.panel13.Margin = new System.Windows.Forms.Padding(5);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1510,7 +1509,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(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1520,9 +1519,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, 4, 5, 4);
+ this.panel9.Margin = new System.Windows.Forms.Padding(5);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(380, 91);
+ this.panel9.Size = new System.Drawing.Size(415, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1534,7 +1533,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(380, 91);
+ this.label3.Size = new System.Drawing.Size(415, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1545,9 +1544,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, 4, 5, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1555,10 +1554,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(311, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel4.Location = new System.Drawing.Point(339, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(5);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2036, 147);
+ this.panel4.Size = new System.Drawing.Size(2221, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1567,9 +1566,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, 4, 5, 4);
+ this.panel6.Margin = new System.Windows.Forms.Padding(5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1684, 147);
+ this.panel6.Size = new System.Drawing.Size(1837, 168);
this.panel6.TabIndex = 1;
//
// btnOnlyBarCode
@@ -1578,7 +1577,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(217, 143);
+ this.btnOnlyBarCode.Size = new System.Drawing.Size(237, 163);
this.btnOnlyBarCode.TabIndex = 1;
this.btnOnlyBarCode.Text = "条码模式";
this.btnOnlyBarCode.UseVisualStyleBackColor = false;
@@ -1592,7 +1591,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(1684, 147);
+ this.label1.Size = new System.Drawing.Size(1837, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间箱码条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1601,10 +1600,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1684, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel5.Location = new System.Drawing.Point(1837, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(5);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1615,7 +1614,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(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1626,19 +1625,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, 4, 5, 4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(5);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(311, 147);
+ this.panel3.Size = new System.Drawing.Size(339, 168);
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, 4);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(5, 5);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(307, 139);
+ this.pictureBox1.Size = new System.Drawing.Size(335, 159);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1682,12 +1681,12 @@
//
// FrmMain2408
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1601);
+ this.ClientSize = new System.Drawing.Size(2560, 1830);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.Margin = new System.Windows.Forms.Padding(5);
this.Name = "FrmMain2408";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs
index 255f645..c86eac2 100644
--- a/InjectionPC/FrmMain2408.cs
+++ b/InjectionPC/FrmMain2408.cs
@@ -2994,23 +2994,39 @@ namespace InjectionPC
}
else
{
- DialogResult result = MessageBox.Show("确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
+ GlacialComponents.Controls.GLItem gv;
+ gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+ code = gv.Text;
+ DialogResult result = MessageBox.Show($"补打条码[{code}]将被新的替换,确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
if (result == DialogResult.OK)
{
- GlacialComponents.Controls.GLItem gv;
- gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
- code = gv.Text;
+
+ bool exsitWms = _wmsBll.IsReadBarCodeInWms(code);
+ if (exsitWms)
+ {
+ MessageBox.Show($"条码[{code}]在WMS系统已处理,无法补打!");
+ return;
+ }
DataTable dt = bll.SearchInfoByBarCodeNew(code, Program.tableName);
if (dt != null && dt.Rows.Count > 0)
{
md.ID = Guid.NewGuid().ToString();
- md.BarCode = code;
+ //md.BarCode = code;
md.StationID = dt.Rows[0]["StationID"].ToString();
md.StockNo = dt.Rows[0]["StockNo"].ToString();
- md.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
- //md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
md.PartNo = dt.Rows[0]["PartNo"].ToString();
+ md.BatchNo = dt.Rows[0]["BatchNo"].ToString();
+ string newOneCode = string.Empty;
+ string newBarCode = string.Empty;
+ GetBarCode(md.StockNo, md.BatchNo, md.PartNo, ref newOneCode, ref newBarCode);
+ md.OneBarCode = newOneCode;
+ md.BarCode = newBarCode;
+ md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
+ if (gv.SubItems.Count > 1)
+ {
+ md.Des1 = gv.SubItems[1].Text;
+ }
md.PrintType = 2;
@@ -3038,11 +3054,16 @@ namespace InjectionPC
return;
}
- if (bll.Add_Info_New(md, Program.tableName) == false)
- // if (SaveBarCode(md, Program.tableName, true) == false) 补打不装箱
+ string msg = bll.ReprintSave(md, Program.tableName, dt.Rows[0]["OneBarCode"].ToString(), dt.Rows[0]["BarCode"].ToString());
+ if (!string.IsNullOrEmpty(msg))
{
+ MessageBox.Show($"补打失败,原因:" + msg);
return;
}
+ //if (bll.Add_Info_New(md, Program.tableName) == false)
+ //{
+ // return;
+ //}
glacialList1.SelectedItems.Clear();
initBarCode();
@@ -4397,12 +4418,16 @@ namespace InjectionPC
CheckPackageCode(partNo, autoPrint, mould, partName);
string batch = GetBatch(autoPrint);
-
+ GetBarCode(stockNo, batch, partNo, ref newOneCode, ref newCode);
+ // newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
+ //newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
+ }
+ void GetBarCode(string stockNo,string batch,string partNo,ref string newOneCode, ref string newCode)
+ {
newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
}
-
string GetPackageCode(string partNo,bool autoPrint )
{
string batch = GetBatch(autoPrint);
diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs
index cadfdca..49379cf 100644
--- a/InjectionPC/FrmMain2411.Designer.cs
+++ b/InjectionPC/FrmMain2411.Designer.cs
@@ -29,10 +29,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- GlacialComponents.Controls.GLColumn glColumn5 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn6 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn7 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn8 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2411));
this.panel1 = new System.Windows.Forms.Panel();
this.panel7 = new System.Windows.Forms.Panel();
@@ -183,9 +183,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, 4, 5, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1601);
+ this.panel1.Size = new System.Drawing.Size(2560, 1830);
this.panel1.TabIndex = 0;
//
// panel7
@@ -194,10 +194,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, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(5);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1454);
+ this.panel7.Size = new System.Drawing.Size(2560, 1662);
this.panel7.TabIndex = 1;
//
// panel23
@@ -205,10 +205,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, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(5);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1363);
+ this.panel23.Size = new System.Drawing.Size(2560, 1558);
this.panel23.TabIndex = 1;
//
// panel27
@@ -216,10 +216,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, 976);
- this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel27.Location = new System.Drawing.Point(0, 1115);
+ this.panel27.Margin = new System.Windows.Forms.Padding(5);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 387);
+ this.panel27.Size = new System.Drawing.Size(2560, 443);
this.panel27.TabIndex = 1;
//
// panel29
@@ -227,10 +227,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(311, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel29.Location = new System.Drawing.Point(339, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(5);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2036, 387);
+ this.panel29.Size = new System.Drawing.Size(2221, 443);
this.panel29.TabIndex = 1;
//
// panel31
@@ -238,10 +238,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(122, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel31.Location = new System.Drawing.Point(133, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(5);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1914, 387);
+ this.panel31.Size = new System.Drawing.Size(2088, 443);
this.panel31.TabIndex = 1;
//
// panel33
@@ -249,10 +249,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(122, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel33.Location = new System.Drawing.Point(133, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(5);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1792, 387);
+ this.panel33.Size = new System.Drawing.Size(1955, 443);
this.panel33.TabIndex = 1;
//
// panel35
@@ -260,9 +260,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, 4, 5, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1670, 387);
+ this.panel35.Size = new System.Drawing.Size(1822, 443);
this.panel35.TabIndex = 1;
//
// panel37
@@ -270,9 +270,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, 4, 5, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1670, 387);
+ this.panel37.Size = new System.Drawing.Size(1822, 443);
this.panel37.TabIndex = 1;
//
// panel40
@@ -281,9 +281,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, 4, 5, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1670, 387);
+ this.panel40.Size = new System.Drawing.Size(1822, 443);
this.panel40.TabIndex = 1;
//
// panel42
@@ -292,9 +292,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, 4, 5, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1548, 387);
+ this.panel42.Size = new System.Drawing.Size(1689, 443);
this.panel42.TabIndex = 1;
//
// panel39
@@ -310,28 +310,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(5, 4, 5, 4);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1426, 387);
+ this.panel39.Size = new System.Drawing.Size(1556, 443);
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(220, 291);
- this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox2.Location = new System.Drawing.Point(240, 333);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(302, 65);
+ this.textBox2.Size = new System.Drawing.Size(329, 74);
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(40, 304);
+ this.label18.Location = new System.Drawing.Point(44, 347);
this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -339,10 +339,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(606, 178);
+ this.label19.Location = new System.Drawing.Point(661, 203);
this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -350,20 +350,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(223, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox1.Location = new System.Drawing.Point(243, 197);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
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(41, 186);
+ this.label20.Location = new System.Drawing.Point(45, 213);
this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -372,10 +372,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(223, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox2.Location = new System.Drawing.Point(243, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(5);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -383,10 +383,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(41, 70);
+ this.label21.Location = new System.Drawing.Point(45, 80);
this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -394,10 +394,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1426, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel43.Location = new System.Drawing.Point(1556, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(5);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(122, 387);
+ this.panel43.Size = new System.Drawing.Size(133, 443);
this.panel43.TabIndex = 0;
//
// label23
@@ -408,7 +408,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(122, 387);
+ this.label23.Size = new System.Drawing.Size(133, 443);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -418,22 +418,21 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1548, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel41.Location = new System.Drawing.Point(1689, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(5);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(122, 387);
+ this.panel41.Size = new System.Drawing.Size(133, 443);
this.panel41.TabIndex = 0;
//
// label22
//
- this.label22.BackColor = System.Drawing.Color.Gray;
+ this.label22.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label22.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label22.Enabled = false;
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(122, 387);
+ this.label22.Size = new System.Drawing.Size(133, 443);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -443,10 +442,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1670, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel34.Location = new System.Drawing.Point(1822, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(5);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(122, 387);
+ this.panel34.Size = new System.Drawing.Size(133, 443);
this.panel34.TabIndex = 0;
//
// label15
@@ -457,7 +456,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(122, 387);
+ this.label15.Size = new System.Drawing.Size(133, 443);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -468,9 +467,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, 4, 5, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(122, 387);
+ this.panel32.Size = new System.Drawing.Size(133, 443);
this.panel32.TabIndex = 0;
//
// label14
@@ -481,7 +480,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(122, 387);
+ this.label14.Size = new System.Drawing.Size(133, 443);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -492,9 +491,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, 4, 5, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(122, 387);
+ this.panel30.Size = new System.Drawing.Size(133, 443);
this.panel30.TabIndex = 0;
//
// label13
@@ -505,7 +504,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(122, 387);
+ this.label13.Size = new System.Drawing.Size(133, 443);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -516,9 +515,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, 4, 5, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(311, 387);
+ this.panel28.Size = new System.Drawing.Size(339, 443);
this.panel28.TabIndex = 0;
//
// label12
@@ -530,7 +529,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(311, 387);
+ this.label12.Size = new System.Drawing.Size(339, 443);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -541,9 +540,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, 4, 5, 4);
+ this.panel24.Margin = new System.Windows.Forms.Padding(5);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 976);
+ this.panel24.Size = new System.Drawing.Size(2560, 1115);
this.panel24.TabIndex = 0;
//
// panel26
@@ -552,10 +551,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(380, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel26.Location = new System.Drawing.Point(415, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(5);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(1967, 976);
+ this.panel26.Size = new System.Drawing.Size(2145, 1115);
this.panel26.TabIndex = 1;
//
// panel45
@@ -565,19 +564,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(296, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel45.Location = new System.Drawing.Point(323, 677);
+ this.panel45.Margin = new System.Windows.Forms.Padding(5);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1281, 132);
+ this.panel45.Size = new System.Drawing.Size(1397, 151);
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(1129, 38);
- this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button3.Location = new System.Drawing.Point(1232, 43);
+ this.button3.Margin = new System.Windows.Forms.Padding(5);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 59);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -586,10 +585,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(951, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button4.Location = new System.Drawing.Point(1037, 43);
+ this.button4.Margin = new System.Windows.Forms.Padding(5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 59);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -598,20 +597,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(308, 39);
- this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox4.Location = new System.Drawing.Point(336, 45);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(5);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
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(26, 46);
+ this.label25.Location = new System.Drawing.Point(28, 53);
this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -623,19 +622,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(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel44.Location = new System.Drawing.Point(360, 363);
+ this.panel44.Margin = new System.Windows.Forms.Padding(5);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1281, 132);
+ this.panel44.Size = new System.Drawing.Size(1397, 151);
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(1097, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button2.Location = new System.Drawing.Point(1197, 43);
+ this.button2.Margin = new System.Windows.Forms.Padding(5);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 59);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -644,10 +643,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(941, 35);
- this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button1.Location = new System.Drawing.Point(1027, 40);
+ this.button1.Margin = new System.Windows.Forms.Padding(5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 59);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -656,20 +655,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(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox3.Location = new System.Drawing.Point(208, 43);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(5);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(676, 49);
+ this.textBox3.Size = new System.Drawing.Size(737, 55);
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(25, 46);
+ this.label24.Location = new System.Drawing.Point(27, 53);
this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -683,43 +682,43 @@
this.glacialList1.AutoHeight = true;
this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.glacialList1.BackgroundStretchToFit = true;
- glColumn5.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn5.CheckBoxes = false;
- glColumn5.ImageIndex = -1;
- glColumn5.Name = "条码";
- glColumn5.NumericSort = false;
- glColumn5.Text = "条码";
- glColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn5.Width = 350;
- glColumn6.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn6.CheckBoxes = false;
- glColumn6.ImageIndex = -1;
- glColumn6.Name = "产品名称";
- glColumn6.NumericSort = false;
- glColumn6.Text = "产品名称";
- glColumn6.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn6.Width = 320;
- glColumn7.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn7.CheckBoxes = false;
- glColumn7.ImageIndex = -1;
- glColumn7.Name = "打印方式";
- glColumn7.NumericSort = false;
- glColumn7.Text = "打印方式";
- glColumn7.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn7.Width = 150;
- glColumn8.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn8.CheckBoxes = false;
- glColumn8.ImageIndex = -1;
- glColumn8.Name = "打印时间";
- glColumn8.NumericSort = false;
- glColumn8.Text = "打印时间";
- glColumn8.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn8.Width = 270;
+ glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn1.CheckBoxes = false;
+ glColumn1.ImageIndex = -1;
+ glColumn1.Name = "条码";
+ glColumn1.NumericSort = false;
+ glColumn1.Text = "条码";
+ glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn1.Width = 350;
+ glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn2.CheckBoxes = false;
+ glColumn2.ImageIndex = -1;
+ glColumn2.Name = "产品名称";
+ glColumn2.NumericSort = false;
+ glColumn2.Text = "产品名称";
+ glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn2.Width = 320;
+ glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn3.CheckBoxes = false;
+ glColumn3.ImageIndex = -1;
+ glColumn3.Name = "打印方式";
+ glColumn3.NumericSort = false;
+ glColumn3.Text = "打印方式";
+ glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn3.Width = 150;
+ glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn4.CheckBoxes = false;
+ glColumn4.ImageIndex = -1;
+ glColumn4.Name = "打印时间";
+ glColumn4.NumericSort = false;
+ glColumn4.Text = "打印时间";
+ glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn4.Width = 270;
this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] {
- glColumn5,
- glColumn6,
- glColumn7,
- glColumn8});
+ glColumn1,
+ glColumn2,
+ glColumn3,
+ glColumn4});
this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal;
this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F);
@@ -737,17 +736,17 @@
this.glacialList1.HoverEvents = false;
this.glacialList1.HoverTime = 1;
this.glacialList1.ImageList = null;
- this.glacialList1.ItemHeight = 50;
+ 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, 4, 5, 4);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(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(1967, 976);
+ this.glacialList1.Size = new System.Drawing.Size(2145, 1115);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -760,9 +759,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, 4, 5, 4);
+ this.panel25.Margin = new System.Windows.Forms.Padding(5);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(380, 976);
+ this.panel25.Size = new System.Drawing.Size(415, 1115);
this.panel25.TabIndex = 0;
//
// tableLayoutPanel2
@@ -771,13 +770,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, 406);
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
- 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.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.TabIndex = 1;
//
// panel38
@@ -787,19 +786,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, 4);
- this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel38.Location = new System.Drawing.Point(5, 5);
+ this.panel38.Margin = new System.Windows.Forms.Padding(5);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(370, 562);
+ this.panel38.Size = new System.Drawing.Size(404, 641);
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, 171);
+ this.label27.Location = new System.Drawing.Point(-3, 195);
this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(291, 73);
+ this.label27.Size = new System.Drawing.Size(317, 83);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -808,20 +807,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, 136);
+ this.label26.Location = new System.Drawing.Point(0, 155);
this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(151, 33);
+ this.label26.Size = new System.Drawing.Size(169, 37);
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, 49);
+ this.label17.Location = new System.Drawing.Point(-3, 56);
this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(291, 74);
+ this.label17.Size = new System.Drawing.Size(317, 85);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -830,10 +829,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, 10);
+ this.label16.Location = new System.Drawing.Point(0, 11);
this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(151, 33);
+ this.label16.Size = new System.Drawing.Size(169, 37);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -842,9 +841,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, 4, 5, 4);
+ this.panel36.Margin = new System.Windows.Forms.Padding(5);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(380, 406);
+ this.panel36.Size = new System.Drawing.Size(415, 464);
this.panel36.TabIndex = 0;
//
// tableLayoutPanel1
@@ -854,12 +853,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);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
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, 406F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406);
+ 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.TabIndex = 1;
//
// label11
@@ -870,7 +869,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(370, 406);
+ this.label11.Size = new System.Drawing.Size(403, 464);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -881,9 +880,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, 4, 5, 4);
+ this.panel8.Margin = new System.Windows.Forms.Padding(5);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -891,10 +890,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(380, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel10.Location = new System.Drawing.Point(415, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(5);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(1967, 91);
+ this.panel10.Size = new System.Drawing.Size(2145, 104);
this.panel10.TabIndex = 2;
//
// panel12
@@ -902,10 +901,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(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(5);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1516, 91);
+ this.panel12.Size = new System.Drawing.Size(1653, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -913,10 +912,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(467, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel16.Location = new System.Drawing.Point(509, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(5);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1049, 91);
+ this.panel16.Size = new System.Drawing.Size(1144, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -924,10 +923,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(428, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel20.Location = new System.Drawing.Point(467, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(5);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(621, 91);
+ this.panel20.Size = new System.Drawing.Size(677, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -935,10 +934,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(341, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(280, 91);
+ this.label10.Size = new System.Drawing.Size(305, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -949,9 +948,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, 4, 5, 4);
+ this.panel22.Margin = new System.Windows.Forms.Padding(5);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -963,7 +962,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(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -975,9 +974,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, 4, 5, 4);
+ this.panel19.Margin = new System.Windows.Forms.Padding(5);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(428, 91);
+ this.panel19.Size = new System.Drawing.Size(467, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -985,10 +984,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(202, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(226, 91);
+ this.label8.Size = new System.Drawing.Size(247, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -998,9 +997,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, 4, 5, 4);
+ this.panel21.Margin = new System.Windows.Forms.Padding(5);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -1012,7 +1011,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(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1024,19 +1023,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, 4, 5, 4);
+ this.panel15.Margin = new System.Windows.Forms.Padding(5);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(467, 91);
+ this.panel15.Size = new System.Drawing.Size(509, 104);
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(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(5);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(265, 91);
+ this.panel18.Size = new System.Drawing.Size(289, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1047,7 +1046,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(265, 91);
+ this.label6.Size = new System.Drawing.Size(289, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1057,9 +1056,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, 4, 5, 4);
+ this.panel17.Margin = new System.Windows.Forms.Padding(5);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1071,7 +1070,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(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1083,19 +1082,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, 4, 5, 4);
+ this.panel11.Margin = new System.Windows.Forms.Padding(5);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
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(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(5);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1108,9 +1107,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(5);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
//
// panel13
@@ -1118,9 +1117,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, 4, 5, 4);
+ this.panel13.Margin = new System.Windows.Forms.Padding(5);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1132,7 +1131,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(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1142,9 +1141,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, 4, 5, 4);
+ this.panel9.Margin = new System.Windows.Forms.Padding(5);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(380, 91);
+ this.panel9.Size = new System.Drawing.Size(415, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1156,7 +1155,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(380, 91);
+ this.label3.Size = new System.Drawing.Size(415, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1167,9 +1166,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, 4, 5, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1177,10 +1176,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(311, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel4.Location = new System.Drawing.Point(339, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(5);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2036, 147);
+ this.panel4.Size = new System.Drawing.Size(2221, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1189,9 +1188,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, 4, 5, 4);
+ this.panel6.Margin = new System.Windows.Forms.Padding(5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1684, 147);
+ this.panel6.Size = new System.Drawing.Size(1837, 168);
this.panel6.TabIndex = 1;
//
// btnBarCodeWithBox
@@ -1200,7 +1199,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(217, 143);
+ this.btnBarCodeWithBox.Size = new System.Drawing.Size(237, 163);
this.btnBarCodeWithBox.TabIndex = 2;
this.btnBarCodeWithBox.Text = "箱码模式";
this.btnBarCodeWithBox.UseVisualStyleBackColor = false;
@@ -1214,7 +1213,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(1684, 147);
+ this.label1.Size = new System.Drawing.Size(1837, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1223,10 +1222,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1684, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel5.Location = new System.Drawing.Point(1837, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(5);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1237,7 +1236,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(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1248,19 +1247,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, 4, 5, 4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(5);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(311, 147);
+ this.panel3.Size = new System.Drawing.Size(339, 168);
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, 4);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(5, 5);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(307, 139);
+ this.pictureBox1.Size = new System.Drawing.Size(335, 159);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1304,12 +1303,12 @@
//
// FrmMain2411
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1601);
+ this.ClientSize = new System.Drawing.Size(2560, 1830);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.Margin = new System.Windows.Forms.Padding(5);
this.Name = "FrmMain2411";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMain2411.cs b/InjectionPC/FrmMain2411.cs
index b27de62..d99e91b 100644
--- a/InjectionPC/FrmMain2411.cs
+++ b/InjectionPC/FrmMain2411.cs
@@ -2926,7 +2926,7 @@ namespace InjectionPC
///
private void label22_Click(object sender, EventArgs e)
{
- string code = "", filename = "", printName = "", ManufacturerName="";
+ string code = "", filename = "", printName = "", ManufacturerName = "";
BarCodeModel md = new BarCodeModel();
BarCodeBLL bll = new BarCodeBLL();
ProductBLL pbll = new ProductBLL();
@@ -2940,23 +2940,39 @@ namespace InjectionPC
}
else
{
- DialogResult result = MessageBox.Show("确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
+ GlacialComponents.Controls.GLItem gv;
+ gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+ code = gv.Text;
+ DialogResult result = MessageBox.Show($"补打条码[{code}]将被新的替换,确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
if (result == DialogResult.OK)
{
- GlacialComponents.Controls.GLItem gv;
- gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
- code = gv.Text;
+
+ bool exsitWms = _wmsBll.IsReadBarCodeInWms(code);
+ if (exsitWms)
+ {
+ MessageBox.Show($"条码[{code}]在WMS系统已处理,无法补打!");
+ return;
+ }
DataTable dt = bll.SearchInfoByBarCodeNew(code, Program.tableName);
if (dt != null && dt.Rows.Count > 0)
{
md.ID = Guid.NewGuid().ToString();
- md.BarCode = code;
+ //md.BarCode = code;
md.StationID = dt.Rows[0]["StationID"].ToString();
md.StockNo = dt.Rows[0]["StockNo"].ToString();
- md.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
- //md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
md.PartNo = dt.Rows[0]["PartNo"].ToString();
+ md.BatchNo = dt.Rows[0]["BatchNo"].ToString();
+ string newOneCode = string.Empty;
+ string newBarCode = string.Empty;
+ GetBarCode(md.StockNo, md.BatchNo, md.PartNo, ref newOneCode, ref newBarCode);
+ md.OneBarCode = newOneCode;
+ md.BarCode = newBarCode;
+ md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
+ if (gv.SubItems.Count > 1)
+ {
+ md.Des1 = gv.SubItems[1].Text;
+ }
md.PrintType = 2;
@@ -2984,11 +3000,16 @@ namespace InjectionPC
return;
}
- if (bll.Add_Info_New(md, Program.tableName) == false)
- // if (SaveBarCode(md, Program.tableName, true) == false) 补打不装箱
+ string msg = bll.ReprintSave(md, Program.tableName, dt.Rows[0]["OneBarCode"].ToString(), dt.Rows[0]["BarCode"].ToString());
+ if (!string.IsNullOrEmpty(msg))
{
+ MessageBox.Show($"补打失败,原因:" + msg);
return;
}
+ //if (bll.Add_Info_New(md, Program.tableName) == false)
+ //{
+ // return;
+ //}
glacialList1.SelectedItems.Clear();
initBarCode();
@@ -3006,7 +3027,7 @@ namespace InjectionPC
filename = AppDomain.CurrentDomain.BaseDirectory +
"Sill.grf";
}
-
+
string partName = "";
DataTable dt2 = pbll.SearchInfoByPartNo(md.PartNo);
if (dt2 != null && dt2.Rows.Count > 0)
@@ -3031,7 +3052,7 @@ namespace InjectionPC
ReportHelper rp = new ReportHelper(filename, headTable, null,
- (int) GRPaperOrientation.grpoDefault, 1, reportName);
+ (int)GRPaperOrientation.grpoDefault, 1, reportName);
LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + md.OneBarCode, MethodBase.GetCurrentMethod());
rp.Report.Print(false);
@@ -3044,7 +3065,6 @@ namespace InjectionPC
LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
}
}
-
///
/// 补打箱单
///
@@ -4165,11 +4185,16 @@ namespace InjectionPC
void GetSjBarCode(string stockNo,string partNo, bool autoPrint,string mould,string partName, ref string newOneCode,ref string newCode)
{
string batch = GetBatch(autoPrint);
+ GetBarCode(stockNo, batch, partNo, ref newOneCode, ref newCode);
+ //newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
+ //newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
+ }
+ void GetBarCode(string stockNo, string batch, string partNo, ref string newOneCode, ref string newCode)
+ {
newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
}
-
string GetBatch(bool isAutoPrint)
{
string batch = string.Empty;
diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
index 4974900..7cfde68 100644
--- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
@@ -99,6 +99,8 @@ namespace MESClassLibrary.BLL.BasicInfo
return false;
}
}
+
+
public bool Add_Info_New(LocalDBService local, BarCodeModel md, string tableName)
{
try
@@ -111,6 +113,62 @@ namespace MESClassLibrary.BLL.BasicInfo
return false;
}
}
+ ///
+ /// 补打
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public string ReprintSave(BarCodeModel md, string tableName,string oldOneBarCode,string oldBarCode)
+ {
+ LocalDBService local = new LocalDBService(SqlHelper.GetConnSting());
+ try
+ {
+ local.BeginTrans();
+ //tb_barCode 更新 isDel=1
+ db.DelBarCode(local, oldOneBarCode, tableName,$",Des5='条码补打,新条码[{md.OneBarCode}]'");
+ //tb_barCode 插入 printType=2 补打
+
+ db.AddInfoNew(local, md, tableName);
+ if(!string.IsNullOrEmpty(md.BoxNo))
+ {
+ //根据箱码删除接口表tb_Injectionn_Interface中数据
+ wmsDal.DeleteRecord(local, md.BoxNo, oldOneBarCode, oldBarCode);
+
+ }
+ else
+ {
+ //根据旧条码删除接口tb_Injectionn_Interface中数据
+ wmsDal.DeleteInterface(local, oldOneBarCode);
+ }
+ md.Remark = "补打,原塑件码:" + oldOneBarCode;
+ wmsDal.SaveInterface(local, md, "");
+
+ local.Commit();
+
+ return "";
+ }
+ catch (Exception ex)
+ {
+ if (local != null)
+ {
+ local.Rollback();
+ }
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+
+ return ex.Message;
+ }
+ finally
+ {
+ if (local != null)
+ {
+ local.EndTrans();
+ }
+ }
+ }
+
public DataTable SearchInfo(string stationNo)
{
try
@@ -124,6 +182,7 @@ namespace MESClassLibrary.BLL.BasicInfo
}
}
+
public DataTable SearchInfoAll()
{
try
diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
index fc77e09..79207f8 100644
--- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
+++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
@@ -369,9 +369,9 @@ namespace MESClassLibrary.DAL.BasicInfo
string sql = "";
- sql = "INSERT INTO " + tableName + " (ID,StationID,OneBarCode,[BarCode],[StockNo],[PartNo],[PrintType],[CreateTime],[IsImport],StationID2,PlanID,ProductNature,Des1,Des2,Des3,Des4,Des5,BoxNo,Weight";
- sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}',getdate(),'{md.Import}'," +
- $"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}')";
+ sql = "INSERT INTO " + tableName + " (ID,StationID,OneBarCode,[BarCode],[StockNo],[PartNo],[PrintType],[CreateTime],[IsImport],StationID2,PlanID,ProductNature,Des1,Des2,Des3,Des4,Des5,BoxNo,Weight,BatchNo";
+ sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}',getdate(),'{md.Import}'," +
+ $"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}','{ md.BatchNo}')";
return local.Exec_NonQuery(sql);
@@ -686,7 +686,7 @@ namespace MESClassLibrary.DAL.BasicInfo
{
try
{
- string sql = @"select top 1 * from " + tableName + " where BarCode=@BarCode order by [CreateTime] desc ";
+ string sql = @"select top 1 * from " + tableName + " where BarCode=@BarCode and IsBad=0 and IsDel=0 order by [CreateTime] desc ";
SqlParameter[] param = new SqlParameter[1];
param[0] = new SqlParameter("@BarCode", SqlDbType.VarChar);
@@ -798,14 +798,14 @@ namespace MESClassLibrary.DAL.BasicInfo
}
}
- public bool DelBarCode(LocalDBService localDB, string barCode, string tableName)
+ public bool DelBarCode(LocalDBService localDB, string barCode, string tableName, string upField = null )
{
string column1 = "OneBarCode";
if (barCode.Contains("."))
{
column1 = "BarCode";
}
- string sql = "update " + tableName + $" set IsDel=1 where {column1}='{barCode}'";
+ string sql = "update " + tableName + $" set IsDel=1 {upField} where {column1}='{barCode}'";
return localDB.Exec_NonQuery(sql);
diff --git a/MESClassLibrary/DAL/Wms/WmsDAL.cs b/MESClassLibrary/DAL/Wms/WmsDAL.cs
index 0fbb424..1418ce3 100644
--- a/MESClassLibrary/DAL/Wms/WmsDAL.cs
+++ b/MESClassLibrary/DAL/Wms/WmsDAL.cs
@@ -58,7 +58,7 @@ namespace MESClassLibrary.DAL.Injection
{
string sql = $" insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark,QaRst,Describe,BadReason)" +
- $" values ('{bcm.BoxNo}','{bcm.OneBarCode}','{bcm.BarCode}','','{bcm.IsBad}','{bcm.Des1}','{badReason}')";
+ $" values ('{bcm.BoxNo}','{bcm.OneBarCode}','{bcm.BarCode}','{bcm.Remark}','{bcm.IsBad}','{bcm.Des1}','{badReason}')";
return local.Exec_NonQuery(sql);
}
diff --git a/MESClassLibrary/Model/BarCodeModel.cs b/MESClassLibrary/Model/BarCodeModel.cs
index c6bef6d..f32e562 100644
--- a/MESClassLibrary/Model/BarCodeModel.cs
+++ b/MESClassLibrary/Model/BarCodeModel.cs
@@ -46,5 +46,7 @@ namespace MESClassLibrary.Model
public string Des5 { get; set; }
public decimal Weight { get; set; }
+ public string BatchNo { get; set; }
+ public string Remark { get; set; }
}
}