From 9f4110e3d6ce3b72f65e4fae66017cde0931303e Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Thu, 10 Oct 2024 09:45:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E8=B0=83=E6=95=B4=E4=B8=80?= =?UTF-8?q?=E4=BA=9B.=20=E5=96=B7=E6=B6=82=E5=8A=A0=E4=BA=86=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E7=9C=8B=E6=9D=BF=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InjectionPC/FrmMain2408.Designer.cs | 482 ++++----- InjectionPC/FrmMain2408.cs | 1 + InjectionSearch/FrmPackageDetail.Designer.cs | 138 +-- MESClassLibrary/DAL/Wms/WmsDAL.cs | 45 +- PaintingPC/FrmChangeColor.cs | 5 +- PaintingPC/FrmQuality.Designer.cs | 403 ++++++++ PaintingPC/FrmQuality.cs | 949 ++++++++++++++++++ PaintingPC/FrmQuality.resx | 481 +++++++++ PaintingPC/Function.cs | 332 ++++++ PaintingPC/PaintingPC.csproj | 18 + PaintingPC/Program.cs | 12 +- .../Code/PaintingPC/FrmChainUp1.Designer.cs | 80 +- 12 files changed, 2583 insertions(+), 363 deletions(-) create mode 100644 PaintingPC/FrmQuality.Designer.cs create mode 100644 PaintingPC/FrmQuality.cs create mode 100644 PaintingPC/FrmQuality.resx diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index 522a06a..333e971 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -209,9 +209,9 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(5); + this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2560, 1651); + this.panel1.Size = new System.Drawing.Size(2347, 1617); this.panel1.TabIndex = 0; // // panel7 @@ -220,10 +220,10 @@ this.panel7.Controls.Add(this.panel8); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.panel7.Location = new System.Drawing.Point(0, 168); - this.panel7.Margin = new System.Windows.Forms.Padding(5); + this.panel7.Location = new System.Drawing.Point(0, 147); + this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2560, 1483); + this.panel7.Size = new System.Drawing.Size(2347, 1470); this.panel7.TabIndex = 1; // // panel23 @@ -231,10 +231,10 @@ this.panel23.Controls.Add(this.panel27); this.panel23.Controls.Add(this.panel24); this.panel23.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel23.Location = new System.Drawing.Point(0, 104); - this.panel23.Margin = new System.Windows.Forms.Padding(5); + this.panel23.Location = new System.Drawing.Point(0, 91); + this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(2560, 1379); + this.panel23.Size = new System.Drawing.Size(2347, 1379); this.panel23.TabIndex = 1; // // panel27 @@ -242,10 +242,10 @@ this.panel27.Controls.Add(this.panel29); this.panel27.Controls.Add(this.panel28); this.panel27.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel27.Location = new System.Drawing.Point(0, 1115); - this.panel27.Margin = new System.Windows.Forms.Padding(5); + this.panel27.Location = new System.Drawing.Point(0, 976); + this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(2560, 264); + this.panel27.Size = new System.Drawing.Size(2347, 403); this.panel27.TabIndex = 1; // // panel29 @@ -253,10 +253,10 @@ this.panel29.Controls.Add(this.panel31); this.panel29.Controls.Add(this.panel30); this.panel29.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel29.Location = new System.Drawing.Point(339, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(5); + this.panel29.Location = new System.Drawing.Point(311, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(2221, 264); + this.panel29.Size = new System.Drawing.Size(2036, 403); this.panel29.TabIndex = 1; // // panel31 @@ -264,10 +264,10 @@ this.panel31.Controls.Add(this.panel33); this.panel31.Controls.Add(this.panel32); this.panel31.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel31.Location = new System.Drawing.Point(133, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(5); + this.panel31.Location = new System.Drawing.Point(122, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(2088, 264); + this.panel31.Size = new System.Drawing.Size(1914, 403); this.panel31.TabIndex = 1; // // panel33 @@ -275,10 +275,10 @@ this.panel33.Controls.Add(this.panel35); this.panel33.Controls.Add(this.panel34); this.panel33.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel33.Location = new System.Drawing.Point(133, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(5); + this.panel33.Location = new System.Drawing.Point(122, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(1955, 264); + this.panel33.Size = new System.Drawing.Size(1792, 403); this.panel33.TabIndex = 1; // // panel35 @@ -286,9 +286,9 @@ this.panel35.Controls.Add(this.panel37); this.panel35.Dock = System.Windows.Forms.DockStyle.Fill; this.panel35.Location = new System.Drawing.Point(0, 0); - this.panel35.Margin = new System.Windows.Forms.Padding(5); + this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel35.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(1822, 264); + this.panel35.Size = new System.Drawing.Size(1670, 403); this.panel35.TabIndex = 1; // // panel37 @@ -296,9 +296,9 @@ this.panel37.Controls.Add(this.panel40); this.panel37.Dock = System.Windows.Forms.DockStyle.Fill; this.panel37.Location = new System.Drawing.Point(0, 0); - this.panel37.Margin = new System.Windows.Forms.Padding(5); + this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel37.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(1822, 264); + this.panel37.Size = new System.Drawing.Size(1670, 403); this.panel37.TabIndex = 1; // // panel40 @@ -307,9 +307,9 @@ this.panel40.Controls.Add(this.panel41); this.panel40.Dock = System.Windows.Forms.DockStyle.Fill; this.panel40.Location = new System.Drawing.Point(0, 0); - this.panel40.Margin = new System.Windows.Forms.Padding(5); + this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel40.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(1822, 264); + this.panel40.Size = new System.Drawing.Size(1670, 403); this.panel40.TabIndex = 1; // // panel42 @@ -318,9 +318,9 @@ this.panel42.Controls.Add(this.panel43); this.panel42.Dock = System.Windows.Forms.DockStyle.Fill; this.panel42.Location = new System.Drawing.Point(0, 0); - this.panel42.Margin = new System.Windows.Forms.Padding(5); + this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel42.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(1689, 264); + this.panel42.Size = new System.Drawing.Size(1548, 403); this.panel42.TabIndex = 1; // // panel39 @@ -337,9 +337,9 @@ this.panel39.Controls.Add(this.label21); this.panel39.Dock = System.Windows.Forms.DockStyle.Fill; this.panel39.Location = new System.Drawing.Point(0, 0); - this.panel39.Margin = new System.Windows.Forms.Padding(5); + this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel39.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(1556, 264); + this.panel39.Size = new System.Drawing.Size(1426, 403); this.panel39.TabIndex = 1; // // cboxHandBox @@ -348,10 +348,10 @@ this.cboxHandBox.Checked = true; this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked; this.cboxHandBox.Enabled = false; - this.cboxHandBox.Location = new System.Drawing.Point(1008, 196); + this.cboxHandBox.Location = new System.Drawing.Point(924, 172); this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4); this.cboxHandBox.Name = "cboxHandBox"; - this.cboxHandBox.Size = new System.Drawing.Size(293, 62); + this.cboxHandBox.Size = new System.Drawing.Size(256, 55); this.cboxHandBox.TabIndex = 14; this.cboxHandBox.Tag = "true"; this.cboxHandBox.Text = "打印箱码"; @@ -361,20 +361,20 @@ // textBox2 // this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(240, 333); - this.textBox2.Margin = new System.Windows.Forms.Padding(5); + this.textBox2.Location = new System.Drawing.Point(220, 291); + this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(329, 74); + this.textBox2.Size = new System.Drawing.Size(302, 65); this.textBox2.TabIndex = 13; // // label18 // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(44, 347); + this.label18.Location = new System.Drawing.Point(40, 304); this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(202, 58); + this.label18.Size = new System.Drawing.Size(178, 51); this.label18.TabIndex = 12; this.label18.Text = "数量："; // @@ -382,10 +382,10 @@ // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(661, 203); + this.label19.Location = new System.Drawing.Point(606, 178); this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(265, 58); + this.label19.Size = new System.Drawing.Size(238, 51); this.label19.TabIndex = 11; this.label19.Text = "(yyMMdd)"; // @@ -393,20 +393,20 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(243, 196); - this.textBox1.Margin = new System.Windows.Forms.Padding(5); + this.textBox1.Location = new System.Drawing.Point(223, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(328, 74); + this.textBox1.Size = new System.Drawing.Size(301, 65); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(45, 212); + this.label20.Location = new System.Drawing.Point(41, 186); this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(202, 58); + this.label20.Size = new System.Drawing.Size(178, 51); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -415,10 +415,10 @@ this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(243, 72); - this.comboBox2.Margin = new System.Windows.Forms.Padding(5); + this.comboBox2.Location = new System.Drawing.Point(223, 63); + this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(928, 56); + this.comboBox2.Size = new System.Drawing.Size(851, 50); this.comboBox2.TabIndex = 8; this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); // @@ -426,10 +426,10 @@ // this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(45, 80); + this.label21.Location = new System.Drawing.Point(41, 70); this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(202, 58); + this.label21.Size = new System.Drawing.Size(178, 51); this.label21.TabIndex = 7; this.label21.Text = "产品："; // @@ -437,10 +437,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(1556, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(5); + this.panel43.Location = new System.Drawing.Point(1426, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(133, 264); + this.panel43.Size = new System.Drawing.Size(122, 403); this.panel43.TabIndex = 0; // // label23 @@ -451,7 +451,7 @@ this.label23.Location = new System.Drawing.Point(0, 0); this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(133, 264); + this.label23.Size = new System.Drawing.Size(122, 403); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -461,10 +461,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(1689, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(5); + this.panel41.Location = new System.Drawing.Point(1548, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(133, 264); + this.panel41.Size = new System.Drawing.Size(122, 403); this.panel41.TabIndex = 0; // // label22 @@ -475,7 +475,7 @@ this.label22.Location = new System.Drawing.Point(0, 0); this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(133, 264); + this.label22.Size = new System.Drawing.Size(122, 403); this.label22.TabIndex = 0; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -485,10 +485,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(1822, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(5); + this.panel34.Location = new System.Drawing.Point(1670, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(133, 264); + this.panel34.Size = new System.Drawing.Size(122, 403); this.panel34.TabIndex = 0; // // label15 @@ -499,7 +499,7 @@ this.label15.Location = new System.Drawing.Point(0, 0); this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(133, 264); + this.label15.Size = new System.Drawing.Size(122, 403); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -510,9 +510,9 @@ this.panel32.Controls.Add(this.label14); this.panel32.Dock = System.Windows.Forms.DockStyle.Left; this.panel32.Location = new System.Drawing.Point(0, 0); - this.panel32.Margin = new System.Windows.Forms.Padding(5); + this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel32.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(133, 264); + this.panel32.Size = new System.Drawing.Size(122, 403); this.panel32.TabIndex = 0; // // label14 @@ -523,7 +523,7 @@ this.label14.Location = new System.Drawing.Point(0, 0); this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(133, 264); + this.label14.Size = new System.Drawing.Size(122, 403); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -534,9 +534,9 @@ this.panel30.Controls.Add(this.label13); this.panel30.Dock = System.Windows.Forms.DockStyle.Left; this.panel30.Location = new System.Drawing.Point(0, 0); - this.panel30.Margin = new System.Windows.Forms.Padding(5); + this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel30.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(133, 264); + this.panel30.Size = new System.Drawing.Size(122, 403); this.panel30.TabIndex = 0; // // label13 @@ -547,7 +547,7 @@ this.label13.Location = new System.Drawing.Point(0, 0); this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(133, 264); + this.label13.Size = new System.Drawing.Size(122, 403); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -558,9 +558,9 @@ this.panel28.Controls.Add(this.label12); this.panel28.Dock = System.Windows.Forms.DockStyle.Left; this.panel28.Location = new System.Drawing.Point(0, 0); - this.panel28.Margin = new System.Windows.Forms.Padding(5); + this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel28.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(339, 264); + this.panel28.Size = new System.Drawing.Size(311, 403); this.panel28.TabIndex = 0; // // label12 @@ -572,7 +572,7 @@ this.label12.Location = new System.Drawing.Point(0, 0); this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(339, 264); + this.label12.Size = new System.Drawing.Size(311, 403); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -583,9 +583,9 @@ this.panel24.Controls.Add(this.panel25); this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); - this.panel24.Margin = new System.Windows.Forms.Padding(5); + this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(2560, 1115); + this.panel24.Size = new System.Drawing.Size(2347, 976); this.panel24.TabIndex = 0; // // panel26 @@ -594,10 +594,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(339, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5); + this.panel26.Location = new System.Drawing.Point(311, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2221, 1115); + this.panel26.Size = new System.Drawing.Size(2036, 976); this.panel26.TabIndex = 1; // // panel45 @@ -607,19 +607,19 @@ this.panel45.Controls.Add(this.button4); this.panel45.Controls.Add(this.textBox4); this.panel45.Controls.Add(this.label25); - this.panel45.Location = new System.Drawing.Point(323, 676); - this.panel45.Margin = new System.Windows.Forms.Padding(5); + this.panel45.Location = new System.Drawing.Point(296, 592); + this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1397, 150); + this.panel45.Size = new System.Drawing.Size(1281, 132); this.panel45.TabIndex = 2; // // button3 // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1232, 43); - this.button3.Margin = new System.Windows.Forms.Padding(5); + this.button3.Location = new System.Drawing.Point(1129, 38); + this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(160, 60); + this.button3.Size = new System.Drawing.Size(147, 52); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -628,10 +628,10 @@ // button4 // this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1037, 44); - this.button4.Margin = new System.Windows.Forms.Padding(5); + this.button4.Location = new System.Drawing.Point(951, 38); + this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(160, 60); + this.button4.Size = new System.Drawing.Size(147, 52); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -640,20 +640,20 @@ // textBox4 // this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox4.Location = new System.Drawing.Point(336, 45); - this.textBox4.Margin = new System.Windows.Forms.Padding(5); + this.textBox4.Location = new System.Drawing.Point(308, 39); + this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(660, 55); + this.textBox4.Size = new System.Drawing.Size(605, 49); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(28, 52); + this.label25.Location = new System.Drawing.Point(26, 46); this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(319, 42); + this.label25.Size = new System.Drawing.Size(283, 37); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -665,19 +665,19 @@ this.panel44.Controls.Add(this.button1); this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); - this.panel44.Location = new System.Drawing.Point(360, 364); - this.panel44.Margin = new System.Windows.Forms.Padding(5); + this.panel44.Location = new System.Drawing.Point(330, 318); + this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1397, 150); + this.panel44.Size = new System.Drawing.Size(1281, 132); this.panel44.TabIndex = 1; // // button2 // this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1197, 44); - this.button2.Margin = new System.Windows.Forms.Padding(5); + this.button2.Location = new System.Drawing.Point(1097, 38); + this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(160, 60); + this.button2.Size = new System.Drawing.Size(147, 52); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -686,10 +686,10 @@ // button1 // this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(1027, 40); - this.button1.Margin = new System.Windows.Forms.Padding(5); + this.button1.Location = new System.Drawing.Point(941, 35); + this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(160, 60); + this.button1.Size = new System.Drawing.Size(147, 52); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -698,20 +698,20 @@ // textBox3 // this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(208, 44); - this.textBox3.Margin = new System.Windows.Forms.Padding(5); + this.textBox3.Location = new System.Drawing.Point(191, 38); + this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(737, 55); + this.textBox3.Size = new System.Drawing.Size(676, 49); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(27, 52); + this.label24.Location = new System.Drawing.Point(25, 46); this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(190, 42); + this.label24.Size = new System.Drawing.Size(169, 37); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -779,17 +779,17 @@ this.glacialList1.HoverEvents = false; this.glacialList1.HoverTime = 1; this.glacialList1.ImageList = null; - this.glacialList1.ItemHeight = 57; + this.glacialList1.ItemHeight = 50; this.glacialList1.ItemWordWrap = false; this.glacialList1.Location = new System.Drawing.Point(0, 0); - this.glacialList1.Margin = new System.Windows.Forms.Padding(5); + this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2221, 1115); + this.glacialList1.Size = new System.Drawing.Size(2036, 976); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -802,9 +802,9 @@ this.panel25.Controls.Add(this.panel36); this.panel25.Dock = System.Windows.Forms.DockStyle.Left; this.panel25.Location = new System.Drawing.Point(0, 0); - this.panel25.Margin = new System.Windows.Forms.Padding(5); + this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(339, 1115); + this.panel25.Size = new System.Drawing.Size(311, 976); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -814,13 +814,13 @@ this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0); this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406); this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 300F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(339, 651); + this.tableLayoutPanel2.Size = new System.Drawing.Size(311, 570); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -830,19 +830,19 @@ this.panel38.Controls.Add(this.label26); this.panel38.Controls.Add(this.label17); this.panel38.Controls.Add(this.label16); - this.panel38.Location = new System.Drawing.Point(5, 5); - this.panel38.Margin = new System.Windows.Forms.Padding(5); + this.panel38.Location = new System.Drawing.Point(5, 4); + this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(317, 288); + this.panel38.Size = new System.Drawing.Size(291, 252); this.panel38.TabIndex = 1; // // label27 // this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(-3, 195); + this.label27.Location = new System.Drawing.Point(-3, 171); this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(317, 83); + this.label27.Size = new System.Drawing.Size(291, 73); this.label27.TabIndex = 3; this.label27.Text = "9999"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -851,20 +851,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, 156); + this.label26.Location = new System.Drawing.Point(0, 136); this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(169, 37); + this.label26.Size = new System.Drawing.Size(151, 33); this.label26.TabIndex = 2; this.label26.Text = "完成数量"; // // label17 // this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(-3, 56); + this.label17.Location = new System.Drawing.Point(-3, 49); this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(317, 84); + this.label17.Size = new System.Drawing.Size(291, 74); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -873,10 +873,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(0, 11); + this.label16.Location = new System.Drawing.Point(0, 10); this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(169, 37); + this.label16.Size = new System.Drawing.Size(151, 33); this.label16.TabIndex = 0; this.label16.Text = "计划数量"; // @@ -886,11 +886,11 @@ this.groupBox1.Controls.Add(this.tableLayoutPanel3); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox1.Location = new System.Drawing.Point(4, 304); + this.groupBox1.Location = new System.Drawing.Point(4, 266); this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(331, 343); + this.groupBox1.Size = new System.Drawing.Size(303, 300); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "模具2"; @@ -905,15 +905,15 @@ this.tableLayoutPanel3.Controls.Add(this.label34, 0, 1); this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 36); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 32); this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(323, 303); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(295, 264); this.tableLayoutPanel3.TabIndex = 2; // // comBoxSizeR @@ -925,10 +925,10 @@ this.comBoxSizeR.Items.AddRange(new object[] { "A班", "B班"}); - this.comBoxSizeR.Location = new System.Drawing.Point(134, 114); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5); + this.comBoxSizeR.Location = new System.Drawing.Point(123, 99); + this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeR.Name = "comBoxSizeR"; - this.comBoxSizeR.Size = new System.Drawing.Size(177, 72); + this.comBoxSizeR.Size = new System.Drawing.Size(163, 64); this.comBoxSizeR.TabIndex = 3; this.comBoxSizeR.SelectedValueChanged += new System.EventHandler(this.comBoxSizeR_SelectedValueChanged); // @@ -940,19 +940,19 @@ 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, 205); + this.panel47.Location = new System.Drawing.Point(4, 179); this.panel47.Margin = new System.Windows.Forms.Padding(4); this.panel47.Name = "panel47"; - this.panel47.Size = new System.Drawing.Size(315, 94); + this.panel47.Size = new System.Drawing.Size(287, 81); this.panel47.TabIndex = 4; // // btnHandPrintR // 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(200, 29); + this.btnHandPrintR.Location = new System.Drawing.Point(183, 25); this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4); this.btnHandPrintR.Name = "btnHandPrintR"; - this.btnHandPrintR.Size = new System.Drawing.Size(125, 60); + this.btnHandPrintR.Size = new System.Drawing.Size(115, 52); this.btnHandPrintR.TabIndex = 3; this.btnHandPrintR.Text = "打印"; this.btnHandPrintR.UseVisualStyleBackColor = true; @@ -962,10 +962,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(77, 29); + this.label30.Location = new System.Drawing.Point(71, 25); this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(56, 59); + this.label30.Size = new System.Drawing.Size(50, 52); this.label30.TabIndex = 2; this.label30.Text = "/"; // @@ -973,10 +973,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(140, 32); + this.lbNeedQtyR.Location = new System.Drawing.Point(128, 28); this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyR.Name = "lbNeedQtyR"; - this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59); + this.lbNeedQtyR.Size = new System.Drawing.Size(50, 52); this.lbNeedQtyR.TabIndex = 1; this.lbNeedQtyR.Text = "0"; // @@ -984,10 +984,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(19, 32); + this.lbCurrentlQtyR.Location = new System.Drawing.Point(17, 28); this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyR.Name = "lbCurrentlQtyR"; - this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyR.TabIndex = 0; this.lbCurrentlQtyR.Text = "0"; this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -997,10 +997,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, 124); + this.label34.Location = new System.Drawing.Point(5, 108); this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(116, 53); + this.label34.Size = new System.Drawing.Size(106, 46); this.label34.TabIndex = 1; this.label34.Text = "规格:"; this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1011,10 +1011,10 @@ this.lbPackageCodeR.AutoSize = true; this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2); this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeR.Location = new System.Drawing.Point(4, 31); + this.lbPackageCodeR.Location = new System.Drawing.Point(4, 27); this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeR.Name = "lbPackageCodeR"; - this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeR.TabIndex = 5; // // panel36 @@ -1022,16 +1022,16 @@ this.panel36.Controls.Add(this.tableLayoutPanel1); this.panel36.Dock = System.Windows.Forms.DockStyle.Top; this.panel36.Location = new System.Drawing.Point(0, 0); - this.panel36.Margin = new System.Windows.Forms.Padding(5); + this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(339, 464); + this.panel36.Size = new System.Drawing.Size(311, 406); this.panel36.TabIndex = 0; // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F)); this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1041,7 +1041,7 @@ 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(339, 464); + this.tableLayoutPanel1.Size = new System.Drawing.Size(311, 406); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -1049,10 +1049,10 @@ this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.BackColor = System.Drawing.Color.DeepSkyBlue; this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label11.Location = new System.Drawing.Point(5, 21); + this.label11.Location = new System.Drawing.Point(5, 18); this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(325, 95); + this.label11.Size = new System.Drawing.Size(298, 83); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1063,11 +1063,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, 120); + this.groupBox2.Location = new System.Drawing.Point(4, 105); this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(4); - this.groupBox2.Size = new System.Drawing.Size(331, 340); + this.groupBox2.Size = new System.Drawing.Size(303, 297); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "模具1&&手打"; @@ -1082,15 +1082,15 @@ this.tableLayoutPanel4.Controls.Add(this.panel46, 0, 2); this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 36); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32); this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 3; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 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, 20F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(323, 300); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(295, 261); this.tableLayoutPanel4.TabIndex = 3; // // comBoxSizeL @@ -1102,10 +1102,10 @@ this.comBoxSizeL.Items.AddRange(new object[] { "A班", "B班"}); - this.comBoxSizeL.Location = new System.Drawing.Point(134, 113); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5); + this.comBoxSizeL.Location = new System.Drawing.Point(123, 97); + this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(177, 72); + this.comBoxSizeL.Size = new System.Drawing.Size(163, 64); this.comBoxSizeL.TabIndex = 3; this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSize_SelectedValueChanged); // @@ -1114,10 +1114,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, 122); + this.label38.Location = new System.Drawing.Point(5, 106); this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(116, 53); + this.label38.Size = new System.Drawing.Size(106, 46); this.label38.TabIndex = 1; this.label38.Text = "规格:"; this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1130,19 +1130,19 @@ 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, 203); + this.panel46.Location = new System.Drawing.Point(4, 177); this.panel46.Margin = new System.Windows.Forms.Padding(4); this.panel46.Name = "panel46"; - this.panel46.Size = new System.Drawing.Size(315, 93); + this.panel46.Size = new System.Drawing.Size(287, 80); this.panel46.TabIndex = 4; // // btnHandPrintL // 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(200, 29); + this.btnHandPrintL.Location = new System.Drawing.Point(183, 25); this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4); this.btnHandPrintL.Name = "btnHandPrintL"; - this.btnHandPrintL.Size = new System.Drawing.Size(125, 60); + this.btnHandPrintL.Size = new System.Drawing.Size(115, 52); this.btnHandPrintL.TabIndex = 3; this.btnHandPrintL.Text = "打印"; this.btnHandPrintL.UseVisualStyleBackColor = true; @@ -1152,10 +1152,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(77, 29); + this.label31.Location = new System.Drawing.Point(71, 25); this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(56, 59); + this.label31.Size = new System.Drawing.Size(50, 52); this.label31.TabIndex = 2; this.label31.Text = "/"; // @@ -1163,10 +1163,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(140, 32); + this.lbNeedQtyL.Location = new System.Drawing.Point(128, 28); this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyL.Name = "lbNeedQtyL"; - this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59); + this.lbNeedQtyL.Size = new System.Drawing.Size(50, 52); this.lbNeedQtyL.TabIndex = 1; this.lbNeedQtyL.Text = "0"; // @@ -1174,10 +1174,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(19, 32); + this.lbCurrentlQtyL.Location = new System.Drawing.Point(17, 28); this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyL.Name = "lbCurrentlQtyL"; - this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyL.TabIndex = 0; this.lbCurrentlQtyL.Text = "0"; this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1188,10 +1188,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, 31); + this.lbPackageCodeL.Location = new System.Drawing.Point(4, 26); this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeL.Name = "lbPackageCodeL"; - this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeL.TabIndex = 5; // // panel8 @@ -1200,9 +1200,9 @@ this.panel8.Controls.Add(this.panel9); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Margin = new System.Windows.Forms.Padding(5); + this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(2560, 104); + this.panel8.Size = new System.Drawing.Size(2347, 91); this.panel8.TabIndex = 0; // // panel10 @@ -1210,10 +1210,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(339, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5); + this.panel10.Location = new System.Drawing.Point(311, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2221, 104); + this.panel10.Size = new System.Drawing.Size(2036, 91); this.panel10.TabIndex = 2; // // panel12 @@ -1221,10 +1221,10 @@ this.panel12.Controls.Add(this.panel16); this.panel12.Controls.Add(this.panel15); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel12.Location = new System.Drawing.Point(492, 0); - this.panel12.Margin = new System.Windows.Forms.Padding(5); + this.panel12.Location = new System.Drawing.Point(451, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1729, 104); + this.panel12.Size = new System.Drawing.Size(1585, 91); this.panel12.TabIndex = 1; // // panel16 @@ -1232,10 +1232,10 @@ this.panel16.Controls.Add(this.panel20); this.panel16.Controls.Add(this.panel19); this.panel16.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel16.Location = new System.Drawing.Point(509, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(5); + this.panel16.Location = new System.Drawing.Point(467, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1220, 104); + this.panel16.Size = new System.Drawing.Size(1118, 91); this.panel16.TabIndex = 1; // // panel20 @@ -1243,10 +1243,10 @@ this.panel20.Controls.Add(this.label10); this.panel20.Controls.Add(this.panel22); this.panel20.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel20.Location = new System.Drawing.Point(467, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(5); + this.panel20.Location = new System.Drawing.Point(428, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(753, 104); + this.panel20.Size = new System.Drawing.Size(690, 91); this.panel20.TabIndex = 1; // // label10 @@ -1254,10 +1254,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(372, 0); + this.label10.Location = new System.Drawing.Point(341, 0); this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(381, 104); + this.label10.Size = new System.Drawing.Size(349, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1268,9 +1268,9 @@ this.panel22.Controls.Add(this.label9); this.panel22.Dock = System.Windows.Forms.DockStyle.Left; this.panel22.Location = new System.Drawing.Point(0, 0); - this.panel22.Margin = new System.Windows.Forms.Padding(5); + this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel22.Name = "panel22"; - this.panel22.Size = new System.Drawing.Size(372, 104); + this.panel22.Size = new System.Drawing.Size(341, 91); this.panel22.TabIndex = 0; // // label9 @@ -1282,7 +1282,7 @@ this.label9.Location = new System.Drawing.Point(0, 0); this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(372, 104); + this.label9.Size = new System.Drawing.Size(341, 91); this.label9.TabIndex = 0; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1294,9 +1294,9 @@ this.panel19.Controls.Add(this.panel21); this.panel19.Dock = System.Windows.Forms.DockStyle.Left; this.panel19.Location = new System.Drawing.Point(0, 0); - this.panel19.Margin = new System.Windows.Forms.Padding(5); + this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel19.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(467, 104); + this.panel19.Size = new System.Drawing.Size(428, 91); this.panel19.TabIndex = 0; // // label8 @@ -1304,10 +1304,10 @@ this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label8.Location = new System.Drawing.Point(220, 0); + this.label8.Location = new System.Drawing.Point(202, 0); this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(247, 104); + this.label8.Size = new System.Drawing.Size(226, 91); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1317,9 +1317,9 @@ this.panel21.Controls.Add(this.label7); this.panel21.Dock = System.Windows.Forms.DockStyle.Left; this.panel21.Location = new System.Drawing.Point(0, 0); - this.panel21.Margin = new System.Windows.Forms.Padding(5); + this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(220, 104); + this.panel21.Size = new System.Drawing.Size(202, 91); this.panel21.TabIndex = 0; // // label7 @@ -1331,7 +1331,7 @@ this.label7.Location = new System.Drawing.Point(0, 0); this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(220, 104); + this.label7.Size = new System.Drawing.Size(202, 91); this.label7.TabIndex = 0; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1343,19 +1343,19 @@ this.panel15.Controls.Add(this.panel17); this.panel15.Dock = System.Windows.Forms.DockStyle.Left; this.panel15.Location = new System.Drawing.Point(0, 0); - this.panel15.Margin = new System.Windows.Forms.Padding(5); + this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(509, 104); + this.panel15.Size = new System.Drawing.Size(467, 91); this.panel15.TabIndex = 0; // // panel18 // this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(220, 0); - this.panel18.Margin = new System.Windows.Forms.Padding(5); + this.panel18.Location = new System.Drawing.Point(202, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(289, 104); + this.panel18.Size = new System.Drawing.Size(265, 91); this.panel18.TabIndex = 1; // // label6 @@ -1366,7 +1366,7 @@ this.label6.Location = new System.Drawing.Point(0, 0); this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(289, 104); + this.label6.Size = new System.Drawing.Size(265, 91); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1376,9 +1376,9 @@ this.panel17.Controls.Add(this.label5); this.panel17.Dock = System.Windows.Forms.DockStyle.Left; this.panel17.Location = new System.Drawing.Point(0, 0); - this.panel17.Margin = new System.Windows.Forms.Padding(5); + this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(220, 104); + this.panel17.Size = new System.Drawing.Size(202, 91); this.panel17.TabIndex = 0; // // label5 @@ -1390,7 +1390,7 @@ this.label5.Location = new System.Drawing.Point(0, 0); this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(220, 104); + this.label5.Size = new System.Drawing.Size(202, 91); this.label5.TabIndex = 0; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1402,19 +1402,19 @@ this.panel11.Controls.Add(this.panel13); this.panel11.Dock = System.Windows.Forms.DockStyle.Left; this.panel11.Location = new System.Drawing.Point(0, 0); - this.panel11.Margin = new System.Windows.Forms.Padding(5); + this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(492, 104); + this.panel11.Size = new System.Drawing.Size(451, 91); this.panel11.TabIndex = 0; // // panel14 // this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(220, 0); - this.panel14.Margin = new System.Windows.Forms.Padding(5); + this.panel14.Location = new System.Drawing.Point(202, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(272, 104); + this.panel14.Size = new System.Drawing.Size(249, 91); this.panel14.TabIndex = 1; // // comboBox1 @@ -1427,9 +1427,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(5); + this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(272, 93); + this.comboBox1.Size = new System.Drawing.Size(249, 83); this.comboBox1.TabIndex = 0; // // panel13 @@ -1437,9 +1437,9 @@ this.panel13.Controls.Add(this.label4); this.panel13.Dock = System.Windows.Forms.DockStyle.Left; this.panel13.Location = new System.Drawing.Point(0, 0); - this.panel13.Margin = new System.Windows.Forms.Padding(5); + this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(220, 104); + this.panel13.Size = new System.Drawing.Size(202, 91); this.panel13.TabIndex = 0; // // label4 @@ -1451,7 +1451,7 @@ this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(220, 104); + this.label4.Size = new System.Drawing.Size(202, 91); this.label4.TabIndex = 0; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1461,9 +1461,9 @@ this.panel9.Controls.Add(this.label3); this.panel9.Dock = System.Windows.Forms.DockStyle.Left; this.panel9.Location = new System.Drawing.Point(0, 0); - this.panel9.Margin = new System.Windows.Forms.Padding(5); + this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(339, 104); + this.panel9.Size = new System.Drawing.Size(311, 91); this.panel9.TabIndex = 0; // // label3 @@ -1475,7 +1475,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(339, 104); + this.label3.Size = new System.Drawing.Size(311, 91); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1486,9 +1486,9 @@ this.panel2.Controls.Add(this.panel3); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(5); + this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2560, 168); + this.panel2.Size = new System.Drawing.Size(2347, 147); this.panel2.TabIndex = 0; // // panel4 @@ -1496,10 +1496,10 @@ this.panel4.Controls.Add(this.panel6); this.panel4.Controls.Add(this.panel5); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(339, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(5); + this.panel4.Location = new System.Drawing.Point(311, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2221, 168); + this.panel4.Size = new System.Drawing.Size(2036, 147); this.panel4.TabIndex = 1; // // panel6 @@ -1507,9 +1507,9 @@ this.panel6.Controls.Add(this.label1); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Margin = new System.Windows.Forms.Padding(5); + this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1837, 168); + this.panel6.Size = new System.Drawing.Size(1684, 147); this.panel6.TabIndex = 1; // // label1 @@ -1520,7 +1520,7 @@ this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1837, 168); + this.label1.Size = new System.Drawing.Size(1684, 147); this.label1.TabIndex = 0; this.label1.Text = "注塑车间条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1529,10 +1529,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(1837, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(5); + this.panel5.Location = new System.Drawing.Point(1684, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(384, 168); + this.panel5.Size = new System.Drawing.Size(352, 147); this.panel5.TabIndex = 0; // // label2 @@ -1543,7 +1543,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(384, 168); + this.label2.Size = new System.Drawing.Size(352, 147); this.label2.TabIndex = 0; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1554,19 +1554,19 @@ this.panel3.Controls.Add(this.pictureBox1); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(5); + this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(339, 168); + this.panel3.Size = new System.Drawing.Size(311, 147); this.panel3.TabIndex = 0; // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(5, 5); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(5); + this.pictureBox1.Location = new System.Drawing.Point(5, 4); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(335, 159); + this.pictureBox1.Size = new System.Drawing.Size(307, 139); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1610,12 +1610,12 @@ // // FrmMain2408 // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2560, 1651); + this.ClientSize = new System.Drawing.Size(2347, 1617); this.Controls.Add(this.panel1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(5); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.Name = "FrmMain2408"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index 5c1d88e..0cf573a 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -71,6 +71,7 @@ namespace InjectionPC public FrmMain2408() { InitializeComponent(); + this.Size = new Size(1280, 1024); } public string planID = "", productID = "", nextPlanID = "", nextproductID = "",aa=""; diff --git a/InjectionSearch/FrmPackageDetail.Designer.cs b/InjectionSearch/FrmPackageDetail.Designer.cs index f9594fe..b2b3e8e 100644 --- a/InjectionSearch/FrmPackageDetail.Designer.cs +++ b/InjectionSearch/FrmPackageDetail.Designer.cs @@ -32,16 +32,16 @@ namespace InjectionSearch System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.txtPackageCode = new System.Windows.Forms.TextBox(); this.btnSearch = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); - this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); this.箱单号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.注塑码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -64,10 +64,10 @@ namespace InjectionSearch this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 52F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(2331, 1192); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 52F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2137, 1043); this.tableLayoutPanel1.TabIndex = 0; // // panel1 @@ -83,9 +83,59 @@ namespace InjectionSearch this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2325, 54); + this.panel1.Size = new System.Drawing.Size(2131, 46); this.panel1.TabIndex = 0; // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(1560, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(52, 21); + this.label3.TabIndex = 7; + this.label3.Text = "箱码"; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(929, 14); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(52, 21); + this.label2.TabIndex = 6; + this.label2.Text = "时间"; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(1240, 14); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(21, 21); + this.label1.TabIndex = 5; + this.label1.Text = "-"; + // + // dateTimePicker2 + // + this.dateTimePicker2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.dateTimePicker2.CustomFormat = "yyyy-MM-dd HH:mm"; + this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dateTimePicker2.Location = new System.Drawing.Point(1270, 9); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(242, 31); + this.dateTimePicker2.TabIndex = 4; + // + // dateTimePicker1 + // + this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm"; + this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dateTimePicker1.Location = new System.Drawing.Point(992, 9); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(242, 31); + this.dateTimePicker1.TabIndex = 3; + // // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 1; @@ -95,7 +145,7 @@ namespace InjectionSearch this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(751, 56); + this.tableLayoutPanel2.Size = new System.Drawing.Size(688, 49); this.tableLayoutPanel2.TabIndex = 2; // // toolStrip1 @@ -104,7 +154,7 @@ namespace InjectionSearch this.toolStrip1.ImageScalingSize = new System.Drawing.Size(32, 32); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(751, 56); + this.toolStrip1.Size = new System.Drawing.Size(688, 49); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // @@ -113,18 +163,18 @@ namespace InjectionSearch this.txtPackageCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.txtPackageCode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPackageCode.Location = new System.Drawing.Point(1771, 5); + this.txtPackageCode.Location = new System.Drawing.Point(1623, 4); this.txtPackageCode.Name = "txtPackageCode"; - this.txtPackageCode.Size = new System.Drawing.Size(373, 44); + this.txtPackageCode.Size = new System.Drawing.Size(342, 39); this.txtPackageCode.TabIndex = 1; // // btnSearch // this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSearch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(2173, 0); + this.btnSearch.Location = new System.Drawing.Point(1992, 0); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(153, 51); + this.btnSearch.Size = new System.Drawing.Size(140, 45); this.btnSearch.TabIndex = 0; this.btnSearch.Text = "查 询"; this.btnSearch.UseVisualStyleBackColor = true; @@ -150,64 +200,14 @@ namespace InjectionSearch dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(3, 63); + this.dataGridView1.Location = new System.Drawing.Point(3, 55); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 82; this.dataGridView1.RowTemplate.Height = 37; - this.dataGridView1.Size = new System.Drawing.Size(2325, 1066); + this.dataGridView1.Size = new System.Drawing.Size(2131, 933); this.dataGridView1.TabIndex = 1; this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); // - // dateTimePicker1 - // - this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker1.Location = new System.Drawing.Point(1082, 10); - this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(264, 35); - this.dateTimePicker1.TabIndex = 3; - // - // dateTimePicker2 - // - this.dateTimePicker2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.dateTimePicker2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker2.Location = new System.Drawing.Point(1385, 10); - this.dateTimePicker2.Name = "dateTimePicker2"; - this.dateTimePicker2.Size = new System.Drawing.Size(264, 35); - this.dateTimePicker2.TabIndex = 4; - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(1353, 16); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(22, 24); - this.label1.TabIndex = 5; - this.label1.Text = "-"; - // - // label2 - // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(1013, 16); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(58, 24); - this.label2.TabIndex = 6; - this.label2.Text = "时间"; - // - // label3 - // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(1702, 14); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(58, 24); - this.label3.TabIndex = 7; - this.label3.Text = "箱码"; - // // 箱单号 // this.箱单号.DataPropertyName = "BoxNo"; @@ -259,9 +259,9 @@ namespace InjectionSearch // // FrmPackageDetail // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2331, 1192); + this.ClientSize = new System.Drawing.Size(2137, 1043); this.Controls.Add(this.tableLayoutPanel1); this.Name = "FrmPackageDetail"; this.Text = "箱单详细信息"; diff --git a/MESClassLibrary/DAL/Wms/WmsDAL.cs b/MESClassLibrary/DAL/Wms/WmsDAL.cs index 0f83f97..daf50ef 100644 --- a/MESClassLibrary/DAL/Wms/WmsDAL.cs +++ b/MESClassLibrary/DAL/Wms/WmsDAL.cs @@ -16,6 +16,12 @@ namespace MESClassLibrary.DAL.Injection { public class WmsDAL { + #region 注塑 + /// + /// wms注塑中间表tb_Injectionn_Interface批量插入箱码,注塑码数据 + /// + /// + /// public string SaveInterface(DataTable barCodeTable) { LocalDBService local = new LocalDBService(SqlHelper.GetConnSting()); @@ -47,13 +53,20 @@ namespace MESClassLibrary.DAL.Injection } return null; } - - public bool DeleteRecord(LocalDBService localDB,string boxNo,string oneBarCode,string barCode ) + /// + /// wms注塑中间表tb_Injectionn_Interface 单条插入箱码,注塑码数据 + /// + /// + /// + /// + /// + /// + public bool AddRecord(LocalDBService localDB, string boxNo, string oneBarCode, string barCode) { try - { - string sql = $"delete from tb_Injectionn_Interface where PackageCode='{boxNo}' and OneBarCode='{oneBarCode}' and BarCode='{barCode}'"; - localDB.Exec_NonQuery(sql); + { + string sql = $"insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark) values ('{boxNo}','{oneBarCode}','{barCode}','')"; + localDB.Exec_NonQuery(sql); return true; } catch (Exception ex) @@ -62,11 +75,19 @@ namespace MESClassLibrary.DAL.Injection return false; } } - public bool AddRecord(LocalDBService localDB, string boxNo, string oneBarCode, string barCode) + /// + /// 删除一条WMS中间表数据. 装箱过程中发现一条报废产品,删除. + /// + /// + /// + /// + /// + /// + public bool DeleteRecord(LocalDBService localDB, string boxNo, string oneBarCode, string barCode) { try { - string sql = $"insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark) values ('{boxNo}','{oneBarCode}','{barCode}','')"; + string sql = $"delete from tb_Injectionn_Interface where PackageCode='{boxNo}' and OneBarCode='{oneBarCode}' and BarCode='{barCode}'"; localDB.Exec_NonQuery(sql); return true; } @@ -76,6 +97,7 @@ namespace MESClassLibrary.DAL.Injection return false; } } + /// /// 箱码是否已传递到wms /// @@ -88,7 +110,7 @@ namespace MESClassLibrary.DAL.Injection string sql = $" select * from tb_Injectionn_Interface where PackageCode='{pacakgCode}'"; DataTable dt = SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, null).Tables[0]; - return dt.Rows.Count>0; + return dt.Rows.Count > 0; } catch (Exception ex) { @@ -97,6 +119,11 @@ namespace MESClassLibrary.DAL.Injection } } - + #endregion + + #region 喷涂 + + #endregion + } } diff --git a/PaintingPC/FrmChangeColor.cs b/PaintingPC/FrmChangeColor.cs index 6b524b1..0376909 100644 --- a/PaintingPC/FrmChangeColor.cs +++ b/PaintingPC/FrmChangeColor.cs @@ -83,8 +83,9 @@ namespace PaintingPC RadioButton rbn = c as RadioButton; if (rbn.Checked) { - FrmFirstCheck.ColorName = rbn.Text; - FrmSecondCheck.ColorName = rbn.Text; + //FrmFirstCheck.ColorName = rbn.Text; + //FrmSecondCheck.ColorName = rbn.Text; + FrmQuality.ColorName = rbn.Text; } } diff --git a/PaintingPC/FrmQuality.Designer.cs b/PaintingPC/FrmQuality.Designer.cs new file mode 100644 index 0000000..0f5b981 --- /dev/null +++ b/PaintingPC/FrmQuality.Designer.cs @@ -0,0 +1,403 @@ +namespace PaintingPC +{ + partial class FrmQuality + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + try + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + catch + { + + } + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmQuality)); + this.labelVersion = new System.Windows.Forms.Label(); + this.labStation = new System.Windows.Forms.Label(); + this.labWorkClass = new System.Windows.Forms.Label(); + this.rdo3 = new System.Windows.Forms.RadioButton(); + this.rdo2 = new System.Windows.Forms.RadioButton(); + this.rdo1 = new System.Windows.Forms.RadioButton(); + this.labTime = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.labTitle = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.label15 = new System.Windows.Forms.Label(); + this.labProductInfo = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.txtBarCode = new System.Windows.Forms.TextBox(); + this.labProPosition = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.btnRepair = new System.Windows.Forms.Button(); + this.btnAbt = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.panel1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // labelVersion + // + this.labelVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.labelVersion.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labelVersion.Location = new System.Drawing.Point(1947, 173); + this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelVersion.Name = "labelVersion"; + this.labelVersion.Size = new System.Drawing.Size(378, 122); + this.labelVersion.TabIndex = 24; + this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labStation + // + this.labStation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.labStation.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labStation.Location = new System.Drawing.Point(1562, 173); + this.labStation.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labStation.Name = "labStation"; + this.labStation.Size = new System.Drawing.Size(378, 122); + this.labStation.TabIndex = 23; + this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labWorkClass + // + this.labWorkClass.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.labWorkClass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labWorkClass.Location = new System.Drawing.Point(1177, 173); + this.labWorkClass.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labWorkClass.Name = "labWorkClass"; + this.labWorkClass.Size = new System.Drawing.Size(378, 122); + this.labWorkClass.TabIndex = 22; + this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click); + // + // rdo3 + // + this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.rdo3.Location = new System.Drawing.Point(792, 173); + this.rdo3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.rdo3.Name = "rdo3"; + this.rdo3.Size = new System.Drawing.Size(378, 122); + this.rdo3.TabIndex = 21; + this.rdo3.Text = "项目调试"; + this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.rdo3.UseVisualStyleBackColor = false; + // + // rdo2 + // + this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.rdo2.Location = new System.Drawing.Point(407, 173); + this.rdo2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.rdo2.Name = "rdo2"; + this.rdo2.Size = new System.Drawing.Size(378, 122); + this.rdo2.TabIndex = 20; + this.rdo2.Text = "量产调试"; + this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.rdo2.UseVisualStyleBackColor = false; + // + // rdo1 + // + this.rdo1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); + this.rdo1.Checked = true; + this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.rdo1.Location = new System.Drawing.Point(22, 173); + this.rdo1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.rdo1.Name = "rdo1"; + this.rdo1.Size = new System.Drawing.Size(378, 122); + this.rdo1.TabIndex = 19; + this.rdo1.TabStop = true; + this.rdo1.Text = "正式量产"; + this.rdo1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.rdo1.UseVisualStyleBackColor = false; + // + // labTime + // + this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labTime.Location = new System.Drawing.Point(1868, 16); + this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labTime.Name = "labTime"; + this.labTime.Size = new System.Drawing.Size(457, 146); + this.labTime.TabIndex = 18; + this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labTime.Click += new System.EventHandler(this.labTime_Click); + // + // 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(22, 16); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(290, 146); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 17; + this.pictureBox1.TabStop = false; + // + // labTitle + // + this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labTitle.Location = new System.Drawing.Point(295, 16); + this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labTitle.Name = "labTitle"; + this.labTitle.Size = new System.Drawing.Size(1577, 146); + this.labTitle.TabIndex = 16; + this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(22, 1174); + this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1828, 614); + this.panel2.TabIndex = 48; + // + // pictureBox2 + // + this.pictureBox2.Location = new System.Drawing.Point(22, 653); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(1828, 511); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 47; + this.pictureBox2.TabStop = false; + // + // label15 + // + this.label15.BackColor = System.Drawing.Color.Lime; + this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(22, 306); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(292, 131); + this.label15.TabIndex = 49; + this.label15.Text = "扫码信息"; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labProductInfo + // + this.labProductInfo.BackColor = System.Drawing.Color.White; + this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labProductInfo.Location = new System.Drawing.Point(1408, 306); + this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labProductInfo.Name = "labProductInfo"; + this.labProductInfo.Size = new System.Drawing.Size(917, 131); + this.labProductInfo.TabIndex = 52; + this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Lime; + this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(1106, 306); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(292, 131); + this.label2.TabIndex = 51; + this.label2.Text = "产品信息"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // txtBarCode + // + this.txtBarCode.BackColor = System.Drawing.Color.White; + this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtBarCode.Location = new System.Drawing.Point(326, 327); + this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.txtBarCode.Name = "txtBarCode"; + this.txtBarCode.Size = new System.Drawing.Size(765, 87); + this.txtBarCode.TabIndex = 0; + this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtBarCode.DoubleClick += new System.EventHandler(this.txtBarCode_DoubleClick); + this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown); + // + // labProPosition + // + this.labProPosition.BackColor = System.Drawing.Color.White; + this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labProPosition.Location = new System.Drawing.Point(1861, 450); + this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labProPosition.Name = "labProPosition"; + this.labProPosition.Size = new System.Drawing.Size(464, 151); + this.labProPosition.TabIndex = 64; + this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panel1 + // + this.panel1.AutoScroll = true; + this.panel1.Controls.Add(this.groupBox1); + this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panel1.Location = new System.Drawing.Point(22, 434); + this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1828, 212); + this.panel1.TabIndex = 66; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.panel3); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox1.Location = new System.Drawing.Point(0, 0); + this.groupBox1.Margin = new System.Windows.Forms.Padding(0); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(0); + this.groupBox1.Size = new System.Drawing.Size(1828, 212); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "更改颜色"; + // + // panel3 + // + this.panel3.AutoScroll = true; + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 37); + this.panel3.Margin = new System.Windows.Forms.Padding(0); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1828, 175); + this.panel3.TabIndex = 0; + // + // button2 + // + this.button2.BackColor = System.Drawing.Color.LawnGreen; + this.button2.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button2.Location = new System.Drawing.Point(1852, 663); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(491, 153); + this.button2.TabIndex = 67; + this.button2.Text = "合 格"; + this.button2.UseVisualStyleBackColor = false; + // + // button3 + // + this.button3.BackColor = System.Drawing.Color.Yellow; + this.button3.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button3.Location = new System.Drawing.Point(1852, 974); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(491, 153); + this.button3.TabIndex = 68; + this.button3.Text = "不合格"; + this.button3.UseVisualStyleBackColor = false; + // + // btnRepair + // + this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue; + this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRepair.Location = new System.Drawing.Point(1852, 1314); + this.btnRepair.Name = "btnRepair"; + this.btnRepair.Size = new System.Drawing.Size(491, 153); + this.btnRepair.TabIndex = 69; + this.btnRepair.Text = "返 喷"; + this.btnRepair.UseVisualStyleBackColor = false; + this.btnRepair.Click += new System.EventHandler(this.btnRepair_Click); + // + // btnAbt + // + this.btnAbt.BackColor = System.Drawing.Color.OrangeRed; + this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAbt.Location = new System.Drawing.Point(1852, 1635); + this.btnAbt.Name = "btnAbt"; + this.btnAbt.Size = new System.Drawing.Size(491, 153); + this.btnAbt.TabIndex = 70; + this.btnAbt.Text = "报 废"; + this.btnAbt.UseVisualStyleBackColor = false; + this.btnAbt.Click += new System.EventHandler(this.btnAbt_Click); + // + // FrmQuality + // + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(2351, 1764); + this.Controls.Add(this.btnAbt); + this.Controls.Add(this.btnRepair); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.panel1); + this.Controls.Add(this.labProPosition); + this.Controls.Add(this.txtBarCode); + this.Controls.Add(this.labProductInfo); + this.Controls.Add(this.label2); + this.Controls.Add(this.label15); + this.Controls.Add(this.panel2); + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.labelVersion); + this.Controls.Add(this.labStation); + this.Controls.Add(this.labWorkClass); + this.Controls.Add(this.rdo3); + this.Controls.Add(this.rdo2); + this.Controls.Add(this.rdo1); + this.Controls.Add(this.labTime); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.labTitle); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.Name = "FrmQuality"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "喷涂质检"; + this.Load += new System.EventHandler(this.FrmSecondCheck_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.panel1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label labelVersion; + private System.Windows.Forms.Label labStation; + private System.Windows.Forms.Label labWorkClass; + private System.Windows.Forms.RadioButton rdo3; + private System.Windows.Forms.RadioButton rdo2; + private System.Windows.Forms.RadioButton rdo1; + private System.Windows.Forms.Label labTime; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label labTitle; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label labProductInfo; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtBarCode; + private System.Windows.Forms.Label labProPosition; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button btnRepair; + private System.Windows.Forms.Button btnAbt; + } +} \ No newline at end of file diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs new file mode 100644 index 0000000..a32195f --- /dev/null +++ b/PaintingPC/FrmQuality.cs @@ -0,0 +1,949 @@ + +using PaintingPC.Model; +using PaintingPC.WebReference; +using System; +using System.Configuration; +using System.Data; +using System.Drawing; +using System.IO; +using System.Net.NetworkInformation; +using System.Reflection; +using System.Threading; +using System.Windows.Forms; + +namespace PaintingPC +{ + public partial class FrmQuality : Form + { + int count = 0; //缺陷图选择个数 + public static string ColorName = ""; //修改颜色 + public static string paintId = ""; + + private static string position = "", reason = ""; + + public FrmQuality() + { + InitializeComponent(); + //WindowState = FormWindowState.Normal; + this.Size = new Size(1280, 1024); + } + + private void FrmSecondCheck_Load(object sender, EventArgs e) + { + try + { + Control.CheckForIllegalCrossThreadCalls = false; + UpdateSoftware(); + InitPage(); + } + catch (Exception ex) + { + MessageBox.Show("网络故障，请联系网络管理员"); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + } + + public void InitPage() + { + try + { + string title = ConfigurationManager.AppSettings["Position"].ToString(); + string workClass = Function.GetWorkClass(); + string station = ConfigurationManager.AppSettings["Station"].ToString(); + + labTitle.Text = title; + labWorkClass.Text = workClass; + labStation.Text = station; + labelVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); + + Program.IP = ConfigurationManager.AppSettings["IP"].ToString(); + + //System.Threading.Timer timer = new System.Threading.Timer(delegate + //{ + // labTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + //}, + //null, + //2000, + //1000 + //); + + + Thread t = new Thread(new ThreadStart(TimeGo)); + t.Start(); + } + catch (Exception ex) + { } + } + + public void InitColor(string stockNo) + { + try + { + DataTable dt = Function.GetColorByStockNo(stockNo); + if (dt != null && dt.Rows.Count > 0) + { + RadioButton[] rb = new RadioButton[dt.Rows.Count]; + for(int i=0; i 6) + { + rb[i].Location = new Point(rb[i - 1].Location.X + rb[i - 1].Width + 50, rb[i - 1].Location.Y); + } + else + { + rb[i].Location = new Point(rb[i - 1].Location.X + rb[i - 1].Width + 50, rb[i - 1].Location.Y); + } + + } + rb[i].Click += new System.EventHandler(this.rb_Click); + } + + groupBox1.Controls.AddRange(rb); + //panel3.Controls.AddRange(rb); + } + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + throw ex; + } + } + + private void rb_CheckedChanged(object sender, EventArgs e) + { + RadioButton rb = sender as RadioButton; + if (rb.Checked) + { + rb.BackColor = Color.LightSalmon; + } + else + { + rb.BackColor = Color.Silver; + } + } + + private void TimeGo() + { + System.Timers.Timer timer = new System.Timers.Timer(); + timer.Interval = 10; + timer.Enabled = true; + timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Tick); + } + + private void timer_Tick(object sender, EventArgs e) + { + try + { + labTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + Thread.Sleep(500); + } + catch + { + + } + } + + /// + /// 缺陷图点击 + /// + /// + /// + void lblRoom_Click(object sender, EventArgs e) + { + Label a = (Label)sender; + string aa = a.Text; + if (a.BackColor == Color.Transparent) + { + a.BackColor = Color.FromArgb(150, System.Drawing.Color.Chartreuse); + position += aa; + count++; + } + else + { + a.BackColor = Color.Transparent; + count--; + } + } + + /// + /// 缺陷原因点击 + /// + /// + /// + void dLbRoom_Click(object sender, EventArgs e) + { + if (count == 0) + { + MessageBox.Show("请选择缺陷区域！"); + return; + } + Label a = (Label)sender; + string aa = a.Text; + if (a.BackColor == Color.Transparent) + { + a.BackColor = Color.Chartreuse; + reason += a.Text + ";"; + } + else + { + a.BackColor = Color.Transparent; + reason = reason.Replace(a.Text + ";", ""); + } + } + + private Control[] SetControlGroup() + { + //Control[] controls = { btnPass, btnAbt, btnRepair }; + Control[] controls = { btnAbt, btnRepair }; + return controls; + } + + /// + /// 清除控件选中 + /// + /// + public void ClearControlColor(Control[] controls) + { + foreach (Control c in controls) + { + c.BackColor = Color.LightGray; + } + } + + /// + /// 抛光按钮 + /// + /// + /// + private void btnPass_Click(object sender, EventArgs e) + { + #region 必须选择缺陷位置与缺陷原因，否则无法保存 + + string damnPositionTemp = ""; + string reasonTemp = ""; + //缺陷位置 + foreach (Control c in pictureBox2.Controls) + { + Label lab = c as Label; + if (lab.BackColor != Color.Transparent) + { + damnPositionTemp += lab.Text + ";"; + } + } + //缺陷原因 + foreach (Control c in panel2.Controls) + { + Label lab = c as Label; + if (lab.BackColor != Color.Transparent) + { + reasonTemp += lab.Text + ";"; + } + } + + if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) + { + MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); + return; + } + + #endregion + + ClearControlColor(SetControlGroup()); + btnRepair.BackColor = Color.Yellow; + //保存 + SaveInspect("抛光"); + ClearPage(); + ClearTxtBarcode(); + txtBarCode.TabIndex = 0; + //LoadPage(); + //ClearInspect(); + //ClearControlColor(SetControlGroup()); + } + + /// + /// 打磨按钮 + /// + /// + /// + private void btnRepair_Click(object sender, EventArgs e) + { + #region 可回喷次数 =1，不能打磨， =2 可以， 不能有两次质检结果为打磨 + + string barcode = Function.UniteBarCodeToOne(txtBarCode.Text.Trim()); + int cs = Function.YiDaMoCiShu(barcode); + //if (cs >= 1) + //{ + // MessageBox.Show("该条码已有判定为打磨的质检结果！"); + // return; + //} + + int keHuiPen = Function.keHuiPen(barcode); + + if (keHuiPen > 0 && cs < keHuiPen) + { + #region 必须选择缺陷位置与缺陷原因，否则无法保存 + + string damnPositionTemp = ""; + string reasonTemp = ""; + //缺陷位置 + foreach (Control c in pictureBox2.Controls) + { + Label lab = c as Label; + if (lab.BackColor != Color.Transparent) + { + damnPositionTemp += lab.Text + ";"; + } + } + //缺陷原因 + foreach (Control c in panel2.Controls) + { + Label lab = c as Label; + if (lab.BackColor != Color.Transparent) + { + reasonTemp += lab.Text + ";"; + } + } + + if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) + { + MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); + return; + } + + #endregion + + ClearControlColor(SetControlGroup()); + btnRepair.BackColor = Color.Yellow; + //保存 + SaveInspect("打磨"); + ClearPage(); + ClearTxtBarcode(); + txtBarCode.TabIndex = 0; + } + else + { + MessageBox.Show("根据该零件可回喷次数设置，不能判定为打磨或已超过打磨次数！"); + return; + } + + #endregion + } + + /// + /// 报废按钮 + /// + /// + /// + private void btnAbt_Click(object sender, EventArgs e) + { + #region 必须选择缺陷位置与缺陷原因，否则无法保存 + + string damnPositionTemp = ""; + string reasonTemp = ""; + //缺陷位置 + foreach (Control c in pictureBox2.Controls) + { + Label lab = c as Label; + if (lab.BackColor != Color.Transparent) + { + damnPositionTemp += lab.Text + ";"; + position = damnPositionTemp; + } + } + //缺陷原因 + foreach (Control c in panel2.Controls) + { + Label lab = c as Label; + if (lab.BackColor != Color.Transparent) + { + reasonTemp += lab.Text + ";"; + reason = reasonTemp; + } + } + + if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) + { + MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); + return; + } + #endregion + + #region 判断产品是否有颜色 + + string[] ss = labProductInfo.Text.Split('，'); + if (ss.Length >= 1) + { + if (string.IsNullOrWhiteSpace(ss[0])) + { + MessageBox.Show("无颜色信息，请重新扫描"); + return; + } + } + else + { + MessageBox.Show("条码有误，请重新扫描"); + return; + } + + #endregion + + ClearControlColor(SetControlGroup()); + btnAbt.BackColor = Color.Red; + //保存 + SaveInspect("报废"); + + #region 报废则调WMS WebService，入库 + + //try + //{ + // WMSWebService webService = new WMSWebService(); + // webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString(); + // //webService.Timeout = 1200000; + + // string errorReason = ""; + // webService.WMSSprayingForCS(Function.UniteBarCodeToOne(txtBarCode.Text.Trim()), 0, out errorReason); + //} + //catch (Exception ex) + //{ + // LogHelper.WriteErrLogBase("工位：" + labStation.Text.Trim() + "，二次质检调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); + //} + + #endregion + + ClearPage(); + ClearTxtBarcode(); + txtBarCode.TabIndex = 0; + //ClearInspect(); + //ClearControlColor(SetControlGroup()); + } + + public void SaveInspect(string inspectResult) + { + try + { + if (!string.IsNullOrWhiteSpace(txtBarCode.Text.Trim())) + { + InspectModel model1 = new InspectModel(); + + model1.barcode = Function.UniteBarCodeToOne(txtBarCode.Text.Trim()); + model1.position = labProPosition.Text; + model1.stationNo = labStation.Text; + model1.workClass = labWorkClass.Text; + model1.inspectResult = "[" + inspectResult + "]"; + model1.damnPosition = position; + model1.reason = reason; + model1.remark3 = paintId; + + if (string.IsNullOrWhiteSpace(model1.damnPosition) || string.IsNullOrWhiteSpace(model1.reason)) + { + MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); + return; + } + + if (rdo1.Checked) + { + model1.productOption = "1"; + } + else if (rdo2.Checked) + { + model1.productOption = "2"; + } + else if (rdo3.Checked) + { + model1.productOption = "3"; + } + + model1.productInfo = labProductInfo.Text.Trim(); + model1.side = labProPosition.Text.Contains("A侧") ? "A侧" : "B侧"; + model1.InspectTimes = (Function.GetInspectTimes(txtBarCode.Text.Trim())+1).ToString(); + + Function.InsertInspect(model1); + } + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase("二次质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + } + + public void ClearInspect() + { + //缺陷位置 + foreach (Control c in pictureBox2.Controls) + { + Label lab = c as Label; + lab.BackColor = Color.Transparent; + } + //缺陷原因 + foreach (Control c in panel2.Controls) + { + Label lab = c as Label; + lab.BackColor = Color.Transparent; + } + } + + /// + /// 扫码-根据条码查询信息（产品信息、加载图片及缺陷原因、三次检验信息） + /// + /// + /// + private void txtBarCode_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + try + { + ClearPage(); + LoadPage(); + } + catch (Exception ex) + { + MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。"+ ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + } + } + + private void LoadPage() + { + try + { + ButtonEnable(SetControlGroup()); + //ClearPage(); + + //测试条码：11111111112222222222 + string barcode = txtBarCode.Text.Trim(); + if (barcode.Contains(".")) + { + barcode = Function.TransToBarCodeOne(barcode); + } + + #region 判断条码有效性 + + if (! Function.BarCodeValid(barcode)) + { + MessageBox.Show("扫描的条码号："+barcode+"无效，请重新扫描！"); + txtBarCode.Text = ""; + return; + } + + #endregion + + #region 查询该系列产品都有什么颜色 + + string canChanageColor = ConfigurationManager.AppSettings["CanChangeColor"].Trim(); + if (canChanageColor.ToLower() == "true") + { + string stockNo = barcode.Substring(0, 10); + InitColor(stockNo); + } + + #endregion + + #region 如果是补打的条码，查询产品信息 + + if (!barcode.Contains(".") && barcode.Length > 4) + { + string strCode = barcode.Substring(barcode.Length - 4, 4); + int num = 0; + Int32.TryParse(strCode, out num); + if (num > 7000) + { + labProductInfo.Text = Function.GetReprintInfo(barcode); + if (string.IsNullOrWhiteSpace(labProductInfo.Text.Trim())) + { + ButtonDisable(SetControlGroup()); + labProductInfo.Text = "没有查询到补打条码信息"; + return; + } + } + + } + + #endregion + + //根据条码查询，加载图片及原因 + int row = 0, col = 0; + string picture = ""; + + #region 缺陷原因 + + try + { + int drow = 0, dcol = 5; //行，列 + + DataTable dt3 = Function.SearchDefectInfo(ConfigurationManager.AppSettings["Station"].Trim()); + if (dt3 != null && dt3.Rows.Count > 0) + { + drow = Convert.ToInt32(Math.Ceiling((double)dt3.Rows.Count / dcol)); + Label[] dLb = new Label[7]; + string[] dstr = new string[dt3.Rows.Count]; + + for (int i = 0; i < dt3.Rows.Count; i++) + { + dstr[i] = dt3.Rows[i]["DefectName"].ToString(); + } + + for (int i = 0; i < dcol; i++) //列 + { + for (int j = 0; j < drow; j++) //行 + { + dLb[i] = new Label(); + if ((i + dcol * j) < dstr.Length) + { + dLb[i].Text = dstr[i + dcol * j].ToString(); + dLb[i].Font = new Font(dLb[i].Font.FontFamily, 24, FontStyle.Bold); + dLb[i].Size = new Size(150, 50); + dLb[i].Location = new Point(20 + i * (dLb[i].Size.Width + 25), 5 + j * (dLb[i].Size.Height + 20)); + dLb[i].BorderStyle = BorderStyle.FixedSingle; + dLb[i].BackColor = Color.Transparent; + dLb[i].TextAlign = ContentAlignment.MiddleCenter; + panel2.Controls.Add(dLb[i]); + dLb[i].Click += new EventHandler(dLbRoom_Click); + } + } + } + } + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + throw ex; + } + + #endregion + + #region 加载图片 + + try + { + DataTable dt = Function.SearchInfoByBarCode(barcode); + + if (dt != null && dt.Rows.Count > 0) + { + row = Convert.ToInt32(dt.Rows[0]["Rows"].ToString()); + col = Convert.ToInt32(dt.Rows[0]["Cols"].ToString()); + picture = dt.Rows[0]["PicturePath"].ToString(); + } + dt.Dispose(); + + if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) + { + + string strImageURL = Function.GetImgPath() + picture; + + System.Net.WebClient webClient = new System.Net.WebClient(); + webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); + } + FileStream fs = new FileStream(Directory.GetCurrentDirectory() + "\\" + picture, FileMode.Open, + FileAccess.Read);//获取图片文件流 + Image img = Image.FromStream(fs); // 文件流转换成Image格式 + pictureBox2.Image = img; //给 图片框设置要显示的图片 + fs.Close(); // 关闭流，释放图片资源 + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + #endregion + + #region 缺陷图划分区域 + + Label[] lb = new Label[5]; + string[] str = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" }; + + for (int i = 0; i < col; i++) + { + for (int j = 0; j < row; j++) + { + lb[i] = new Label(); + lb[i].Text = str[i + col * j].ToString(); + lb[i].Font = new Font(lb[i].Font.FontFamily, 32, FontStyle.Bold); + + lb[i].Size = new Size(pictureBox2.Width / col, pictureBox2.Height / row); + lb[i].Location = new Point(0 + i * lb[i].Size.Width, 0 + j * lb[i].Size.Height); + lb[i].BorderStyle = BorderStyle.FixedSingle; + lb[i].BackColor = Color.Transparent; + lb[i].TextAlign = ContentAlignment.MiddleCenter; + pictureBox2.Controls.Add(lb[i]); + + lb[i].Click += new EventHandler(lblRoom_Click); + } + } + + #endregion + + //不是补打的条码，根据条码查询产品信息、检验信息，选中缺陷位置及原因 + DataTable dtInspect = Function.GetInspectInfoByBarCode(barcode); + if (dtInspect != null && dtInspect.Rows.Count > 0) + { + labProductInfo.Text = dtInspect.Rows[0]["productInfo"].ToString().Trim(); //产品信息 + //string position1 = dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置 + //string reason1 = dtInspect.Rows[0]["reason"].ToString(); //原因 + position= dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置 + reason= dtInspect.Rows[0]["reason"].ToString(); //原因 + paintId = dtInspect.Rows[0]["remark3"].ToString(); //原因 + + #region 三检结果 + + //for (int i = 0; i < dtInspect.Rows.Count; i++) + //{ + // string time = dtInspect.Rows[i]["InspectTimes"].ToString(); + // string result = dtInspect.Rows[i]["inspectResult"].ToString() + dtInspect.Rows[i]["damnPosition"].ToString() + ":" + dtInspect.Rows[i]["reason"].ToString(); + // switch (time) + // { + // case "1": + // labFirstCheck.Text = result; + // break; + // case "2": + // labSecondCheck.Text = result; + // break; + // case "3": + // labThirdCheck.Text = result; + // break; + // } + //} + + #endregion + + #region 选中缺陷位置及原因 + + foreach (Control c in pictureBox2.Controls) + { + Label lab = c as Label; + if (position.Contains(lab.Text)) + { + lab.BackColor = Color.FromArgb(150, System.Drawing.Color.Chartreuse); + count++; + } + } + foreach (Control c in panel2.Controls) + { + Label lab = c as Label; + if (reason.Contains(lab.Text)) + { + lab.BackColor = Color.Chartreuse; + reason += lab.Text + ";"; + } + } + + #endregion + + #region 根据一检结果显示一检时的位置--暂时不要 + + labProPosition.Text = Function.GetFirstInsPosition(dtInspect); + + #endregion + } + else + { + #region 没有一检结果，查询老外数据库，取产品信息 + + string[] info = Function.GetProductInfo(barcode).Split('，'); + labProductInfo.Text = info[0] + "，" + info[1]; + paintId = info[2]; + + labProductInfo.Tag = Function.GetSide(barcode, paintId); + labProPosition.Text = labTitle.Text.Trim() + " " + labProductInfo.Tag.ToString().Replace(';', ' '); + + #endregion + } + + + txtBarCode.SelectAll(); + } + catch (Exception ex) + { + MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。" + ex.ToString()); + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + } + + /// + /// 设置按钮不可用 + /// + /// + private void ButtonDisable(Control[] controls) + { + foreach (Control c in controls) + { + Button btn = c as Button; + btn.Enabled = false; + } + } + + /// + /// 设置按钮可用 + /// + /// + private void ButtonEnable(Control[] controls) + { + foreach (Control c in controls) + { + Button btn = c as Button; + btn.Enabled = true; + } + } + + private void labWorkClass_Click(object sender, EventArgs e) + { + Function.ChangeWorkClass(labWorkClass); + } + + /// + /// 点击退出 + /// + /// + /// + private void labTime_Click(object sender, EventArgs e) + { + Environment.Exit(0); + } + + /// + /// 清空页面 + /// + private void ClearPage() + { + labProductInfo.Tag = null; + labProductInfo.Text = ""; + //labFirstCheck.Text = ""; + //labSecondCheck.Text = ""; + //labThirdCheck.Text = ""; + //btnPass.BackColor = Color.LightGray; + btnAbt.BackColor = Color.LightGray; + btnRepair.BackColor = Color.LightGray; + + ClearRadioButton(); + ClearInspect(); + ClearControlColor(SetControlGroup()); + pictureBox2.Controls.Clear(); + panel2.Controls.Clear(); + pictureBox2.Image = null; + txtBarCode.TabIndex = 0; + txtBarCode.Select(); + position = ""; + reason = ""; + } + + public void ClearRadioButton() + { + groupBox1.Controls.Clear(); + } + + public void ClearTxtBarcode() + { + txtBarCode.Text = ""; + labProPosition.Text = ""; + } + + #region 更改颜色按钮 + /// + /// 更改颜色 + /// + /// + /// + private void labChangeColor_Click(object sender, EventArgs e) + { + ColorName = ""; + + FrmChangeColor frm = new FrmChangeColor(); + frm.ShowDialog(); + + if (!string.IsNullOrWhiteSpace(labProductInfo.Text.Trim())) + { + string[] str = labProductInfo.Text.Trim().Split('，'); + if (str.Length > 1) + { + labProductInfo.Text = ColorName + "，" + str[str.Length - 1] ; + } + } + else + { + labProductInfo.Text = ColorName; + } + } + + private void labChangeColor_MouseLeave(object sender, EventArgs e) + { + Label lab = sender as Label; + lab.BackColor = Color.FromArgb(192, 255, 255); + } + + private void labChangeColor_MouseMove(object sender, MouseEventArgs e) + { + Label lab = sender as Label; + lab.BackColor = Color.Turquoise; + } + #endregion + + /// + /// 其他按钮 + /// + /// + /// + private void button1_Click(object sender, EventArgs e) + { + ClearControlColor(SetControlGroup()); + //btnPass.BackColor = Color.GreenYellow; + //保存 + SaveInspect("其他"); + ClearPage(); + ClearTxtBarcode(); + txtBarCode.TabIndex = 0; + } + + private void UpdateSoftware() + { + var serverUrl = "http://10.60.101.59:8013/"; + var updateXmlFileName = "PaintingUpdatePC.xml"; + var updater = new AutoUpdater(); + if (updater.CheckUpdateLoad(serverUrl, updateXmlFileName)) + { + Environment.Exit(0); + } + } + + private void rb_Click(object sender, EventArgs e) + { + RadioButton rb = sender as RadioButton; + if (!string.IsNullOrWhiteSpace(labProductInfo.Text)) + { + string[] ss = labProductInfo.Text.Split('，'); + labProductInfo.Text = rb.Text.Trim() + "，" + ss[1]; + } + + } + + + private void txtBarCode_DoubleClick(object sender, EventArgs e) + { + txtBarCode.SelectAll(); + } + + } +} diff --git a/PaintingPC/FrmQuality.resx b/PaintingPC/FrmQuality.resx new file mode 100644 index 0000000..920dc57 --- /dev/null +++ b/PaintingPC/FrmQuality.resx @@ -0,0 +1,481 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + q22C8fY24wAAAABJRU5ErkJggg== + + + \ No newline at end of file diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs index 75c886e..f585fa8 100644 --- a/PaintingPC/Function.cs +++ b/PaintingPC/Function.cs @@ -1670,6 +1670,338 @@ namespace PaintingPC } return res; } + + + #region 新 + + public static DataTable GetColorByStockNo(string stockNo) + { + DataTable res = new DataTable(); + try + { + string pId = ""; + // string sql = @" + // select distinct Color + // from tb_PaintColorInfo + // where stockNo = '" + stockNo + @"' + // "; + string sql = @" + select Color + from tb_PaintColorInfo + where stockNo = '" + stockNo + @"' + "; + return SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + //if (dt != null && dt.Rows.Count > 0) + //{ + // for (int i = 0; i < dt.Rows.Count; i++) + // { + // pId = dt.Rows[i]["PaintID"].ToString(); + // } + //} + + //if (!string.IsNullOrWhiteSpace(pId)&&pId.Contains(',')) + //{ + // if (pId.Contains(',')) + // { + // string[] s_pid = pId.Split(','); + // pId = s_pid[0]; + // } + //} + + //string cSql = @"select ColorName from tb_PaintInfo where ID='" + pId + @"'"; + //res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, cSql, null); + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + return res; + } + + public static int GetInspectTimes(string barcode) + { + try + { + int res = 0; + + string sql = @"select top 1 InspectTimes from tb_InspectResult where barcode='" + barcode + @"' order by ID desc "; + DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (dt != null && dt.Rows.Count > 0) + { + res = Convert.ToInt32(dt.Rows[0]["InspectTimes"]); + } + + return res; + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return 0; + } + } + + public static string GetImgPath() + { + string res = ""; + try + { + string sql_imgPath = " select top 1 value from tb_Config where name = 'ImgPath' "; + object aa = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql_imgPath, null); + if (aa != null) + { + res = aa.ToString(); + } + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + return res; + } + + /// + /// 根据条码号获取AB侧+支架位置 + /// + /// + /// + public static string GetSide(string barCode, string paintId) + { + string res = "", stockNo = "", productId = ""; + int layers = 0; + string columnName = "", side = "", floor = ""; + try + { + //有一检结果的 + string sql = @" select top 1 side from tb_InspectResult where barcode = '" + barCode + "' order by createTime desc "; + object aa = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (aa != null) + { + res = aa.ToString(); + } + else + { + if (string.IsNullOrWhiteSpace(res)) + { + //没有一检结果，查询产品是几层、几侧的产品 + + #region 判断是一维码还是二维码 + + if (barCode.Contains(".") == false) + { + //一维码 + if (barCode.Length > 10) + { + stockNo = barCode.Substring(0, 10); + } + } + else + { + //二维码 + //string[] strs = barCode.Split('.'); + //if (strs.Length > 0) + //{ + // partNo = strs[0]; + //} + } + + #endregion + + string sql1 = ""; + + if (!string.IsNullOrWhiteSpace(stockNo)) + { + //sql1 = @"select Layers,ProductID from tb_Product where StockNo='" + stockNo + @"'"; + sql1 = @"SELECT ProductID FROM dbo.tb_Product WITH (NOLOCK) + WHERE PartNo IN(select Paint_No from tb_PaintColorInfo WITH (NOLOCK) where StockNo='" + stockNo + @"' and PaintID='" + paintId + @"')"; + DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql1, null); + if (dt != null && dt.Rows.Count > 0) + { + productId = dt.Rows[0]["ProductID"].ToString(); + } + } + + + #region 取消从存储过程中获取列 + + //string sqlConnString = ConfigurationManager.ConnectionStrings["SqlConnStringForeign"].ToString(); + ////DataTable dtColor = SqlHelper.GetDataDateTable(sqlConnString, CommandType.StoredProcedure, "P_SYSTEM_FindData", param); + + //SqlParameter[] param = new SqlParameter[1]; + //param[0] = new SqlParameter("@value", SqlDbType.VarChar); + //param[0].Value = barcode; + + //DataTable dtC = SqlHelper.GetDataDateTable(sqlConnString, CommandType.StoredProcedure, "P_SYSTEM_FindData", param); + //if (dtC != null && dtC.Rows.Count > 0) + //{ + // columnName = dtC.Rows[0]["columnname"].ToString(); + //} + + #endregion + + #region 从老外系统获得列名 + + string sqlConnString = ConfigurationManager.ConnectionStrings["SqlConnStringForeign"].ToString(); + string strSql1 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side1_Data1)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt1 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql1, null); + if (dt1 != null && dt1.Rows.Count > 0) + { + columnName = "Side1_Data1"; + } + else + { + string strSql2 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side1_Data2)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt2 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql2, null); + if (dt2 != null && dt2.Rows.Count > 0) + { + columnName = "Side1_Data2"; + } + else + { + string strSql3 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side1_Data3)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt3 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql3, null); + if (dt3 != null && dt3.Rows.Count > 0) + { + columnName = "Side1_Data3"; + } + else + { + string strSql4 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side1_Data4)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt4 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql4, null); + if (dt4 != null && dt4.Rows.Count > 0) + { + columnName = "Side1_Data4"; + } + else + { + string strSql5 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side1_Data5)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt5 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql5, null); + if (dt5 != null && dt5.Rows.Count > 0) + { + columnName = "Side1_Data5"; + } + else + { + string strSql6 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side1_Data6)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt6 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql6, null); + if (dt6 != null && dt6.Rows.Count > 0) + { + columnName = "Side1_Data6"; + } + else + { + string strSql7 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side2_Data1)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt7 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql7, null); + if (dt7 != null && dt7.Rows.Count > 0) + { + columnName = "Side2_Data1"; + } + else + { + string strSql8 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side2_Data2)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt8 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql8, null); + if (dt8 != null && dt8.Rows.Count > 0) + { + columnName = "Side2_Data2"; + } + else + { + string strSql9 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side2_Data3)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt9 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql9, null); + if (dt9 != null && dt9.Rows.Count > 0) + { + columnName = "Side2_Data3"; + } + else + { + string strSql10 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side2_Data4)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt10 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql10, null); + if (dt10 != null && dt10.Rows.Count > 0) + { + columnName = "Side2_Data4"; + } + else + { + string strSql11 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side2_Data5)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt11 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql11, null); + if (dt11 != null && dt11.Rows.Count > 0) + { + columnName = "Side2_Data5"; + } + else + { + string strSql12 = @"select top 1 TimeStamp FROM [BMPT_BJ1_Paintlinedata].[dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side2_Data6)) = '" + barCode + @"' order by TimeStamp desc"; + + DataTable dt12 = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, strSql12, null); + if (dt12 != null && dt12.Rows.Count > 0) + { + columnName = "Side2_Data6"; + } + } + } + } + } + } + } + } + } + } + } + } + + #endregion + + #region 根据列名和层获取支架位置 + + string sql2 = @"select floor,side from tb_LayerAndBC where des like '%" + columnName + + @"%' and ProductId='" + productId + @"'"; + + DataTable dtZ = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql2, null); + if (dtZ != null && dtZ.Rows.Count > 0) + { + floor = dtZ.Rows[0]["floor"] + "支架"; + side = dtZ.Rows[0]["side"] + "侧"; + } + + #endregion + + res = side + ";" + floor; + } + } + + return res; + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + #endregion + } } diff --git a/PaintingPC/PaintingPC.csproj b/PaintingPC/PaintingPC.csproj index 6592f7e..759f94f 100644 --- a/PaintingPC/PaintingPC.csproj +++ b/PaintingPC/PaintingPC.csproj @@ -106,6 +106,12 @@ FrmChainUp1.cs + + Form + + + FrmChangeColor.cs + Form @@ -130,6 +136,12 @@ FrmPack.cs + + Form + + + FrmQuality.cs + Form @@ -172,6 +184,9 @@ FrmChainUp1.cs + + FrmChangeColor.cs + FrmChooseDamnPosition.cs @@ -184,6 +199,9 @@ FrmPack.cs + + FrmQuality.cs + FrmRePrint.cs diff --git a/PaintingPC/Program.cs b/PaintingPC/Program.cs index eff04a9..847e826 100644 --- a/PaintingPC/Program.cs +++ b/PaintingPC/Program.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Configuration; using System.Diagnostics; using System.Linq; using System.Text; @@ -31,8 +32,15 @@ namespace PaintingPC //处理非UI线程异常 AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); - - Application.Run(new FrmChainDown()); + string pageView = ConfigurationManager.AppSettings["PageView"].ToString(); + if(pageView == "喷涂质量看板") + { + Application.Run(new FrmQuality()); + } + else if(pageView == "下悬挂链") + { + Application.Run(new FrmChainDown()); + } } #region 系统异常处理 static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e) diff --git a/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs b/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs index 6bebd9d..8663239 100644 --- a/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs +++ b/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs @@ -81,7 +81,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35.64453F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1830); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1601); this.tableLayoutPanel1.TabIndex = 0; // // tableLayoutPanel2 @@ -100,8 +100,8 @@ this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 146F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 146); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 127F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(2347, 128); this.tableLayoutPanel2.TabIndex = 0; // // panel1 @@ -111,7 +111,7 @@ this.panel1.Location = new System.Drawing.Point(1, 1); this.panel1.Margin = new System.Windows.Forms.Padding(0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(255, 144); + this.panel1.Size = new System.Drawing.Size(234, 126); this.panel1.TabIndex = 0; // // pictureBox1 @@ -119,9 +119,9 @@ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); this.pictureBox1.Location = new System.Drawing.Point(0, 0); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(6); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(255, 144); + this.pictureBox1.Size = new System.Drawing.Size(234, 126); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -131,10 +131,10 @@ this.panel2.BackColor = System.Drawing.SystemColors.Control; this.panel2.Controls.Add(this.label1); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(257, 1); + this.panel2.Location = new System.Drawing.Point(236, 1); this.panel2.Margin = new System.Windows.Forms.Padding(0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2044, 144); + this.panel2.Size = new System.Drawing.Size(1874, 126); this.panel2.TabIndex = 1; // // label1 @@ -146,7 +146,7 @@ this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(2044, 144); + this.label1.Size = new System.Drawing.Size(1874, 126); this.label1.TabIndex = 0; this.label1.Text = "悬挂链上件看板"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -155,10 +155,10 @@ // this.panel3.Controls.Add(this.button1); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(2302, 1); + this.panel3.Location = new System.Drawing.Point(2111, 1); this.panel3.Margin = new System.Windows.Forms.Padding(0); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(257, 144); + this.panel3.Size = new System.Drawing.Size(235, 126); this.panel3.TabIndex = 2; // // button1 @@ -171,7 +171,7 @@ this.button1.Location = new System.Drawing.Point(0, 0); this.button1.Margin = new System.Windows.Forms.Padding(0); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(257, 144); + this.button1.Size = new System.Drawing.Size(235, 126); this.button1.TabIndex = 0; this.button1.Text = "退出"; this.button1.UseVisualStyleBackColor = false; @@ -182,10 +182,10 @@ this.panel4.BackColor = System.Drawing.SystemColors.Control; this.panel4.Controls.Add(this.comboBox1); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(0, 146); + this.panel4.Location = new System.Drawing.Point(0, 128); this.panel4.Margin = new System.Windows.Forms.Padding(0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2560, 114); + this.panel4.Size = new System.Drawing.Size(2347, 100); this.panel4.TabIndex = 1; // // comboBox1 @@ -195,7 +195,7 @@ this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox1.FormattingEnabled = true; this.comboBox1.IntegralHeight = false; - this.comboBox1.ItemHeight = 104; + this.comboBox1.ItemHeight = 90; this.comboBox1.Items.AddRange(new object[] { "B01", "B02", @@ -218,10 +218,10 @@ "A09", "A10"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(6); + this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.comboBox1.MaxDropDownItems = 20; this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(2560, 112); + this.comboBox1.Size = new System.Drawing.Size(2347, 98); this.comboBox1.TabIndex = 1; // // panel5 @@ -229,10 +229,10 @@ this.panel5.BackColor = System.Drawing.Color.Black; this.panel5.Controls.Add(this.tableLayoutPanel3); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(0, 260); + this.panel5.Location = new System.Drawing.Point(0, 228); this.panel5.Margin = new System.Windows.Forms.Padding(0); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(2560, 652); + this.panel5.Size = new System.Drawing.Size(2347, 571); this.panel5.TabIndex = 2; // // tableLayoutPanel3 @@ -252,7 +252,7 @@ this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(2560, 652); + this.tableLayoutPanel3.Size = new System.Drawing.Size(2347, 571); this.tableLayoutPanel3.TabIndex = 0; // // panel6 @@ -263,16 +263,16 @@ this.panel6.Location = new System.Drawing.Point(1, 1); this.panel6.Margin = new System.Windows.Forms.Padding(0); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1278, 129); + this.panel6.Size = new System.Drawing.Size(1172, 113); this.panel6.TabIndex = 0; // // textBox1 // this.textBox1.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(278, 22); - this.textBox1.Margin = new System.Windows.Forms.Padding(6); + this.textBox1.Location = new System.Drawing.Point(255, 19); + this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(964, 92); + this.textBox1.Size = new System.Drawing.Size(884, 81); this.textBox1.TabIndex = 1; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -280,10 +280,10 @@ // this.label3.BackColor = System.Drawing.SystemColors.Control; this.label3.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(34, 22); + this.label3.Location = new System.Drawing.Point(31, 19); this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(216, 94); + this.label3.Size = new System.Drawing.Size(198, 82); this.label3.TabIndex = 0; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -292,10 +292,10 @@ this.label4.Dock = System.Windows.Forms.DockStyle.Fill; this.label4.Font = new System.Drawing.Font("微软雅黑", 150F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.Yellow; - this.label4.Location = new System.Drawing.Point(1, 131); + this.label4.Location = new System.Drawing.Point(1, 115); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(1278, 520); + this.label4.Size = new System.Drawing.Size(1172, 455); this.label4.TabIndex = 1; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -304,10 +304,10 @@ this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("微软雅黑", 150F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Location = new System.Drawing.Point(1280, 131); + this.label5.Location = new System.Drawing.Point(1174, 115); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(1279, 520); + this.label5.Size = new System.Drawing.Size(1172, 455); this.label5.TabIndex = 2; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -316,10 +316,10 @@ this.label6.Dock = System.Windows.Forms.DockStyle.Fill; this.label6.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Location = new System.Drawing.Point(1286, 1); + this.label6.Location = new System.Drawing.Point(1180, 1); this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(1267, 129); + this.label6.Size = new System.Drawing.Size(1160, 113); this.label6.TabIndex = 3; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -331,20 +331,20 @@ this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel7.ForeColor = System.Drawing.Color.White; - this.panel7.Location = new System.Drawing.Point(0, 912); + this.panel7.Location = new System.Drawing.Point(0, 799); this.panel7.Margin = new System.Windows.Forms.Padding(0); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2560, 918); + this.panel7.Size = new System.Drawing.Size(2347, 802); this.panel7.TabIndex = 3; // // btOK // this.btOK.BackColor = System.Drawing.Color.LimeGreen; this.btOK.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btOK.Location = new System.Drawing.Point(2388, 532); - this.btOK.Margin = new System.Windows.Forms.Padding(6); + this.btOK.Location = new System.Drawing.Point(2189, 466); + this.btOK.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(164, 368); + this.btOK.Size = new System.Drawing.Size(150, 322); this.btOK.TabIndex = 0; this.btOK.Text = "合格"; this.btOK.UseVisualStyleBackColor = false; @@ -357,12 +357,12 @@ // // FrmChainUp1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2560, 1830); + this.ClientSize = new System.Drawing.Size(2347, 1601); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(6); + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmChainUp1"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmChainUp";