From 8b5fdbef64a7863fc21c5bb87c42f26990d079b5 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Mon, 21 Oct 2024 10:23:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E6=88=BF=E8=BF=94=E5=96=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PaintingPC/FrmQuality.Designer.cs | 154 +++++++++++++++--------------- PaintingPC/FrmQuality.cs | 25 ++++- PaintingPC/Function.cs | 11 ++- 3 files changed, 109 insertions(+), 81 deletions(-) diff --git a/PaintingPC/FrmQuality.Designer.cs b/PaintingPC/FrmQuality.Designer.cs index 3d1959a..90fd887 100644 --- a/PaintingPC/FrmQuality.Designer.cs +++ b/PaintingPC/FrmQuality.Designer.cs @@ -73,10 +73,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(1593, 148); - this.labelVersion.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.labelVersion.Location = new System.Drawing.Point(2124, 197); + this.labelVersion.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.labelVersion.Name = "labelVersion"; - this.labelVersion.Size = new System.Drawing.Size(309, 104); + this.labelVersion.Size = new System.Drawing.Size(412, 139); this.labelVersion.TabIndex = 24; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -84,10 +84,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(1278, 148); - this.labStation.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.labStation.Location = new System.Drawing.Point(1704, 197); + this.labStation.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.labStation.Name = "labStation"; - this.labStation.Size = new System.Drawing.Size(309, 104); + this.labStation.Size = new System.Drawing.Size(412, 139); this.labStation.TabIndex = 23; this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -95,10 +95,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(963, 148); - this.labWorkClass.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.labWorkClass.Location = new System.Drawing.Point(1284, 197); + this.labWorkClass.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.labWorkClass.Name = "labWorkClass"; - this.labWorkClass.Size = new System.Drawing.Size(309, 104); + this.labWorkClass.Size = new System.Drawing.Size(412, 139); this.labWorkClass.TabIndex = 22; this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click); @@ -107,10 +107,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(648, 148); - this.rdo3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.rdo3.Location = new System.Drawing.Point(864, 197); + this.rdo3.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.rdo3.Name = "rdo3"; - this.rdo3.Size = new System.Drawing.Size(309, 104); + this.rdo3.Size = new System.Drawing.Size(412, 139); this.rdo3.TabIndex = 21; this.rdo3.Text = "项目调试"; this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -120,10 +120,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(333, 148); - this.rdo2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.rdo2.Location = new System.Drawing.Point(444, 197); + this.rdo2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.rdo2.Name = "rdo2"; - this.rdo2.Size = new System.Drawing.Size(309, 104); + this.rdo2.Size = new System.Drawing.Size(412, 139); this.rdo2.TabIndex = 20; this.rdo2.Text = "量产调试"; this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -134,10 +134,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(18, 148); - this.rdo1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.rdo1.Location = new System.Drawing.Point(24, 197); + this.rdo1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.rdo1.Name = "rdo1"; - this.rdo1.Size = new System.Drawing.Size(309, 104); + this.rdo1.Size = new System.Drawing.Size(412, 139); this.rdo1.TabIndex = 19; this.rdo1.TabStop = true; this.rdo1.Text = "正式量产"; @@ -148,10 +148,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(1528, 14); - this.labTime.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.labTime.Location = new System.Drawing.Point(2037, 19); + this.labTime.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(374, 126); + this.labTime.Size = new System.Drawing.Size(498, 167); this.labTime.TabIndex = 18; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -160,10 +160,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(18, 14); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.pictureBox1.Location = new System.Drawing.Point(24, 19); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(238, 126); + this.pictureBox1.Size = new System.Drawing.Size(317, 167); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 17; this.pictureBox1.TabStop = false; @@ -172,27 +172,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(242, 14); - this.labTitle.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.labTitle.Location = new System.Drawing.Point(323, 19); + this.labTitle.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.labTitle.Name = "labTitle"; - this.labTitle.Size = new System.Drawing.Size(1290, 126); + this.labTitle.Size = new System.Drawing.Size(1719, 167); this.labTitle.TabIndex = 16; this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // panel2 // - this.panel2.Location = new System.Drawing.Point(18, 1006); - this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel2.Location = new System.Drawing.Point(24, 1341); + this.panel2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1496, 526); + this.panel2.Size = new System.Drawing.Size(1995, 701); this.panel2.TabIndex = 48; // // pictureBox2 // - this.pictureBox2.Location = new System.Drawing.Point(18, 560); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.pictureBox2.Location = new System.Drawing.Point(24, 747); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(1496, 438); + this.pictureBox2.Size = new System.Drawing.Size(1995, 584); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox2.TabIndex = 47; this.pictureBox2.TabStop = false; @@ -201,10 +201,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(18, 262); - this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label15.Location = new System.Drawing.Point(24, 349); + this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(239, 112); + this.label15.Size = new System.Drawing.Size(319, 149); this.label15.TabIndex = 49; this.label15.Text = "扫码信息"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -213,10 +213,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(1152, 262); - this.labProductInfo.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.labProductInfo.Location = new System.Drawing.Point(1536, 349); + this.labProductInfo.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.labProductInfo.Name = "labProductInfo"; - this.labProductInfo.Size = new System.Drawing.Size(750, 112); + this.labProductInfo.Size = new System.Drawing.Size(1000, 149); this.labProductInfo.TabIndex = 52; this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -224,10 +224,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(905, 262); - this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label2.Location = new System.Drawing.Point(1207, 349); + this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(239, 112); + this.label2.Size = new System.Drawing.Size(319, 149); this.label2.TabIndex = 51; this.label2.Text = "产品信息"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -236,10 +236,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(267, 280); - this.txtBarCode.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.txtBarCode.Location = new System.Drawing.Point(356, 373); + this.txtBarCode.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.txtBarCode.Name = "txtBarCode"; - this.txtBarCode.Size = new System.Drawing.Size(626, 76); + this.txtBarCode.Size = new System.Drawing.Size(833, 99); this.txtBarCode.TabIndex = 0; this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtBarCode.DoubleClick += new System.EventHandler(this.txtBarCode_DoubleClick); @@ -249,10 +249,10 @@ // 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(1522, 386); - this.labProPosition.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.labProPosition.Location = new System.Drawing.Point(2029, 515); + this.labProPosition.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); this.labProPosition.Name = "labProPosition"; - this.labProPosition.Size = new System.Drawing.Size(380, 130); + this.labProPosition.Size = new System.Drawing.Size(507, 173); this.labProPosition.TabIndex = 64; this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -261,10 +261,10 @@ this.panel1.AutoScroll = true; this.panel1.Controls.Add(this.groupBox1); this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panel1.Location = new System.Drawing.Point(18, 372); - this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.panel1.Location = new System.Drawing.Point(24, 496); + this.panel1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1496, 182); + this.panel1.Size = new System.Drawing.Size(1995, 243); this.panel1.TabIndex = 66; // // groupBox1 @@ -276,7 +276,7 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(0); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(0); - this.groupBox1.Size = new System.Drawing.Size(1496, 182); + this.groupBox1.Size = new System.Drawing.Size(1995, 243); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "更改颜色"; @@ -287,19 +287,20 @@ this.panelAttchColor.Controls.Add(this.label1); this.panelAttchColor.Controls.Add(this.cboxAddColor); this.panelAttchColor.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelAttchColor.Location = new System.Drawing.Point(0, 32); + this.panelAttchColor.Location = new System.Drawing.Point(0, 43); this.panelAttchColor.Margin = new System.Windows.Forms.Padding(0); this.panelAttchColor.Name = "panelAttchColor"; - this.panelAttchColor.Size = new System.Drawing.Size(1496, 150); + this.panelAttchColor.Size = new System.Drawing.Size(1995, 200); this.panelAttchColor.TabIndex = 0; // // label1 // this.label1.AutoSize = true; 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(27, 29); + this.label1.Location = new System.Drawing.Point(36, 39); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(201, 57); + this.label1.Size = new System.Drawing.Size(269, 78); this.label1.TabIndex = 1; this.label1.Text = "附加颜色"; // @@ -308,9 +309,10 @@ this.cboxAddColor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboxAddColor.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboxAddColor.FormattingEnabled = true; - this.cboxAddColor.Location = new System.Drawing.Point(243, 23); + this.cboxAddColor.Location = new System.Drawing.Point(324, 31); + this.cboxAddColor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cboxAddColor.Name = "cboxAddColor"; - this.cboxAddColor.Size = new System.Drawing.Size(1022, 66); + this.cboxAddColor.Size = new System.Drawing.Size(1361, 86); this.cboxAddColor.TabIndex = 0; this.cboxAddColor.SelectedValueChanged += new System.EventHandler(this.cboxAddColor_SelectedValueChanged); // @@ -318,10 +320,9 @@ // this.btnOk.BackColor = System.Drawing.Color.LawnGreen; this.btnOk.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOk.Location = new System.Drawing.Point(1515, 702); - this.btnOk.Margin = new System.Windows.Forms.Padding(2); + this.btnOk.Location = new System.Drawing.Point(2020, 936); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(402, 131); + this.btnOk.Size = new System.Drawing.Size(536, 175); this.btnOk.TabIndex = 67; this.btnOk.Text = "合 格"; this.btnOk.UseVisualStyleBackColor = false; @@ -331,10 +332,9 @@ // this.btnNok.BackColor = System.Drawing.Color.Yellow; this.btnNok.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnNok.Location = new System.Drawing.Point(1515, 949); - this.btnNok.Margin = new System.Windows.Forms.Padding(2); + this.btnNok.Location = new System.Drawing.Point(2020, 1265); this.btnNok.Name = "btnNok"; - this.btnNok.Size = new System.Drawing.Size(402, 131); + this.btnNok.Size = new System.Drawing.Size(536, 175); this.btnNok.TabIndex = 68; this.btnNok.Text = "不 良"; this.btnNok.UseVisualStyleBackColor = false; @@ -344,10 +344,9 @@ // this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue; this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRepair.Location = new System.Drawing.Point(1515, 1178); - this.btnRepair.Margin = new System.Windows.Forms.Padding(2); + this.btnRepair.Location = new System.Drawing.Point(2020, 1571); this.btnRepair.Name = "btnRepair"; - this.btnRepair.Size = new System.Drawing.Size(402, 131); + this.btnRepair.Size = new System.Drawing.Size(536, 175); this.btnRepair.TabIndex = 69; this.btnRepair.Text = "返 喷"; this.btnRepair.UseVisualStyleBackColor = false; @@ -357,10 +356,9 @@ // this.btnAbt.BackColor = System.Drawing.Color.OrangeRed; this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAbt.Location = new System.Drawing.Point(1515, 1402); - this.btnAbt.Margin = new System.Windows.Forms.Padding(2); + this.btnAbt.Location = new System.Drawing.Point(2020, 1869); this.btnAbt.Name = "btnAbt"; - this.btnAbt.Size = new System.Drawing.Size(402, 131); + this.btnAbt.Size = new System.Drawing.Size(536, 175); this.btnAbt.TabIndex = 70; this.btnAbt.Text = "报 废"; this.btnAbt.UseVisualStyleBackColor = false; @@ -369,19 +367,21 @@ // lableFP // this.lableFP.AutoSize = true; - this.lableFP.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lableFP.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lableFP.ForeColor = System.Drawing.Color.Red; - this.lableFP.Location = new System.Drawing.Point(1603, 613); + this.lableFP.Location = new System.Drawing.Point(2137, 817); + this.lableFP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lableFP.Name = "lableFP"; - this.lableFP.Size = new System.Drawing.Size(159, 36); + this.lableFP.Size = new System.Drawing.Size(120, 48); this.lableFP.TabIndex = 71; - this.lableFP.Text = "存在返喷"; + this.lableFP.Tag = "存在返喷"; + this.lableFP.Text = " "; // // FrmQuality // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1924, 1534); + this.ClientSize = new System.Drawing.Size(2565, 2045); this.Controls.Add(this.lableFP); this.Controls.Add(this.btnAbt); this.Controls.Add(this.btnRepair); @@ -405,7 +405,7 @@ this.Controls.Add(this.pictureBox1); this.Controls.Add(this.labTitle); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); + this.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5); this.Name = "FrmQuality"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "喷涂质检"; diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index fc1c872..93dbb35 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -2,6 +2,8 @@ using PaintingPC.Model; using PaintingPC.WebReference; using System; +using System.Linq; +using System.Collections.Generic; using System.Configuration; using System.Data; using System.Drawing; @@ -401,6 +403,9 @@ namespace PaintingPC if (CheckColor(ref colorName, ref partName) == false) return; #endregion + + + ClearControlColor(SetControlGroup()); btnRepair.BackColor = Color.Yellow; string s = _isWmsQuality == false ? "打磨" : "WMS打磨"; @@ -664,7 +669,20 @@ namespace PaintingPC } #endregion - + if (_isWmsQuality) + { + DataTable dt = Function.GetLastResult(barcode); + if (dt.Rows.Count == 0) + { + MessageBox.Show($"条码[{barcode}]没有质检记录, 请核对数据!"); + return; + } + else if (dt.Rows[0]["inspectResult"].ToString().Contains("合格") == false) + { + MessageBox.Show($"条码[{barcode}]最后质检结果为{dt.Rows[0]["inspectResult"].ToString()}, 非[合格]状态无法返喷!"); + return; + } + } #region 查询该系列产品都有什么颜色 string canChanageColor = ConfigurationManager.AppSettings["CanChangeColor"].Trim(); @@ -820,6 +838,11 @@ namespace PaintingPC DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); if (dtInspect != null && dtInspect.Rows.Count > 0) { + List list = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("打磨")).ToList(); + if (list.Count > 0) + { + lableFP.Text = "存在返喷"; + } labProductInfo.Text = dtInspect.Rows[0]["productInfo"].ToString().Trim(); //产品信息 //string position1 = dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置 //string reason1 = dtInspect.Rows[0]["reason"].ToString(); //原因 diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs index d544ceb..7ff6967 100644 --- a/PaintingPC/Function.cs +++ b/PaintingPC/Function.cs @@ -1624,11 +1624,16 @@ namespace PaintingPC DataTable res = new DataTable(); try { - string sql = @" select * from (SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '1' ORDER BY createTime DESC) aa + //string sql = @" select * from (SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '1' ORDER BY createTime DESC) aa + // UNION + // SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '2' ORDER BY createTime DESC) bb + // UNION + // SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '3' ORDER BY createTime DESC) cc) dd order by createTime DESC "; + string sql = @" select * from (SELECT * from (select TOP 30 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '1' ORDER BY createTime DESC) aa UNION - SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '2' ORDER BY createTime DESC) bb + SELECT * from (select TOP 30 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '2' ORDER BY createTime DESC) bb UNION - SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '3' ORDER BY createTime DESC) cc) dd order by createTime DESC "; + SELECT * from (select TOP 30 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '3' ORDER BY createTime DESC) cc) dd order by createTime DESC "; res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); LogHelper.WriteSysLogBase("[sql：]" + sql, MethodBase.GetCurrentMethod().Name); return res;