diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs
index a96dadc..1f153f2 100644
--- a/FacOneZPStation/FrmZP.Designer.cs
+++ b/FacOneZPStation/FrmZP.Designer.cs
@@ -28,6 +28,7 @@
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmZP));
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.button6 = new System.Windows.Forms.Button();
@@ -47,7 +48,7 @@
this.labPName = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.labPartNo = new System.Windows.Forms.Label();
- this.timer1 = new System.Windows.Forms.Timer();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label6 = new System.Windows.Forms.Label();
this.labBadCount = new System.Windows.Forms.Label();
this.labNum = new System.Windows.Forms.Label();
@@ -76,7 +77,7 @@
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F));
- this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 705F));
+ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 770F));
this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@@ -85,14 +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, 1224);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(7, 1400);
+ 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
@@ -101,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(1642, 12);
- this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button6.Location = new System.Drawing.Point(1789, 14);
+ this.button6.Margin = new System.Windows.Forms.Padding(14, 14, 14, 14);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(680, 161);
+ this.button6.Size = new System.Drawing.Size(743, 183);
this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false;
@@ -115,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(534, 176);
+ this.button1.Size = new System.Drawing.Size(581, 200);
this.button1.TabIndex = 6;
this.button1.Text = "打印标签";
this.button1.UseVisualStyleBackColor = false;
@@ -130,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(1107, 197);
- this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button5.Location = new System.Drawing.Point(1206, 225);
+ this.button5.Margin = new System.Windows.Forms.Padding(14, 14, 14, 14);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(509, 162);
+ this.button5.Size = new System.Drawing.Size(555, 184);
this.button5.TabIndex = 5;
this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false;
@@ -144,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(552, 5);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button4.Location = new System.Drawing.Point(602, 6);
+ this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(536, 175);
+ this.button4.Size = new System.Drawing.Size(583, 199);
this.button4.TabIndex = 4;
this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false;
@@ -158,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(534, 175);
+ this.button3.Size = new System.Drawing.Size(581, 199);
this.button3.TabIndex = 3;
this.button3.Text = "上一计划";
this.button3.UseVisualStyleBackColor = false;
@@ -173,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(559, 197);
- this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button2.Location = new System.Drawing.Point(609, 225);
+ this.button2.Margin = new System.Windows.Forms.Padding(14, 14, 14, 14);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(522, 162);
+ this.button2.Size = new System.Drawing.Size(569, 184);
this.button2.TabIndex = 2;
this.button2.Text = "补打标签";
this.button2.UseVisualStyleBackColor = false;
@@ -187,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(1635, 190);
- this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button7.Location = new System.Drawing.Point(1782, 217);
+ this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(694, 176);
+ this.button7.Size = new System.Drawing.Size(757, 200);
this.button7.TabIndex = 8;
this.button7.Text = "补打箱单";
this.button7.UseVisualStyleBackColor = false;
@@ -202,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(1318, 3);
+ this.label7.Location = new System.Drawing.Point(1436, 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, 210);
+ this.label7.Size = new System.Drawing.Size(272, 241);
this.label7.TabIndex = 32;
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -214,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(380, 111);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Location = new System.Drawing.Point(414, 127);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(931, 77);
+ this.textBox2.Size = new System.Drawing.Size(1015, 87);
this.textBox2.TabIndex = 30;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
@@ -226,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(366, 108);
+ this.label3.Size = new System.Drawing.Size(400, 124);
this.label3.TabIndex = 29;
this.label3.Text = "扫描物料条码";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -239,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(1572, 218);
+ this.labOrderNo.Location = new System.Drawing.Point(1713, 249);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
- this.labOrderNo.Size = new System.Drawing.Size(764, 151);
+ this.labOrderNo.Size = new System.Drawing.Size(836, 174);
this.labOrderNo.TabIndex = 28;
this.labOrderNo.Text = "A64654646464";
this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -253,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(1318, 218);
+ this.label4.Location = new System.Drawing.Point(1436, 249);
this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(249, 151);
+ this.label4.Size = new System.Drawing.Size(272, 174);
this.label4.TabIndex = 27;
this.label4.Text = "计划编号";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -267,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(378, 218);
+ this.labStationNo.Location = new System.Drawing.Point(412, 249);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
- this.labStationNo.Size = new System.Drawing.Size(935, 151);
+ this.labStationNo.Size = new System.Drawing.Size(1019, 174);
this.labStationNo.TabIndex = 26;
this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -281,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, 218);
+ 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(370, 151);
+ this.label2.Size = new System.Drawing.Size(404, 174);
this.label2.TabIndex = 25;
this.label2.Text = "工位名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -294,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(1572, 374);
+ this.labPName.Location = new System.Drawing.Point(1713, 428);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
- this.labPName.Size = new System.Drawing.Size(764, 248);
+ this.labPName.Size = new System.Drawing.Size(836, 284);
this.labPName.TabIndex = 24;
this.labPName.Text = "MF253 MF S后保";
this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -308,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(1318, 374);
+ this.label8.Location = new System.Drawing.Point(1436, 428);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(249, 248);
+ this.label8.Size = new System.Drawing.Size(272, 284);
this.label8.TabIndex = 23;
this.label8.Text = "产品名称";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -322,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(378, 374);
+ this.labPartNo.Location = new System.Drawing.Point(412, 428);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
- this.labPartNo.Size = new System.Drawing.Size(935, 248);
+ this.labPartNo.Size = new System.Drawing.Size(1019, 284);
this.labPartNo.TabIndex = 22;
this.labPartNo.Text = "A2530822665";
this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -341,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, 374);
+ 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(370, 248);
+ this.label6.Size = new System.Drawing.Size(404, 284);
this.label6.TabIndex = 21;
this.label6.Text = "产品代码";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -355,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(1572, 627);
+ this.labBadCount.Location = new System.Drawing.Point(1713, 717);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
- this.labBadCount.Size = new System.Drawing.Size(764, 451);
+ this.labBadCount.Size = new System.Drawing.Size(836, 515);
this.labBadCount.TabIndex = 20;
this.labBadCount.Text = "0";
this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -369,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(378, 627);
+ this.labNum.Location = new System.Drawing.Point(412, 717);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
- this.labNum.Size = new System.Drawing.Size(935, 451);
+ this.labNum.Size = new System.Drawing.Size(1019, 515);
this.labNum.TabIndex = 18;
this.labNum.Text = "152/210";
this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -383,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, 627);
+ this.label10.Location = new System.Drawing.Point(3, 717);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(370, 451);
+ this.label10.Size = new System.Drawing.Size(404, 515);
this.label10.TabIndex = 17;
this.label10.Text = "计划/完成数";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -399,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(366, 105);
+ this.label14.Size = new System.Drawing.Size(400, 120);
this.label14.TabIndex = 12;
this.label14.Text = "扫描本体条码";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -408,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(380, 5);
- this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Location = new System.Drawing.Point(414, 6);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(931, 77);
+ this.textBox1.Size = new System.Drawing.Size(1015, 87);
this.textBox1.TabIndex = 13;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@@ -420,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(1574, 1);
+ this.labErrMessage.Location = new System.Drawing.Point(1715, 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(760, 214);
+ this.labErrMessage.Size = new System.Drawing.Size(832, 245);
this.labErrMessage.TabIndex = 16;
this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -436,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, 767F));
- 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, 839F));
+ 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);
@@ -458,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, 1081);
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 517F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1235);
this.tableLayoutPanel4.TabIndex = 2;
//
// label12
@@ -477,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(1318, 627);
+ this.label12.Location = new System.Drawing.Point(1436, 717);
this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(249, 451);
+ this.label12.Size = new System.Drawing.Size(272, 515);
this.label12.TabIndex = 19;
this.label12.Text = "不合格数";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -490,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(1765, 0);
+ this.labTime.Location = new System.Drawing.Point(1924, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
- this.labTime.Size = new System.Drawing.Size(582, 130);
+ this.labTime.Size = new System.Drawing.Size(636, 149);
this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -507,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(319, 130);
+ this.pictureBox1.Size = new System.Drawing.Size(348, 149);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -517,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(319, 0);
+ this.label1.Location = new System.Drawing.Point(348, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1446, 130);
+ this.label1.Size = new System.Drawing.Size(1576, 149);
this.label1.TabIndex = 1;
this.label1.Text = "装配工位信息看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -531,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, 581F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 635F));
this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);
@@ -541,7 +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
@@ -558,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, 1600);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1829);
this.tableLayoutPanel1.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, 1600);
+ this.ClientSize = new System.Drawing.Size(2560, 1829);
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 e87b0d6..f400e0d 100644
--- a/InjectionPC/FrmMain.Designer.cs
+++ b/InjectionPC/FrmMain.Designer.cs
@@ -28,7 +28,6 @@
///
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();
@@ -118,10 +117,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.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.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.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel23.SuspendLayout();
@@ -176,9 +175,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
@@ -187,10 +186,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
@@ -198,10 +197,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
@@ -209,10 +208,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
@@ -220,10 +219,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
@@ -231,10 +230,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
@@ -242,10 +241,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
@@ -253,9 +252,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
@@ -263,9 +262,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
@@ -274,9 +273,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
@@ -285,9 +284,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
@@ -303,28 +302,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 = "数量：";
//
@@ -332,10 +331,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)";
//
@@ -343,20 +342,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 = "批次：";
//
@@ -365,10 +364,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);
//
@@ -376,10 +375,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 = "产品：";
//
@@ -387,10 +386,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
@@ -399,9 +398,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;
@@ -411,10 +410,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
@@ -423,9 +422,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;
@@ -435,10 +434,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
@@ -447,9 +446,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;
@@ -460,9 +459,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
@@ -471,9 +470,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;
@@ -484,9 +483,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
@@ -495,9 +494,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;
@@ -508,9 +507,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
@@ -520,9 +519,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;
@@ -533,9 +532,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
@@ -544,10 +543,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
@@ -557,19 +556,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;
@@ -578,10 +577,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;
@@ -590,20 +589,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;
@@ -615,19 +614,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;
@@ -636,10 +635,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;
@@ -648,20 +647,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;
@@ -732,14 +731,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;
@@ -752,9 +751,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
@@ -765,19 +764,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;
@@ -785,20 +784,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;
@@ -806,10 +805,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 = "计划数量";
//
@@ -818,9 +817,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
@@ -829,9 +828,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;
@@ -842,9 +841,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
@@ -852,10 +851,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
@@ -863,10 +862,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
@@ -874,10 +873,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
@@ -885,10 +884,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
@@ -896,10 +895,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;
@@ -910,9 +909,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
@@ -922,9 +921,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;
@@ -936,9 +935,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
@@ -946,10 +945,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;
@@ -959,9 +958,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
@@ -971,9 +970,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;
@@ -984,19 +983,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
@@ -1005,9 +1004,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;
@@ -1017,9 +1016,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
@@ -1029,9 +1028,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;
@@ -1042,19 +1041,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
@@ -1067,9 +1066,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);
//
@@ -1078,9 +1077,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
@@ -1090,9 +1089,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;
@@ -1102,9 +1101,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
@@ -1114,9 +1113,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;
@@ -1127,9 +1126,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
@@ -1137,10 +1136,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
@@ -1148,9 +1147,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
@@ -1159,9 +1158,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;
@@ -1170,10 +1169,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
@@ -1182,9 +1181,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;
@@ -1195,19 +1194,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;
@@ -1233,12 +1232,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 c668d1a..cd08e92 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -46,6 +46,7 @@
this.panel40 = new System.Windows.Forms.Panel();
this.panel42 = new System.Windows.Forms.Panel();
this.panel39 = new System.Windows.Forms.Panel();
+ this.lbDevState = new System.Windows.Forms.Label();
this.lbAddPrintR = new System.Windows.Forms.Label();
this.lbAddPrintL = new System.Windows.Forms.Label();
this.cboxHandBox = new System.Windows.Forms.CheckBox();
@@ -156,7 +157,6 @@
this.serialPort1 = new System.IO.Ports.SerialPort(this.components);
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.timer3 = new System.Windows.Forms.Timer(this.components);
- this.lbDevState = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel23.SuspendLayout();
@@ -221,9 +221,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2666, 1600);
+ this.panel1.Size = new System.Drawing.Size(2908, 1829);
this.panel1.TabIndex = 0;
//
// panel7
@@ -232,10 +232,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 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(2666, 1453);
+ this.panel7.Size = new System.Drawing.Size(2908, 1661);
this.panel7.TabIndex = 1;
//
// panel23
@@ -243,10 +243,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 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(2666, 1362);
+ this.panel23.Size = new System.Drawing.Size(2908, 1557);
this.panel23.TabIndex = 1;
//
// panel27
@@ -254,10 +254,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 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(2666, 386);
+ this.panel27.Size = new System.Drawing.Size(2908, 442);
this.panel27.TabIndex = 1;
//
// panel29
@@ -265,10 +265,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(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(2355, 386);
+ this.panel29.Size = new System.Drawing.Size(2569, 442);
this.panel29.TabIndex = 1;
//
// panel31
@@ -276,10 +276,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(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(2233, 386);
+ this.panel31.Size = new System.Drawing.Size(2436, 442);
this.panel31.TabIndex = 1;
//
// panel33
@@ -287,10 +287,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(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(2111, 386);
+ this.panel33.Size = new System.Drawing.Size(2303, 442);
this.panel33.TabIndex = 1;
//
// panel35
@@ -298,9 +298,9 @@
this.panel35.Controls.Add(this.panel37);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1989, 386);
+ this.panel35.Size = new System.Drawing.Size(2170, 442);
this.panel35.TabIndex = 1;
//
// panel37
@@ -308,9 +308,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1989, 386);
+ this.panel37.Size = new System.Drawing.Size(2170, 442);
this.panel37.TabIndex = 1;
//
// panel40
@@ -319,9 +319,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1989, 386);
+ this.panel40.Size = new System.Drawing.Size(2170, 442);
this.panel40.TabIndex = 1;
//
// panel42
@@ -330,9 +330,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1867, 386);
+ this.panel42.Size = new System.Drawing.Size(2037, 442);
this.panel42.TabIndex = 1;
//
// panel39
@@ -352,21 +352,34 @@
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(1745, 386);
+ this.panel39.Size = new System.Drawing.Size(1904, 442);
this.panel39.TabIndex = 1;
//
+ // lbDevState
+ //
+ this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue;
+ this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.lbDevState.Location = new System.Drawing.Point(932, 273);
+ this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbDevState.Name = "lbDevState";
+ this.lbDevState.Size = new System.Drawing.Size(378, 66);
+ this.lbDevState.TabIndex = 15;
+ this.lbDevState.Text = "设备已连接";
+ this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbDevState.Click += new System.EventHandler(this.lbDevState_Click);
+ //
// lbAddPrintR
//
this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbAddPrintR.Location = new System.Drawing.Point(532, 298);
+ this.lbAddPrintR.Location = new System.Drawing.Point(580, 341);
this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbAddPrintR.Name = "lbAddPrintR";
- this.lbAddPrintR.Size = new System.Drawing.Size(269, 58);
+ this.lbAddPrintR.Size = new System.Drawing.Size(342, 66);
this.lbAddPrintR.TabIndex = 3;
- this.lbAddPrintR.Text = "右箱添打";
+ this.lbAddPrintR.Text = "右条码添打";
this.lbAddPrintR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.lbAddPrintR.Click += new System.EventHandler(this.lbAddPrintR_Click);
//
@@ -374,12 +387,12 @@
//
this.lbAddPrintL.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbAddPrintL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbAddPrintL.Location = new System.Drawing.Point(532, 239);
+ this.lbAddPrintL.Location = new System.Drawing.Point(580, 273);
this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbAddPrintL.Name = "lbAddPrintL";
- this.lbAddPrintL.Size = new System.Drawing.Size(269, 58);
+ this.lbAddPrintL.Size = new System.Drawing.Size(342, 66);
this.lbAddPrintL.TabIndex = 2;
- this.lbAddPrintL.Text = "左箱添打";
+ this.lbAddPrintL.Text = "左条码添打";
this.lbAddPrintL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.lbAddPrintL.Click += new System.EventHandler(this.lbAddPrintL_Click);
//
@@ -389,10 +402,10 @@
this.cboxHandBox.Checked = true;
this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
this.cboxHandBox.Enabled = false;
- this.cboxHandBox.Location = new System.Drawing.Point(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 = "打印箱码";
@@ -402,20 +415,20 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(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 = "数量：";
//
@@ -423,10 +436,10 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(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)";
//
@@ -434,20 +447,20 @@
//
this.textBox1.Enabled = false;
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(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 = "批次：";
//
@@ -457,10 +470,10 @@
this.comboBox2.Enabled = false;
this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(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.SelectedValueChanged += new System.EventHandler(this.comboBox2_SelectedValueChanged);
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
@@ -469,10 +482,10 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(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 = "产品：";
//
@@ -480,10 +493,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1745, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel43.Location = new System.Drawing.Point(1904, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(5);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(122, 386);
+ this.panel43.Size = new System.Drawing.Size(133, 442);
this.panel43.TabIndex = 0;
//
// label23
@@ -494,7 +507,7 @@
this.label23.Location = new System.Drawing.Point(0, 0);
this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(122, 386);
+ this.label23.Size = new System.Drawing.Size(133, 442);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -504,10 +517,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1867, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel41.Location = new System.Drawing.Point(2037, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(5);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(122, 386);
+ this.panel41.Size = new System.Drawing.Size(133, 442);
this.panel41.TabIndex = 0;
//
// label22
@@ -518,7 +531,7 @@
this.label22.Location = new System.Drawing.Point(0, 0);
this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(122, 386);
+ this.label22.Size = new System.Drawing.Size(133, 442);
this.label22.TabIndex = 1;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -528,10 +541,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1989, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel34.Location = new System.Drawing.Point(2170, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(5);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(122, 386);
+ this.panel34.Size = new System.Drawing.Size(133, 442);
this.panel34.TabIndex = 0;
//
// label15
@@ -542,7 +555,7 @@
this.label15.Location = new System.Drawing.Point(0, 0);
this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(122, 386);
+ this.label15.Size = new System.Drawing.Size(133, 442);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -553,9 +566,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(122, 386);
+ this.panel32.Size = new System.Drawing.Size(133, 442);
this.panel32.TabIndex = 0;
//
// label14
@@ -566,7 +579,7 @@
this.label14.Location = new System.Drawing.Point(0, 0);
this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(122, 386);
+ this.label14.Size = new System.Drawing.Size(133, 442);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -577,9 +590,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(122, 386);
+ this.panel30.Size = new System.Drawing.Size(133, 442);
this.panel30.TabIndex = 0;
//
// label13
@@ -590,7 +603,7 @@
this.label13.Location = new System.Drawing.Point(0, 0);
this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(122, 386);
+ this.label13.Size = new System.Drawing.Size(133, 442);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -601,9 +614,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(311, 386);
+ this.panel28.Size = new System.Drawing.Size(339, 442);
this.panel28.TabIndex = 0;
//
// label12
@@ -615,7 +628,7 @@
this.label12.Location = new System.Drawing.Point(0, 0);
this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(311, 386);
+ this.label12.Size = new System.Drawing.Size(339, 442);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -626,9 +639,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel24.Margin = new System.Windows.Forms.Padding(5);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2666, 976);
+ this.panel24.Size = new System.Drawing.Size(2908, 1115);
this.panel24.TabIndex = 0;
//
// panel26
@@ -637,10 +650,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(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(2286, 976);
+ this.panel26.Size = new System.Drawing.Size(2493, 1115);
this.panel26.TabIndex = 1;
//
// panel45
@@ -650,19 +663,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(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;
@@ -671,10 +684,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(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;
@@ -683,20 +696,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(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;
@@ -708,19 +721,19 @@
this.panel44.Controls.Add(this.button1);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(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;
@@ -729,10 +742,10 @@
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(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;
@@ -741,20 +754,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(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;
@@ -822,17 +835,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(2286, 976);
+ this.glacialList1.Size = new System.Drawing.Size(2493, 1115);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -845,9 +858,9 @@
this.panel25.Controls.Add(this.panel36);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(5, 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
@@ -857,13 +870,13 @@
this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 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
@@ -875,19 +888,19 @@
this.panel38.Controls.Add(this.label26);
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
- this.panel38.Location = new System.Drawing.Point(5, 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;
//
// btn_lastBoxPrintR
//
this.btn_lastBoxPrintR.BackColor = System.Drawing.Color.Aquamarine;
this.btn_lastBoxPrintR.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 129);
+ this.btn_lastBoxPrintR.Location = new System.Drawing.Point(278, 147);
this.btn_lastBoxPrintR.Name = "btn_lastBoxPrintR";
- this.btn_lastBoxPrintR.Size = new System.Drawing.Size(116, 123);
+ this.btn_lastBoxPrintR.Size = new System.Drawing.Size(127, 141);
this.btn_lastBoxPrintR.TabIndex = 4;
this.btn_lastBoxPrintR.Text = "右侧前一箱单";
this.btn_lastBoxPrintR.UseVisualStyleBackColor = false;
@@ -897,9 +910,9 @@
//
this.btn_lastBoxPrintL.BackColor = System.Drawing.Color.Aquamarine;
this.btn_lastBoxPrintL.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_lastBoxPrintL.Location = new System.Drawing.Point(255, 0);
+ this.btn_lastBoxPrintL.Location = new System.Drawing.Point(278, 0);
this.btn_lastBoxPrintL.Name = "btn_lastBoxPrintL";
- this.btn_lastBoxPrintL.Size = new System.Drawing.Size(116, 123);
+ this.btn_lastBoxPrintL.Size = new System.Drawing.Size(127, 141);
this.btn_lastBoxPrintL.TabIndex = 2;
this.btn_lastBoxPrintL.Text = "左侧前一箱单";
this.btn_lastBoxPrintL.UseVisualStyleBackColor = false;
@@ -908,10 +921,10 @@
// label27
//
this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.Location = new System.Drawing.Point(-3, 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;
@@ -920,20 +933,20 @@
//
this.label26.AutoSize = true;
this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label26.Location = new System.Drawing.Point(0, 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;
@@ -942,10 +955,10 @@
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label16.Location = new System.Drawing.Point(0, 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 = "计划数量";
//
@@ -955,11 +968,11 @@
this.groupBox1.Controls.Add(this.tableLayoutPanel3);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox1.Location = new System.Drawing.Point(4, 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";
@@ -974,14 +987,14 @@
this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 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
@@ -992,10 +1005,10 @@
this.panel47.Controls.Add(this.lbNeedQtyR);
this.panel47.Controls.Add(this.lbCurrentlQtyR);
this.panel47.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel47.Location = new System.Drawing.Point(4, 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
@@ -1003,10 +1016,10 @@
this.btnHandPrintR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnHandPrintR.Location = new System.Drawing.Point(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;
@@ -1016,10 +1029,10 @@
//
this.label30.AutoSize = true;
this.label30.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label30.Location = new System.Drawing.Point(86, 25);
+ this.label30.Location = new System.Drawing.Point(94, 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 = "/";
//
@@ -1027,10 +1040,10 @@
//
this.lbNeedQtyR.AutoSize = true;
this.lbNeedQtyR.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbNeedQtyR.Location = new System.Drawing.Point(160, 28);
+ this.lbNeedQtyR.Location = new System.Drawing.Point(175, 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";
//
@@ -1038,10 +1051,10 @@
//
this.lbCurrentlQtyR.AutoSize = true;
this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbCurrentlQtyR.Location = new System.Drawing.Point(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);
@@ -1051,10 +1064,10 @@
this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label34.BackColor = System.Drawing.Color.Transparent;
this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label34.Location = new System.Drawing.Point(5, 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;
@@ -1065,10 +1078,10 @@
this.lbPackageCodeR.AutoSize = true;
this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2);
this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPackageCodeR.Location = new System.Drawing.Point(4, 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
@@ -1076,9 +1089,9 @@
this.panel49.Controls.Add(this.btnChangeSizeR);
this.panel49.Controls.Add(this.comBoxSizeR);
this.panel49.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel49.Location = new System.Drawing.Point(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
@@ -1086,10 +1099,10 @@
this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnChangeSizeR.Location = new System.Drawing.Point(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;
@@ -1102,10 +1115,10 @@
this.comBoxSizeR.Enabled = false;
this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comBoxSizeR.FormattingEnabled = true;
- this.comBoxSizeR.Location = new System.Drawing.Point(0, 18);
- this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comBoxSizeR.Location = new System.Drawing.Point(0, 21);
+ 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
@@ -1113,26 +1126,26 @@
this.panel36.Controls.Add(this.tableLayoutPanel1);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1140,10 +1153,10 @@
this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label11.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.label11.Location = new System.Drawing.Point(5, 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;
@@ -1154,11 +1167,11 @@
this.groupBox2.Controls.Add(this.tableLayoutPanel4);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold);
- this.groupBox2.Location = new System.Drawing.Point(4, 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&&手打";
@@ -1173,15 +1186,15 @@
this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0);
this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 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
@@ -1189,10 +1202,10 @@
this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label38.BackColor = System.Drawing.Color.Transparent;
this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label38.Location = new System.Drawing.Point(5, 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;
@@ -1205,10 +1218,10 @@
this.panel46.Controls.Add(this.lbNeedQtyL);
this.panel46.Controls.Add(this.lbCurrentlQtyL);
this.panel46.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel46.Location = new System.Drawing.Point(4, 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
@@ -1216,10 +1229,10 @@
this.btnHandPrintL.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnHandPrintL.Location = new System.Drawing.Point(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;
@@ -1229,10 +1242,10 @@
//
this.label31.AutoSize = true;
this.label31.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label31.Location = new System.Drawing.Point(83, 25);
+ this.label31.Location = new System.Drawing.Point(91, 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 = "/";
//
@@ -1240,10 +1253,10 @@
//
this.lbNeedQtyL.AutoSize = true;
this.lbNeedQtyL.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbNeedQtyL.Location = new System.Drawing.Point(155, 28);
+ this.lbNeedQtyL.Location = new System.Drawing.Point(169, 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";
//
@@ -1251,10 +1264,10 @@
//
this.lbCurrentlQtyL.AutoSize = true;
this.lbCurrentlQtyL.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbCurrentlQtyL.Location = new System.Drawing.Point(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);
@@ -1265,10 +1278,10 @@
this.lbPackageCodeL.AutoSize = true;
this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2);
this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPackageCodeL.Location = new System.Drawing.Point(4, 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
@@ -1276,9 +1289,9 @@
this.panel48.Controls.Add(this.btnChangeSizeL);
this.panel48.Controls.Add(this.comBoxSizeL);
this.panel48.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel48.Location = new System.Drawing.Point(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
@@ -1286,10 +1299,10 @@
this.btnChangeSizeL.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnChangeSizeL.Location = new System.Drawing.Point(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;
@@ -1302,10 +1315,10 @@
this.comBoxSizeL.Enabled = false;
this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comBoxSizeL.FormattingEnabled = true;
- this.comBoxSizeL.Location = new System.Drawing.Point(2, 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
@@ -1314,9 +1327,9 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel8.Margin = new System.Windows.Forms.Padding(5);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2666, 91);
+ this.panel8.Size = new System.Drawing.Size(2908, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -1324,10 +1337,10 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(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(2286, 91);
+ this.panel10.Size = new System.Drawing.Size(2493, 104);
this.panel10.TabIndex = 2;
//
// panel12
@@ -1335,10 +1348,10 @@
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(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(1835, 91);
+ this.panel12.Size = new System.Drawing.Size(2001, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -1346,10 +1359,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(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(1368, 91);
+ this.panel16.Size = new System.Drawing.Size(1492, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -1357,10 +1370,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(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(940, 91);
+ this.panel20.Size = new System.Drawing.Size(1025, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -1368,10 +1381,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(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(599, 91);
+ this.label10.Size = new System.Drawing.Size(653, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1382,9 +1395,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1396,7 +1409,7 @@
this.label9.Location = new System.Drawing.Point(0, 0);
this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(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;
@@ -1408,9 +1421,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1418,10 +1431,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(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;
@@ -1431,9 +1444,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1445,7 +1458,7 @@
this.label7.Location = new System.Drawing.Point(0, 0);
this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(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;
@@ -1457,19 +1470,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1480,7 +1493,7 @@
this.label6.Location = new System.Drawing.Point(0, 0);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(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;
@@ -1490,9 +1503,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1504,7 +1517,7 @@
this.label5.Location = new System.Drawing.Point(0, 0);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(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;
@@ -1517,19 +1530,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1542,9 +1555,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
@@ -1552,9 +1565,9 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1566,7 +1579,7 @@
this.label4.Location = new System.Drawing.Point(0, 0);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(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;
@@ -1576,9 +1589,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1590,7 +1603,7 @@
this.label3.Location = new System.Drawing.Point(0, 0);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(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;
@@ -1601,9 +1614,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2666, 147);
+ this.panel2.Size = new System.Drawing.Size(2908, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1611,10 +1624,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(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(2355, 147);
+ this.panel4.Size = new System.Drawing.Size(2569, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1623,9 +1636,9 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel6.Margin = new System.Windows.Forms.Padding(5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(2003, 147);
+ this.panel6.Size = new System.Drawing.Size(2185, 168);
this.panel6.TabIndex = 1;
//
// btnOnlyBarCode
@@ -1634,7 +1647,7 @@
this.btnOnlyBarCode.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOnlyBarCode.Location = new System.Drawing.Point(3, 1);
this.btnOnlyBarCode.Name = "btnOnlyBarCode";
- this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143);
+ this.btnOnlyBarCode.Size = new System.Drawing.Size(237, 163);
this.btnOnlyBarCode.TabIndex = 1;
this.btnOnlyBarCode.Text = "条码模式";
this.btnOnlyBarCode.UseVisualStyleBackColor = false;
@@ -1648,7 +1661,7 @@
this.label1.Location = new System.Drawing.Point(0, 0);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(2003, 147);
+ this.label1.Size = new System.Drawing.Size(2185, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间箱码条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1657,10 +1670,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(2003, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel5.Location = new System.Drawing.Point(2185, 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
@@ -1671,7 +1684,7 @@
this.label2.Location = new System.Drawing.Point(0, 0);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(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;
@@ -1682,19 +1695,19 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(5, 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;
@@ -1736,27 +1749,14 @@
this.timer3.Interval = 5000;
this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
//
- // lbDevState
- //
- this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue;
- this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbDevState.Location = new System.Drawing.Point(854, 239);
- this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.lbDevState.Name = "lbDevState";
- this.lbDevState.Size = new System.Drawing.Size(347, 58);
- this.lbDevState.TabIndex = 15;
- this.lbDevState.Text = "设备已连接";
- this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.lbDevState.Click += new System.EventHandler(this.lbDevState_Click);
- //
// FrmMain2408
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2666, 1600);
+ this.ClientSize = new System.Drawing.Size(2908, 1829);
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 48a3a95..0679af7 100644
--- a/InjectionPC/FrmMain2408.cs
+++ b/InjectionPC/FrmMain2408.cs
@@ -163,15 +163,7 @@ namespace InjectionPC
label2.BackColor = Color.Red;
}
- //comBoxSizeL.DataSource = _basicBLL1.GetPackageSize();
- //comBoxSizeL.DisplayMember = "describe";
- //comBoxSizeL.ValueMember = "Count";
- //comBoxSizeR.DataSource = _basicBLL1.GetPackageSize();
- //comBoxSizeR.DisplayMember = "describe";
- //comBoxSizeR.ValueMember = "Count";
-
-
-
+
comboBox2.MouseWheel += new MouseEventHandler(comboBox2_MouseWheel);
@@ -181,37 +173,7 @@ namespace InjectionPC
#endregion
- #region 测试opc暂时注销
- //if (ConfigurationManager.AppSettings["StationMode"].ToString() == "1") //自动称重
- //{
- // timer1.Start();
- //}
- //else
- //{
- // timer1.Stop();
-
- // #region 设置串口属性
-
- // serialPort1.PortName = ConfigurationManager.AppSettings["PortName"].ToString();
- // serialPort1.BaudRate = 9600;
- // serialPort1.DataBits = 8;
- // serialPort1.StopBits = (StopBits)1;
- // serialPort1.Parity = 0;
- // serialPort1.ReadTimeout = 5000;
-
- // if (serialPort1.IsOpen)
- // {
- // serialPort1.Close();
- // serialPort1.Open();
- // }
- // else
- // {
- // serialPort1.Open();
- // }
-
- // #endregion
- //}
- #endregion
+
#region 连接PLC
@@ -5024,26 +4986,31 @@ namespace InjectionPC
///
private void label7_MouseDoubleClick(object sender, MouseEventArgs e)
{
- timer3.Enabled = false;
- //调用测试
- Array a = null;
- Array b = null;
- Array c = null;
- Array d = null;
- status = true;
- IsTest = true;
- bool bbb = true;
- //label23_Click(null, null);
- textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
- Program.ProductDate.Substring(8, 2);
- if (bbb == true)
- { //自动
- opcGroup1_DataChange(1, 2, ref a, ref b, ref c, ref d);
- }
- else
- { //手动
- label23_Click(null, null);
+ string cs = ConfigurationManager.AppSettings["测试"];
+ if (!string.IsNullOrEmpty(cs) && cs == "true")
+ {
+ timer3.Enabled = false;
+ //调用测试
+ Array a = null;
+ Array b = null;
+ Array c = null;
+ Array d = null;
+ status = true;
+ IsTest = true;
+ bool bbb = true;
+ //label23_Click(null, null);
+ textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
+ Program.ProductDate.Substring(8, 2);
+ if (bbb == true)
+ { //自动
+ opcGroup1_DataChange(1, 2, ref a, ref b, ref c, ref d);
+ }
+ else
+ { //手动
+ label23_Click(null, null);
+ }
}
+
}
bool IsTest = false;
///
diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs
index 9ab5358..1c2674b 100644
--- a/InjectionPC/FrmMain2411.Designer.cs
+++ b/InjectionPC/FrmMain2411.Designer.cs
@@ -184,9 +184,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1600);
+ this.panel1.Size = new System.Drawing.Size(2560, 1829);
this.panel1.TabIndex = 0;
//
// panel7
@@ -195,10 +195,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 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, 1453);
+ this.panel7.Size = new System.Drawing.Size(2560, 1661);
this.panel7.TabIndex = 1;
//
// panel23
@@ -206,10 +206,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 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, 1362);
+ this.panel23.Size = new System.Drawing.Size(2560, 1557);
this.panel23.TabIndex = 1;
//
// panel27
@@ -217,10 +217,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 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, 386);
+ this.panel27.Size = new System.Drawing.Size(2560, 442);
this.panel27.TabIndex = 1;
//
// panel29
@@ -228,10 +228,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(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, 386);
+ this.panel29.Size = new System.Drawing.Size(2221, 442);
this.panel29.TabIndex = 1;
//
// panel31
@@ -239,10 +239,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(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, 386);
+ this.panel31.Size = new System.Drawing.Size(2088, 442);
this.panel31.TabIndex = 1;
//
// panel33
@@ -250,10 +250,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(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, 386);
+ this.panel33.Size = new System.Drawing.Size(1955, 442);
this.panel33.TabIndex = 1;
//
// panel35
@@ -261,9 +261,9 @@
this.panel35.Controls.Add(this.panel37);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1670, 386);
+ this.panel35.Size = new System.Drawing.Size(1822, 442);
this.panel35.TabIndex = 1;
//
// panel37
@@ -271,9 +271,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1670, 386);
+ this.panel37.Size = new System.Drawing.Size(1822, 442);
this.panel37.TabIndex = 1;
//
// panel40
@@ -282,9 +282,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1670, 386);
+ this.panel40.Size = new System.Drawing.Size(1822, 442);
this.panel40.TabIndex = 1;
//
// panel42
@@ -293,9 +293,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1548, 386);
+ this.panel42.Size = new System.Drawing.Size(1689, 442);
this.panel42.TabIndex = 1;
//
// panel39
@@ -312,19 +312,19 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1426, 386);
+ this.panel39.Size = new System.Drawing.Size(1556, 442);
this.panel39.TabIndex = 1;
//
// lbDevState
//
this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbDevState.Location = new System.Drawing.Point(556, 291);
+ this.lbDevState.Location = new System.Drawing.Point(607, 333);
this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbDevState.Name = "lbDevState";
- this.lbDevState.Size = new System.Drawing.Size(347, 58);
+ this.lbDevState.Size = new System.Drawing.Size(378, 66);
this.lbDevState.TabIndex = 16;
this.lbDevState.Text = "设备已连接";
this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -333,20 +333,20 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(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 = "数量：";
//
@@ -354,10 +354,10 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(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)";
//
@@ -365,20 +365,20 @@
//
this.textBox1.Enabled = false;
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(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 = "批次：";
//
@@ -387,10 +387,10 @@
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(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);
//
@@ -398,10 +398,10 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(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 = "产品：";
//
@@ -409,10 +409,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(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, 386);
+ this.panel43.Size = new System.Drawing.Size(133, 442);
this.panel43.TabIndex = 0;
//
// label23
@@ -423,7 +423,7 @@
this.label23.Location = new System.Drawing.Point(0, 0);
this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(122, 386);
+ this.label23.Size = new System.Drawing.Size(133, 442);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -433,10 +433,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(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, 386);
+ this.panel41.Size = new System.Drawing.Size(133, 442);
this.panel41.TabIndex = 0;
//
// label22
@@ -447,7 +447,7 @@
this.label22.Location = new System.Drawing.Point(0, 0);
this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(122, 386);
+ this.label22.Size = new System.Drawing.Size(133, 442);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -457,10 +457,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(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, 386);
+ this.panel34.Size = new System.Drawing.Size(133, 442);
this.panel34.TabIndex = 0;
//
// label15
@@ -471,7 +471,7 @@
this.label15.Location = new System.Drawing.Point(0, 0);
this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(122, 386);
+ this.label15.Size = new System.Drawing.Size(133, 442);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -482,9 +482,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(122, 386);
+ this.panel32.Size = new System.Drawing.Size(133, 442);
this.panel32.TabIndex = 0;
//
// label14
@@ -495,7 +495,7 @@
this.label14.Location = new System.Drawing.Point(0, 0);
this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(122, 386);
+ this.label14.Size = new System.Drawing.Size(133, 442);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -506,9 +506,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(122, 386);
+ this.panel30.Size = new System.Drawing.Size(133, 442);
this.panel30.TabIndex = 0;
//
// label13
@@ -519,7 +519,7 @@
this.label13.Location = new System.Drawing.Point(0, 0);
this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(122, 386);
+ this.label13.Size = new System.Drawing.Size(133, 442);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -530,9 +530,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(311, 386);
+ this.panel28.Size = new System.Drawing.Size(339, 442);
this.panel28.TabIndex = 0;
//
// label12
@@ -544,7 +544,7 @@
this.label12.Location = new System.Drawing.Point(0, 0);
this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(311, 386);
+ this.label12.Size = new System.Drawing.Size(339, 442);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -555,9 +555,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(5, 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
@@ -566,10 +566,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(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
@@ -579,19 +579,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(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;
@@ -600,10 +600,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(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;
@@ -612,20 +612,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(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;
@@ -637,19 +637,19 @@
this.panel44.Controls.Add(this.button1);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(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;
@@ -658,10 +658,10 @@
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(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;
@@ -670,20 +670,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(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;
@@ -751,17 +751,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;
@@ -774,9 +774,9 @@
this.panel25.Controls.Add(this.panel36);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(5, 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
@@ -785,13 +785,13 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 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
@@ -801,19 +801,19 @@
this.panel38.Controls.Add(this.label26);
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
- this.panel38.Location = new System.Drawing.Point(5, 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, 561);
+ 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;
@@ -822,20 +822,20 @@
//
this.label26.AutoSize = true;
this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label26.Location = new System.Drawing.Point(0, 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;
@@ -844,10 +844,10 @@
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label16.Location = new System.Drawing.Point(0, 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 = "计划数量";
//
@@ -856,9 +856,9 @@
this.panel36.Controls.Add(this.tableLayoutPanel1);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(5, 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
@@ -868,12 +868,12 @@
this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+ 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
@@ -884,7 +884,7 @@
this.label11.Location = new System.Drawing.Point(5, 0);
this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(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;
@@ -895,9 +895,9 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(5, 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
@@ -905,10 +905,10 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(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
@@ -916,10 +916,10 @@
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(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
@@ -927,10 +927,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(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
@@ -938,10 +938,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(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
@@ -949,10 +949,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(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;
@@ -963,9 +963,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(5, 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
@@ -977,7 +977,7 @@
this.label9.Location = new System.Drawing.Point(0, 0);
this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(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;
@@ -989,9 +989,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(5, 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
@@ -999,10 +999,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(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;
@@ -1012,9 +1012,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1026,7 +1026,7 @@
this.label7.Location = new System.Drawing.Point(0, 0);
this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(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;
@@ -1038,19 +1038,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1061,7 +1061,7 @@
this.label6.Location = new System.Drawing.Point(0, 0);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(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;
@@ -1071,9 +1071,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1085,7 +1085,7 @@
this.label5.Location = new System.Drawing.Point(0, 0);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(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;
@@ -1097,19 +1097,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1122,9 +1122,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
@@ -1132,9 +1132,9 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1146,7 +1146,7 @@
this.label4.Location = new System.Drawing.Point(0, 0);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(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;
@@ -1156,9 +1156,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1170,7 +1170,7 @@
this.label3.Location = new System.Drawing.Point(0, 0);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(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;
@@ -1181,9 +1181,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1191,10 +1191,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(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
@@ -1203,9 +1203,9 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(5, 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
@@ -1214,7 +1214,7 @@
this.btnBarCodeWithBox.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBarCodeWithBox.Location = new System.Drawing.Point(0, 1);
this.btnBarCodeWithBox.Name = "btnBarCodeWithBox";
- this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143);
+ this.btnBarCodeWithBox.Size = new System.Drawing.Size(237, 163);
this.btnBarCodeWithBox.TabIndex = 2;
this.btnBarCodeWithBox.Text = "箱码模式";
this.btnBarCodeWithBox.UseVisualStyleBackColor = false;
@@ -1228,7 +1228,7 @@
this.label1.Location = new System.Drawing.Point(0, 0);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(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;
@@ -1237,10 +1237,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(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
@@ -1251,7 +1251,7 @@
this.label2.Location = new System.Drawing.Point(0, 0);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(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;
@@ -1262,19 +1262,19 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(5, 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;
@@ -1318,12 +1318,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, 1600);
+ this.ClientSize = new System.Drawing.Size(2560, 1829);
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 cd176be..279439f 100644
--- a/InjectionPC/FrmMain2411.cs
+++ b/InjectionPC/FrmMain2411.cs
@@ -169,38 +169,6 @@ namespace InjectionPC
#endregion
- #region 测试opc暂时注销
- //if (ConfigurationManager.AppSettings["StationMode"].ToString() == "1") //自动称重
- //{
- // timer1.Start();
- //}
- //else
- //{
- // timer1.Stop();
-
- // #region 设置串口属性
-
- // serialPort1.PortName = ConfigurationManager.AppSettings["PortName"].ToString();
- // serialPort1.BaudRate = 9600;
- // serialPort1.DataBits = 8;
- // serialPort1.StopBits = (StopBits)1;
- // serialPort1.Parity = 0;
- // serialPort1.ReadTimeout = 5000;
-
- // if (serialPort1.IsOpen)
- // {
- // serialPort1.Close();
- // serialPort1.Open();
- // }
- // else
- // {
- // serialPort1.Open();
- // }
-
- // #endregion
- //}
- #endregion
-
#region 连接PLC
try
@@ -390,25 +358,31 @@ namespace InjectionPC
{
if ((ItemValues!=null && ItemValues.GetValue(i).ToString() == "True") || IsTest ==true)
{
- LogSysBLL.AddInfo("true" + label6.Text, MethodBase.GetCurrentMethod());
- GetClass();
+ //LogSysBLL.AddInfo("true" + label6.Text, MethodBase.GetCurrentMethod());
- #region 增加时间差判定
+ try
+ {
+ GetClass();
- //DateTime lastTime = GetPrintTime(label6.Text);
+ #region 增加时间差判定
- //long ts = TimeDiff(lastTime, DateTime.Now);
- TimeSpan span=DateTime.Now - lastTime;
- if (span.TotalSeconds < Convert.ToDouble(ConfigurationManager.AppSettings["InterValT"]))
- {
- return;
- }
+ TimeSpan span = DateTime.Now - lastTime;
+ if (span.TotalSeconds < Convert.ToDouble(ConfigurationManager.AppSettings["InterValT"]))
+ {
+ return;
+ }
- #endregion
+ #endregion
- //comboBox1.Text = "A班"; //班次
- textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
- Program.ProductDate.Substring(8, 2); //批次
+ //comboBox1.Text = "A班"; //班次
+ textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
+ Program.ProductDate.Substring(8, 2); //批次
+ }
+ catch(Exception ex)
+ {
+ throw new Exception(Program.station + "p383" + ex.Message);
+ }
+
#region 查找当前计划
DataTable dt = bll.SearchInfoByName(Program.station);
@@ -417,152 +391,185 @@ namespace InjectionPC
if (aa != dt.Rows[0]["PartNo"].ToString())
{
+
DialogResult result=MessageBox.Show("计划有变更，请确认！", "提示", MessageBoxButtons.OKCancel,
MessageBoxIcon.Information);
if (result == DialogResult.OK)
{
-
- planID = dt.Rows[0]["InjectionPlanID"].ToString();
- string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(',');
- //string[] stockNo = dt.Rows[0]["StockNo"].ToString().Split(',');
- string[] stockNo = new string[partNo.Length];
- string ProductNature = dt.Rows[0]["ProductNature"].ToString();
- aa = dt.Rows[0]["PartNo"].ToString();
-
- //ManufacturerName = dt.Rows[0]["ManufacturerName"].ToString();
- DataTable dtM = productBll.SearchInfoByPartNo(partNo[0]);
- if (dtM != null && dtM.Rows.Count > 0)
- {
- ManufacturerName = dtM.Rows[0]["ManufacturerName"].ToString();
- }
-
- #region 判断有几个零件号
- string mould = "0";
- for (int j = 0; j < partNo.Length; j++)
+ try
{
- #region 根据零件号查找存货代码
-
- DataTable sdt = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (sdt != null && sdt.Rows.Count > 0)
+ planID = dt.Rows[0]["InjectionPlanID"].ToString();
+ string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(',');
+ //string[] stockNo = dt.Rows[0]["StockNo"].ToString().Split(',');
+ string[] stockNo = new string[partNo.Length];
+ string ProductNature = dt.Rows[0]["ProductNature"].ToString();
+ aa = dt.Rows[0]["PartNo"].ToString();
+
+ //ManufacturerName = dt.Rows[0]["ManufacturerName"].ToString();
+ DataTable dtM = productBll.SearchInfoByPartNo(partNo[0]);
+ if (dtM != null && dtM.Rows.Count > 0)
{
- stockNo[j] = sdt.Rows[0]["StockNo"].ToString();
- IsSame = sdt.Rows[0]["IsSame"].ToString();
+ ManufacturerName = dtM.Rows[0]["ManufacturerName"].ToString();
}
- else
+
+ #region 判断有几个零件号
+ string mould = "0";
+ for (int j = 0; j < partNo.Length; j++)
{
- stockNo[j] = "";
- }
+ #region 根据零件号查找存货代码
- #endregion
+ DataTable sdt = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ if (sdt != null && sdt.Rows.Count > 0)
+ {
+ stockNo[j] = sdt.Rows[0]["StockNo"].ToString();
+ IsSame = sdt.Rows[0]["IsSame"].ToString();
+ }
+ else
+ {
+ stockNo[j] = "";
+ }
- #region 获取零件属性
+ #endregion
- DataTable dtx = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (dtx != null && dtx.Rows.Count > 0)
- {
- QLevel = dtx.Rows[0]["QLevel"].ToString();
- IsOne = dtx.Rows[0]["IsPrintOneTag"].ToString();
- IsPack = dtx.Rows[0]["IsPrintPackList"].ToString();
- IsPaint = dtx.Rows[0]["IsPlating"].ToString();
- PartName = dtx.Rows[0]["ProductName"].ToString();
- IsSupply = dtx.Rows[0]["IsSupply"].ToString();
- }
+ #region 获取零件属性
- #endregion
+ DataTable dtx = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ if (dtx != null && dtx.Rows.Count > 0)
+ {
+ QLevel = dtx.Rows[0]["QLevel"].ToString();
+ IsOne = dtx.Rows[0]["IsPrintOneTag"].ToString();
+ IsPack = dtx.Rows[0]["IsPrintPackList"].ToString();
+ IsPaint = dtx.Rows[0]["IsPlating"].ToString();
+ PartName = dtx.Rows[0]["ProductName"].ToString();
+ IsSupply = dtx.Rows[0]["IsSupply"].ToString();
+ }
- if (IsSame == "1")//一模两压相同的
- {
- for (int k = 0; k < 2; k++)
+ #endregion
+
+ if (IsSame == "1")//一模两压相同的
{
- #region 非直供件打印
+ for (int k = 0; k < 2; k++)
+ {
+ #region 非直供件打印
+
+ if (IsSupply != "1")
+ {
+ if (ManufacturerName.Contains("蔚来"))
+ {
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+ }
+ else
+ {
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+
+ }
+ }
+
+ #endregion
+
+ #region 直供件打印
+
+ if (IsSupply == "1")
+ {
+
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
+ }
+
+ #endregion
+
+ #region 插入数据tb_barCode
+
+ md.ID = Guid.NewGuid().ToString();
+ md.StationID = dt.Rows[0]["StationID"].ToString();
+ md.OneBarCode = NewOneCode;
+ md.BarCode = newcode;
+ md.StockNo = stockNo[j].ToString().Trim();
+ md.PartNo = partNo[j].ToString().Trim();
+ md.PrintType = 0;
+ md.PlanID = planID;
+ md.ProductNature = ProductNature;
+ md.Des1 = PartName;
+
+ string errMsg = string.Empty;
+ bool saveRst = SaveInfo(md, true, mould, false, ref errMsg);
+ if (saveRst == false)
+ {
+ //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg);
+ //return;
+ }
+
+ #endregion
+
+ #region 打印条码，判断是否打印单个条码
+
+ #region 打印单个标签
+
+ if (IsOne == "1")
+ {
+ if (IsSupply != "1")
+ {
+ filename = ManufacturerName.Contains("蔚来")
+ ? System.AppDomain.CurrentDomain.BaseDirectory +
+ "wl.grf"
+ : System.AppDomain.CurrentDomain.BaseDirectory +
+ PrintMoudleName("0"); //new
+ }
+ else
+ {
+ filename = System.AppDomain.CurrentDomain.BaseDirectory +
+ PrintMoudleName("1");
+ }
+
+ printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
+
+ string reportName = ConfigurationManager.AppSettings[printName]
+ .ToString();
+
+ DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null,
+ (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ LogSysBLL.AddInfo(
+ GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode,
+ MethodBase.GetCurrentMethod());
+ rp.Report.Print(false);
+ }
+
+ #endregion
+
+ #endregion
+
+ initBarCode();
+ }
+ }
+ else//一模两压不同的
+ {
if (IsSupply != "1")
{
+ #region 非直供件
+
if (ManufacturerName.Contains("蔚来"))
{
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dts.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) +
- // 1).ToString()
- // .PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "0001";
- //}
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, ref NewOneCode, ref newcode);
}
else
{
- //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- //if (dt2 != null && dt2.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) +
- // 1).ToString()
- // .PadLeft(4, '0');
- // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim();
- // NewOneCode =
- // OneCode.Substring(0, OneCode.Length - 4) +
- // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4,
- // 4)) +
- // 1).ToString().PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." +
- // "0001";
- // NewOneCode =
- // stockNo[j].ToString().Trim() +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "0001";
- //}
-
GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
- }
-
- #endregion
-
- #region 直供件打印
- if (IsSupply == "1")
+ #endregion
+ }
+ else
{
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dts.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(23, 3)) +
- // 1).ToString()
- // .PadLeft(3, '0')+"#";
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "#" + QLevel+"#"+
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "#" + "001"+"#";
- //}
-
+ #region 直供件
GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
+ #endregion
}
- #endregion
-
#region 插入数据tb_barCode
md.ID = Guid.NewGuid().ToString();
@@ -575,26 +582,26 @@ namespace InjectionPC
md.PlanID = planID;
md.ProductNature = ProductNature;
md.Des1 = PartName;
- //DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
- //if (pdt != null && pdt.Rows.Count > 0)
- //{
- // if (pdt.Rows[0]["isImport"].ToString() == "1")
- // {
- // md.Import = "国产料Kingfa";
- // }
- // else
- // {
- // md.Import = "";
- // }
- //}
+ DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
+ if (pdt != null && pdt.Rows.Count > 0)
+ {
+ if (pdt.Rows[0]["isImport"].ToString() == "1")
+ {
+ md.Import = "国产料Kingfa";
+ }
+ else
+ {
+ md.Import = "";
+ }
+ }
- ////if (brbll.Add_Info_New(md, Program.tableName) == false)
- //if (SaveBarCode (md, Program.tableName, true, mould) == false)
- // {
+ //// if (brbll.Add_Info_New(md, Program.tableName) == false)
+ //if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ //{
// int a = 0;
// for (int l = 0; l < 5; l++)
// {
- // // if (brbll.Add_Info_New(md, Program.tableName))
+ // //if (brbll.Add_Info_New(md, Program.tableName))
// if (SaveBarCode(md, Program.tableName, true, mould) == true)
// {
// break;
@@ -609,9 +616,10 @@ namespace InjectionPC
// return;
// }
//}
+
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould,false,ref errMsg);
- if(saveRst == false)
+ bool saveRst = SaveInfo(md, true, mould, false, ref errMsg);
+ if (saveRst == false)
{
//MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg);
//return;
@@ -621,6 +629,19 @@ namespace InjectionPC
#region 打印条码，判断是否打印单个条码
+ DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ if (dt3 != null && dt3.Rows.Count > 0)
+ {
+ QLevel = dt3.Rows[0]["QLevel"].ToString();
+ IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
+ IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
+ IsPaint = dt3.Rows[0]["IsPlating"].ToString();
+ PartName = dt3.Rows[0]["ProductName"].ToString();
+ //MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
+ IsSame = dt3.Rows[0]["IsSame"].ToString();
+ IsSupply = dt3.Rows[0]["IsSupply"].ToString();
+ }
+
#region 打印单个标签
if (IsOne == "1")
@@ -632,6 +653,12 @@ namespace InjectionPC
"wl.grf"
: System.AppDomain.CurrentDomain.BaseDirectory +
PrintMoudleName("0"); //new
+ if (partNo[j].Contains("A2146982300") ||
+ partNo[j].Contains("A2146982400"))
+ {
+ filename = AppDomain.CurrentDomain.BaseDirectory +
+ PrintMoudleName("0");
+ }
}
else
{
@@ -646,16 +673,15 @@ namespace InjectionPC
//{
// printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
//}
- printName = "Printer" +_printNameDict[partNo[j].ToString().Trim()+ dt.Rows[0]["StationID"].ToString()];
+ printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
string reportName = ConfigurationManager.AppSettings[printName]
.ToString();
-
DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode);
- ReportHelper rp = new ReportHelper(filename, headTable, null,
- (int) GRPaperOrientation.grpoDefault, 1, reportName);
+ ReportHelper rp = new ReportHelper(filename, headTable, null,
+ (int)GRPaperOrientation.grpoDefault, 1, reportName);
LogSysBLL.AddInfo(
GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode,
MethodBase.GetCurrentMethod());
@@ -670,752 +696,386 @@ namespace InjectionPC
initBarCode();
}
}
- else//一模两压不同的
- {
- if (IsSupply != "1")
- {
- #region 非直供件
- if (ManufacturerName.Contains("蔚来"))
- {
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) +
- // 1).ToString()
- // .PadLeft(4, '0') ;
- //}
- //else
- //{
- // newcode = partNo[j].Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "0001";
- //}
-
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
-
- }
- else
- {
- //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- //if (dt2 != null && dt2.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) +
- // 1)
- // .ToString()
- // .PadLeft(4, '0');
- // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim();
- // NewOneCode =
- // OneCode.Substring(0, OneCode.Length - 4) +
- // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) +
- // 1)
- // .ToString().PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "0001";
- // NewOneCode =
- // stockNo[j].ToString().Trim() +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "0001";
- //}
-
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(Program.station + "p704" + ex.Message);
+ }
+ }
+ else
+ {
+ return;
+ }
+ }
+ else
+ {
+ try
+ {
- }
+ planID = dt.Rows[0]["InjectionPlanID"].ToString();
+ string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(',');
+ //string[] stockNo = dt.Rows[0]["StockNo"].ToString().Split(',');
+ string[] stockNo = new string[partNo.Length];
+ string ProductNature = dt.Rows[0]["ProductNature"].ToString();
+ //ManufacturerName = dt.Rows[0]["ManufacturerName"].ToString();
+ DataTable dtM = productBll.SearchInfoByPartNo(partNo[0]);
+ if (dtM != null && dtM.Rows.Count > 0)
+ {
+ ManufacturerName = dtM.Rows[0]["ManufacturerName"].ToString();
+ }
- #endregion
+ #region 判断有几个零件号
+ string mould = "0";
+ for (int j = 0; j < partNo.Length; j++)
+ {
+ try
+ {
+ #region 根据零件号查找存货代码
+ mould = j.ToString();
+ DataTable sdt = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ if (sdt != null && sdt.Rows.Count > 0)
+ {
+ stockNo[j] = sdt.Rows[0]["StockNo"].ToString();
+ IsSame = sdt.Rows[0]["IsSame"].ToString();
}
else
{
- #region 直供件
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(23, 3)) +
- // 1).ToString()
- // .PadLeft(3, '0') + "#";
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "#" + QLevel + "#" +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
- //}
-
- GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
- #endregion
+ stockNo[j] = "";
}
- #region 插入数据tb_barCode
+ #endregion
- md.ID = Guid.NewGuid().ToString();
- md.StationID = dt.Rows[0]["StationID"].ToString();
- md.OneBarCode = NewOneCode;
- md.BarCode = newcode;
- md.StockNo = stockNo[j].ToString().Trim();
- md.PartNo = partNo[j].ToString().Trim();
- md.PrintType = 0;
- md.PlanID = planID;
- md.ProductNature = ProductNature;
- md.Des1 = PartName;
- DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
- if (pdt != null && pdt.Rows.Count > 0)
- {
- if (pdt.Rows[0]["isImport"].ToString() == "1")
- {
- md.Import = "国产料Kingfa";
- }
- else
- {
- md.Import = "";
- }
- }
+ #region 查询零件属性
- //// if (brbll.Add_Info_New(md, Program.tableName) == false)
- //if (SaveBarCode(md, Program.tableName, true, mould) == false)
- //{
- // int a = 0;
- // for (int l = 0; l < 5; l++)
- // {
- // //if (brbll.Add_Info_New(md, Program.tableName))
- // if (SaveBarCode(md, Program.tableName, true, mould) == true)
- // {
- // break;
- // }
-
- // a += 1;
- // Thread.Sleep(200);
- // }
-
- // if (a >= 4)
- // {
- // return;
- // }
- //}
-
- string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould, false, ref errMsg);
- if (saveRst == false)
+ DataTable dt10 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ if (dt10 != null && dt10.Rows.Count > 0)
{
- //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg);
- //return;
+ QLevel = dt10.Rows[0]["QLevel"].ToString();
+ IsOne = dt10.Rows[0]["IsPrintOneTag"].ToString();
+ IsPack = dt10.Rows[0]["IsPrintPackList"].ToString();
+ IsPaint = dt10.Rows[0]["IsPlating"].ToString();
+ PartName = dt10.Rows[0]["ProductName"].ToString();
+ //MaxCount = Convert.ToInt32(dt10.Rows[0]["PackCount"].ToString());
+ IsSupply = dt10.Rows[0]["IsSupply"].ToString();
}
#endregion
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(Program.station + "p768" + ex.Message);
+ }
- #region 打印条码，判断是否打印单个条码
- DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (dt3 != null && dt3.Rows.Count > 0)
- {
- QLevel = dt3.Rows[0]["QLevel"].ToString();
- IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
- IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
- IsPaint = dt3.Rows[0]["IsPlating"].ToString();
- PartName = dt3.Rows[0]["ProductName"].ToString();
- //MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
- IsSame = dt3.Rows[0]["IsSame"].ToString();
- IsSupply = dt3.Rows[0]["IsSupply"].ToString();
- }
-
- #region 打印单个标签
-
- if (IsOne == "1")
+ if (IsSame == "1")
+ {
+ for (int k = 0; k < 2; k++)
{
if (IsSupply != "1")
{
- filename = ManufacturerName.Contains("蔚来")
- ? System.AppDomain.CurrentDomain.BaseDirectory +
- "wl.grf"
- : System.AppDomain.CurrentDomain.BaseDirectory +
- PrintMoudleName("0"); //new
- if (partNo[j].Contains("A2146982300") ||
- partNo[j].Contains("A2146982400"))
+ #region 非直供件
+
+ try
+ {
+ if (ManufacturerName.Contains("蔚来"))
+ {
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+
+ }
+ else
+ {
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+
+ }
+ }
+ catch (Exception ex)
{
- filename = AppDomain.CurrentDomain.BaseDirectory +
- PrintMoudleName("0");
+ throw new Exception(Program.station + "p795" + ex.Message);
}
+
+ #endregion
}
else
{
- filename = System.AppDomain.CurrentDomain.BaseDirectory +
- PrintMoudleName("1");
- }
-
-
- //DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString());
- //if (dt4 != null && dt4.Rows.Count > 0)
- //{
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- //}
- printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
-
- string reportName = ConfigurationManager.AppSettings[printName]
- .ToString();
- DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode);
-
-
- ReportHelper rp = new ReportHelper(filename, headTable, null,
- (int) GRPaperOrientation.grpoDefault, 1, reportName);
- LogSysBLL.AddInfo(
- GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode,
- MethodBase.GetCurrentMethod());
- rp.Report.Print(false);
-
- }
-
- #endregion
-
- #endregion
+ #region 直供件
- initBarCode();
- }
- }
+ try
+ {
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(Program.station + "p810" + ex.Message);
+ }
- #endregion
- }
- else
- {
- return;
- }
- }
- else
- {
- planID = dt.Rows[0]["InjectionPlanID"].ToString();
- string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(',');
- //string[] stockNo = dt.Rows[0]["StockNo"].ToString().Split(',');
- string[] stockNo = new string[partNo.Length];
- string ProductNature = dt.Rows[0]["ProductNature"].ToString();
- //ManufacturerName = dt.Rows[0]["ManufacturerName"].ToString();
- DataTable dtM = productBll.SearchInfoByPartNo(partNo[0]);
- if (dtM != null && dtM.Rows.Count > 0)
- {
- ManufacturerName = dtM.Rows[0]["ManufacturerName"].ToString();
- }
+ #endregion
+ }
- #region 判断有几个零件号
- string mould = "0";
- for (int j = 0; j < partNo.Length; j++)
- {
- #region 根据零件号查找存货代码
- mould = j.ToString();
- DataTable sdt = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (sdt != null && sdt.Rows.Count > 0)
- {
- stockNo[j] = sdt.Rows[0]["StockNo"].ToString();
- IsSame = sdt.Rows[0]["IsSame"].ToString();
- }
- else
- {
- stockNo[j] = "";
- }
+ #region 插入数据tb_barCode
- #endregion
+ try
+ {
+ md.ID = Guid.NewGuid().ToString();
+ md.StationID = dt.Rows[0]["StationID"].ToString();
+ md.OneBarCode = NewOneCode;
+ md.BarCode = newcode;
+ md.StockNo = stockNo[j].ToString().Trim();
+ md.PartNo = partNo[j].ToString().Trim();
+ md.PrintType = 0;
+ md.PlanID = planID;
+ md.ProductNature = ProductNature;
+ md.Des1 = PartName;
+ DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
+ if (pdt != null && pdt.Rows.Count > 0)
+ {
+ if (pdt.Rows[0]["isImport"].ToString() == "1")
+ {
+ md.Import = "国产料Kingfa";
+ }
+ else
+ {
+ md.Import = "";
+ }
+ }
- #region 查询零件属性
+ string errMsg = string.Empty;
+ bool saveRst = SaveInfo(md, true, mould, false, ref errMsg);
+ if (saveRst == false)
+ {
+ //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg);
+ //return;
+ }
- DataTable dt10 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (dt10 != null && dt10.Rows.Count > 0)
- {
- QLevel = dt10.Rows[0]["QLevel"].ToString();
- IsOne = dt10.Rows[0]["IsPrintOneTag"].ToString();
- IsPack = dt10.Rows[0]["IsPrintPackList"].ToString();
- IsPaint = dt10.Rows[0]["IsPlating"].ToString();
- PartName = dt10.Rows[0]["ProductName"].ToString();
- //MaxCount = Convert.ToInt32(dt10.Rows[0]["PackCount"].ToString());
- IsSupply = dt10.Rows[0]["IsSupply"].ToString();
- }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(Program.station + "p854" + ex.Message);
+ }
- #endregion
+ #endregion
- if (IsSame == "1")
- {
- for (int k = 0; k < 2; k++)
- {
- if (IsSupply != "1")
- {
- #region 非直供件
+ #region 打印条码，判断是否打印单个条码
+ #region 打印单个标签
try
{
- if (ManufacturerName.Contains("蔚来"))
+ if (IsOne == "1")
{
- #region 修改前，屏蔽
-
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dts.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) +
- // 1).ToString()
- // .PadLeft(4, '0');
- //}
- //else
+ if (IsSupply != "1")
+ {
+ filename = ManufacturerName.Contains("蔚来")
+ ? System.AppDomain.CurrentDomain.BaseDirectory +
+ "wl.grf"
+ : System.AppDomain.CurrentDomain.BaseDirectory +
+ PrintMoudleName("0"); //new
+ }
+ else
+ {
+ filename = System.AppDomain.CurrentDomain.BaseDirectory +
+ PrintMoudleName("1");
+ }
+
+ //DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
+ // dt.Rows[0]["StationID"].ToString());
+ //if (dt4 != null && dt4.Rows.Count > 0)
//{
- // newcode = partNo[j].Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "0001";
+ // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
//}
+ printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
- #endregion
-
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
-
- }
- else
- {
- #region 修改前，屏蔽
+ string reportName = ConfigurationManager.AppSettings[printName]
+ .ToString();
+ DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode);
- //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- //if (dt2 != null && dt2.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4,
- // 4)) + 1)
- // .ToString()
- // .PadLeft(4, '0');
- // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim();
- // NewOneCode =
- // OneCode.Substring(0, OneCode.Length - 4) +
- // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4,
- // 4)) + 1)
- // .ToString().PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." +
- // "0001";
- // NewOneCode =
- // stockNo[j].ToString().Trim() +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "0001";
- //}
+ ReportHelper rp = new ReportHelper(filename, headTable, null,
+ (int)GRPaperOrientation.grpoDefault, 1, reportName);
- #endregion
-
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+ LogSysBLL.AddInfo(
+ GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode,
+ MethodBase.GetCurrentMethod());
+ rp.Report.Print(false);
}
}
catch (Exception ex)
{
- MessageBox.Show(ex.ToString());
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return;
+ throw new Exception(Program.station + "p904" + ex.Message);
}
-
+
+
#endregion
+
+ #endregion
+
+ initBarCode();
}
- else
+ }
+ else
+ {
+ if (IsSupply != "1")
{
- #region 直供件
+ #region 非直供件
try
{
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(23, 3)) +
- // 1).ToString()
- // .PadLeft(3, '0') + "#";
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "#" + QLevel + "#" +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
- //}
+ if (ManufacturerName.Contains("蔚来"))
+ {
- GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
+ try
+ {
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(Program.station + "p932" + ex.Message);
+ }
+ }
+ else
+ {
+ try
+ {
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(Program.station + "p944" + ex.Message);
+ }
+ }
}
catch (Exception ex)
{
- MessageBox.Show(ex.ToString());
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return;
+ throw new Exception(Program.station + "p950" + ex.Message);
}
-
- #endregion
- }
-
- #region 插入数据tb_barCode
-
- md.ID = Guid.NewGuid().ToString();
- md.StationID = dt.Rows[0]["StationID"].ToString();
- md.OneBarCode = NewOneCode;
- md.BarCode = newcode;
- md.StockNo = stockNo[j].ToString().Trim();
- md.PartNo = partNo[j].ToString().Trim();
- md.PrintType = 0;
- md.PlanID = planID;
- md.ProductNature = ProductNature;
- md.Des1 = PartName;
- DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
- if (pdt != null && pdt.Rows.Count > 0)
- {
- if (pdt.Rows[0]["isImport"].ToString() == "1")
- {
- md.Import = "国产料Kingfa";
- }
- else
- {
- md.Import = "";
- }
- }
- ////if (brbll.Add_Info_New(md, Program.tableName) == false)
- //if (SaveBarCode(md, Program.tableName, true, mould) == false)
- //{
- // int a = 0;
- // for (int l = 0; l < 5; l++)
- // {
- // //if (brbll.Add_Info_New(md, Program.tableName))
- // if (SaveBarCode(md, Program.tableName, true, mould) == true)
- // {
- // break;
- // }
-
- // a += 1;
- // Thread.Sleep(200);
- // }
-
- // if (a >= 4)
- // {
- // return;
- // }
- //}
-
- string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould, false, ref errMsg);
- if (saveRst == false)
- {
- //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg);
- //return;
+ #endregion
}
-
- #endregion
-
- #region 打印条码，判断是否打印单个条码
-
- #region 打印单个标签
-
- if (IsOne == "1")
+ else
{
- if (IsSupply != "1")
+ #region 直供件
+
+ try
{
- filename = ManufacturerName.Contains("蔚来")
- ? System.AppDomain.CurrentDomain.BaseDirectory +
- "wl.grf"
- : System.AppDomain.CurrentDomain.BaseDirectory +
- PrintMoudleName("0"); //new
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
}
- else
+ catch (Exception ex)
{
- filename = System.AppDomain.CurrentDomain.BaseDirectory +
- PrintMoudleName("1");
+ throw new Exception(Program.station + "p965" + ex.Message);
}
- //DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString());
- //if (dt4 != null && dt4.Rows.Count > 0)
- //{
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- //}
- printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
-
- string reportName = ConfigurationManager.AppSettings[printName]
- .ToString();
- DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode);
-
- ReportHelper rp = new ReportHelper(filename, headTable, null,
- (int) GRPaperOrientation.grpoDefault, 1, reportName);
-
- LogSysBLL.AddInfo(
- GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode,
- MethodBase.GetCurrentMethod());
- rp.Report.Print(false);
-
+ #endregion
}
- #endregion
-
- #endregion
-
- initBarCode();
- }
- }
- else
- {
- if (IsSupply != "1")
- {
- #region 非直供件
-
+ #region 插入数据tb_barCode
try
{
- if (ManufacturerName.Contains("蔚来"))
+ md.ID = Guid.NewGuid().ToString();
+ md.StationID = dt.Rows[0]["StationID"].ToString();
+ md.OneBarCode = NewOneCode;
+ md.BarCode = newcode;
+ md.StockNo = stockNo[j].ToString().Trim();
+ md.PartNo = partNo[j].ToString().Trim();
+ md.PrintType = 0;
+ md.PlanID = planID;
+ md.ProductNature = ProductNature;
+ md.Des1 = PartName;
+ DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
+ if (pdt != null && pdt.Rows.Count > 0)
{
- #region 修改前，屏蔽
-
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dts.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) +
- // 1).ToString()
- // .PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "0001";
- //}
-
- #endregion
- try
+ if (pdt.Rows[0]["isImport"].ToString() == "1")
{
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
+ md.Import = "国产料Kingfa";
}
- catch (Exception ex)
+ else
{
- throw new Exception("p1197" + ex.Message);
+ md.Import = "";
}
}
- else
- {
- #region 修改前，屏蔽
- //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- //if (dt2 != null && dt2.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) +
- // 1)
- // .ToString()
- // .PadLeft(4, '0');
- // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim();
- // NewOneCode =
- // OneCode.Substring(0, OneCode.Length - 4) +
- // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) +
- // 1)
- // .ToString().PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "0001";
- // NewOneCode =
- // stockNo[j].ToString().Trim() +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "0001";
- //}
-
- #endregion
- try
- {
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
-
- }
- catch(Exception ex)
- {
- throw new Exception("p1235"+ex.Message);
- }
+ string errMsg = string.Empty;
+ bool saveRst = SaveInfo(md, true, mould, false, ref errMsg);
+ if (saveRst == false)
+ {
+ SaveLog3(Program.station + "测试保存错误,异常信息:" + md.OneBarCode + errMsg);
+ //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg);
+ //return;
}
}
catch (Exception ex)
{
- MessageBox.Show(ex.ToString());
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return;
+ throw new Exception(Program.station + "p1009" + ex.Message);
}
-
+
#endregion
- }
- else
- {
- #region 直供件
- try
- {
- //DataTable dts = brbll.SearchInfoByPartNo1(partNo[j].ToString().Trim());
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dts.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(23, 3)) +
- // 1).ToString()
- // .PadLeft(3, '0') + "#";
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "#" + QLevel + "#" +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
- //}
+ #region 打印条码，判断是否打印单个条码
- GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.ToString());
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return;
- }
-
- #endregion
- }
+ #region 打印单个标签
- #region 插入数据tb_barCode
- try
- {
- md.ID = Guid.NewGuid().ToString();
- md.StationID = dt.Rows[0]["StationID"].ToString();
- md.OneBarCode = NewOneCode;
- md.BarCode = newcode;
- md.StockNo = stockNo[j].ToString().Trim();
- md.PartNo = partNo[j].ToString().Trim();
- md.PrintType = 0;
- md.PlanID = planID;
- md.ProductNature = ProductNature;
- md.Des1 = PartName;
- DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
- if (pdt != null && pdt.Rows.Count > 0)
+ if (IsOne == "1")
{
- if (pdt.Rows[0]["isImport"].ToString() == "1")
+ try
{
- md.Import = "国产料Kingfa";
+ if (IsSupply != "1")
+ {
+ filename = ManufacturerName.Contains("蔚来")
+ ? System.AppDomain.CurrentDomain.BaseDirectory +
+ "wl.grf"
+ : System.AppDomain.CurrentDomain.BaseDirectory +
+ PrintMoudleName("0");//new
+ if (partNo[j].Contains("A2146982300") ||
+ partNo[j].Contains("A2146982400"))
+ {
+ filename = AppDomain.CurrentDomain.BaseDirectory +
+ "Sill.grf";
+ }
+ }
+ else
+ {
+ filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("1");
+ }
+ //DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
+ // dt.Rows[0]["StationID"].ToString());
+ //if (dt4 != null && dt4.Rows.Count > 0)
+ //{
+ // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
+ //}
+ printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
+
+ string reportName = ConfigurationManager.AppSettings[printName].ToString();
+ DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+ LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod());
+ rp.Report.Print(false);
}
- else
+ catch (Exception ex)
{
- md.Import = "";
+ throw new Exception(Program.station + "p1056" + ex.Message);
}
+
}
- ////if (brbll.Add_Info_New(md, Program.tableName) == false)
- //if (SaveBarCode(md, Program.tableName, true, mould) == false)
- //{
- // int a = 0;
- // for (int l = 0; l < 5; l++)
- // {
- // //if (brbll.Add_Info_New(md, Program.tableName))
- // if (SaveBarCode(md, Program.tableName, true, mould) == true)
- // {
- // break;
- // }
-
- // a += 1;
- // Thread.Sleep(200);
- // }
-
- // if (a >= 4)
- // {
- // return;
- // }
- //}
-
- SaveLog3(Program.station + "测试保存条码" + md.OneBarCode);
- string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould, false, ref errMsg);
- if (saveRst == false)
- {
- SaveLog3(Program.station + "测试保存错误,异常信息:" + md.OneBarCode + errMsg);
- //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg);
- //return;
- }
- }
- catch (Exception ex)
- {
- throw new Exception("p1348" + ex.Message);
- }
-
- #endregion
-
- #region 打印条码，判断是否打印单个条码
-
- #region 打印单个标签
+ #endregion
- SaveLog3(Program.station + "测试保存 ,IsOne:" + md.OneBarCode +":"+ IsOne);
- if (IsOne == "1")
- {
+ #endregion
- if (IsSupply != "1")
- {
- filename = ManufacturerName.Contains("蔚来")
- ? System.AppDomain.CurrentDomain.BaseDirectory +
- "wl.grf"
- : System.AppDomain.CurrentDomain.BaseDirectory +
- PrintMoudleName("0");//new
- if (partNo[j].Contains("A2146982300") ||
- partNo[j].Contains("A2146982400"))
- {
- filename = AppDomain.CurrentDomain.BaseDirectory +
- "Sill.grf";
- }
- }
- else
- {
- filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("1");
- }
- SaveLog3(Program.station + "测试保存 ,filename:" + md.OneBarCode + ":" + filename);
- //DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString());
- //if (dt4 != null && dt4.Rows.Count > 0)
- //{
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- //}
- printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
-
- string reportName = ConfigurationManager.AppSettings[printName].ToString();
- DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode);
-
- ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
- LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod());
- rp.Report.Print(false);
+ initBarCode();
}
- #endregion
-
- #endregion
-
- initBarCode();
}
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(Program.station + "p1074" + ex.Message);
}
- #endregion
}
-
+
}
#endregion
@@ -1579,24 +1239,6 @@ namespace InjectionPC
{
for (int k = 0; k < 2; k++)
{
- //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- //if (dt2 != null && dt2.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) + 1).ToString()
- // .PadLeft(4, '0');
- // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim();
- // NewOneCode = OneCode.Substring(0, OneCode.Length - 4) + (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) + 1).ToString().PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "." + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "." + "0001";
- // NewOneCode = stockNo[j].ToString().Trim() + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
- //}
-
-
-
GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould.ToString(), PartName, ref NewOneCode, ref newcode);
@@ -1716,121 +1358,12 @@ namespace InjectionPC
#endregion
- //DataTable dt5 = brbll.SearchBoxIsNull(partNo[j].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString(), Program.tableName, ProductNature);
-
- //if (dt5 != null && dt5.Rows.Count > 0)
- //{
- // CurrentCount = Convert.ToInt32(dt5.Rows[0]["SumCount"].ToString());
- //}
-
- //if (CurrentCount >= MaxCount)
- //{
- // #region 判断是否满箱,满箱打印箱单
-
- // DialogResult result = MessageBox.Show("是否打印装箱单？", "提示", MessageBoxButtons.OKCancel,
- // MessageBoxIcon.Information);
- // if (result == DialogResult.OK)
- // {
- // filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf";
- // DataTable headTable = new DataTable();
- // headTable.Columns.Add("BoxNo");
- // headTable.Columns.Add("PartName");
- // headTable.Columns.Add("PartNo");
- // headTable.Columns.Add("BatchNo");
- // headTable.Columns.Add("PackCount");
- // headTable.Columns.Add("QLevel");
- // DataRow row = headTable.NewRow();
-
- // row["BatchNo"] = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2);
-
- // #region 查询当前批次装箱单
-
- // DataTable dt6 = boxbll.SeachInfoByBox(partNo[j].ToString().Trim(), Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2));
- // if (dt6 != null && dt6.Rows.Count > 0)
- // {
- // row["BoxNo"] =
- // dt6.Rows[0]["BoxNo"].ToString().Substring(0,
- // dt6.Rows[0]["BoxNo"].ToString().Length - 6) +
- // (Convert.ToInt32(dt6.Rows[0]["BoxNo"].ToString()
- // .Substring(dt6.Rows[0]["BoxNo"].ToString().Length - 6, 6)) + 1)
- // .ToString().PadLeft(6, '0');
- // }
- // else
- // {
- // row["BoxNo"] =
- // partNo[j].ToString().Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "000001";
- // }
-
- // #endregion
-
- // row["PartNo"] = partNo[j].ToString().Trim();
- // row["PartName"] = PartName;
- // row["PackCount"] = MaxCount.ToString() + " EA";
- // row["QLevel"] = QLevel;
-
- // #region 更新barCode表中BoxNo的绑定关系
-
- // brbll.UpdateBoxNo(Program.tableName, row["BoxNo"].ToString(),
- // partNo[j].ToString().Trim());
-
- // #endregion
-
- // #region 保存箱单记录
-
- // boxmd.ID = Guid.NewGuid().ToString();
- // boxmd.BoxNo = row["BoxNo"].ToString();
- // boxmd.IsFlag = 0;
- // boxmd.BoxCount = MaxCount;
-
- // boxbll.AddInfo(boxmd);
-
- // #endregion
-
- // #region 打印箱单
-
- // printBoxName = "Printer" + (Convert.ToInt32(printName.Substring(7, 1))+2).ToString();
- // string reportName = ConfigurationManager.AppSettings[printBoxName].ToString();
- // headTable.Rows.Add(row);
-
- // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
-
- // rp.Report.Print(false);
-
- // #endregion
- // }
- // else
- // {
-
- // }
-
- // #endregion
- //}
-
#endregion
}
}
else
{
- //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- //if (dt2 != null && dt2.Rows.Count > 0)
- //{
- // code = dt2.Rows[0]["BarCode"].ToString().Trim();
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) + 1).ToString()
- // .PadLeft(4, '0');
- // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim();
- // NewOneCode = OneCode.Substring(0, OneCode.Length - 4) + (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) + 1).ToString().PadLeft(4, '0');
- //}
- //else
- //{
- // newcode = partNo[j].ToString().Trim() + "." + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "." + "0001";
- // NewOneCode = stockNo[j].ToString().Trim() + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
- //}
-
+
GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould.ToString(), PartName, ref NewOneCode, ref newcode);
#region 插入数据tb_barCode
@@ -1858,27 +1391,7 @@ namespace InjectionPC
}
}
- //// if (brbll.Add_Info_New(md, Program.tableName) == false)
- //if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
- //{
- // int a = 0;
- // for (int l = 0; l < 5; l++)
- // {
- // //if (brbll.Add_Info_New(md, Program.tableName))
- // if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == true)
- // {
- // break;
- // }
-
- // a += 1;
- // Thread.Sleep(200);
- // }
-
- // if (a >= 4)
- // {
- // return;
- // }
- //}
+
string errMsg = string.Empty;
bool saveRst = SaveInfo(md, true, same[j].ToString(), false, ref errMsg);
if (saveRst == false)
@@ -1921,23 +1434,6 @@ namespace InjectionPC
#region 打印条码，判断是否打印单个条码
- //DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- //if (dt3 != null && dt3.Rows.Count > 0)
- //{
- // QLevel = dt3.Rows[0]["QLevel"].ToString();
- // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
- // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
- // IsPaint = dt3.Rows[0]["IsPlating"].ToString();
- // PartName = dt3.Rows[0]["ProductName"].ToString();
- // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
- //}
-
- //DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString());
- //if (dt4 != null && dt4.Rows.Count > 0)
- //{
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- //}
printName = "Printer" + _printNameDict[partNo[j].ToString().Trim() + dt.Rows[0]["StationID"].ToString()];
#region 打印单个标签
@@ -1956,100 +1452,6 @@ namespace InjectionPC
#endregion
- //DataTable dt5 = brbll.SearchBoxIsNull(partNo[j].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString(), Program.tableName, ProductNature);
-
- //if (dt5 != null && dt5.Rows.Count > 0)
- //{
- // CurrentCount = Convert.ToInt32(dt5.Rows[0]["SumCount"].ToString());
- //}
-
- //if (CurrentCount >= MaxCount)
- //{
- // #region 判断是否满箱,满箱打印箱单
-
- // DialogResult result = MessageBox.Show("是否打印装箱单？", "提示", MessageBoxButtons.OKCancel,
- // MessageBoxIcon.Information);
- // if (result == DialogResult.OK)
- // {
- // filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf";
- // DataTable headTable = new DataTable();
- // headTable.Columns.Add("BoxNo");
- // headTable.Columns.Add("PartName");
- // headTable.Columns.Add("PartNo");
- // headTable.Columns.Add("BatchNo");
- // headTable.Columns.Add("PackCount");
- // headTable.Columns.Add("QLevel");
- // DataRow row = headTable.NewRow();
-
- // row["BatchNo"] = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2);
-
- // #region 查询当前批次装箱单
-
- // DataTable dt6 = boxbll.SeachInfoByBox(partNo[j].ToString().Trim(), Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2));
- // if (dt6 != null && dt6.Rows.Count > 0)
- // {
- // row["BoxNo"] =
- // dt6.Rows[0]["BoxNo"].ToString().Substring(0,
- // dt6.Rows[0]["BoxNo"].ToString().Length - 6) +
- // (Convert.ToInt32(dt6.Rows[0]["BoxNo"].ToString()
- // .Substring(dt6.Rows[0]["BoxNo"].ToString().Length - 6, 6)) + 1)
- // .ToString().PadLeft(6, '0');
- // }
- // else
- // {
- // row["BoxNo"] =
- // partNo[j].ToString().Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "000001";
- // }
-
- // #endregion
-
- // row["PartNo"] = partNo[j].ToString().Trim();
- // row["PartName"] = PartName;
- // row["PackCount"] = MaxCount.ToString() + " EA";
- // row["QLevel"] = QLevel;
-
- // #region 更新barCode表中BoxNo的绑定关系
-
- // brbll.UpdateBoxNo(Program.tableName, row["BoxNo"].ToString(),
- // partNo[j].ToString().Trim());
-
- // #endregion
-
- // #region 保存箱单记录
-
- // boxmd.ID = Guid.NewGuid().ToString();
- // boxmd.BoxNo = row["BoxNo"].ToString();
- // boxmd.IsFlag = 0;
- // boxmd.BoxCount = MaxCount;
-
- // boxbll.AddInfo(boxmd);
-
- // #endregion
-
- // #region 打印箱单
-
- // printBoxName = "Printer" + (Convert.ToInt32(printName.Substring(7, 1)) + 2).ToString();
- // string reportName = ConfigurationManager.AppSettings[printBoxName].ToString();
- // headTable.Rows.Add(row);
-
- // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
-
- // rp.Report.Print(false);
-
- // #endregion
- // }
- // else
- // {
-
- // }
-
- // #endregion
- //}
-
#endregion
}
@@ -2203,9 +1605,8 @@ namespace InjectionPC
}
catch (Exception ex)
{
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
-
- }
+ LogErrBLL.AddInfo(Program.station + "p1608" + ex.ToString(), MethodBase.GetCurrentMethod());
+ }
}
@@ -2551,192 +1952,6 @@ namespace InjectionPC
}
- #region 原来的 已注释
- //DataTable dt = bll.SearchSerialNoByBarCodeNew(partNo + "." + textBox1.Text.Trim(), Program.tableName);
- //if (dt != null && dt.Rows.Count > 0)
- //{
- // OneCode = dt.Rows[0]["OneBarCode"].ToString().Trim();
- // code = dt.Rows[0]["BarCode"].ToString().TrimEnd();
- // for (int i = 1; i <= Convert.ToInt32(textBox2.Text.Trim()); i++)
- // {
- // //newcode = code.Substring(0, code.Length - 4) +
- // // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) + i)
- // // .ToString()
- // // .PadLeft(4, '0');
- // ////86611-BU500.240826.0003
- // //if (OneCode != "")
- // //{
- // // NewOneCode = OneCode.Substring(0, OneCode.Length - 4) +
- // // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) + i)
- // // .ToString()
- // // .PadLeft(4, '0');
- // //}
- // //60000001942408260003
- // GetSjBarCode(stockNo, partNo, ref NewOneCode, ref newcode);
- // string[] part = newcode.Split('.');
-
- // #region 插入数据tb_barCode
-
- // md.ID = Guid.NewGuid().ToString();
- // md.StationID = stationID;
- // md.OneBarCode = NewOneCode;
- // md.BarCode = newcode;
- // md.StockNo = stockNo;
- // md.PartNo = partNo;
- // md.PrintType = 1;
- // md.PlanID = planID;
-
- // md.ProductNature = "正常件"; //第一次没有这个
-
- // DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
- // if (dt2 != null && dt2.Rows.Count > 0)
- // {
- // if (dt2.Rows[0]["isImport"].ToString() == "1")
- // {
- // md.Import = "国产料Kingfa";
- // }
- // else
- // {
- // md.Import = "";
- // }
- // }
-
- // if (bll.Add_Info_New(md, Program.tableName) == false)
- // {
- // return;
- // }
-
- // #endregion
-
- // #region 打印单个标签
-
- // if (IsOne == "1")
- // {
- // //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
- // filename = ManufacturerName.Contains("蔚来")
- // ? System.AppDomain.CurrentDomain.BaseDirectory +
- // "wl.grf"
- // : System.AppDomain.CurrentDomain.BaseDirectory +
- // "单个条码.grf";
- // if (partNo.Contains("A2146982300") ||
- // partNo.Contains("A2146982400"))
- // {
- // filename = AppDomain.CurrentDomain.BaseDirectory +
- // "Sill.grf";
- // }
- // DataTable headTable = new DataTable();
- // headTable.Columns.Add("PrintTime");
- // headTable.Columns.Add("PartNo");
- // headTable.Columns.Add("PartName");
- // headTable.Columns.Add("OneBarCode");
- // headTable.Columns.Add("BarCode");
- // DataRow row = headTable.NewRow();
- // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
- // row["PartNo"] = partNo;
- // row["PartName"] = PartName;
- // row["OneBarCode"] = NewOneCode;
- // row["BarCode"] = newcode;
-
- // DataTable dt4 = plbll.SearchInfo(partNo, stationID);
- // if (dt4 != null && dt4.Rows.Count > 0)
- // {
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- // }
-
- // string reportName = ConfigurationManager.AppSettings[printName].ToString();
- // headTable.Rows.Add(row);
-
- // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
- // LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod());
- // rp.Report.Print(false);
- // }
-
- // #endregion
- // }
- //}
- //else
- //{
- // for (int i = 1; i <= Convert.ToInt32(textBox2.Text.Trim()); i++)
- // {
- // //newcode = partNo + "." + textBox1.Text.Trim() + "." + i.ToString().PadLeft(4, '0');
- // //NewOneCode = stockNo + textBox1.Text.Trim() + i.ToString().PadLeft(4, '0');
-
- // GetSjBarCode(stockNo, partNo,false, ref NewOneCode, ref newcode);
- // string[] part = newcode.Split('.');
-
- // #region 插入数据tb_barCode
-
- // md.ID = Guid.NewGuid().ToString();
- // md.StationID = stationID;
- // md.OneBarCode = NewOneCode;
- // md.BarCode = newcode;
- // md.StockNo = stockNo;
- // md.PartNo = partNo;
- // md.PrintType = 1;
- // md.PlanID = planID;
-
- // DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
- // if (dt2 != null && dt2.Rows.Count > 0)
- // {
- // if (dt2.Rows[0]["isImport"].ToString() == "1")
- // {
- // md.Import = "国产料Kingfa";
- // }
- // else
- // {
- // md.Import = "";
- // }
- // }
-
- // if (bll.Add_Info_New(md, Program.tableName) == false)
- // {
- // return;
- // }
-
- // #endregion
-
- // #region 打印单个标签
-
- // if (IsOne == "1")
- // {
- // //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
- // filename = ManufacturerName.Contains("蔚来")
- // ? System.AppDomain.CurrentDomain.BaseDirectory +
- // "wl.grf"
- // : System.AppDomain.CurrentDomain.BaseDirectory +
- // "单个条码.grf";
- // DataTable headTable = new DataTable();
- // headTable.Columns.Add("PrintTime");
- // headTable.Columns.Add("PartNo");
- // headTable.Columns.Add("PartName");
- // headTable.Columns.Add("OneBarCode");
- // headTable.Columns.Add("BarCode");
- // DataRow row = headTable.NewRow();
- // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
- // row["PartNo"] = partNo;
- // row["PartName"] = PartName;
- // row["OneBarCode"] = NewOneCode;
- // row["BarCode"] = newcode;
-
- // DataTable dt4 = plbll.SearchInfo(partNo, stationID);
- // if (dt4 != null && dt4.Rows.Count > 0)
- // {
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- // }
-
- // string reportName = ConfigurationManager.AppSettings[printName].ToString();
- // headTable.Rows.Add(row);
-
- // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
- // LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod());
- // rp.Report.Print(false);
- // }
-
- // #endregion
- // }
- //}
- #endregion
-
#endregion
}
else
@@ -2815,160 +2030,6 @@ namespace InjectionPC
#endregion
}
-
-
- //DataTable dts = bll.SearchInfoByPartNo1(partNo);
- //if (dts != null && dts.Rows.Count > 0)
- //{
- // code = dts.Rows[0]["BarCode"].ToString().Trim();
- // for (int i = 1; i <= Convert.ToInt32(textBox2.Text.Trim()); i++ )
- // {
- // newcode = code.Substring(0, code.Length - 4) +
- // (Convert.ToInt32(code.Substring(23, 3)) +
- // i).ToString()
- // .PadLeft(3, '0') + "#";
- // 需要用GetSupplyCode新生成
-
- // #region 插入数据tb_barCode
-
- // md.ID = Guid.NewGuid().ToString();
- // md.StationID = stationID;
- // md.OneBarCode = NewOneCode;
- // md.BarCode = newcode;
- // md.StockNo = stockNo;
- // md.PartNo = partNo;
- // md.PrintType = 1;
- // md.PlanID = planID;
-
- // DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
- // if (dt2 != null && dt2.Rows.Count > 0)
- // {
- // if (dt2.Rows[0]["isImport"].ToString() == "1")
- // {
- // md.Import = "国产料Kingfa";
- // }
- // else
- // {
- // md.Import = "";
- // }
- // }
-
- // if (bll.Add_Info_New(md, Program.tableName) == false)
- // {
- // return;
- // }
-
- // #endregion
-
- // #region 打印单个标签
-
- // if (IsOne == "1")
- // {
- // filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf";
- // DataTable headTable = new DataTable();
- // headTable.Columns.Add("PrintTime");
- // headTable.Columns.Add("PartNo");
- // headTable.Columns.Add("PartName");
- // headTable.Columns.Add("OneBarCode");
- // headTable.Columns.Add("BarCode");
- // DataRow row = headTable.NewRow();
- // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
- // row["PartNo"] = partNo;
- // row["PartName"] = PartName;
- // row["OneBarCode"] = NewOneCode;
- // row["BarCode"] = newcode;
-
- // DataTable dt4 = plbll.SearchInfo(partNo, stationID);
- // if (dt4 != null && dt4.Rows.Count > 0)
- // {
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- // }
-
- // string reportName = ConfigurationManager.AppSettings[printName].ToString();
- // headTable.Rows.Add(row);
-
- // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
- // LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod());
- // rp.Report.Print(false);
- // }
-
- // #endregion
- // }
- //}
- //else
- //{
- // for (int i = 1; i <= Convert.ToInt32(textBox2.Text.Trim()); i++)
- // {
- // newcode = partNo + "#" + QLevel + "#" +
- // textBox1.Text.Trim() + "#" + i.ToString().PadLeft(3, '0') + "#";
- // 需要用GetSupplyCode新写
- // #region 插入数据tb_barCode
-
- // md.ID = Guid.NewGuid().ToString();
- // md.StationID = stationID;
- // md.OneBarCode = NewOneCode;
- // md.BarCode = newcode;
- // md.StockNo = stockNo;
- // md.PartNo = partNo;
- // md.PrintType = 1;
- // md.PlanID = planID;
-
- // DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
- // if (dt2 != null && dt2.Rows.Count > 0)
- // {
- // if (dt2.Rows[0]["isImport"].ToString() == "1")
- // {
- // md.Import = "国产料Kingfa";
- // }
- // else
- // {
- // md.Import = "";
- // }
- // }
-
- // if (bll.Add_Info_New(md, Program.tableName) == false)
- // {
- // return;
- // }
-
- // #endregion
-
- // #region 打印单个标签
-
- // if (IsOne == "1")
- // {
- // filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf";
- // DataTable headTable = new DataTable();
- // headTable.Columns.Add("PrintTime");
- // headTable.Columns.Add("PartNo");
- // headTable.Columns.Add("PartName");
- // headTable.Columns.Add("OneBarCode");
- // headTable.Columns.Add("BarCode");
- // DataRow row = headTable.NewRow();
- // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
- // row["PartNo"] = partNo;
- // row["PartName"] = PartName;
- // row["OneBarCode"] = NewOneCode;
- // row["BarCode"] = newcode;
-
- // DataTable dt4 = plbll.SearchInfo(partNo, stationID);
- // if (dt4 != null && dt4.Rows.Count > 0)
- // {
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- // }
-
- // string reportName = ConfigurationManager.AppSettings[printName].ToString();
- // headTable.Rows.Add(row);
-
- // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
- // LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod());
- // rp.Report.Print(false);
- // }
-
- // #endregion
- // }
- //}
-
#endregion
}
@@ -4355,25 +3416,29 @@ namespace InjectionPC
///
private void label7_MouseDoubleClick(object sender, MouseEventArgs e)
{
- timer3.Enabled = false;
- //调用测试
- Array a = null;
- Array b = null;
- Array c = null;
- Array d = null;
- status = true;
- IsTest = true;
- bool bbb = true;
- //label23_Click(null, null);
- textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
- Program.ProductDate.Substring(8, 2);
- if (bbb == true)
- { //自动
- opcGroup1_DataChange(1, 1, ref a, ref b, ref c, ref d);
- }
- else
- { //手动
- label23_Click(null, null);
+ string cs = ConfigurationManager.AppSettings["测试"];
+ if (!string.IsNullOrEmpty(cs) && cs == "true")
+ {
+ timer3.Enabled = false;
+ //调用测试
+ Array a = null;
+ Array b = null;
+ Array c = null;
+ Array d = null;
+ status = true;
+ IsTest = true;
+ bool bbb = true;
+ //label23_Click(null, null);
+ textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
+ Program.ProductDate.Substring(8, 2);
+ if (bbb == true)
+ { //自动
+ opcGroup1_DataChange(1, 1, ref a, ref b, ref c, ref d);
+ }
+ else
+ { //手动
+ label23_Click(null, null);
+ }
}
}
bool IsTest = false;