From 5ad50ebf9f94625aa94e9a10853aba13d0f8c848 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Tue, 5 Aug 2025 10:27:20 +0800 Subject: [PATCH] 1 --- PaintingPC/FrmQuality.Designer.cs | 2 +- PunchingMistake/FrmAssemble.cs | 2 +- PunchingMistake/FrmQualityNew.cs | 41 +- PunchingMistake/FrmQualityNew1.Designer.cs | 656 --------- PunchingMistake/FrmQualityNew1.cs | 1536 -------------------- PunchingMistake/FrmQualityNew1.resx | 475 ------ PunchingMistake/Function2.cs | 97 ++ PunchingMistake/PunchingMistake.csproj | 9 - 8 files changed, 136 insertions(+), 2682 deletions(-) delete mode 100644 PunchingMistake/FrmQualityNew1.Designer.cs delete mode 100644 PunchingMistake/FrmQualityNew1.cs delete mode 100644 PunchingMistake/FrmQualityNew1.resx diff --git a/PaintingPC/FrmQuality.Designer.cs b/PaintingPC/FrmQuality.Designer.cs index 2efc2a1..568ac43 100644 --- a/PaintingPC/FrmQuality.Designer.cs +++ b/PaintingPC/FrmQuality.Designer.cs @@ -365,7 +365,7 @@ this.btnNok.Name = "btnNok"; this.btnNok.Size = new System.Drawing.Size(491, 153); this.btnNok.TabIndex = 68; - this.btnNok.Text = "其 它"; + this.btnNok.Text = "抛 光"; this.btnNok.UseVisualStyleBackColor = false; this.btnNok.Click += new System.EventHandler(this.btnNok_Click); // diff --git a/PunchingMistake/FrmAssemble.cs b/PunchingMistake/FrmAssemble.cs index bc912fb..6e68ebf 100644 --- a/PunchingMistake/FrmAssemble.cs +++ b/PunchingMistake/FrmAssemble.cs @@ -30,6 +30,7 @@ namespace PunchingMistake private string _sjBarCode = string.Empty; private string _partNo1 = string.Empty; private string _partNo2 = string.Empty; + /// /// 当前设备行数据ID /// @@ -62,7 +63,6 @@ namespace PunchingMistake Thread t = new Thread(new ThreadStart(TimeGo)); t.Start(); - LoadScreen(); } public void LoadScreen() diff --git a/PunchingMistake/FrmQualityNew.cs b/PunchingMistake/FrmQualityNew.cs index cd31a71..fb28f5a 100644 --- a/PunchingMistake/FrmQualityNew.cs +++ b/PunchingMistake/FrmQualityNew.cs @@ -253,7 +253,9 @@ namespace PunchingMistake } ShowHint(""); - + + + SaveRst("返修合格", _scanAssembleRow); } @@ -264,6 +266,25 @@ namespace PunchingMistake Clear(); } } + + private void VerifyLastScan(string type) + { + DataTable dt = Function2.GetLastQualityResult(_scanAssembleRow["barCode"].ToString()); + if (dt.Rows.Count == 0) return; + if(type == "返修合格") + { + if(dt.Rows[0]["inspectResult"].ToString() != "返修") + { + throw new Exception("前置操作不是[返修],无法判定返修合格"); + } + } + else + { + throw new Exception("已判定为[" + dt.Rows[0]["inspectResult"].ToString() + "],无法重新判定."); + } + + + } /// /// 报废按钮 /// @@ -311,7 +332,8 @@ namespace PunchingMistake { userName = Program.UserName; } - string bcode = txtBarCode.Text.Trim(); + string bcode = txtBarCode.Text.Trim(); + VerifyLastScan(state); //保存 string id = SaveInspect(state, _scanAssembleRow, userName); if (!string.IsNullOrEmpty(id)) @@ -427,21 +449,32 @@ namespace PunchingMistake model1.AddMan = userName; - Function2.InsertInspect3(model1, scanPaintRow["ZcBarCode"].ToString(), scanPaintRow["ID"].ToString(), scanPaintRow["PlanID"].ToString()); + Function2.InsertInspect3(model1, scanPaintRow["ZcBarCode"].ToString(), scanPaintRow["ID"].ToString(), scanPaintRow["PlanID"].ToString()); } if(inspectResult == "报废") { //更新计划的报废数量 Function2.AddCompleteCount(scanPaintRow["PlanID"].ToString(), "报废"); Function2.UpdateRecordFlag(scanPaintRow["ID"].ToString().ToString(), "0"); + Function2.InsertPunchQuality("0", scanPaintRow["ZcBarCode"].ToString(), scanPaintRow["ZcPartNo"].ToString(), scanPaintRow["barcode"].ToString(), Program.UserName); } if (inspectResult == "返修") { Function2.AddCompleteCount(scanPaintRow["PlanID"].ToString(), "返修"); - Function2.UpdateRecordFlag(scanPaintRow["ID"].ToString().ToString(), "1"); + Function2.UpdateRecordFlag(scanPaintRow["ID"].ToString().ToString(), "2"); } + //更新tb_Punch_Code_Record数据的状态 + if (inspectResult == "返修合格") + { + Function2.UpdateRecordFlag(scanPaintRow["ID"].ToString().ToString(), "1"); + Function2.InsertPunchQuality("1", scanPaintRow["ZcBarCode"].ToString(), scanPaintRow["ZcPartNo"].ToString(), scanPaintRow["barcode"].ToString(), Program.UserName); + } + if (inspectResult == "合格") + { + Function2.InsertPunchQuality("1", scanPaintRow["ZcBarCode"].ToString(), scanPaintRow["ZcPartNo"].ToString(), scanPaintRow["barcode"].ToString(), Program.UserName); + } return ""; } diff --git a/PunchingMistake/FrmQualityNew1.Designer.cs b/PunchingMistake/FrmQualityNew1.Designer.cs deleted file mode 100644 index 116fecd..0000000 --- a/PunchingMistake/FrmQualityNew1.Designer.cs +++ /dev/null @@ -1,656 +0,0 @@ -namespace PunchingMistake -{ - partial class FrmQualityNew1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - try - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - catch - { - - } - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmQualityNew1)); - this.labTime = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.labTitle = new System.Windows.Forms.Label(); - this.panel2 = new System.Windows.Forms.Panel(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.label15 = new System.Windows.Forms.Label(); - this.labProductInfo = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.txtBarCode = new System.Windows.Forms.TextBox(); - this.labProPosition = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.button4 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.btnPlanDown = new System.Windows.Forms.Button(); - this.btnPlanUp = new System.Windows.Forms.Button(); - this.btnOk = new System.Windows.Forms.Button(); - this.btnRepair = new System.Windows.Forms.Button(); - this.btnNok = new System.Windows.Forms.Button(); - this.btnAbt = new System.Windows.Forms.Button(); - this.lableFP = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.lbProductName = new System.Windows.Forms.Label(); - this.lbProductCode = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.lbPlanCode = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.lbPlanQty = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.lbPlanCompleteQty = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.lbOkCount = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.lbRepairCount = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.lbBadCount = new System.Windows.Forms.Label(); - this.lbForeig = new System.Windows.Forms.Label(); - this.labWorkClass = new System.Windows.Forms.Label(); - this.labStation = new System.Windows.Forms.Label(); - this.labelVersion = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.panel1.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.SuspendLayout(); - // - // labTime - // - this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTime.Location = new System.Drawing.Point(1867, 17); - this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(457, 146); - this.labTime.TabIndex = 18; - this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labTime.Click += new System.EventHandler(this.labTime_Click); - // - // pictureBox1 - // - this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(22, 17); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(291, 146); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 17; - this.pictureBox1.TabStop = false; - // - // labTitle - // - this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTitle.Location = new System.Drawing.Point(296, 17); - this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.labTitle.Name = "labTitle"; - this.labTitle.Size = new System.Drawing.Size(1576, 146); - this.labTitle.TabIndex = 16; - this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(18, 870); - this.panel2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1829, 578); - this.panel2.TabIndex = 48; - // - // pictureBox2 - // - this.pictureBox2.Location = new System.Drawing.Point(18, 352); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(1829, 509); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox2.TabIndex = 47; - this.pictureBox2.TabStop = false; - // - // label15 - // - this.label15.BackColor = System.Drawing.Color.Lime; - this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(21, 163); - this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(292, 130); - this.label15.TabIndex = 49; - this.label15.Text = "扫码信息"; - this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // labProductInfo - // - this.labProductInfo.BackColor = System.Drawing.Color.White; - this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProductInfo.Location = new System.Drawing.Point(1407, 163); - this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.labProductInfo.Name = "labProductInfo"; - this.labProductInfo.Size = new System.Drawing.Size(917, 130); - this.labProductInfo.TabIndex = 52; - this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.Lime; - this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1106, 163); - this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(292, 130); - this.label2.TabIndex = 51; - this.label2.Text = "产品信息"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // txtBarCode - // - this.txtBarCode.BackColor = System.Drawing.Color.White; - this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBarCode.Location = new System.Drawing.Point(325, 184); - this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4); - this.txtBarCode.Name = "txtBarCode"; - this.txtBarCode.Size = new System.Drawing.Size(764, 87); - this.txtBarCode.TabIndex = 0; - this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtBarCode.DoubleClick += new System.EventHandler(this.txtBarCode_DoubleClick); - this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown); - // - // labProPosition - // - this.labProPosition.BackColor = System.Drawing.Color.White; - this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProPosition.Location = new System.Drawing.Point(1870, 315); - this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.labProPosition.Name = "labProPosition"; - this.labProPosition.Size = new System.Drawing.Size(465, 151); - this.labProPosition.TabIndex = 64; - this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panel1 - // - this.panel1.AutoScroll = true; - this.panel1.Controls.Add(this.button4); - this.panel1.Controls.Add(this.button3); - this.panel1.Controls.Add(this.btnPlanDown); - this.panel1.Controls.Add(this.btnPlanUp); - this.panel1.Controls.Add(this.btnOk); - this.panel1.Controls.Add(this.btnRepair); - this.panel1.Controls.Add(this.btnNok); - this.panel1.Controls.Add(this.btnAbt); - 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, 1469); - this.panel1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1829, 317); - this.panel1.TabIndex = 66; - // - // button4 - // - this.button4.BackColor = System.Drawing.Color.Red; - this.button4.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1275, 181); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(326, 90); - this.button4.TabIndex = 74; - this.button4.Text = "结束计划"; - this.button4.UseVisualStyleBackColor = false; - // - // button3 - // - this.button3.BackColor = System.Drawing.Color.LawnGreen; - this.button3.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1275, 45); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(326, 90); - this.button3.TabIndex = 73; - this.button3.Text = "计划查询"; - this.button3.UseVisualStyleBackColor = false; - // - // btnPlanDown - // - this.btnPlanDown.BackColor = System.Drawing.Color.LawnGreen; - this.btnPlanDown.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPlanDown.Location = new System.Drawing.Point(852, 181); - this.btnPlanDown.Name = "btnPlanDown"; - this.btnPlanDown.Size = new System.Drawing.Size(326, 81); - this.btnPlanDown.TabIndex = 72; - this.btnPlanDown.Text = "下一计划"; - this.btnPlanDown.UseVisualStyleBackColor = false; - this.btnPlanDown.Click += new System.EventHandler(this.btnPlanDown_Click); - // - // btnPlanUp - // - this.btnPlanUp.BackColor = System.Drawing.Color.LawnGreen; - this.btnPlanUp.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPlanUp.Location = new System.Drawing.Point(852, 45); - this.btnPlanUp.Name = "btnPlanUp"; - this.btnPlanUp.Size = new System.Drawing.Size(326, 90); - this.btnPlanUp.TabIndex = 71; - this.btnPlanUp.Text = "上一计划"; - this.btnPlanUp.UseVisualStyleBackColor = false; - this.btnPlanUp.Click += new System.EventHandler(this.btnPlanUp_Click); - // - // btnOk - // - 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(30, 45); - this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(326, 90); - this.btnOk.TabIndex = 67; - this.btnOk.Text = "合 格"; - this.btnOk.UseVisualStyleBackColor = false; - this.btnOk.Click += new System.EventHandler(this.btnOk_Click); - // - // btnRepair - // - this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue; - this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRepair.Location = new System.Drawing.Point(30, 181); - this.btnRepair.Name = "btnRepair"; - this.btnRepair.Size = new System.Drawing.Size(326, 90); - this.btnRepair.TabIndex = 69; - this.btnRepair.Text = "返修"; - this.btnRepair.UseVisualStyleBackColor = false; - this.btnRepair.Click += new System.EventHandler(this.btnRepair_Click); - // - // btnNok - // - 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(466, 45); - this.btnNok.Name = "btnNok"; - this.btnNok.Size = new System.Drawing.Size(321, 90); - this.btnNok.TabIndex = 68; - this.btnNok.Text = "返修合格"; - this.btnNok.UseVisualStyleBackColor = false; - this.btnNok.Click += new System.EventHandler(this.btnNok_Click); - // - // btnAbt - // - this.btnAbt.BackColor = System.Drawing.Color.OrangeRed; - this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAbt.Location = new System.Drawing.Point(466, 181); - this.btnAbt.Name = "btnAbt"; - this.btnAbt.Size = new System.Drawing.Size(314, 90); - this.btnAbt.TabIndex = 70; - this.btnAbt.Text = "报 废"; - this.btnAbt.UseVisualStyleBackColor = false; - this.btnAbt.Click += new System.EventHandler(this.btnAbt_Click); - // - // lableFP - // - this.lableFP.AutoSize = true; - 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(2201, 552); - this.lableFP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lableFP.Name = "lableFP"; - this.lableFP.Size = new System.Drawing.Size(106, 42); - this.lableFP.TabIndex = 71; - this.lableFP.Tag = "存在返喷"; - this.lableFP.Text = " "; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.lbProductName); - this.groupBox1.Controls.Add(this.lbProductCode); - this.groupBox1.Controls.Add(this.label10); - this.groupBox1.Controls.Add(this.label9); - this.groupBox1.Controls.Add(this.label8); - this.groupBox1.Controls.Add(this.lbPlanCode); - this.groupBox1.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox1.ForeColor = System.Drawing.Color.Blue; - this.groupBox1.Location = new System.Drawing.Point(1879, 604); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(456, 192); - this.groupBox1.TabIndex = 72; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "当前计划"; - // - // lbProductName - // - this.lbProductName.AutoSize = true; - this.lbProductName.ForeColor = System.Drawing.Color.Black; - this.lbProductName.Location = new System.Drawing.Point(114, 156); - this.lbProductName.Name = "lbProductName"; - this.lbProductName.Size = new System.Drawing.Size(105, 33); - this.lbProductName.TabIndex = 5; - this.lbProductName.Text = " "; - // - // lbProductCode - // - this.lbProductCode.AutoSize = true; - this.lbProductCode.ForeColor = System.Drawing.Color.Black; - this.lbProductCode.Location = new System.Drawing.Point(114, 105); - this.lbProductCode.Name = "lbProductCode"; - this.lbProductCode.Size = new System.Drawing.Size(87, 33); - this.lbProductCode.TabIndex = 4; - this.lbProductCode.Text = " "; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.ForeColor = System.Drawing.Color.Black; - this.label10.Location = new System.Drawing.Point(17, 156); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(83, 33); - this.label10.TabIndex = 3; - this.label10.Text = "描述"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.ForeColor = System.Drawing.Color.Black; - this.label9.Location = new System.Drawing.Point(16, 105); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(83, 33); - this.label9.TabIndex = 2; - this.label9.Text = "产品"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.ForeColor = System.Drawing.Color.Black; - this.label8.Location = new System.Drawing.Point(16, 55); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(83, 33); - this.label8.TabIndex = 1; - this.label8.Text = "编号"; - // - // lbPlanCode - // - this.lbPlanCode.AutoSize = true; - this.lbPlanCode.ForeColor = System.Drawing.Color.Black; - this.lbPlanCode.Location = new System.Drawing.Point(114, 55); - this.lbPlanCode.Name = "lbPlanCode"; - this.lbPlanCode.Size = new System.Drawing.Size(87, 33); - this.lbPlanCode.TabIndex = 0; - this.lbPlanCode.Text = " "; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.lbPlanQty); - this.groupBox2.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox2.ForeColor = System.Drawing.Color.Blue; - this.groupBox2.Location = new System.Drawing.Point(1879, 821); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(456, 138); - this.groupBox2.TabIndex = 73; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "生产计划数量"; - // - // lbPlanQty - // - this.lbPlanQty.AutoSize = true; - this.lbPlanQty.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPlanQty.ForeColor = System.Drawing.Color.Black; - this.lbPlanQty.Location = new System.Drawing.Point(41, 40); - this.lbPlanQty.Name = "lbPlanQty"; - this.lbPlanQty.Size = new System.Drawing.Size(78, 84); - this.lbPlanQty.TabIndex = 1; - this.lbPlanQty.Text = "0"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.lbPlanCompleteQty); - this.groupBox3.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox3.ForeColor = System.Drawing.Color.Blue; - this.groupBox3.Location = new System.Drawing.Point(1885, 983); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(456, 138); - this.groupBox3.TabIndex = 74; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "计划完成数量"; - // - // lbPlanCompleteQty - // - this.lbPlanCompleteQty.AutoSize = true; - this.lbPlanCompleteQty.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPlanCompleteQty.ForeColor = System.Drawing.Color.Black; - this.lbPlanCompleteQty.Location = new System.Drawing.Point(36, 40); - this.lbPlanCompleteQty.Name = "lbPlanCompleteQty"; - this.lbPlanCompleteQty.Size = new System.Drawing.Size(78, 84); - this.lbPlanCompleteQty.TabIndex = 0; - this.lbPlanCompleteQty.Text = "0"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.lbOkCount); - this.groupBox4.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox4.ForeColor = System.Drawing.Color.Blue; - this.groupBox4.Location = new System.Drawing.Point(1885, 1153); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(456, 138); - this.groupBox4.TabIndex = 75; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "合格数量"; - // - // lbOkCount - // - this.lbOkCount.AutoSize = true; - this.lbOkCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbOkCount.ForeColor = System.Drawing.Color.Black; - this.lbOkCount.Location = new System.Drawing.Point(36, 40); - this.lbOkCount.Name = "lbOkCount"; - this.lbOkCount.Size = new System.Drawing.Size(78, 84); - this.lbOkCount.TabIndex = 1; - this.lbOkCount.Text = "0"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.lbRepairCount); - this.groupBox5.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox5.ForeColor = System.Drawing.Color.Blue; - this.groupBox5.Location = new System.Drawing.Point(1885, 1324); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(456, 138); - this.groupBox5.TabIndex = 76; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "返修数量"; - // - // lbRepairCount - // - this.lbRepairCount.AutoSize = true; - this.lbRepairCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbRepairCount.ForeColor = System.Drawing.Color.Black; - this.lbRepairCount.Location = new System.Drawing.Point(36, 40); - this.lbRepairCount.Name = "lbRepairCount"; - this.lbRepairCount.Size = new System.Drawing.Size(78, 84); - this.lbRepairCount.TabIndex = 1; - this.lbRepairCount.Text = "0"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.lbBadCount); - this.groupBox6.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox6.ForeColor = System.Drawing.Color.Blue; - this.groupBox6.Location = new System.Drawing.Point(1885, 1494); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(456, 138); - this.groupBox6.TabIndex = 77; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "报废数量"; - // - // lbBadCount - // - this.lbBadCount.AutoSize = true; - this.lbBadCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbBadCount.ForeColor = System.Drawing.Color.Black; - this.lbBadCount.Location = new System.Drawing.Point(36, 40); - this.lbBadCount.Name = "lbBadCount"; - this.lbBadCount.Size = new System.Drawing.Size(78, 84); - this.lbBadCount.TabIndex = 1; - this.lbBadCount.Text = "0"; - // - // lbForeig - // - this.lbForeig.AutoSize = true; - this.lbForeig.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbForeig.Location = new System.Drawing.Point(26, 306); - this.lbForeig.Name = "lbForeig"; - this.lbForeig.Size = new System.Drawing.Size(69, 33); - this.lbForeig.TabIndex = 78; - this.lbForeig.Text = " "; - // - // labWorkClass - // - this.labWorkClass.AutoSize = true; - this.labWorkClass.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labWorkClass.Location = new System.Drawing.Point(1879, 487); - this.labWorkClass.Name = "labWorkClass"; - this.labWorkClass.Size = new System.Drawing.Size(67, 33); - this.labWorkClass.TabIndex = 79; - this.labWorkClass.Text = "A班"; - // - // labStation - // - this.labStation.AutoSize = true; - this.labStation.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labStation.Location = new System.Drawing.Point(2123, 487); - this.labStation.Name = "labStation"; - this.labStation.Size = new System.Drawing.Size(69, 33); - this.labStation.TabIndex = 80; - this.labStation.Text = "F02"; - // - // labelVersion - // - this.labelVersion.AutoSize = true; - this.labelVersion.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labelVersion.Location = new System.Drawing.Point(1879, 552); - this.labelVersion.Name = "labelVersion"; - this.labelVersion.Size = new System.Drawing.Size(159, 33); - this.labelVersion.TabIndex = 81; - this.labelVersion.Text = "10.0.0.1"; - // - // FrmQualityNew - // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2351, 1789); - this.Controls.Add(this.labelVersion); - this.Controls.Add(this.labStation); - this.Controls.Add(this.labWorkClass); - this.Controls.Add(this.lbForeig); - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.panel1); - this.Controls.Add(this.lableFP); - this.Controls.Add(this.labProPosition); - this.Controls.Add(this.txtBarCode); - this.Controls.Add(this.labProductInfo); - this.Controls.Add(this.label2); - this.Controls.Add(this.label15); - this.Controls.Add(this.panel2); - this.Controls.Add(this.pictureBox2); - this.Controls.Add(this.labTime); - this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.labTitle); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4); - this.Name = "FrmQualityNew"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "喷涂质检"; - this.Load += new System.EventHandler(this.FrmSecondCheck_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.panel1.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - private System.Windows.Forms.Label labTime; - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label labTitle; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label labProductInfo; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox txtBarCode; - private System.Windows.Forms.Label labProPosition; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Button btnOk; - private System.Windows.Forms.Button btnNok; - private System.Windows.Forms.Button btnRepair; - private System.Windows.Forms.Button btnAbt; - private System.Windows.Forms.Label lableFP; - private System.Windows.Forms.Button btnPlanDown; - private System.Windows.Forms.Button btnPlanUp; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.Label lbForeig; - private System.Windows.Forms.Label labWorkClass; - private System.Windows.Forms.Label labStation; - private System.Windows.Forms.Label labelVersion; - private System.Windows.Forms.Label lbPlanCode; - private System.Windows.Forms.Label lbPlanCompleteQty; - private System.Windows.Forms.Label lbOkCount; - private System.Windows.Forms.Label lbRepairCount; - private System.Windows.Forms.Label lbBadCount; - private System.Windows.Forms.Label lbPlanQty; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label lbProductName; - private System.Windows.Forms.Label lbProductCode; - } -} \ No newline at end of file diff --git a/PunchingMistake/FrmQualityNew1.cs b/PunchingMistake/FrmQualityNew1.cs deleted file mode 100644 index d9a3006..0000000 --- a/PunchingMistake/FrmQualityNew1.cs +++ /dev/null @@ -1,1536 +0,0 @@ - -using PaintingPC.Model; -using PaintingPC.WebReference; -using System; -using System.Linq; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Drawing; -using System.IO; -using System.Net.NetworkInformation; -using System.Reflection; -using System.Threading; -using System.Windows.Forms; -using MESClassLibrary.BLL.BasicInfo; -using static System.Windows.Forms.AxHost; -using PaintingPC; - -namespace PunchingMistake -{ - public partial class FrmQualityNew1 : Form - { - int count = 0; //缺陷图选择个数 - public static string ColorName = ""; //修改颜色 - public static string paintId = ""; - - private static string position = "", reason = ""; - - private string _carType = string.Empty; - private Dictionary _lastJustDict = new Dictionary(); - private string _foreighColor = string.Empty; - private string _lineCode = string.Empty; - private List _stations = new List(); - - private StationBLL _stationBLL = new StationBLL(); - /// - /// 从tb_ForeignColorMap表得到的零件号 - /// - private string _foreignPartCode = string.Empty; - private bool _isSingleStation = false; - private string _isTest = "false"; - private string _stationNo = ""; - private string IsHigh = "1"; - public FrmQualityNew1() - { - InitializeComponent(); - //WindowState = FormWindowState.Normal; - this.Size = new Size(1280, 1020); - - - - } - - - - - private void FrmSecondCheck_Load(object sender, EventArgs e) - { - try - { - Control.CheckForIllegalCrossThreadCalls = false; - InitPage(); - } - catch (Exception ex) - { - MessageBox.Show("网络故障，请联系网络管理员"); - LogHelper.WriteLog(ex.ToString(), MethodBase.GetCurrentMethod().Name); - } - } - - public void InitPage() - { - try - { - string title = ConfigurationManager.AppSettings["Display"].ToString(); - string workClass = Function.GetWorkClass2(); - _stationNo = ConfigurationManager.AppSettings["Station"].ToString(); - - labTitle.Text = title; - - labWorkClass.Text = workClass; - labStation.Text = _stationNo; - labelVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); - - LoadScreen(); - - - Thread t = new Thread(new ThreadStart(TimeGo)); - t.Start(); - } - catch (Exception ex) - { } - } - - - - private void TimeGo() - { - System.Timers.Timer timer = new System.Timers.Timer(); - timer.Interval = 10; - timer.Enabled = true; - timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Tick); - } - - private void timer_Tick(object sender, EventArgs e) - { - try - { - labTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - Thread.Sleep(500); - } - catch - { - - } - } - - /// - /// 缺陷图点击 - /// - /// - /// - void lblRoom_Click(object sender, EventArgs e) - { - Label a = (Label)sender; - string aa = a.Text; - if (a.BackColor == Color.Transparent) - { - a.BackColor = Color.FromArgb(150, System.Drawing.Color.Chartreuse); - position += aa; - count++; - } - else - { - a.BackColor = Color.Transparent; - count--; - } - } - - /// - /// 缺陷原因点击 - /// - /// - /// - void dLbRoom_Click(object sender, EventArgs e) - { - if (count == 0) - { - MessageBox.Show("请选择缺陷区域！"); - return; - } - Label a = (Label)sender; - string aa = a.Text; - if (a.BackColor == Color.Transparent) - { - a.BackColor = Color.Chartreuse; - reason += a.Text + ";"; - } - else - { - a.BackColor = Color.Transparent; - reason = reason.Replace(a.Text + ";", ""); - } - } - - private Control[] SetControlGroup() - { - //Control[] controls = { btnPass, btnAbt, btnRepair }; - Control[] controls = { }; - return controls; - } - - /// - /// 清除控件选中 - /// - /// - public void ClearControlColor(Control[] controls) - { - foreach (Control c in controls) - { - c.BackColor = Color.LightGray; - } - } - - bool SaveBeforeVerify( string currentRst) - { - string lastRst = GetLastInspectRst(txtBarCode.Text.Trim()); - if (lastRst.Contains("报废")) - { - MessageBox.Show($"条码已判定为报废，不能再判定为{currentRst}."); - Clear(); - return false; - } - return true; - } - /// - /// 合格 - /// - /// - /// - private void btnOk_Click(object sender, EventArgs e) - { - try - { - if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) - { - MessageBox.Show("请先扫描数据,然后操作."); - return; - } - #region 返喷下线数据验证 - if (lableFP.Text.Contains("[返喷]")) - { - string barcode = txtBarCode.Text.Trim(); - DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); - if (dtInspect != null && dtInspect.Rows.Count > 0) - { - string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果 - string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色 - if (inspectResult.Contains("打磨")) - { - string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间 - int count = 0; - string colorInfo = ""; - if (_lineCode == "2") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime ,ref colorInfo); - } - else if (_lineCode == "1") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime , ref colorInfo); - - } - else - { - - } - - if (count == 0) - { - MessageBox.Show("未发现返喷下线数据！，无法进行质量判定"); - return; - } - else - { - if(inspectColorInfo != colorInfo) - { - btnOk.Enabled = false; - btnRepair.Enabled = false; - btnNok.Enabled = false; - - MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！"); - return; - } - - } - } - } - - } - #endregion - - 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; - - bool rr = SaveBeforeVerify("合格"); - if (rr == false) - { - return; - } - - //if (lastRst.Contains("合格")) - //{ - // MessageBox.Show("条码已判定为合格，无需重复判定"); - // Clear(); - // return; - //} - SaveRst("合格", colorName, partName, 1); - } - catch(Exception ex) - { - ShowHint("执行合格判定发生异常,异常原因:" + ex.Message); - MessageBox.Show("执行合格判定发生异常,异常原因:" + ex.Message); - Clear(); - } - - } - void Clear() - { - ClearPage(); - ClearTxtBarcode(); - txtBarCode.TabIndex = 0; - } - - /// - /// 其它 - /// - /// - /// - private void btnNok_Click(object sender, EventArgs e) - { - try - { - if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) - { - MessageBox.Show("请先扫描数据,然后操作."); - return; - } - - #region 返喷下线数据验证 - if (lableFP.Text.Contains("[返喷]")) - { - string barcode = txtBarCode.Text.Trim(); - DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); - if (dtInspect != null && dtInspect.Rows.Count > 0) - { - string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果 - string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色 - if (inspectResult.Contains("打磨")) - { - string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间 - int count = 0; - string colorInfo = ""; - if (_lineCode == "2") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo); - } - else if (_lineCode == "1") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo); - - } - else - { - - } - - if (count == 0) - { - MessageBox.Show("未发现返喷下线数据！，无法进行质量判定"); - return; - } - else - { - if (inspectColorInfo != colorInfo) - { - btnOk.Enabled = false; - btnRepair.Enabled = false; - btnNok.Enabled = false; - - MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！"); - return; - } - - } - } - } - - } - #endregion - - if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行[其它]判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; - ShowHint(""); - #region 必须选择缺陷位置与缺陷原因，否则无法保存 - if (CheckDefect() == false) return; - #endregion - - #region 判断产品是否有颜色 - string colorName = string.Empty; - string partName = string.Empty; - if (CheckColor(ref colorName, ref partName) == false) return; - #endregion - - - bool rr = SaveBeforeVerify("其它"); - if (rr == false) - { - return; - } - SaveRst("其它", colorName, partName, 4); - } - catch(Exception ex) - { - ShowHint("执行其它判定发生异常,异常原因:" + ex.Message); - MessageBox.Show("执行其它判定发生异常,异常原因:" + ex.Message); - Clear(); - } - } - - /// - /// 返喷按钮 - /// - /// - /// - private void btnRepair_Click(object sender, EventArgs e) - { - try - { - #region 可回喷次数 =1，不能打磨， =2 可以， 不能有两次质检结果为打磨 - if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) - { - 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); //记录中已返喷次数 - - int keHuiPen = Function.keHuiPen(barcode); //基础数据中,可返喷次数 - if (keHuiPen > 1) - keHuiPen = 1; - - if (keHuiPen > 0 && cs < keHuiPen) - { - #region 必须选择缺陷位置与缺陷原因，否则无法保存 - - if (CheckDefect() == false) return; - - #endregion - - #region 判断产品是否有颜色 - string colorName = string.Empty; - string partName = string.Empty; - - if (CheckColor(ref colorName, ref partName) == false) return; - #endregion - - ClearControlColor(SetControlGroup()); - btnRepair.BackColor = Color.Yellow; - - //string lastRst = GetLastInspectRst(txtBarCode.Text.Trim()); - //if (lastRst.Contains("打磨")) - //{ - // ShowHint("条码已判定为返喷，无需重复判定"); - // MessageBox.Show("条码已判定为返喷，无需重复判定"); - // Clear(); - // return; - //} - - - bool rr = SaveBeforeVerify("返喷"); - if (rr == false) - { - return; - } - SaveRst("", colorName, partName, 9); - - } - else - { - ShowHint("根据该零件可回喷次数设置，不能判定为返喷或已超过返喷次数！"); - MessageBox.Show("根据该零件可回喷次数设置，不能判定为返喷或已超过返喷次数！"); - Clear(); - return; - } - - #endregion - } - catch(Exception ex) - { - ShowHint("执行返喷操作发生异常,异常原因:"+ex.Message); - MessageBox.Show("执行返喷操作发生异常,异常原因:" + ex.Message); - Clear(); - } - - } - - /// - /// 报废按钮 - /// - /// - /// - private void btnAbt_Click(object sender, EventArgs e) - { - try - { - if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) - { - MessageBox.Show("请先扫描数据,然后操作."); - return; - } - - #region 返喷下线数据验证 - if (lableFP.Text.Contains("[返喷]")) - { - string barcode = txtBarCode.Text.Trim(); - DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); - if (dtInspect != null && dtInspect.Rows.Count > 0) - { - string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果 - string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色 - if (inspectResult.Contains("打磨")) - { - string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间 - int count = 0; - string colorInfo = ""; - if (_lineCode == "2") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo); - } - else if (_lineCode == "1") - { - count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo); - - } - else - { - - } - - if (count == 0) - { - MessageBox.Show("未发现返喷下线数据！，无法进行质量判定"); - return; - } - } - } - - } - #endregion - - // if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行报废操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; - - //UserInput(userName => { - - //string userName = Program.UserName; - // if (string.IsNullOrEmpty(userName)) - // { - // MessageBox.Show("报废必须录入用户名."); - // return; - // } - // else - // { - ShowHint(""); - #region 必须选择缺陷位置与缺陷原因，否则无法保存 - if (CheckDefect() == false) return; - #endregion - - #region 判断产品是否有颜色 - string colorName = string.Empty; - 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; - //} - //if (lastRst.Contains("报废")) - //{ - // MessageBox.Show("条码已判定为报废，无需重复报废"); - // Clear(); - // return; - //} - - ClearControlColor(SetControlGroup()); - btnAbt.BackColor = Color.Red; - - bool rr = SaveBeforeVerify("报废"); - if (rr == false) - { - return; - } - - SaveRst("报废", colorName, partName, 2); - - // } - // }); - } - - catch(Exception ex) - { - ShowHint("执行报废操作发生异常,异常原因:" + ex.Message); - MessageBox.Show("执行报废操作发生异常,异常原因:" + ex.Message); - Clear(); - } - - } - /// - /// - /// - /// - /// - /// - /// 0-不合格;1-合格；9-返喷 8-其他 - void SaveRst(string state, string colorName, string partName,int isOK,string userName="") - { - if (string.IsNullOrEmpty(userName)) - { - userName = Program.UserName; - } - if (string.IsNullOrEmpty(userName)) - { - - } - - if(reason.Contains("点修补") && state!="其它") - { - MessageBox.Show("选择[点修补],只能判定为[其它]状态,不能判定为"+ state); - return; - } - string bcode = txtBarCode.Text.Trim(); - - bool ispass = ScanCodeValidVerify(bcode); - if (ispass == false) - { - txtBarCode.SelectAll(); - return; - } - - - - //保存 - string id = SaveInspect(state, colorName, partName, userName); - - try - { - if (!string.IsNullOrEmpty(id)) - { - string interfaceMsg = string.Empty; - bool rst = SendToWms(txtBarCode.Text.Trim(), isOK,ref interfaceMsg); - if (rst == false) - { - DeleteRepectRst(id, "Web接口调用返回false,原因:" + interfaceMsg, bcode); - } - else - { - ShowHint(txtBarCode.Text.Trim()+"操作成功",true); - Clear(); - } - } - else - { - MessageBox.Show("质检记录保存失败,请重新操作."); - return; - } - - } - catch (Exception ex) - { - if (ex.Message.Contains("WMS")) - { - DeleteRepectRst(id,"Web接口调用抛出异常,异常原因:" + ex.Message , bcode); - } - ShowHint(state+"-WMS报工异常,原因:" + ex.Message); - MessageBox.Show(state+"-WMS报工异常,原因:" + ex.Message); - LogHelper.WriteLog(state+"-WMS报工调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); - } - } - private void DeleteRepectRst(string id,string msg,string oneBarCode) - { - Function.DelInspectRst(id); - LogHelper.WriteLog($"接口异常,删除塑件[{oneBarCode}]喷涂质检记录,异常内容:" + msg, MethodBase.GetCurrentMethod().Name); - } - - /// - /// - /// - /// - /// - 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:返喷 - bool SendToWms(string scanBarCode, int isOk,ref string errorMsg) - { - try - { - if (_isTest == "true") - return true; - - //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) - //{ - - // MessageBox.Show("调用远程接口失败"); - // ShowHint("调用远程接口失败: " + errorReason); - - // _lastJustDict.Clear(); - // _lastJustDict.Add(scanBarCode, isOk.ToString()); - - // return false; - //} - //_lastJustDict.Clear(); - return true; - } - catch(Exception ex) - { - throw new Exception("WMS接口调用异常,异常原因:" + ex.Message); - } - - } - /// - /// 判断产品是否有颜色 - /// - /// - bool CheckColor(ref string colorName,ref string partName) - { - string[] ss = null; - if (string.IsNullOrEmpty(labProductInfo.Text)) - { - MessageBox.Show("颜色信息有误，请重新扫描"); - return false; - } - if (labProductInfo.Text.Contains("，")) - { - ss = labProductInfo.Text.Split('，'); - } - else - { - ss = labProductInfo.Text.Split(','); - } - if (ss.Length >= 1) - { - if (string.IsNullOrWhiteSpace(ss[0])) - { - MessageBox.Show("无颜色信息，请重新扫描"); - return false; - } - } - else - { - MessageBox.Show("颜色信息有误1，请重新扫描"); - return false; - } - colorName = ss[0]; - if (ss.Length > 1) - { - if (!string.IsNullOrEmpty(ss[1])) - { - partName = ss[1]; - } - } - return true; - } - /// - /// 必须选择缺陷位置与缺陷原因，否则无法保存 - /// - /// - bool CheckDefect() - { - string damnPositionTemp = ""; - string reasonTemp = ""; - //缺陷位置 - foreach (Control c in pictureBox2.Controls) - { - Label lab = c as Label; - if (lab.BackColor != Color.Transparent) - { - damnPositionTemp += lab.Text + ";"; - position = damnPositionTemp; - } - } - //缺陷原因 - foreach (Control c in panel2.Controls) - { - Label lab = c as Label; - if (lab.BackColor != Color.Transparent) - { - reasonTemp += lab.Text + ";"; - reason = reasonTemp; - } - } - - if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) - { - MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); - return false; - } - return true; - } - /// - /// 保存质检记录 tb_InspectResult - /// - /// - /// - /// - /// 返回插入记录的ID - public string SaveInspect(string inspectResult,string colorName, string partName,string userName) - { - try - { - - return ""; - } - catch (Exception ex) - { - ShowHint("质检提交异常,原因:" + ex.Message); - LogHelper.WriteLog("质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); - MessageBox.Show("质检提交异常,原因:" + ex.Message); - return null; - } - } - void ShowHint(string txt,bool isOk =false) - { - lbForeig.ForeColor = Color.Red; - lbForeig.Text = txt; - if(isOk == true) - { - lbForeig.ForeColor = Color.Green; - } - } - public void ClearInspect() - { - //缺陷位置 - foreach (Control c in pictureBox2.Controls) - { - Label lab = c as Label; - lab.BackColor = Color.Transparent; - } - //缺陷原因 - foreach (Control c in panel2.Controls) - { - Label lab = c as Label; - lab.BackColor = Color.Transparent; - } - } - - /// - /// 扫码-根据条码查询信息（产品信息、加载图片及缺陷原因、三次检验信息） - /// - /// - /// - private void txtBarCode_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - try - { - btnOk.Enabled = true; - btnRepair.Enabled = true; - btnNok.Enabled = true; - - lbForeig.Text = ""; - ClearPage(); - if (string.IsNullOrEmpty(lbPlanCode.Text)) - { - throw new Exception("当前没有生产计划."); - } - ScanBarCode(); - } - catch (Exception ex) - { - MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。"+ ex); - LogHelper.WriteLog(ex.ToString(), MethodBase.GetCurrentMethod().Name); - } - } - } - - private void ScanBarCode() - { - try - { - ButtonEnable(SetControlGroup()); - //ClearPage(); - - string barcode = txtBarCode.Text.Trim(); - if (barcode.Contains(".")) - { - barcode = Function.TransToBarCodeOne(barcode); - } - - #region 判断条码有效性 - - if (! Function.BarCodeValid(barcode)) - { - MessageBox.Show("扫描的条码号："+barcode+"无效，请重新扫描！"); - txtBarCode.Text = ""; - return; - } - //bool ispass = ScanCodeValidVerify(barcode); - //if (ispass == false) - //{ - // txtBarCode.SelectAll(); - // return; - //} - - DataTable stockInTable = Function2.SearchStockIn(barcode); - if(stockInTable.Rows.Count == 0) - { - ShowHint("扫描半成品码没有喷涂完工记录,无法使用.",false); - return; - } - - DataTable punchTable = Function2.SearchPunchCodeRecord(barcode); - if(punchTable.Rows.Count > 0) - { - if(punchTable.Rows[0]["Flag"].ToString() == "0" || punchTable.Rows[0]["Flag"].ToString() == "1") - { - ShowHint("扫描半成品码已存在装配记录,无法使用.", false); - return; - } - } - DataTable productTable = Function2.GetProductInfo(barcode.Substring(0, 10)); - if(productTable.Rows.Count == 0) - { - ShowHint($"扫描半成品码的存货代码[{barcode.Substring(0, 10)}]在零件表找不对对应零件号,请检查系统维护.", false); - return; - } - string asselblePartCode = Function2.GetAssemblePartCode(productTable.Rows[0]["PartNo"].ToString(), _stationNo); - - if(lbProductCode.Text?.ToLower() != asselblePartCode?.ToLower()) - { - ShowHint($"扫描半成品码在BOM中对应的总成零件号[{asselblePartCode}]与当前计划的零件号[{lbProductCode.Text}]不匹配.", false); - return; - } - - DataTable bomTable = Function2.GetBomTable(asselblePartCode, _stationNo); - List list = bomTable.AsEnumerable().Where(p => p.Field("IsChecked") == 1).ToList(); - - - #endregion - - - - - #region 如果是补打的条码，查询产品信息 - - //if (!barcode.Contains(".") && barcode.Length > 4) - //{ - // string strCode = barcode.Substring(barcode.Length - 4, 4); - // int num = 0; - // Int32.TryParse(strCode, out num); - // if (num > 7000) - // { - // labProductInfo.Text = Function.GetReprintInfo2(barcode); - // if (string.IsNullOrWhiteSpace(labProductInfo.Text.Trim())) - // { - // ButtonDisable(SetControlGroup()); - // labProductInfo.Text = "没有查询到补打条码信息"; - // return; - // } - // } - - //} - - #endregion - - //根据条码查询，加载图片及原因 - int row = 0, col = 0; - string picture = ""; - - #region 缺陷原因 - - try - { - int drow = 0, dcol = 5; //行，列 - - DataTable dt3 = Function.SearchDefectInfo(ConfigurationManager.AppSettings["Station"].Trim()); - if (dt3 != null && dt3.Rows.Count > 0) - { - drow = Convert.ToInt32(Math.Ceiling((double)dt3.Rows.Count / dcol)); - Label[] dLb = new Label[7]; - string[] dstr = new string[dt3.Rows.Count]; - - for (int i = 0; i < dt3.Rows.Count; i++) - { - dstr[i] = dt3.Rows[i]["DefectName"].ToString(); - } - - for (int i = 0; i < dcol; i++) //列 - { - for (int j = 0; j < drow; j++) //行 - { - dLb[i] = new Label(); - if ((i + dcol * j) < dstr.Length) - { - - dLb[i].Text = dstr[i + dcol * j].ToString(); - dLb[i].Font = new Font(dLb[i].Font.FontFamily, 24, FontStyle.Bold); - dLb[i].Size = new Size(150, 50); - dLb[i].Location = new Point(20 + i * (dLb[i].Size.Width + 25), 5 + j * (dLb[i].Size.Height + 20)); - dLb[i].BorderStyle = BorderStyle.FixedSingle; - dLb[i].BackColor = Color.Transparent; - dLb[i].TextAlign = ContentAlignment.MiddleCenter; - - if (dLb[i].Text.Contains("点修补")) - { - dLb[i].Font = new Font(dLb[i].Font.FontFamily, 36, FontStyle.Bold); - dLb[i].Size = new Size(170, 60); - dLb[i].ForeColor = Color.Red; - //dLb[i].BackColor = Color.Red; - } - panel2.Controls.Add(dLb[i]); - dLb[i].Click += new EventHandler(dLbRoom_Click); - } - } - } - } - } - catch (Exception ex) - { - LogHelper.WriteLog("缺陷项-"+ex.ToString(), MethodBase.GetCurrentMethod().Name); - throw ex; - } - - #endregion - - #region 加载图片 - - try - { - DataTable dt2 = Function.SearchInfoByBarCode(barcode); - - if (dt2 != null && dt2.Rows.Count > 0) - { - row = Convert.ToInt32(dt2.Rows[0]["Rows"].ToString()); - col = Convert.ToInt32(dt2.Rows[0]["Cols"].ToString()); - picture = dt2.Rows[0]["PicturePath"].ToString(); - } - dt2.Dispose(); - - if (!string.IsNullOrEmpty(picture)) - { - if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) - { - - string strImageURL = Function.GetImgPath() + picture; - - if(_isTest != "true") - { - System.Net.WebClient webClient = new System.Net.WebClient(); - webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); - } - - } - - - FileStream fs = new FileStream(Directory.GetCurrentDirectory() + "\\" + picture, FileMode.Open, - FileAccess.Read);//获取图片文件流 - Image img = Image.FromStream(fs); // 文件流转换成Image格式 - pictureBox2.Image = img; //给 图片框设置要显示的图片 - fs.Close(); // 关闭流，释放图片资源 - } - } - catch (Exception ex) - { - LogHelper.WriteLog("图片项-" + ex.ToString(), MethodBase.GetCurrentMethod().Name); - } - #endregion - - #region 缺陷图划分区域 - - Label[] lb = new Label[5]; - string[] str = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" }; - - for (int i = 0; i < col; i++) - { - for (int j = 0; j < row; j++) - { - lb[i] = new Label(); - lb[i].Text = str[i + col * j].ToString(); - lb[i].Font = new Font(lb[i].Font.FontFamily, 32, FontStyle.Bold); - - lb[i].Size = new Size(pictureBox2.Width / col, pictureBox2.Height / row); - lb[i].Location = new Point(0 + i * lb[i].Size.Width, 0 + j * lb[i].Size.Height); - lb[i].BorderStyle = BorderStyle.FixedSingle; - lb[i].BackColor = Color.Transparent; - lb[i].TextAlign = ContentAlignment.MiddleCenter; - pictureBox2.Controls.Add(lb[i]); - - lb[i].Click += new EventHandler(lblRoom_Click); - } - } - - #endregion - - //不是补打的条码，根据条码查询产品信息、检验信息，选中缺陷位置及原因 - DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); - if (dtInspect != null && dtInspect.Rows.Count > 0) - { - //List list = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("打磨")).ToList(); - //string state = string.Empty; - //if (list.Count > 0) - //{ - // state = "返喷"; - //} - //List list2 = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("其它")).ToList(); - //if (list2.Count > 0) - //{ - // if(list2.Where(p=> p.Field("inspectResult")=="其它WMS").Count() > 0) - // { - // state = state + ",其它WMS"; - // } - // if (list2.Where(p => p.Field("inspectResult") == "其它").Count() > 0) - // { - // state = state + ",其它"; - // } - - //} - - //if (!string.IsNullOrEmpty(state)) - //{ - // lableFP.Text = "存在[" + state + "]状态"; - //} - - //_carType = dtInspect.Rows[0]["CarType"].ToString().Trim(); - //labProductInfo.Text = dtInspect.Rows[0]["productInfo"].ToString().Trim(); //产品信息 - ////string position1 = dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置 - ////string reason1 = dtInspect.Rows[0]["reason"].ToString(); //原因 - //position= dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置 - //reason= dtInspect.Rows[0]["reason"].ToString(); //原因 - - - - //paintId = dtInspect.Rows[0]["remark3"].ToString(); //原因 - - //string stationNo = dtInspect.Rows[0]["stationNo"].ToString(); //质检工位 - //if(!_stations.Contains(stationNo)) - //{ - - // //ShowHint(em, false); - // txtBarCode.Text = ""; - // txtBarCode.TabIndex = 0; - // txtBarCode.Select(); - // return; - //} - - //#region 选中缺陷位置及原因 - - //foreach (Control c in pictureBox2.Controls) - //{ - // Label lab = c as Label; - // if (position.Contains(lab.Text)) - // { - // lab.BackColor = Color.FromArgb(150, System.Drawing.Color.Chartreuse); - // count++; - // } - //} - //foreach (Control c in panel2.Controls) - //{ - // Label lab = c as Label; - // if (reason.Contains(lab.Text)) - // { - // lab.BackColor = Color.Chartreuse; - // reason += lab.Text + ";"; - // } - //} - - //#endregion - - #region 根据一检结果显示一检时的位置--暂时不要 - - labProPosition.Text = Function.GetFirstInsPosition2(dtInspect); - - #endregion - } - else - { - - #region 没有一检结果，查询老外数据库，取产品信息 - if ((_isSingleStation==true )) - { - string paintError = string.Empty; - //喷涂线边质检,没有质检结果,查询老外数据库，取产品信息 - string foreignVal = string.Empty; - if(_lineCode == "2") - { - foreignVal = Function.GetProductInfoFrWms(barcode, "TM_BJBMPT_MES_DATA", ref paintError); - } - else if (_lineCode == "1") - { - foreignVal = Function.GetProductInfoFrWms(barcode, "TM_BJBMPT_MES_DATA_OLD", ref paintError); - - } - else - { - foreignVal = Function.GetProductInfo2(barcode, ref paintError); - } - if (!string.IsNullOrEmpty(paintError)) - { - lbForeig.Text = paintError; - } - if (string.IsNullOrEmpty(foreignVal)) - { - return; - } - string[] info = foreignVal.Split('，'); - if (!string.IsNullOrEmpty(paintError)) - { - ShowHint(paintError); - } - _foreighColor = info[0]; - labProductInfo.Text = info[0] + "，" + info[1]; - paintId = info[2]; - labProPosition.Tag = paintId; - labProductInfo.Tag = Function.GetSide(barcode, paintId); - labProPosition.Text = labProductInfo.Tag.ToString().Replace(';', ' '); - if (info.Length == 4) - { - _foreignPartCode = info[3]; - } - } - else - { - //库房返喷,没有质检结果,不能查老外库,就是条码不正确 - MessageBox.Show("没有喷涂线边质检记录,无法返喷操作!"); - txtBarCode.Text = ""; - txtBarCode.TabIndex = 0; - txtBarCode.Select(); - return ; - } - - - #endregion - } - - - txtBarCode.SelectAll(); - } - catch (Exception ex) - { - MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。" + ex.ToString()); - LogHelper.WriteLog("整体项-" + ex.ToString(), MethodBase.GetCurrentMethod().Name); - } - } - /// - /// 一检 二检 点修补扫码是否允许验证 - /// - /// - /// - private bool ScanCodeValidVerify(string barcode) - { - //string position = _stationType; - // switch (position) - // { - // case "下线一检": return First(barcode); - // case "下线二检": return Second(barcode);; - // case "下线点修补": return Third(barcode); - // default:return true; - - // } - return true; - - } - - private bool First(string barcode) - { - if(_isSingleStation == true) - { - ShowHint("当前系统配置为[单工位生产],无法在此工位扫码,请去终检工位进行操作.", false); - return false; - } - - DataTable dt = Function.GetLastResult(barcode); - if (dt.Rows.Count > 0) - { - ShowHint("扫描条码["+ barcode + "]已存在质检记录,无法在[下线一检]工位进行重新扫码." , false); - return false; - } - return true; - } - - private bool Second(string barcode) - { - DataTable dt = Function.GetLastResult(barcode); - if (_isSingleStation == false) - { - if (dt.Rows.Count == 0) - { - ShowHint("扫描条码[" + barcode + "]不存在[下线一检]记录,无法在[下线二检]工位进行扫码.", false); - return false; - } - - DataRow dr = dt.Rows[0]; - if (dr["reason"].ToString().Contains("点修补") && dr["inspectResult"].ToString().Contains("其它")) - { - ShowHint("扫描条码[" + barcode + "]上次质量判定为[点修补],无法进行二检扫码.", false); - return false; - } - if (dr["inspectResult"].ToString().Contains("报废")) - { - ShowHint("上次质量判定为[报废],无法进行二检扫码.", false); - return false; - } - } - - - return true; - } - - /// - /// 点修补扫码校验 - /// - /// - /// - private bool Third(string barcode) - { - string errorMsg = string.Empty; - bool isExsit = Function. GetPointRepairFrWms(barcode, ref errorMsg); - if(isExsit == false) - { - if (!string.IsNullOrEmpty(errorMsg)) - { - ShowHint("在wms系统的查询返修入库记录时发生错误,错误原因:"+errorMsg, false); - return false; - - } - else{ - ShowHint("没有在wms系统的返修入库记录,无法进行点修补.", false); - return false; - } - - } - DataTable dt = Function.GetLastResult(barcode); - if (dt.Rows.Count > 0) - { - if(dt.Rows[0]["reason"].ToString().Contains("点修补") && dt.Rows[0]["inspectResult"].ToString().Contains("其它")) - { - return true; - } - else - { - ShowHint("必须上次质量判定记录为点修补,类型为其它,才能在当前[点修补]工位扫码.", false); - return false; - } - } - else - { - ShowHint("没有初始质量判定记录,无法在[点修补]工位扫码.", false); - return false; - } - - - - } - - /// - /// 设置按钮不可用 - /// - /// - private void ButtonDisable(Control[] controls) - { - foreach (Control c in controls) - { - Button btn = c as Button; - btn.Enabled = false; - } - } - - /// - /// 设置按钮可用 - /// - /// - private void ButtonEnable(Control[] controls) - { - foreach (Control c in controls) - { - Button btn = c as Button; - btn.Enabled = true; - } - } - - private void labWorkClass_Click(object sender, EventArgs e) - { - Function.ChangeWorkClass(labWorkClass); - } - - /// - /// 点击退出 - /// - /// - /// - private void labTime_Click(object sender, EventArgs e) - { - Environment.Exit(0); - } - - /// - /// 清空页面 - /// - private void ClearPage() - { - labProductInfo.Tag = null; - labProductInfo.Text = ""; - //btnAbt.BackColor = Color.LightGray; - //btnRepair.BackColor = Color.LightGray; - - //ClearRadioButton(); - ClearInspect(); - ClearControlColor(SetControlGroup()); - pictureBox2.Controls.Clear(); - panel2.Controls.Clear(); - pictureBox2.Image = null; - txtBarCode.TabIndex = 0; - txtBarCode.Select(); - position = ""; - reason = ""; - lableFP.Text = ""; - _foreighColor = ""; - _foreignPartCode = ""; - _carType = string.Empty; - } - - public void ClearRadioButton() - { - groupBox1.Controls.Clear(); - } - - public void ClearTxtBarcode() - { - txtBarCode.Text = ""; - labProPosition.Text = ""; - } - - public void LoadScreen() - { - DataTable dt = Function2.GetProScreen(_stationNo); - if (dt != null && dt.Rows.Count > 0) - { - SetPage(dt); - } - - } - private void SetPage(DataTable dt) - { - IsHigh = "1"; - lbPlanCode.Text = ""; - lbProductCode.Text = ""; - lbProductName.Text = ""; - - - if (dt != null && dt.Rows.Count > 0) - { - lbPlanCode.Text = dt.Rows[0]["OrderNo"].ToString(); - lbPlanCode.Tag = dt.Rows[0]["ID"].ToString(); - lbProductName.Text = dt.Rows[0]["ProductName"].ToString(); - lbProductCode.Text = dt.Rows[0]["PartNo"].ToString(); - - SetProduceCount(dt.Rows[0]); - } - - } - /// - /// 设置生产数量 - /// - /// - void SetProduceCount(DataRow planRow) - { - int planQty = 0; - int okQty = 0; - int badQty = 0; - int repairQty = 0; - - int.TryParse(planRow["OrderCount"].ToString(), out planQty); - int.TryParse(planRow["OKCount"].ToString(), out okQty); - int.TryParse(planRow["BadCount"].ToString(), out badQty); - int.TryParse(planRow["RepairCount"].ToString(), out repairQty); - lbPlanQty.Text = planQty.ToString(); - lbPlanCompleteQty.Text = (okQty+ badQty).ToString(); - lbOkCount.Text = okQty.ToString(); - lbRepairCount.Text = repairQty.ToString(); - lbBadCount.Text = badQty.ToString(); - } - - private void btnPlanUp_Click(object sender, EventArgs e) - { - LoadPlanScreen(lbPlanCode.Tag?.ToString(), "上一计划"); - txtBarCode.Select(); - txtBarCode.Focus(); - } - - private void btnPlanDown_Click(object sender, EventArgs e) - { - LoadPlanScreen(lbPlanCode.Tag?.ToString(), "下一计划"); - txtBarCode.Select(); - txtBarCode.Focus(); - } - public void LoadPlanScreen(string id, string plan) - { - - DataTable dt = Function2.GetProScreenPlan(id, _stationNo, plan); - if (dt != null && dt.Rows.Count > 0) - { - SetPage(dt); - } - else - { - if (plan == "下一计划") - { - MessageBox.Show("无下一计划"); - txtBarCode.SelectAll(); - txtBarCode.Focus(); - } - else - { - MessageBox.Show("无上一计划"); - txtBarCode.SelectAll(); - txtBarCode.Focus(); - } - } - txtBarCode.SelectAll(); - txtBarCode.Focus(); - } - - private void txtBarCode_DoubleClick(object sender, EventArgs e) - { - txtBarCode.SelectAll(); - } - - } -} diff --git a/PunchingMistake/FrmQualityNew1.resx b/PunchingMistake/FrmQualityNew1.resx deleted file mode 100644 index 3d1eb78..0000000 --- a/PunchingMistake/FrmQualityNew1.resx +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - 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 - RK5CYII= - - - \ No newline at end of file diff --git a/PunchingMistake/Function2.cs b/PunchingMistake/Function2.cs index 9dc42e3..0313b78 100644 --- a/PunchingMistake/Function2.cs +++ b/PunchingMistake/Function2.cs @@ -1085,6 +1085,103 @@ namespace PunchingMistake return ""; } } + public static DataTable GetLastQualityResult(string barcode) + { + + DataTable res = null; + try + { + string sql = string.Empty; + if (barcode.Contains(".")) + { + sql = $"select top 1 * from tb_Punch_Quality where ZcBarCode ='{barcode}' order by id desc "; + } + else + { + sql = $"select top 1 * from tb_Punch_Quality where barcode ='{barcode}' order by id desc "; + + } + + res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + return res; + } + catch (Exception ex) + { + //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + LogHelper.WriteLog($"查询tb_Punch_Quality表错误，barcode ='{barcode}' ,异常信息:" + ex.Message); + } + return null; + } + public static string GetCarType(string partNo) + { + + DataTable res = null; + try + { + string sql = sql = $"select CarTypeName from v_Car where PartNo='{partNo}' "; + + res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + + if (res.Rows.Count > 0) + { + return res.Rows[0]["CarTypeName"].ToString(); + } + return null; + } + catch (Exception ex) + { + LogHelper.WriteLog($"查询tb_CarType表错误 ,异常信息:" + ex.Message); + } + return null; + } + /// + /// + /// + /// + /// (1合格、2报废) + /// + /// + /// + /// + public static string InsertPunchQuality(string state, string zcBarCode, string ZcPartNo,string barcode, string userName) + { + int res = 0; string sql = string.Empty; + try + { + string carType = Function2.GetCarType(ZcPartNo); + sql = @" INSERT INTO [dbo].[TM_BJBMPT_MYASSEMBE] + ( + [BarCode] + ,[LU_Code] + ,[IsOk] + ,[CreationTime] + ,[MESOperName] + ,[Models] + ,[Remark] + ) + VALUES + ('" + zcBarCode + @"' + ,'" + ZcPartNo + @"' + ,'" + state + @"' + ,(select getdate()), '" + @"' + ,'" + userName + @"' + ,'" + carType + @"' + ,'" + barcode + @"' + );select @@Identity "; + DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (dt.Rows.Count > 0) + { + return dt.Rows[0][0].ToString(); + } + return ""; + } + catch (Exception ex) + { + LogHelper.WriteLog($"插入tb_Punch_Quality表错误，sql ='{sql}' ,异常信息:" + ex.Message); + return ""; + } + } + public static DataTable SearchDefectInfo(string stationNo) { DataTable res = new DataTable(); diff --git a/PunchingMistake/PunchingMistake.csproj b/PunchingMistake/PunchingMistake.csproj index 12b807b..fff6b59 100644 --- a/PunchingMistake/PunchingMistake.csproj +++ b/PunchingMistake/PunchingMistake.csproj @@ -106,12 +106,6 @@ FrmProScreen3.cs - - Form - - - FrmQualityNew1.cs - Form @@ -152,9 +146,6 @@ FrmProScreen3.cs - - FrmQualityNew1.cs - FrmQuality.cs