From df2a52876e5973244556c84144d58a9fc4a85e29 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Tue, 20 May 2025 10:07:18 +0800 Subject: [PATCH] 1 --- PaintingPC/FrmSecondCheck.Designer.cs | 170 +++++++++++----------- PaintingPC/FrmSecondCheck.cs | 65 +++++---- PaintingPC/FrmSecondCheckSpec.Designer.cs | 158 ++++++++++---------- PaintingPC/Function.cs | 69 +++++++-- PaintingPC/Properties/AssemblyInfo.cs | 4 +- 5 files changed, 258 insertions(+), 208 deletions(-) diff --git a/PaintingPC/FrmSecondCheck.Designer.cs b/PaintingPC/FrmSecondCheck.Designer.cs index 28a74a7..bbf4155 100644 --- a/PaintingPC/FrmSecondCheck.Designer.cs +++ b/PaintingPC/FrmSecondCheck.Designer.cs @@ -64,10 +64,10 @@ // this.labChangeColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labChangeColor.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labChangeColor.Location = new System.Drawing.Point(1445, 125); - this.labChangeColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labChangeColor.Location = new System.Drawing.Point(1987, 175); + this.labChangeColor.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labChangeColor.Name = "labChangeColor"; - this.labChangeColor.Size = new System.Drawing.Size(247, 88); + this.labChangeColor.Size = new System.Drawing.Size(340, 123); this.labChangeColor.TabIndex = 25; this.labChangeColor.Text = "修改颜色"; this.labChangeColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -79,10 +79,10 @@ // this.labelVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labelVersion.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labelVersion.Location = new System.Drawing.Point(1191, 124); - this.labelVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelVersion.Location = new System.Drawing.Point(1638, 174); + this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labelVersion.Name = "labelVersion"; - this.labelVersion.Size = new System.Drawing.Size(247, 88); + this.labelVersion.Size = new System.Drawing.Size(340, 123); this.labelVersion.TabIndex = 24; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -90,10 +90,10 @@ // this.labStation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labStation.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labStation.Location = new System.Drawing.Point(936, 124); - this.labStation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labStation.Location = new System.Drawing.Point(1287, 174); + this.labStation.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labStation.Name = "labStation"; - this.labStation.Size = new System.Drawing.Size(247, 88); + this.labStation.Size = new System.Drawing.Size(340, 123); this.labStation.TabIndex = 23; this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -101,10 +101,10 @@ // this.labWorkClass.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labWorkClass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labWorkClass.Location = new System.Drawing.Point(681, 124); - this.labWorkClass.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labWorkClass.Location = new System.Drawing.Point(936, 174); + this.labWorkClass.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labWorkClass.Name = "labWorkClass"; - this.labWorkClass.Size = new System.Drawing.Size(247, 88); + this.labWorkClass.Size = new System.Drawing.Size(340, 123); this.labWorkClass.TabIndex = 22; this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click); @@ -113,10 +113,10 @@ // this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo3.Location = new System.Drawing.Point(459, 124); - this.rdo3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.rdo3.Location = new System.Drawing.Point(631, 174); + this.rdo3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.rdo3.Name = "rdo3"; - this.rdo3.Size = new System.Drawing.Size(212, 88); + this.rdo3.Size = new System.Drawing.Size(292, 123); this.rdo3.TabIndex = 21; this.rdo3.Text = "项目调试"; this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -126,10 +126,10 @@ // this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo2.Location = new System.Drawing.Point(237, 124); - this.rdo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.rdo2.Location = new System.Drawing.Point(326, 174); + this.rdo2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.rdo2.Name = "rdo2"; - this.rdo2.Size = new System.Drawing.Size(212, 88); + this.rdo2.Size = new System.Drawing.Size(292, 123); this.rdo2.TabIndex = 20; this.rdo2.Text = "量产调试"; this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -140,10 +140,10 @@ this.rdo1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); this.rdo1.Checked = true; this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo1.Location = new System.Drawing.Point(16, 124); - this.rdo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.rdo1.Location = new System.Drawing.Point(22, 174); + this.rdo1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.rdo1.Name = "rdo1"; - this.rdo1.Size = new System.Drawing.Size(212, 88); + this.rdo1.Size = new System.Drawing.Size(292, 123); this.rdo1.TabIndex = 19; this.rdo1.TabStop = true; this.rdo1.Text = "正式量产"; @@ -154,10 +154,10 @@ // this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTime.Location = new System.Drawing.Point(1359, 11); - this.labTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labTime.Location = new System.Drawing.Point(1869, 15); + this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(333, 104); + this.labTime.Size = new System.Drawing.Size(457, 145); this.labTime.TabIndex = 18; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -166,10 +166,10 @@ // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(16, 11); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox1.Location = new System.Drawing.Point(22, 15); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(211, 104); + this.pictureBox1.Size = new System.Drawing.Size(289, 145); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 17; this.pictureBox1.TabStop = false; @@ -178,28 +178,28 @@ // this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTitle.Location = new System.Drawing.Point(215, 11); - this.labTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labTitle.Location = new System.Drawing.Point(296, 15); + this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labTitle.Name = "labTitle"; - this.labTitle.Size = new System.Drawing.Size(1147, 104); + this.labTitle.Size = new System.Drawing.Size(1576, 145); this.labTitle.TabIndex = 16; this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // panel2 // this.panel2.AutoScroll = true; - this.panel2.Location = new System.Drawing.Point(16, 762); - this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel2.Location = new System.Drawing.Point(22, 1067); + this.panel2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1329, 331); + this.panel2.Size = new System.Drawing.Size(1827, 463); this.panel2.TabIndex = 48; // // pictureBox2 // - this.pictureBox2.Location = new System.Drawing.Point(16, 321); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox2.Location = new System.Drawing.Point(22, 449); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(1329, 438); + this.pictureBox2.Size = new System.Drawing.Size(1827, 613); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox2.TabIndex = 47; this.pictureBox2.TabStop = false; @@ -208,10 +208,10 @@ // this.label15.BackColor = System.Drawing.Color.Lime; this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(16, 219); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Location = new System.Drawing.Point(22, 307); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(212, 94); + this.label15.Size = new System.Drawing.Size(292, 132); this.label15.TabIndex = 49; this.label15.Text = "扫码信息"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -220,10 +220,10 @@ // this.labProductInfo.BackColor = System.Drawing.Color.White; this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProductInfo.Location = new System.Drawing.Point(1024, 219); - this.labProductInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labProductInfo.Location = new System.Drawing.Point(1408, 307); + this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labProductInfo.Name = "labProductInfo"; - this.labProductInfo.Size = new System.Drawing.Size(667, 94); + this.labProductInfo.Size = new System.Drawing.Size(917, 132); this.labProductInfo.TabIndex = 52; this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -231,10 +231,10 @@ // this.label2.BackColor = System.Drawing.Color.Lime; this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(804, 219); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(1106, 307); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(212, 94); + this.label2.Size = new System.Drawing.Size(292, 132); this.label2.TabIndex = 51; this.label2.Text = "产品信息"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -243,10 +243,10 @@ // this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label8.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(1353, 404); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(1860, 566); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(337, 88); + this.label8.Size = new System.Drawing.Size(463, 123); this.label8.TabIndex = 53; this.label8.Text = "一检结果"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -255,10 +255,10 @@ // this.labFirstCheck.BackColor = System.Drawing.Color.White; this.labFirstCheck.Font = new System.Drawing.Font("黑体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labFirstCheck.Location = new System.Drawing.Point(1353, 499); - this.labFirstCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labFirstCheck.Location = new System.Drawing.Point(1860, 699); + this.labFirstCheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labFirstCheck.Name = "labFirstCheck"; - this.labFirstCheck.Size = new System.Drawing.Size(337, 132); + this.labFirstCheck.Size = new System.Drawing.Size(463, 185); this.labFirstCheck.TabIndex = 54; this.labFirstCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -266,10 +266,10 @@ // this.labSecondCheck.BackColor = System.Drawing.Color.White; this.labSecondCheck.Font = new System.Drawing.Font("黑体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labSecondCheck.Location = new System.Drawing.Point(1353, 730); - this.labSecondCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labSecondCheck.Location = new System.Drawing.Point(1860, 1022); + this.labSecondCheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labSecondCheck.Name = "labSecondCheck"; - this.labSecondCheck.Size = new System.Drawing.Size(337, 132); + this.labSecondCheck.Size = new System.Drawing.Size(463, 185); this.labSecondCheck.TabIndex = 56; this.labSecondCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -277,10 +277,10 @@ // this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label7.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(1353, 638); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(1860, 893); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(337, 88); + this.label7.Size = new System.Drawing.Size(463, 123); this.label7.TabIndex = 55; this.label7.Text = "二检结果"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -289,10 +289,10 @@ // this.labThirdCheck.BackColor = System.Drawing.Color.White; this.labThirdCheck.Font = new System.Drawing.Font("黑体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labThirdCheck.Location = new System.Drawing.Point(1355, 961); - this.labThirdCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labThirdCheck.Location = new System.Drawing.Point(1863, 1345); + this.labThirdCheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labThirdCheck.Name = "labThirdCheck"; - this.labThirdCheck.Size = new System.Drawing.Size(337, 132); + this.labThirdCheck.Size = new System.Drawing.Size(463, 185); this.labThirdCheck.TabIndex = 58; this.labThirdCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -300,10 +300,10 @@ // this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label10.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(1355, 868); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(1863, 1215); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(337, 88); + this.label10.Size = new System.Drawing.Size(463, 123); this.label10.TabIndex = 57; this.label10.Text = "三检结果"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -312,10 +312,10 @@ // this.btnPass.BackColor = System.Drawing.Color.Yellow; this.btnPass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPass.Location = new System.Drawing.Point(899, 1120); - this.btnPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnPass.Location = new System.Drawing.Point(1236, 1568); + this.btnPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.btnPass.Name = "btnPass"; - this.btnPass.Size = new System.Drawing.Size(360, 145); + this.btnPass.Size = new System.Drawing.Size(495, 203); this.btnPass.TabIndex = 59; this.btnPass.Text = "抛光合格"; this.btnPass.UseVisualStyleBackColor = false; @@ -325,10 +325,10 @@ // this.btnRepair.BackColor = System.Drawing.Color.LimeGreen; this.btnRepair.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRepair.Location = new System.Drawing.Point(459, 1119); - this.btnRepair.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnRepair.Location = new System.Drawing.Point(631, 1567); + this.btnRepair.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.btnRepair.Name = "btnRepair"; - this.btnRepair.Size = new System.Drawing.Size(360, 145); + this.btnRepair.Size = new System.Drawing.Size(495, 203); this.btnRepair.TabIndex = 60; this.btnRepair.Text = "二次返修"; this.btnRepair.UseVisualStyleBackColor = false; @@ -338,10 +338,10 @@ // this.btnAbt.BackColor = System.Drawing.Color.Red; this.btnAbt.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAbt.Location = new System.Drawing.Point(1331, 1119); - this.btnAbt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAbt.Location = new System.Drawing.Point(1830, 1567); + this.btnAbt.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.btnAbt.Name = "btnAbt"; - this.btnAbt.Size = new System.Drawing.Size(360, 145); + this.btnAbt.Size = new System.Drawing.Size(495, 203); this.btnAbt.TabIndex = 61; this.btnAbt.Text = "抛光报废"; this.btnAbt.UseVisualStyleBackColor = false; @@ -351,10 +351,10 @@ // this.txtBarCode.BackColor = System.Drawing.Color.White; this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBarCode.Location = new System.Drawing.Point(237, 234); - this.txtBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtBarCode.Location = new System.Drawing.Point(326, 328); + this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.txtBarCode.Name = "txtBarCode"; - this.txtBarCode.Size = new System.Drawing.Size(557, 65); + this.txtBarCode.Size = new System.Drawing.Size(764, 87); this.txtBarCode.TabIndex = 0; this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown); @@ -363,10 +363,10 @@ // this.btnFirstPass.BackColor = System.Drawing.Color.Green; this.btnFirstPass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFirstPass.Location = new System.Drawing.Point(16, 1119); - this.btnFirstPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnFirstPass.Location = new System.Drawing.Point(22, 1567); + this.btnFirstPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.btnFirstPass.Name = "btnFirstPass"; - this.btnFirstPass.Size = new System.Drawing.Size(360, 145); + this.btnFirstPass.Size = new System.Drawing.Size(495, 203); this.btnFirstPass.TabIndex = 63; this.btnFirstPass.Text = "一次合格"; this.btnFirstPass.UseVisualStyleBackColor = false; @@ -376,18 +376,18 @@ // this.labProPosition.BackColor = System.Drawing.Color.White; this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProPosition.Location = new System.Drawing.Point(1353, 321); - this.labProPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labProPosition.Location = new System.Drawing.Point(1860, 449); + this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labProPosition.Name = "labProPosition"; - this.labProPosition.Size = new System.Drawing.Size(337, 75); + this.labProPosition.Size = new System.Drawing.Size(463, 105); this.labProPosition.TabIndex = 64; this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // FrmSecondCheck // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1707, 1280); + this.ClientSize = new System.Drawing.Size(2347, 1792); this.Controls.Add(this.labProPosition); this.Controls.Add(this.btnFirstPass); this.Controls.Add(this.txtBarCode); @@ -415,8 +415,8 @@ this.Controls.Add(this.labTime); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.labTitle); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.Name = "FrmSecondCheck"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmSecondCheck"; diff --git a/PaintingPC/FrmSecondCheck.cs b/PaintingPC/FrmSecondCheck.cs index 594f9c1..2b52394 100644 --- a/PaintingPC/FrmSecondCheck.cs +++ b/PaintingPC/FrmSecondCheck.cs @@ -710,37 +710,40 @@ namespace PaintingPC #region 加载图片 - //try - //{ - // DataTable dt = Function.SearchInfoByBarCode(barcode); - - // if (dt != null && dt.Rows.Count > 0) - // { - // row = Convert.ToInt32(dt.Rows[0]["Rows"].ToString()); - // col = Convert.ToInt32(dt.Rows[0]["Cols"].ToString()); - // picture = dt.Rows[0]["PicturePath"].ToString(); - // } - // dt.Dispose(); - - // if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) - // { - - // string strImageURL = Function.GetImgPath() + picture; - - // System.Net.WebClient webClient = new System.Net.WebClient(); - // webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); - - // } - // FileStream fs = new FileStream(System.Environment.CurrentDirectory + "\\" + picture, FileMode.Open, - // FileAccess.Read);//获取图片文件流 - // Image img = Image.FromStream(fs); // 文件流转换成Image格式 - // pictureBox2.Image = img; //给 图片框设置要显示的图片 - // fs.Close(); // 关闭流，释放图片资源 - //} - //catch (Exception ex) - //{ - // LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); - //} + try + { + DataTable dt = Function.SearchInfoByBarCode(barcode); + + if (dt != null && dt.Rows.Count > 0) + { + row = Convert.ToInt32(dt.Rows[0]["Rows"].ToString()); + col = Convert.ToInt32(dt.Rows[0]["Cols"].ToString()); + picture = dt.Rows[0]["PicturePath"].ToString(); + } + dt.Dispose(); + if (!string.IsNullOrEmpty(picture)) + { + if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) + { + + string strImageURL = Function.GetImgPath() + picture; + + System.Net.WebClient webClient = new System.Net.WebClient(); + webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); + + } + FileStream fs = new FileStream(System.Environment.CurrentDirectory + "\\" + picture, FileMode.Open, + FileAccess.Read);//获取图片文件流 + Image img = Image.FromStream(fs); // 文件流转换成Image格式 + pictureBox2.Image = img; //给 图片框设置要显示的图片 + fs.Close(); // 关闭流，释放图片资源 + } + + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } #endregion diff --git a/PaintingPC/FrmSecondCheckSpec.Designer.cs b/PaintingPC/FrmSecondCheckSpec.Designer.cs index 25a1ccf..ac64a3c 100644 --- a/PaintingPC/FrmSecondCheckSpec.Designer.cs +++ b/PaintingPC/FrmSecondCheckSpec.Designer.cs @@ -62,10 +62,10 @@ // this.labChangeColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labChangeColor.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labChangeColor.Location = new System.Drawing.Point(1215, 124); - this.labChangeColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labChangeColor.Location = new System.Drawing.Point(1671, 174); + this.labChangeColor.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labChangeColor.Name = "labChangeColor"; - this.labChangeColor.Size = new System.Drawing.Size(143, 88); + this.labChangeColor.Size = new System.Drawing.Size(197, 123); this.labChangeColor.TabIndex = 25; this.labChangeColor.Text = "修改颜色"; this.labChangeColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -77,10 +77,10 @@ // this.labelVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labelVersion.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labelVersion.Location = new System.Drawing.Point(937, 124); - this.labelVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelVersion.Location = new System.Drawing.Point(1288, 174); + this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labelVersion.Name = "labelVersion"; - this.labelVersion.Size = new System.Drawing.Size(269, 88); + this.labelVersion.Size = new System.Drawing.Size(370, 123); this.labelVersion.TabIndex = 24; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -88,10 +88,10 @@ // this.labStation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labStation.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labStation.Location = new System.Drawing.Point(816, 124); - this.labStation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labStation.Location = new System.Drawing.Point(1122, 174); + this.labStation.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labStation.Name = "labStation"; - this.labStation.Size = new System.Drawing.Size(116, 88); + this.labStation.Size = new System.Drawing.Size(160, 123); this.labStation.TabIndex = 23; this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -99,10 +99,10 @@ // this.labWorkClass.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labWorkClass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labWorkClass.Location = new System.Drawing.Point(681, 124); - this.labWorkClass.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labWorkClass.Location = new System.Drawing.Point(936, 174); + this.labWorkClass.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labWorkClass.Name = "labWorkClass"; - this.labWorkClass.Size = new System.Drawing.Size(129, 88); + this.labWorkClass.Size = new System.Drawing.Size(177, 123); this.labWorkClass.TabIndex = 22; this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click); @@ -111,10 +111,10 @@ // this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo3.Location = new System.Drawing.Point(459, 124); - this.rdo3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.rdo3.Location = new System.Drawing.Point(631, 174); + this.rdo3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.rdo3.Name = "rdo3"; - this.rdo3.Size = new System.Drawing.Size(212, 88); + this.rdo3.Size = new System.Drawing.Size(292, 123); this.rdo3.TabIndex = 21; this.rdo3.Text = "项目调试"; this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -124,10 +124,10 @@ // this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo2.Location = new System.Drawing.Point(237, 124); - this.rdo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.rdo2.Location = new System.Drawing.Point(326, 174); + this.rdo2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.rdo2.Name = "rdo2"; - this.rdo2.Size = new System.Drawing.Size(212, 88); + this.rdo2.Size = new System.Drawing.Size(292, 123); this.rdo2.TabIndex = 20; this.rdo2.Text = "量产调试"; this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -138,10 +138,10 @@ this.rdo1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); this.rdo1.Checked = true; this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo1.Location = new System.Drawing.Point(16, 124); - this.rdo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.rdo1.Location = new System.Drawing.Point(22, 174); + this.rdo1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.rdo1.Name = "rdo1"; - this.rdo1.Size = new System.Drawing.Size(212, 88); + this.rdo1.Size = new System.Drawing.Size(292, 123); this.rdo1.TabIndex = 19; this.rdo1.TabStop = true; this.rdo1.Text = "正式量产"; @@ -152,10 +152,10 @@ // this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTime.Location = new System.Drawing.Point(1024, 11); - this.labTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labTime.Location = new System.Drawing.Point(1408, 15); + this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(333, 104); + this.labTime.Size = new System.Drawing.Size(457, 145); this.labTime.TabIndex = 18; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -164,10 +164,10 @@ // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(16, 11); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox1.Location = new System.Drawing.Point(22, 15); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(211, 104); + this.pictureBox1.Size = new System.Drawing.Size(289, 145); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 17; this.pictureBox1.TabStop = false; @@ -176,27 +176,27 @@ // this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTitle.Location = new System.Drawing.Point(215, 11); - this.labTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labTitle.Location = new System.Drawing.Point(296, 15); + this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labTitle.Name = "labTitle"; - this.labTitle.Size = new System.Drawing.Size(801, 104); + this.labTitle.Size = new System.Drawing.Size(1101, 145); this.labTitle.TabIndex = 16; this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // panel2 // - this.panel2.Location = new System.Drawing.Point(16, 608); - this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel2.Location = new System.Drawing.Point(22, 851); + this.panel2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1125, 352); + this.panel2.Size = new System.Drawing.Size(1547, 493); this.panel2.TabIndex = 48; // // pictureBox2 // - this.pictureBox2.Location = new System.Drawing.Point(16, 321); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox2.Location = new System.Drawing.Point(22, 449); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(1125, 279); + this.pictureBox2.Size = new System.Drawing.Size(1547, 391); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox2.TabIndex = 47; this.pictureBox2.TabStop = false; @@ -205,10 +205,10 @@ // this.label15.BackColor = System.Drawing.Color.Lime; this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(16, 219); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Location = new System.Drawing.Point(22, 307); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(212, 94); + this.label15.Size = new System.Drawing.Size(292, 132); this.label15.TabIndex = 49; this.label15.Text = "扫码信息"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -217,10 +217,10 @@ // this.labProductInfo.BackColor = System.Drawing.Color.White; this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProductInfo.Location = new System.Drawing.Point(927, 219); - this.labProductInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labProductInfo.Location = new System.Drawing.Point(1275, 307); + this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labProductInfo.Name = "labProductInfo"; - this.labProductInfo.Size = new System.Drawing.Size(432, 94); + this.labProductInfo.Size = new System.Drawing.Size(594, 132); this.labProductInfo.TabIndex = 52; this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -228,10 +228,10 @@ // this.label2.BackColor = System.Drawing.Color.Lime; this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(804, 219); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(1106, 307); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(120, 94); + this.label2.Size = new System.Drawing.Size(165, 132); this.label2.TabIndex = 51; this.label2.Text = "产品信息"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -240,10 +240,10 @@ // this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label8.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(1147, 382); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(1577, 535); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(212, 60); + this.label8.Size = new System.Drawing.Size(292, 84); this.label8.TabIndex = 53; this.label8.Text = "一检结果"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -252,10 +252,10 @@ // this.labFirstCheck.BackColor = System.Drawing.Color.White; this.labFirstCheck.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labFirstCheck.Location = new System.Drawing.Point(1147, 441); - this.labFirstCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labFirstCheck.Location = new System.Drawing.Point(1577, 617); + this.labFirstCheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labFirstCheck.Name = "labFirstCheck"; - this.labFirstCheck.Size = new System.Drawing.Size(212, 90); + this.labFirstCheck.Size = new System.Drawing.Size(292, 126); this.labFirstCheck.TabIndex = 54; this.labFirstCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -263,10 +263,10 @@ // this.labSecondCheck.BackColor = System.Drawing.Color.White; this.labSecondCheck.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labSecondCheck.Location = new System.Drawing.Point(1147, 589); - this.labSecondCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labSecondCheck.Location = new System.Drawing.Point(1577, 825); + this.labSecondCheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labSecondCheck.Name = "labSecondCheck"; - this.labSecondCheck.Size = new System.Drawing.Size(212, 84); + this.labSecondCheck.Size = new System.Drawing.Size(292, 118); this.labSecondCheck.TabIndex = 56; this.labSecondCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -274,10 +274,10 @@ // this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label7.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(1149, 534); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(1580, 748); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(209, 50); + this.label7.Size = new System.Drawing.Size(287, 70); this.label7.TabIndex = 55; this.label7.Text = "二检结果"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -286,10 +286,10 @@ // this.labThirdCheck.BackColor = System.Drawing.Color.White; this.labThirdCheck.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labThirdCheck.Location = new System.Drawing.Point(1145, 726); - this.labThirdCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labThirdCheck.Location = new System.Drawing.Point(1574, 1016); + this.labThirdCheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labThirdCheck.Name = "labThirdCheck"; - this.labThirdCheck.Size = new System.Drawing.Size(213, 75); + this.labThirdCheck.Size = new System.Drawing.Size(293, 105); this.labThirdCheck.TabIndex = 58; this.labThirdCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -297,10 +297,10 @@ // this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label10.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(1147, 676); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(1577, 946); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(212, 46); + this.label10.Size = new System.Drawing.Size(292, 64); this.label10.TabIndex = 57; this.label10.Text = "三检结果"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -309,10 +309,10 @@ // this.btnPass.BackColor = System.Drawing.Color.LightGray; this.btnPass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPass.Location = new System.Drawing.Point(1153, 804); - this.btnPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnPass.Location = new System.Drawing.Point(1585, 1126); + this.btnPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.btnPass.Name = "btnPass"; - this.btnPass.Size = new System.Drawing.Size(95, 155); + this.btnPass.Size = new System.Drawing.Size(131, 217); this.btnPass.TabIndex = 59; this.btnPass.Text = "抛光合格"; this.btnPass.UseVisualStyleBackColor = false; @@ -322,10 +322,10 @@ // this.btnAbt.BackColor = System.Drawing.Color.LightGray; this.btnAbt.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAbt.Location = new System.Drawing.Point(1263, 804); - this.btnAbt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAbt.Location = new System.Drawing.Point(1737, 1126); + this.btnAbt.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.btnAbt.Name = "btnAbt"; - this.btnAbt.Size = new System.Drawing.Size(89, 155); + this.btnAbt.Size = new System.Drawing.Size(122, 217); this.btnAbt.TabIndex = 61; this.btnAbt.Text = "抛光报废"; this.btnAbt.UseVisualStyleBackColor = false; @@ -335,10 +335,10 @@ // this.txtBarCode.BackColor = System.Drawing.Color.White; this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBarCode.Location = new System.Drawing.Point(237, 234); - this.txtBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtBarCode.Location = new System.Drawing.Point(326, 328); + this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.txtBarCode.Name = "txtBarCode"; - this.txtBarCode.Size = new System.Drawing.Size(557, 65); + this.txtBarCode.Size = new System.Drawing.Size(764, 87); this.txtBarCode.TabIndex = 0; this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown); @@ -347,18 +347,18 @@ // this.labProPosition.BackColor = System.Drawing.Color.White; this.labProPosition.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProPosition.Location = new System.Drawing.Point(1145, 321); - this.labProPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labProPosition.Location = new System.Drawing.Point(1574, 449); + this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.labProPosition.Name = "labProPosition"; - this.labProPosition.Size = new System.Drawing.Size(212, 61); + this.labProPosition.Size = new System.Drawing.Size(292, 85); this.labProPosition.TabIndex = 62; this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // FrmSecondCheckSpec // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1365, 960); + this.ClientSize = new System.Drawing.Size(1877, 1344); this.Controls.Add(this.labProPosition); this.Controls.Add(this.txtBarCode); this.Controls.Add(this.btnAbt); @@ -384,8 +384,8 @@ this.Controls.Add(this.labTime); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.labTitle); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.Name = "FrmSecondCheckSpec"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmSecondCheck"; diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs index b1956e4..f0be000 100644 --- a/PaintingPC/Function.cs +++ b/PaintingPC/Function.cs @@ -1118,6 +1118,7 @@ namespace PaintingPC string colorNo = ""; string colorQQNo = ""; string colorPRNo = ""; + string side1BarCode = ""; //if (aa != null) //{ // colorNo = aa.ToString(); @@ -1127,6 +1128,7 @@ namespace PaintingPC colorNo = dtColor.Rows[0]["Setvalue_BC_Color_No"].ToString(); colorQQNo = dtColor.Rows[0]["Setvalue_CC_Color_No"].ToString(); colorPRNo = dtColor.Rows[0]["Setvalue_PR_Color_No"].ToString(); + side1BarCode = barcode; } //根据颜色代码查颜色 @@ -1134,22 +1136,67 @@ namespace PaintingPC if (!string.IsNullOrWhiteSpace(colorNo)) { DataTable dt = new DataTable(); - //string sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "' "; - string sql_c = ""; - if (!string.IsNullOrWhiteSpace(colorQQNo) && !string.IsNullOrWhiteSpace(colorPRNo)) + + if (colorNo.Trim() == "BC37" && colorQQNo.Trim() == "CC04") { - sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "' and ColorQQCode = '" + colorQQNo + "' and ColorDQCode = '" + colorPRNo + "' "; + #region 单独修改亚光山脉灰 + string sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "' and ColorQQCode = '" + colorQQNo + "' "; + dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_c, null); + if (dt != null && dt.Rows.Count > 0) + { + res = dt.Rows[0]["Des"].ToString(); + colorInfo = dt.Rows[0]["Des"].ToString().Trim() + "，" + dt.Rows[0]["ColorCode"].ToString().Trim() + "，" + dt.Rows[0]["ColorNo"].ToString().Trim(); + } + #endregion } else { - sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "'"; - } - dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_c, null); - if (dt != null && dt.Rows.Count > 0) - { - res = dt.Rows[0]["Des"].ToString(); - colorInfo = dt.Rows[0]["Des"].ToString().Trim() + "，" + dt.Rows[0]["ColorCode"].ToString().Trim() + "，" + dt.Rows[0]["ColorNo"].ToString().Trim(); + string sjBarCode1 = side1BarCode?.Trim(); + if (!string.IsNullOrEmpty(sjBarCode1) && sjBarCode1.Length == 20) + { + string sql_Extend = ""; + string stockNo1 = side1BarCode.Substring(0, 10); + if (!string.IsNullOrWhiteSpace(colorQQNo) && !string.IsNullOrWhiteSpace(colorPRNo)) + { + sql_Extend = @" select * from tb_ColorExtend where ColorCode = '" + colorNo + "' and ColorQQCode = '" + colorQQNo + "' and ColorDQCode = '" + colorPRNo + "' and StockNo = '" + stockNo1 + "' "; + } + else + { + sql_Extend = @" select * from tb_ColorExtend where ColorCode = '" + colorNo + "' and StockNo = '" + stockNo1 + "' "; + } + dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_Extend, null); + if (dt != null && dt.Rows.Count > 0) + { + res = dt.Rows[0]["Des"].ToString(); + colorInfo = dt.Rows[0]["Des"].ToString().Trim() + "，" + dt.Rows[0]["ColorCode"].ToString().Trim() + "，" + dt.Rows[0]["ColorNo"].ToString().Trim(); + } + } + + + if (string.IsNullOrEmpty(res)) + { + //string sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "' "; + string sql_c = ""; + if (!string.IsNullOrWhiteSpace(colorQQNo) && !string.IsNullOrWhiteSpace(colorPRNo)) + { + sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "' and ColorQQCode = '" + colorQQNo + "' and ColorDQCode = '" + colorPRNo + "' "; + } + else + { + sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "'"; + } + dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_c, null); + if (dt != null && dt.Rows.Count > 0) + { + res = dt.Rows[0]["Des"].ToString(); + colorInfo = dt.Rows[0]["Des"].ToString().Trim() + "，" + dt.Rows[0]["ColorCode"].ToString().Trim() + "，" + dt.Rows[0]["ColorNo"].ToString().Trim(); + } + } } + + + + } //根据条码查询产品信息 diff --git a/PaintingPC/Properties/AssemblyInfo.cs b/PaintingPC/Properties/AssemblyInfo.cs index aa61bf4..d39b9c5 100644 --- a/PaintingPC/Properties/AssemblyInfo.cs +++ b/PaintingPC/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.17")] -[assembly: AssemblyFileVersion("1.0.1.17")] +[assembly: AssemblyVersion("1.0.1.18")] +[assembly: AssemblyFileVersion("1.0.1.18")]