From 6383175176d5e9c211a1b609149164be65ddadbc Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Thu, 31 Oct 2024 17:24:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E9=83=A8=E5=88=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96.=20=E5=96=B7=E6=B6=82=E6=94=B9=E8=BF=94=E5=96=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E4=B8=80=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FacOneZPStation/FrmZP.Designer.cs | 166 ++++----- InjectionPC/FrmMain2408.Designer.cs | 531 ++++++++++++++-------------- InjectionPC/FrmMain2408.cs | 373 ++----------------- PaintingPC/FrmQuality.cs | 251 +++++++------ WebService/Function.cs | 20 +- WebService/WMSWebService.asmx.cs | 10 + 6 files changed, 545 insertions(+), 806 deletions(-) diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs index 6e0d23d..4322dde 100644 --- a/FacOneZPStation/FrmZP.Designer.cs +++ b/FacOneZPStation/FrmZP.Designer.cs @@ -77,7 +77,7 @@ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 709F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 652F)); this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0); this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1); this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1); @@ -86,14 +86,14 @@ this.tableLayoutPanel3.Controls.Add(this.button2, 1, 1); this.tableLayoutPanel3.Controls.Add(this.button7, 3, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(7, 1401); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1225); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(2546, 423); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(2335, 371); this.tableLayoutPanel3.TabIndex = 3; // // button6 @@ -102,10 +102,10 @@ this.button6.Dock = System.Windows.Forms.DockStyle.Fill; this.button6.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button6.ForeColor = System.Drawing.Color.Black; - this.button6.Location = new System.Drawing.Point(1849, 14); - this.button6.Margin = new System.Windows.Forms.Padding(14, 14, 14, 14); + this.button6.Location = new System.Drawing.Point(1695, 12); + this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(683, 183); + this.button6.Size = new System.Drawing.Size(627, 161); this.button6.TabIndex = 7; this.button6.Text = "手动打印箱单"; this.button6.UseVisualStyleBackColor = false; @@ -116,10 +116,10 @@ this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button1.Dock = System.Windows.Forms.DockStyle.Fill; this.button1.Font = new System.Drawing.Font("黑体", 16F); - this.button1.Location = new System.Drawing.Point(7, 217); - this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button1.Location = new System.Drawing.Point(6, 190); + this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(601, 200); + this.button1.Size = new System.Drawing.Size(552, 176); this.button1.TabIndex = 6; this.button1.Text = "打印标签"; this.button1.UseVisualStyleBackColor = false; @@ -131,10 +131,10 @@ this.button5.Dock = System.Windows.Forms.DockStyle.Fill; this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button5.ForeColor = System.Drawing.Color.Black; - this.button5.Location = new System.Drawing.Point(1246, 225); - this.button5.Margin = new System.Windows.Forms.Padding(14, 14, 14, 14); + this.button5.Location = new System.Drawing.Point(1142, 197); + this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(575, 184); + this.button5.Size = new System.Drawing.Size(527, 162); this.button5.TabIndex = 5; this.button5.Text = "不合格"; this.button5.UseVisualStyleBackColor = false; @@ -145,10 +145,10 @@ this.button4.BackColor = System.Drawing.Color.RoyalBlue; this.button4.Dock = System.Windows.Forms.DockStyle.Fill; this.button4.Font = new System.Drawing.Font("黑体", 16F); - this.button4.Location = new System.Drawing.Point(622, 6); - this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button4.Location = new System.Drawing.Point(570, 5); + this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(603, 199); + this.button4.Size = new System.Drawing.Size(553, 175); this.button4.TabIndex = 4; this.button4.Text = "下一计划"; this.button4.UseVisualStyleBackColor = false; @@ -159,10 +159,10 @@ this.button3.BackColor = System.Drawing.Color.Aqua; this.button3.Dock = System.Windows.Forms.DockStyle.Fill; this.button3.Font = new System.Drawing.Font("黑体", 16F); - this.button3.Location = new System.Drawing.Point(7, 6); - this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button3.Location = new System.Drawing.Point(6, 5); + this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(601, 199); + this.button3.Size = new System.Drawing.Size(552, 175); this.button3.TabIndex = 3; this.button3.Text = "上一计划"; this.button3.UseVisualStyleBackColor = false; @@ -174,10 +174,10 @@ this.button2.Dock = System.Windows.Forms.DockStyle.Fill; this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button2.ForeColor = System.Drawing.Color.Black; - this.button2.Location = new System.Drawing.Point(629, 225); - this.button2.Margin = new System.Windows.Forms.Padding(14, 14, 14, 14); + this.button2.Location = new System.Drawing.Point(577, 197); + this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(589, 184); + this.button2.Size = new System.Drawing.Size(539, 162); this.button2.TabIndex = 2; this.button2.Text = "补打标签"; this.button2.UseVisualStyleBackColor = false; @@ -188,10 +188,10 @@ this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button7.Dock = System.Windows.Forms.DockStyle.Fill; this.button7.Font = new System.Drawing.Font("黑体", 16F); - this.button7.Location = new System.Drawing.Point(1842, 217); - this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.button7.Location = new System.Drawing.Point(1688, 190); + this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(697, 200); + this.button7.Size = new System.Drawing.Size(641, 176); this.button7.TabIndex = 8; this.button7.Text = "补打箱单"; this.button7.UseVisualStyleBackColor = false; @@ -203,11 +203,11 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.ForeColor = System.Drawing.Color.White; - this.label7.Location = new System.Drawing.Point(1517, 3); + this.label7.Location = new System.Drawing.Point(1388, 3); this.label7.Margin = new System.Windows.Forms.Padding(2); this.label7.Name = "label7"; this.tableLayoutPanel4.SetRowSpan(this.label7, 2); - this.label7.Size = new System.Drawing.Size(272, 241); + this.label7.Size = new System.Drawing.Size(249, 211); this.label7.TabIndex = 32; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -215,10 +215,10 @@ // this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox2.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(437, 127); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox2.Location = new System.Drawing.Point(400, 111); + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(1073, 87); + this.textBox2.Size = new System.Drawing.Size(981, 77); this.textBox2.TabIndex = 30; this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown); // @@ -227,10 +227,10 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(5, 122); + this.label3.Location = new System.Drawing.Point(5, 107); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(423, 124); + this.label3.Size = new System.Drawing.Size(386, 109); this.label3.TabIndex = 29; this.label3.Text = "扫描物料条码"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -240,10 +240,10 @@ this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labOrderNo.ForeColor = System.Drawing.Color.White; - this.labOrderNo.Location = new System.Drawing.Point(1794, 249); + this.labOrderNo.Location = new System.Drawing.Point(1642, 219); this.labOrderNo.Margin = new System.Windows.Forms.Padding(2); this.labOrderNo.Name = "labOrderNo"; - this.labOrderNo.Size = new System.Drawing.Size(755, 174); + this.labOrderNo.Size = new System.Drawing.Size(694, 152); this.labOrderNo.TabIndex = 28; this.labOrderNo.Text = "A64654646464"; this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -254,10 +254,10 @@ this.label4.Dock = System.Windows.Forms.DockStyle.Fill; this.label4.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(1517, 249); + this.label4.Location = new System.Drawing.Point(1388, 219); this.label4.Margin = new System.Windows.Forms.Padding(2); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(272, 174); + this.label4.Size = new System.Drawing.Size(249, 152); this.label4.TabIndex = 27; this.label4.Text = "计划编号"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -268,10 +268,10 @@ this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labStationNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labStationNo.ForeColor = System.Drawing.Color.White; - this.labStationNo.Location = new System.Drawing.Point(435, 249); + this.labStationNo.Location = new System.Drawing.Point(398, 219); this.labStationNo.Margin = new System.Windows.Forms.Padding(2); this.labStationNo.Name = "labStationNo"; - this.labStationNo.Size = new System.Drawing.Size(1077, 174); + this.labStationNo.Size = new System.Drawing.Size(985, 152); this.labStationNo.TabIndex = 26; this.labStationNo.Text = "V253-MF-S后保下部延伸焊接"; this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -282,10 +282,10 @@ this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(3, 249); + this.label2.Location = new System.Drawing.Point(3, 219); this.label2.Margin = new System.Windows.Forms.Padding(2); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(427, 174); + this.label2.Size = new System.Drawing.Size(390, 152); this.label2.TabIndex = 25; this.label2.Text = "工位名称"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -295,10 +295,10 @@ this.labPName.Dock = System.Windows.Forms.DockStyle.Fill; this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labPName.ForeColor = System.Drawing.Color.White; - this.labPName.Location = new System.Drawing.Point(1794, 428); + this.labPName.Location = new System.Drawing.Point(1642, 376); this.labPName.Margin = new System.Windows.Forms.Padding(2); this.labPName.Name = "labPName"; - this.labPName.Size = new System.Drawing.Size(755, 285); + this.labPName.Size = new System.Drawing.Size(694, 249); this.labPName.TabIndex = 24; this.labPName.Text = "MF253 MF S后保"; this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -309,10 +309,10 @@ this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(1517, 428); + this.label8.Location = new System.Drawing.Point(1388, 376); this.label8.Margin = new System.Windows.Forms.Padding(2); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(272, 285); + this.label8.Size = new System.Drawing.Size(249, 249); this.label8.TabIndex = 23; this.label8.Text = "产品名称"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -323,10 +323,10 @@ this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labPartNo.Font = new System.Drawing.Font("黑体", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labPartNo.ForeColor = System.Drawing.Color.White; - this.labPartNo.Location = new System.Drawing.Point(435, 428); + this.labPartNo.Location = new System.Drawing.Point(398, 376); this.labPartNo.Margin = new System.Windows.Forms.Padding(2); this.labPartNo.Name = "labPartNo"; - this.labPartNo.Size = new System.Drawing.Size(1077, 285); + this.labPartNo.Size = new System.Drawing.Size(985, 249); this.labPartNo.TabIndex = 22; this.labPartNo.Text = "A2530822665"; this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -342,10 +342,10 @@ this.label6.Dock = System.Windows.Forms.DockStyle.Fill; this.label6.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Location = new System.Drawing.Point(3, 428); + this.label6.Location = new System.Drawing.Point(3, 376); this.label6.Margin = new System.Windows.Forms.Padding(2); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(427, 285); + this.label6.Size = new System.Drawing.Size(390, 249); this.label6.TabIndex = 21; this.label6.Text = "产品代码"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -356,10 +356,10 @@ this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill; this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labBadCount.ForeColor = System.Drawing.Color.Lime; - this.labBadCount.Location = new System.Drawing.Point(1794, 718); + this.labBadCount.Location = new System.Drawing.Point(1642, 630); this.labBadCount.Margin = new System.Windows.Forms.Padding(2); this.labBadCount.Name = "labBadCount"; - this.labBadCount.Size = new System.Drawing.Size(755, 515); + this.labBadCount.Size = new System.Drawing.Size(694, 449); this.labBadCount.TabIndex = 20; this.labBadCount.Text = "0"; this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -370,10 +370,10 @@ this.labNum.Dock = System.Windows.Forms.DockStyle.Fill; this.labNum.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labNum.ForeColor = System.Drawing.Color.Lime; - this.labNum.Location = new System.Drawing.Point(435, 718); + this.labNum.Location = new System.Drawing.Point(398, 630); this.labNum.Margin = new System.Windows.Forms.Padding(2); this.labNum.Name = "labNum"; - this.labNum.Size = new System.Drawing.Size(1077, 515); + this.labNum.Size = new System.Drawing.Size(985, 449); this.labNum.TabIndex = 18; this.labNum.Text = "152/210"; this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -384,10 +384,10 @@ this.label10.Dock = System.Windows.Forms.DockStyle.Fill; this.label10.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(3, 718); + this.label10.Location = new System.Drawing.Point(3, 630); this.label10.Margin = new System.Windows.Forms.Padding(2); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(427, 515); + this.label10.Size = new System.Drawing.Size(390, 449); this.label10.TabIndex = 17; this.label10.Text = "计划/完成数"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -400,7 +400,7 @@ this.label14.Location = new System.Drawing.Point(5, 1); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(423, 120); + this.label14.Size = new System.Drawing.Size(386, 105); this.label14.TabIndex = 12; this.label14.Text = "扫描本体条码"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -409,10 +409,10 @@ // this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox1.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(437, 6); - this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox1.Location = new System.Drawing.Point(400, 5); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(1073, 87); + this.textBox1.Size = new System.Drawing.Size(981, 77); this.textBox1.TabIndex = 13; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -421,11 +421,11 @@ this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill; this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labErrMessage.ForeColor = System.Drawing.Color.Red; - this.labErrMessage.Location = new System.Drawing.Point(1796, 1); + this.labErrMessage.Location = new System.Drawing.Point(1644, 1); this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labErrMessage.Name = "labErrMessage"; this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2); - this.labErrMessage.Size = new System.Drawing.Size(751, 245); + this.labErrMessage.Size = new System.Drawing.Size(690, 215); this.labErrMessage.TabIndex = 16; this.labErrMessage.Text = "条码与产品不匹配，重新扫描"; this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -437,9 +437,9 @@ this.tableLayoutPanel4.ColumnCount = 4; this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.52292F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.47708F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 276F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 758F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 253F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 697F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F)); this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0); this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1); this.tableLayoutPanel4.Controls.Add(this.label3, 0, 1); @@ -459,17 +459,17 @@ this.tableLayoutPanel4.Controls.Add(this.textBox1, 1, 0); this.tableLayoutPanel4.Controls.Add(this.labErrMessage, 3, 0); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 154); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 134); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 5; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.8932F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17.47573F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40.52419F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 517F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1236); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 452F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 1082); this.tableLayoutPanel4.TabIndex = 2; // // label12 @@ -478,10 +478,10 @@ this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.ForeColor = System.Drawing.Color.White; - this.label12.Location = new System.Drawing.Point(1517, 718); + this.label12.Location = new System.Drawing.Point(1388, 630); this.label12.Margin = new System.Windows.Forms.Padding(2); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(272, 515); + this.label12.Size = new System.Drawing.Size(249, 449); this.label12.TabIndex = 19; this.label12.Text = "不合格数"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -491,10 +491,10 @@ this.labTime.BackColor = System.Drawing.Color.Transparent; this.labTime.Dock = System.Windows.Forms.DockStyle.Fill; this.labTime.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTime.Location = new System.Drawing.Point(1963, 0); + this.labTime.Location = new System.Drawing.Point(1799, 0); this.labTime.Margin = new System.Windows.Forms.Padding(0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(597, 149); + this.labTime.Size = new System.Drawing.Size(548, 130); this.labTime.TabIndex = 7; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -508,7 +508,7 @@ this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(355, 149); + this.pictureBox1.Size = new System.Drawing.Size(325, 130); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -518,10 +518,10 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(355, 0); + this.label1.Location = new System.Drawing.Point(325, 0); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1608, 149); + this.label1.Size = new System.Drawing.Size(1474, 130); this.label1.TabIndex = 1; this.label1.Text = "装配工位信息看板"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -532,7 +532,7 @@ this.tableLayoutPanel2.ColumnCount = 3; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 596F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 547F)); this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0); this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0); @@ -542,7 +542,7 @@ this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 149); + this.tableLayoutPanel2.Size = new System.Drawing.Size(2347, 130); this.tableLayoutPanel2.TabIndex = 0; // // tableLayoutPanel1 @@ -559,18 +559,18 @@ this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10.69692F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 89.30308F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1830); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 380F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1601); this.tableLayoutPanel1.TabIndex = 9; // // FrmZP // - 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(7, 6, 7, 6); + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmZP"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmZP"; diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index d4eff5c..cd06584 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn(); @@ -147,10 +146,10 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label35 = new System.Windows.Forms.Label(); this.label39 = new System.Windows.Forms.Label(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.serialPort1 = new System.IO.Ports.SerialPort(this.components); - this.timer2 = new System.Windows.Forms.Timer(this.components); - this.timer3 = new System.Windows.Forms.Timer(this.components); + this.timer1 = new System.Windows.Forms.Timer(); + this.serialPort1 = new System.IO.Ports.SerialPort(); + this.timer2 = new System.Windows.Forms.Timer(); + this.timer3 = new System.Windows.Forms.Timer(); this.panel1.SuspendLayout(); this.panel7.SuspendLayout(); this.panel23.SuspendLayout(); @@ -215,9 +214,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, 5, 5, 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, 1830); + this.panel1.Size = new System.Drawing.Size(2347, 1601); this.panel1.TabIndex = 0; // // panel7 @@ -226,10 +225,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, 5, 5, 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, 1662); + this.panel7.Size = new System.Drawing.Size(2347, 1454); this.panel7.TabIndex = 1; // // panel23 @@ -237,10 +236,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, 5, 5, 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, 1558); + this.panel23.Size = new System.Drawing.Size(2347, 1363); this.panel23.TabIndex = 1; // // panel27 @@ -248,10 +247,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, 5, 5, 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, 443); + this.panel27.Size = new System.Drawing.Size(2347, 387); this.panel27.TabIndex = 1; // // panel29 @@ -259,10 +258,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, 5, 5, 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, 443); + this.panel29.Size = new System.Drawing.Size(2036, 387); this.panel29.TabIndex = 1; // // panel31 @@ -270,10 +269,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, 5, 5, 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, 443); + this.panel31.Size = new System.Drawing.Size(1914, 387); this.panel31.TabIndex = 1; // // panel33 @@ -281,10 +280,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, 5, 5, 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, 443); + this.panel33.Size = new System.Drawing.Size(1792, 387); this.panel33.TabIndex = 1; // // panel35 @@ -292,9 +291,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, 5, 5, 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, 443); + this.panel35.Size = new System.Drawing.Size(1670, 387); this.panel35.TabIndex = 1; // // panel37 @@ -302,9 +301,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, 5, 5, 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, 443); + this.panel37.Size = new System.Drawing.Size(1670, 387); this.panel37.TabIndex = 1; // // panel40 @@ -313,9 +312,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, 5, 5, 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, 443); + this.panel40.Size = new System.Drawing.Size(1670, 387); this.panel40.TabIndex = 1; // // panel42 @@ -324,9 +323,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, 5, 5, 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, 443); + this.panel42.Size = new System.Drawing.Size(1548, 387); this.panel42.TabIndex = 1; // // panel39 @@ -343,9 +342,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, 5, 5, 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, 443); + this.panel39.Size = new System.Drawing.Size(1426, 387); this.panel39.TabIndex = 1; // // cboxHandBox @@ -354,10 +353,10 @@ this.cboxHandBox.Checked = true; this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked; this.cboxHandBox.Enabled = false; - this.cboxHandBox.Location = new System.Drawing.Point(1008, 197); - this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cboxHandBox.Location = new System.Drawing.Point(924, 172); + this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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 = "打印箱码"; @@ -367,20 +366,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, 5, 5, 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 = "数量："; // @@ -388,10 +387,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)"; // @@ -399,20 +398,20 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(243, 197); - this.textBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.textBox1.Location = new System.Drawing.Point(223, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(328, 74); + this.textBox1.Size = new System.Drawing.Size(301, 65); this.textBox1.TabIndex = 10; // // label20 // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(45, 213); + this.label20.Location = new System.Drawing.Point(41, 186); this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(202, 58); + this.label20.Size = new System.Drawing.Size(178, 51); this.label20.TabIndex = 9; this.label20.Text = "批次："; // @@ -421,10 +420,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, 5, 5, 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); // @@ -432,10 +431,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 = "产品："; // @@ -443,10 +442,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, 5, 5, 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, 443); + this.panel43.Size = new System.Drawing.Size(122, 387); this.panel43.TabIndex = 0; // // label23 @@ -457,7 +456,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, 443); + this.label23.Size = new System.Drawing.Size(122, 387); this.label23.TabIndex = 0; this.label23.Text = "手工打印条码"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -467,10 +466,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, 5, 5, 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, 443); + this.panel41.Size = new System.Drawing.Size(122, 387); this.panel41.TabIndex = 0; // // label22 @@ -482,7 +481,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, 443); + this.label22.Size = new System.Drawing.Size(122, 387); this.label22.TabIndex = 0; this.label22.Text = "补打条码"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -492,10 +491,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, 5, 5, 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, 443); + this.panel34.Size = new System.Drawing.Size(122, 387); this.panel34.TabIndex = 0; // // label15 @@ -506,7 +505,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, 443); + this.label15.Size = new System.Drawing.Size(122, 387); this.label15.TabIndex = 0; this.label15.Text = "删除条码"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -517,9 +516,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, 5, 5, 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, 443); + this.panel32.Size = new System.Drawing.Size(122, 387); this.panel32.TabIndex = 0; // // label14 @@ -530,7 +529,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, 443); + this.label14.Size = new System.Drawing.Size(122, 387); this.label14.TabIndex = 0; this.label14.Text = "下一计划"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -541,9 +540,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, 5, 5, 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, 443); + this.panel30.Size = new System.Drawing.Size(122, 387); this.panel30.TabIndex = 0; // // label13 @@ -554,7 +553,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, 443); + this.label13.Size = new System.Drawing.Size(122, 387); this.label13.TabIndex = 0; this.label13.Text = "暂停打印"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -565,9 +564,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, 5, 5, 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, 443); + this.panel28.Size = new System.Drawing.Size(311, 387); this.panel28.TabIndex = 0; // // label12 @@ -579,7 +578,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, 443); + this.label12.Size = new System.Drawing.Size(311, 387); this.label12.TabIndex = 0; this.label12.Text = "打印信息："; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -590,9 +589,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, 5, 5, 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 @@ -601,10 +600,10 @@ this.panel26.Controls.Add(this.panel44); this.panel26.Controls.Add(this.glacialList1); this.panel26.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel26.Location = new System.Drawing.Point(415, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel26.Location = new System.Drawing.Point(380, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2145, 1115); + this.panel26.Size = new System.Drawing.Size(1967, 976); this.panel26.TabIndex = 1; // // panel45 @@ -614,19 +613,19 @@ this.panel45.Controls.Add(this.button4); this.panel45.Controls.Add(this.textBox4); this.panel45.Controls.Add(this.label25); - this.panel45.Location = new System.Drawing.Point(323, 677); - this.panel45.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel45.Location = new System.Drawing.Point(296, 592); + this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel45.Name = "panel45"; - this.panel45.Size = new System.Drawing.Size(1397, 151); + this.panel45.Size = new System.Drawing.Size(1281, 132); this.panel45.TabIndex = 2; // // button3 // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1232, 43); - this.button3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.button3.Location = new System.Drawing.Point(1129, 38); + this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(160, 59); + this.button3.Size = new System.Drawing.Size(147, 52); this.button3.TabIndex = 5; this.button3.Text = "取消"; this.button3.UseVisualStyleBackColor = true; @@ -635,10 +634,10 @@ // button4 // this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1037, 43); - this.button4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.button4.Location = new System.Drawing.Point(951, 38); + this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(160, 59); + this.button4.Size = new System.Drawing.Size(147, 52); this.button4.TabIndex = 4; this.button4.Text = "切换"; this.button4.UseVisualStyleBackColor = true; @@ -647,20 +646,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, 5, 5, 5); + this.textBox4.Location = new System.Drawing.Point(308, 39); + this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(660, 55); + this.textBox4.Size = new System.Drawing.Size(605, 49); this.textBox4.TabIndex = 3; // // label25 // this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(28, 53); + this.label25.Location = new System.Drawing.Point(26, 46); this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(319, 42); + this.label25.Size = new System.Drawing.Size(283, 37); this.label25.TabIndex = 2; this.label25.Text = "扫描模具条码："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -672,19 +671,19 @@ this.panel44.Controls.Add(this.button1); this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); - this.panel44.Location = new System.Drawing.Point(360, 363); - this.panel44.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel44.Location = new System.Drawing.Point(330, 318); + this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel44.Name = "panel44"; - this.panel44.Size = new System.Drawing.Size(1397, 151); + this.panel44.Size = new System.Drawing.Size(1281, 132); this.panel44.TabIndex = 1; // // button2 // this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1197, 43); - this.button2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.button2.Location = new System.Drawing.Point(1097, 38); + this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(160, 59); + this.button2.Size = new System.Drawing.Size(147, 52); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -693,10 +692,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, 5, 5, 5); + this.button1.Location = new System.Drawing.Point(941, 35); + this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(160, 59); + this.button1.Size = new System.Drawing.Size(147, 52); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -705,20 +704,20 @@ // textBox3 // this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox3.Location = new System.Drawing.Point(208, 43); - this.textBox3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.textBox3.Location = new System.Drawing.Point(191, 38); + this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(737, 55); + this.textBox3.Size = new System.Drawing.Size(676, 49); this.textBox3.TabIndex = 1; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(27, 53); + this.label24.Location = new System.Drawing.Point(25, 46); this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(190, 42); + this.label24.Size = new System.Drawing.Size(169, 37); this.label24.TabIndex = 0; this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -789,14 +788,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(5, 5, 5, 5); + this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2145, 1115); + this.glacialList1.Size = new System.Drawing.Size(1967, 976); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -809,9 +808,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, 5, 5, 5); + this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel25.Name = "panel25"; - this.panel25.Size = new System.Drawing.Size(415, 1115); + this.panel25.Size = new System.Drawing.Size(380, 976); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -821,13 +820,13 @@ this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0); this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 299F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); + this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -837,19 +836,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, 5, 5, 5); + this.panel38.Location = new System.Drawing.Point(5, 4); + this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel38.Name = "panel38"; - this.panel38.Size = new System.Drawing.Size(404, 288); + this.panel38.Size = new System.Drawing.Size(370, 252); this.panel38.TabIndex = 1; // // 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; @@ -858,20 +857,20 @@ // this.label26.AutoSize = true; this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label26.Location = new System.Drawing.Point(0, 155); + this.label26.Location = new System.Drawing.Point(0, 136); this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(169, 37); + this.label26.Size = new System.Drawing.Size(151, 33); this.label26.TabIndex = 2; this.label26.Text = "完成数量"; // // label17 // this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(-3, 56); + this.label17.Location = new System.Drawing.Point(-3, 49); this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(317, 85); + this.label17.Size = new System.Drawing.Size(291, 74); this.label17.TabIndex = 1; this.label17.Text = "9999"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -880,10 +879,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 = "计划数量"; // @@ -893,11 +892,11 @@ this.groupBox1.Controls.Add(this.tableLayoutPanel3); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox1.Location = new System.Drawing.Point(4, 304); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Location = new System.Drawing.Point(4, 266); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Size = new System.Drawing.Size(407, 342); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(372, 300); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "模具2"; @@ -912,14 +911,14 @@ this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0); this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 37); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 32); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 3; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(399, 300); + this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 264); this.tableLayoutPanel3.TabIndex = 2; // // panel47 @@ -930,10 +929,10 @@ this.panel47.Controls.Add(this.lbNeedQtyR); this.panel47.Controls.Add(this.lbCurrentlQtyR); this.panel47.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel47.Location = new System.Drawing.Point(4, 204); - this.panel47.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panel47.Location = new System.Drawing.Point(4, 179); + this.panel47.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel47.Name = "panel47"; - this.panel47.Size = new System.Drawing.Size(391, 91); + this.panel47.Size = new System.Drawing.Size(356, 81); this.panel47.TabIndex = 4; // // btnHandPrintR @@ -941,10 +940,10 @@ this.btnHandPrintR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintR.Location = new System.Drawing.Point(269, 18); - this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnHandPrintR.Location = new System.Drawing.Point(247, 16); + this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnHandPrintR.Name = "btnHandPrintR"; - this.btnHandPrintR.Size = new System.Drawing.Size(125, 73); + this.btnHandPrintR.Size = new System.Drawing.Size(115, 64); this.btnHandPrintR.TabIndex = 3; this.btnHandPrintR.Text = "打印"; this.btnHandPrintR.UseVisualStyleBackColor = false; @@ -954,10 +953,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 = "/"; // @@ -965,10 +964,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"; // @@ -976,10 +975,10 @@ // this.lbCurrentlQtyR.AutoSize = true; this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyR.Location = new System.Drawing.Point(8, 31); + this.lbCurrentlQtyR.Location = new System.Drawing.Point(7, 27); this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyR.Name = "lbCurrentlQtyR"; - this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyR.TabIndex = 0; this.lbCurrentlQtyR.Text = "0"; this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -989,10 +988,10 @@ this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label34.BackColor = System.Drawing.Color.Transparent; this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label34.Location = new System.Drawing.Point(5, 122); + this.label34.Location = new System.Drawing.Point(5, 108); this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(116, 53); + this.label34.Size = new System.Drawing.Size(106, 46); this.label34.TabIndex = 1; this.label34.Text = "规格:"; this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1003,10 +1002,10 @@ this.lbPackageCodeR.AutoSize = true; this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2); this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeR.Location = new System.Drawing.Point(4, 31); + this.lbPackageCodeR.Location = new System.Drawing.Point(4, 27); this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeR.Name = "lbPackageCodeR"; - this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeR.TabIndex = 5; // // panel49 @@ -1014,9 +1013,9 @@ this.panel49.Controls.Add(this.btnChangeSizeR); this.panel49.Controls.Add(this.comBoxSizeR); this.panel49.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel49.Location = new System.Drawing.Point(136, 102); + this.panel49.Location = new System.Drawing.Point(124, 90); this.panel49.Name = "panel49"; - this.panel49.Size = new System.Drawing.Size(260, 94); + this.panel49.Size = new System.Drawing.Size(237, 82); this.panel49.TabIndex = 6; // // btnChangeSizeR @@ -1024,10 +1023,10 @@ this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeR.Location = new System.Drawing.Point(139, 17); - this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeR.Location = new System.Drawing.Point(127, 15); + this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnChangeSizeR.Name = "btnChangeSizeR"; - this.btnChangeSizeR.Size = new System.Drawing.Size(132, 73); + this.btnChangeSizeR.Size = new System.Drawing.Size(121, 64); this.btnChangeSizeR.TabIndex = 4; this.btnChangeSizeR.Text = "调整"; this.btnChangeSizeR.UseVisualStyleBackColor = false; @@ -1043,10 +1042,10 @@ this.comBoxSizeR.Items.AddRange(new object[] { "A班", "B班"}); - this.comBoxSizeR.Location = new System.Drawing.Point(0, 18); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.comBoxSizeR.Location = new System.Drawing.Point(0, 16); + this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeR.Name = "comBoxSizeR"; - this.comBoxSizeR.Size = new System.Drawing.Size(136, 72); + this.comBoxSizeR.Size = new System.Drawing.Size(125, 64); this.comBoxSizeR.TabIndex = 3; // // panel36 @@ -1054,26 +1053,26 @@ this.panel36.Controls.Add(this.tableLayoutPanel1); this.panel36.Dock = System.Windows.Forms.DockStyle.Top; this.panel36.Location = new System.Drawing.Point(0, 0); - this.panel36.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel36.Name = "panel36"; - this.panel36.Size = new System.Drawing.Size(415, 464); + this.panel36.Size = new System.Drawing.Size(380, 406); this.panel36.TabIndex = 0; // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F)); this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.99953F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); + this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -1081,10 +1080,10 @@ this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.BackColor = System.Drawing.Color.DeepSkyBlue; this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label11.Location = new System.Drawing.Point(5, 21); + this.label11.Location = new System.Drawing.Point(5, 18); this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(403, 95); + this.label11.Size = new System.Drawing.Size(370, 83); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1095,11 +1094,11 @@ this.groupBox2.Controls.Add(this.tableLayoutPanel4); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold); - this.groupBox2.Location = new System.Drawing.Point(4, 121); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox2.Location = new System.Drawing.Point(4, 105); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox2.Size = new System.Drawing.Size(407, 338); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox2.Size = new System.Drawing.Size(372, 297); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "模具1&&手打"; @@ -1114,15 +1113,15 @@ this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 37); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 3; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(399, 296); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 261); this.tableLayoutPanel4.TabIndex = 3; // // label38 @@ -1130,10 +1129,10 @@ this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label38.BackColor = System.Drawing.Color.Transparent; this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(5, 120); + this.label38.Location = new System.Drawing.Point(5, 106); this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(116, 53); + this.label38.Size = new System.Drawing.Size(106, 46); this.label38.TabIndex = 1; this.label38.Text = "规格:"; this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1146,10 +1145,10 @@ this.panel46.Controls.Add(this.lbNeedQtyL); this.panel46.Controls.Add(this.lbCurrentlQtyL); this.panel46.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel46.Location = new System.Drawing.Point(4, 201); - this.panel46.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panel46.Location = new System.Drawing.Point(4, 177); + this.panel46.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel46.Name = "panel46"; - this.panel46.Size = new System.Drawing.Size(391, 90); + this.panel46.Size = new System.Drawing.Size(356, 80); this.panel46.TabIndex = 4; // // btnHandPrintL @@ -1157,10 +1156,10 @@ this.btnHandPrintL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintL.Location = new System.Drawing.Point(267, 15); - this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnHandPrintL.Location = new System.Drawing.Point(245, 13); + this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnHandPrintL.Name = "btnHandPrintL"; - this.btnHandPrintL.Size = new System.Drawing.Size(125, 73); + this.btnHandPrintL.Size = new System.Drawing.Size(115, 64); this.btnHandPrintL.TabIndex = 3; this.btnHandPrintL.Text = "打印"; this.btnHandPrintL.UseVisualStyleBackColor = false; @@ -1170,10 +1169,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 = "/"; // @@ -1181,10 +1180,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"; // @@ -1192,10 +1191,10 @@ // this.lbCurrentlQtyL.AutoSize = true; this.lbCurrentlQtyL.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbCurrentlQtyL.Location = new System.Drawing.Point(9, 31); + this.lbCurrentlQtyL.Location = new System.Drawing.Point(8, 27); this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentlQtyL.Name = "lbCurrentlQtyL"; - this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59); + this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52); this.lbCurrentlQtyL.TabIndex = 0; this.lbCurrentlQtyL.Text = "0"; this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click); @@ -1206,10 +1205,10 @@ this.lbPackageCodeL.AutoSize = true; this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2); this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeL.Location = new System.Drawing.Point(4, 30); + this.lbPackageCodeL.Location = new System.Drawing.Point(4, 26); this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeL.Name = "lbPackageCodeL"; - this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); + this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33); this.lbPackageCodeL.TabIndex = 5; // // panel48 @@ -1217,9 +1216,9 @@ this.panel48.Controls.Add(this.btnChangeSizeL); this.panel48.Controls.Add(this.comBoxSizeL); this.panel48.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel48.Location = new System.Drawing.Point(136, 101); + this.panel48.Location = new System.Drawing.Point(124, 89); this.panel48.Name = "panel48"; - this.panel48.Size = new System.Drawing.Size(260, 92); + this.panel48.Size = new System.Drawing.Size(237, 81); this.panel48.TabIndex = 6; // // btnChangeSizeL @@ -1227,10 +1226,10 @@ this.btnChangeSizeL.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeSizeL.Location = new System.Drawing.Point(139, 11); - this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeL.Location = new System.Drawing.Point(127, 10); + this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnChangeSizeL.Name = "btnChangeSizeL"; - this.btnChangeSizeL.Size = new System.Drawing.Size(125, 73); + this.btnChangeSizeL.Size = new System.Drawing.Size(115, 64); this.btnChangeSizeL.TabIndex = 4; this.btnChangeSizeL.Text = "调整"; this.btnChangeSizeL.UseVisualStyleBackColor = false; @@ -1246,10 +1245,10 @@ this.comBoxSizeL.Items.AddRange(new object[] { "A班", "B班"}); - this.comBoxSizeL.Location = new System.Drawing.Point(2, 11); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.comBoxSizeL.Location = new System.Drawing.Point(2, 9); + this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(136, 72); + this.comBoxSizeL.Size = new System.Drawing.Size(125, 64); this.comBoxSizeL.TabIndex = 3; // // panel8 @@ -1258,9 +1257,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, 5, 5, 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 @@ -1268,10 +1267,10 @@ this.panel10.Controls.Add(this.panel12); this.panel10.Controls.Add(this.panel11); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel10.Location = new System.Drawing.Point(415, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel10.Location = new System.Drawing.Point(380, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2145, 104); + this.panel10.Size = new System.Drawing.Size(1967, 91); this.panel10.TabIndex = 2; // // panel12 @@ -1279,10 +1278,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, 5, 5, 5); + this.panel12.Location = new System.Drawing.Point(451, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1653, 104); + this.panel12.Size = new System.Drawing.Size(1516, 91); this.panel12.TabIndex = 1; // // panel16 @@ -1290,10 +1289,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, 5, 5, 5); + this.panel16.Location = new System.Drawing.Point(467, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1144, 104); + this.panel16.Size = new System.Drawing.Size(1049, 91); this.panel16.TabIndex = 1; // // panel20 @@ -1301,10 +1300,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, 5, 5, 5); + this.panel20.Location = new System.Drawing.Point(428, 0); + this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel20.Name = "panel20"; - this.panel20.Size = new System.Drawing.Size(677, 104); + this.panel20.Size = new System.Drawing.Size(621, 91); this.panel20.TabIndex = 1; // // label10 @@ -1312,10 +1311,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(372, 0); + this.label10.Location = new System.Drawing.Point(341, 0); this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(305, 104); + this.label10.Size = new System.Drawing.Size(280, 91); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1326,9 +1325,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, 5, 5, 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 @@ -1340,7 +1339,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; @@ -1352,9 +1351,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, 5, 5, 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 @@ -1362,10 +1361,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; @@ -1375,9 +1374,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, 5, 5, 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 @@ -1389,7 +1388,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; @@ -1401,19 +1400,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, 5, 5, 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, 5, 5, 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 @@ -1424,7 +1423,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; @@ -1434,9 +1433,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, 5, 5, 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 @@ -1448,7 +1447,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; @@ -1460,19 +1459,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, 5, 5, 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, 5, 5, 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 @@ -1485,9 +1484,9 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 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 @@ -1495,9 +1494,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, 5, 5, 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 @@ -1509,7 +1508,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; @@ -1519,9 +1518,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, 5, 5, 5); + this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(415, 104); + this.panel9.Size = new System.Drawing.Size(380, 91); this.panel9.TabIndex = 0; // // label3 @@ -1533,7 +1532,7 @@ this.label3.Location = new System.Drawing.Point(0, 0); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(415, 104); + this.label3.Size = new System.Drawing.Size(380, 91); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1544,9 +1543,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, 5, 5, 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 @@ -1554,10 +1553,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, 5, 5, 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 @@ -1565,9 +1564,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, 5, 5, 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 @@ -1578,7 +1577,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; @@ -1587,10 +1586,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, 5, 5, 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 @@ -1601,7 +1600,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; @@ -1612,19 +1611,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, 5, 5, 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, 5, 5, 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; @@ -1668,12 +1667,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, 1830); + this.ClientSize = new System.Drawing.Size(2347, 1601); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.Name = "FrmMain2408"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index f864eea..e5ffb9a 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -2348,11 +2348,11 @@ namespace InjectionPC return; } - if (Convert.ToInt32(textBox2.Text.Trim()) > 10) - { - MessageBox.Show("数量不能大于10!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); - return; - } + //if (Convert.ToInt32(textBox2.Text.Trim()) > 10) + //{ + // MessageBox.Show("数量不能大于10!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + // return; + //} #endregion @@ -2415,8 +2415,8 @@ namespace InjectionPC if (IsSupply != "1") { #region 非直供件 - - for (int i = 1; i <= Convert.ToInt32(textBox2.Text.Trim()); i++) + int printCount = Convert.ToInt32(textBox2.Text.Trim()); + for (int i = 1; i <= printCount; i++) { GetSjBarCode(stockNo, partNo,false,"0", PartName, ref NewOneCode, ref newcode); @@ -2449,7 +2449,7 @@ namespace InjectionPC } //if (bll.Add_Info_New(md, Program.tableName) == false) - if (SaveBarCode(md, Program.tableName, false, "0") == false) + if (SaveBarCode(md, Program.tableName, false, "0",i== printCount) == false) { return; } @@ -3771,28 +3771,7 @@ namespace InjectionPC { for (int k = 0; k < 2; k++) { - //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim()); - //if (dt2 != null && dt2.Rows.Count > 0) - //{ - // code = dt2.Rows[0]["BarCode"].ToString().Trim(); - // newcode = code.Substring(0, code.Length - 4) + - // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) + 1).ToString() - // .PadLeft(4, '0'); - // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim(); - // NewOneCode = OneCode.Substring(0, OneCode.Length - 4) + - // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) + 1).ToString() - // .PadLeft(4, '0'); - //} - //else - //{ - // newcode = partNo[j].ToString().Trim() + "." + Program.ProductDate.Substring(2, 2) + - // Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "." + - // "0001"; - // NewOneCode = stockNo[j].ToString().Trim() + Program.ProductDate.Substring(2, 2) + - // Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + - // "0001"; - //} - + GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, ref NewOneCode, ref newcode); #region 插入数据tb_barCode @@ -3830,18 +3809,6 @@ namespace InjectionPC #region 打印条码，判断是否打印单个条码 - //DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim()); - //if (dt3 != null && dt3.Rows.Count > 0) - //{ - // QLevel = dt3.Rows[0]["QLevel"].ToString(); - // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString(); - // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString(); - // IsPaint = dt3.Rows[0]["IsPlating"].ToString(); - // PartName = dt3.Rows[0]["ProductName"].ToString(); - // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString()); - // IsSupply = dt3.Rows[0]["IsSupply"].ToString(); - //} - DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(), dt.Rows[0]["StationID"].ToString()); if (dt4 != null && dt4.Rows.Count > 0) @@ -3869,130 +3836,13 @@ namespace InjectionPC #endregion - //DataTable dt5 = brbll.SearchBoxIsNull(partNo[j].ToString().Trim(), - // dt.Rows[0]["StationID"].ToString(), Program.tableName, ProductNature); - - //if (dt5 != null && dt5.Rows.Count > 0) - //{ - // CurrentCount = Convert.ToInt32(dt5.Rows[0]["SumCount"].ToString()); - //} - - //if (CurrentCount >= MaxCount) - //{ - // #region 判断是否满箱,满箱打印箱单 - - // DialogResult result = MessageBox.Show("是否打印装箱单？", "提示", MessageBoxButtons.OKCancel, - // MessageBoxIcon.Information); - // if (result == DialogResult.OK) - // { - // filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf"; - // DataTable headTable = new DataTable(); - // headTable.Columns.Add("BoxNo"); - // headTable.Columns.Add("PartName"); - // headTable.Columns.Add("PartNo"); - // headTable.Columns.Add("BatchNo"); - // headTable.Columns.Add("PackCount"); - // headTable.Columns.Add("QLevel"); - // DataRow row = headTable.NewRow(); - - // row["BatchNo"] = Program.ProductDate.Substring(2, 2) + - // Program.ProductDate.Substring(5, 2) + - // Program.ProductDate.Substring(8, 2); - - // #region 查询当前批次装箱单 - - // DataTable dt6 = boxbll.SeachInfoByBox(partNo[j].ToString().Trim(), - // Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + - // Program.ProductDate.Substring(8, 2)); - // if (dt6 != null && dt6.Rows.Count > 0) - // { - // row["BoxNo"] = - // dt6.Rows[0]["BoxNo"].ToString().Substring(0, - // dt6.Rows[0]["BoxNo"].ToString().Length - 6) + - // (Convert.ToInt32(dt6.Rows[0]["BoxNo"].ToString() - // .Substring(dt6.Rows[0]["BoxNo"].ToString().Length - 6, 6)) + 1) - // .ToString().PadLeft(6, '0'); - // } - // else - // { - // row["BoxNo"] = - // partNo[j].ToString().Trim() + "." + - // Program.ProductDate.Substring(2, 2) + - // Program.ProductDate.Substring(5, 2) + - // Program.ProductDate.Substring(8, 2) + "." + "000001"; - // } - - // #endregion - - // row["PartNo"] = partNo[j].ToString().Trim(); - // row["PartName"] = PartName; - // row["PackCount"] = MaxCount.ToString() + " EA"; - // row["QLevel"] = QLevel; - - // #region 更新barCode表中BoxNo的绑定关系 - - // brbll.UpdateBoxNo(Program.tableName, row["BoxNo"].ToString(), - // partNo[j].ToString().Trim()); - - // #endregion - - // #region 保存箱单记录 - - // boxmd.ID = Guid.NewGuid().ToString(); - // boxmd.BoxNo = row["BoxNo"].ToString(); - // boxmd.IsFlag = 0; - // boxmd.BoxCount = MaxCount; - - // boxbll.AddInfo(boxmd); - - // #endregion - - // #region 打印箱单 - - // printBoxName = "Printer" + (Convert.ToInt32(printName.Substring(7, 1)) + 2).ToString(); - // string reportName = ConfigurationManager.AppSettings[printBoxName].ToString(); - // headTable.Rows.Add(row); - - // ReportHelper rp = new ReportHelper(filename, headTable, null, - // (int) GRPaperOrientation.grpoDefault, 1, reportName); - - // rp.Report.Print(true); - - // #endregion - // } - // else - // { - // } - - // #endregion - //} + #endregion } } else { - //dt2 = brbll.SearchInfoByPartNo(partNo[j].ToString().Trim()); - //if (dt2 != null && dt2.Rows.Count > 0) - //{ - // code = dt2.Rows[0]["BarCode"].ToString().Trim(); - // newcode = code.Substring(0, code.Length - 4) + - // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) + 1).ToString() - // .PadLeft(4, '0'); - // OneCode = dt2.Rows[0]["OneBarCode"].ToString().Trim(); - // NewOneCode = OneCode.Substring(0, OneCode.Length - 4) + - // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) + 1).ToString() - // .PadLeft(4, '0'); - //} - //else - //{ - // newcode = partNo[j].ToString().Trim() + "." + Program.ProductDate.Substring(2, 2) + - // Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "." + - // "0001"; - // NewOneCode = stockNo[j].ToString().Trim() + Program.ProductDate.Substring(2, 2) + - // Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001"; - //} - GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, ref NewOneCode, ref newcode); #region 插入数据tb_barCode @@ -4030,18 +3880,6 @@ namespace InjectionPC #region 打印条码，判断是否打印单个条码 - //DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim()); - //if (dt3 != null && dt3.Rows.Count > 0) - //{ - // QLevel = dt3.Rows[0]["QLevel"].ToString(); - // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString(); - // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString(); - // IsPaint = dt3.Rows[0]["IsPlating"].ToString(); - // PartName = dt3.Rows[0]["ProductName"].ToString(); - // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString()); - // IsSupply = dt3.Rows[0]["IsSupply"].ToString(); - //} - DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(), dt.Rows[0]["StationID"].ToString()); if (dt4 != null && dt4.Rows.Count > 0) @@ -4070,102 +3908,7 @@ namespace InjectionPC #endregion - //DataTable dt5 = brbll.SearchBoxIsNull(partNo[j].ToString().Trim(), - // dt.Rows[0]["StationID"].ToString(), Program.tableName, ProductNature); - - //if (dt5 != null && dt5.Rows.Count > 0) - //{ - // CurrentCount = Convert.ToInt32(dt5.Rows[0]["SumCount"].ToString()); - //} - - //if (CurrentCount >= MaxCount) - //{ - // #region 判断是否满箱,满箱打印箱单 - - // DialogResult result = MessageBox.Show("是否打印装箱单？", "提示", MessageBoxButtons.OKCancel, - // MessageBoxIcon.Information); - // if (result == DialogResult.OK) - // { - // filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf"; - // DataTable headTable = new DataTable(); - // headTable.Columns.Add("BoxNo"); - // headTable.Columns.Add("PartName"); - // headTable.Columns.Add("PartNo"); - // headTable.Columns.Add("BatchNo"); - // headTable.Columns.Add("PackCount"); - // headTable.Columns.Add("QLevel"); - // DataRow row = headTable.NewRow(); - - // row["BatchNo"] = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + - // Program.ProductDate.Substring(8, 2); - - // #region 查询当前批次装箱单 - - // DataTable dt6 = boxbll.SeachInfoByBox(partNo[j].ToString().Trim(), - // Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + - // Program.ProductDate.Substring(8, 2)); - // if (dt6 != null && dt6.Rows.Count > 0) - // { - // row["BoxNo"] = - // dt6.Rows[0]["BoxNo"].ToString().Substring(0, - // dt6.Rows[0]["BoxNo"].ToString().Length - 6) + - // (Convert.ToInt32(dt6.Rows[0]["BoxNo"].ToString() - // .Substring(dt6.Rows[0]["BoxNo"].ToString().Length - 6, 6)) + 1) - // .ToString().PadLeft(6, '0'); - // } - // else - // { - // row["BoxNo"] = - // partNo[j].ToString().Trim() + "." + - // Program.ProductDate.Substring(2, 2) + - // Program.ProductDate.Substring(5, 2) + - // Program.ProductDate.Substring(8, 2) + "." + "000001"; - // } - - // #endregion - - // row["PartNo"] = partNo[j].ToString().Trim(); - // row["PartName"] = PartName; - // row["PackCount"] = MaxCount.ToString() + " EA"; - // row["QLevel"] = QLevel; - - // #region 更新barCode表中BoxNo的绑定关系 - - // brbll.UpdateBoxNo(Program.tableName, row["BoxNo"].ToString(), - // partNo[j].ToString().Trim()); - - // #endregion - - // #region 保存箱单记录 - - // boxmd.ID = Guid.NewGuid().ToString(); - // boxmd.BoxNo = row["BoxNo"].ToString(); - // boxmd.IsFlag = 0; - // boxmd.BoxCount = MaxCount; - - // boxbll.AddInfo(boxmd); - - // #endregion - - // #region 打印箱单 - - // printBoxName = "Printer" + (Convert.ToInt32(printName.Substring(7, 1)) + 2).ToString(); - // string reportName = ConfigurationManager.AppSettings[printBoxName].ToString(); - // headTable.Rows.Add(row); - // ReportHelper rp = new ReportHelper(filename, headTable, null, - // (int) GRPaperOrientation.grpoDefault, 1, reportName); - - // rp.Report.Print(false); - - // #endregion - // } - // else - // { - // } - - // #endregion - //} - + #endregion } initBarCode(); @@ -4183,41 +3926,6 @@ namespace InjectionPC } private void timer2_Tick(object sender, EventArgs e) { - //InjectionPlanBLL bll = new InjectionPlanBLL(); - //ProductBLL productBll = new ProductBLL(); - - //try - //{ - // #region 获取当前生产信息 - - // DataTable dt = bll.SearchInfoByName(Program.station); - // if (dt != null && dt.Rows.Count > 0) - // { - // planID = dt.Rows[0]["InjectionPlanID"].ToString(); - // string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(','); - - // label12.Text = "当前生产计划为:"; - // for (int i = 0; i < partNo.Length; i++) - // { - // DataTable sdt = productBll.SearchInfoByPartNo(partNo[i].ToString().Trim()); - // if (sdt != null && sdt.Rows.Count > 0) - // { - // label12.Text += "零件号" + partNo[i].ToString().Trim() + ",零件名称" + sdt.Rows[0]["ProductName"].ToString() + ";"; - // } - // } - // } - // else - // { - // label12.Text = "暂无生产计划"; - // } - - // #endregion - //} - //catch (Exception ex) - //{ - // LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); - // label12.Text = ""; - //} initPlan(); } @@ -4272,54 +3980,12 @@ namespace InjectionPC textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2); //批次 - - initPlan(); - #region 获取当前生产信息 - //InjectionPlanBLL ibll = new InjectionPlanBLL(); - //ProductBLL productBll = new ProductBLL(); - //DataTable dt = ibll.SearchInfoByName(Program.station); - //if (dt != null && dt.Rows.Count > 0) - //{ - // planID = dt.Rows[0]["InjectionPlanID"].ToString(); - // string[] partNo1 = dt.Rows[0]["PartNo"].ToString().Split(','); - - // label12.Text = "当前生产计划为:"; - // for (int i = 0; i < partNo1.Length; i++) - // { - // DataTable dt2 = productBll.SearchInfoByPartNo(partNo1[i].ToString().Trim()); - // if (dt2 != null && dt2.Rows.Count > 0) - // { - // label12.Text += "零件号" + partNo1[i].ToString().Trim() + ",零件名称" + dt2.Rows[0]["ProductName"].ToString() + ";"; - // } - // if ((partNo1.Length == 1 && comBoxSizeL.SelectedItem == null) || (partNo1.Length == 2 && comBoxSizeL.SelectedItem == null && comBoxSizeR.SelectedItem == null)) - // { - // if (!string.IsNullOrEmpty(partNo1[i].ToString().Trim())) - // { - // string currentSize = string.Empty; - // List list = GetProductBoxSize(partNo1[i].ToString().Trim(), ref currentSize); - - // if (i == 0) - // { - // comBoxSizeL.DataSource = list; - // comBoxSizeL.SelectedItem = currentSize; - // } - // else - // { - // comBoxSizeR.DataSource = list; - // comBoxSizeR.SelectedItem = currentSize; - // } - // } - // } - // } - //} - //else - //{ - // label12.Text = "暂无生产计划"; - //} + #region 获取当前生产信息 + initPlan(); #endregion } catch (Exception ex) @@ -4453,19 +4119,22 @@ namespace InjectionPC - bool SaveBarCode(BarCodeModel bcm,string tableName, bool isAutoPrint,string mould) + bool SaveBarCode(BarCodeModel bcm,string tableName, bool isAutoPrint,string mould,bool handPrint = false) { Label lbPackageCode = lbPackageCodeL; Label lbCurrentlQty = lbCurrentlQtyL; + Label lbNeedQty = lbNeedQtyL; if (mould == _leftType) { lbPackageCode = lbPackageCodeL; lbCurrentlQty = lbCurrentlQtyL; + lbNeedQty = lbNeedQtyL; } else { lbPackageCode = lbPackageCodeR; lbCurrentlQty = lbCurrentlQtyR; + lbNeedQty = lbNeedQtyR; } bool saveRst = false; @@ -4486,12 +4155,12 @@ namespace InjectionPC return false; } string realCountStr = dt.Rows[0]["BoxCount"].ToString(); - string sizeCountStr = lbNeedQtyL.Text.Trim(); + string sizeCountStr = lbNeedQty.Text.Trim(); int realCount = 0; int sizeCount = 0; int.TryParse(realCountStr, out realCount); int.TryParse(sizeCountStr, out sizeCount); - if (realCount != 0 && realCount == sizeCount) + if ((realCount != 0 && realCount == sizeCount) || (isAutoPrint == false && handPrint==true)) { lbPackageCode.Text = ""; lbCurrentlQty.Text = "0"; @@ -5113,6 +4782,10 @@ namespace InjectionPC comBoxSizeR.Enabled = true; } } + else + { + MessageBox.Show("密码错误"); + } }; frm.Controls.Add(tb); frm.Controls.Add(bt); diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index c37448c..d58764a 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -24,6 +24,7 @@ namespace PaintingPC private static string position = "", reason = ""; private bool _isWmsQuality = false ; private string _carType = string.Empty; + private Dictionary _lastJustDict = new Dictionary(); public FrmQuality(bool isWmsQuality) { InitializeComponent(); @@ -266,56 +267,6 @@ namespace PaintingPC } } - /// - /// 抛光按钮 - /// - /// - /// - //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()); - //} - /// /// 合格 /// @@ -328,16 +279,44 @@ namespace PaintingPC MessageBox.Show("请先扫描数据,然后操作."); return; } + ShowHint(""); #region 判断产品是否有颜色 string colorName = string.Empty; string partName = string.Empty; if (CheckColor(ref colorName,ref partName) == false) return; + #endregion ClearControlColor(SetControlGroup()); btnAbt.BackColor = Color.Red; + + string lastRst = GetLastInspectRst(txtBarCode.Text.Trim()); + if (lastRst.Contains("合格")) + { + MessageBox.Show("条码已判定为合格，无需重复判定"); + Clear(); + return; + } + //保存 SaveInspect("合格", colorName, partName); + + try + { + SendToWms(txtBarCode.Text.Trim(), 1); + } + catch (Exception ex) + { + ShowHint("合格WMS报工异常,原因:" + ex.Message); + MessageBox.Show("合格WMS报工异常,原因:" + ex.Message); + LogHelper.WriteErrLogBase("合格WMS报工调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + + + Clear(); + } + void Clear() + { ClearPage(); ClearTxtBarcode(); txtBarCode.TabIndex = 0; @@ -355,8 +334,9 @@ namespace PaintingPC MessageBox.Show("请先扫描数据,然后操作."); return; } + if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行不良判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; - + ShowHint(""); #region 必须选择缺陷位置与缺陷原因，否则无法保存 if (CheckDefect() == false) return; #endregion @@ -366,6 +346,13 @@ namespace PaintingPC string partName = string.Empty; if (CheckColor(ref colorName, ref partName) == false) return; #endregion + string lastRst = GetLastInspectRst(txtBarCode.Text.Trim()); + if (lastRst.Contains("不良")) + { + MessageBox.Show("条码已判定为不合格，无需重复判定"); + Clear(); + return; + } //保存 SaveInspect("不良", colorName, partName); ClearPage(); @@ -386,16 +373,12 @@ namespace PaintingPC MessageBox.Show("请先扫描数据,然后操作."); return; } + if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行返喷操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; - + ShowHint(""); 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) @@ -413,24 +396,38 @@ namespace PaintingPC if (CheckColor(ref colorName, ref partName) == false) return; #endregion - - - ClearControlColor(SetControlGroup()); btnRepair.BackColor = Color.Yellow; + + string lastRst = GetLastInspectRst(txtBarCode.Text.Trim()); + if (lastRst.Contains("打磨")) + { + MessageBox.Show("条码已判定为返喷，无需重复判定"); + Clear(); + return; + } + string s = _isWmsQuality == false ? "打磨" : "WMS打磨"; + //保存 SaveInspect(s, colorName, partName); - ClearPage(); - ClearTxtBarcode(); - txtBarCode.TabIndex = 0; + + try + { + SendToWms(txtBarCode.Text.Trim(), 9); + } + catch (Exception ex) + { + ShowHint("返喷WMS报工异常,原因:" + ex.Message); + MessageBox.Show("返喷WMS报工异常,原因:" + ex.Message); + LogHelper.WriteErrLogBase("返喷WMS报工调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + Clear(); } else { MessageBox.Show("根据该零件可回喷次数设置，不能判定为打磨或已超过打磨次数！"); - ClearPage(); - ClearTxtBarcode(); - txtBarCode.TabIndex = 0; + Clear(); return; } @@ -449,8 +446,9 @@ namespace PaintingPC MessageBox.Show("请先扫描数据,然后操作."); return; } + if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行报废操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; - + ShowHint(""); #region 必须选择缺陷位置与缺陷原因，否则无法保存 if (CheckDefect() == false) return; #endregion @@ -461,15 +459,20 @@ namespace PaintingPC if (CheckColor(ref colorName, ref partName) == false) return; #endregion - DataTable inspectTable = Function. GetInspectInfoByBarCode2(txtBarCode.Text.Trim()); - if(inspectTable.Rows.Count>0) + string lastRst = GetLastInspectRst(txtBarCode.Text.Trim()); + if (lastRst.Contains("合格")) { - if (inspectTable.Rows[0]["inspectResult"].ToString().Contains("合格")) - { - MessageBox.Show("条码已判定为合格，无法重新判定为报废"); - return ; - } + MessageBox.Show("条码已判定为合格，无法重新判定为报废"); + Clear(); + return; } + if (lastRst.Contains("报废")) + { + MessageBox.Show("条码已判定为报废，无需重复报废"); + Clear(); + return; + } + ClearControlColor(SetControlGroup()); btnAbt.BackColor = Color.Red; string id = SaveInspect("报废", colorName, partName); @@ -477,24 +480,26 @@ namespace PaintingPC try { - WMSWebService webService = new WMSWebService(); - webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString(); - //webService.Timeout = 1200000; - - string errorReason = ""; - bool rst = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(txtBarCode.Text.Trim()), 0, out errorReason); - if(rst == false) - { - - if (!string.IsNullOrEmpty(id)) - { - LogHelper.WriteErrLogBase($"质检调用WMS接口失败,删除条码为[{txtBarCode.Text}]的质检记录", MethodBase.GetCurrentMethod().Name); - - Function.DelInspectRst(id); - } - MessageBox.Show("报废操作失败,原因:"+ errorReason); - return; - } + SendToWms(txtBarCode.Text.Trim(), 0); + + // WMSWebService webService = new WMSWebService(); + // webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString(); + // //webService.Timeout = 1200000; + + // string errorReason = ""; + //bool rst = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(txtBarCode.Text.Trim()), 0, out errorReason); + //if(rst == false) + // { + + // if (!string.IsNullOrEmpty(id)) + // { + // LogHelper.WriteErrLogBase($"质检调用WMS接口失败,删除条码为[{txtBarCode.Text}]的质检记录", MethodBase.GetCurrentMethod().Name); + + // Function.DelInspectRst(id); + // } + // MessageBox.Show("报废操作失败,原因:"+ errorReason); + // return; + // } } catch (Exception ex) @@ -512,6 +517,53 @@ namespace PaintingPC //ClearControlColor(SetControlGroup()); } /// + /// + /// + /// + /// + string GetLastInspectRst(string barCode) + { + DataTable inspectTable = Function.GetInspectInfoByBarCode2(txtBarCode.Text.Trim()); + if (inspectTable.Rows.Count > 0) + { + return inspectTable.Rows[0]["inspectResult"].ToString(); + } + return ""; + } + + /// + /// 发送wms罢工 + /// + /// + /// 0:报废 1:合格 9:返喷 + void SendToWms(string scanBarCode, int isOk) + { + + WMSWebService webService = new WMSWebService(); + webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString(); + //webService.Timeout = 1200000; + string errorReason = ""; + //上次异常提交 + if (_lastJustDict.Count > 0) + { + bool rst2 = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(_lastJustDict.First().Key), int.Parse( _lastJustDict.First().Value), out errorReason); + } + + + bool rst = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(scanBarCode), isOk, out errorReason); + if (rst == false) + { + ShowHint("WMS报工接口调用失败: " + errorReason); + + _lastJustDict.Clear(); + _lastJustDict.Add(scanBarCode, isOk.ToString()); + + return; + } + _lastJustDict.Clear(); + + } + /// /// 判断产品是否有颜色 /// /// @@ -655,12 +707,16 @@ namespace PaintingPC } catch (Exception ex) { + ShowHint("质检提交异常,原因:" + ex.Message); LogHelper.WriteErrLogBase("质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); MessageBox.Show("质检提交异常,原因:" + ex.Message); return null; } } - + void ShowHint(string txt) + { + lbForeig.Text = txt; + } public void ClearInspect() { //缺陷位置 @@ -967,7 +1023,7 @@ namespace PaintingPC string[] info = Function.GetProductInfo2(barcode,ref paintError).Split('，'); if (!string.IsNullOrEmpty(paintError)) { - lbForeig.Text = paintError; + ShowHint(paintError); } labProductInfo.Text = info[0] + "，" + info[1]; paintId = info[2]; @@ -1048,10 +1104,6 @@ namespace PaintingPC { labProductInfo.Tag = null; labProductInfo.Text = ""; - //labFirstCheck.Text = ""; - //labSecondCheck.Text = ""; - //labThirdCheck.Text = ""; - //btnPass.BackColor = Color.LightGray; btnAbt.BackColor = Color.LightGray; btnRepair.BackColor = Color.LightGray; @@ -1140,6 +1192,7 @@ namespace PaintingPC private void UpdateSoftware() { + return; var serverUrl = "http://10.60.101.59:8013/"; var updateXmlFileName = "PaintingUpdatePC.xml"; var updater = new AutoUpdater(); diff --git a/WebService/Function.cs b/WebService/Function.cs index b9615bf..08afe87 100644 --- a/WebService/Function.cs +++ b/WebService/Function.cs @@ -1178,7 +1178,7 @@ namespace Webservice /// 是否允许发送给wms 是否质检等判断 /// /// - /// 0-不合格;1-合格 + /// 0-不合格;1-合格 9-返喷 /// static bool AllowSendToWms(string oneBarCode, int state, ref int pRepaint,ref string errorMssg ,ref string paintColor, ref string colorName, ref string productName,ref string carType) @@ -1215,7 +1215,7 @@ namespace Webservice rePaint = 0; } pRepaint = rePaint; - //不合格 返喷=0 有报工记录不能重发 + //不合格0 有报工记录不能重发 if (state == 0) { if (inspectTable.Rows[0]["inspectResult"].ToString().Contains("报废") == false) @@ -1232,14 +1232,14 @@ namespace Webservice } } } - //合格 返喷=0 最近一条是报废记录,可以重发. 否则不可以. + //合格 1 最近一条是报废记录,可以重发. 否则不可以. else if (state == 1) { - if(inspectTable.Rows[0]["inspectResult"].ToString().Contains("合格") ==false) - { - errorMssg = $"条码[{oneBarCode}]质检记录是[{inspectTable.Rows[0]["inspectResult"].ToString()}]状态,无法合格报工."; - return false; - } + //if(inspectTable.Rows[0]["inspectResult"].ToString().Contains("合格") ==false) + //{ + // errorMssg = $"条码[{oneBarCode}]质检记录是[{inspectTable.Rows[0]["inspectResult"].ToString()}]状态,无法合格报工."; + // return false; + //} if (rePaint == 0) //没返喷的合格, { if (IsStockInAll(oneBarCode)) @@ -1262,6 +1262,10 @@ namespace Webservice { return true; } + if (lastRst.Contains("打磨")) //允许返喷二次判定为合格 + { + return true; + } errorMssg = $"条码[{oneBarCode}]存在返喷报工,不能重新报工."; return false; } diff --git a/WebService/WMSWebService.asmx.cs b/WebService/WMSWebService.asmx.cs index 376a357..89d25df 100644 --- a/WebService/WMSWebService.asmx.cs +++ b/WebService/WMSWebService.asmx.cs @@ -78,6 +78,16 @@ namespace Webservice Context.Response.Write(res); } + [WebMethod] + [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)] + public string WMSSprayingForCSForTest(string barcode, int isOK) + { + string errorReason = string.Empty; + bool b = WMSSprayingForCS(barcode, isOK, out errorReason); + if (string.IsNullOrEmpty(errorReason)) + return "true"; + return errorReason; + } /// /// 调用WMS接口03