From 17e2bd53457e046ff2f1f1d47712b49f4494c94c Mon Sep 17 00:00:00 2001 From: ldw <11622064+ldw888@user.noreply.gitee.com> Date: Fri, 26 Sep 2025 16:24:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E8=A7=82=E6=A3=801?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JinYuan.ControlCenter/ControlCenter_Plc.cs | 26 ++- LargeSquareOne/FrmDataMonitor.Designer.cs | 160 +++++++++---------- LargeSquareOne/FrmDataMonitor.resx | 5 +- LargeSquareOne/FrmVariableConfig.Designer.cs | 2 +- 4 files changed, 108 insertions(+), 85 deletions(-) diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index ef047aa..90235ce 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -1858,7 +1858,7 @@ namespace JinYuan.ControlCenters //} for (int j = 0; j < 20; j++) { - m.CCD_NgNo[i, j] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, (7800 * 2 + j * 40 * 2), 20 * 2, System.Text.Encoding.ASCII). + m.CCD_NgNo[i, j] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, (7800 * 2 + j * 40 * 2 + i * 2 * 1000), 20 * 2, System.Text.Encoding.ASCII). Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); //ShortLib.GetShortFromByteArray(bArrays.Content, 6800 *2 + j * 2, DataFormat.CDAB); } @@ -1915,10 +1915,30 @@ namespace JinYuan.ControlCenters //List NGcodeList = new List(); //NGcodeList = NGcode(m.list_Data1[i, 10], m.list_Data1[i, 11], m.list_Data1[i, 12], m.list_Data1[i, 15], m.list_Data1[i, 26], m.list_Data1[i, 16] // , m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], m.list_Data1[i, 23], m.list_Data1[i, 24], m.list_Data1[i, 25], m.list_Data1[i, 27]); - // var (NGcodeList, NGmessage) = NGWGJcode(m.CCD_Data, i); + // var (NGcodeList, NGmessage) = NGWGJcode(m.CCD_Data, i); //电芯CCD判定结果 #region //电芯CCD判定结果 1 0K 0NG 2缺图 + m.CCD1 = m.CCD_Data[i, 0]; + m.CCD2 = m.CCD_Data[i, 1]; + m.CCD3 = m.CCD_Data[i, 2]; + m.CCD4 = m.CCD_Data[i, 3]; + m.CCD5 = m.CCD_Data[i, 4]; + m.CCD6 = m.CCD_Data[i, 5]; + m.CCD7 = m.CCD_Data[i, 6]; + m.CCD8 = m.CCD_Data[i, 7]; + m.CCD9 = m.CCD_Data[i, 8]; + m.CCD10 = m.CCD_Data[i, 9]; + m.CCD11 = m.CCD_Data[i, 10]; + m.CCD12 = m.CCD_Data[i, 11]; + m.CCD13 = m.CCD_Data[i, 12]; + m.CCD14 = m.CCD_Data[i, 13]; + m.CCD15 = m.CCD_Data[i, 14]; + m.CCD16 = m.CCD_Data[i, 15]; + m.CCD17 = m.CCD_Data[i, 16]; + m.CCD18 = m.CCD_Data[i, 17]; + m.CCD19 = m.CCD_Data[i, 18]; + m.CCD20 = m.CCD_Data[i, 19]; m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 0 ? "NG" : "缺图"); m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 0 ? "NG" : "缺图"); m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 0 ? "NG" : "缺图"); @@ -1973,7 +1993,7 @@ namespace JinYuan.ControlCenters } else MyRes[i] = 2;//扫码NG - var judementResult = JudgmentWGJResult(1, list[i].CCD_Data, i); + var judementResult = JudgmentWGJResult(1, m.CCD_Data, i); MyRes[i] = judementResult.Item1; OK_NG = judementResult.Item2; NG_Type = judementResult.Item3; diff --git a/LargeSquareOne/FrmDataMonitor.Designer.cs b/LargeSquareOne/FrmDataMonitor.Designer.cs index 8c9020f..735f4f2 100644 --- a/LargeSquareOne/FrmDataMonitor.Designer.cs +++ b/LargeSquareOne/FrmDataMonitor.Designer.cs @@ -29,12 +29,12 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDataMonitor)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.groupBoxEX3 = new JinYuan.ControlLib.GroupBoxEX(); @@ -63,6 +63,7 @@ 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(); @@ -95,7 +96,6 @@ 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(); @@ -127,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, 1080); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1370, 749); this.tableLayoutPanel1.TabIndex = 0; // // groupBoxEX3 @@ -146,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, 271); + this.groupBoxEX3.Size = new System.Drawing.Size(206, 120); this.groupBoxEX3.TabIndex = 14; this.groupBoxEX3.TabStop = false; this.groupBoxEX3.Text = "操作设置"; @@ -155,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, 104); + this.btSatrt.Location = new System.Drawing.Point(42, 105); this.btSatrt.Margin = new System.Windows.Forms.Padding(2); this.btSatrt.Name = "btSatrt"; this.btSatrt.Padding = new System.Windows.Forms.Padding(2); @@ -232,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, 277); + 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, 323); + this.groupBoxEX2.Size = new System.Drawing.Size(206, 143); this.groupBoxEX2.TabIndex = 13; this.groupBoxEX2.TabStop = false; this.groupBoxEX2.Text = "参数"; @@ -258,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, 300); + 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; @@ -297,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, 598); + this.groupBoxEX4.Size = new System.Drawing.Size(1156, 267); this.groupBoxEX4.TabIndex = 15; this.groupBoxEX4.TabStop = false; this.groupBoxEX4.Text = "进站"; @@ -316,14 +316,14 @@ this.dgvFeedingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.dgvFeedingData.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvFeedingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dgvFeedingData.ColumnHeadersHeight = 34; this.dgvFeedingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvFeedingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -334,14 +334,14 @@ this.InResult, this.Column5, this.Column139}); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle8; this.dgvFeedingData.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvFeedingData.EnableHeadersVisualStyles = false; this.dgvFeedingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); @@ -351,19 +351,19 @@ this.dgvFeedingData.Name = "dgvFeedingData"; this.dgvFeedingData.ReadOnly = true; this.dgvFeedingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvFeedingData.RowHeadersVisible = false; 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, 575); + 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); @@ -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, 604); + 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, 604); + 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 = "出站"; @@ -486,14 +486,14 @@ this.dgvBlankingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.dgvBlankingData.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvBlankingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvBlankingData.ColumnHeadersHeight = 34; this.dgvBlankingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvBlankingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -529,14 +529,14 @@ this.Column35, this.Column102, this.Column22}); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle11; this.dgvBlankingData.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvBlankingData.EnableHeadersVisualStyles = false; this.dgvBlankingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); @@ -546,22 +546,30 @@ this.dgvBlankingData.Name = "dgvBlankingData"; this.dgvBlankingData.ReadOnly = true; this.dgvBlankingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dgvBlankingData.RowHeadersVisible = false; 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.HeaderText = "序号"; @@ -589,7 +597,7 @@ // // dataGridViewTextBoxColumn5 // - this.dataGridViewTextBoxColumn5.DataPropertyName = "CSBYHCODEA"; + this.dataGridViewTextBoxColumn5.DataPropertyName = "BarCode"; this.dataGridViewTextBoxColumn5.HeaderText = "芯包条码"; this.dataGridViewTextBoxColumn5.MinimumWidth = 8; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; @@ -806,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, 1080); + this.ClientSize = new System.Drawing.Size(1370, 749); this.Controls.Add(this.tableLayoutPanel1); this.DoubleBuffered = true; this.Font = new System.Drawing.Font("微软雅黑", 10.5F); diff --git a/LargeSquareOne/FrmDataMonitor.resx b/LargeSquareOne/FrmDataMonitor.resx index 3a94f42..3cffcbd 100644 --- a/LargeSquareOne/FrmDataMonitor.resx +++ b/LargeSquareOne/FrmDataMonitor.resx @@ -120,6 +120,9 @@ True + + True + True @@ -197,7 +200,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE - DQAAAk1TRnQBSQFMAgEBAwEAAYgBAgGIAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + DQAAAk1TRnQBSQFMAgEBAwEAAZABAgGQAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1 ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2 diff --git a/LargeSquareOne/FrmVariableConfig.Designer.cs b/LargeSquareOne/FrmVariableConfig.Designer.cs index c1da91b..d5d5804 100644 --- a/LargeSquareOne/FrmVariableConfig.Designer.cs +++ b/LargeSquareOne/FrmVariableConfig.Designer.cs @@ -481,7 +481,7 @@ // this.num_OffsetOrLenght.Location = new System.Drawing.Point(931, 55); this.num_OffsetOrLenght.Maximum = new decimal(new int[] { - 3000, + 30000, 0, 0, 0});