diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index fb257ac..a3ddf4c 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -223,9 +223,9 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel1.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2666, 1566); + this.panel1.Size = new System.Drawing.Size(2908, 1790); this.panel1.TabIndex = 0; // // panel7 @@ -234,10 +234,10 @@ this.panel7.Controls.Add(this.panel8); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.panel7.Location = new System.Drawing.Point(0, 147); - this.panel7.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel7.Location = new System.Drawing.Point(0, 168); + this.panel7.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(2666, 1419); + this.panel7.Size = new System.Drawing.Size(2908, 1622); this.panel7.TabIndex = 1; // // panel23 @@ -245,10 +245,10 @@ this.panel23.Controls.Add(this.panel27); this.panel23.Controls.Add(this.panel24); this.panel23.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel23.Location = new System.Drawing.Point(0, 91); - this.panel23.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel23.Location = new System.Drawing.Point(0, 104); + this.panel23.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel23.Name = "panel23"; - this.panel23.Size = new System.Drawing.Size(2666, 1328); + this.panel23.Size = new System.Drawing.Size(2908, 1518); this.panel23.TabIndex = 1; // // panel27 @@ -256,10 +256,10 @@ this.panel27.Controls.Add(this.panel29); this.panel27.Controls.Add(this.panel28); this.panel27.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel27.Location = new System.Drawing.Point(0, 976); - this.panel27.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel27.Location = new System.Drawing.Point(0, 1115); + this.panel27.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel27.Name = "panel27"; - this.panel27.Size = new System.Drawing.Size(2666, 352); + this.panel27.Size = new System.Drawing.Size(2908, 403); this.panel27.TabIndex = 1; // // panel29 @@ -267,10 +267,10 @@ this.panel29.Controls.Add(this.panel31); this.panel29.Controls.Add(this.panel30); this.panel29.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel29.Location = new System.Drawing.Point(312, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel29.Location = new System.Drawing.Point(340, 0); + this.panel29.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel29.Name = "panel29"; - this.panel29.Size = new System.Drawing.Size(2354, 352); + this.panel29.Size = new System.Drawing.Size(2568, 403); this.panel29.TabIndex = 1; // // panel31 @@ -278,10 +278,10 @@ this.panel31.Controls.Add(this.panel33); this.panel31.Controls.Add(this.panel32); this.panel31.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel31.Location = new System.Drawing.Point(123, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel31.Location = new System.Drawing.Point(134, 0); + this.panel31.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel31.Name = "panel31"; - this.panel31.Size = new System.Drawing.Size(2231, 352); + this.panel31.Size = new System.Drawing.Size(2434, 403); this.panel31.TabIndex = 1; // // panel33 @@ -289,10 +289,10 @@ this.panel33.Controls.Add(this.panel35); this.panel33.Controls.Add(this.panel34); this.panel33.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel33.Location = new System.Drawing.Point(123, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel33.Location = new System.Drawing.Point(134, 0); + this.panel33.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel33.Name = "panel33"; - this.panel33.Size = new System.Drawing.Size(2108, 352); + this.panel33.Size = new System.Drawing.Size(2300, 403); this.panel33.TabIndex = 1; // // panel35 @@ -300,9 +300,9 @@ this.panel35.Controls.Add(this.panel37); this.panel35.Dock = System.Windows.Forms.DockStyle.Fill; this.panel35.Location = new System.Drawing.Point(0, 0); - this.panel35.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel35.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel35.Name = "panel35"; - this.panel35.Size = new System.Drawing.Size(1985, 352); + this.panel35.Size = new System.Drawing.Size(2166, 403); this.panel35.TabIndex = 1; // // panel37 @@ -310,9 +310,9 @@ this.panel37.Controls.Add(this.panel40); this.panel37.Dock = System.Windows.Forms.DockStyle.Fill; this.panel37.Location = new System.Drawing.Point(0, 0); - this.panel37.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel37.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel37.Name = "panel37"; - this.panel37.Size = new System.Drawing.Size(1985, 352); + this.panel37.Size = new System.Drawing.Size(2166, 403); this.panel37.TabIndex = 1; // // panel40 @@ -321,9 +321,9 @@ this.panel40.Controls.Add(this.panel41); this.panel40.Dock = System.Windows.Forms.DockStyle.Fill; this.panel40.Location = new System.Drawing.Point(0, 0); - this.panel40.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel40.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel40.Name = "panel40"; - this.panel40.Size = new System.Drawing.Size(1985, 352); + this.panel40.Size = new System.Drawing.Size(2166, 403); this.panel40.TabIndex = 1; // // panel42 @@ -332,9 +332,9 @@ this.panel42.Controls.Add(this.panel43); this.panel42.Dock = System.Windows.Forms.DockStyle.Fill; this.panel42.Location = new System.Drawing.Point(0, 0); - this.panel42.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel42.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel42.Name = "panel42"; - this.panel42.Size = new System.Drawing.Size(1862, 352); + this.panel42.Size = new System.Drawing.Size(2032, 403); this.panel42.TabIndex = 1; // // panel39 @@ -354,19 +354,19 @@ this.panel39.Controls.Add(this.label21); this.panel39.Dock = System.Windows.Forms.DockStyle.Fill; this.panel39.Location = new System.Drawing.Point(0, 0); - this.panel39.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel39.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel39.Name = "panel39"; - this.panel39.Size = new System.Drawing.Size(1739, 352); + this.panel39.Size = new System.Drawing.Size(1898, 403); this.panel39.TabIndex = 1; // // lbDevState // this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbDevState.Location = new System.Drawing.Point(854, 240); - this.lbDevState.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbDevState.Location = new System.Drawing.Point(932, 274); + this.lbDevState.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbDevState.Name = "lbDevState"; - this.lbDevState.Size = new System.Drawing.Size(347, 58); + this.lbDevState.Size = new System.Drawing.Size(378, 66); this.lbDevState.TabIndex = 15; this.lbDevState.Text = "设备已连接"; this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -376,10 +376,10 @@ // this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbAddPrintR.Location = new System.Drawing.Point(532, 297); - this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbAddPrintR.Location = new System.Drawing.Point(580, 339); + this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbAddPrintR.Name = "lbAddPrintR"; - this.lbAddPrintR.Size = new System.Drawing.Size(314, 58); + this.lbAddPrintR.Size = new System.Drawing.Size(342, 66); this.lbAddPrintR.TabIndex = 3; this.lbAddPrintR.Text = "右条码添打"; this.lbAddPrintR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -389,10 +389,10 @@ // this.lbAddPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.lbAddPrintL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbAddPrintL.Location = new System.Drawing.Point(532, 240); - this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbAddPrintL.Location = new System.Drawing.Point(580, 274); + this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.lbAddPrintL.Name = "lbAddPrintL"; - this.lbAddPrintL.Size = new System.Drawing.Size(314, 58); + this.lbAddPrintL.Size = new System.Drawing.Size(342, 66); this.lbAddPrintL.TabIndex = 2; this.lbAddPrintL.Text = "左条码添打"; this.lbAddPrintL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -404,10 +404,10 @@ this.cboxHandBox.Checked = true; this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked; this.cboxHandBox.Enabled = false; - this.cboxHandBox.Location = new System.Drawing.Point(924, 171); + this.cboxHandBox.Location = new System.Drawing.Point(1008, 195); this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.cboxHandBox.Name = "cboxHandBox"; - this.cboxHandBox.Size = new System.Drawing.Size(256, 55); + this.cboxHandBox.Size = new System.Drawing.Size(293, 62); this.cboxHandBox.TabIndex = 14; this.cboxHandBox.Tag = "true"; this.cboxHandBox.Text = "打印箱码"; @@ -417,20 +417,20 @@ // textBox2 // this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(220, 290); - this.textBox2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.textBox2.Location = new System.Drawing.Point(240, 331); + this.textBox2.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(303, 65); + this.textBox2.Size = new System.Drawing.Size(330, 74); this.textBox2.TabIndex = 13; // // label18 // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(40, 304); - this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label18.Location = new System.Drawing.Point(44, 347); + this.label18.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(178, 51); + this.label18.Size = new System.Drawing.Size(202, 58); this.label18.TabIndex = 12; this.label18.Text = "数量："; // @@ -438,10 +438,10 @@ // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(607, 178); - this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label19.Location = new System.Drawing.Point(662, 203); + this.label19.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(238, 51); + this.label19.Size = new System.Drawing.Size(265, 58); this.label19.TabIndex = 11; this.label19.Text = "(yyMMdd)"; // @@ -449,20 +449,20 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(224, 171); - this.textBox1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.textBox1.Location = new System.Drawing.Point(244, 195); + this.textBox1.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(301, 65); + this.textBox1.Size = new System.Drawing.Size(328, 74); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(40, 185); - this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label20.Location = new System.Drawing.Point(44, 211); + this.label20.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(178, 51); + this.label20.Size = new System.Drawing.Size(202, 58); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -472,10 +472,10 @@ this.comboBox2.Enabled = false; this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(224, 63); - this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.comboBox2.Location = new System.Drawing.Point(244, 72); + this.comboBox2.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(851, 50); + this.comboBox2.Size = new System.Drawing.Size(928, 56); this.comboBox2.TabIndex = 8; this.comboBox2.SelectedValueChanged += new System.EventHandler(this.comboBox2_SelectedValueChanged); this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); @@ -484,10 +484,10 @@ // this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(40, 70); - this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label21.Location = new System.Drawing.Point(44, 80); + this.label21.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(178, 51); + this.label21.Size = new System.Drawing.Size(202, 58); this.label21.TabIndex = 7; this.label21.Text = "产品："; // @@ -495,10 +495,10 @@ // this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; - this.panel43.Location = new System.Drawing.Point(1739, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel43.Location = new System.Drawing.Point(1898, 0); + this.panel43.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel43.Name = "panel43"; - this.panel43.Size = new System.Drawing.Size(123, 352); + this.panel43.Size = new System.Drawing.Size(134, 403); this.panel43.TabIndex = 0; // // label23 @@ -507,9 +507,9 @@ this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label23.Dock = System.Windows.Forms.DockStyle.Fill; this.label23.Location = new System.Drawing.Point(0, 0); - this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label23.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(123, 352); + this.label23.Size = new System.Drawing.Size(134, 403); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -519,10 +519,10 @@ // this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; - this.panel41.Location = new System.Drawing.Point(1862, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel41.Location = new System.Drawing.Point(2032, 0); + this.panel41.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel41.Name = "panel41"; - this.panel41.Size = new System.Drawing.Size(123, 352); + this.panel41.Size = new System.Drawing.Size(134, 403); this.panel41.TabIndex = 0; // // label22 @@ -531,9 +531,9 @@ this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label22.Dock = System.Windows.Forms.DockStyle.Fill; this.label22.Location = new System.Drawing.Point(0, 0); - this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label22.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(123, 352); + this.label22.Size = new System.Drawing.Size(134, 403); this.label22.TabIndex = 1; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -543,10 +543,10 @@ // this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; - this.panel34.Location = new System.Drawing.Point(1985, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel34.Location = new System.Drawing.Point(2166, 0); + this.panel34.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel34.Name = "panel34"; - this.panel34.Size = new System.Drawing.Size(123, 352); + this.panel34.Size = new System.Drawing.Size(134, 403); this.panel34.TabIndex = 0; // // label15 @@ -555,9 +555,9 @@ this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Location = new System.Drawing.Point(0, 0); - this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(123, 352); + this.label15.Size = new System.Drawing.Size(134, 403); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -568,9 +568,9 @@ this.panel32.Controls.Add(this.label14); this.panel32.Dock = System.Windows.Forms.DockStyle.Left; this.panel32.Location = new System.Drawing.Point(0, 0); - this.panel32.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel32.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel32.Name = "panel32"; - this.panel32.Size = new System.Drawing.Size(123, 352); + this.panel32.Size = new System.Drawing.Size(134, 403); this.panel32.TabIndex = 0; // // label14 @@ -579,9 +579,9 @@ this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Location = new System.Drawing.Point(0, 0); - this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label14.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(123, 352); + this.label14.Size = new System.Drawing.Size(134, 403); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -592,9 +592,9 @@ this.panel30.Controls.Add(this.label13); this.panel30.Dock = System.Windows.Forms.DockStyle.Left; this.panel30.Location = new System.Drawing.Point(0, 0); - this.panel30.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel30.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel30.Name = "panel30"; - this.panel30.Size = new System.Drawing.Size(123, 352); + this.panel30.Size = new System.Drawing.Size(134, 403); this.panel30.TabIndex = 0; // // label13 @@ -603,9 +603,9 @@ this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label13.Dock = System.Windows.Forms.DockStyle.Fill; this.label13.Location = new System.Drawing.Point(0, 0); - this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label13.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(123, 352); + this.label13.Size = new System.Drawing.Size(134, 403); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -616,9 +616,9 @@ this.panel28.Controls.Add(this.label12); this.panel28.Dock = System.Windows.Forms.DockStyle.Left; this.panel28.Location = new System.Drawing.Point(0, 0); - this.panel28.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel28.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel28.Name = "panel28"; - this.panel28.Size = new System.Drawing.Size(312, 352); + this.panel28.Size = new System.Drawing.Size(340, 403); this.panel28.TabIndex = 0; // // label12 @@ -628,9 +628,9 @@ this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.Location = new System.Drawing.Point(0, 0); - this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label12.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(312, 352); + this.label12.Size = new System.Drawing.Size(340, 403); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -641,9 +641,9 @@ this.panel24.Controls.Add(this.panel25); this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); - this.panel24.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel24.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(2666, 976); + this.panel24.Size = new System.Drawing.Size(2908, 1115); this.panel24.TabIndex = 0; // // panel26 @@ -652,10 +652,10 @@ this.panel26.Controls.Add(this.panel44); this.panel26.Controls.Add(this.glacialList1); this.panel26.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel26.Location = new System.Drawing.Point(380, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel26.Location = new System.Drawing.Point(415, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2286, 976); + this.panel26.Size = new System.Drawing.Size(2493, 1115); this.panel26.TabIndex = 1; // // panel45 @@ -665,19 +665,19 @@ this.panel45.Controls.Add(this.button4); this.panel45.Controls.Add(this.textBox4); this.panel45.Controls.Add(this.label25); - this.panel45.Location = new System.Drawing.Point(295, 591); - this.panel45.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel45.Location = new System.Drawing.Point(322, 675); + this.panel45.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1282, 131); + this.panel45.Size = new System.Drawing.Size(1398, 149); this.panel45.TabIndex = 2; // // button3 // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1129, 38); - this.button3.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.button3.Location = new System.Drawing.Point(1232, 43); + this.button3.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(147, 52); + this.button3.Size = new System.Drawing.Size(160, 59); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -686,10 +686,10 @@ // button4 // this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(952, 38); - this.button4.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.button4.Location = new System.Drawing.Point(1039, 43); + this.button4.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(147, 52); + this.button4.Size = new System.Drawing.Size(160, 59); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -698,20 +698,20 @@ // textBox4 // this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox4.Location = new System.Drawing.Point(308, 38); - this.textBox4.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.textBox4.Location = new System.Drawing.Point(336, 43); + this.textBox4.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(605, 49); + this.textBox4.Size = new System.Drawing.Size(660, 55); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(26, 45); - this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label25.Location = new System.Drawing.Point(28, 51); + this.label25.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(283, 37); + this.label25.Size = new System.Drawing.Size(319, 42); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -723,19 +723,19 @@ this.panel44.Controls.Add(this.button1); this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); - this.panel44.Location = new System.Drawing.Point(330, 318); - this.panel44.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel44.Location = new System.Drawing.Point(360, 363); + this.panel44.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1282, 131); + this.panel44.Size = new System.Drawing.Size(1398, 149); 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(1096, 38); - this.button2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.button2.Location = new System.Drawing.Point(1196, 43); + this.button2.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(147, 52); + this.button2.Size = new System.Drawing.Size(160, 59); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -744,10 +744,10 @@ // button1 // this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(941, 35); - this.button1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.button1.Location = new System.Drawing.Point(1027, 40); + this.button1.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(147, 52); + this.button1.Size = new System.Drawing.Size(160, 59); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -756,20 +756,20 @@ // textBox3 // this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(191, 38); - this.textBox3.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.textBox3.Location = new System.Drawing.Point(208, 43); + this.textBox3.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(677, 49); + this.textBox3.Size = new System.Drawing.Size(738, 55); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(26, 45); - this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label24.Location = new System.Drawing.Point(28, 51); + this.label24.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(169, 37); + this.label24.Size = new System.Drawing.Size(190, 42); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -840,14 +840,14 @@ 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(6, 3, 6, 3); + this.glacialList1.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2286, 976); + this.glacialList1.Size = new System.Drawing.Size(2493, 1115); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -860,9 +860,9 @@ this.panel25.Controls.Add(this.panel36); this.panel25.Dock = System.Windows.Forms.DockStyle.Left; this.panel25.Location = new System.Drawing.Point(0, 0); - this.panel25.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel25.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(380, 976); + this.panel25.Size = new System.Drawing.Size(415, 1115); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -872,13 +872,13 @@ this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0); this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464); this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 299F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570); + this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -890,20 +890,20 @@ 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(6, 3); - this.panel38.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel38.Location = new System.Drawing.Point(7, 3); + this.panel38.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(368, 252); + this.panel38.Size = new System.Drawing.Size(401, 288); this.panel38.TabIndex = 1; // // btn_lastBoxPrintR // this.btn_lastBoxPrintR.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintR.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 129); + this.btn_lastBoxPrintR.Location = new System.Drawing.Point(278, 147); this.btn_lastBoxPrintR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btn_lastBoxPrintR.Name = "btn_lastBoxPrintR"; - this.btn_lastBoxPrintR.Size = new System.Drawing.Size(116, 122); + this.btn_lastBoxPrintR.Size = new System.Drawing.Size(127, 139); this.btn_lastBoxPrintR.TabIndex = 4; this.btn_lastBoxPrintR.Text = "右侧前一箱单"; this.btn_lastBoxPrintR.UseVisualStyleBackColor = false; @@ -913,10 +913,10 @@ // this.btn_lastBoxPrintL.BackColor = System.Drawing.Color.Aquamarine; this.btn_lastBoxPrintL.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_lastBoxPrintL.Location = new System.Drawing.Point(255, 0); + this.btn_lastBoxPrintL.Location = new System.Drawing.Point(278, 0); this.btn_lastBoxPrintL.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btn_lastBoxPrintL.Name = "btn_lastBoxPrintL"; - this.btn_lastBoxPrintL.Size = new System.Drawing.Size(116, 122); + this.btn_lastBoxPrintL.Size = new System.Drawing.Size(127, 139); this.btn_lastBoxPrintL.TabIndex = 2; this.btn_lastBoxPrintL.Text = "左侧前一箱单"; this.btn_lastBoxPrintL.UseVisualStyleBackColor = false; @@ -925,10 +925,10 @@ // label27 // this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(-4, 171); - this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label27.Location = new System.Drawing.Point(-4, 195); + this.label27.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(292, 73); + this.label27.Size = new System.Drawing.Size(319, 83); this.label27.TabIndex = 3; this.label27.Text = "9999"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -937,20 +937,20 @@ // this.label26.AutoSize = true; this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label26.Location = new System.Drawing.Point(0, 136); - this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label26.Location = new System.Drawing.Point(0, 155); + this.label26.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(151, 33); + this.label26.Size = new System.Drawing.Size(169, 37); this.label26.TabIndex = 2; this.label26.Text = "完成数量"; // // label17 // this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(-4, 49); - this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label17.Location = new System.Drawing.Point(-4, 56); + this.label17.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(292, 73); + this.label17.Size = new System.Drawing.Size(319, 83); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -959,10 +959,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(0, 10); - this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label16.Location = new System.Drawing.Point(0, 11); + this.label16.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(151, 33); + this.label16.Size = new System.Drawing.Size(169, 37); this.label16.TabIndex = 0; this.label16.Text = "计划数量"; // @@ -972,11 +972,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, 265); + this.groupBox1.Location = new System.Drawing.Point(4, 302); this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.groupBox1.Size = new System.Drawing.Size(372, 302); + this.groupBox1.Size = new System.Drawing.Size(407, 346); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "模具2"; @@ -991,14 +991,14 @@ this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0); this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 31); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 35); this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 268); + this.tableLayoutPanel3.Size = new System.Drawing.Size(399, 308); this.tableLayoutPanel3.TabIndex = 2; // // panel47 @@ -1009,10 +1009,10 @@ this.panel47.Controls.Add(this.lbNeedQtyR); this.panel47.Controls.Add(this.lbCurrentlQtyR); this.panel47.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel47.Location = new System.Drawing.Point(4, 181); + this.panel47.Location = new System.Drawing.Point(4, 207); this.panel47.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel47.Name = "panel47"; - this.panel47.Size = new System.Drawing.Size(356, 84); + this.panel47.Size = new System.Drawing.Size(391, 98); this.panel47.TabIndex = 4; // // btnHandPrintR @@ -1020,10 +1020,10 @@ this.btnHandPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintR.Location = new System.Drawing.Point(248, 16); + this.btnHandPrintR.Location = new System.Drawing.Point(271, 18); this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnHandPrintR.Name = "btnHandPrintR"; - this.btnHandPrintR.Size = new System.Drawing.Size(116, 65); + this.btnHandPrintR.Size = new System.Drawing.Size(127, 74); this.btnHandPrintR.TabIndex = 3; this.btnHandPrintR.Text = "打印"; this.btnHandPrintR.UseVisualStyleBackColor = false; @@ -1033,10 +1033,10 @@ // this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(86, 24); + this.label30.Location = new System.Drawing.Point(94, 27); this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(50, 52); + this.label30.Size = new System.Drawing.Size(56, 59); this.label30.TabIndex = 2; this.label30.Text = "/"; // @@ -1044,10 +1044,10 @@ // this.lbNeedQtyR.AutoSize = true; this.lbNeedQtyR.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbNeedQtyR.Location = new System.Drawing.Point(160, 28); + this.lbNeedQtyR.Location = new System.Drawing.Point(175, 32); this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyR.Name = "lbNeedQtyR"; - this.lbNeedQtyR.Size = new System.Drawing.Size(50, 52); + this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59); this.lbNeedQtyR.TabIndex = 1; this.lbNeedQtyR.Text = "0"; // @@ -1055,10 +1055,10 @@ // this.lbCurrentlQtyR.AutoSize = true; this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyR.Location = new System.Drawing.Point(7, 26); + this.lbCurrentlQtyR.Location = new System.Drawing.Point(8, 30); this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyR.Name = "lbCurrentlQtyR"; - this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52); + this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59); this.lbCurrentlQtyR.TabIndex = 0; this.lbCurrentlQtyR.Text = "0"; this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1068,10 +1068,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(6, 111); - this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label34.Location = new System.Drawing.Point(7, 127); + this.label34.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(106, 45); + this.label34.Size = new System.Drawing.Size(116, 51); this.label34.TabIndex = 1; this.label34.Text = "规格:"; this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1082,10 +1082,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, 28); + this.lbPackageCodeR.Location = new System.Drawing.Point(4, 32); this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeR.Name = "lbPackageCodeR"; - this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33); + this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37); this.lbPackageCodeR.TabIndex = 5; // // panel49 @@ -1093,10 +1093,10 @@ this.panel49.Controls.Add(this.btnChangeSizeR); this.panel49.Controls.Add(this.comBoxSizeR); this.panel49.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel49.Location = new System.Drawing.Point(125, 92); + this.panel49.Location = new System.Drawing.Point(137, 105); this.panel49.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel49.Name = "panel49"; - this.panel49.Size = new System.Drawing.Size(235, 83); + this.panel49.Size = new System.Drawing.Size(258, 96); this.panel49.TabIndex = 6; // // btnChangeSizeR @@ -1104,10 +1104,10 @@ this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeR.Location = new System.Drawing.Point(127, 16); + this.btnChangeSizeR.Location = new System.Drawing.Point(139, 18); this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnChangeSizeR.Name = "btnChangeSizeR"; - this.btnChangeSizeR.Size = new System.Drawing.Size(121, 65); + this.btnChangeSizeR.Size = new System.Drawing.Size(132, 74); this.btnChangeSizeR.TabIndex = 4; this.btnChangeSizeR.Text = "调整"; this.btnChangeSizeR.UseVisualStyleBackColor = false; @@ -1120,10 +1120,10 @@ this.comBoxSizeR.Enabled = false; this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeR.FormattingEnabled = true; - this.comBoxSizeR.Location = new System.Drawing.Point(0, 19); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.comBoxSizeR.Location = new System.Drawing.Point(0, 23); + this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.comBoxSizeR.Name = "comBoxSizeR"; - this.comBoxSizeR.Size = new System.Drawing.Size(125, 64); + this.comBoxSizeR.Size = new System.Drawing.Size(136, 72); this.comBoxSizeR.TabIndex = 3; // // panel36 @@ -1131,16 +1131,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(6, 3, 6, 3); + this.panel36.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(380, 406); + this.panel36.Size = new System.Drawing.Size(415, 464); this.panel36.TabIndex = 0; // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1150,7 +1150,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(380, 406); + this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -1158,10 +1158,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(6, 19); - this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label11.Location = new System.Drawing.Point(7, 23); + this.label11.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(367, 82); + this.label11.Size = new System.Drawing.Size(400, 93); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1172,11 +1172,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, 104); + this.groupBox2.Location = new System.Drawing.Point(4, 119); this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.groupBox2.Size = new System.Drawing.Size(372, 299); + this.groupBox2.Size = new System.Drawing.Size(407, 342); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "模具1&&手打"; @@ -1191,15 +1191,15 @@ this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 31); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 35); this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); 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, 17F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 265); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 19F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(399, 304); this.tableLayoutPanel4.TabIndex = 3; // // label38 @@ -1207,10 +1207,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(6, 109); - this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label38.Location = new System.Drawing.Point(7, 126); + this.label38.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(106, 45); + this.label38.Size = new System.Drawing.Size(116, 51); this.label38.TabIndex = 1; this.label38.Text = "规格:"; this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1223,10 +1223,10 @@ this.panel46.Controls.Add(this.lbNeedQtyL); this.panel46.Controls.Add(this.lbCurrentlQtyL); this.panel46.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel46.Location = new System.Drawing.Point(4, 179); + this.panel46.Location = new System.Drawing.Point(4, 205); this.panel46.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel46.Name = "panel46"; - this.panel46.Size = new System.Drawing.Size(356, 83); + this.panel46.Size = new System.Drawing.Size(391, 96); this.panel46.TabIndex = 4; // // btnHandPrintL @@ -1234,10 +1234,10 @@ this.btnHandPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintL.Location = new System.Drawing.Point(246, 12); + this.btnHandPrintL.Location = new System.Drawing.Point(268, 14); this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnHandPrintL.Name = "btnHandPrintL"; - this.btnHandPrintL.Size = new System.Drawing.Size(116, 65); + this.btnHandPrintL.Size = new System.Drawing.Size(127, 74); this.btnHandPrintL.TabIndex = 3; this.btnHandPrintL.Text = "打印"; this.btnHandPrintL.UseVisualStyleBackColor = false; @@ -1247,10 +1247,10 @@ // this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(83, 24); + this.label31.Location = new System.Drawing.Point(91, 27); this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(50, 52); + this.label31.Size = new System.Drawing.Size(56, 59); this.label31.TabIndex = 2; this.label31.Text = "/"; // @@ -1258,10 +1258,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(156, 28); + this.lbNeedQtyL.Location = new System.Drawing.Point(170, 32); this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNeedQtyL.Name = "lbNeedQtyL"; - this.lbNeedQtyL.Size = new System.Drawing.Size(50, 52); + this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59); this.lbNeedQtyL.TabIndex = 1; this.lbNeedQtyL.Text = "0"; // @@ -1269,10 +1269,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(7, 26); + this.lbCurrentlQtyL.Location = new System.Drawing.Point(8, 30); this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyL.Name = "lbCurrentlQtyL"; - this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52); + this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59); this.lbCurrentlQtyL.TabIndex = 0; this.lbCurrentlQtyL.Text = "0"; this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1283,10 +1283,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, 27); + this.lbPackageCodeL.Location = new System.Drawing.Point(4, 32); this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeL.Name = "lbPackageCodeL"; - this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33); + this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); this.lbPackageCodeL.TabIndex = 5; // // panel48 @@ -1294,10 +1294,10 @@ this.panel48.Controls.Add(this.btnChangeSizeL); this.panel48.Controls.Add(this.comBoxSizeL); this.panel48.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel48.Location = new System.Drawing.Point(125, 91); + this.panel48.Location = new System.Drawing.Point(137, 104); this.panel48.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel48.Name = "panel48"; - this.panel48.Size = new System.Drawing.Size(235, 82); + this.panel48.Size = new System.Drawing.Size(258, 95); this.panel48.TabIndex = 6; // // btnChangeSizeL @@ -1305,10 +1305,10 @@ this.btnChangeSizeL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeL.Location = new System.Drawing.Point(127, 10); + this.btnChangeSizeL.Location = new System.Drawing.Point(139, 11); this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnChangeSizeL.Name = "btnChangeSizeL"; - this.btnChangeSizeL.Size = new System.Drawing.Size(116, 65); + this.btnChangeSizeL.Size = new System.Drawing.Size(127, 74); this.btnChangeSizeL.TabIndex = 4; this.btnChangeSizeL.Text = "调整"; this.btnChangeSizeL.UseVisualStyleBackColor = false; @@ -1321,10 +1321,10 @@ this.comBoxSizeL.Enabled = false; this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeL.FormattingEnabled = true; - this.comBoxSizeL.Location = new System.Drawing.Point(2, 10); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.comBoxSizeL.Location = new System.Drawing.Point(2, 11); + this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(125, 64); + this.comBoxSizeL.Size = new System.Drawing.Size(136, 72); this.comBoxSizeL.TabIndex = 3; // // panel8 @@ -1333,9 +1333,9 @@ this.panel8.Controls.Add(this.panel9); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel8.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(2666, 91); + this.panel8.Size = new System.Drawing.Size(2908, 104); this.panel8.TabIndex = 0; // // panel10 @@ -1343,10 +1343,10 @@ this.panel10.Controls.Add(this.panel12); this.panel10.Controls.Add(this.panel11); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel10.Location = new System.Drawing.Point(380, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel10.Location = new System.Drawing.Point(415, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2286, 91); + this.panel10.Size = new System.Drawing.Size(2493, 104); this.panel10.TabIndex = 2; // // panel12 @@ -1354,10 +1354,10 @@ this.panel12.Controls.Add(this.panel16); this.panel12.Controls.Add(this.panel15); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel12.Location = new System.Drawing.Point(451, 0); - this.panel12.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel12.Location = new System.Drawing.Point(492, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1835, 91); + this.panel12.Size = new System.Drawing.Size(2001, 104); this.panel12.TabIndex = 1; // // panel16 @@ -1365,10 +1365,10 @@ this.panel16.Controls.Add(this.panel20); this.panel16.Controls.Add(this.panel19); this.panel16.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel16.Location = new System.Drawing.Point(468, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel16.Location = new System.Drawing.Point(511, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1367, 91); + this.panel16.Size = new System.Drawing.Size(1490, 104); this.panel16.TabIndex = 1; // // panel20 @@ -1376,10 +1376,10 @@ this.panel20.Controls.Add(this.label10); this.panel20.Controls.Add(this.panel22); this.panel20.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel20.Location = new System.Drawing.Point(427, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel20.Location = new System.Drawing.Point(466, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(940, 91); + this.panel20.Size = new System.Drawing.Size(1024, 104); this.panel20.TabIndex = 1; // // label10 @@ -1387,10 +1387,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(341, 0); - this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label10.Location = new System.Drawing.Point(372, 0); + this.label10.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(599, 91); + this.label10.Size = new System.Drawing.Size(652, 104); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1401,9 +1401,9 @@ this.panel22.Controls.Add(this.label9); this.panel22.Dock = System.Windows.Forms.DockStyle.Left; this.panel22.Location = new System.Drawing.Point(0, 0); - this.panel22.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel22.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel22.Name = "panel22"; - this.panel22.Size = new System.Drawing.Size(341, 91); + this.panel22.Size = new System.Drawing.Size(372, 104); this.panel22.TabIndex = 0; // // label9 @@ -1413,9 +1413,9 @@ this.label9.Dock = System.Windows.Forms.DockStyle.Fill; this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label9.Location = new System.Drawing.Point(0, 0); - this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label9.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(341, 91); + this.label9.Size = new System.Drawing.Size(372, 104); this.label9.TabIndex = 0; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1427,9 +1427,9 @@ this.panel19.Controls.Add(this.panel21); this.panel19.Dock = System.Windows.Forms.DockStyle.Left; this.panel19.Location = new System.Drawing.Point(0, 0); - this.panel19.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel19.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel19.Name = "panel19"; - this.panel19.Size = new System.Drawing.Size(427, 91); + this.panel19.Size = new System.Drawing.Size(466, 104); this.panel19.TabIndex = 0; // // label8 @@ -1437,10 +1437,10 @@ this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label8.Location = new System.Drawing.Point(202, 0); - this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label8.Location = new System.Drawing.Point(220, 0); + this.label8.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(225, 91); + this.label8.Size = new System.Drawing.Size(246, 104); this.label8.TabIndex = 1; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1450,9 +1450,9 @@ this.panel21.Controls.Add(this.label7); this.panel21.Dock = System.Windows.Forms.DockStyle.Left; this.panel21.Location = new System.Drawing.Point(0, 0); - this.panel21.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel21.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(202, 91); + this.panel21.Size = new System.Drawing.Size(220, 104); this.panel21.TabIndex = 0; // // label7 @@ -1462,9 +1462,9 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label7.Location = new System.Drawing.Point(0, 0); - this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label7.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(202, 91); + this.label7.Size = new System.Drawing.Size(220, 104); this.label7.TabIndex = 0; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1476,19 +1476,19 @@ this.panel15.Controls.Add(this.panel17); this.panel15.Dock = System.Windows.Forms.DockStyle.Left; this.panel15.Location = new System.Drawing.Point(0, 0); - this.panel15.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel15.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(468, 91); + this.panel15.Size = new System.Drawing.Size(511, 104); this.panel15.TabIndex = 0; // // panel18 // this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel18.Location = new System.Drawing.Point(202, 0); - this.panel18.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel18.Location = new System.Drawing.Point(220, 0); + this.panel18.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel18.Name = "panel18"; - this.panel18.Size = new System.Drawing.Size(266, 91); + this.panel18.Size = new System.Drawing.Size(291, 104); this.panel18.TabIndex = 1; // // label6 @@ -1497,9 +1497,9 @@ this.label6.Dock = System.Windows.Forms.DockStyle.Fill; this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label6.Location = new System.Drawing.Point(0, 0); - this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(266, 91); + this.label6.Size = new System.Drawing.Size(291, 104); this.label6.TabIndex = 0; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1509,9 +1509,9 @@ this.panel17.Controls.Add(this.label5); this.panel17.Dock = System.Windows.Forms.DockStyle.Left; this.panel17.Location = new System.Drawing.Point(0, 0); - this.panel17.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel17.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(202, 91); + this.panel17.Size = new System.Drawing.Size(220, 104); this.panel17.TabIndex = 0; // // label5 @@ -1521,9 +1521,9 @@ this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label5.Location = new System.Drawing.Point(0, 0); - this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(202, 91); + this.label5.Size = new System.Drawing.Size(220, 104); this.label5.TabIndex = 0; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1536,19 +1536,19 @@ this.panel11.Controls.Add(this.panel13); this.panel11.Dock = System.Windows.Forms.DockStyle.Left; this.panel11.Location = new System.Drawing.Point(0, 0); - this.panel11.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel11.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(451, 91); + this.panel11.Size = new System.Drawing.Size(492, 104); this.panel11.TabIndex = 0; // // panel14 // this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel14.Location = new System.Drawing.Point(202, 0); - this.panel14.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel14.Location = new System.Drawing.Point(220, 0); + this.panel14.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(249, 91); + this.panel14.Size = new System.Drawing.Size(272, 104); this.panel14.TabIndex = 1; // // comboBox1 @@ -1561,9 +1561,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.comboBox1.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(249, 83); + this.comboBox1.Size = new System.Drawing.Size(272, 93); this.comboBox1.TabIndex = 0; // // panel13 @@ -1571,9 +1571,9 @@ this.panel13.Controls.Add(this.label4); this.panel13.Dock = System.Windows.Forms.DockStyle.Left; this.panel13.Location = new System.Drawing.Point(0, 0); - this.panel13.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel13.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(202, 91); + this.panel13.Size = new System.Drawing.Size(220, 104); this.panel13.TabIndex = 0; // // label4 @@ -1583,9 +1583,9 @@ this.label4.Dock = System.Windows.Forms.DockStyle.Fill; this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label4.Location = new System.Drawing.Point(0, 0); - this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(202, 91); + this.label4.Size = new System.Drawing.Size(220, 104); this.label4.TabIndex = 0; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1595,9 +1595,9 @@ this.panel9.Controls.Add(this.label3); this.panel9.Dock = System.Windows.Forms.DockStyle.Left; this.panel9.Location = new System.Drawing.Point(0, 0); - this.panel9.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel9.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(380, 91); + this.panel9.Size = new System.Drawing.Size(415, 104); this.panel9.TabIndex = 0; // // label3 @@ -1607,9 +1607,9 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.label3.Location = new System.Drawing.Point(0, 0); - this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(380, 91); + this.label3.Size = new System.Drawing.Size(415, 104); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1620,9 +1620,9 @@ this.panel2.Controls.Add(this.panel3); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel2.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2666, 147); + this.panel2.Size = new System.Drawing.Size(2908, 168); this.panel2.TabIndex = 0; // // panel4 @@ -1630,10 +1630,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(312, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel4.Location = new System.Drawing.Point(340, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2354, 147); + this.panel4.Size = new System.Drawing.Size(2568, 168); this.panel4.TabIndex = 1; // // panel6 @@ -1643,18 +1643,18 @@ this.panel6.Controls.Add(this.label1); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel6.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(2002, 147); + this.panel6.Size = new System.Drawing.Size(2184, 168); this.panel6.TabIndex = 1; // // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(1602, 59); + this.checkBox1.Location = new System.Drawing.Point(1748, 67); this.checkBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(120, 25); + this.checkBox1.Size = new System.Drawing.Size(138, 28); this.checkBox1.TabIndex = 2; this.checkBox1.Text = "插入异常"; this.checkBox1.UseVisualStyleBackColor = true; @@ -1667,7 +1667,7 @@ this.btnOnlyBarCode.Location = new System.Drawing.Point(4, 2); this.btnOnlyBarCode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnOnlyBarCode.Name = "btnOnlyBarCode"; - this.btnOnlyBarCode.Size = new System.Drawing.Size(216, 143); + this.btnOnlyBarCode.Size = new System.Drawing.Size(236, 163); this.btnOnlyBarCode.TabIndex = 1; this.btnOnlyBarCode.Text = "条码模式"; this.btnOnlyBarCode.UseVisualStyleBackColor = false; @@ -1679,9 +1679,9 @@ this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold); this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(2002, 147); + this.label1.Size = new System.Drawing.Size(2184, 168); this.label1.TabIndex = 0; this.label1.Text = "注塑车间箱码条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1690,10 +1690,10 @@ // this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(2002, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel5.Location = new System.Drawing.Point(2184, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(352, 147); + this.panel5.Size = new System.Drawing.Size(384, 168); this.panel5.TabIndex = 0; // // label2 @@ -1702,9 +1702,9 @@ this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold); this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(352, 147); + this.label2.Size = new System.Drawing.Size(384, 168); this.label2.TabIndex = 0; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1716,9 +1716,9 @@ this.panel3.Controls.Add(this.pictureBox1); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.panel3.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(312, 147); + this.panel3.Size = new System.Drawing.Size(340, 168); this.panel3.TabIndex = 0; // // lbVer @@ -1726,10 +1726,10 @@ this.lbVer.AutoSize = true; this.lbVer.BackColor = System.Drawing.SystemColors.Window; this.lbVer.ForeColor = System.Drawing.Color.LightSkyBlue; - this.lbVer.Location = new System.Drawing.Point(15, 121); + this.lbVer.Location = new System.Drawing.Point(16, 138); this.lbVer.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbVer.Name = "lbVer"; - this.lbVer.Size = new System.Drawing.Size(32, 21); + this.lbVer.Size = new System.Drawing.Size(34, 24); this.lbVer.TabIndex = 1; this.lbVer.Text = " "; // @@ -1737,10 +1737,10 @@ // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(6, 3); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.pictureBox1.Location = new System.Drawing.Point(7, 3); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(306, 138); + this.pictureBox1.Size = new System.Drawing.Size(334, 157); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -1781,12 +1781,12 @@ // // FrmMain2408 // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2666, 1566); + this.ClientSize = new System.Drawing.Size(2908, 1790); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); + this.Margin = new System.Windows.Forms.Padding(7, 3, 7, 3); this.Name = "FrmMain2408"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index 650dc42..0971d8b 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -70,15 +70,11 @@ namespace PaintingPC btnAbt.Visible = false; } - if(_lineCode == "2") - { - // groupBox1.Visible = false; + // if(_lineCode == "2") + // { HidenColorSelect(true); - //label1.Visible = false; - //cboxAddColor.Visible = false; - btnAllowChangeColor.Visible = true; - } + // } } void HidenColorSelect(bool isHidden) { @@ -621,6 +617,12 @@ namespace PaintingPC { } + + if(reason.Contains("点修补") && state!="其它") + { + MessageBox.Show("选择[点修补],只能判定为[其它]状态,不能判定为"+ state); + return; + } string bcode = txtBarCode.Text.Trim(); //保存 string id = SaveInspect(state, colorName, partName, userName); @@ -823,6 +825,10 @@ namespace PaintingPC model1.inspectResult =inspectResult; model1.damnPosition = position; model1.reason = reason; + if (reason.Contains("点修补")) + { + model1.IsNeedThirdCheck = 1; + } model1.remark3 = paintId; model1.ForeignPartCode = _foreignPartCode; model1.IsHandChangeColor = _colorHandChanged == true ? 1 : 0; diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs index 5881612..363e2c6 100644 --- a/PaintingPC/Function.cs +++ b/PaintingPC/Function.cs @@ -1775,6 +1775,7 @@ namespace PaintingPC ,[AddMan] ,[ForeignPartCode] ,[IsHandChangeColor] + ,[IsNeedThirdCheck] ) VALUES ('" + model.barcode + @"' @@ -1796,6 +1797,7 @@ namespace PaintingPC ,'" + model.AddMan + @"' ,'" + model.ForeignPartCode + @"' ,'" + model.IsHandChangeColor + @"' + ,'" + model.IsNeedThirdCheck + @"' );select @@Identity "; //res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null); DataTable dt= SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); diff --git a/PaintingPC/Model/InspectModel.cs b/PaintingPC/Model/InspectModel.cs index 07ea938..d352119 100644 --- a/PaintingPC/Model/InspectModel.cs +++ b/PaintingPC/Model/InspectModel.cs @@ -87,5 +87,9 @@ namespace PaintingPC.Model /// 是否手动修改了颜色 /// public int IsHandChangeColor { get; set; } = 0; + /// + /// 是否需要点修补 + /// + public int IsNeedThirdCheck { get; set; } = 0; } } diff --git a/WebService/Function.cs b/WebService/Function.cs index e5b5522..cb51229 100644 --- a/WebService/Function.cs +++ b/WebService/Function.cs @@ -1106,7 +1106,7 @@ namespace Webservice /// /// /// - static bool GetWmsCompleteState(string sjBarCode) + static bool GetWmsCompleteState(string sjBarCode,ref string wmsMsg) { string jsonParam = " [{\"ServiceType\":\"GetMesData\",\"BarCode\":\""+sjBarCode+"\"}]"; WebService.WebReference.JsonService webService = GetWebService(); @@ -1116,6 +1116,7 @@ namespace Webservice { return true; } + wmsMsg = rst; return false; } /// @@ -1247,10 +1248,19 @@ namespace Webservice //上次合格,这次转报废,需要wms给true if (lastState.Contains("合格")) { - bool wmsAllow = GetWmsCompleteState(oneBarCode); + string wmsMsg = string.Empty; + bool wmsAllow = GetWmsCompleteState(oneBarCode, ref wmsMsg); if (wmsAllow == false) { - errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[报废]."; + if (string.IsNullOrEmpty(wmsMsg)) + { + errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[报废]."; + + } + else + { + errorMssg = wmsMsg; + } return false; } else @@ -1279,10 +1289,19 @@ namespace Webservice //上次合格,这次转其它,需要wms给true if (lastState.Contains("合格")) { - bool wmsAllow = GetWmsCompleteState(oneBarCode); + string wmsMsg = string.Empty; + bool wmsAllow = GetWmsCompleteState(oneBarCode,ref wmsMsg); if (wmsAllow == false) { - errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[其它]."; + if (string.IsNullOrEmpty(wmsMsg)) + { + errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[其它]."; + + } + else + { + errorMssg = wmsMsg; + } return false; } else @@ -1312,10 +1331,19 @@ namespace Webservice //上次合格,这次转报废,需要wms给true if (lastState.Contains("合格")) { - bool wmsAllow = GetWmsCompleteState(oneBarCode); + string wmsMsg = string.Empty; + bool wmsAllow = GetWmsCompleteState(oneBarCode,ref wmsMsg); if (wmsAllow == false) { - errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[返喷]."; + if (string.IsNullOrEmpty(wmsMsg)) + { + errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[返喷]."; + + } + else + { + errorMssg = wmsMsg; + } return false; } else