diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index ced45c4..48f9d87 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn5 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn6 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn7 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn8 = new GlacialComponents.Controls.GLColumn(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2408)); this.panel1 = new System.Windows.Forms.Panel(); this.panel7 = new System.Windows.Forms.Panel(); @@ -145,6 +145,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.panel6 = new System.Windows.Forms.Panel(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); this.btnOnlyBarCode = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.panel5 = new System.Windows.Forms.Panel(); @@ -157,6 +158,7 @@ this.serialPort1 = new System.IO.Ports.SerialPort(this.components); this.timer2 = new System.Windows.Forms.Timer(this.components); this.timer3 = new System.Windows.Forms.Timer(this.components); + this.lbVer = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel7.SuspendLayout(); this.panel23.SuspendLayout(); @@ -221,9 +223,9 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(5); + this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2908, 1829); + this.panel1.Size = new System.Drawing.Size(2666, 1600); this.panel1.TabIndex = 0; // // panel7 @@ -232,10 +234,10 @@ this.panel7.Controls.Add(this.panel8); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.panel7.Location = new System.Drawing.Point(0, 168); - this.panel7.Margin = new System.Windows.Forms.Padding(5); + this.panel7.Location = new System.Drawing.Point(0, 147); + this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2908, 1661); + this.panel7.Size = new System.Drawing.Size(2666, 1453); this.panel7.TabIndex = 1; // // panel23 @@ -243,10 +245,10 @@ this.panel23.Controls.Add(this.panel27); this.panel23.Controls.Add(this.panel24); this.panel23.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel23.Location = new System.Drawing.Point(0, 104); - this.panel23.Margin = new System.Windows.Forms.Padding(5); + this.panel23.Location = new System.Drawing.Point(0, 91); + this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(2908, 1557); + this.panel23.Size = new System.Drawing.Size(2666, 1362); this.panel23.TabIndex = 1; // // panel27 @@ -254,10 +256,10 @@ this.panel27.Controls.Add(this.panel29); this.panel27.Controls.Add(this.panel28); this.panel27.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel27.Location = new System.Drawing.Point(0, 1115); - this.panel27.Margin = new System.Windows.Forms.Padding(5); + this.panel27.Location = new System.Drawing.Point(0, 976); + this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(2908, 442); + this.panel27.Size = new System.Drawing.Size(2666, 386); this.panel27.TabIndex = 1; // // panel29 @@ -265,10 +267,10 @@ this.panel29.Controls.Add(this.panel31); this.panel29.Controls.Add(this.panel30); this.panel29.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel29.Location = new System.Drawing.Point(339, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(5); + this.panel29.Location = new System.Drawing.Point(311, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(2569, 442); + this.panel29.Size = new System.Drawing.Size(2355, 386); this.panel29.TabIndex = 1; // // panel31 @@ -276,10 +278,10 @@ this.panel31.Controls.Add(this.panel33); this.panel31.Controls.Add(this.panel32); this.panel31.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel31.Location = new System.Drawing.Point(133, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(5); + this.panel31.Location = new System.Drawing.Point(122, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(2436, 442); + this.panel31.Size = new System.Drawing.Size(2233, 386); this.panel31.TabIndex = 1; // // panel33 @@ -287,10 +289,10 @@ this.panel33.Controls.Add(this.panel35); this.panel33.Controls.Add(this.panel34); this.panel33.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel33.Location = new System.Drawing.Point(133, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(5); + this.panel33.Location = new System.Drawing.Point(122, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(2303, 442); + this.panel33.Size = new System.Drawing.Size(2111, 386); this.panel33.TabIndex = 1; // // panel35 @@ -298,9 +300,9 @@ this.panel35.Controls.Add(this.panel37); this.panel35.Dock = System.Windows.Forms.DockStyle.Fill; this.panel35.Location = new System.Drawing.Point(0, 0); - this.panel35.Margin = new System.Windows.Forms.Padding(5); + this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel35.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(2170, 442); + this.panel35.Size = new System.Drawing.Size(1989, 386); this.panel35.TabIndex = 1; // // panel37 @@ -308,9 +310,9 @@ this.panel37.Controls.Add(this.panel40); this.panel37.Dock = System.Windows.Forms.DockStyle.Fill; this.panel37.Location = new System.Drawing.Point(0, 0); - this.panel37.Margin = new System.Windows.Forms.Padding(5); + this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel37.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(2170, 442); + this.panel37.Size = new System.Drawing.Size(1989, 386); this.panel37.TabIndex = 1; // // panel40 @@ -319,9 +321,9 @@ this.panel40.Controls.Add(this.panel41); this.panel40.Dock = System.Windows.Forms.DockStyle.Fill; this.panel40.Location = new System.Drawing.Point(0, 0); - this.panel40.Margin = new System.Windows.Forms.Padding(5); + this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel40.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(2170, 442); + this.panel40.Size = new System.Drawing.Size(1989, 386); this.panel40.TabIndex = 1; // // panel42 @@ -330,9 +332,9 @@ this.panel42.Controls.Add(this.panel43); this.panel42.Dock = System.Windows.Forms.DockStyle.Fill; this.panel42.Location = new System.Drawing.Point(0, 0); - this.panel42.Margin = new System.Windows.Forms.Padding(5); + this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel42.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(2037, 442); + this.panel42.Size = new System.Drawing.Size(1867, 386); this.panel42.TabIndex = 1; // // panel39 @@ -352,19 +354,19 @@ this.panel39.Controls.Add(this.label21); this.panel39.Dock = System.Windows.Forms.DockStyle.Fill; this.panel39.Location = new System.Drawing.Point(0, 0); - this.panel39.Margin = new System.Windows.Forms.Padding(5); + this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel39.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(1904, 442); + this.panel39.Size = new System.Drawing.Size(1745, 386); this.panel39.TabIndex = 1; // // lbDevState // this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbDevState.Location = new System.Drawing.Point(932, 273); + this.lbDevState.Location = new System.Drawing.Point(854, 239); this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbDevState.Name = "lbDevState"; - this.lbDevState.Size = new System.Drawing.Size(378, 66); + this.lbDevState.Size = new System.Drawing.Size(347, 58); this.lbDevState.TabIndex = 15; this.lbDevState.Text = "设备已连接"; this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -374,10 +376,10 @@ // this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbAddPrintR.Location = new System.Drawing.Point(580, 341); + this.lbAddPrintR.Location = new System.Drawing.Point(532, 298); this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbAddPrintR.Name = "lbAddPrintR"; - this.lbAddPrintR.Size = new System.Drawing.Size(342, 66); + this.lbAddPrintR.Size = new System.Drawing.Size(314, 58); this.lbAddPrintR.TabIndex = 3; this.lbAddPrintR.Text = "右条码添打"; this.lbAddPrintR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -387,10 +389,10 @@ // this.lbAddPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbAddPrintL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbAddPrintL.Location = new System.Drawing.Point(580, 273); + this.lbAddPrintL.Location = new System.Drawing.Point(532, 239); this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbAddPrintL.Name = "lbAddPrintL"; - this.lbAddPrintL.Size = new System.Drawing.Size(342, 66); + this.lbAddPrintL.Size = new System.Drawing.Size(314, 58); this.lbAddPrintL.TabIndex = 2; this.lbAddPrintL.Text = "左条码添打"; this.lbAddPrintL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -402,10 +404,10 @@ this.cboxHandBox.Checked = true; this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked; this.cboxHandBox.Enabled = false; - this.cboxHandBox.Location = new System.Drawing.Point(1008, 197); - this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cboxHandBox.Location = new System.Drawing.Point(924, 172); + this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4); this.cboxHandBox.Name = "cboxHandBox"; - this.cboxHandBox.Size = new System.Drawing.Size(293, 62); + this.cboxHandBox.Size = new System.Drawing.Size(256, 55); this.cboxHandBox.TabIndex = 14; this.cboxHandBox.Tag = "true"; this.cboxHandBox.Text = "打印箱码"; @@ -415,20 +417,20 @@ // textBox2 // this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(240, 333); - this.textBox2.Margin = new System.Windows.Forms.Padding(5); + this.textBox2.Location = new System.Drawing.Point(220, 291); + this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(329, 74); + this.textBox2.Size = new System.Drawing.Size(302, 65); this.textBox2.TabIndex = 13; // // label18 // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(44, 347); + this.label18.Location = new System.Drawing.Point(40, 304); this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(202, 58); + this.label18.Size = new System.Drawing.Size(178, 51); this.label18.TabIndex = 12; this.label18.Text = "数量："; // @@ -436,10 +438,10 @@ // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(661, 203); + this.label19.Location = new System.Drawing.Point(606, 178); this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(265, 58); + this.label19.Size = new System.Drawing.Size(238, 51); this.label19.TabIndex = 11; this.label19.Text = "(yyMMdd)"; // @@ -447,20 +449,20 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(243, 197); - this.textBox1.Margin = new System.Windows.Forms.Padding(5); + this.textBox1.Location = new System.Drawing.Point(223, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(328, 74); + this.textBox1.Size = new System.Drawing.Size(301, 65); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(45, 213); + this.label20.Location = new System.Drawing.Point(41, 186); this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(202, 58); + this.label20.Size = new System.Drawing.Size(178, 51); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -470,10 +472,10 @@ this.comboBox2.Enabled = false; this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(243, 72); - this.comboBox2.Margin = new System.Windows.Forms.Padding(5); + this.comboBox2.Location = new System.Drawing.Point(223, 63); + this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(928, 56); + this.comboBox2.Size = new System.Drawing.Size(851, 50); this.comboBox2.TabIndex = 8; this.comboBox2.SelectedValueChanged += new System.EventHandler(this.comboBox2_SelectedValueChanged); this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); @@ -482,10 +484,10 @@ // this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(45, 80); + this.label21.Location = new System.Drawing.Point(41, 70); this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(202, 58); + this.label21.Size = new System.Drawing.Size(178, 51); this.label21.TabIndex = 7; this.label21.Text = "产品："; // @@ -493,10 +495,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(1904, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(5); + this.panel43.Location = new System.Drawing.Point(1745, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(133, 442); + this.panel43.Size = new System.Drawing.Size(122, 386); this.panel43.TabIndex = 0; // // label23 @@ -507,7 +509,7 @@ this.label23.Location = new System.Drawing.Point(0, 0); this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(133, 442); + this.label23.Size = new System.Drawing.Size(122, 386); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -517,10 +519,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(2037, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(5); + this.panel41.Location = new System.Drawing.Point(1867, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(133, 442); + this.panel41.Size = new System.Drawing.Size(122, 386); this.panel41.TabIndex = 0; // // label22 @@ -531,7 +533,7 @@ this.label22.Location = new System.Drawing.Point(0, 0); this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(133, 442); + this.label22.Size = new System.Drawing.Size(122, 386); this.label22.TabIndex = 1; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -541,10 +543,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(2170, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(5); + this.panel34.Location = new System.Drawing.Point(1989, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(133, 442); + this.panel34.Size = new System.Drawing.Size(122, 386); this.panel34.TabIndex = 0; // // label15 @@ -555,7 +557,7 @@ this.label15.Location = new System.Drawing.Point(0, 0); this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(133, 442); + this.label15.Size = new System.Drawing.Size(122, 386); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -566,9 +568,9 @@ this.panel32.Controls.Add(this.label14); this.panel32.Dock = System.Windows.Forms.DockStyle.Left; this.panel32.Location = new System.Drawing.Point(0, 0); - this.panel32.Margin = new System.Windows.Forms.Padding(5); + this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel32.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(133, 442); + this.panel32.Size = new System.Drawing.Size(122, 386); this.panel32.TabIndex = 0; // // label14 @@ -579,7 +581,7 @@ this.label14.Location = new System.Drawing.Point(0, 0); this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(133, 442); + this.label14.Size = new System.Drawing.Size(122, 386); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -590,9 +592,9 @@ this.panel30.Controls.Add(this.label13); this.panel30.Dock = System.Windows.Forms.DockStyle.Left; this.panel30.Location = new System.Drawing.Point(0, 0); - this.panel30.Margin = new System.Windows.Forms.Padding(5); + this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel30.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(133, 442); + this.panel30.Size = new System.Drawing.Size(122, 386); this.panel30.TabIndex = 0; // // label13 @@ -603,7 +605,7 @@ this.label13.Location = new System.Drawing.Point(0, 0); this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(133, 442); + this.label13.Size = new System.Drawing.Size(122, 386); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -614,9 +616,9 @@ this.panel28.Controls.Add(this.label12); this.panel28.Dock = System.Windows.Forms.DockStyle.Left; this.panel28.Location = new System.Drawing.Point(0, 0); - this.panel28.Margin = new System.Windows.Forms.Padding(5); + this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel28.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(339, 442); + this.panel28.Size = new System.Drawing.Size(311, 386); this.panel28.TabIndex = 0; // // label12 @@ -628,7 +630,7 @@ this.label12.Location = new System.Drawing.Point(0, 0); this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(339, 442); + this.label12.Size = new System.Drawing.Size(311, 386); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -639,9 +641,9 @@ this.panel24.Controls.Add(this.panel25); this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); - this.panel24.Margin = new System.Windows.Forms.Padding(5); + this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(2908, 1115); + this.panel24.Size = new System.Drawing.Size(2666, 976); this.panel24.TabIndex = 0; // // panel26 @@ -650,10 +652,10 @@ this.panel26.Controls.Add(this.panel44); this.panel26.Controls.Add(this.glacialList1); this.panel26.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel26.Location = new System.Drawing.Point(415, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5); + this.panel26.Location = new System.Drawing.Point(380, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2493, 1115); + this.panel26.Size = new System.Drawing.Size(2286, 976); this.panel26.TabIndex = 1; // // panel45 @@ -663,19 +665,19 @@ this.panel45.Controls.Add(this.button4); this.panel45.Controls.Add(this.textBox4); this.panel45.Controls.Add(this.label25); - this.panel45.Location = new System.Drawing.Point(323, 677); - this.panel45.Margin = new System.Windows.Forms.Padding(5); + this.panel45.Location = new System.Drawing.Point(296, 592); + this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1397, 151); + this.panel45.Size = new System.Drawing.Size(1281, 132); this.panel45.TabIndex = 2; // // button3 // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1232, 43); - this.button3.Margin = new System.Windows.Forms.Padding(5); + this.button3.Location = new System.Drawing.Point(1129, 38); + this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(160, 59); + this.button3.Size = new System.Drawing.Size(147, 52); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -684,10 +686,10 @@ // button4 // this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1037, 43); - this.button4.Margin = new System.Windows.Forms.Padding(5); + this.button4.Location = new System.Drawing.Point(951, 38); + this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(160, 59); + this.button4.Size = new System.Drawing.Size(147, 52); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -696,20 +698,20 @@ // textBox4 // this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox4.Location = new System.Drawing.Point(336, 45); - this.textBox4.Margin = new System.Windows.Forms.Padding(5); + this.textBox4.Location = new System.Drawing.Point(308, 39); + this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(660, 55); + this.textBox4.Size = new System.Drawing.Size(605, 49); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(28, 53); + this.label25.Location = new System.Drawing.Point(26, 46); this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(319, 42); + this.label25.Size = new System.Drawing.Size(283, 37); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -721,19 +723,19 @@ this.panel44.Controls.Add(this.button1); this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); - this.panel44.Location = new System.Drawing.Point(360, 363); - this.panel44.Margin = new System.Windows.Forms.Padding(5); + this.panel44.Location = new System.Drawing.Point(330, 318); + this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1397, 151); + this.panel44.Size = new System.Drawing.Size(1281, 132); this.panel44.TabIndex = 1; // // button2 // this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1197, 43); - this.button2.Margin = new System.Windows.Forms.Padding(5); + this.button2.Location = new System.Drawing.Point(1097, 38); + this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(160, 59); + this.button2.Size = new System.Drawing.Size(147, 52); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -742,10 +744,10 @@ // button1 // this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(1027, 40); - this.button1.Margin = new System.Windows.Forms.Padding(5); + this.button1.Location = new System.Drawing.Point(941, 35); + this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(160, 59); + this.button1.Size = new System.Drawing.Size(147, 52); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -754,20 +756,20 @@ // textBox3 // this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(208, 43); - this.textBox3.Margin = new System.Windows.Forms.Padding(5); + this.textBox3.Location = new System.Drawing.Point(191, 38); + this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(737, 55); + this.textBox3.Size = new System.Drawing.Size(676, 49); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(27, 53); + this.label24.Location = new System.Drawing.Point(25, 46); this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(190, 42); + this.label24.Size = new System.Drawing.Size(169, 37); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -781,43 +783,43 @@ this.glacialList1.AutoHeight = true; this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight; this.glacialList1.BackgroundStretchToFit = true; - glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn1.CheckBoxes = false; - glColumn1.ImageIndex = -1; - glColumn1.Name = "条码"; - glColumn1.NumericSort = false; - glColumn1.Text = "条码"; - glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn1.Width = 350; - glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn2.CheckBoxes = false; - glColumn2.ImageIndex = -1; - glColumn2.Name = "产品名称"; - glColumn2.NumericSort = false; - glColumn2.Text = "产品名称"; - glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn2.Width = 320; - glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn3.CheckBoxes = false; - glColumn3.ImageIndex = -1; - glColumn3.Name = "打印方式"; - glColumn3.NumericSort = false; - glColumn3.Text = "打印方式"; - glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn3.Width = 150; - glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn4.CheckBoxes = false; - glColumn4.ImageIndex = -1; - glColumn4.Name = "打印时间"; - glColumn4.NumericSort = false; - glColumn4.Text = "打印时间"; - glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn4.Width = 270; + glColumn5.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn5.CheckBoxes = false; + glColumn5.ImageIndex = -1; + glColumn5.Name = "条码"; + glColumn5.NumericSort = false; + glColumn5.Text = "条码"; + glColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn5.Width = 350; + glColumn6.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn6.CheckBoxes = false; + glColumn6.ImageIndex = -1; + glColumn6.Name = "产品名称"; + glColumn6.NumericSort = false; + glColumn6.Text = "产品名称"; + glColumn6.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn6.Width = 320; + glColumn7.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn7.CheckBoxes = false; + glColumn7.ImageIndex = -1; + glColumn7.Name = "打印方式"; + glColumn7.NumericSort = false; + glColumn7.Text = "打印方式"; + glColumn7.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn7.Width = 150; + glColumn8.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn8.CheckBoxes = false; + glColumn8.ImageIndex = -1; + glColumn8.Name = "打印时间"; + glColumn8.NumericSort = false; + glColumn8.Text = "打印时间"; + glColumn8.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn8.Width = 270; this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] { - glColumn1, - glColumn2, - glColumn3, - glColumn4}); + glColumn5, + glColumn6, + glColumn7, + glColumn8}); this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal; this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill; this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F); @@ -835,17 +837,17 @@ this.glacialList1.HoverEvents = false; this.glacialList1.HoverTime = 1; this.glacialList1.ImageList = null; - this.glacialList1.ItemHeight = 57; + this.glacialList1.ItemHeight = 50; this.glacialList1.ItemWordWrap = false; this.glacialList1.Location = new System.Drawing.Point(0, 0); - this.glacialList1.Margin = new System.Windows.Forms.Padding(5); + this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2493, 1115); + this.glacialList1.Size = new System.Drawing.Size(2286, 976); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -858,9 +860,9 @@ this.panel25.Controls.Add(this.panel36); this.panel25.Dock = System.Windows.Forms.DockStyle.Left; this.panel25.Location = new System.Drawing.Point(0, 0); - this.panel25.Margin = new System.Windows.Forms.Padding(5); + this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(415, 1115); + this.panel25.Size = new System.Drawing.Size(380, 976); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -870,13 +872,13 @@ this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0); this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 299F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); + this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -888,19 +890,19 @@ this.panel38.Controls.Add(this.label26); this.panel38.Controls.Add(this.label17); this.panel38.Controls.Add(this.label16); - this.panel38.Location = new System.Drawing.Point(5, 5); - this.panel38.Margin = new System.Windows.Forms.Padding(5); + this.panel38.Location = new System.Drawing.Point(5, 4); + this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(404, 288); + this.panel38.Size = new System.Drawing.Size(370, 252); this.panel38.TabIndex = 1; // // btn_lastBoxPrintR // this.btn_lastBoxPrintR.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintR.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintR.Location = new System.Drawing.Point(278, 147); + this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 129); this.btn_lastBoxPrintR.Name = "btn_lastBoxPrintR"; - this.btn_lastBoxPrintR.Size = new System.Drawing.Size(127, 141); + this.btn_lastBoxPrintR.Size = new System.Drawing.Size(116, 123); this.btn_lastBoxPrintR.TabIndex = 4; this.btn_lastBoxPrintR.Text = "右侧前一箱单"; this.btn_lastBoxPrintR.UseVisualStyleBackColor = false; @@ -910,9 +912,9 @@ // this.btn_lastBoxPrintL.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintL.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintL.Location = new System.Drawing.Point(278, 0); + this.btn_lastBoxPrintL.Location = new System.Drawing.Point(255, 0); this.btn_lastBoxPrintL.Name = "btn_lastBoxPrintL"; - this.btn_lastBoxPrintL.Size = new System.Drawing.Size(127, 141); + this.btn_lastBoxPrintL.Size = new System.Drawing.Size(116, 123); this.btn_lastBoxPrintL.TabIndex = 2; this.btn_lastBoxPrintL.Text = "左侧前一箱单"; this.btn_lastBoxPrintL.UseVisualStyleBackColor = false; @@ -921,10 +923,10 @@ // label27 // this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(-3, 195); + this.label27.Location = new System.Drawing.Point(-3, 171); this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(317, 83); + this.label27.Size = new System.Drawing.Size(291, 73); this.label27.TabIndex = 3; this.label27.Text = "9999"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -933,20 +935,20 @@ // this.label26.AutoSize = true; this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label26.Location = new System.Drawing.Point(0, 155); + this.label26.Location = new System.Drawing.Point(0, 136); this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(169, 37); + this.label26.Size = new System.Drawing.Size(151, 33); this.label26.TabIndex = 2; this.label26.Text = "完成数量"; // // label17 // this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(-3, 56); + this.label17.Location = new System.Drawing.Point(-3, 49); this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(317, 85); + this.label17.Size = new System.Drawing.Size(291, 74); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -955,10 +957,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(0, 11); + this.label16.Location = new System.Drawing.Point(0, 10); this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(169, 37); + this.label16.Size = new System.Drawing.Size(151, 33); this.label16.TabIndex = 0; this.label16.Text = "计划数量"; // @@ -968,11 +970,11 @@ this.groupBox1.Controls.Add(this.tableLayoutPanel3); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox1.Location = new System.Drawing.Point(4, 304); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Location = new System.Drawing.Point(4, 266); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Size = new System.Drawing.Size(407, 342); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(372, 300); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "模具2"; @@ -987,14 +989,14 @@ this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0); this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 37); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 32); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(399, 300); + this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 264); this.tableLayoutPanel3.TabIndex = 2; // // panel47 @@ -1005,10 +1007,10 @@ this.panel47.Controls.Add(this.lbNeedQtyR); this.panel47.Controls.Add(this.lbCurrentlQtyR); this.panel47.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel47.Location = new System.Drawing.Point(4, 204); - this.panel47.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panel47.Location = new System.Drawing.Point(4, 179); + this.panel47.Margin = new System.Windows.Forms.Padding(4); this.panel47.Name = "panel47"; - this.panel47.Size = new System.Drawing.Size(391, 91); + this.panel47.Size = new System.Drawing.Size(356, 81); this.panel47.TabIndex = 4; // // btnHandPrintR @@ -1016,10 +1018,10 @@ this.btnHandPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintR.Location = new System.Drawing.Point(269, 18); - this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnHandPrintR.Location = new System.Drawing.Point(247, 16); + this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4); this.btnHandPrintR.Name = "btnHandPrintR"; - this.btnHandPrintR.Size = new System.Drawing.Size(125, 73); + this.btnHandPrintR.Size = new System.Drawing.Size(115, 64); this.btnHandPrintR.TabIndex = 3; this.btnHandPrintR.Text = "打印"; this.btnHandPrintR.UseVisualStyleBackColor = false; @@ -1029,10 +1031,10 @@ // this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(94, 29); + this.label30.Location = new System.Drawing.Point(86, 25); this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(56, 59); + this.label30.Size = new System.Drawing.Size(50, 52); this.label30.TabIndex = 2; this.label30.Text = "/"; // @@ -1040,10 +1042,10 @@ // this.lbNeedQtyR.AutoSize = true; this.lbNeedQtyR.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbNeedQtyR.Location = new System.Drawing.Point(175, 32); + this.lbNeedQtyR.Location = new System.Drawing.Point(160, 28); this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyR.Name = "lbNeedQtyR"; - this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59); + this.lbNeedQtyR.Size = new System.Drawing.Size(50, 52); this.lbNeedQtyR.TabIndex = 1; this.lbNeedQtyR.Text = "0"; // @@ -1051,10 +1053,10 @@ // this.lbCurrentlQtyR.AutoSize = true; this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyR.Location = new System.Drawing.Point(8, 31); + this.lbCurrentlQtyR.Location = new System.Drawing.Point(7, 27); this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyR.Name = "lbCurrentlQtyR"; - this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyR.TabIndex = 0; this.lbCurrentlQtyR.Text = "0"; this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1064,10 +1066,10 @@ this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label34.BackColor = System.Drawing.Color.Transparent; this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label34.Location = new System.Drawing.Point(5, 122); + this.label34.Location = new System.Drawing.Point(5, 108); this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(116, 53); + this.label34.Size = new System.Drawing.Size(106, 46); this.label34.TabIndex = 1; this.label34.Text = "规格:"; this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1078,10 +1080,10 @@ this.lbPackageCodeR.AutoSize = true; this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2); this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeR.Location = new System.Drawing.Point(4, 31); + this.lbPackageCodeR.Location = new System.Drawing.Point(4, 27); this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeR.Name = "lbPackageCodeR"; - this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeR.TabIndex = 5; // // panel49 @@ -1089,9 +1091,9 @@ this.panel49.Controls.Add(this.btnChangeSizeR); this.panel49.Controls.Add(this.comBoxSizeR); this.panel49.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel49.Location = new System.Drawing.Point(136, 102); + this.panel49.Location = new System.Drawing.Point(124, 90); this.panel49.Name = "panel49"; - this.panel49.Size = new System.Drawing.Size(260, 94); + this.panel49.Size = new System.Drawing.Size(237, 82); this.panel49.TabIndex = 6; // // btnChangeSizeR @@ -1099,10 +1101,10 @@ this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeR.Location = new System.Drawing.Point(139, 17); - this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeR.Location = new System.Drawing.Point(127, 15); + this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4); this.btnChangeSizeR.Name = "btnChangeSizeR"; - this.btnChangeSizeR.Size = new System.Drawing.Size(132, 73); + this.btnChangeSizeR.Size = new System.Drawing.Size(121, 64); this.btnChangeSizeR.TabIndex = 4; this.btnChangeSizeR.Text = "调整"; this.btnChangeSizeR.UseVisualStyleBackColor = false; @@ -1115,10 +1117,10 @@ this.comBoxSizeR.Enabled = false; this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeR.FormattingEnabled = true; - this.comBoxSizeR.Location = new System.Drawing.Point(0, 21); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5); + this.comBoxSizeR.Location = new System.Drawing.Point(0, 18); + this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeR.Name = "comBoxSizeR"; - this.comBoxSizeR.Size = new System.Drawing.Size(136, 72); + this.comBoxSizeR.Size = new System.Drawing.Size(125, 64); this.comBoxSizeR.TabIndex = 3; // // panel36 @@ -1126,26 +1128,26 @@ this.panel36.Controls.Add(this.tableLayoutPanel1); this.panel36.Dock = System.Windows.Forms.DockStyle.Top; this.panel36.Location = new System.Drawing.Point(0, 0); - this.panel36.Margin = new System.Windows.Forms.Padding(5); + this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(415, 464); + this.panel36.Size = new System.Drawing.Size(380, 406); this.panel36.TabIndex = 0; // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F)); this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.99953F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); + this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -1153,10 +1155,10 @@ this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.BackColor = System.Drawing.Color.DeepSkyBlue; this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label11.Location = new System.Drawing.Point(5, 21); + this.label11.Location = new System.Drawing.Point(5, 18); this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(403, 95); + this.label11.Size = new System.Drawing.Size(370, 83); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1167,11 +1169,11 @@ this.groupBox2.Controls.Add(this.tableLayoutPanel4); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold); - this.groupBox2.Location = new System.Drawing.Point(4, 121); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox2.Location = new System.Drawing.Point(4, 105); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox2.Size = new System.Drawing.Size(407, 338); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4); + this.groupBox2.Size = new System.Drawing.Size(372, 297); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "模具1&&手打"; @@ -1186,15 +1188,15 @@ this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 37); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 3; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(399, 296); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 261); this.tableLayoutPanel4.TabIndex = 3; // // label38 @@ -1202,10 +1204,10 @@ this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label38.BackColor = System.Drawing.Color.Transparent; this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(5, 120); + this.label38.Location = new System.Drawing.Point(5, 106); this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(116, 53); + this.label38.Size = new System.Drawing.Size(106, 46); this.label38.TabIndex = 1; this.label38.Text = "规格:"; this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1218,10 +1220,10 @@ this.panel46.Controls.Add(this.lbNeedQtyL); this.panel46.Controls.Add(this.lbCurrentlQtyL); this.panel46.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel46.Location = new System.Drawing.Point(4, 201); - this.panel46.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panel46.Location = new System.Drawing.Point(4, 177); + this.panel46.Margin = new System.Windows.Forms.Padding(4); this.panel46.Name = "panel46"; - this.panel46.Size = new System.Drawing.Size(391, 90); + this.panel46.Size = new System.Drawing.Size(356, 80); this.panel46.TabIndex = 4; // // btnHandPrintL @@ -1229,10 +1231,10 @@ this.btnHandPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintL.Location = new System.Drawing.Point(267, 15); - this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnHandPrintL.Location = new System.Drawing.Point(245, 13); + this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4); this.btnHandPrintL.Name = "btnHandPrintL"; - this.btnHandPrintL.Size = new System.Drawing.Size(125, 73); + this.btnHandPrintL.Size = new System.Drawing.Size(115, 64); this.btnHandPrintL.TabIndex = 3; this.btnHandPrintL.Text = "打印"; this.btnHandPrintL.UseVisualStyleBackColor = false; @@ -1242,10 +1244,10 @@ // this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(91, 29); + this.label31.Location = new System.Drawing.Point(83, 25); this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(56, 59); + this.label31.Size = new System.Drawing.Size(50, 52); this.label31.TabIndex = 2; this.label31.Text = "/"; // @@ -1253,10 +1255,10 @@ // this.lbNeedQtyL.AutoSize = true; this.lbNeedQtyL.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbNeedQtyL.Location = new System.Drawing.Point(169, 32); + this.lbNeedQtyL.Location = new System.Drawing.Point(155, 28); this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyL.Name = "lbNeedQtyL"; - this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59); + this.lbNeedQtyL.Size = new System.Drawing.Size(50, 52); this.lbNeedQtyL.TabIndex = 1; this.lbNeedQtyL.Text = "0"; // @@ -1264,10 +1266,10 @@ // this.lbCurrentlQtyL.AutoSize = true; this.lbCurrentlQtyL.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyL.Location = new System.Drawing.Point(9, 31); + this.lbCurrentlQtyL.Location = new System.Drawing.Point(8, 27); this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyL.Name = "lbCurrentlQtyL"; - this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyL.TabIndex = 0; this.lbCurrentlQtyL.Text = "0"; this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1278,10 +1280,10 @@ this.lbPackageCodeL.AutoSize = true; this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2); this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeL.Location = new System.Drawing.Point(4, 30); + this.lbPackageCodeL.Location = new System.Drawing.Point(4, 26); this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeL.Name = "lbPackageCodeL"; - this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeL.TabIndex = 5; // // panel48 @@ -1289,9 +1291,9 @@ this.panel48.Controls.Add(this.btnChangeSizeL); this.panel48.Controls.Add(this.comBoxSizeL); this.panel48.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel48.Location = new System.Drawing.Point(136, 101); + this.panel48.Location = new System.Drawing.Point(124, 89); this.panel48.Name = "panel48"; - this.panel48.Size = new System.Drawing.Size(260, 92); + this.panel48.Size = new System.Drawing.Size(237, 81); this.panel48.TabIndex = 6; // // btnChangeSizeL @@ -1299,10 +1301,10 @@ this.btnChangeSizeL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeL.Location = new System.Drawing.Point(139, 11); - this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeL.Location = new System.Drawing.Point(127, 10); + this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4); this.btnChangeSizeL.Name = "btnChangeSizeL"; - this.btnChangeSizeL.Size = new System.Drawing.Size(125, 73); + this.btnChangeSizeL.Size = new System.Drawing.Size(115, 64); this.btnChangeSizeL.TabIndex = 4; this.btnChangeSizeL.Text = "调整"; this.btnChangeSizeL.UseVisualStyleBackColor = false; @@ -1315,10 +1317,10 @@ this.comBoxSizeL.Enabled = false; this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeL.FormattingEnabled = true; - this.comBoxSizeL.Location = new System.Drawing.Point(2, 10); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5); + this.comBoxSizeL.Location = new System.Drawing.Point(2, 9); + this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(136, 72); + this.comBoxSizeL.Size = new System.Drawing.Size(125, 64); this.comBoxSizeL.TabIndex = 3; // // panel8 @@ -1327,9 +1329,9 @@ this.panel8.Controls.Add(this.panel9); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Margin = new System.Windows.Forms.Padding(5); + this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(2908, 104); + this.panel8.Size = new System.Drawing.Size(2666, 91); this.panel8.TabIndex = 0; // // panel10 @@ -1337,10 +1339,10 @@ this.panel10.Controls.Add(this.panel12); this.panel10.Controls.Add(this.panel11); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel10.Location = new System.Drawing.Point(415, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5); + this.panel10.Location = new System.Drawing.Point(380, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2493, 104); + this.panel10.Size = new System.Drawing.Size(2286, 91); this.panel10.TabIndex = 2; // // panel12 @@ -1348,10 +1350,10 @@ this.panel12.Controls.Add(this.panel16); this.panel12.Controls.Add(this.panel15); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel12.Location = new System.Drawing.Point(492, 0); - this.panel12.Margin = new System.Windows.Forms.Padding(5); + this.panel12.Location = new System.Drawing.Point(451, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(2001, 104); + this.panel12.Size = new System.Drawing.Size(1835, 91); this.panel12.TabIndex = 1; // // panel16 @@ -1359,10 +1361,10 @@ this.panel16.Controls.Add(this.panel20); this.panel16.Controls.Add(this.panel19); this.panel16.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel16.Location = new System.Drawing.Point(509, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(5); + this.panel16.Location = new System.Drawing.Point(467, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1492, 104); + this.panel16.Size = new System.Drawing.Size(1368, 91); this.panel16.TabIndex = 1; // // panel20 @@ -1370,10 +1372,10 @@ this.panel20.Controls.Add(this.label10); this.panel20.Controls.Add(this.panel22); this.panel20.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel20.Location = new System.Drawing.Point(467, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(5); + this.panel20.Location = new System.Drawing.Point(428, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(1025, 104); + this.panel20.Size = new System.Drawing.Size(940, 91); this.panel20.TabIndex = 1; // // label10 @@ -1381,10 +1383,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(372, 0); + this.label10.Location = new System.Drawing.Point(341, 0); this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(653, 104); + this.label10.Size = new System.Drawing.Size(599, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1395,9 +1397,9 @@ this.panel22.Controls.Add(this.label9); this.panel22.Dock = System.Windows.Forms.DockStyle.Left; this.panel22.Location = new System.Drawing.Point(0, 0); - this.panel22.Margin = new System.Windows.Forms.Padding(5); + this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel22.Name = "panel22"; - this.panel22.Size = new System.Drawing.Size(372, 104); + this.panel22.Size = new System.Drawing.Size(341, 91); this.panel22.TabIndex = 0; // // label9 @@ -1409,7 +1411,7 @@ this.label9.Location = new System.Drawing.Point(0, 0); this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(372, 104); + this.label9.Size = new System.Drawing.Size(341, 91); this.label9.TabIndex = 0; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1421,9 +1423,9 @@ this.panel19.Controls.Add(this.panel21); this.panel19.Dock = System.Windows.Forms.DockStyle.Left; this.panel19.Location = new System.Drawing.Point(0, 0); - this.panel19.Margin = new System.Windows.Forms.Padding(5); + this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel19.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(467, 104); + this.panel19.Size = new System.Drawing.Size(428, 91); this.panel19.TabIndex = 0; // // label8 @@ -1431,10 +1433,10 @@ this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label8.Location = new System.Drawing.Point(220, 0); + this.label8.Location = new System.Drawing.Point(202, 0); this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(247, 104); + this.label8.Size = new System.Drawing.Size(226, 91); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1444,9 +1446,9 @@ this.panel21.Controls.Add(this.label7); this.panel21.Dock = System.Windows.Forms.DockStyle.Left; this.panel21.Location = new System.Drawing.Point(0, 0); - this.panel21.Margin = new System.Windows.Forms.Padding(5); + this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(220, 104); + this.panel21.Size = new System.Drawing.Size(202, 91); this.panel21.TabIndex = 0; // // label7 @@ -1458,7 +1460,7 @@ this.label7.Location = new System.Drawing.Point(0, 0); this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(220, 104); + this.label7.Size = new System.Drawing.Size(202, 91); this.label7.TabIndex = 0; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1470,19 +1472,19 @@ this.panel15.Controls.Add(this.panel17); this.panel15.Dock = System.Windows.Forms.DockStyle.Left; this.panel15.Location = new System.Drawing.Point(0, 0); - this.panel15.Margin = new System.Windows.Forms.Padding(5); + this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(509, 104); + this.panel15.Size = new System.Drawing.Size(467, 91); this.panel15.TabIndex = 0; // // panel18 // this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(220, 0); - this.panel18.Margin = new System.Windows.Forms.Padding(5); + this.panel18.Location = new System.Drawing.Point(202, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(289, 104); + this.panel18.Size = new System.Drawing.Size(265, 91); this.panel18.TabIndex = 1; // // label6 @@ -1493,7 +1495,7 @@ this.label6.Location = new System.Drawing.Point(0, 0); this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(289, 104); + this.label6.Size = new System.Drawing.Size(265, 91); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1503,9 +1505,9 @@ this.panel17.Controls.Add(this.label5); this.panel17.Dock = System.Windows.Forms.DockStyle.Left; this.panel17.Location = new System.Drawing.Point(0, 0); - this.panel17.Margin = new System.Windows.Forms.Padding(5); + this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(220, 104); + this.panel17.Size = new System.Drawing.Size(202, 91); this.panel17.TabIndex = 0; // // label5 @@ -1517,7 +1519,7 @@ this.label5.Location = new System.Drawing.Point(0, 0); this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(220, 104); + this.label5.Size = new System.Drawing.Size(202, 91); this.label5.TabIndex = 0; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1530,19 +1532,19 @@ this.panel11.Controls.Add(this.panel13); this.panel11.Dock = System.Windows.Forms.DockStyle.Left; this.panel11.Location = new System.Drawing.Point(0, 0); - this.panel11.Margin = new System.Windows.Forms.Padding(5); + this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(492, 104); + this.panel11.Size = new System.Drawing.Size(451, 91); this.panel11.TabIndex = 0; // // panel14 // this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(220, 0); - this.panel14.Margin = new System.Windows.Forms.Padding(5); + this.panel14.Location = new System.Drawing.Point(202, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(272, 104); + this.panel14.Size = new System.Drawing.Size(249, 91); this.panel14.TabIndex = 1; // // comboBox1 @@ -1555,9 +1557,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(5); + this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(272, 93); + this.comboBox1.Size = new System.Drawing.Size(249, 83); this.comboBox1.TabIndex = 0; // // panel13 @@ -1565,9 +1567,9 @@ this.panel13.Controls.Add(this.label4); this.panel13.Dock = System.Windows.Forms.DockStyle.Left; this.panel13.Location = new System.Drawing.Point(0, 0); - this.panel13.Margin = new System.Windows.Forms.Padding(5); + this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(220, 104); + this.panel13.Size = new System.Drawing.Size(202, 91); this.panel13.TabIndex = 0; // // label4 @@ -1579,7 +1581,7 @@ this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(220, 104); + this.label4.Size = new System.Drawing.Size(202, 91); this.label4.TabIndex = 0; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1589,9 +1591,9 @@ this.panel9.Controls.Add(this.label3); this.panel9.Dock = System.Windows.Forms.DockStyle.Left; this.panel9.Location = new System.Drawing.Point(0, 0); - this.panel9.Margin = new System.Windows.Forms.Padding(5); + this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(415, 104); + this.panel9.Size = new System.Drawing.Size(380, 91); this.panel9.TabIndex = 0; // // label3 @@ -1603,7 +1605,7 @@ this.label3.Location = new System.Drawing.Point(0, 0); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(415, 104); + this.label3.Size = new System.Drawing.Size(380, 91); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1614,9 +1616,9 @@ this.panel2.Controls.Add(this.panel3); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(5); + this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2908, 168); + this.panel2.Size = new System.Drawing.Size(2666, 147); this.panel2.TabIndex = 0; // // panel4 @@ -1624,30 +1626,42 @@ this.panel4.Controls.Add(this.panel6); this.panel4.Controls.Add(this.panel5); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(339, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(5); + this.panel4.Location = new System.Drawing.Point(311, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2569, 168); + this.panel4.Size = new System.Drawing.Size(2355, 147); this.panel4.TabIndex = 1; // // panel6 // + this.panel6.Controls.Add(this.checkBox1); this.panel6.Controls.Add(this.btnOnlyBarCode); this.panel6.Controls.Add(this.label1); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Margin = new System.Windows.Forms.Padding(5); + this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(2185, 168); + this.panel6.Size = new System.Drawing.Size(2003, 147); this.panel6.TabIndex = 1; // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(1603, 60); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(120, 25); + this.checkBox1.TabIndex = 2; + this.checkBox1.Text = "插入异常"; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.Visible = false; + // // btnOnlyBarCode // this.btnOnlyBarCode.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnOnlyBarCode.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOnlyBarCode.Location = new System.Drawing.Point(3, 1); this.btnOnlyBarCode.Name = "btnOnlyBarCode"; - this.btnOnlyBarCode.Size = new System.Drawing.Size(237, 163); + this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143); this.btnOnlyBarCode.TabIndex = 1; this.btnOnlyBarCode.Text = "条码模式"; this.btnOnlyBarCode.UseVisualStyleBackColor = false; @@ -1661,7 +1675,7 @@ this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(2185, 168); + this.label1.Size = new System.Drawing.Size(2003, 147); this.label1.TabIndex = 0; this.label1.Text = "注塑车间箱码条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1670,10 +1684,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(2185, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(5); + this.panel5.Location = new System.Drawing.Point(2003, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(384, 168); + this.panel5.Size = new System.Drawing.Size(352, 147); this.panel5.TabIndex = 0; // // label2 @@ -1684,7 +1698,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(384, 168); + this.label2.Size = new System.Drawing.Size(352, 147); this.label2.TabIndex = 0; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1692,22 +1706,23 @@ // // panel3 // + this.panel3.Controls.Add(this.lbVer); this.panel3.Controls.Add(this.pictureBox1); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(5); + this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(339, 168); + this.panel3.Size = new System.Drawing.Size(311, 147); this.panel3.TabIndex = 0; // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(5, 5); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(5); + this.pictureBox1.Location = new System.Drawing.Point(5, 4); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(335, 159); + this.pictureBox1.Size = new System.Drawing.Size(307, 139); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1746,14 +1761,25 @@ this.timer3.Interval = 5000; this.timer3.Tick += new System.EventHandler(this.timer3_Tick); // + // lbVer + // + this.lbVer.AutoSize = true; + this.lbVer.BackColor = System.Drawing.SystemColors.Window; + this.lbVer.ForeColor = System.Drawing.Color.LightSkyBlue; + this.lbVer.Location = new System.Drawing.Point(14, 120); + this.lbVer.Name = "lbVer"; + this.lbVer.Size = new System.Drawing.Size(32, 21); + this.lbVer.TabIndex = 1; + this.lbVer.Text = " "; + // // FrmMain2408 // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2908, 1829); + this.ClientSize = new System.Drawing.Size(2666, 1600); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(5); + this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.Name = "FrmMain2408"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; @@ -1819,8 +1845,10 @@ this.panel2.ResumeLayout(false); this.panel4.ResumeLayout(false); this.panel6.ResumeLayout(false); + this.panel6.PerformLayout(); this.panel5.ResumeLayout(false); this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); @@ -1951,5 +1979,7 @@ private System.Windows.Forms.Label lbAddPrintL; private System.Windows.Forms.Label label22; private System.Windows.Forms.Label lbDevState; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.Label lbVer; } } \ No newline at end of file diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index 9af746c..2d03f2b 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -91,6 +91,10 @@ namespace InjectionPC private static int InterVal_Seconds = 0; + /// + /// 异常重发次数. 超过四次,不再重发. 无限重发会有垃圾数据. + /// + private int _repeatSentTimes = 4; private void FrmMain_Load(object sender, EventArgs e) { try @@ -135,9 +139,6 @@ namespace InjectionPC label23.Enabled = false; label23.BackColor = System.Drawing.Color.Gray; - - - DataTable plasticTable = GetPlastic(); foreach(DataRow dr in plasticTable.Rows) { @@ -148,9 +149,6 @@ namespace InjectionPC } } - - - Ping p1 = new Ping(); PingReply reply = p1.Send("10.60.101.60"); //发送主机名或Ip地址 @@ -166,11 +164,19 @@ namespace InjectionPC label2.BackColor = Color.Red; } - + #region 测试关闭 + string cs = ConfigurationManager.AppSettings["测试"]; + if (!string.IsNullOrEmpty(cs) && cs == "true") + { + label5_MouseDoubleClick(null, null); + checkBox1.Visible = true; + } + lbVer.Text = Application.ProductVersion; + #endregion comboBox2.MouseWheel += new MouseEventHandler(comboBox2_MouseWheel); - - #region 获取当前生产信息 + + #region 获取当前生产信息 initPlan(); @@ -246,10 +252,11 @@ namespace InjectionPC return; } - + #endregion - + + } catch (Exception ex) { @@ -320,33 +327,6 @@ namespace InjectionPC if (_lastParts.Contains(partNo[i].ToString().Trim()) == false) { InitComboBoxSize(partNo[i].ToString().Trim(), i,""); - //string currentSize = string.Empty; - //List list = GetProductBoxSize(partNo[i].ToString().Trim(), ref currentSize); - - //if (i == 0) - //{ - // comBoxSizeL.DataSource = list; - // comBoxSizeL.SelectedItem = currentSize; - // _selectItemL = currentSize; - // int j = 0; - // int.TryParse(currentSize, out j); - // if (j > 0) - // { - // lbNeedQtyL.Text = j.ToString(); - // } - //} - //else - //{ - // comBoxSizeR.DataSource = list; - // comBoxSizeR.SelectedItem = currentSize; - // _selectItemR = currentSize; - // int j = 0; - // int.TryParse(currentSize, out j); - // if (j > 0) - // { - // lbNeedQtyR.Text = j.ToString(); - // } - //} } } @@ -451,6 +431,7 @@ namespace InjectionPC for (int i = 1; i <= NumItems; i++) { + #region PLC来信号记录 if (ItemValues == null) { _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues= null ", planID, "2408"); @@ -461,13 +442,7 @@ namespace InjectionPC _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.Length ==0 ", planID, "2408"); continue; } - //string val = ItemValues.GetValue(i)?.ToString(); - //if (ItemValues.GetValue(i)?.ToString() != "True") - //{ - // _bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.GetValue(i)= " + val, planID, "2408"); - //} - - + #endregion if ((ItemValues!=null && ItemValues.GetValue(i)?.ToString() == "True") || IsTest ==true) { @@ -476,12 +451,6 @@ namespace InjectionPC #region 增加时间差判定 - //DateTime lastTime = GetPrintTime(label6.Text); - - //long ts = TimeDiff(lastTime, DateTime.Now); - - - TimeSpan span=DateTime.Now - lastTime; if (span.TotalSeconds < Convert.ToDouble(ConfigurationManager.AppSettings["InterValT"])) { @@ -501,7 +470,7 @@ namespace InjectionPC DataTable dt = bll.SearchInfoByName(Program.station); if (dt != null && dt.Rows.Count > 0) { - + //切换计划后 if (aa != dt.Rows[0]["PartNo"].ToString()) { DialogResult result=MessageBox.Show("计划有变更，请确认！", "提示", MessageBoxButtons.OKCancel, @@ -600,12 +569,12 @@ namespace InjectionPC md.Des1 = PartName; string errMsg = string.Empty; - bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); + bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName,"",ref errMsg);//PLC来信号,切换计划后,IsSame == "1"时插入 if (saveRst == false) { LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:"+ errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + return; } @@ -614,42 +583,43 @@ namespace InjectionPC #region 打印条码，判断是否打印单个条码 #region 打印单个标签 + PrintOne(IsOne, IsSupply, ManufacturerName, md.PartNo, md.Des1, md.OneBarCode, md.BarCode, _currentStationID,""); - if (IsOne == "1") - { - if (IsSupply != "1") - { - filename = ManufacturerName.Contains("蔚来") - ? System.AppDomain.CurrentDomain.BaseDirectory + - "wl.grf" - : System.AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("0","Print"+Program.station+"_679"); //new - } - else - { - filename = System.AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("1", "Print" + Program.station + "_684"); - } - - 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.grpoPortrait, 1, reportName); - - LogSysBLL.AddInfo( - GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, - MethodBase.GetCurrentMethod()); - rp.Report.Print(false); + //if (IsOne == "1") + //{ + // if (IsSupply != "1") + // { + // filename = ManufacturerName.Contains("蔚来") + // ? System.AppDomain.CurrentDomain.BaseDirectory + + // "wl.grf" + // : System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("0","Print"+Program.station+"_679"); //new + // } + // else + // { + // filename = System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("1", "Print" + Program.station + "_684"); + // } + + // 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.grpoPortrait, 1, reportName); + + // LogSysBLL.AddInfo( + // GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, + // MethodBase.GetCurrentMethod()); + // rp.Report.Print(false); - } + //} #endregion @@ -708,15 +678,15 @@ namespace InjectionPC md.Import = ""; } } - + string fileName214 = AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("0", "Print" + Program.station + "_887"); string errMsg = string.Empty; - bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); + bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName, fileName214, ref errMsg); //PLC来信号,切换计划后,IsSame == "0"时插入 if (saveRst == false) { LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + return; } #endregion @@ -734,53 +704,55 @@ namespace InjectionPC IsSame = dt3.Rows[0]["IsSame"].ToString(); IsSupply = dt3.Rows[0]["IsSupply"].ToString(); } - - #region 打印单个标签 - - if (IsOne == "1") - { - if (IsSupply != "1") - { - filename = ManufacturerName.Contains("蔚来") - ? System.AppDomain.CurrentDomain.BaseDirectory + - "wl.grf" - : System.AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("0", "Print" + Program.station + "_882"); //new - if (partNo[j].Contains("A2146982300") || - partNo[j].Contains("A2146982400")) - { - filename = AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("0", "Print" + Program.station + "_887"); - } - } - else - { - filename = System.AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("1", "Print" + Program.station + "_893"); - } - - //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); + #region 打印单个标签 + + PrintOne(IsOne, IsSupply, ManufacturerName, md.PartNo, md.Des1, md.OneBarCode, md.BarCode, _currentStationID, fileName214); + //if (IsOne == "1") + //{ + // if (IsSupply != "1") + // { + // filename = ManufacturerName.Contains("蔚来") + // ? System.AppDomain.CurrentDomain.BaseDirectory + + // "wl.grf" + // : System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("0", "Print" + Program.station + "_882"); //new + // if (partNo[j].Contains("A2146982300") || + // partNo[j].Contains("A2146982400")) + // { + // filename = AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("0", "Print" + Program.station + "_887"); + // } + // } + // else + // { + // filename = System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("1", "Print" + Program.station + "_893"); + // } + + + // //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.grpoPortrait, 1, reportName); + // LogSysBLL.AddInfo( + // GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, + // MethodBase.GetCurrentMethod()); + // rp.Report.Print(false); - ReportHelper rp = new ReportHelper(filename, headTable, null, - (int) GRPaperOrientation.grpoPortrait, 1, reportName); - LogSysBLL.AddInfo( - GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, - MethodBase.GetCurrentMethod()); - rp.Report.Print(false); - - } + //} #endregion @@ -797,6 +769,7 @@ namespace InjectionPC return; } } + //未换计划 else { planID = dt.Rows[0]["InjectionPlanID"].ToString(); @@ -928,13 +901,14 @@ namespace InjectionPC } string errMsg = string.Empty; - bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); + + bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName,"", ref errMsg);//PLC来信号,IsSame == "1"时插入 if (saveRst == false) { LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + return; } #endregion @@ -942,43 +916,46 @@ namespace InjectionPC #region 打印单个标签 - if (IsOne == "1") - { - if (IsSupply != "1") - { - filename = ManufacturerName.Contains("蔚来") - ? System.AppDomain.CurrentDomain.BaseDirectory + - "wl.grf" - : System.AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("0", "Print" + Program.station + "_1167"); //new - } - else - { - filename = System.AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("1", "Print" + Program.station + "_1172"); - } - - //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()]; + PrintOne(IsOne, IsSupply, ManufacturerName, md.PartNo, md.Des1, md.OneBarCode, md.BarCode, _currentStationID,""); - 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.grpoPortrait, 1, reportName); + //if (IsOne == "1") + //{ + // if (IsSupply != "1") + // { + // filename = ManufacturerName.Contains("蔚来") + // ? System.AppDomain.CurrentDomain.BaseDirectory + + // "wl.grf" + // : System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("0", "Print" + Program.station + "_1167"); //new + // } + // else + // { + // filename = System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("1", "Print" + Program.station + "_1172"); + // } + + // //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.grpoPortrait, 1, reportName); + + // //LogSysBLL.AddInfo( + // // GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, + // // MethodBase.GetCurrentMethod()); + // rp.Report.Print(false); - LogSysBLL.AddInfo( - GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, - MethodBase.GetCurrentMethod()); - rp.Report.Print(false); - - } + //} #endregion @@ -1041,6 +1018,7 @@ namespace InjectionPC } #region 插入数据tb_barCode + string filename214 = AppDomain.CurrentDomain.BaseDirectory + "Sill.grf"; try { md.ID = Guid.NewGuid().ToString(); @@ -1065,65 +1043,65 @@ namespace InjectionPC md.Import = ""; } } - + string errMsg = string.Empty; - bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); + bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName, filename214, ref errMsg);//PLC来信号,IsSame == "0"时插入 if (saveRst == false) { LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + return; } } catch (Exception ex) { throw new Exception("p1396" + ex.Message); } - + #endregion #region 打印条码，判断是否打印单个条码 #region 打印单个标签 - - if (IsOne == "1") - { - - if (IsSupply != "1") - { - filename = ManufacturerName.Contains("蔚来") - ? System.AppDomain.CurrentDomain.BaseDirectory + - "wl.grf" - : System.AppDomain.CurrentDomain.BaseDirectory + - PrintMoudleName("0", "Print" + Program.station + "_1385");//new - if (partNo[j].Contains("A2146982300") || - partNo[j].Contains("A2146982400")) - { - filename = AppDomain.CurrentDomain.BaseDirectory + - "Sill.grf"; - } - } - else - { - filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("1", "Print" + Program.station + "_1395"); - } - - //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.grpoPortrait, 1, reportName); - LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); - rp.Report.Print(false); - } + + PrintOne(IsOne, IsSupply, ManufacturerName, md.PartNo, md.Des1, md.OneBarCode, md.BarCode, _currentStationID, filename214); + //if (IsOne == "1") + //{ + // if (IsSupply != "1") + // { + // filename = ManufacturerName.Contains("蔚来") + // ? System.AppDomain.CurrentDomain.BaseDirectory + + // "wl.grf" + // : System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("0", "Print" + Program.station + "_1385");//new + // if (partNo[j].Contains("A2146982300") || + // partNo[j].Contains("A2146982400")) + // { + // filename = AppDomain.CurrentDomain.BaseDirectory + + // "Sill.grf"; + // } + // } + // else + // { + // filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("1", "Print" + Program.station + "_1395"); + // } + + // //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.grpoPortrait, 1, reportName); + // LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); + // rp.Report.Print(false); + //} #endregion @@ -1158,8 +1136,104 @@ namespace InjectionPC MessageBox.Show(ex.ToString()); } } + void PrintOneHand(string IsOne,string isSupply, string ManufacturerName, string partCode, string partName, string newOneCode, string newcode, string stationID) + { + string filename = ""; + string printName = ""; + if (IsOne != "1") + { + if(isSupply != "1") + { + //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf"; + filename = ManufacturerName.Contains("蔚来") + ? System.AppDomain.CurrentDomain.BaseDirectory + + "wl.grf" + : System.AppDomain.CurrentDomain.BaseDirectory + + PrintMoudleName("0", "Print" + Program.station + "_2514"); //new + if (partCode.Contains("A2146982300") || + partCode.Contains("A2146982400")) + { + filename = AppDomain.CurrentDomain.BaseDirectory + + "Sill.grf"; + } + + printName = "Printer" + _printNameDict[partCode + stationID]; + + string reportName = ConfigurationManager.AppSettings[printName].ToString(); + DataTable headTable = GetPrintHeadTable(partCode, partName, newOneCode, newcode); + + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); + LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + newOneCode, MethodBase.GetCurrentMethod()); + rp.Report.Print(false); + } + else + { + filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("1", "Print" + Program.station + "_2778"); ; + + //DataTable dt4 = plbll.SearchInfo(partNo, stationID); + //if (dt4 != null && dt4.Rows.Count > 0) + //{ + // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString(); + //} + printName = "Printer" + _printNameDict[partCode + stationID]; + + string reportName = ConfigurationManager.AppSettings[printName].ToString(); + DataTable headTable = GetPrintHeadTable(partCode, partName, newOneCode, newcode); + + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); + LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + newOneCode, MethodBase.GetCurrentMethod()); + rp.Report.Print(false); + } + + } + + + } + void PrintOne(string IsOne,string IsSupply,string ManufacturerName,string partCode,string partName,string newOneCode,string newcode,string stationID,string fileName214) + { + string filename = string.Empty; + string printName = string.Empty; + if (IsOne == "1") + { + if (IsSupply != "1") + { + filename = ManufacturerName.Contains("蔚来") + ? System.AppDomain.CurrentDomain.BaseDirectory + + "wl.grf" + : System.AppDomain.CurrentDomain.BaseDirectory + + PrintMoudleName("0", "Print" + Program.station + "_679"); //new + + if ((partCode.Contains("A2146982300") || partCode.Contains("A2146982400")) && !string.IsNullOrEmpty(fileName214) ) + { + filename = fileName214; + } + } + else + { + filename = System.AppDomain.CurrentDomain.BaseDirectory + + PrintMoudleName("1", "Print" + Program.station + "_684"); + } - + printName = "Printer" + _printNameDict[partCode + stationID]; + + string reportName = ConfigurationManager.AppSettings[printName] + .ToString(); + + DataTable headTable = GetPrintHeadTable(partCode, partName, newOneCode, newcode); + + //ReportHelper rp = new ReportHelper(filename, headTable, null, + // (int) GRPaperOrientation.grpoDefault, 1, reportName); + + ReportHelper rp = new ReportHelper(filename, headTable, null, + (int)GRPaperOrientation.grpoPortrait, 1, reportName); + + LogSysBLL.AddInfo( + GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + newOneCode, + MethodBase.GetCurrentMethod()); + rp.Report.Print(false); + + } + } private void TimeGo() { @@ -1182,6 +1256,11 @@ namespace InjectionPC } } + /// + /// 应该没用到.加个日志,以后观察 @250418 + /// + /// + /// private void timer1_Tick(object sender, EventArgs e) { int wID = 0; @@ -1208,8 +1287,10 @@ namespace InjectionPC try { - timer1.Enabled=false; - + timer1.Enabled=false; + + LogSysBLL.AddInfo(Program.station+ GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"), + MethodBase.GetCurrentMethod()); GetClass(); aa = aa + 1; @@ -1314,13 +1395,13 @@ namespace InjectionPC } string errMsg = string.Empty; - bool saveRst = SaveInfo(md, true, same[j].ToString(), false, ref errMsg); + bool saveRst = SaveInfo(md, true, same[j].ToString(), false, IsOne, "0", "","", ref errMsg); if (saveRst == false) { LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + return; } #endregion @@ -1418,13 +1499,13 @@ namespace InjectionPC string errMsg = string.Empty; - bool saveRst = SaveInfo(md, true, same[j].ToString(), false, ref errMsg); + bool saveRst = SaveInfo(md, true, same[j].ToString(), false, IsOne, "0", "","", ref errMsg); if (saveRst == false) { LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + return; } #endregion @@ -1929,48 +2010,49 @@ namespace InjectionPC } string errMsg = string.Empty; - bool saveRst = SaveInfo(md, false, "0", i == printCount, ref errMsg); + bool saveRst = SaveInfo(md, false, "0", i == printCount, IsOne, IsSupply, ManufacturerName,"", ref errMsg);//手工打印条码 非直供件 if (saveRst == false) { LogErrBLL.AddInfo($"手工打印[{partNo}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + 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 + - PrintMoudleName("0", "Print" + Program.station + "_2514"); //new - if (partNo.Contains("A2146982300") || - partNo.Contains("A2146982400")) - { - filename = AppDomain.CurrentDomain.BaseDirectory + - "Sill.grf"; - } + PrintOneHand(IsOne,IsSupply, ManufacturerName, partNo, PartName, NewOneCode, newcode, stationID); + //if (IsOne == "1") + //{ + // //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf"; + // filename = ManufacturerName.Contains("蔚来") + // ? System.AppDomain.CurrentDomain.BaseDirectory + + // "wl.grf" + // : System.AppDomain.CurrentDomain.BaseDirectory + + // PrintMoudleName("0", "Print" + Program.station + "_2514"); //new + // if (partNo.Contains("A2146982300") || + // partNo.Contains("A2146982400")) + // { + // filename = AppDomain.CurrentDomain.BaseDirectory + + // "Sill.grf"; + // } - //DataTable dt4 = plbll.SearchInfo(partNo, stationID); - //if (dt4 != null && dt4.Rows.Count > 0) - //{ - // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString(); - //} - printName = "Printer" + _printNameDict[partNo + stationID]; - - string reportName = ConfigurationManager.AppSettings[printName].ToString(); - DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); - - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); - LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); - rp.Report.Print(false); - } + // //DataTable dt4 = plbll.SearchInfo(partNo, stationID); + // //if (dt4 != null && dt4.Rows.Count > 0) + // //{ + // // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString(); + // //} + // printName = "Printer" + _printNameDict[partNo + stationID]; + + // string reportName = ConfigurationManager.AppSettings[printName].ToString(); + // DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); + + // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); + // LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); + // rp.Report.Print(false); + //} #endregion @@ -2017,38 +2099,37 @@ namespace InjectionPC } string errMsg = string.Empty; - bool saveRst = SaveInfo(md, false, "0", false, ref errMsg); + bool saveRst = SaveInfo(md, false, "0", false, IsOne, IsSupply, ManufacturerName,"", ref errMsg); //手工打印条码 非直供件 if (saveRst == false) { LogErrBLL.AddInfo($"手工打印[{partNo}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - //return; + return; } #endregion #region 打印单个标签 - - if (IsOne == "1") - { - filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("1", "Print" + Program.station + "_2778"); ; + PrintOneHand(IsOne,IsSupply, ManufacturerName, partNo, PartName, NewOneCode, newcode, stationID); + //if (IsOne == "1") + //{ + // filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("1", "Print" + Program.station + "_2778"); ; - //DataTable dt4 = plbll.SearchInfo(partNo, stationID); - //if (dt4 != null && dt4.Rows.Count > 0) - //{ - // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString(); - //} - printName = "Printer" + _printNameDict[partNo + stationID]; - - string reportName = ConfigurationManager.AppSettings[printName].ToString(); - DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); - - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); - LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); - rp.Report.Print(false); - } - + // //DataTable dt4 = plbll.SearchInfo(partNo, stationID); + // //if (dt4 != null && dt4.Rows.Count > 0) + // //{ + // // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString(); + // //} + // printName = "Printer" + _printNameDict[partNo + stationID]; + + // string reportName = ConfigurationManager.AppSettings[printName].ToString(); + // DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); + + // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); + // LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); + // rp.Report.Print(false); + //} #endregion } @@ -3188,14 +3269,12 @@ namespace InjectionPC lbPackageCode = lbPackageCodeL; lbCurrentlQty = lbCurrentlQtyL; lbNeedQty = lbNeedQtyL; - //lastFailedModel = _lastFailedModelL; } else { lbPackageCode = lbPackageCodeR; lbCurrentlQty = lbCurrentlQtyR; lbNeedQty = lbNeedQtyR; - //lastFailedModel = _lastFailedModelR; } bool saveRst = true; @@ -3242,8 +3321,10 @@ namespace InjectionPC } } - //throw new Exception("资源被占用,死锁了测试"); - + //throw new Exception("资源被占用,死锁了测试");ui789 + if (checkBox1.Checked) { + throw new Exception("资源被占用,死锁了测试"); + } local.Commit(); } catch (Exception ex) @@ -3253,15 +3334,29 @@ namespace InjectionPC local.Rollback(); } errorMsg = ex.Message; - //lastFailedModel = bcm; - if (mould == _leftType) { - _lastFailedModelL = bcm; - } - else + DataTable dt3 = _injectionBoxBLL.SearchBox(bcm.BoxNo); + if (dt3.Rows.Count > 0) { - _lastFailedModelR = bcm; + lbCurrentlQty.Text = dt3.Rows[0]["BoxCount"].ToString(); } + //if (mould == _leftType) { + // _lastFailedModelL = bcm; + + //} + //else + //{ + // _lastFailedModelR = bcm; + //} + + SaveBarcodeFailInfo(null, Program.station, bcm.OneBarCode, 0, bcm.BoxNo, ex.Message, mould,"自动打或者手动有箱码", bcm.PartNo,bcm.Des1); + saveRst = false; + + if (isSuccess == true) + { + isSuccess = false; + lbPackageCode.Text = bcm.BoxNo; + } } finally { @@ -3290,32 +3385,37 @@ namespace InjectionPC //手动打印, 关闭打印箱码, 直接存条码记录.不处理其他 saveRst = _barCodeBLL.Add_Info_New(bcm, Program.tableName); if (saveRst == false) - { - //lastFailedModel = bcm; - if (mould == _leftType) - { - _lastFailedModelL = bcm; - } - else - { - _lastFailedModelR = bcm; - } + { + //if (mould == _leftType) + //{ + // _lastFailedModelL = bcm; + //} + //else + //{ + // _lastFailedModelR = bcm; + //} + + SaveBarcodeFailInfo(null, Program.station, bcm.OneBarCode, 0, bcm.BoxNo, "没发生异常,返回false", mould, "手动无箱码返回false", bcm.PartNo, bcm.Des1); + } } catch(Exception ex) { errorMsg = ex.Message; - //lastFailedModel = bcm; - if (mould == _leftType) - { - _lastFailedModelL = bcm; - } - else - { - _lastFailedModelR = bcm; - } + + //if (mould == _leftType) + //{ + // _lastFailedModelL = bcm; + //} + //else + //{ + // _lastFailedModelR = bcm; + //} + + SaveBarcodeFailInfo(null, Program.station, bcm.OneBarCode, 0, bcm.BoxNo, ex.Message, mould, "手动无箱码发生异常", bcm.PartNo, bcm.Des1); + } - + } return saveRst; @@ -3496,6 +3596,32 @@ namespace InjectionPC lbPackageCode.Text = packageCode; } } + //判断当前箱码是否已经打印,或者实际完成数量已经达到满器具 + else + { + DataTable boxTable = _injectionBoxBLL.SearchBox(pkgCode); + if (boxTable.Rows.Count > 0) + { + DataRow boxRow = boxTable.Rows[0]; + if(boxRow["IsPrint"].ToString() == "1") + { + lbPackageCode.Text = ""; + CheckPackageCode(partCode, autoPrint, mould, partName); + } + else + { + int boxCount = int.Parse(boxRow["BoxCount"].ToString()); + int standCount = int.Parse(boxRow["StandardQty"].ToString()); + if(boxCount>= standCount) + { + lbPackageCode.Text = ""; + CheckPackageCode(partCode, autoPrint, mould, partName); + } + } + + + } + } #endregion } } @@ -4390,45 +4516,113 @@ namespace InjectionPC } private BarCodeModel _lastFailedModelL = null; private BarCodeModel _lastFailedModelR = null; - bool SaveInfo(BarCodeModel md, bool isAutoPrint, string mould, bool handPrint, ref string errMsg) + + bool SaveInfo(BarCodeModel md, bool isAutoPrint, string mould, bool handPrint,string isOne,string IsSupply,string ManufacturerName,string fileName214, ref string errMsg) { - if (_lastFailedModelL != null && mould == "0") - { - SaveBarCode(_lastFailedModelL, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); - _lastFailedModelL = null; - } - if (_lastFailedModelR != null && !string.IsNullOrEmpty(mould) && mould != "0") + //if (_lastFailedModelL != null && mould == "0") + //{ + // bool rst1 = SaveBarCode(_lastFailedModelL, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); + // _lastFailedModelL = null; + //} + //if (_lastFailedModelR != null && !string.IsNullOrEmpty(mould) && mould != "0") + //{ + // bool rst2 = SaveBarCode(_lastFailedModelR, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); + // _lastFailedModelR = null; + //} + DataTable failTable = GetFailedBarCode(null, mould); + if (failTable.Rows.Count > 0) { - SaveBarCode(_lastFailedModelR, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); - _lastFailedModelR = null; - } + foreach(DataRow failRow in failTable.Rows) + { + //重发前检查箱码,1,不为空 2.箱码没有超标 否则生成新的箱码 + //重发成功一个,打印一个标签,失败不打印标签. + //重发成功,更新 IsRight=1, RepeatTimes +1,UpdateTime 重发失败,更新IsRight=0, RepeatTimes +1,UpdateTime + //重发后,保存完,检查箱码数量是数量,为空或者大于等于标包,生成新箱码. + + CheckPackageCode(failRow["PartNo"].ToString(), isAutoPrint, failRow["Model"].ToString(), failRow["PartName"].ToString()); + BarCodeModel md1 = new BarCodeModel(); + if(failRow["Model"].ToString() == "0") + { + md1.BoxNo = lbPackageCodeL.Text; + } + else + { + md1.BoxNo = lbPackageCodeR.Text; + } + md1.OneBarCode = failRow["OneBarCode"].ToString(); - bool rst = SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); + md1.ID = Guid.NewGuid().ToString(); + md1.StationID =_currentStationID; + + md1.StockNo = md1.OneBarCode.Substring(0,10); + md1.PartNo = failRow["PartNo"].ToString(); + md1.PrintType = 0; + md1.PlanID = planID; + md1.ProductNature = "重传件"; + md1.Des1 = failRow["PartName"].ToString(); + if(!string.IsNullOrEmpty(md1.OneBarCode) && md1.OneBarCode.Length == 20) + { + md1.BatchNo = md1.OneBarCode.Substring(10, 6); + string serialNo = md1.OneBarCode.Substring(16, 4); + md1.BarCode = md1.PartNo + "." + md1.BatchNo + "." + serialNo; + } + - //if (SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint) == false) - //{ - // int a = 0; - // for (int l = 0; l < 3; l++) - // { - // // if (brbll.Add_Info_New(md, Program.tableName)) - // if (SaveBarCode(md, Program.tableName, true, mould, ref errMsg, handPrint) == true) - // { - // break; - // } - - // a += 1; - // //Thread.Sleep(200); - // Thread.Sleep(200); - // } - // if (a >= 2) - // { - // SaveLog3(Program.station + "保存3次失败,条码" + md.OneBarCode); - // return false; - // } - //} + bool saveRst= SaveBarCode(md1, Program.tableName, isAutoPrint, failRow["Model"].ToString(), ref errMsg, handPrint); + if (saveRst == true) + { + if(handPrint == false) + { + PrintOne(isOne, IsSupply, ManufacturerName, failRow["PartNo"].ToString(), failRow["PartName"].ToString(), failRow["OneBarCode"].ToString(), md1.BarCode, _currentStationID, fileName214); + } + else + { + PrintOneHand(isOne, IsSupply, ManufacturerName, failRow["PartNo"].ToString(), failRow["PartName"].ToString(), failRow["OneBarCode"].ToString(), md1.BarCode, _currentStationID); + } + SaveBarcodeFailInfo(null, Program.station, md1.OneBarCode, 1, md1.BoxNo, "", failRow["Model"].ToString(), "补发成功", md1.PartNo, md1.Des1); + + CheckPackageCode(failRow["PartNo"].ToString(), isAutoPrint, failRow["Model"].ToString(), failRow["PartName"].ToString()); + } + else + { + SaveBarcodeFailInfo(null, Program.station, md1.OneBarCode, 0, md1.BoxNo, errMsg, failRow["Model"].ToString(), "补发失败", md1.PartNo, md1.Des1); + } + + } + } + + //发送前,检查当前箱码, 为空或者箱码数量等于标包,情况箱码,重新生成新的箱码 250420 + CheckPackageCode(md.PartNo, isAutoPrint, mould, md.Des1); + bool rst = SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); + return rst; } + + void SaveBarcodeFailInfo(LocalDBService local, string stationNo, string oneBarCode, int isRight, string boxCode, string errMsg,string model,string remark,string partNo,string partName) + { + try + { + if(local == null) + { + local = new LocalDBService(SqlHelper.GetConnSting()); + } + _barCodeBLL.SaveBarCodeFails(local, stationNo, oneBarCode, isRight, boxCode, errMsg, model, remark,partNo, partName); + } + catch(Exception ex) + { + LogHelper.WriteLog("SaveBarcodeFailInfo错误:" + ex.Message); + } + } + DataTable GetFailedBarCode(LocalDBService local,string model) + { + if (local == null) + { + local = new LocalDBService(SqlHelper.GetConnSting()); + } + return _barCodeBLL.GetFailedBarCode(local, model, _repeatSentTimes); + } + } } diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs index c5c1068..20675e7 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); + this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2560, 1829); + this.panel1.Size = new System.Drawing.Size(2347, 1600); this.panel1.TabIndex = 0; // // panel7 @@ -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, 168); - this.panel7.Margin = new System.Windows.Forms.Padding(5); + this.panel7.Location = new System.Drawing.Point(0, 147); + this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2560, 1661); + this.panel7.Size = new System.Drawing.Size(2347, 1453); this.panel7.TabIndex = 1; // // panel23 @@ -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, 104); - this.panel23.Margin = new System.Windows.Forms.Padding(5); + this.panel23.Location = new System.Drawing.Point(0, 91); + this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(2560, 1557); + this.panel23.Size = new System.Drawing.Size(2347, 1362); this.panel23.TabIndex = 1; // // panel27 @@ -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, 1115); - this.panel27.Margin = new System.Windows.Forms.Padding(5); + this.panel27.Location = new System.Drawing.Point(0, 976); + this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(2560, 442); + this.panel27.Size = new System.Drawing.Size(2347, 386); this.panel27.TabIndex = 1; // // panel29 @@ -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(339, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(5); + this.panel29.Location = new System.Drawing.Point(311, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(2221, 442); + this.panel29.Size = new System.Drawing.Size(2036, 386); this.panel29.TabIndex = 1; // // panel31 @@ -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(133, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(5); + this.panel31.Location = new System.Drawing.Point(122, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(2088, 442); + this.panel31.Size = new System.Drawing.Size(1914, 386); this.panel31.TabIndex = 1; // // panel33 @@ -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(133, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(5); + this.panel33.Location = new System.Drawing.Point(122, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(1955, 442); + this.panel33.Size = new System.Drawing.Size(1792, 386); this.panel33.TabIndex = 1; // // panel35 @@ -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); + this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel35.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(1822, 442); + this.panel35.Size = new System.Drawing.Size(1670, 386); this.panel35.TabIndex = 1; // // panel37 @@ -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); + this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel37.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(1822, 442); + this.panel37.Size = new System.Drawing.Size(1670, 386); this.panel37.TabIndex = 1; // // panel40 @@ -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); + this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel40.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(1822, 442); + this.panel40.Size = new System.Drawing.Size(1670, 386); this.panel40.TabIndex = 1; // // panel42 @@ -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); + this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel42.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(1689, 442); + this.panel42.Size = new System.Drawing.Size(1548, 386); this.panel42.TabIndex = 1; // // panel39 @@ -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); + this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel39.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(1556, 442); + this.panel39.Size = new System.Drawing.Size(1426, 386); this.panel39.TabIndex = 1; // // lbDevState // this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbDevState.Location = new System.Drawing.Point(607, 333); + this.lbDevState.Location = new System.Drawing.Point(556, 291); this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbDevState.Name = "lbDevState"; - this.lbDevState.Size = new System.Drawing.Size(378, 66); + this.lbDevState.Size = new System.Drawing.Size(347, 58); this.lbDevState.TabIndex = 16; this.lbDevState.Text = "设备已连接"; this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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(240, 333); - this.textBox2.Margin = new System.Windows.Forms.Padding(5); + this.textBox2.Location = new System.Drawing.Point(220, 291); + this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(329, 74); + this.textBox2.Size = new System.Drawing.Size(302, 65); this.textBox2.TabIndex = 13; // // label18 // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(44, 347); + this.label18.Location = new System.Drawing.Point(40, 304); this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(202, 58); + this.label18.Size = new System.Drawing.Size(178, 51); this.label18.TabIndex = 12; this.label18.Text = "数量："; // @@ -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(661, 203); + this.label19.Location = new System.Drawing.Point(606, 178); this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(265, 58); + this.label19.Size = new System.Drawing.Size(238, 51); this.label19.TabIndex = 11; this.label19.Text = "(yyMMdd)"; // @@ -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(243, 197); - this.textBox1.Margin = new System.Windows.Forms.Padding(5); + this.textBox1.Location = new System.Drawing.Point(223, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(328, 74); + this.textBox1.Size = new System.Drawing.Size(301, 65); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(45, 213); + this.label20.Location = new System.Drawing.Point(41, 186); this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(202, 58); + this.label20.Size = new System.Drawing.Size(178, 51); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -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(243, 72); - this.comboBox2.Margin = new System.Windows.Forms.Padding(5); + this.comboBox2.Location = new System.Drawing.Point(223, 63); + this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(928, 56); + this.comboBox2.Size = new System.Drawing.Size(851, 50); this.comboBox2.TabIndex = 8; this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); // @@ -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(45, 80); + this.label21.Location = new System.Drawing.Point(41, 70); this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(202, 58); + this.label21.Size = new System.Drawing.Size(178, 51); this.label21.TabIndex = 7; this.label21.Text = "产品："; // @@ -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(1556, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(5); + this.panel43.Location = new System.Drawing.Point(1426, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(133, 442); + this.panel43.Size = new System.Drawing.Size(122, 386); this.panel43.TabIndex = 0; // // label23 @@ -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(133, 442); + this.label23.Size = new System.Drawing.Size(122, 386); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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(1689, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(5); + this.panel41.Location = new System.Drawing.Point(1548, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(133, 442); + this.panel41.Size = new System.Drawing.Size(122, 386); this.panel41.TabIndex = 0; // // label22 @@ -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(133, 442); + this.label22.Size = new System.Drawing.Size(122, 386); this.label22.TabIndex = 0; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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(1822, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(5); + this.panel34.Location = new System.Drawing.Point(1670, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(133, 442); + this.panel34.Size = new System.Drawing.Size(122, 386); this.panel34.TabIndex = 0; // // label15 @@ -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(133, 442); + this.label15.Size = new System.Drawing.Size(122, 386); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel32.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(133, 442); + this.panel32.Size = new System.Drawing.Size(122, 386); this.panel32.TabIndex = 0; // // label14 @@ -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(133, 442); + this.label14.Size = new System.Drawing.Size(122, 386); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel30.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(133, 442); + this.panel30.Size = new System.Drawing.Size(122, 386); this.panel30.TabIndex = 0; // // label13 @@ -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(133, 442); + this.label13.Size = new System.Drawing.Size(122, 386); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel28.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(339, 442); + this.panel28.Size = new System.Drawing.Size(311, 386); this.panel28.TabIndex = 0; // // label12 @@ -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(339, 442); + this.label12.Size = new System.Drawing.Size(311, 386); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(2560, 1115); + this.panel24.Size = new System.Drawing.Size(2347, 976); this.panel24.TabIndex = 0; // // panel26 @@ -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(415, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5); + this.panel26.Location = new System.Drawing.Point(380, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2145, 1115); + this.panel26.Size = new System.Drawing.Size(1967, 976); this.panel26.TabIndex = 1; // // panel45 @@ -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(323, 677); - this.panel45.Margin = new System.Windows.Forms.Padding(5); + this.panel45.Location = new System.Drawing.Point(296, 592); + this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1397, 151); + this.panel45.Size = new System.Drawing.Size(1281, 132); this.panel45.TabIndex = 2; // // button3 // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1232, 43); - this.button3.Margin = new System.Windows.Forms.Padding(5); + this.button3.Location = new System.Drawing.Point(1129, 38); + this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(160, 59); + this.button3.Size = new System.Drawing.Size(147, 52); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -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(1037, 43); - this.button4.Margin = new System.Windows.Forms.Padding(5); + this.button4.Location = new System.Drawing.Point(951, 38); + this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(160, 59); + this.button4.Size = new System.Drawing.Size(147, 52); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -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(336, 45); - this.textBox4.Margin = new System.Windows.Forms.Padding(5); + this.textBox4.Location = new System.Drawing.Point(308, 39); + this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(660, 55); + this.textBox4.Size = new System.Drawing.Size(605, 49); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(28, 53); + this.label25.Location = new System.Drawing.Point(26, 46); this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(319, 42); + this.label25.Size = new System.Drawing.Size(283, 37); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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(360, 363); - this.panel44.Margin = new System.Windows.Forms.Padding(5); + this.panel44.Location = new System.Drawing.Point(330, 318); + this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1397, 151); + this.panel44.Size = new System.Drawing.Size(1281, 132); this.panel44.TabIndex = 1; // // button2 // this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1197, 43); - this.button2.Margin = new System.Windows.Forms.Padding(5); + this.button2.Location = new System.Drawing.Point(1097, 38); + this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(160, 59); + this.button2.Size = new System.Drawing.Size(147, 52); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -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(1027, 40); - this.button1.Margin = new System.Windows.Forms.Padding(5); + this.button1.Location = new System.Drawing.Point(941, 35); + this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(160, 59); + this.button1.Size = new System.Drawing.Size(147, 52); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -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(208, 43); - this.textBox3.Margin = new System.Windows.Forms.Padding(5); + this.textBox3.Location = new System.Drawing.Point(191, 38); + this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(737, 55); + this.textBox3.Size = new System.Drawing.Size(676, 49); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(27, 53); + this.label24.Location = new System.Drawing.Point(25, 46); this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(190, 42); + this.label24.Size = new System.Drawing.Size(169, 37); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -754,14 +754,14 @@ this.glacialList1.ItemHeight = 57; this.glacialList1.ItemWordWrap = false; this.glacialList1.Location = new System.Drawing.Point(0, 0); - this.glacialList1.Margin = new System.Windows.Forms.Padding(5); + this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2145, 1115); + this.glacialList1.Size = new System.Drawing.Size(1967, 976); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -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); + this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(415, 1115); + this.panel25.Size = new System.Drawing.Size(380, 976); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -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, 464); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -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, 5); - this.panel38.Margin = new System.Windows.Forms.Padding(5); + this.panel38.Location = new System.Drawing.Point(5, 4); + this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(404, 641); + this.panel38.Size = new System.Drawing.Size(370, 561); this.panel38.TabIndex = 1; // // label27 // this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(-3, 195); + this.label27.Location = new System.Drawing.Point(-3, 171); this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(317, 83); + this.label27.Size = new System.Drawing.Size(291, 73); this.label27.TabIndex = 3; this.label27.Text = "9999"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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, 155); + this.label26.Location = new System.Drawing.Point(0, 136); this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(169, 37); + this.label26.Size = new System.Drawing.Size(151, 33); this.label26.TabIndex = 2; this.label26.Text = "完成数量"; // // label17 // this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(-3, 56); + this.label17.Location = new System.Drawing.Point(-3, 49); this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(317, 85); + this.label17.Size = new System.Drawing.Size(291, 74); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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, 11); + this.label16.Location = new System.Drawing.Point(0, 10); this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(169, 37); + this.label16.Size = new System.Drawing.Size(151, 33); this.label16.TabIndex = 0; this.label16.Text = "计划数量"; // @@ -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); + this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(415, 464); + this.panel36.Size = new System.Drawing.Size(380, 406); this.panel36.TabIndex = 0; // // tableLayoutPanel1 @@ -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, 5, 4, 5); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 464F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 406F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -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(403, 464); + this.label11.Size = new System.Drawing.Size(370, 406); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -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); + this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(2560, 104); + this.panel8.Size = new System.Drawing.Size(2347, 91); this.panel8.TabIndex = 0; // // panel10 @@ -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(415, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5); + this.panel10.Location = new System.Drawing.Point(380, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2145, 104); + this.panel10.Size = new System.Drawing.Size(1967, 91); this.panel10.TabIndex = 2; // // panel12 @@ -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(492, 0); - this.panel12.Margin = new System.Windows.Forms.Padding(5); + this.panel12.Location = new System.Drawing.Point(451, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1653, 104); + this.panel12.Size = new System.Drawing.Size(1516, 91); this.panel12.TabIndex = 1; // // panel16 @@ -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(509, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(5); + this.panel16.Location = new System.Drawing.Point(467, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1144, 104); + this.panel16.Size = new System.Drawing.Size(1049, 91); this.panel16.TabIndex = 1; // // panel20 @@ -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(467, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(5); + this.panel20.Location = new System.Drawing.Point(428, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(677, 104); + this.panel20.Size = new System.Drawing.Size(621, 91); this.panel20.TabIndex = 1; // // label10 @@ -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(372, 0); + this.label10.Location = new System.Drawing.Point(341, 0); this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(305, 104); + this.label10.Size = new System.Drawing.Size(280, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel22.Name = "panel22"; - this.panel22.Size = new System.Drawing.Size(372, 104); + this.panel22.Size = new System.Drawing.Size(341, 91); this.panel22.TabIndex = 0; // // label9 @@ -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(372, 104); + this.label9.Size = new System.Drawing.Size(341, 91); this.label9.TabIndex = 0; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel19.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(467, 104); + this.panel19.Size = new System.Drawing.Size(428, 91); this.panel19.TabIndex = 0; // // label8 @@ -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(220, 0); + this.label8.Location = new System.Drawing.Point(202, 0); this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(247, 104); + this.label8.Size = new System.Drawing.Size(226, 91); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(220, 104); + this.panel21.Size = new System.Drawing.Size(202, 91); this.panel21.TabIndex = 0; // // label7 @@ -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(220, 104); + this.label7.Size = new System.Drawing.Size(202, 91); this.label7.TabIndex = 0; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(509, 104); + this.panel15.Size = new System.Drawing.Size(467, 91); this.panel15.TabIndex = 0; // // panel18 // this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(220, 0); - this.panel18.Margin = new System.Windows.Forms.Padding(5); + this.panel18.Location = new System.Drawing.Point(202, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(289, 104); + this.panel18.Size = new System.Drawing.Size(265, 91); this.panel18.TabIndex = 1; // // label6 @@ -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(289, 104); + this.label6.Size = new System.Drawing.Size(265, 91); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(220, 104); + this.panel17.Size = new System.Drawing.Size(202, 91); this.panel17.TabIndex = 0; // // label5 @@ -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(220, 104); + this.label5.Size = new System.Drawing.Size(202, 91); this.label5.TabIndex = 0; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(492, 104); + this.panel11.Size = new System.Drawing.Size(451, 91); this.panel11.TabIndex = 0; // // panel14 // this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(220, 0); - this.panel14.Margin = new System.Windows.Forms.Padding(5); + this.panel14.Location = new System.Drawing.Point(202, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(272, 104); + this.panel14.Size = new System.Drawing.Size(249, 91); this.panel14.TabIndex = 1; // // comboBox1 @@ -1122,9 +1122,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(5); + this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(272, 93); + this.comboBox1.Size = new System.Drawing.Size(249, 83); this.comboBox1.TabIndex = 0; // // panel13 @@ -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); + this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(220, 104); + this.panel13.Size = new System.Drawing.Size(202, 91); this.panel13.TabIndex = 0; // // label4 @@ -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(220, 104); + this.label4.Size = new System.Drawing.Size(202, 91); this.label4.TabIndex = 0; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(415, 104); + this.panel9.Size = new System.Drawing.Size(380, 91); this.panel9.TabIndex = 0; // // label3 @@ -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(415, 104); + this.label3.Size = new System.Drawing.Size(380, 91); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2560, 168); + this.panel2.Size = new System.Drawing.Size(2347, 147); this.panel2.TabIndex = 0; // // panel4 @@ -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(339, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(5); + this.panel4.Location = new System.Drawing.Point(311, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2221, 168); + this.panel4.Size = new System.Drawing.Size(2036, 147); this.panel4.TabIndex = 1; // // panel6 @@ -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); + this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1837, 168); + this.panel6.Size = new System.Drawing.Size(1684, 147); this.panel6.TabIndex = 1; // // btnBarCodeWithBox @@ -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(237, 163); + this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143); 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(1837, 168); + this.label1.Size = new System.Drawing.Size(1684, 147); this.label1.TabIndex = 0; this.label1.Text = "注塑车间条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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(1837, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(5); + this.panel5.Location = new System.Drawing.Point(1684, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(384, 168); + this.panel5.Size = new System.Drawing.Size(352, 147); this.panel5.TabIndex = 0; // // label2 @@ -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(384, 168); + this.label2.Size = new System.Drawing.Size(352, 147); this.label2.TabIndex = 0; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -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); + this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(339, 168); + this.panel3.Size = new System.Drawing.Size(311, 147); this.panel3.TabIndex = 0; // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(5, 5); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(5); + this.pictureBox1.Location = new System.Drawing.Point(5, 4); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(335, 159); + this.pictureBox1.Size = new System.Drawing.Size(307, 139); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1315,12 +1315,12 @@ // // FrmMain2411 // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2560, 1829); + this.ClientSize = new System.Drawing.Size(2347, 1600); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(5); + this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.Name = "FrmMain2411"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/InjectionPC/FrmMainNew.Designer.cs b/InjectionPC/FrmMainNew.Designer.cs index c73af52..d460853 100644 --- a/InjectionPC/FrmMainNew.Designer.cs +++ b/InjectionPC/FrmMainNew.Designer.cs @@ -170,8 +170,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.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1280, 876); + this.panel1.Size = new System.Drawing.Size(2347, 1533); this.panel1.TabIndex = 0; // // panel7 @@ -180,9 +181,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, 84); + this.panel7.Location = new System.Drawing.Point(0, 147); + this.panel7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(1280, 792); + this.panel7.Size = new System.Drawing.Size(2347, 1386); this.panel7.TabIndex = 1; // // panel23 @@ -190,9 +192,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, 52); + this.panel23.Location = new System.Drawing.Point(0, 91); + this.panel23.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(1280, 740); + this.panel23.Size = new System.Drawing.Size(2347, 1295); this.panel23.TabIndex = 1; // // panel27 @@ -200,9 +203,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, 622); + this.panel27.Location = new System.Drawing.Point(0, 1088); + this.panel27.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(1280, 118); + this.panel27.Size = new System.Drawing.Size(2347, 207); this.panel27.TabIndex = 1; // // panel29 @@ -210,9 +214,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(169, 0); + this.panel29.Location = new System.Drawing.Point(310, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(1111, 118); + this.panel29.Size = new System.Drawing.Size(2037, 207); this.panel29.TabIndex = 1; // // panel31 @@ -220,9 +225,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(73, 0); + this.panel31.Location = new System.Drawing.Point(134, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(1038, 118); + this.panel31.Size = new System.Drawing.Size(1903, 207); this.panel31.TabIndex = 1; // // panel33 @@ -230,9 +236,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(73, 0); + this.panel33.Location = new System.Drawing.Point(134, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(965, 118); + this.panel33.Size = new System.Drawing.Size(1769, 207); this.panel33.TabIndex = 1; // // panel35 @@ -241,8 +248,9 @@ this.panel35.Controls.Add(this.panel36); 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.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(892, 118); + this.panel35.Size = new System.Drawing.Size(1635, 207); this.panel35.TabIndex = 1; // // panel37 @@ -250,8 +258,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.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(819, 118); + this.panel37.Size = new System.Drawing.Size(1501, 207); this.panel37.TabIndex = 1; // // panel40 @@ -260,8 +269,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.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(819, 118); + this.panel40.Size = new System.Drawing.Size(1501, 207); this.panel40.TabIndex = 1; // // panel42 @@ -270,8 +280,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.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(746, 118); + this.panel42.Size = new System.Drawing.Size(1367, 207); this.panel42.TabIndex = 1; // // panel39 @@ -287,25 +298,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.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(673, 118); + this.panel39.Size = new System.Drawing.Size(1233, 207); 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(120, 167); + this.textBox2.Location = new System.Drawing.Point(220, 292); + this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(167, 41); + this.textBox2.Size = new System.Drawing.Size(303, 65); this.textBox2.TabIndex = 13; // // label18 // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(22, 173); + this.label18.Location = new System.Drawing.Point(40, 303); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(103, 29); + this.label18.Size = new System.Drawing.Size(178, 51); this.label18.TabIndex = 12; this.label18.Text = "数量："; // @@ -313,27 +327,30 @@ // 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(331, 101); + this.label19.Location = new System.Drawing.Point(607, 177); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(141, 29); + this.label19.Size = new System.Drawing.Size(238, 51); this.label19.TabIndex = 11; this.label19.Text = "(yyMMdd)"; // // textBox1 // 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(121, 98); + this.textBox1.Location = new System.Drawing.Point(222, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(166, 41); + this.textBox1.Size = new System.Drawing.Size(301, 65); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(23, 106); + this.label20.Location = new System.Drawing.Point(42, 186); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(103, 29); + this.label20.Size = new System.Drawing.Size(178, 51); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -342,18 +359,20 @@ this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(121, 36); + this.comboBox2.Location = new System.Drawing.Point(222, 63); + this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(505, 37); + this.comboBox2.Size = new System.Drawing.Size(923, 59); this.comboBox2.TabIndex = 8; // // label21 // 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(23, 40); + this.label21.Location = new System.Drawing.Point(42, 70); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(103, 29); + this.label21.Size = new System.Drawing.Size(178, 51); this.label21.TabIndex = 7; this.label21.Text = "产品："; // @@ -361,9 +380,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(673, 0); + this.panel43.Location = new System.Drawing.Point(1233, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(73, 118); + this.panel43.Size = new System.Drawing.Size(134, 207); this.panel43.TabIndex = 0; // // label23 @@ -372,8 +392,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.Name = "label23"; - this.label23.Size = new System.Drawing.Size(73, 118); + this.label23.Size = new System.Drawing.Size(134, 207); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -383,9 +404,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(746, 0); + this.panel41.Location = new System.Drawing.Point(1367, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(73, 118); + this.panel41.Size = new System.Drawing.Size(134, 207); this.panel41.TabIndex = 0; // // label22 @@ -394,8 +416,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.Name = "label22"; - this.label22.Size = new System.Drawing.Size(73, 118); + this.label22.Size = new System.Drawing.Size(134, 207); this.label22.TabIndex = 0; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -405,9 +428,10 @@ // this.panel36.Controls.Add(this.label16); this.panel36.Dock = System.Windows.Forms.DockStyle.Right; - this.panel36.Location = new System.Drawing.Point(819, 0); + this.panel36.Location = new System.Drawing.Point(1501, 0); + this.panel36.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(73, 118); + this.panel36.Size = new System.Drawing.Size(134, 207); this.panel36.TabIndex = 0; // // label16 @@ -416,8 +440,9 @@ this.label16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Location = new System.Drawing.Point(0, 0); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(73, 118); + this.label16.Size = new System.Drawing.Size(134, 207); this.label16.TabIndex = 0; this.label16.Text = "装箱校验"; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -427,9 +452,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(892, 0); + this.panel34.Location = new System.Drawing.Point(1635, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(73, 118); + this.panel34.Size = new System.Drawing.Size(134, 207); this.panel34.TabIndex = 0; // // label15 @@ -438,8 +464,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.Name = "label15"; - this.label15.Size = new System.Drawing.Size(73, 118); + this.label15.Size = new System.Drawing.Size(134, 207); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -450,8 +477,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.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(73, 118); + this.panel32.Size = new System.Drawing.Size(134, 207); this.panel32.TabIndex = 0; // // label14 @@ -460,8 +488,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.Name = "label14"; - this.label14.Size = new System.Drawing.Size(73, 118); + this.label14.Size = new System.Drawing.Size(134, 207); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -472,8 +501,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.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(73, 118); + this.panel30.Size = new System.Drawing.Size(134, 207); this.panel30.TabIndex = 0; // // label13 @@ -482,8 +512,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.Name = "label13"; - this.label13.Size = new System.Drawing.Size(73, 118); + this.label13.Size = new System.Drawing.Size(134, 207); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -494,8 +525,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.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(169, 118); + this.panel28.Size = new System.Drawing.Size(310, 207); this.panel28.TabIndex = 0; // // label12 @@ -505,8 +537,9 @@ this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label12.Location = new System.Drawing.Point(0, 0); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(169, 118); + this.label12.Size = new System.Drawing.Size(310, 207); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -517,8 +550,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.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(1280, 622); + this.panel24.Size = new System.Drawing.Size(2347, 1088); this.panel24.TabIndex = 0; // // panel26 @@ -527,9 +561,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(169, 0); + this.panel26.Location = new System.Drawing.Point(310, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(1111, 622); + this.panel26.Size = new System.Drawing.Size(2037, 1088); this.panel26.TabIndex = 1; // // panel45 @@ -538,17 +573,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(174, 486); + this.panel45.Location = new System.Drawing.Point(319, 850); + this.panel45.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(699, 76); + this.panel45.Size = new System.Drawing.Size(1282, 133); 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(616, 21); + this.button3.Location = new System.Drawing.Point(1129, 37); + this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(80, 30); + this.button3.Size = new System.Drawing.Size(147, 52); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -557,9 +594,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(519, 22); + this.button4.Location = new System.Drawing.Point(952, 38); + this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(80, 30); + this.button4.Size = new System.Drawing.Size(147, 52); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -568,18 +606,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(168, 23); + this.textBox4.Location = new System.Drawing.Point(308, 40); + this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(332, 31); + this.textBox4.Size = new System.Drawing.Size(605, 49); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(14, 26); + this.label25.Location = new System.Drawing.Point(26, 46); + this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(164, 21); + this.label25.Size = new System.Drawing.Size(283, 37); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -592,17 +632,19 @@ this.panel44.Controls.Add(this.button2); this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); - this.panel44.Location = new System.Drawing.Point(174, 335); + this.panel44.Location = new System.Drawing.Point(319, 586); + this.panel44.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(699, 120); + this.panel44.Size = new System.Drawing.Size(1280, 208); this.panel44.TabIndex = 1; // // textBox5 // this.textBox5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox5.Location = new System.Drawing.Point(119, 69); + this.textBox5.Location = new System.Drawing.Point(218, 121); + this.textBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(371, 31); + this.textBox5.Size = new System.Drawing.Size(677, 49); this.textBox5.TabIndex = 5; this.textBox5.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox5_KeyDown); // @@ -610,9 +652,10 @@ // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(13, 73); + this.label17.Location = new System.Drawing.Point(24, 128); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(120, 21); + this.label17.Size = new System.Drawing.Size(207, 37); this.label17.TabIndex = 4; this.label17.Text = "塑件条码："; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -620,9 +663,10 @@ // 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(582, 26); + this.button2.Location = new System.Drawing.Point(1067, 46); + this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(80, 30); + this.button2.Size = new System.Drawing.Size(147, 52); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -631,18 +675,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(118, 22); + this.textBox3.Location = new System.Drawing.Point(216, 38); + this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(371, 31); + this.textBox3.Size = new System.Drawing.Size(677, 49); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(13, 26); + this.label24.Location = new System.Drawing.Point(24, 46); + this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(98, 21); + this.label24.Size = new System.Drawing.Size(169, 37); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -713,13 +759,14 @@ this.glacialList1.ItemHeight = 30; 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.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(1111, 622); + this.glacialList1.Size = new System.Drawing.Size(2037, 1088); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -730,8 +777,9 @@ this.panel25.Controls.Add(this.label11); 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.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(169, 622); + this.panel25.Size = new System.Drawing.Size(310, 1088); this.panel25.TabIndex = 0; // // label11 @@ -740,8 +788,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.Name = "label11"; - this.label11.Size = new System.Drawing.Size(169, 622); + this.label11.Size = new System.Drawing.Size(310, 1088); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -752,8 +801,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.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1280, 52); + this.panel8.Size = new System.Drawing.Size(2347, 91); this.panel8.TabIndex = 0; // // panel10 @@ -761,9 +811,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(169, 0); + this.panel10.Location = new System.Drawing.Point(310, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(1111, 52); + this.panel10.Size = new System.Drawing.Size(2037, 91); this.panel10.TabIndex = 1; // // panel12 @@ -771,9 +822,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(246, 0); + this.panel12.Location = new System.Drawing.Point(451, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(865, 52); + this.panel12.Size = new System.Drawing.Size(1586, 91); this.panel12.TabIndex = 1; // // panel16 @@ -781,9 +833,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(255, 0); + this.panel16.Location = new System.Drawing.Point(468, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(610, 52); + this.panel16.Size = new System.Drawing.Size(1118, 91); this.panel16.TabIndex = 1; // // panel20 @@ -791,9 +844,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(233, 0); + this.panel20.Location = new System.Drawing.Point(427, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(377, 52); + this.panel20.Size = new System.Drawing.Size(691, 91); this.panel20.TabIndex = 1; // // label10 @@ -801,9 +855,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(186, 0); + this.label10.Location = new System.Drawing.Point(341, 0); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(191, 52); + this.label10.Size = new System.Drawing.Size(350, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -814,8 +869,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.Name = "panel22"; - this.panel22.Size = new System.Drawing.Size(186, 52); + this.panel22.Size = new System.Drawing.Size(341, 91); this.panel22.TabIndex = 0; // // label9 @@ -825,8 +881,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.Name = "label9"; - this.label9.Size = new System.Drawing.Size(186, 52); + this.label9.Size = new System.Drawing.Size(341, 91); this.label9.TabIndex = 0; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -838,8 +895,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.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(233, 52); + this.panel19.Size = new System.Drawing.Size(427, 91); this.panel19.TabIndex = 0; // // label8 @@ -847,9 +905,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(110, 0); + this.label8.Location = new System.Drawing.Point(202, 0); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(123, 52); + this.label8.Size = new System.Drawing.Size(225, 91); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -859,8 +918,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.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(110, 52); + this.panel21.Size = new System.Drawing.Size(202, 91); this.panel21.TabIndex = 0; // // label7 @@ -870,8 +930,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.Name = "label7"; - this.label7.Size = new System.Drawing.Size(110, 52); + this.label7.Size = new System.Drawing.Size(202, 91); this.label7.TabIndex = 0; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -882,17 +943,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.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(255, 52); + this.panel15.Size = new System.Drawing.Size(468, 91); this.panel15.TabIndex = 0; // // panel18 // this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(110, 0); + this.panel18.Location = new System.Drawing.Point(202, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(145, 52); + this.panel18.Size = new System.Drawing.Size(266, 91); this.panel18.TabIndex = 1; // // label6 @@ -901,8 +964,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.Name = "label6"; - this.label6.Size = new System.Drawing.Size(145, 52); + this.label6.Size = new System.Drawing.Size(266, 91); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -912,8 +976,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.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(110, 52); + this.panel17.Size = new System.Drawing.Size(202, 91); this.panel17.TabIndex = 0; // // label5 @@ -923,8 +988,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.Name = "label5"; - this.label5.Size = new System.Drawing.Size(110, 52); + this.label5.Size = new System.Drawing.Size(202, 91); this.label5.TabIndex = 0; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -935,17 +1001,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.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(246, 52); + this.panel11.Size = new System.Drawing.Size(451, 91); this.panel11.TabIndex = 0; // // panel14 // this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(110, 0); + this.panel14.Location = new System.Drawing.Point(202, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(136, 52); + this.panel14.Size = new System.Drawing.Size(249, 91); this.panel14.TabIndex = 1; // // comboBox1 @@ -958,8 +1026,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.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(136, 51); + this.comboBox1.Size = new System.Drawing.Size(249, 83); this.comboBox1.TabIndex = 0; // // panel13 @@ -967,8 +1036,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.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(110, 52); + this.panel13.Size = new System.Drawing.Size(202, 91); this.panel13.TabIndex = 0; // // label4 @@ -978,8 +1048,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.Name = "label4"; - this.label4.Size = new System.Drawing.Size(110, 52); + this.label4.Size = new System.Drawing.Size(202, 91); this.label4.TabIndex = 0; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -989,8 +1060,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.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(169, 52); + this.panel9.Size = new System.Drawing.Size(310, 91); this.panel9.TabIndex = 0; // // label3 @@ -1000,8 +1072,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.Name = "label3"; - this.label3.Size = new System.Drawing.Size(169, 52); + this.label3.Size = new System.Drawing.Size(310, 91); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1012,8 +1085,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.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1280, 84); + this.panel2.Size = new System.Drawing.Size(2347, 147); this.panel2.TabIndex = 0; // // panel4 @@ -1021,9 +1095,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(169, 0); + this.panel4.Location = new System.Drawing.Point(310, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(1111, 84); + this.panel4.Size = new System.Drawing.Size(2037, 147); this.panel4.TabIndex = 1; // // panel6 @@ -1031,8 +1106,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.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(919, 84); + this.panel6.Size = new System.Drawing.Size(1685, 147); this.panel6.TabIndex = 1; // // label1 @@ -1041,8 +1117,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.Name = "label1"; - this.label1.Size = new System.Drawing.Size(919, 84); + this.label1.Size = new System.Drawing.Size(1685, 147); this.label1.TabIndex = 0; this.label1.Text = "注塑车间条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1051,9 +1128,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(919, 0); + this.panel5.Location = new System.Drawing.Point(1685, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(192, 84); + this.panel5.Size = new System.Drawing.Size(352, 147); this.panel5.TabIndex = 0; // // label2 @@ -1062,8 +1140,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.Name = "label2"; - this.label2.Size = new System.Drawing.Size(192, 84); + this.label2.Size = new System.Drawing.Size(352, 147); this.label2.TabIndex = 0; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1074,17 +1153,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.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(169, 84); + this.panel3.Size = new System.Drawing.Size(310, 147); this.panel3.TabIndex = 0; // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + this.pictureBox1.Location = new System.Drawing.Point(6, 5); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(169, 81); + this.pictureBox1.Size = new System.Drawing.Size(308, 140); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1099,11 +1180,12 @@ // // FrmMainNew // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1280, 876); + this.ClientSize = new System.Drawing.Size(2347, 1533); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmMainNew"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/InjectionPC/FrmMainNew.resx b/InjectionPC/FrmMainNew.resx index e0a3182..74f9863 100644 --- a/InjectionPC/FrmMainNew.resx +++ b/InjectionPC/FrmMainNew.resx @@ -121,361 +121,355 @@ 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 - q22C8fY24wAAAABJRU5ErkJggg== + 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 + RK5CYII= diff --git a/InjectionPC/FrmQuality.cs b/InjectionPC/FrmQuality.cs index a72eb22..708d4cb 100644 --- a/InjectionPC/FrmQuality.cs +++ b/InjectionPC/FrmQuality.cs @@ -542,7 +542,7 @@ namespace InjectionPC { if (boxTable.Rows[0]["IsPrint"].ToString() == "1") { - MessageBox.Show("请产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("该产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); reason = ""; txtScanBarCode.Text = ""; txtScanBarCode.TabIndex = 0; diff --git a/InjectionPC/Properties/AssemblyInfo.cs b/InjectionPC/Properties/AssemblyInfo.cs index 7aad544..c6346e5 100644 --- a/InjectionPC/Properties/AssemblyInfo.cs +++ b/InjectionPC/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.19")] -[assembly: AssemblyFileVersion("1.0.1.19")] +[assembly: AssemblyVersion("1.0.1.20")] +[assembly: AssemblyFileVersion("1.0.1.20")] diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs index 06688d2..2d75cf9 100644 --- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs +++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs @@ -119,6 +119,28 @@ namespace MESClassLibrary.BLL.BasicInfo db.AddInfoNew(local, md, tableName, isNew); } + /// + /// 传输错误,保存到tb_BarCodeFails表,等待重传 + /// + /// + /// + /// + /// + /// + /// + public void SaveBarCodeFails(LocalDBService local, string stationNo, string oneBarCode, int isRight ,string boxCode,string errMsg, string model, string remark, string partNo, string partName) + { + db.SaveBarCodeFails(local, stationNo, oneBarCode, isRight, boxCode, errMsg, model, remark,partNo, partName); + } + /// + /// 查询 报错条码错误记录列表 重传次数为3次 + /// + /// + /// + public DataTable GetFailedBarCode(LocalDBService local,string model,int repeatSendTimes) + { + return db.GetFailedBarCode(local, model, repeatSendTimes); + } //public bool Add_Info_New(LocalDBService local, BarCodeModel md, string tableName) //{ // try diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs index c6bdcb6..81b1d7e 100644 --- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs +++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs @@ -380,7 +380,51 @@ namespace MESClassLibrary.DAL.BasicInfo local.Exec_NonQuery(sql); } + public void SaveBarCodeFails(LocalDBService local, string stationNo, string oneBarCode, int isRight, string boxCode, string errMsg, string model, string remark, string partNo, string partName) + { + try + { + if (errMsg.Length > 500) + { + errMsg = errMsg.Substring(0, 500); + } + string sqlSelect = $" select * from tb_BarCodeFails where StationNo='{stationNo}' and OneBarCode='{oneBarCode}' and Model='{model}' "; + DataTable failTable = local.Exec_DataSet(sqlSelect).Tables[0]; + if(failTable.Rows.Count > 0) + { + string sqlUpdate = $" update tb_BarCodeFails set IsRight='{isRight}' ,RepeatTimes=RepeatTimes+1,NewBoxCode='{boxCode}',ErrMsg='{errMsg}',UpdateTime=getdate(), remark='{remark}'" + + $" where ID='{failTable.Rows[0]["ID"].ToString()}' "; + local.Exec_NonQuery(sqlUpdate); + } + else + { + string sqlInsert = "INSERT INTO tb_BarCodeFails (StationNo,OneBarCode,OldBoxCode,IsRight,ErrMsg,UpdateTime,Model,remark,PartNo,partName) " + + $"VALUES ('{stationNo}','{oneBarCode}','{boxCode}','{isRight}','{errMsg}', getdate(),'{model}','{remark}','{partNo}','{partName}')"; + local.Exec_NonQuery(sqlInsert); + } + + } + catch(Exception ex) + { + //异常也不用回滚,因此加了catch + return; + } + } + public DataTable GetFailedBarCode(LocalDBService local,string model, int repeatSendTimes) + { + try + { + string sql = $" select * from tb_BarCodeFails where IsRight=0 and RepeatTimes<={repeatSendTimes} and Model='{model}' order by id"; + DataTable failTable = local.Exec_DataSet(sql).Tables[0]; + return failTable; + } + catch + { + return null; + } + + } public int Add_ReprintRecord(DataRow dr,string userID,string userName) { string sql = "";