From 5b05d6d0e8005e7a46671ecec74abad6932baeec Mon Sep 17 00:00:00 2001 From: ldw <11622064+ldw888@user.noreply.gitee.com> Date: Sun, 14 Sep 2025 16:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9A=E5=BA=A6ng=E6=A3=80=E6=B5=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JinYuan.ControlCenter/ControlCenter_Plc.cs | 128 ++++++++----- JinYuan.Models/AGearEntity.cs | 2 +- JinYuan.Models/BGearEntity.cs | 26 ++- LargeSquareOne/FrmDataMonitor.Designer.cs | 213 +++++++-------------- LargeSquareOne/FrmDataMonitor.resx | 11 +- 5 files changed, 176 insertions(+), 204 deletions(-) diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index 94301b2..15f92a0 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -257,18 +257,35 @@ namespace JinYuan.ControlCenters } return Result; } - private int JudgmentWGJResult(int A, int[,] B, int C) + private int JudgmentCCDResult(int A, int[,] B, int C) { + var ngType = new string[16] {"正面(2D/3D)结果", + "反面(2D/3D)结果", + "左侧面(2D/3D)结果", + "右侧面(2D/3D)结果", + "顶面(2D/3D)结果", + "底面(2D/3D)结果", + "底DE1结果", + "底DE2结果", + "底DE3结果", + "底DE4结果", + "中ME1结果", + "中ME2结果", + "中ME3结果", + "中ME4结果", + "极柱(POS/NEG)结果", + "防爆阀(PRO)结果" + }; int Result = 1; OK_NG = "OK"; - for (int i = 0; i < 27; i++) + for (int i = 0; i < 16; i++) { if (B[C,i] !=1) { //1OK，2扫码NG，3MES反馈NG，4其他NG Result = 4; OK_NG = "NG"; - NG_Type += $"外观检测NG{i + 1},"; + NG_Type += $"{ngType[i]}(NG),"; } } if (A == 2) @@ -280,6 +297,26 @@ namespace JinYuan.ControlCenters return Result; } + private int JudgmentThickNessResult(int[,] B, int C,int ccdResult =1) + { + var ngType = new string[3] {"厚度1结果", + "厚度2结果", + "厚度3结果" + }; + int Result = ccdResult; + for (int i = 0; i < 3; i++) + { + if (B[C, i] != 1) + { + //1OK，2扫码NG，3MES反馈NG，4其他NG + Result = 4; + OK_NG = "NG"; + NG_Type += $"{ngType[i]}(NG),"; + } + } + + return Result; + } #region 上料工位(数据处理) /// /// 上料工位 @@ -432,7 +469,7 @@ namespace JinYuan.ControlCenters { m.Flag = 0; m.ID = i + 1; - m.CNum = "i"; + m.CNum = m.ID.ToString(); //电芯反馈结果 listRes[i] = 1; m.Result = "OK"; @@ -1768,33 +1805,42 @@ namespace JinYuan.ControlCenters //芯包信息1 D3300~D3326 //芯包信息2 D3330~D3356 //芯包信息3 D3360~D3386 - for (int j = 0; j < 27; j++) + for (int j = 0; j < 16; j++) { m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB); } + //厚度3400 for (int j = 0; j < 3; j++) { m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB); } - for (int j = 0; j < 27; j++) + //厚度plc 3500 + for (int j = 0; j < 3; j++) + { + m.Thickness_PLCData[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 500 + i * 30 * 2 + j * 2, DataFormat.CDAB); + } + //不良ng编号 + for (int j = 0; j < 16; j++) { m.CCD_NgNo[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 2200 + i * 30 * 2 + j * 2, DataFormat.CDAB); } + //芯包扫码时间 //m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); m.BarCode = listBarCode[i]; //m.CSBYHCODEA = "TEST"; - - var EX = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetChallengeCode(m.BarCode)); - for (int j = 0; j < EX.Count; j++) - { - if (string.Compare(EX[j].ChallengeBarCode, m.BarCode) == 0) - { - m.Remark += "(极限件," + EX[j].CodeMessage + "," + EX[j].WeldingCCD + ")"; - ChallengeFlag = 1; - } - } + #region 极限件查询 + //var EX = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetChallengeCode(m.BarCode)); + //for (int j = 0; j < EX.Count; j++) + //{ + // if (string.Compare(EX[j].ChallengeBarCode, m.BarCode) == 0) + // { + // m.Remark += "(极限件," + EX[j].CodeMessage + "," + EX[j].WeldingCCD + ")"; + // ChallengeFlag = 1; + // } + //} + #endregion //查询进站时间数据 var w = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetInTime(m.BarCode)); //获取新一行数据 @@ -1852,19 +1898,12 @@ namespace JinYuan.ControlCenters m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 0 ? "NG" : "缺图"); m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 0 ? "NG" : "缺图"); m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 0 ? "NG" : "缺图"); - m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 0 ? "NG" : "缺图"); - m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 0 ? "NG" : "缺图"); - m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 0 ? "NG" : "缺图"); - m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 0 ? "NG" : "缺图"); - m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 0 ? "NG" : "缺图"); - m.CCDResult22 = m.CCD_Data[i, 21] == 1 ? "OK" : (m.CCD_Data[i, 21] == 0 ? "NG" : "缺图"); - m.CCDResult23 = m.CCD_Data[i, 22] == 1 ? "OK" : (m.CCD_Data[i, 22] == 0 ? "NG" : "缺图"); - m.CCDResult24 = m.CCD_Data[i, 23] == 1 ? "OK" : (m.CCD_Data[i, 23] == 0 ? "NG" : "缺图"); - m.CCDResult25 = m.CCD_Data[i, 24] == 1 ? "OK" : (m.CCD_Data[i, 24] == 0 ? "NG" : "缺图"); - m.CCDResult26 = m.CCD_Data[i, 25] == 1 ? "OK" : (m.CCD_Data[i, 25] == 0 ? "NG" : "缺图"); - m.CCDResult27 = m.CCD_Data[i, 26] == 1 ? "OK" : (m.CCD_Data[i, 26] == 0 ? "NG" : "缺图"); #endregion - + #region //厚度判定结果 + m.ThicknessResult1 = m.Thickness_PLCData[i, 0] == 1 ? "OK" : (m.Thickness_PLCData[i, 0] == 0 ? "NG" : "缺测"); + m.ThicknessResult2 = m.Thickness_PLCData[i, 1] == 1 ? "OK" : (m.Thickness_PLCData[i, 1] == 0 ? "NG" : "缺测"); + m.ThicknessResult3 = m.Thickness_PLCData[i, 2] == 1 ? "OK" : (m.Thickness_PLCData[i, 2] == 0 ? "NG" : "缺测"); + #endregion m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); m.CSBYHPROCESSNAME = "外观检测"; m.CSBYHSCHEDULE = CommonMethods.strClass; @@ -1874,12 +1913,12 @@ namespace JinYuan.ControlCenters m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]); m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]); m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]); - + m.ChannelNo = i + 1; //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置， //芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折 if (Code_NG == 1) { - for (int ii = 0; ii < 27; ii++) + for (int ii = 0; ii < 16; ii++) { if (m.CCD_Data[i, ii] != 1) { @@ -1892,8 +1931,8 @@ namespace JinYuan.ControlCenters } else MyRes[i] = 2;//扫码NG - MyRes[i] = JudgmentWGJResult(Code_NG, m.CCD_Data,i); - + MyRes[i] = JudgmentCCDResult(Code_NG, m.CCD_Data,i); + MyRes[i] = JudgmentThickNessResult(m.Thickness_PLCData, i, MyRes[i]); m.Result = MyRes[i]; m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG; @@ -2027,18 +2066,19 @@ namespace JinYuan.ControlCenters //if (m.list_Data1[i, 12] == 2) { m.Remark += ",芯包CCD极性检测NG"; } m.UpState = "未上传"; } - //极限件发3给PLC - if (ChallengeFlag == 1) - { - if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊前ccd") == 0) - { - MyRes[i] = 3; - } - if (string.Compare(EX[0].WeldingCCD, "焊后CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊后ccd") == 0) - { - MyRes[i] = 4; - } - } + #region//极限件发3给PLC + //if (ChallengeFlag == 1) + //{ + // if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊前ccd") == 0) + // { + // MyRes[i] = 3; + // } + // if (string.Compare(EX[0].WeldingCCD, "焊后CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊后ccd") == 0) + // { + // MyRes[i] = 4; + // } + //} + #endregion } catch (Exception ex) { diff --git a/JinYuan.Models/AGearEntity.cs b/JinYuan.Models/AGearEntity.cs index d589b84..e5eec1b 100644 --- a/JinYuan.Models/AGearEntity.cs +++ b/JinYuan.Models/AGearEntity.cs @@ -7,7 +7,7 @@ namespace JinYuan.Models /// public class AGearEntity { - [SugarColumn(IsIgnore = false)] //存储到数据库 + //[SugarColumn(IsIgnore = false)] //存储到数据库 public System.String CNum { get; set; } /// /// 电芯条码 diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs index 3f9a027..260730a 100644 --- a/JinYuan.Models/BGearEntity.cs +++ b/JinYuan.Models/BGearEntity.cs @@ -20,20 +20,20 @@ namespace JinYuan.Models public short[,] list_pan = new short[3, 1];//物流线托盘码 // - public int[,] CCD_Data = new int[3, 27];//芯包CCD信息1,2,3 - public int[,] CCD_NgNo = new int[3, 27];//芯包不良编码信息1,2,3 + public int[,] CCD_Data = new int[3, 16];//芯包CCD信息1,2,3 + public int[,] CCD_NgNo = new int[3, 16];//芯包不良编码信息1,2,3 public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3 + public int[,] Thickness_PLCData = new int[3, 3];//电芯3_厚度数据OKNG1,2,3 与ccd一样 1 OK，0 NG，2 缺图 /// - /// 时间 - /// - [SugarColumn(IsPrimaryKey = false)] - public System.String TestTime { get; set; } + /// 通道 + /// + public int ChannelNo { get; set; } /// /// A芯包扫码时间 /// [SugarColumn(IsPrimaryKey = false)] - public System.String CSBYHASCANNINGTIME { get; set; } + public string CSBYHASCANNINGTIME { get; set; } /// /// 上传状态 /// @@ -83,6 +83,18 @@ namespace JinYuan.Models public float Thickness2 { get; set; } public float Thickness3 { get; set; } /// + /// 电芯1_厚度 PLC判定 OKNG 1 OK，0 NG + /// + public int ThicknessPLCResult1 { get; set; } + public int ThicknessPLCResult2 { get; set; } + public int ThicknessPLCResult3 { get; set; } + /// + /// 电芯1_厚度OKNG 显示OK NG + /// + public string ThicknessResult1 { get; set; } + public string ThicknessResult2 { get; set; } + public string ThicknessResult3 { get; set; } + /// /// 电芯_CCD1结果 1 OK，0 NG，2 缺图 /// public string CCDResult1 { get; set; } diff --git a/LargeSquareOne/FrmDataMonitor.Designer.cs b/LargeSquareOne/FrmDataMonitor.Designer.cs index 17fef53..31117ff 100644 --- a/LargeSquareOne/FrmDataMonitor.Designer.cs +++ b/LargeSquareOne/FrmDataMonitor.Designer.cs @@ -54,6 +54,7 @@ this.dgvFeedingData = new System.Windows.Forms.DataGridView(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.InResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -62,11 +63,12 @@ this.rtb_Info = new System.Windows.Forms.RichTextBox(); this.groupBoxEX5 = new JinYuan.ControlLib.GroupBoxEX(); this.dgvBlankingData = new System.Windows.Forms.DataGridView(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column33 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column138 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -89,21 +91,11 @@ this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column114 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column115 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column116 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column117 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column118 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column119 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column120 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column121 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column122 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column123 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column147 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column34 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column102 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.tableLayoutPanel1.SuspendLayout(); this.groupBoxEX3.SuspendLayout(); this.groupBoxEX2.SuspendLayout(); @@ -135,7 +127,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 54.37666F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 477F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 1061); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1370, 749); this.tableLayoutPanel1.TabIndex = 0; // // groupBoxEX3 @@ -154,7 +146,7 @@ this.groupBoxEX3.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX3.Name = "groupBoxEX3"; this.groupBoxEX3.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX3.Size = new System.Drawing.Size(343, 262); + this.groupBoxEX3.Size = new System.Drawing.Size(206, 120); this.groupBoxEX3.TabIndex = 14; this.groupBoxEX3.TabStop = false; this.groupBoxEX3.Text = "操作设置"; @@ -163,7 +155,7 @@ // this.btSatrt.BackNormalColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.btSatrt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btSatrt.Location = new System.Drawing.Point(42, 105); + this.btSatrt.Location = new System.Drawing.Point(42, 29); this.btSatrt.Margin = new System.Windows.Forms.Padding(2); this.btSatrt.Name = "btSatrt"; this.btSatrt.Padding = new System.Windows.Forms.Padding(2); @@ -240,11 +232,11 @@ this.groupBoxEX2.Controls.Add(this.lVConfigRange); this.groupBoxEX2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX2.ForeColor = System.Drawing.Color.White; - this.groupBoxEX2.Location = new System.Drawing.Point(2, 268); + this.groupBoxEX2.Location = new System.Drawing.Point(2, 126); this.groupBoxEX2.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX2.Name = "groupBoxEX2"; this.groupBoxEX2.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX2.Size = new System.Drawing.Size(343, 313); + this.groupBoxEX2.Size = new System.Drawing.Size(206, 143); this.groupBoxEX2.TabIndex = 13; this.groupBoxEX2.TabStop = false; this.groupBoxEX2.Text = "参数"; @@ -266,7 +258,7 @@ this.lVConfigRange.Margin = new System.Windows.Forms.Padding(2); this.lVConfigRange.Name = "lVConfigRange"; this.lVConfigRange.OwnerDraw = true; - this.lVConfigRange.Size = new System.Drawing.Size(339, 290); + this.lVConfigRange.Size = new System.Drawing.Size(202, 120); this.lVConfigRange.TabIndex = 2; this.lVConfigRange.UseCompatibleStateImageBehavior = false; this.lVConfigRange.View = System.Windows.Forms.View.Details; @@ -305,12 +297,12 @@ this.groupBoxEX4.Controls.Add(this.dgvFeedingData); this.groupBoxEX4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX4.ForeColor = System.Drawing.Color.White; - this.groupBoxEX4.Location = new System.Drawing.Point(349, 2); + this.groupBoxEX4.Location = new System.Drawing.Point(212, 2); this.groupBoxEX4.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX4.Name = "groupBoxEX4"; this.groupBoxEX4.Padding = new System.Windows.Forms.Padding(2); this.tableLayoutPanel1.SetRowSpan(this.groupBoxEX4, 2); - this.groupBoxEX4.Size = new System.Drawing.Size(1569, 579); + this.groupBoxEX4.Size = new System.Drawing.Size(1156, 267); this.groupBoxEX4.TabIndex = 15; this.groupBoxEX4.TabStop = false; this.groupBoxEX4.Text = "进站"; @@ -337,6 +329,7 @@ this.dgvFeedingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column4, this.Column2, + this.Column6, this.Column1, this.InResult, this.Column5, @@ -370,7 +363,7 @@ this.dgvFeedingData.RowHeadersWidth = 60; this.dgvFeedingData.RowTemplate.Height = 23; this.dgvFeedingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvFeedingData.Size = new System.Drawing.Size(1565, 556); + this.dgvFeedingData.Size = new System.Drawing.Size(1152, 244); this.dgvFeedingData.TabIndex = 10; this.dgvFeedingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvFeedingData_CellContentClick); this.dgvFeedingData.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvFeedingData_RowPrePaint); @@ -394,6 +387,13 @@ this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.Column2.Width = 160; // + // Column6 + // + this.Column6.DataPropertyName = "CNum"; + this.Column6.HeaderText = "通道"; + this.Column6.Name = "Column6"; + this.Column6.ReadOnly = true; + // // Column1 // this.Column1.DataPropertyName = "BarCode"; @@ -437,11 +437,11 @@ this.groupBoxEX1.Controls.Add(this.rtb_Info); this.groupBoxEX1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX1.ForeColor = System.Drawing.Color.White; - this.groupBoxEX1.Location = new System.Drawing.Point(2, 585); + this.groupBoxEX1.Location = new System.Drawing.Point(2, 273); this.groupBoxEX1.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX1.Name = "groupBoxEX1"; this.groupBoxEX1.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX1.Size = new System.Drawing.Size(343, 474); + this.groupBoxEX1.Size = new System.Drawing.Size(206, 474); this.groupBoxEX1.TabIndex = 12; this.groupBoxEX1.TabStop = false; this.groupBoxEX1.Text = "日志记录"; @@ -456,7 +456,7 @@ this.rtb_Info.Margin = new System.Windows.Forms.Padding(2); this.rtb_Info.Name = "rtb_Info"; this.rtb_Info.ReadOnly = true; - this.rtb_Info.Size = new System.Drawing.Size(339, 451); + this.rtb_Info.Size = new System.Drawing.Size(202, 451); this.rtb_Info.TabIndex = 1; this.rtb_Info.Text = ""; // @@ -468,11 +468,11 @@ this.groupBoxEX5.Controls.Add(this.dgvBlankingData); this.groupBoxEX5.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX5.ForeColor = System.Drawing.Color.White; - this.groupBoxEX5.Location = new System.Drawing.Point(349, 585); + this.groupBoxEX5.Location = new System.Drawing.Point(212, 273); this.groupBoxEX5.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX5.Name = "groupBoxEX5"; this.groupBoxEX5.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX5.Size = new System.Drawing.Size(1569, 474); + this.groupBoxEX5.Size = new System.Drawing.Size(1156, 474); this.groupBoxEX5.TabIndex = 16; this.groupBoxEX5.TabStop = false; this.groupBoxEX5.Text = "出站"; @@ -499,9 +499,9 @@ this.dgvBlankingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2, + this.Column7, this.dataGridViewTextBoxColumn5, this.Column33, - this.Column32, this.Column29, this.Column3, this.Column138, @@ -524,15 +524,6 @@ this.Column112, this.Column113, this.Column114, - this.Column115, - this.Column116, - this.Column117, - this.Column118, - this.Column119, - this.Column120, - this.Column121, - this.Column122, - this.Column123, this.Column147, this.Column34, this.Column35, @@ -567,13 +558,20 @@ this.dgvBlankingData.RowHeadersWidth = 60; this.dgvBlankingData.RowTemplate.Height = 23; this.dgvBlankingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvBlankingData.Size = new System.Drawing.Size(1565, 451); + this.dgvBlankingData.Size = new System.Drawing.Size(1152, 451); this.dgvBlankingData.TabIndex = 10; this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick); // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "info.png"); + this.imageList1.Images.SetKeyName(1, "error.png"); + this.imageList1.Images.SetKeyName(2, "warning.png"); + // // dataGridViewTextBoxColumn1 // - this.dataGridViewTextBoxColumn1.DataPropertyName = "ChannelNo"; this.dataGridViewTextBoxColumn1.HeaderText = "序号"; this.dataGridViewTextBoxColumn1.MinimumWidth = 8; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; @@ -590,6 +588,13 @@ this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.dataGridViewTextBoxColumn2.Width = 160; // + // Column7 + // + this.Column7.DataPropertyName = "ChannelNo"; + this.Column7.HeaderText = "通道"; + this.Column7.Name = "Column7"; + this.Column7.ReadOnly = true; + // // dataGridViewTextBoxColumn5 // this.dataGridViewTextBoxColumn5.DataPropertyName = "CSBYHCODEA"; @@ -609,19 +614,10 @@ this.Column33.ReadOnly = true; this.Column33.Width = 150; // - // Column32 - // - this.Column32.DataPropertyName = "CSBYHPROCESSNAME"; - this.Column32.HeaderText = "工序"; - this.Column32.MinimumWidth = 8; - this.Column32.Name = "Column32"; - this.Column32.ReadOnly = true; - this.Column32.Width = 150; - // // Column29 // this.Column29.DataPropertyName = "CSBYHOUTSTATIONJUDGMENTRESULT"; - this.Column29.HeaderText = "电芯出站判定结果"; + this.Column29.HeaderText = "出站判定"; this.Column29.MinimumWidth = 8; this.Column29.Name = "Column29"; this.Column29.ReadOnly = true; @@ -645,199 +641,136 @@ // Column25 // this.Column25.DataPropertyName = "CCDResult1"; - this.Column25.HeaderText = "CCD1判定结果"; + this.Column25.HeaderText = "正面(2D/3D)"; this.Column25.Name = "Column25"; this.Column25.ReadOnly = true; // // Column96 // this.Column96.DataPropertyName = "CCDResult2"; - this.Column96.HeaderText = "CCD2判定结果"; + this.Column96.HeaderText = "反面(2D/3D)"; this.Column96.Name = "Column96"; this.Column96.ReadOnly = true; // // Column97 // this.Column97.DataPropertyName = "CCDResult3"; - this.Column97.HeaderText = "CCD3判定结果"; + this.Column97.HeaderText = "左侧面(2D/3D)"; this.Column97.Name = "Column97"; this.Column97.ReadOnly = true; // // Column98 // this.Column98.DataPropertyName = "CCDResult4"; - this.Column98.HeaderText = "CCD4判定结果"; + this.Column98.HeaderText = "右侧面(2D/3D)"; this.Column98.Name = "Column98"; this.Column98.ReadOnly = true; // // Column99 // this.Column99.DataPropertyName = "CCDResult5"; - this.Column99.HeaderText = "CCD5判定结果"; + this.Column99.HeaderText = "顶面(2D/3D)"; this.Column99.Name = "Column99"; this.Column99.ReadOnly = true; // // Column100 // this.Column100.DataPropertyName = "CCDResult6"; - this.Column100.HeaderText = "CCD6判定结果"; + this.Column100.HeaderText = "底面(2D/3D)"; this.Column100.Name = "Column100"; this.Column100.ReadOnly = true; // // Column101 // this.Column101.DataPropertyName = "CCDResult7"; - this.Column101.HeaderText = "CCD7判定结果"; + this.Column101.HeaderText = "底DE1"; this.Column101.Name = "Column101"; this.Column101.ReadOnly = true; // // Column103 // this.Column103.DataPropertyName = "CCDResult8"; - this.Column103.HeaderText = "CCD8判定结果"; + this.Column103.HeaderText = "底DE2"; this.Column103.Name = "Column103"; this.Column103.ReadOnly = true; // // Column104 // this.Column104.DataPropertyName = "CCDResult9"; - this.Column104.HeaderText = "CCD9判定结果"; + this.Column104.HeaderText = "底DE3"; this.Column104.Name = "Column104"; this.Column104.ReadOnly = true; // // Column105 // this.Column105.DataPropertyName = "CCDResult10"; - this.Column105.HeaderText = "CCD10判定结果"; + this.Column105.HeaderText = "底DE4"; this.Column105.Name = "Column105"; this.Column105.ReadOnly = true; // // Column106 // this.Column106.DataPropertyName = "CCDResult11"; - this.Column106.HeaderText = "CCD11判定结果"; + this.Column106.HeaderText = "中ME1"; this.Column106.Name = "Column106"; this.Column106.ReadOnly = true; // // Column107 // this.Column107.DataPropertyName = "CCDResult12"; - this.Column107.HeaderText = "CCD12判定结果"; + this.Column107.HeaderText = "中ME2"; this.Column107.Name = "Column107"; this.Column107.ReadOnly = true; // // Column108 // this.Column108.DataPropertyName = "CCDResult13"; - this.Column108.HeaderText = "CCD13判定结果"; + this.Column108.HeaderText = "中ME3"; this.Column108.Name = "Column108"; this.Column108.ReadOnly = true; // // Column109 // this.Column109.DataPropertyName = "CCDResult14"; - this.Column109.HeaderText = "CCD14判定结果"; + this.Column109.HeaderText = "中ME4"; this.Column109.Name = "Column109"; this.Column109.ReadOnly = true; // // Column110 // this.Column110.DataPropertyName = "CCDResult15"; - this.Column110.HeaderText = "CCD15判定结果"; + this.Column110.HeaderText = "极柱(POS/NEG)"; this.Column110.Name = "Column110"; this.Column110.ReadOnly = true; // // Column111 // this.Column111.DataPropertyName = "CCDResult16"; - this.Column111.HeaderText = "CCD16判定结果"; + this.Column111.HeaderText = "防爆阀(PRO)"; this.Column111.Name = "Column111"; this.Column111.ReadOnly = true; // // Column112 // this.Column112.DataPropertyName = "CCDResult17"; - this.Column112.HeaderText = "CCD17判定结果"; + this.Column112.HeaderText = "厚度1"; this.Column112.Name = "Column112"; this.Column112.ReadOnly = true; // // Column113 // this.Column113.DataPropertyName = "CCDResult18"; - this.Column113.HeaderText = "CCD18判定结果"; + this.Column113.HeaderText = "厚度2"; this.Column113.Name = "Column113"; this.Column113.ReadOnly = true; // // Column114 // this.Column114.DataPropertyName = "CCDResult19"; - this.Column114.HeaderText = "CCD19判定结果"; + this.Column114.HeaderText = "厚度3"; this.Column114.Name = "Column114"; this.Column114.ReadOnly = true; // - // Column115 - // - this.Column115.DataPropertyName = "CCDResult20"; - this.Column115.HeaderText = "CCD19判定结果"; - this.Column115.Name = "Column115"; - this.Column115.ReadOnly = true; - // - // Column116 - // - this.Column116.DataPropertyName = "CCDResult21"; - this.Column116.HeaderText = "CCD19判定结果"; - this.Column116.Name = "Column116"; - this.Column116.ReadOnly = true; - // - // Column117 - // - this.Column117.DataPropertyName = "CCDResult22"; - this.Column117.HeaderText = "CCD22判定结果"; - this.Column117.Name = "Column117"; - this.Column117.ReadOnly = true; - // - // Column118 - // - this.Column118.DataPropertyName = "CCDResult23"; - this.Column118.HeaderText = "CCD23判定结果"; - this.Column118.Name = "Column118"; - this.Column118.ReadOnly = true; - // - // Column119 - // - this.Column119.DataPropertyName = "CCDResult23"; - this.Column119.HeaderText = "CCD23判定结果"; - this.Column119.Name = "Column119"; - this.Column119.ReadOnly = true; - // - // Column120 - // - this.Column120.DataPropertyName = "CCDResult24"; - this.Column120.HeaderText = "CCD24判定结果"; - this.Column120.Name = "Column120"; - this.Column120.ReadOnly = true; - // - // Column121 - // - this.Column121.DataPropertyName = "CCDResult25"; - this.Column121.HeaderText = "CCD25判定结果"; - this.Column121.Name = "Column121"; - this.Column121.ReadOnly = true; - // - // Column122 - // - this.Column122.DataPropertyName = "CCDResult26"; - this.Column122.HeaderText = "CCD26判定结果"; - this.Column122.Name = "Column122"; - this.Column122.ReadOnly = true; - // - // Column123 - // - this.Column123.DataPropertyName = "CCDResult27"; - this.Column123.HeaderText = "CCD27判定结果"; - this.Column123.Name = "Column123"; - this.Column123.ReadOnly = true; - // // Column147 // this.Column147.DataPropertyName = "RethrowNum"; @@ -881,21 +814,13 @@ this.Column22.ReadOnly = true; this.Column22.Width = 150; // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "info.png"); - this.imageList1.Images.SetKeyName(1, "error.png"); - this.imageList1.Images.SetKeyName(2, "warning.png"); - // // FrmDataMonitor // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(1920, 1061); + this.ClientSize = new System.Drawing.Size(1370, 749); this.Controls.Add(this.tableLayoutPanel1); this.DoubleBuffered = true; this.Font = new System.Drawing.Font("微软雅黑", 10.5F); @@ -941,15 +866,16 @@ private System.Windows.Forms.DataGridView dgvBlankingData; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; private System.Windows.Forms.DataGridViewTextBoxColumn Column1; private System.Windows.Forms.DataGridViewTextBoxColumn InResult; private System.Windows.Forms.DataGridViewTextBoxColumn Column5; private System.Windows.Forms.DataGridViewTextBoxColumn Column139; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn Column33; - private System.Windows.Forms.DataGridViewTextBoxColumn Column32; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column138; @@ -972,15 +898,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column112; private System.Windows.Forms.DataGridViewTextBoxColumn Column113; private System.Windows.Forms.DataGridViewTextBoxColumn Column114; - private System.Windows.Forms.DataGridViewTextBoxColumn Column115; - private System.Windows.Forms.DataGridViewTextBoxColumn Column116; - private System.Windows.Forms.DataGridViewTextBoxColumn Column117; - private System.Windows.Forms.DataGridViewTextBoxColumn Column118; - private System.Windows.Forms.DataGridViewTextBoxColumn Column119; - private System.Windows.Forms.DataGridViewTextBoxColumn Column120; - private System.Windows.Forms.DataGridViewTextBoxColumn Column121; - private System.Windows.Forms.DataGridViewTextBoxColumn Column122; - private System.Windows.Forms.DataGridViewTextBoxColumn Column123; private System.Windows.Forms.DataGridViewTextBoxColumn Column147; private System.Windows.Forms.DataGridViewTextBoxColumn Column34; private System.Windows.Forms.DataGridViewTextBoxColumn Column35; diff --git a/LargeSquareOne/FrmDataMonitor.resx b/LargeSquareOne/FrmDataMonitor.resx index 649de59..cbf6e11 100644 --- a/LargeSquareOne/FrmDataMonitor.resx +++ b/LargeSquareOne/FrmDataMonitor.resx @@ -126,6 +126,9 @@ True + + True + True @@ -144,15 +147,15 @@ True + + True + True True - - True - True @@ -194,7 +197,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE - DQAAAk1TRnQBSQFMAgEBAwEAAXABAgFwAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + DQAAAk1TRnQBSQFMAgEBAwEAAYABAgGAAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1 ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2