From 20965236c1d182effe95c762116b22d3acaf85ab Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Wed, 5 Mar 2025 10:20:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E6=8C=89=E7=AE=B1=E6=89=93,?= =?UTF-8?q?=E6=AD=BB=E9=94=81=E7=AD=89=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= =?UTF-8?q?,=E9=87=8D=E5=8F=91=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InjectionPC/FrmMain2408.Designer.cs | 546 +++++++++--------- InjectionPC/FrmMain2408.cs | 581 ++++++++------------ InjectionSearch/FrmBarCodeSearch2408.cs | 69 +-- MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs | 4 +- MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs | 4 +- MESWebSite/MESWebSite.csproj | 3 + MESWebSite/Manage/Index.aspx | 5 +- MESWebSite/Manage/YongHong/PaintS_JCJL.aspx | 2 +- 8 files changed, 510 insertions(+), 704 deletions(-) diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index 8853b44..235dd36 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -221,9 +221,9 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2666, 1600); + this.panel1.Size = new System.Drawing.Size(2908, 1829); this.panel1.TabIndex = 0; // // panel7 @@ -232,10 +232,10 @@ this.panel7.Controls.Add(this.panel8); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.panel7.Location = new System.Drawing.Point(0, 147); - this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel7.Location = new System.Drawing.Point(0, 168); + this.panel7.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2666, 1453); + this.panel7.Size = new System.Drawing.Size(2908, 1661); this.panel7.TabIndex = 1; // // panel23 @@ -243,10 +243,10 @@ this.panel23.Controls.Add(this.panel27); this.panel23.Controls.Add(this.panel24); this.panel23.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel23.Location = new System.Drawing.Point(0, 91); - this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel23.Location = new System.Drawing.Point(0, 104); + this.panel23.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(2666, 1362); + this.panel23.Size = new System.Drawing.Size(2908, 1557); this.panel23.TabIndex = 1; // // panel27 @@ -254,10 +254,10 @@ this.panel27.Controls.Add(this.panel29); this.panel27.Controls.Add(this.panel28); this.panel27.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel27.Location = new System.Drawing.Point(0, 976); - this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel27.Location = new System.Drawing.Point(0, 1115); + this.panel27.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(2666, 386); + this.panel27.Size = new System.Drawing.Size(2908, 442); this.panel27.TabIndex = 1; // // panel29 @@ -265,10 +265,10 @@ this.panel29.Controls.Add(this.panel31); this.panel29.Controls.Add(this.panel30); this.panel29.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel29.Location = new System.Drawing.Point(311, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel29.Location = new System.Drawing.Point(339, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(2355, 386); + this.panel29.Size = new System.Drawing.Size(2569, 442); this.panel29.TabIndex = 1; // // panel31 @@ -276,10 +276,10 @@ this.panel31.Controls.Add(this.panel33); this.panel31.Controls.Add(this.panel32); this.panel31.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel31.Location = new System.Drawing.Point(122, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel31.Location = new System.Drawing.Point(133, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(2233, 386); + this.panel31.Size = new System.Drawing.Size(2436, 442); this.panel31.TabIndex = 1; // // panel33 @@ -287,10 +287,10 @@ this.panel33.Controls.Add(this.panel35); this.panel33.Controls.Add(this.panel34); this.panel33.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel33.Location = new System.Drawing.Point(122, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel33.Location = new System.Drawing.Point(133, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(2111, 386); + this.panel33.Size = new System.Drawing.Size(2303, 442); this.panel33.TabIndex = 1; // // panel35 @@ -298,9 +298,9 @@ this.panel35.Controls.Add(this.panel37); this.panel35.Dock = System.Windows.Forms.DockStyle.Fill; this.panel35.Location = new System.Drawing.Point(0, 0); - this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel35.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel35.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(1989, 386); + this.panel35.Size = new System.Drawing.Size(2170, 442); this.panel35.TabIndex = 1; // // panel37 @@ -308,9 +308,9 @@ this.panel37.Controls.Add(this.panel40); this.panel37.Dock = System.Windows.Forms.DockStyle.Fill; this.panel37.Location = new System.Drawing.Point(0, 0); - this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel37.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel37.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(1989, 386); + this.panel37.Size = new System.Drawing.Size(2170, 442); this.panel37.TabIndex = 1; // // panel40 @@ -319,9 +319,9 @@ this.panel40.Controls.Add(this.panel41); this.panel40.Dock = System.Windows.Forms.DockStyle.Fill; this.panel40.Location = new System.Drawing.Point(0, 0); - this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel40.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel40.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(1989, 386); + this.panel40.Size = new System.Drawing.Size(2170, 442); this.panel40.TabIndex = 1; // // panel42 @@ -330,9 +330,9 @@ this.panel42.Controls.Add(this.panel43); this.panel42.Dock = System.Windows.Forms.DockStyle.Fill; this.panel42.Location = new System.Drawing.Point(0, 0); - this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel42.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel42.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(1867, 386); + this.panel42.Size = new System.Drawing.Size(2037, 442); this.panel42.TabIndex = 1; // // panel39 @@ -352,19 +352,19 @@ this.panel39.Controls.Add(this.label21); this.panel39.Dock = System.Windows.Forms.DockStyle.Fill; this.panel39.Location = new System.Drawing.Point(0, 0); - this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel39.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel39.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(1745, 386); + this.panel39.Size = new System.Drawing.Size(1904, 442); this.panel39.TabIndex = 1; // // lbDevState // this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbDevState.Location = new System.Drawing.Point(854, 239); + this.lbDevState.Location = new System.Drawing.Point(932, 273); this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbDevState.Name = "lbDevState"; - this.lbDevState.Size = new System.Drawing.Size(347, 58); + this.lbDevState.Size = new System.Drawing.Size(378, 66); this.lbDevState.TabIndex = 15; this.lbDevState.Text = "设备已连接"; this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -374,10 +374,10 @@ // this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbAddPrintR.Location = new System.Drawing.Point(532, 298); + this.lbAddPrintR.Location = new System.Drawing.Point(580, 341); this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbAddPrintR.Name = "lbAddPrintR"; - this.lbAddPrintR.Size = new System.Drawing.Size(314, 58); + this.lbAddPrintR.Size = new System.Drawing.Size(342, 66); this.lbAddPrintR.TabIndex = 3; this.lbAddPrintR.Text = "右条码添打"; this.lbAddPrintR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -387,10 +387,10 @@ // this.lbAddPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbAddPrintL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbAddPrintL.Location = new System.Drawing.Point(532, 239); + this.lbAddPrintL.Location = new System.Drawing.Point(580, 273); this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lbAddPrintL.Name = "lbAddPrintL"; - this.lbAddPrintL.Size = new System.Drawing.Size(314, 58); + this.lbAddPrintL.Size = new System.Drawing.Size(342, 66); this.lbAddPrintL.TabIndex = 2; this.lbAddPrintL.Text = "左条码添打"; this.lbAddPrintL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -402,10 +402,10 @@ this.cboxHandBox.Checked = true; this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked; this.cboxHandBox.Enabled = false; - this.cboxHandBox.Location = new System.Drawing.Point(924, 172); - this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4); + this.cboxHandBox.Location = new System.Drawing.Point(1008, 197); + this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboxHandBox.Name = "cboxHandBox"; - this.cboxHandBox.Size = new System.Drawing.Size(256, 55); + this.cboxHandBox.Size = new System.Drawing.Size(293, 62); this.cboxHandBox.TabIndex = 14; this.cboxHandBox.Tag = "true"; this.cboxHandBox.Text = "打印箱码"; @@ -415,20 +415,20 @@ // textBox2 // this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(220, 291); - this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.textBox2.Location = new System.Drawing.Point(240, 333); + this.textBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(302, 65); + this.textBox2.Size = new System.Drawing.Size(329, 74); this.textBox2.TabIndex = 13; // // label18 // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(40, 304); + this.label18.Location = new System.Drawing.Point(44, 347); this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(178, 51); + this.label18.Size = new System.Drawing.Size(202, 58); this.label18.TabIndex = 12; this.label18.Text = "数量："; // @@ -436,10 +436,10 @@ // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(606, 178); + this.label19.Location = new System.Drawing.Point(661, 203); this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(238, 51); + this.label19.Size = new System.Drawing.Size(265, 58); this.label19.TabIndex = 11; this.label19.Text = "(yyMMdd)"; // @@ -447,20 +447,20 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(223, 172); - this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.textBox1.Location = new System.Drawing.Point(243, 197); + this.textBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(301, 65); + this.textBox1.Size = new System.Drawing.Size(328, 74); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(41, 186); + this.label20.Location = new System.Drawing.Point(45, 213); this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(178, 51); + this.label20.Size = new System.Drawing.Size(202, 58); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -470,10 +470,10 @@ this.comboBox2.Enabled = false; this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(223, 63); - this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.comboBox2.Location = new System.Drawing.Point(243, 72); + this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(851, 50); + this.comboBox2.Size = new System.Drawing.Size(928, 56); this.comboBox2.TabIndex = 8; this.comboBox2.SelectedValueChanged += new System.EventHandler(this.comboBox2_SelectedValueChanged); this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); @@ -482,10 +482,10 @@ // this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(41, 70); + this.label21.Location = new System.Drawing.Point(45, 80); this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(178, 51); + this.label21.Size = new System.Drawing.Size(202, 58); this.label21.TabIndex = 7; this.label21.Text = "产品："; // @@ -493,10 +493,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(1745, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel43.Location = new System.Drawing.Point(1904, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(122, 386); + this.panel43.Size = new System.Drawing.Size(133, 442); this.panel43.TabIndex = 0; // // label23 @@ -507,7 +507,7 @@ this.label23.Location = new System.Drawing.Point(0, 0); this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(122, 386); + this.label23.Size = new System.Drawing.Size(133, 442); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -517,10 +517,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(1867, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel41.Location = new System.Drawing.Point(2037, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(122, 386); + this.panel41.Size = new System.Drawing.Size(133, 442); this.panel41.TabIndex = 0; // // label22 @@ -531,7 +531,7 @@ this.label22.Location = new System.Drawing.Point(0, 0); this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(122, 386); + this.label22.Size = new System.Drawing.Size(133, 442); this.label22.TabIndex = 1; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -541,10 +541,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(1989, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel34.Location = new System.Drawing.Point(2170, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(122, 386); + this.panel34.Size = new System.Drawing.Size(133, 442); this.panel34.TabIndex = 0; // // label15 @@ -555,7 +555,7 @@ this.label15.Location = new System.Drawing.Point(0, 0); this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(122, 386); + this.label15.Size = new System.Drawing.Size(133, 442); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -566,9 +566,9 @@ this.panel32.Controls.Add(this.label14); this.panel32.Dock = System.Windows.Forms.DockStyle.Left; this.panel32.Location = new System.Drawing.Point(0, 0); - this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel32.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel32.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(122, 386); + this.panel32.Size = new System.Drawing.Size(133, 442); this.panel32.TabIndex = 0; // // label14 @@ -579,7 +579,7 @@ this.label14.Location = new System.Drawing.Point(0, 0); this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(122, 386); + this.label14.Size = new System.Drawing.Size(133, 442); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -590,9 +590,9 @@ this.panel30.Controls.Add(this.label13); this.panel30.Dock = System.Windows.Forms.DockStyle.Left; this.panel30.Location = new System.Drawing.Point(0, 0); - this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel30.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel30.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(122, 386); + this.panel30.Size = new System.Drawing.Size(133, 442); this.panel30.TabIndex = 0; // // label13 @@ -603,7 +603,7 @@ this.label13.Location = new System.Drawing.Point(0, 0); this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(122, 386); + this.label13.Size = new System.Drawing.Size(133, 442); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -614,9 +614,9 @@ this.panel28.Controls.Add(this.label12); this.panel28.Dock = System.Windows.Forms.DockStyle.Left; this.panel28.Location = new System.Drawing.Point(0, 0); - this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel28.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel28.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(311, 386); + this.panel28.Size = new System.Drawing.Size(339, 442); this.panel28.TabIndex = 0; // // label12 @@ -628,7 +628,7 @@ this.label12.Location = new System.Drawing.Point(0, 0); this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(311, 386); + this.label12.Size = new System.Drawing.Size(339, 442); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -639,9 +639,9 @@ this.panel24.Controls.Add(this.panel25); this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); - this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel24.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(2666, 976); + this.panel24.Size = new System.Drawing.Size(2908, 1115); this.panel24.TabIndex = 0; // // panel26 @@ -650,10 +650,10 @@ this.panel26.Controls.Add(this.panel44); this.panel26.Controls.Add(this.glacialList1); this.panel26.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel26.Location = new System.Drawing.Point(380, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel26.Location = new System.Drawing.Point(415, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2286, 976); + this.panel26.Size = new System.Drawing.Size(2493, 1115); this.panel26.TabIndex = 1; // // panel45 @@ -663,19 +663,19 @@ this.panel45.Controls.Add(this.button4); this.panel45.Controls.Add(this.textBox4); this.panel45.Controls.Add(this.label25); - this.panel45.Location = new System.Drawing.Point(296, 592); - this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel45.Location = new System.Drawing.Point(323, 677); + this.panel45.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1281, 132); + this.panel45.Size = new System.Drawing.Size(1397, 151); this.panel45.TabIndex = 2; // // button3 // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1129, 38); - this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.button3.Location = new System.Drawing.Point(1232, 43); + this.button3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(147, 52); + this.button3.Size = new System.Drawing.Size(160, 59); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -684,10 +684,10 @@ // button4 // this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(951, 38); - this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.button4.Location = new System.Drawing.Point(1037, 43); + this.button4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(147, 52); + this.button4.Size = new System.Drawing.Size(160, 59); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -696,20 +696,20 @@ // textBox4 // this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox4.Location = new System.Drawing.Point(308, 39); - this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.textBox4.Location = new System.Drawing.Point(336, 45); + this.textBox4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(605, 49); + this.textBox4.Size = new System.Drawing.Size(660, 55); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(26, 46); + this.label25.Location = new System.Drawing.Point(28, 53); this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(283, 37); + this.label25.Size = new System.Drawing.Size(319, 42); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -721,19 +721,19 @@ this.panel44.Controls.Add(this.button1); this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); - this.panel44.Location = new System.Drawing.Point(330, 318); - this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel44.Location = new System.Drawing.Point(360, 363); + this.panel44.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1281, 132); + this.panel44.Size = new System.Drawing.Size(1397, 151); this.panel44.TabIndex = 1; // // button2 // this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1097, 38); - this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.button2.Location = new System.Drawing.Point(1197, 43); + this.button2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(147, 52); + this.button2.Size = new System.Drawing.Size(160, 59); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -742,10 +742,10 @@ // button1 // this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(941, 35); - this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.button1.Location = new System.Drawing.Point(1027, 40); + this.button1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(147, 52); + this.button1.Size = new System.Drawing.Size(160, 59); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -754,20 +754,20 @@ // textBox3 // this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(191, 38); - this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.textBox3.Location = new System.Drawing.Point(208, 43); + this.textBox3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(676, 49); + this.textBox3.Size = new System.Drawing.Size(737, 55); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(25, 46); + this.label24.Location = new System.Drawing.Point(27, 53); this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(169, 37); + this.label24.Size = new System.Drawing.Size(190, 42); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -835,17 +835,17 @@ this.glacialList1.HoverEvents = false; this.glacialList1.HoverTime = 1; this.glacialList1.ImageList = null; - this.glacialList1.ItemHeight = 50; + this.glacialList1.ItemHeight = 57; this.glacialList1.ItemWordWrap = false; this.glacialList1.Location = new System.Drawing.Point(0, 0); - this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2286, 976); + this.glacialList1.Size = new System.Drawing.Size(2493, 1115); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -858,9 +858,9 @@ this.panel25.Controls.Add(this.panel36); this.panel25.Dock = System.Windows.Forms.DockStyle.Left; this.panel25.Location = new System.Drawing.Point(0, 0); - this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel25.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(380, 976); + this.panel25.Size = new System.Drawing.Size(415, 1115); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -870,13 +870,13 @@ this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0); this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 299F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570); + this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -888,19 +888,19 @@ this.panel38.Controls.Add(this.label26); this.panel38.Controls.Add(this.label17); this.panel38.Controls.Add(this.label16); - this.panel38.Location = new System.Drawing.Point(5, 4); - this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel38.Location = new System.Drawing.Point(5, 5); + this.panel38.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(370, 252); + this.panel38.Size = new System.Drawing.Size(404, 288); this.panel38.TabIndex = 1; // // btn_lastBoxPrintR // this.btn_lastBoxPrintR.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintR.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 129); + this.btn_lastBoxPrintR.Location = new System.Drawing.Point(278, 147); this.btn_lastBoxPrintR.Name = "btn_lastBoxPrintR"; - this.btn_lastBoxPrintR.Size = new System.Drawing.Size(116, 123); + this.btn_lastBoxPrintR.Size = new System.Drawing.Size(127, 141); this.btn_lastBoxPrintR.TabIndex = 4; this.btn_lastBoxPrintR.Text = "右侧前一箱单"; this.btn_lastBoxPrintR.UseVisualStyleBackColor = false; @@ -910,9 +910,9 @@ // this.btn_lastBoxPrintL.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintL.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintL.Location = new System.Drawing.Point(255, 0); + this.btn_lastBoxPrintL.Location = new System.Drawing.Point(278, 0); this.btn_lastBoxPrintL.Name = "btn_lastBoxPrintL"; - this.btn_lastBoxPrintL.Size = new System.Drawing.Size(116, 123); + this.btn_lastBoxPrintL.Size = new System.Drawing.Size(127, 141); this.btn_lastBoxPrintL.TabIndex = 2; this.btn_lastBoxPrintL.Text = "左侧前一箱单"; this.btn_lastBoxPrintL.UseVisualStyleBackColor = false; @@ -921,10 +921,10 @@ // label27 // this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(-3, 171); + this.label27.Location = new System.Drawing.Point(-3, 195); this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(291, 73); + this.label27.Size = new System.Drawing.Size(317, 83); this.label27.TabIndex = 3; this.label27.Text = "9999"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -933,20 +933,20 @@ // this.label26.AutoSize = true; this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label26.Location = new System.Drawing.Point(0, 136); + this.label26.Location = new System.Drawing.Point(0, 155); this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(151, 33); + this.label26.Size = new System.Drawing.Size(169, 37); this.label26.TabIndex = 2; this.label26.Text = "完成数量"; // // label17 // this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(-3, 49); + this.label17.Location = new System.Drawing.Point(-3, 56); this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(291, 74); + this.label17.Size = new System.Drawing.Size(317, 85); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -955,10 +955,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(0, 10); + this.label16.Location = new System.Drawing.Point(0, 11); this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(151, 33); + this.label16.Size = new System.Drawing.Size(169, 37); this.label16.TabIndex = 0; this.label16.Text = "计划数量"; // @@ -968,11 +968,11 @@ this.groupBox1.Controls.Add(this.tableLayoutPanel3); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox1.Location = new System.Drawing.Point(4, 266); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Location = new System.Drawing.Point(4, 304); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(372, 300); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Size = new System.Drawing.Size(407, 342); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "模具2"; @@ -987,14 +987,14 @@ this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0); this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 32); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 37); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 264); + this.tableLayoutPanel3.Size = new System.Drawing.Size(399, 300); this.tableLayoutPanel3.TabIndex = 2; // // panel47 @@ -1005,10 +1005,10 @@ this.panel47.Controls.Add(this.lbNeedQtyR); this.panel47.Controls.Add(this.lbCurrentlQtyR); this.panel47.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel47.Location = new System.Drawing.Point(4, 179); - this.panel47.Margin = new System.Windows.Forms.Padding(4); + this.panel47.Location = new System.Drawing.Point(4, 204); + this.panel47.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel47.Name = "panel47"; - this.panel47.Size = new System.Drawing.Size(356, 81); + this.panel47.Size = new System.Drawing.Size(391, 91); this.panel47.TabIndex = 4; // // btnHandPrintR @@ -1016,10 +1016,10 @@ this.btnHandPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintR.Location = new System.Drawing.Point(247, 16); - this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4); + this.btnHandPrintR.Location = new System.Drawing.Point(269, 18); + this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnHandPrintR.Name = "btnHandPrintR"; - this.btnHandPrintR.Size = new System.Drawing.Size(115, 64); + this.btnHandPrintR.Size = new System.Drawing.Size(125, 73); this.btnHandPrintR.TabIndex = 3; this.btnHandPrintR.Text = "打印"; this.btnHandPrintR.UseVisualStyleBackColor = false; @@ -1029,10 +1029,10 @@ // this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(86, 25); + this.label30.Location = new System.Drawing.Point(94, 29); this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(50, 52); + this.label30.Size = new System.Drawing.Size(56, 59); this.label30.TabIndex = 2; this.label30.Text = "/"; // @@ -1040,10 +1040,10 @@ // this.lbNeedQtyR.AutoSize = true; this.lbNeedQtyR.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbNeedQtyR.Location = new System.Drawing.Point(160, 28); + this.lbNeedQtyR.Location = new System.Drawing.Point(175, 32); this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyR.Name = "lbNeedQtyR"; - this.lbNeedQtyR.Size = new System.Drawing.Size(50, 52); + this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59); this.lbNeedQtyR.TabIndex = 1; this.lbNeedQtyR.Text = "0"; // @@ -1051,10 +1051,10 @@ // this.lbCurrentlQtyR.AutoSize = true; this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyR.Location = new System.Drawing.Point(7, 27); + this.lbCurrentlQtyR.Location = new System.Drawing.Point(8, 31); this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyR.Name = "lbCurrentlQtyR"; - this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52); + this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59); this.lbCurrentlQtyR.TabIndex = 0; this.lbCurrentlQtyR.Text = "0"; this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1064,10 +1064,10 @@ this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label34.BackColor = System.Drawing.Color.Transparent; this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label34.Location = new System.Drawing.Point(5, 108); + this.label34.Location = new System.Drawing.Point(5, 122); this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(106, 46); + this.label34.Size = new System.Drawing.Size(116, 53); this.label34.TabIndex = 1; this.label34.Text = "规格:"; this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1078,10 +1078,10 @@ this.lbPackageCodeR.AutoSize = true; this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2); this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeR.Location = new System.Drawing.Point(4, 27); + this.lbPackageCodeR.Location = new System.Drawing.Point(4, 31); this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeR.Name = "lbPackageCodeR"; - this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33); + this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37); this.lbPackageCodeR.TabIndex = 5; // // panel49 @@ -1089,9 +1089,9 @@ this.panel49.Controls.Add(this.btnChangeSizeR); this.panel49.Controls.Add(this.comBoxSizeR); this.panel49.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel49.Location = new System.Drawing.Point(124, 90); + this.panel49.Location = new System.Drawing.Point(136, 102); this.panel49.Name = "panel49"; - this.panel49.Size = new System.Drawing.Size(237, 82); + this.panel49.Size = new System.Drawing.Size(260, 94); this.panel49.TabIndex = 6; // // btnChangeSizeR @@ -1099,10 +1099,10 @@ this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeR.Location = new System.Drawing.Point(127, 15); - this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4); + this.btnChangeSizeR.Location = new System.Drawing.Point(139, 17); + this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnChangeSizeR.Name = "btnChangeSizeR"; - this.btnChangeSizeR.Size = new System.Drawing.Size(121, 64); + this.btnChangeSizeR.Size = new System.Drawing.Size(132, 73); this.btnChangeSizeR.TabIndex = 4; this.btnChangeSizeR.Text = "调整"; this.btnChangeSizeR.UseVisualStyleBackColor = false; @@ -1115,10 +1115,10 @@ this.comBoxSizeR.Enabled = false; this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeR.FormattingEnabled = true; - this.comBoxSizeR.Location = new System.Drawing.Point(0, 18); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.comBoxSizeR.Location = new System.Drawing.Point(0, 21); + this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.comBoxSizeR.Name = "comBoxSizeR"; - this.comBoxSizeR.Size = new System.Drawing.Size(125, 64); + this.comBoxSizeR.Size = new System.Drawing.Size(136, 72); this.comBoxSizeR.TabIndex = 3; // // panel36 @@ -1126,26 +1126,26 @@ this.panel36.Controls.Add(this.tableLayoutPanel1); this.panel36.Dock = System.Windows.Forms.DockStyle.Top; this.panel36.Location = new System.Drawing.Point(0, 0); - this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel36.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(380, 406); + this.panel36.Size = new System.Drawing.Size(415, 464); this.panel36.TabIndex = 0; // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.99953F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406); + this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -1153,10 +1153,10 @@ this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.BackColor = System.Drawing.Color.DeepSkyBlue; this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label11.Location = new System.Drawing.Point(5, 18); + this.label11.Location = new System.Drawing.Point(5, 21); this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(370, 83); + this.label11.Size = new System.Drawing.Size(403, 95); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1167,11 +1167,11 @@ this.groupBox2.Controls.Add(this.tableLayoutPanel4); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold); - this.groupBox2.Location = new System.Drawing.Point(4, 105); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4); + this.groupBox2.Location = new System.Drawing.Point(4, 121); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4); - this.groupBox2.Size = new System.Drawing.Size(372, 297); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox2.Size = new System.Drawing.Size(407, 338); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "模具1&&手打"; @@ -1186,15 +1186,15 @@ this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 37); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 3; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 261); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(399, 296); this.tableLayoutPanel4.TabIndex = 3; // // label38 @@ -1202,10 +1202,10 @@ this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label38.BackColor = System.Drawing.Color.Transparent; this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(5, 106); + this.label38.Location = new System.Drawing.Point(5, 120); this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(106, 46); + this.label38.Size = new System.Drawing.Size(116, 53); this.label38.TabIndex = 1; this.label38.Text = "规格:"; this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1218,10 +1218,10 @@ this.panel46.Controls.Add(this.lbNeedQtyL); this.panel46.Controls.Add(this.lbCurrentlQtyL); this.panel46.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel46.Location = new System.Drawing.Point(4, 177); - this.panel46.Margin = new System.Windows.Forms.Padding(4); + this.panel46.Location = new System.Drawing.Point(4, 201); + this.panel46.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel46.Name = "panel46"; - this.panel46.Size = new System.Drawing.Size(356, 80); + this.panel46.Size = new System.Drawing.Size(391, 90); this.panel46.TabIndex = 4; // // btnHandPrintL @@ -1229,10 +1229,10 @@ this.btnHandPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintL.Location = new System.Drawing.Point(245, 13); - this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4); + this.btnHandPrintL.Location = new System.Drawing.Point(267, 15); + this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnHandPrintL.Name = "btnHandPrintL"; - this.btnHandPrintL.Size = new System.Drawing.Size(115, 64); + this.btnHandPrintL.Size = new System.Drawing.Size(125, 73); this.btnHandPrintL.TabIndex = 3; this.btnHandPrintL.Text = "打印"; this.btnHandPrintL.UseVisualStyleBackColor = false; @@ -1242,10 +1242,10 @@ // this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(83, 25); + this.label31.Location = new System.Drawing.Point(91, 29); this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(50, 52); + this.label31.Size = new System.Drawing.Size(56, 59); this.label31.TabIndex = 2; this.label31.Text = "/"; // @@ -1253,10 +1253,10 @@ // this.lbNeedQtyL.AutoSize = true; this.lbNeedQtyL.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbNeedQtyL.Location = new System.Drawing.Point(155, 28); + this.lbNeedQtyL.Location = new System.Drawing.Point(169, 32); this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyL.Name = "lbNeedQtyL"; - this.lbNeedQtyL.Size = new System.Drawing.Size(50, 52); + this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59); this.lbNeedQtyL.TabIndex = 1; this.lbNeedQtyL.Text = "0"; // @@ -1264,10 +1264,10 @@ // this.lbCurrentlQtyL.AutoSize = true; this.lbCurrentlQtyL.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyL.Location = new System.Drawing.Point(8, 27); + this.lbCurrentlQtyL.Location = new System.Drawing.Point(9, 31); this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyL.Name = "lbCurrentlQtyL"; - this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52); + this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59); this.lbCurrentlQtyL.TabIndex = 0; this.lbCurrentlQtyL.Text = "0"; this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1278,10 +1278,10 @@ this.lbPackageCodeL.AutoSize = true; this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2); this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeL.Location = new System.Drawing.Point(4, 26); + this.lbPackageCodeL.Location = new System.Drawing.Point(4, 30); this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeL.Name = "lbPackageCodeL"; - this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33); + this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); this.lbPackageCodeL.TabIndex = 5; // // panel48 @@ -1289,9 +1289,9 @@ this.panel48.Controls.Add(this.btnChangeSizeL); this.panel48.Controls.Add(this.comBoxSizeL); this.panel48.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel48.Location = new System.Drawing.Point(124, 89); + this.panel48.Location = new System.Drawing.Point(136, 101); this.panel48.Name = "panel48"; - this.panel48.Size = new System.Drawing.Size(237, 81); + this.panel48.Size = new System.Drawing.Size(260, 92); this.panel48.TabIndex = 6; // // btnChangeSizeL @@ -1299,10 +1299,10 @@ this.btnChangeSizeL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeL.Location = new System.Drawing.Point(127, 10); - this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4); + this.btnChangeSizeL.Location = new System.Drawing.Point(139, 11); + this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnChangeSizeL.Name = "btnChangeSizeL"; - this.btnChangeSizeL.Size = new System.Drawing.Size(115, 64); + this.btnChangeSizeL.Size = new System.Drawing.Size(125, 73); this.btnChangeSizeL.TabIndex = 4; this.btnChangeSizeL.Text = "调整"; this.btnChangeSizeL.UseVisualStyleBackColor = false; @@ -1315,10 +1315,10 @@ this.comBoxSizeL.Enabled = false; this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeL.FormattingEnabled = true; - this.comBoxSizeL.Location = new System.Drawing.Point(2, 9); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.comBoxSizeL.Location = new System.Drawing.Point(2, 10); + this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(125, 64); + this.comBoxSizeL.Size = new System.Drawing.Size(136, 72); this.comBoxSizeL.TabIndex = 3; // // panel8 @@ -1327,9 +1327,9 @@ this.panel8.Controls.Add(this.panel9); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel8.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(2666, 91); + this.panel8.Size = new System.Drawing.Size(2908, 104); this.panel8.TabIndex = 0; // // panel10 @@ -1337,10 +1337,10 @@ this.panel10.Controls.Add(this.panel12); this.panel10.Controls.Add(this.panel11); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel10.Location = new System.Drawing.Point(380, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel10.Location = new System.Drawing.Point(415, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2286, 91); + this.panel10.Size = new System.Drawing.Size(2493, 104); this.panel10.TabIndex = 2; // // panel12 @@ -1348,10 +1348,10 @@ this.panel12.Controls.Add(this.panel16); this.panel12.Controls.Add(this.panel15); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel12.Location = new System.Drawing.Point(451, 0); - this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel12.Location = new System.Drawing.Point(492, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1835, 91); + this.panel12.Size = new System.Drawing.Size(2001, 104); this.panel12.TabIndex = 1; // // panel16 @@ -1359,10 +1359,10 @@ this.panel16.Controls.Add(this.panel20); this.panel16.Controls.Add(this.panel19); this.panel16.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel16.Location = new System.Drawing.Point(467, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel16.Location = new System.Drawing.Point(509, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1368, 91); + this.panel16.Size = new System.Drawing.Size(1492, 104); this.panel16.TabIndex = 1; // // panel20 @@ -1370,10 +1370,10 @@ this.panel20.Controls.Add(this.label10); this.panel20.Controls.Add(this.panel22); this.panel20.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel20.Location = new System.Drawing.Point(428, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel20.Location = new System.Drawing.Point(467, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(940, 91); + this.panel20.Size = new System.Drawing.Size(1025, 104); this.panel20.TabIndex = 1; // // label10 @@ -1381,10 +1381,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(341, 0); + this.label10.Location = new System.Drawing.Point(372, 0); this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(599, 91); + this.label10.Size = new System.Drawing.Size(653, 104); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1395,9 +1395,9 @@ this.panel22.Controls.Add(this.label9); this.panel22.Dock = System.Windows.Forms.DockStyle.Left; this.panel22.Location = new System.Drawing.Point(0, 0); - this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel22.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel22.Name = "panel22"; - this.panel22.Size = new System.Drawing.Size(341, 91); + this.panel22.Size = new System.Drawing.Size(372, 104); this.panel22.TabIndex = 0; // // label9 @@ -1409,7 +1409,7 @@ this.label9.Location = new System.Drawing.Point(0, 0); this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(341, 91); + this.label9.Size = new System.Drawing.Size(372, 104); this.label9.TabIndex = 0; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1421,9 +1421,9 @@ this.panel19.Controls.Add(this.panel21); this.panel19.Dock = System.Windows.Forms.DockStyle.Left; this.panel19.Location = new System.Drawing.Point(0, 0); - this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel19.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel19.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(428, 91); + this.panel19.Size = new System.Drawing.Size(467, 104); this.panel19.TabIndex = 0; // // label8 @@ -1431,10 +1431,10 @@ this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label8.Location = new System.Drawing.Point(202, 0); + this.label8.Location = new System.Drawing.Point(220, 0); this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(226, 91); + this.label8.Size = new System.Drawing.Size(247, 104); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1444,9 +1444,9 @@ this.panel21.Controls.Add(this.label7); this.panel21.Dock = System.Windows.Forms.DockStyle.Left; this.panel21.Location = new System.Drawing.Point(0, 0); - this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel21.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(202, 91); + this.panel21.Size = new System.Drawing.Size(220, 104); this.panel21.TabIndex = 0; // // label7 @@ -1458,7 +1458,7 @@ this.label7.Location = new System.Drawing.Point(0, 0); this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(202, 91); + this.label7.Size = new System.Drawing.Size(220, 104); this.label7.TabIndex = 0; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1470,19 +1470,19 @@ this.panel15.Controls.Add(this.panel17); this.panel15.Dock = System.Windows.Forms.DockStyle.Left; this.panel15.Location = new System.Drawing.Point(0, 0); - this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel15.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(467, 91); + this.panel15.Size = new System.Drawing.Size(509, 104); this.panel15.TabIndex = 0; // // panel18 // this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(202, 0); - this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel18.Location = new System.Drawing.Point(220, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(265, 91); + this.panel18.Size = new System.Drawing.Size(289, 104); this.panel18.TabIndex = 1; // // label6 @@ -1493,7 +1493,7 @@ this.label6.Location = new System.Drawing.Point(0, 0); this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(265, 91); + this.label6.Size = new System.Drawing.Size(289, 104); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1503,9 +1503,9 @@ this.panel17.Controls.Add(this.label5); this.panel17.Dock = System.Windows.Forms.DockStyle.Left; this.panel17.Location = new System.Drawing.Point(0, 0); - this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel17.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(202, 91); + this.panel17.Size = new System.Drawing.Size(220, 104); this.panel17.TabIndex = 0; // // label5 @@ -1517,7 +1517,7 @@ this.label5.Location = new System.Drawing.Point(0, 0); this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(202, 91); + this.label5.Size = new System.Drawing.Size(220, 104); this.label5.TabIndex = 0; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1530,19 +1530,19 @@ this.panel11.Controls.Add(this.panel13); this.panel11.Dock = System.Windows.Forms.DockStyle.Left; this.panel11.Location = new System.Drawing.Point(0, 0); - this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel11.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(451, 91); + this.panel11.Size = new System.Drawing.Size(492, 104); this.panel11.TabIndex = 0; // // panel14 // this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(202, 0); - this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel14.Location = new System.Drawing.Point(220, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(249, 91); + this.panel14.Size = new System.Drawing.Size(272, 104); this.panel14.TabIndex = 1; // // comboBox1 @@ -1555,9 +1555,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(249, 83); + this.comboBox1.Size = new System.Drawing.Size(272, 93); this.comboBox1.TabIndex = 0; // // panel13 @@ -1565,9 +1565,9 @@ this.panel13.Controls.Add(this.label4); this.panel13.Dock = System.Windows.Forms.DockStyle.Left; this.panel13.Location = new System.Drawing.Point(0, 0); - this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel13.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(202, 91); + this.panel13.Size = new System.Drawing.Size(220, 104); this.panel13.TabIndex = 0; // // label4 @@ -1579,7 +1579,7 @@ this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(202, 91); + this.label4.Size = new System.Drawing.Size(220, 104); this.label4.TabIndex = 0; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1589,9 +1589,9 @@ this.panel9.Controls.Add(this.label3); this.panel9.Dock = System.Windows.Forms.DockStyle.Left; this.panel9.Location = new System.Drawing.Point(0, 0); - this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel9.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(380, 91); + this.panel9.Size = new System.Drawing.Size(415, 104); this.panel9.TabIndex = 0; // // label3 @@ -1603,7 +1603,7 @@ this.label3.Location = new System.Drawing.Point(0, 0); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(380, 91); + this.label3.Size = new System.Drawing.Size(415, 104); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1614,9 +1614,9 @@ this.panel2.Controls.Add(this.panel3); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2666, 147); + this.panel2.Size = new System.Drawing.Size(2908, 168); this.panel2.TabIndex = 0; // // panel4 @@ -1624,10 +1624,10 @@ this.panel4.Controls.Add(this.panel6); this.panel4.Controls.Add(this.panel5); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(311, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel4.Location = new System.Drawing.Point(339, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2355, 147); + this.panel4.Size = new System.Drawing.Size(2569, 168); this.panel4.TabIndex = 1; // // panel6 @@ -1636,9 +1636,9 @@ this.panel6.Controls.Add(this.label1); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel6.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(2003, 147); + this.panel6.Size = new System.Drawing.Size(2185, 168); this.panel6.TabIndex = 1; // // btnOnlyBarCode @@ -1647,7 +1647,7 @@ this.btnOnlyBarCode.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOnlyBarCode.Location = new System.Drawing.Point(3, 1); this.btnOnlyBarCode.Name = "btnOnlyBarCode"; - this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143); + this.btnOnlyBarCode.Size = new System.Drawing.Size(237, 163); this.btnOnlyBarCode.TabIndex = 1; this.btnOnlyBarCode.Text = "条码模式"; this.btnOnlyBarCode.UseVisualStyleBackColor = false; @@ -1661,7 +1661,7 @@ this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(2003, 147); + this.label1.Size = new System.Drawing.Size(2185, 168); this.label1.TabIndex = 0; this.label1.Text = "注塑车间箱码条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1670,10 +1670,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(2003, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel5.Location = new System.Drawing.Point(2185, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(352, 147); + this.panel5.Size = new System.Drawing.Size(384, 168); this.panel5.TabIndex = 0; // // label2 @@ -1684,7 +1684,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(352, 147); + this.label2.Size = new System.Drawing.Size(384, 168); this.label2.TabIndex = 0; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1695,19 +1695,19 @@ this.panel3.Controls.Add(this.pictureBox1); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(311, 147); + this.panel3.Size = new System.Drawing.Size(339, 168); this.panel3.TabIndex = 0; // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(5, 4); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.pictureBox1.Location = new System.Drawing.Point(5, 5); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(307, 139); + this.pictureBox1.Size = new System.Drawing.Size(335, 159); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1748,12 +1748,12 @@ // // FrmMain2408 // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2666, 1600); + this.ClientSize = new System.Drawing.Size(2908, 1829); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.Name = "FrmMain2408"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index 77c436d..811db7c 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -567,8 +567,9 @@ namespace InjectionPC bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:"+ errMsg, MethodBase.GetCurrentMethod()); + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } @@ -673,8 +674,10 @@ namespace InjectionPC bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); + + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } #endregion @@ -889,8 +892,10 @@ namespace InjectionPC bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); + + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } #endregion @@ -1026,8 +1031,10 @@ namespace InjectionPC bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); + + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } } catch (Exception ex) @@ -1271,8 +1278,10 @@ namespace InjectionPC bool saveRst = SaveInfo(md, true, same[j].ToString(), false, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); + + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } #endregion @@ -1373,8 +1382,10 @@ namespace InjectionPC bool saveRst = SaveInfo(md, true, same[j].ToString(), false, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); + + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } #endregion @@ -1882,8 +1893,10 @@ namespace InjectionPC bool saveRst = SaveInfo(md, false, "0", i == printCount, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"手工打印[{partNo}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); + + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } #endregion @@ -1964,18 +1977,14 @@ namespace InjectionPC } } - ////if (bll.Add_Info_New(md, Program.tableName) == false) - //if (SaveBarCode(md, Program.tableName, false, "0") == false) - //{ - // return; - //} - string errMsg = string.Empty; bool saveRst = SaveInfo(md, false, "0", false, ref errMsg); if (saveRst == false) { - MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - return; + LogErrBLL.AddInfo($"手工打印[{partNo}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod()); + + //MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); + //return; } #endregion @@ -2928,283 +2937,7 @@ namespace InjectionPC fr.Show(); } - //private void serialPort1_DataReceived(object sender, SerialDataReceivedEventArgs e) - //{ - // try - // { - // base.Invoke(new EventHandler(this.Scan)); - // } - // catch (Exception ex) - // { - // LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); - // } - - //} - - //private void Scan(object sender, EventArgs e) - //{ - // string _code_meca = "",printBoxName=""; - // try - // { - // Thread.Sleep(1500); - // char[] buffer = new char[serialPort1.BytesToRead]; - // serialPort1.Read(buffer, 0, serialPort1.BytesToRead); - // for (int i = 0; i < buffer.Length; i++) - // { - // _code_meca = _code_meca + buffer[i]; - // } - - // GetClass(); - - // string aa = _code_meca; - - // var result1 = System.Text.RegularExpressions.Regex.Replace(aa, @"\s*\n\s*", ","); - // result1 = System.Text.RegularExpressions.Regex.Replace(aa, @"\s*\f\s*", ","); - // result1 = System.Text.RegularExpressions.Regex.Replace(aa, @"\s*\r\s*", ","); - // result1 = result1.Remove(result1.LastIndexOf(","), 1); - // result1 = result1.Remove(result1.LastIndexOf("g"), 1); - // int idxStart = result1.LastIndexOf(" "); - // string value = result1.Substring(idxStart, result1.Length - idxStart).Trim(); - // string[] b = value.Split('.'); - // string c = b[0]; - // string d = b[1]; - // int chengzhong = Convert.ToInt32(c); - // int chengzhong1 = Convert.ToInt32(d); - // if (chengzhong1 >= 5) - // { - // chengzhong = chengzhong + 1; //重量 - // } - - // InjectionPlanBLL bll = new InjectionPlanBLL(); - // BarCodeBLL brbll = new BarCodeBLL(); - // BarCodeModel md = new BarCodeModel(); - // ProductBLL productBll = new ProductBLL(); - // PlasticBLL pbll = _plasticBLL; - // InjectionBoxBLL boxbll = new InjectionBoxBLL(); - // InjectionBoxModel boxmd = new InjectionBoxModel(); - // DataTable dt2 = null; - // string code = "", OneCode = ""; - // string newcode = "", newcode1 = "", NewOneCode = "", NewOneCode1 = ""; - // string IsPack = "", IsOne = "", QLevel = "", IsPaint = "", PartName = "",IsSupply=""; - // string filename = "", printName = ""; - // int MaxCount = 0, CurrentCount = 0; - - // #region 查找当前计划 - - // DataTable dt = bll.SearchInfoByName(Program.station); - // if (dt != null && dt.Rows.Count > 0) - // { - // planID = dt.Rows[0]["InjectionPlanID"].ToString(); - // string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(','); - // string[] stockNo = new string [partNo.Length]; - // //string[] stockNo = dt.Rows[0]["StockNo"].ToString().Split(','); - // string ProductNature = dt.Rows[0]["ProductNature"].ToString(); - // int IsSame = 0; - - // #region 判断有几个零件号 - // string mould = "0"; - // for (int j = 0; j < partNo.Length; j++) - // { - // #region 根据零件号查找存货代码 - - // DataTable sdt = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim()); - // if (sdt != null && sdt.Rows.Count > 0) - // { - // stockNo[j] = sdt.Rows[0]["StockNo"].ToString(); - // IsSame=Convert.ToInt32(sdt.Rows[0]["IsSame"].ToString()); - // } - // else - // { - // stockNo[j] = ""; - // IsSame = 0; - // } - - // #endregion - - // DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim()); - // if (dt3 != null && dt3.Rows.Count > 0) - // { - // QLevel = dt3.Rows[0]["QLevel"].ToString(); - // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString(); - // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString(); - // IsPaint = dt3.Rows[0]["IsPlating"].ToString(); - // PartName = dt3.Rows[0]["ProductName"].ToString(); - // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString()); - // IsSupply = dt3.Rows[0]["IsSupply"].ToString(); - // } - - // if (IsSame == 1) - // { - // for (int k = 0; k < 2; k++) - // { - - // GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, "", ref NewOneCode, ref newcode); - - // #region 插入数据tb_barCode - - // md.ID = Guid.NewGuid().ToString(); - // md.StationID = dt.Rows[0]["StationID"].ToString(); - // md.OneBarCode = NewOneCode; - // md.BarCode = newcode; - // md.StockNo = stockNo[j].ToString().Trim(); - // md.PartNo = partNo[j].ToString().Trim(); - // md.PrintType = 0; - // md.PlanID = planID; - // md.ProductNature = ProductNature; - // md.Des1 = PartName; - // DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString()); - // if (pdt != null && pdt.Rows.Count > 0) - // { - // if (pdt.Rows[0]["isImport"].ToString() == "1") - // { - // md.Import = "国产料Kingfa"; - // } - // else - // { - // md.Import = ""; - // } - // } - - // ////if (brbll.Add_Info_New(md, Program.tableName)==false) - // //if (SaveBarCode(md, Program.tableName, true, mould) == false) - // //{ - // // return; - // //} - - // string errMsg = string.Empty; - // bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); - // if (saveRst == false) - // { - // MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - // return; - // } - - // #endregion - - // #region 打印条码，判断是否打印单个条码 - - // 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(); - // } - - // #region 打印单个标签 - - // if (IsOne == "1") - // { - // if (IsSupply == "1") - // { - // filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(IsSupply, "Print" + Program.station + "_3922"); - - // 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); - - // rp.Report.Print(false); - // } - // } - - // #endregion - - - - // #endregion - // } - // } - // else - // { - // GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, "", ref NewOneCode, ref newcode); - - // #region 插入数据tb_barCode - - // md.ID = Guid.NewGuid().ToString(); - // md.StationID = dt.Rows[0]["StationID"].ToString(); - // md.OneBarCode = NewOneCode; - // md.BarCode = newcode; - // md.StockNo = stockNo[j].ToString().Trim(); - // md.PartNo = partNo[j].ToString().Trim(); - // md.PrintType = 0; - // md.PlanID = planID; - // md.ProductNature = ProductNature; - // md.Des1 = PartName; - // DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString()); - // if (pdt != null && pdt.Rows.Count > 0) - // { - // if (pdt.Rows[0]["isImport"].ToString() == "1") - // { - // md.Import = "国产料Kingfa"; - // } - // else - // { - // md.Import = ""; - // } - // } - - // ////if (brbll.Add_Info_New(md, Program.tableName)==false) - // //if (SaveBarCode(md, Program.tableName, true, mould) == false) - // //{ - // // return; - // //} - - // string errMsg = string.Empty; - // bool saveRst = SaveInfo(md, true, mould, false, ref errMsg); - // if (saveRst == false) - // { - // MessageBox.Show("条码" + md.OneBarCode + "存储时发生错误,原因:" + errMsg); - // return; - // } - // #endregion - - // #region 打印条码，判断是否打印单个条码 - - // 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(); - // } - - // #region 打印单个标签 - - // if (IsOne == "1") - // { - // if (IsSupply == "1") - // { - // filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(IsSupply, "Print" + Program.station + "_3993"); //new - - // string reportName = ConfigurationManager.AppSettings[printName].ToString(); - // DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); - - // LogHelper.WriteLog(printName + ";" + reportName + ";" + filename); - // ReportHelper rp = new ReportHelper(filename, headTable, null, - // (int) GRPaperOrientation.grpoDefault, 1, reportName); - - // rp.Report.Print(false); - // } - // } - - // #endregion - - - // #endregion - // } - // initBarCode(); - // } - - // #endregion - // } - - // #endregion - // } - // catch (Exception ex) - // { - // LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); - // } - //} + private void timer2_Tick(object sender, EventArgs e) { Program.ProductDate = _barCodeBLL.GetServiceTime().ToString(); @@ -3406,83 +3139,195 @@ namespace InjectionPC Label lbPackageCode = lbPackageCodeL; Label lbCurrentlQty = lbCurrentlQtyL; Label lbNeedQty = lbNeedQtyL; + //BarCodeModel lastFailedModel = null; if (mould == _leftType) { lbPackageCode = lbPackageCodeL; lbCurrentlQty = lbCurrentlQtyL; lbNeedQty = lbNeedQtyL; + //lastFailedModel = _lastFailedModelL; } else { lbPackageCode = lbPackageCodeR; lbCurrentlQty = lbCurrentlQtyR; lbNeedQty = lbNeedQtyR; + //lastFailedModel = _lastFailedModelR; } - bool saveRst = false; + bool saveRst = true; //自动模式 或者手动模式选中绑定箱码 if (isAutoPrint == true || (isAutoPrint==false && cboxHandBox.Checked ==true)) { bcm.BoxNo = lbPackageCode.Text.Trim(); - saveRst = _barCodeBLL.Add_Info_New(bcm, Program.tableName); - - if (saveRst == true) + bool isSuccess = false; + DataTable dt = null; + int realCount = 0; + int sizeCount = 0; + LocalDBService local = new LocalDBService(SqlHelper.GetConnSting()); + try { + local.BeginTrans(); + _barCodeBLL.Add_Info_New(local, bcm, Program.tableName, "1"); + //更新箱单数量 //查询箱单数量 是否等于标包数量 等于的话清空lb显示 小于,数量值赋值给lb显示 - if (_injectionBoxBLL.UpdateBoxCount(bcm.BoxNo,1)) + if (_injectionBoxBLL.UpdateBoxCount(local, bcm.BoxNo, 1)) { - DataTable dt = _injectionBoxBLL.SearchBox(bcm.BoxNo); - if (dt.Rows.Count == 0) + dt = _injectionBoxBLL.SearchBox(local, bcm.BoxNo); + if (dt.Rows.Count > 0) { - return false; - } - string realCountStr = dt.Rows[0]["BoxCount"].ToString(); - string sizeCountStr = lbNeedQty.Text.Trim(); - int realCount = 0; - int sizeCount = 0; - int.TryParse(realCountStr, out realCount); - int.TryParse(sizeCountStr, out sizeCount); - - // if(Program.station == "IM18") - // { - SaveLog3($"{Program.station}装箱测试:realCount=[{realCount}],sizeCount=[{sizeCount}],isAutoPrint=[{isAutoPrint}],handPrint=[{handPrint}]"); - //} - - if ((realCount != 0 && realCount == sizeCount) || (isAutoPrint == false && handPrint==true)) - { - lbPackageCode.Text = ""; - lbCurrentlQty.Text = "0"; + string realCountStr = dt.Rows[0]["BoxCount"].ToString(); + string sizeCountStr = lbNeedQty.Text.Trim(); + + int.TryParse(realCountStr, out realCount); + int.TryParse(sizeCountStr, out sizeCount); - string rst = _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), _lastBoxNoL, _lastBoxNoR, MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工, Program.station); - if (string.IsNullOrEmpty(rst)) + if ((realCount != 0 && realCount == sizeCount) || (isAutoPrint == false && handPrint == true)) { - _lastBoxNoL = lbPackageCodeL.Text; - _lastBoxNoR = lbPackageCodeR.Text; - PrintBoxCode(dt.Rows[0], realCount, mould); + lbPackageCode.Text = ""; + lbCurrentlQty.Text = "0"; + _wmsBll.SaveInterface(local, bcm, "", Program.station); + isSuccess = true; } else { - errorMsg = "插入接口表时异常-" +rst; - MessageBox.Show(rst); + lbCurrentlQty.Text = realCountStr; } } - else - { - lbCurrentlQty.Text = realCountStr; - } + } + //throw new Exception("资源被占用,死锁了测试"); + + local.Commit(); } - else + catch (Exception ex) { - errorMsg = "插入表" + Program.tableName + "时发生异常"; + if (local != null) + { + local.Rollback(); + } + errorMsg = ex.Message; + //lastFailedModel = bcm; + if (mould == _leftType) { + _lastFailedModelL = bcm; + } + else + { + _lastFailedModelR = bcm; + } saveRst = false; } + finally + { + if (local != null) + { + local.EndTrans(); + } + } + + //保存后打印箱单 + if (isSuccess) + { + _lastBoxNoL = lbPackageCodeL.Text; + _lastBoxNoR = lbPackageCodeR.Text; + + //打印箱码 + PrintBoxCode(dt.Rows[0], realCount, mould); + // _lastBoxNo = lbPackageCodeL.Text; + lbPackageCodeL.Text = ""; + } + + + + //saveRst = _barCodeBLL.Add_Info_New(bcm, Program.tableName); + + //if (saveRst == true) + //{ + // //更新箱单数量 + // //查询箱单数量 是否等于标包数量 等于的话清空lb显示 小于,数量值赋值给lb显示 + // if (_injectionBoxBLL.UpdateBoxCount(bcm.BoxNo, 1)) + // { + // DataTable dt = _injectionBoxBLL.SearchBox(bcm.BoxNo); + // if (dt.Rows.Count == 0) + // { + // return false; + // } + // string realCountStr = dt.Rows[0]["BoxCount"].ToString(); + // string sizeCountStr = lbNeedQty.Text.Trim(); + // int realCount = 0; + // int sizeCount = 0; + // int.TryParse(realCountStr, out realCount); + // int.TryParse(sizeCountStr, out sizeCount); + + // // if(Program.station == "IM18") + // // { + // SaveLog3($"{Program.station}装箱测试:realCount=[{realCount}],sizeCount=[{sizeCount}],isAutoPrint=[{isAutoPrint}],handPrint=[{handPrint}]"); + // //} + + // if ((realCount != 0 && realCount == sizeCount) || (isAutoPrint == false && handPrint == true)) + // { + // lbPackageCode.Text = ""; + // lbCurrentlQty.Text = "0"; + + // string rst = _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), _lastBoxNoL, _lastBoxNoR, MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工, Program.station); + // if (string.IsNullOrEmpty(rst)) + // { + // _lastBoxNoL = lbPackageCodeL.Text; + // _lastBoxNoR = lbPackageCodeR.Text; + // PrintBoxCode(dt.Rows[0], realCount, mould); + // } + // else + // { + // errorMsg = "插入接口表时异常-" + rst; + // MessageBox.Show(rst); + // } + // } + // else + // { + // lbCurrentlQty.Text = realCountStr; + // } + // } + //} + //else + //{ + // errorMsg = "插入表" + Program.tableName + "时发生异常"; + // saveRst = false; + //} } else { - //手动打印, 关闭打印箱码, 直接存条码记录.不处理其他 - saveRst = _barCodeBLL.Add_Info_New(bcm, Program.tableName); + try + { + //手动打印, 关闭打印箱码, 直接存条码记录.不处理其他 + saveRst = _barCodeBLL.Add_Info_New(bcm, Program.tableName); + if (saveRst == false) + { + //lastFailedModel = bcm; + if (mould == _leftType) + { + _lastFailedModelL = bcm; + } + else + { + _lastFailedModelR = bcm; + } + } + } + catch(Exception ex) + { + errorMsg = ex.Message; + //lastFailedModel = bcm; + if (mould == _leftType) + { + _lastFailedModelL = bcm; + } + else + { + _lastFailedModelR = bcm; + } + } + } return saveRst; @@ -3991,7 +3836,7 @@ namespace InjectionPC timer3.Enabled = false; //调用测试 Array a = null; - Array b = null; + Array b = new string[] { "1", "2", "3", "4", "5" }; Array c = null; Array d = null; status = true; @@ -4518,32 +4363,46 @@ namespace InjectionPC LogHelper.WriteLog("SaveLog:" + ex.Message); } } - + private BarCodeModel _lastFailedModelL = null; + private BarCodeModel _lastFailedModelR = null; bool SaveInfo(BarCodeModel md, bool isAutoPrint, string mould, bool handPrint, ref string errMsg) { - if (SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint) == false) + if (_lastFailedModelL != null && mould == "0") { - 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; - } + SaveBarCode(_lastFailedModelL, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); + _lastFailedModelL = null; + } + if (_lastFailedModelR != null && !string.IsNullOrEmpty(mould) && mould != "0") + { + SaveBarCode(_lastFailedModelR, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); + _lastFailedModelR = null; + } - a += 1; - //Thread.Sleep(200); - Thread.Sleep(200); - } + bool rst = SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint); - if (a >= 2) - { - SaveLog3(Program.station + "保存3次失败,条码" + md.OneBarCode); - return false; - } - } - return true; + //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; + // } + //} + return rst; } } diff --git a/InjectionSearch/FrmBarCodeSearch2408.cs b/InjectionSearch/FrmBarCodeSearch2408.cs index 08fe593..4fed900 100644 --- a/InjectionSearch/FrmBarCodeSearch2408.cs +++ b/InjectionSearch/FrmBarCodeSearch2408.cs @@ -33,10 +33,13 @@ namespace InjectionSearch private WmsBLL _wmsBll = new WmsBLL(); private string _lastBoxNo = string.Empty; private BarCodeBLL _barCodeBLL = new BarCodeBLL(); + private BarCodeModel _lastFailedModel = null; public FrmBarCodeSearch2408() { InitializeComponent(); this.Size = new Size(1280, 1024); + + } private void initProduct() @@ -636,7 +639,7 @@ namespace InjectionSearch } return null; } - private BarCodeModel _lastFailedModel = null; + bool SaveBarCode(BarCodeModel bcm, string tableName, bool printBox) { @@ -650,65 +653,7 @@ namespace InjectionSearch if (cboxHandBox.Checked) { Save(bcm, tableName, printBox); - //if (cboxHandBox.Checked) - //{ - // bool isSuccess = false; - // DataTable boxTable = null; - // int realCount = 0; - // int sizeCount = 0; - // LocalDBService local = new LocalDBService(SqlHelper.GetConnSting()); - // try - // { - // local.BeginTrans(); - // saveRst = _bll.Add_Info_New(local, bcm, "tb_BarCode5", "5"); - - // if (_injectionBoxBLL.UpdateBoxCount(local, bcm.BoxNo, 1)) - // { - // boxTable = _injectionBoxBLL.SearchBox(bcm.BoxNo); - // if (boxTable.Rows.Count > 0) - // { - // string realCountStr = boxTable.Rows[0]["BoxCount"].ToString(); - - // int.TryParse(realCountStr, out realCount); - // int.TryParse(comBoxSizeL.SelectedValue?.ToString(), out sizeCount); - // if ((realCount != 0 && realCount == sizeCount) || printBox == true) - // { - // _wmsBll.SaveInterface(local, bcm, "", comboBox2.Text.Trim()); - - // isSuccess = true; - // } - // } - // } - - // local.Commit(); - // } - // catch (Exception ex) - // { - // if (local != null) - // { - // local.Rollback(); - // } - // LogErrBLL.AddInfo("手动批量打印条码" + bcm.OneBarCode + "报错", MethodBase.GetCurrentMethod()); - // _lastFailedModel = bcm; - // } - // finally - // { - // if (local != null) - // { - // local.EndTrans(); - // } - // } - - // //保存后打印箱单 - // if (isSuccess) - // { - // //打印箱码 - // PrintBoxCode(boxTable.Rows[0], realCount, false); - // _lastBoxNo = lbPackageCodeL.Text; - // lbPackageCodeL.Text = ""; - // } - //} - } + } else { try @@ -718,8 +663,6 @@ namespace InjectionSearch { _lastFailedModel = bcm; } - - } catch(Exception ex) { @@ -742,7 +685,7 @@ namespace InjectionSearch try { local.BeginTrans(); - saveRst = _bll.Add_Info_New(local, bcm, "tb_BarCode5", "5"); + _bll.Add_Info_New(local, bcm, "tb_BarCode5", "5"); if (_injectionBoxBLL.UpdateBoxCount(local, bcm.BoxNo, 1)) { diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs index 343768c..06688d2 100644 --- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs +++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs @@ -114,9 +114,9 @@ namespace MESClassLibrary.BLL.BasicInfo } } - public bool Add_Info_New(LocalDBService local,BarCodeModel md, string tableName, string isNew = "1") + public void Add_Info_New(LocalDBService local,BarCodeModel md, string tableName, string isNew = "1") { - return db.AddInfoNew(local, md, tableName, isNew); + db.AddInfoNew(local, md, tableName, isNew); } //public bool Add_Info_New(LocalDBService local, BarCodeModel md, string tableName) diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs index a9f15e1..f492ce8 100644 --- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs +++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs @@ -368,7 +368,7 @@ namespace MESClassLibrary.DAL.BasicInfo return false; } } - public bool AddInfoNew(LocalDBService local, BarCodeModel md, string tableName,string isNew) + public void AddInfoNew(LocalDBService local, BarCodeModel md, string tableName,string isNew) { string sql = ""; @@ -378,7 +378,7 @@ namespace MESClassLibrary.DAL.BasicInfo $"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}','{ md.BatchNo}','{isNew}')"; - return local.Exec_NonQuery(sql); + local.Exec_NonQuery(sql); } public int Add_ReprintRecord(DataRow dr,string userID,string userName) diff --git a/MESWebSite/MESWebSite.csproj b/MESWebSite/MESWebSite.csproj index cde058f..ce9e35d 100644 --- a/MESWebSite/MESWebSite.csproj +++ b/MESWebSite/MESWebSite.csproj @@ -105,6 +105,9 @@ + + PreserveNewest + PreserveNewest diff --git a/MESWebSite/Manage/Index.aspx b/MESWebSite/Manage/Index.aspx index 8b0cccb..2d73a02 100644 --- a/MESWebSite/Manage/Index.aspx +++ b/MESWebSite/Manage/Index.aspx @@ -404,13 +404,14 @@
-
+

+

-
+
diff --git a/MESWebSite/Manage/YongHong/PaintS_JCJL.aspx b/MESWebSite/Manage/YongHong/PaintS_JCJL.aspx index 89aa87c..5dd003c 100644 --- a/MESWebSite/Manage/YongHong/PaintS_JCJL.aspx +++ b/MESWebSite/Manage/YongHong/PaintS_JCJL.aspx @@ -5,7 +5,7 @@ - 喷涂检测记录 + BI统计报表