diff --git a/JY.DAL/OpSqlDataBase.cs b/JY.DAL/OpSqlDataBase.cs index 9e7f66f..f6cd4fe 100644 --- a/JY.DAL/OpSqlDataBase.cs +++ b/JY.DAL/OpSqlDataBase.cs @@ -393,12 +393,12 @@ namespace JY.DAL foreach (var propName in ConstValue.CCD_FDict.Keys) { - sb.Append($",[{propName}] '{ConstValue.CCD_SDict[propName]}'"); + sb.Append($",[{propName}] '{ConstValue.CCD_FDict[propName]}'"); } foreach (var propName in ConstValue.CCD_IDict.Keys) { - sb.Append($",[{propName}] '{ConstValue.CCD_SDict[propName]}'"); + sb.Append($",[{propName}] '{ConstValue.CCD_IDict[propName]}'"); } string formatSql = sb.ToString(); diff --git a/JY.DAL/Service/FeedingDataService.cs b/JY.DAL/Service/FeedingDataService.cs index 8e45abe..00bbb23 100644 --- a/JY.DAL/Service/FeedingDataService.cs +++ b/JY.DAL/Service/FeedingDataService.cs @@ -1,5 +1,7 @@ using JY.DAL.Repository; using JY.Model; +using NPOI.SS.Formula.Functions; +using System; using System.Collections.Generic; namespace JY.DAL.Service @@ -19,7 +21,8 @@ namespace JY.DAL.Service public List GetFeedingData(string barCode) { - return _repository.GetList(x => x.BarCode == barCode); + return _repository.Db.Queryable().Where(x => x.BarCode == barCode) + .OrderByDescending(x => x.CreateTime).ToList(); } public int AddFeedingData(FeedingData data) diff --git a/JY.Inspection/Config/采集项参照表.xlsx b/JY.Inspection/Config/采集项参照表.xlsx index 1ebc654..9206bfd 100644 Binary files a/JY.Inspection/Config/采集项参照表.xlsx and b/JY.Inspection/Config/采集项参照表.xlsx differ diff --git a/JY.Inspection/HomeForm.cs b/JY.Inspection/HomeForm.cs index 83d7998..538e2c1 100644 --- a/JY.Inspection/HomeForm.cs +++ b/JY.Inspection/HomeForm.cs @@ -361,6 +361,30 @@ namespace JY.Inspection colDefList.Add(col); } + + foreach (var propName in ConstValue.CCD_FDict.Keys) + { + DataGridViewColumn col = new DataGridViewTextBoxColumn(); + col.DataPropertyName = propName; + col.HeaderText = ConstValue.CCD_FDict[propName]; + col.MinimumWidth = 6; + col.Name = $"Col_ccd_{propName}"; + col.ReadOnly = true; + + colDefList.Add(col); + } + + foreach (var propName in ConstValue.CCD_IDict.Keys) + { + DataGridViewColumn col = new DataGridViewTextBoxColumn(); + col.DataPropertyName = propName; + col.HeaderText = ConstValue.CCD_IDict[propName]; + col.MinimumWidth = 6; + col.Name = $"Col_ccd_{propName}"; + col.ReadOnly = true; + + colDefList.Add(col); + } #endregion DataGridViewTextBoxColumn Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -2377,6 +2401,8 @@ namespace JY.Inspection if (listEntity.Count() > 0) { m.TDGroup = listEntity.First().TDGroup; + m.InTime = listEntity.First().CreateTime; + m.IsRepeat = listEntity.Count > 1; } // 处理空条码 diff --git a/JY.Inspection/HomeForm.designer.cs b/JY.Inspection/HomeForm.designer.cs index 03f681a..c9305ca 100644 --- a/JY.Inspection/HomeForm.designer.cs +++ b/JY.Inspection/HomeForm.designer.cs @@ -242,7 +242,7 @@ namespace JY.Inspection this.menuStrip1.Location = new System.Drawing.Point(0, 60); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(1556, 28); + this.menuStrip1.Size = new System.Drawing.Size(1556, 33); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -250,14 +250,14 @@ namespace JY.Inspection // this.tsmiLogin.Image = ((System.Drawing.Image)(resources.GetObject("tsmiLogin.Image"))); this.tsmiLogin.Name = "tsmiLogin"; - this.tsmiLogin.Size = new System.Drawing.Size(69, 24); + this.tsmiLogin.Size = new System.Drawing.Size(82, 29); this.tsmiLogin.Text = "登录"; this.tsmiLogin.Click += new System.EventHandler(this.tsmiLogin_Click); // // mES测试ToolStripMenuItem // this.mES测试ToolStripMenuItem.Name = "mES测试ToolStripMenuItem"; - this.mES测试ToolStripMenuItem.Size = new System.Drawing.Size(12, 24); + this.mES测试ToolStripMenuItem.Size = new System.Drawing.Size(14, 29); // // tsmiSearch // @@ -267,20 +267,20 @@ namespace JY.Inspection this.tsmiAlarmSearch}); this.tsmiSearch.Image = ((System.Drawing.Image)(resources.GetObject("tsmiSearch.Image"))); this.tsmiSearch.Name = "tsmiSearch"; - this.tsmiSearch.Size = new System.Drawing.Size(69, 24); + this.tsmiSearch.Size = new System.Drawing.Size(82, 29); this.tsmiSearch.Text = "查询"; // // tsmiHistory // this.tsmiHistory.Name = "tsmiHistory"; - this.tsmiHistory.Size = new System.Drawing.Size(191, 24); + this.tsmiHistory.Size = new System.Drawing.Size(244, 30); this.tsmiHistory.Text = "历史数据查询"; this.tsmiHistory.Click += new System.EventHandler(this.tsmiHistory_Click); // // tsmiCCDData // this.tsmiCCDData.Name = "tsmiCCDData"; - this.tsmiCCDData.Size = new System.Drawing.Size(191, 24); + this.tsmiCCDData.Size = new System.Drawing.Size(244, 30); this.tsmiCCDData.Text = "CCD检测数据统计"; this.tsmiCCDData.Visible = false; this.tsmiCCDData.Click += new System.EventHandler(this.tsmiCCDData_Click); @@ -288,7 +288,7 @@ namespace JY.Inspection // tsmiAlarmSearch // this.tsmiAlarmSearch.Name = "tsmiAlarmSearch"; - this.tsmiAlarmSearch.Size = new System.Drawing.Size(191, 24); + this.tsmiAlarmSearch.Size = new System.Drawing.Size(244, 30); this.tsmiAlarmSearch.Text = "报警信息查询"; this.tsmiAlarmSearch.Visible = false; this.tsmiAlarmSearch.Click += new System.EventHandler(this.tsmiAlarmSearch_Click); @@ -306,7 +306,7 @@ namespace JY.Inspection this.tsmiTestCode}); this.tsmiSetting.Image = ((System.Drawing.Image)(resources.GetObject("tsmiSetting.Image"))); this.tsmiSetting.Name = "tsmiSetting"; - this.tsmiSetting.Size = new System.Drawing.Size(69, 24); + this.tsmiSetting.Size = new System.Drawing.Size(82, 29); this.tsmiSetting.Text = "设置"; // // tsmiUserConfig @@ -314,7 +314,7 @@ namespace JY.Inspection this.tsmiUserConfig.AccessibleRole = System.Windows.Forms.AccessibleRole.None; this.tsmiUserConfig.Image = ((System.Drawing.Image)(resources.GetObject("tsmiUserConfig.Image"))); this.tsmiUserConfig.Name = "tsmiUserConfig"; - this.tsmiUserConfig.Size = new System.Drawing.Size(168, 26); + this.tsmiUserConfig.Size = new System.Drawing.Size(210, 30); this.tsmiUserConfig.Text = "用户设置"; this.tsmiUserConfig.Click += new System.EventHandler(this.tsmiUserConfig_Click); // @@ -322,7 +322,7 @@ namespace JY.Inspection // this.tsmiMESConfig.Image = ((System.Drawing.Image)(resources.GetObject("tsmiMESConfig.Image"))); this.tsmiMESConfig.Name = "tsmiMESConfig"; - this.tsmiMESConfig.Size = new System.Drawing.Size(168, 26); + this.tsmiMESConfig.Size = new System.Drawing.Size(210, 30); this.tsmiMESConfig.Text = "系统参数设置"; this.tsmiMESConfig.Click += new System.EventHandler(this.tsmiMESConfig_Click); // @@ -330,7 +330,7 @@ namespace JY.Inspection // this.tsmiDBConfig.Image = ((System.Drawing.Image)(resources.GetObject("tsmiDBConfig.Image"))); this.tsmiDBConfig.Name = "tsmiDBConfig"; - this.tsmiDBConfig.Size = new System.Drawing.Size(168, 26); + this.tsmiDBConfig.Size = new System.Drawing.Size(210, 30); this.tsmiDBConfig.Text = "数据库设置"; this.tsmiDBConfig.Visible = false; this.tsmiDBConfig.Click += new System.EventHandler(this.tsmiDBConfig_Click); @@ -339,7 +339,7 @@ namespace JY.Inspection // this.tsmiPLCConfig.Image = ((System.Drawing.Image)(resources.GetObject("tsmiPLCConfig.Image"))); this.tsmiPLCConfig.Name = "tsmiPLCConfig"; - this.tsmiPLCConfig.Size = new System.Drawing.Size(168, 26); + this.tsmiPLCConfig.Size = new System.Drawing.Size(210, 30); this.tsmiPLCConfig.Text = "PLC通讯设置"; this.tsmiPLCConfig.Click += new System.EventHandler(this.tsmiPLCConfig_Click); // @@ -347,7 +347,7 @@ namespace JY.Inspection // this.tsmiSerialPortConfig.Image = ((System.Drawing.Image)(resources.GetObject("tsmiSerialPortConfig.Image"))); this.tsmiSerialPortConfig.Name = "tsmiSerialPortConfig"; - this.tsmiSerialPortConfig.Size = new System.Drawing.Size(168, 26); + this.tsmiSerialPortConfig.Size = new System.Drawing.Size(210, 30); this.tsmiSerialPortConfig.Text = "TCP通讯设置"; this.tsmiSerialPortConfig.Visible = false; this.tsmiSerialPortConfig.Click += new System.EventHandler(this.tsmiSerialPortConfig_Click); @@ -356,7 +356,7 @@ namespace JY.Inspection // this.tsmiAbnormalVoice.Image = ((System.Drawing.Image)(resources.GetObject("tsmiAbnormalVoice.Image"))); this.tsmiAbnormalVoice.Name = "tsmiAbnormalVoice"; - this.tsmiAbnormalVoice.Size = new System.Drawing.Size(168, 26); + this.tsmiAbnormalVoice.Size = new System.Drawing.Size(210, 30); this.tsmiAbnormalVoice.Text = "异常播报设置"; this.tsmiAbnormalVoice.Visible = false; this.tsmiAbnormalVoice.Click += new System.EventHandler(this.tsmiAbnormalVoice_Click); @@ -365,7 +365,7 @@ namespace JY.Inspection // this.mES分档设置ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mES分档设置ToolStripMenuItem.Image"))); this.mES分档设置ToolStripMenuItem.Name = "mES分档设置ToolStripMenuItem"; - this.mES分档设置ToolStripMenuItem.Size = new System.Drawing.Size(168, 26); + this.mES分档设置ToolStripMenuItem.Size = new System.Drawing.Size(210, 30); this.mES分档设置ToolStripMenuItem.Text = "MES分档设置"; this.mES分档设置ToolStripMenuItem.Click += new System.EventHandler(this.mES分档设置ToolStripMenuItem_Click); // @@ -373,7 +373,7 @@ namespace JY.Inspection // this.tsmiTestCode.AccessibleRole = System.Windows.Forms.AccessibleRole.None; this.tsmiTestCode.Name = "tsmiTestCode"; - this.tsmiTestCode.Size = new System.Drawing.Size(168, 26); + this.tsmiTestCode.Size = new System.Drawing.Size(210, 30); this.tsmiTestCode.Text = "开发测试"; this.tsmiTestCode.Click += new System.EventHandler(this.tsmiTestCode_Click); // @@ -381,7 +381,7 @@ namespace JY.Inspection // this.tsmiParaConfig.Image = ((System.Drawing.Image)(resources.GetObject("tsmiParaConfig.Image"))); this.tsmiParaConfig.Name = "tsmiParaConfig"; - this.tsmiParaConfig.Size = new System.Drawing.Size(69, 24); + this.tsmiParaConfig.Size = new System.Drawing.Size(82, 29); this.tsmiParaConfig.Text = "参数"; this.tsmiParaConfig.Visible = false; this.tsmiParaConfig.Click += new System.EventHandler(this.tsmiParaConfig_Click); @@ -390,7 +390,7 @@ namespace JY.Inspection // this.tsmiChart.Image = ((System.Drawing.Image)(resources.GetObject("tsmiChart.Image"))); this.tsmiChart.Name = "tsmiChart"; - this.tsmiChart.Size = new System.Drawing.Size(69, 24); + this.tsmiChart.Size = new System.Drawing.Size(82, 29); this.tsmiChart.Text = "统计"; this.tsmiChart.Visible = false; this.tsmiChart.Click += new System.EventHandler(this.tsmiChart_Click); @@ -399,7 +399,7 @@ namespace JY.Inspection // this.tsmiChangeModel.Image = ((System.Drawing.Image)(resources.GetObject("tsmiChangeModel.Image"))); this.tsmiChangeModel.Name = "tsmiChangeModel"; - this.tsmiChangeModel.Size = new System.Drawing.Size(69, 24); + this.tsmiChangeModel.Size = new System.Drawing.Size(82, 29); this.tsmiChangeModel.Text = "换型"; this.tsmiChangeModel.Visible = false; this.tsmiChangeModel.Click += new System.EventHandler(this.tsmiChangeModel_Click); @@ -408,14 +408,14 @@ namespace JY.Inspection // this.tsmiAbout.Image = ((System.Drawing.Image)(resources.GetObject("tsmiAbout.Image"))); this.tsmiAbout.Name = "tsmiAbout"; - this.tsmiAbout.Size = new System.Drawing.Size(69, 24); + this.tsmiAbout.Size = new System.Drawing.Size(82, 29); this.tsmiAbout.Text = "关于"; this.tsmiAbout.Click += new System.EventHandler(this.tsmiAbout_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(12, 24); + this.toolStripMenuItem1.Size = new System.Drawing.Size(14, 29); // // imageList1 // @@ -430,7 +430,7 @@ namespace JY.Inspection this.lblUser.AutoSize = true; this.lblUser.Location = new System.Drawing.Point(64, 29); this.lblUser.Name = "lblUser"; - this.lblUser.Size = new System.Drawing.Size(57, 19); + this.lblUser.Size = new System.Drawing.Size(61, 20); this.lblUser.TabIndex = 3; this.lblUser.Text = "No User"; // @@ -439,7 +439,7 @@ namespace JY.Inspection this.metroLabel3.AutoSize = true; this.metroLabel3.Location = new System.Drawing.Point(3, 29); this.metroLabel3.Name = "metroLabel3"; - this.metroLabel3.Size = new System.Drawing.Size(65, 19); + this.metroLabel3.Size = new System.Drawing.Size(69, 20); this.metroLabel3.TabIndex = 4; this.metroLabel3.Text = "用户名："; // @@ -448,7 +448,7 @@ namespace JY.Inspection this.metroLabel4.AutoSize = true; this.metroLabel4.Location = new System.Drawing.Point(3, 5); this.metroLabel4.Name = "metroLabel4"; - this.metroLabel4.Size = new System.Drawing.Size(79, 19); + this.metroLabel4.Size = new System.Drawing.Size(84, 20); this.metroLabel4.TabIndex = 5; this.metroLabel4.Text = "日期时间："; // @@ -472,7 +472,7 @@ namespace JY.Inspection this.lblAuthority.AutoSize = true; this.lblAuthority.Location = new System.Drawing.Point(183, 29); this.lblAuthority.Name = "lblAuthority"; - this.lblAuthority.Size = new System.Drawing.Size(57, 19); + this.lblAuthority.Size = new System.Drawing.Size(61, 20); this.lblAuthority.TabIndex = 7; this.lblAuthority.Text = "No User"; // @@ -481,7 +481,7 @@ namespace JY.Inspection this.metroLabel31.AutoSize = true; this.metroLabel31.Location = new System.Drawing.Point(141, 29); this.metroLabel31.Name = "metroLabel31"; - this.metroLabel31.Size = new System.Drawing.Size(51, 19); + this.metroLabel31.Size = new System.Drawing.Size(54, 20); this.metroLabel31.TabIndex = 8; this.metroLabel31.Text = "权限："; // @@ -490,7 +490,7 @@ namespace JY.Inspection this.timelabel.AutoSize = true; this.timelabel.Location = new System.Drawing.Point(100, 5); this.timelabel.Name = "timelabel"; - this.timelabel.Size = new System.Drawing.Size(121, 19); + this.timelabel.Size = new System.Drawing.Size(131, 20); this.timelabel.TabIndex = 6; this.timelabel.Text = "2021-10-18 15:30:50"; this.timelabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -512,64 +512,64 @@ namespace JY.Inspection this.txtTcpClicet, this.toolStripStatusLabel3, this.txtClassShift}); - this.statusStrip1.Location = new System.Drawing.Point(0, 862); + this.statusStrip1.Location = new System.Drawing.Point(0, 858); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1556, 22); + this.statusStrip1.Size = new System.Drawing.Size(1556, 26); this.statusStrip1.TabIndex = 8; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatusLabel1 // this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(68, 17); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(84, 20); this.toolStripStatusLabel1.Text = "工厂代码："; // // txtsiteCode // this.txtsiteCode.Name = "txtsiteCode"; - this.txtsiteCode.Size = new System.Drawing.Size(37, 17); + this.txtsiteCode.Size = new System.Drawing.Size(46, 20); this.txtsiteCode.Text = "R001"; // // toolStripStatusLabel2 // this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; - this.toolStripStatusLabel2.Size = new System.Drawing.Size(68, 17); + this.toolStripStatusLabel2.Size = new System.Drawing.Size(84, 20); this.toolStripStatusLabel2.Text = "产线名称："; // // txtlineCode // this.txtlineCode.Name = "txtlineCode"; - this.txtlineCode.Size = new System.Drawing.Size(36, 17); + this.txtlineCode.Size = new System.Drawing.Size(45, 20); this.txtlineCode.Text = "1111"; // // toolStripStatusLabel4 // this.toolStripStatusLabel4.Name = "toolStripStatusLabel4"; - this.toolStripStatusLabel4.Size = new System.Drawing.Size(59, 17); + this.toolStripStatusLabel4.Size = new System.Drawing.Size(73, 20); this.toolStripStatusLabel4.Text = "设备编码:"; // // txtequipCode // this.txtequipCode.Name = "txtequipCode"; - this.txtequipCode.Size = new System.Drawing.Size(29, 17); + this.txtequipCode.Size = new System.Drawing.Size(36, 20); this.txtequipCode.Text = "123"; // // toolStripStatusLabel6 // this.toolStripStatusLabel6.Name = "toolStripStatusLabel6"; - this.toolStripStatusLabel6.Size = new System.Drawing.Size(59, 17); + this.toolStripStatusLabel6.Size = new System.Drawing.Size(73, 20); this.toolStripStatusLabel6.Text = "物料编码:"; // // txtmaterialCode // this.txtmaterialCode.Name = "txtmaterialCode"; - this.txtmaterialCode.Size = new System.Drawing.Size(29, 17); + this.txtmaterialCode.Size = new System.Drawing.Size(36, 20); this.txtmaterialCode.Text = "111"; // // toolStripStatusLabel7 // this.toolStripStatusLabel7.Name = "toolStripStatusLabel7"; - this.toolStripStatusLabel7.Size = new System.Drawing.Size(84, 17); + this.toolStripStatusLabel7.Size = new System.Drawing.Size(100, 20); this.toolStripStatusLabel7.Text = " 当前模式："; // // txtTcpClicet @@ -577,26 +577,26 @@ namespace JY.Inspection this.txtTcpClicet.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.txtTcpClicet.ForeColor = System.Drawing.Color.White; this.txtTcpClicet.Name = "txtTcpClicet"; - this.txtTcpClicet.Size = new System.Drawing.Size(56, 17); + this.txtTcpClicet.Size = new System.Drawing.Size(69, 20); this.txtTcpClicet.Text = "单机模式"; // // toolStripStatusLabel3 // this.toolStripStatusLabel3.Name = "toolStripStatusLabel3"; - this.toolStripStatusLabel3.Size = new System.Drawing.Size(44, 17); + this.toolStripStatusLabel3.Size = new System.Drawing.Size(54, 20); this.toolStripStatusLabel3.Text = "班次："; // // txtClassShift // this.txtClassShift.Name = "txtClassShift"; - this.txtClassShift.Size = new System.Drawing.Size(29, 17); + this.txtClassShift.Size = new System.Drawing.Size(36, 20); this.txtClassShift.Text = "111"; // // panel3 // this.panel3.Controls.Add(this.txtlog); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 659); + this.panel3.Location = new System.Drawing.Point(0, 655); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(1556, 203); this.panel3.TabIndex = 9; @@ -617,7 +617,7 @@ namespace JY.Inspection this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(1473, 250); + this.groupBox1.Size = new System.Drawing.Size(1473, 246); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "电芯出站"; @@ -654,7 +654,7 @@ namespace JY.Inspection this.dgvDataShow_B.EnableHeadersVisualStyles = false; this.dgvDataShow_B.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); this.dgvDataShow_B.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.dgvDataShow_B.Location = new System.Drawing.Point(3, 17); + this.dgvDataShow_B.Location = new System.Drawing.Point(3, 21); this.dgvDataShow_B.Name = "dgvDataShow_B"; this.dgvDataShow_B.ReadOnly = true; this.dgvDataShow_B.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; @@ -671,7 +671,7 @@ namespace JY.Inspection this.dgvDataShow_B.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dgvDataShow_B.RowTemplate.Height = 23; this.dgvDataShow_B.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvDataShow_B.Size = new System.Drawing.Size(1467, 230); + this.dgvDataShow_B.Size = new System.Drawing.Size(1467, 222); this.dgvDataShow_B.TabIndex = 0; this.dgvDataShow_B.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvDataShow_B_RowPrePaint); // @@ -681,7 +681,7 @@ namespace JY.Inspection this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Location = new System.Drawing.Point(3, 3); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(430, 305); + this.groupBox2.Size = new System.Drawing.Size(430, 300); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "电芯进站"; @@ -725,7 +725,7 @@ namespace JY.Inspection this.dgvDataShow_A.EnableHeadersVisualStyles = false; this.dgvDataShow_A.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); this.dgvDataShow_A.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.dgvDataShow_A.Location = new System.Drawing.Point(3, 17); + this.dgvDataShow_A.Location = new System.Drawing.Point(3, 21); this.dgvDataShow_A.Name = "dgvDataShow_A"; this.dgvDataShow_A.ReadOnly = true; this.dgvDataShow_A.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; @@ -742,7 +742,7 @@ namespace JY.Inspection this.dgvDataShow_A.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dgvDataShow_A.RowTemplate.Height = 23; this.dgvDataShow_A.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvDataShow_A.Size = new System.Drawing.Size(424, 285); + this.dgvDataShow_A.Size = new System.Drawing.Size(424, 276); this.dgvDataShow_A.TabIndex = 1; this.dgvDataShow_A.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvDataShow_A_RowPrePaint); // @@ -753,7 +753,7 @@ namespace JY.Inspection this.Column1.MinimumWidth = 6; this.Column1.Name = "Column1"; this.Column1.ReadOnly = true; - this.Column1.Width = 52; + this.Column1.Width = 60; // // Column30 // @@ -762,7 +762,7 @@ namespace JY.Inspection this.Column30.MinimumWidth = 8; this.Column30.Name = "Column30"; this.Column30.ReadOnly = true; - this.Column30.Width = 52; + this.Column30.Width = 60; // // Column2 // @@ -771,7 +771,7 @@ namespace JY.Inspection this.Column2.MinimumWidth = 6; this.Column2.Name = "Column2"; this.Column2.ReadOnly = true; - this.Column2.Width = 64; + this.Column2.Width = 86; // // Column3 // @@ -780,7 +780,7 @@ namespace JY.Inspection this.Column3.MinimumWidth = 6; this.Column3.Name = "Column3"; this.Column3.ReadOnly = true; - this.Column3.Width = 52; + this.Column3.Width = 60; // // Column4 // @@ -789,7 +789,7 @@ namespace JY.Inspection this.Column4.MinimumWidth = 6; this.Column4.Name = "Column4"; this.Column4.ReadOnly = true; - this.Column4.Width = 52; + this.Column4.Width = 60; // // Column5 // @@ -798,7 +798,7 @@ namespace JY.Inspection this.Column5.MinimumWidth = 6; this.Column5.Name = "Column5"; this.Column5.ReadOnly = true; - this.Column5.Width = 52; + this.Column5.Width = 60; // // timer_Clock // @@ -813,11 +813,11 @@ namespace JY.Inspection this.tableLayoutPanel3.Controls.Add(this.splitContainer1, 1, 0); this.tableLayoutPanel3.Controls.Add(this.groupBox3, 0, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 88); + this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 93); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1556, 571); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1556, 562); this.tableLayoutPanel3.TabIndex = 50; // // splitContainer1 @@ -834,8 +834,8 @@ namespace JY.Inspection // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.groupBox1); - this.splitContainer1.Size = new System.Drawing.Size(1473, 565); - this.splitContainer1.SplitterDistance = 311; + this.splitContainer1.Size = new System.Drawing.Size(1473, 556); + this.splitContainer1.SplitterDistance = 306; this.splitContainer1.TabIndex = 12; // // tableLayoutPanel2 @@ -851,7 +851,7 @@ namespace JY.Inspection this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1473, 311); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1473, 306); this.tableLayoutPanel2.TabIndex = 0; // // splitContainer3 @@ -869,7 +869,7 @@ namespace JY.Inspection // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.groupBox4); - this.splitContainer3.Size = new System.Drawing.Size(1031, 305); + this.splitContainer3.Size = new System.Drawing.Size(1031, 300); this.splitContainer3.SplitterDistance = 376; this.splitContainer3.SplitterWidth = 1; this.splitContainer3.TabIndex = 2; @@ -888,8 +888,8 @@ namespace JY.Inspection // splitContainer4.Panel2 // this.splitContainer4.Panel2.Controls.Add(this.groupBox6); - this.splitContainer4.Size = new System.Drawing.Size(376, 305); - this.splitContainer4.SplitterDistance = 168; + this.splitContainer4.Size = new System.Drawing.Size(376, 300); + this.splitContainer4.SplitterDistance = 165; this.splitContainer4.TabIndex = 0; // // groupBox5 @@ -948,7 +948,7 @@ namespace JY.Inspection this.ckStartZNDB.Enabled = false; this.ckStartZNDB.Location = new System.Drawing.Point(295, 1); this.ckStartZNDB.Name = "ckStartZNDB"; - this.ckStartZNDB.Size = new System.Drawing.Size(144, 16); + this.ckStartZNDB.Size = new System.Drawing.Size(179, 19); this.ckStartZNDB.TabIndex = 41; this.ckStartZNDB.Text = "是否开启智能电表读取"; this.ckStartZNDB.UseVisualStyleBackColor = true; @@ -958,7 +958,7 @@ namespace JY.Inspection this.label26.AutoSize = true; this.label26.Location = new System.Drawing.Point(199, 211); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(11, 12); + this.label26.Size = new System.Drawing.Size(15, 15); this.label26.TabIndex = 40; this.label26.Text = "w"; // @@ -967,7 +967,7 @@ namespace JY.Inspection this.label23.AutoSize = true; this.label23.Location = new System.Drawing.Point(424, 187); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(11, 12); + this.label23.Size = new System.Drawing.Size(15, 15); this.label23.TabIndex = 39; this.label23.Text = "w"; // @@ -976,7 +976,7 @@ namespace JY.Inspection this.label24.AutoSize = true; this.label24.Location = new System.Drawing.Point(424, 156); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(11, 12); + this.label24.Size = new System.Drawing.Size(15, 15); this.label24.TabIndex = 38; this.label24.Text = "w"; // @@ -985,7 +985,7 @@ namespace JY.Inspection this.label25.AutoSize = true; this.label25.Location = new System.Drawing.Point(424, 124); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(11, 12); + this.label25.Size = new System.Drawing.Size(15, 15); this.label25.TabIndex = 37; this.label25.Text = "w"; // @@ -994,7 +994,7 @@ namespace JY.Inspection this.label20.AutoSize = true; this.label20.Location = new System.Drawing.Point(199, 185); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(11, 12); + this.label20.Size = new System.Drawing.Size(15, 15); this.label20.TabIndex = 36; this.label20.Text = "A"; // @@ -1003,7 +1003,7 @@ namespace JY.Inspection this.label21.AutoSize = true; this.label21.Location = new System.Drawing.Point(199, 154); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(11, 12); + this.label21.Size = new System.Drawing.Size(15, 15); this.label21.TabIndex = 35; this.label21.Text = "A"; // @@ -1012,7 +1012,7 @@ namespace JY.Inspection this.label22.AutoSize = true; this.label22.Location = new System.Drawing.Point(199, 120); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(11, 12); + this.label22.Size = new System.Drawing.Size(15, 15); this.label22.TabIndex = 34; this.label22.Text = "A"; // @@ -1021,7 +1021,7 @@ namespace JY.Inspection this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(424, 96); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(11, 12); + this.label17.Size = new System.Drawing.Size(15, 15); this.label17.TabIndex = 33; this.label17.Text = "V"; // @@ -1030,7 +1030,7 @@ namespace JY.Inspection this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(424, 62); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(11, 12); + this.label18.Size = new System.Drawing.Size(15, 15); this.label18.TabIndex = 32; this.label18.Text = "V"; // @@ -1039,7 +1039,7 @@ namespace JY.Inspection this.label19.AutoSize = true; this.label19.Location = new System.Drawing.Point(424, 31); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(11, 12); + this.label19.Size = new System.Drawing.Size(15, 15); this.label19.TabIndex = 31; this.label19.Text = "V"; // @@ -1048,7 +1048,7 @@ namespace JY.Inspection this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(198, 97); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(11, 12); + this.label16.Size = new System.Drawing.Size(15, 15); this.label16.TabIndex = 30; this.label16.Text = "V"; // @@ -1057,7 +1057,7 @@ namespace JY.Inspection this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(198, 62); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(11, 12); + this.label14.Size = new System.Drawing.Size(15, 15); this.label14.TabIndex = 29; this.label14.Text = "V"; // @@ -1066,7 +1066,7 @@ namespace JY.Inspection this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(198, 31); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(11, 12); + this.label13.Size = new System.Drawing.Size(15, 15); this.label13.TabIndex = 28; this.label13.Text = "V"; // @@ -1075,7 +1075,7 @@ namespace JY.Inspection this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(16, 210); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(65, 12); + this.label15.Size = new System.Drawing.Size(82, 15); this.label15.TabIndex = 27; this.label15.Text = "总有功功率"; // @@ -1086,7 +1086,7 @@ namespace JY.Inspection this.txtTotalPower.Location = new System.Drawing.Point(89, 203); this.txtTotalPower.Name = "txtTotalPower"; this.txtTotalPower.ReadOnly = true; - this.txtTotalPower.Size = new System.Drawing.Size(108, 23); + this.txtTotalPower.Size = new System.Drawing.Size(108, 27); this.txtTotalPower.TabIndex = 24; // // label10 @@ -1094,7 +1094,7 @@ namespace JY.Inspection this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(236, 180); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(71, 12); + this.label10.Size = new System.Drawing.Size(90, 15); this.label10.TabIndex = 23; this.label10.Text = "C相有功功率"; // @@ -1103,7 +1103,7 @@ namespace JY.Inspection this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(236, 150); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(71, 12); + this.label11.Size = new System.Drawing.Size(90, 15); this.label11.TabIndex = 22; this.label11.Text = "B相有功功率"; // @@ -1112,7 +1112,7 @@ namespace JY.Inspection this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(236, 119); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(71, 12); + this.label12.Size = new System.Drawing.Size(90, 15); this.label12.TabIndex = 21; this.label12.Text = "A相有功功率"; // @@ -1123,7 +1123,7 @@ namespace JY.Inspection this.txtPowerC.Location = new System.Drawing.Point(314, 175); this.txtPowerC.Name = "txtPowerC"; this.txtPowerC.ReadOnly = true; - this.txtPowerC.Size = new System.Drawing.Size(108, 23); + this.txtPowerC.Size = new System.Drawing.Size(108, 27); this.txtPowerC.TabIndex = 20; // // txtPowerB @@ -1133,7 +1133,7 @@ namespace JY.Inspection this.txtPowerB.Location = new System.Drawing.Point(314, 144); this.txtPowerB.Name = "txtPowerB"; this.txtPowerB.ReadOnly = true; - this.txtPowerB.Size = new System.Drawing.Size(108, 23); + this.txtPowerB.Size = new System.Drawing.Size(108, 27); this.txtPowerB.TabIndex = 19; // // txtPowerA @@ -1143,7 +1143,7 @@ namespace JY.Inspection this.txtPowerA.Location = new System.Drawing.Point(314, 113); this.txtPowerA.Name = "txtPowerA"; this.txtPowerA.ReadOnly = true; - this.txtPowerA.Size = new System.Drawing.Size(108, 23); + this.txtPowerA.Size = new System.Drawing.Size(108, 27); this.txtPowerA.TabIndex = 18; // // label7 @@ -1151,7 +1151,7 @@ namespace JY.Inspection this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(16, 179); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(41, 12); + this.label7.Size = new System.Drawing.Size(53, 15); this.label7.TabIndex = 17; this.label7.Text = "电流IC"; // @@ -1160,7 +1160,7 @@ namespace JY.Inspection this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(16, 148); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(41, 12); + this.label8.Size = new System.Drawing.Size(53, 15); this.label8.TabIndex = 16; this.label8.Text = "电流IB"; // @@ -1169,7 +1169,7 @@ namespace JY.Inspection this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(16, 120); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(41, 12); + this.label9.Size = new System.Drawing.Size(53, 15); this.label9.TabIndex = 15; this.label9.Text = "电流IA"; // @@ -1180,7 +1180,7 @@ namespace JY.Inspection this.txtIC.Location = new System.Drawing.Point(89, 174); this.txtIC.Name = "txtIC"; this.txtIC.ReadOnly = true; - this.txtIC.Size = new System.Drawing.Size(108, 23); + this.txtIC.Size = new System.Drawing.Size(108, 27); this.txtIC.TabIndex = 14; // // txtIB @@ -1190,7 +1190,7 @@ namespace JY.Inspection this.txtIB.Location = new System.Drawing.Point(89, 143); this.txtIB.Name = "txtIB"; this.txtIB.ReadOnly = true; - this.txtIB.Size = new System.Drawing.Size(108, 23); + this.txtIB.Size = new System.Drawing.Size(108, 27); this.txtIB.TabIndex = 13; // // txtIA @@ -1200,7 +1200,7 @@ namespace JY.Inspection this.txtIA.Location = new System.Drawing.Point(89, 114); this.txtIA.Name = "txtIA"; this.txtIA.ReadOnly = true; - this.txtIA.Size = new System.Drawing.Size(108, 23); + this.txtIA.Size = new System.Drawing.Size(108, 27); this.txtIA.TabIndex = 12; // // label4 @@ -1208,7 +1208,7 @@ namespace JY.Inspection this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(236, 90); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(59, 12); + this.label4.Size = new System.Drawing.Size(76, 15); this.label4.TabIndex = 11; this.label4.Text = "线电压UAC"; // @@ -1217,7 +1217,7 @@ namespace JY.Inspection this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(236, 59); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(59, 12); + this.label5.Size = new System.Drawing.Size(76, 15); this.label5.TabIndex = 10; this.label5.Text = "线电压UBC"; // @@ -1226,7 +1226,7 @@ namespace JY.Inspection this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(236, 28); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(59, 12); + this.label6.Size = new System.Drawing.Size(76, 15); this.label6.TabIndex = 9; this.label6.Text = "线电压UAB"; // @@ -1237,7 +1237,7 @@ namespace JY.Inspection this.txtLineVolUAC.Location = new System.Drawing.Point(314, 84); this.txtLineVolUAC.Name = "txtLineVolUAC"; this.txtLineVolUAC.ReadOnly = true; - this.txtLineVolUAC.Size = new System.Drawing.Size(108, 23); + this.txtLineVolUAC.Size = new System.Drawing.Size(108, 27); this.txtLineVolUAC.TabIndex = 8; // // txtLineVolUBC @@ -1247,7 +1247,7 @@ namespace JY.Inspection this.txtLineVolUBC.Location = new System.Drawing.Point(314, 54); this.txtLineVolUBC.Name = "txtLineVolUBC"; this.txtLineVolUBC.ReadOnly = true; - this.txtLineVolUBC.Size = new System.Drawing.Size(108, 23); + this.txtLineVolUBC.Size = new System.Drawing.Size(108, 27); this.txtLineVolUBC.TabIndex = 7; // // txtLineVolUAB @@ -1257,7 +1257,7 @@ namespace JY.Inspection this.txtLineVolUAB.Location = new System.Drawing.Point(314, 23); this.txtLineVolUAB.Name = "txtLineVolUAB"; this.txtLineVolUAB.ReadOnly = true; - this.txtLineVolUAB.Size = new System.Drawing.Size(108, 23); + this.txtLineVolUAB.Size = new System.Drawing.Size(108, 27); this.txtLineVolUAB.TabIndex = 6; // // label3 @@ -1265,7 +1265,7 @@ namespace JY.Inspection this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(16, 90); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(53, 12); + this.label3.Size = new System.Drawing.Size(68, 15); this.label3.TabIndex = 5; this.label3.Text = "相电压UC"; // @@ -1274,7 +1274,7 @@ namespace JY.Inspection this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(16, 59); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.Size = new System.Drawing.Size(68, 15); this.label2.TabIndex = 4; this.label2.Text = "相电压UB"; // @@ -1283,7 +1283,7 @@ namespace JY.Inspection this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(16, 28); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.Size = new System.Drawing.Size(68, 15); this.label1.TabIndex = 3; this.label1.Text = "相电压UA"; // @@ -1294,7 +1294,7 @@ namespace JY.Inspection this.txtPhaseVolUC.Location = new System.Drawing.Point(89, 85); this.txtPhaseVolUC.Name = "txtPhaseVolUC"; this.txtPhaseVolUC.ReadOnly = true; - this.txtPhaseVolUC.Size = new System.Drawing.Size(108, 23); + this.txtPhaseVolUC.Size = new System.Drawing.Size(108, 27); this.txtPhaseVolUC.TabIndex = 2; // // txtPhaseVolUB @@ -1304,7 +1304,7 @@ namespace JY.Inspection this.txtPhaseVolUB.Location = new System.Drawing.Point(89, 54); this.txtPhaseVolUB.Name = "txtPhaseVolUB"; this.txtPhaseVolUB.ReadOnly = true; - this.txtPhaseVolUB.Size = new System.Drawing.Size(108, 23); + this.txtPhaseVolUB.Size = new System.Drawing.Size(108, 27); this.txtPhaseVolUB.TabIndex = 1; // // txtPhaseVolUA @@ -1314,7 +1314,7 @@ namespace JY.Inspection this.txtPhaseVolUA.Location = new System.Drawing.Point(89, 23); this.txtPhaseVolUA.Name = "txtPhaseVolUA"; this.txtPhaseVolUA.ReadOnly = true; - this.txtPhaseVolUA.Size = new System.Drawing.Size(108, 23); + this.txtPhaseVolUA.Size = new System.Drawing.Size(108, 27); this.txtPhaseVolUA.TabIndex = 0; // // groupBox6 @@ -1349,7 +1349,7 @@ namespace JY.Inspection this.groupBox6.Controls.Add(this.metroLabel33); this.groupBox6.Location = new System.Drawing.Point(0, 6); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(564, 194); + this.groupBox6.Size = new System.Drawing.Size(564, 192); this.groupBox6.TabIndex = 0; this.groupBox6.TabStop = false; this.groupBox6.Text = "档位拉带参数"; @@ -1359,7 +1359,7 @@ namespace JY.Inspection this.txtTensionStrapCCD4.Enabled = false; this.txtTensionStrapCCD4.Location = new System.Drawing.Point(173, 129); this.txtTensionStrapCCD4.Name = "txtTensionStrapCCD4"; - this.txtTensionStrapCCD4.Size = new System.Drawing.Size(58, 21); + this.txtTensionStrapCCD4.Size = new System.Drawing.Size(58, 25); this.txtTensionStrapCCD4.TabIndex = 157; // // txtgrading4 @@ -1367,7 +1367,7 @@ namespace JY.Inspection this.txtgrading4.Enabled = false; this.txtgrading4.Location = new System.Drawing.Point(109, 129); this.txtgrading4.Name = "txtgrading4"; - this.txtgrading4.Size = new System.Drawing.Size(58, 21); + this.txtgrading4.Size = new System.Drawing.Size(58, 25); this.txtgrading4.TabIndex = 141; // // metroLabel13 @@ -1375,7 +1375,7 @@ namespace JY.Inspection this.metroLabel13.AutoSize = true; this.metroLabel13.Location = new System.Drawing.Point(163, 131); this.metroLabel13.Name = "metroLabel13"; - this.metroLabel13.Size = new System.Drawing.Size(15, 19); + this.metroLabel13.Size = new System.Drawing.Size(15, 20); this.metroLabel13.TabIndex = 158; this.metroLabel13.Text = "-"; // @@ -1384,7 +1384,7 @@ namespace JY.Inspection this.txtTensionStrapCCD3.Enabled = false; this.txtTensionStrapCCD3.Location = new System.Drawing.Point(173, 94); this.txtTensionStrapCCD3.Name = "txtTensionStrapCCD3"; - this.txtTensionStrapCCD3.Size = new System.Drawing.Size(58, 21); + this.txtTensionStrapCCD3.Size = new System.Drawing.Size(58, 25); this.txtTensionStrapCCD3.TabIndex = 156; // // txtgrading3 @@ -1392,7 +1392,7 @@ namespace JY.Inspection this.txtgrading3.Enabled = false; this.txtgrading3.Location = new System.Drawing.Point(109, 94); this.txtgrading3.Name = "txtgrading3"; - this.txtgrading3.Size = new System.Drawing.Size(58, 21); + this.txtgrading3.Size = new System.Drawing.Size(58, 25); this.txtgrading3.TabIndex = 142; // // metroLabel7 @@ -1400,7 +1400,7 @@ namespace JY.Inspection this.metroLabel7.AutoSize = true; this.metroLabel7.Location = new System.Drawing.Point(163, 91); this.metroLabel7.Name = "metroLabel7"; - this.metroLabel7.Size = new System.Drawing.Size(15, 19); + this.metroLabel7.Size = new System.Drawing.Size(15, 20); this.metroLabel7.TabIndex = 155; this.metroLabel7.Text = "-"; // @@ -1409,7 +1409,7 @@ namespace JY.Inspection this.txtTensionStrapCCD2.Enabled = false; this.txtTensionStrapCCD2.Location = new System.Drawing.Point(173, 62); this.txtTensionStrapCCD2.Name = "txtTensionStrapCCD2"; - this.txtTensionStrapCCD2.Size = new System.Drawing.Size(58, 21); + this.txtTensionStrapCCD2.Size = new System.Drawing.Size(58, 25); this.txtTensionStrapCCD2.TabIndex = 154; // // txtgrading2 @@ -1417,7 +1417,7 @@ namespace JY.Inspection this.txtgrading2.Enabled = false; this.txtgrading2.Location = new System.Drawing.Point(109, 62); this.txtgrading2.Name = "txtgrading2"; - this.txtgrading2.Size = new System.Drawing.Size(58, 21); + this.txtgrading2.Size = new System.Drawing.Size(58, 25); this.txtgrading2.TabIndex = 143; // // metroLabel6 @@ -1425,7 +1425,7 @@ namespace JY.Inspection this.metroLabel6.AutoSize = true; this.metroLabel6.Location = new System.Drawing.Point(163, 62); this.metroLabel6.Name = "metroLabel6"; - this.metroLabel6.Size = new System.Drawing.Size(15, 19); + this.metroLabel6.Size = new System.Drawing.Size(15, 20); this.metroLabel6.TabIndex = 153; this.metroLabel6.Text = "-"; // @@ -1434,7 +1434,7 @@ namespace JY.Inspection this.txtgrading1.Enabled = false; this.txtgrading1.Location = new System.Drawing.Point(109, 28); this.txtgrading1.Name = "txtgrading1"; - this.txtgrading1.Size = new System.Drawing.Size(58, 21); + this.txtgrading1.Size = new System.Drawing.Size(58, 25); this.txtgrading1.TabIndex = 146; // // txtTensionStrapCCD1 @@ -1442,7 +1442,7 @@ namespace JY.Inspection this.txtTensionStrapCCD1.Enabled = false; this.txtTensionStrapCCD1.Location = new System.Drawing.Point(173, 28); this.txtTensionStrapCCD1.Name = "txtTensionStrapCCD1"; - this.txtTensionStrapCCD1.Size = new System.Drawing.Size(58, 21); + this.txtTensionStrapCCD1.Size = new System.Drawing.Size(58, 25); this.txtTensionStrapCCD1.TabIndex = 152; // // metroLabel5 @@ -1450,7 +1450,7 @@ namespace JY.Inspection this.metroLabel5.AutoSize = true; this.metroLabel5.Location = new System.Drawing.Point(163, 28); this.metroLabel5.Name = "metroLabel5"; - this.metroLabel5.Size = new System.Drawing.Size(15, 19); + this.metroLabel5.Size = new System.Drawing.Size(15, 20); this.metroLabel5.TabIndex = 151; this.metroLabel5.Text = "-"; // @@ -1460,7 +1460,7 @@ namespace JY.Inspection this.chkStartNGFL.Enabled = false; this.chkStartNGFL.Location = new System.Drawing.Point(377, 134); this.chkStartNGFL.Name = "chkStartNGFL"; - this.chkStartNGFL.Size = new System.Drawing.Size(120, 16); + this.chkStartNGFL.Size = new System.Drawing.Size(150, 19); this.chkStartNGFL.TabIndex = 150; this.chkStartNGFL.Text = "NG电池不分类排出"; this.chkStartNGFL.UseVisualStyleBackColor = true; @@ -1470,7 +1470,7 @@ namespace JY.Inspection this.txtTensionStrap3.Enabled = false; this.txtTensionStrap3.Location = new System.Drawing.Point(367, 96); this.txtTensionStrap3.Name = "txtTensionStrap3"; - this.txtTensionStrap3.Size = new System.Drawing.Size(92, 21); + this.txtTensionStrap3.Size = new System.Drawing.Size(92, 25); this.txtTensionStrap3.TabIndex = 149; // // metroLabel1 @@ -1478,7 +1478,7 @@ namespace JY.Inspection this.metroLabel1.AutoSize = true; this.metroLabel1.Location = new System.Drawing.Point(290, 96); this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Size = new System.Drawing.Size(85, 19); + this.metroLabel1.Size = new System.Drawing.Size(90, 20); this.metroLabel1.TabIndex = 148; this.metroLabel1.Text = "NG拉带(7)："; // @@ -1487,7 +1487,7 @@ namespace JY.Inspection this.metroLabel36.AutoSize = true; this.metroLabel36.Location = new System.Drawing.Point(34, 129); this.metroLabel36.Name = "metroLabel36"; - this.metroLabel36.Size = new System.Drawing.Size(84, 19); + this.metroLabel36.Size = new System.Drawing.Size(89, 20); this.metroLabel36.TabIndex = 134; this.metroLabel36.Text = "OK拉带(4)："; // @@ -1496,7 +1496,7 @@ namespace JY.Inspection this.metroLabel35.AutoSize = true; this.metroLabel35.Location = new System.Drawing.Point(34, 97); this.metroLabel35.Name = "metroLabel35"; - this.metroLabel35.Size = new System.Drawing.Size(84, 19); + this.metroLabel35.Size = new System.Drawing.Size(89, 20); this.metroLabel35.TabIndex = 135; this.metroLabel35.Text = "OK拉带(3)："; // @@ -1505,7 +1505,7 @@ namespace JY.Inspection this.metroLabel34.AutoSize = true; this.metroLabel34.Location = new System.Drawing.Point(34, 62); this.metroLabel34.Name = "metroLabel34"; - this.metroLabel34.Size = new System.Drawing.Size(84, 19); + this.metroLabel34.Size = new System.Drawing.Size(89, 20); this.metroLabel34.TabIndex = 136; this.metroLabel34.Text = "OK拉带(2)："; // @@ -1514,7 +1514,7 @@ namespace JY.Inspection this.txtTensionStrap2.Enabled = false; this.txtTensionStrap2.Location = new System.Drawing.Point(368, 62); this.txtTensionStrap2.Name = "txtTensionStrap2"; - this.txtTensionStrap2.Size = new System.Drawing.Size(92, 21); + this.txtTensionStrap2.Size = new System.Drawing.Size(92, 25); this.txtTensionStrap2.TabIndex = 144; // // chkIsGarding @@ -1523,7 +1523,7 @@ namespace JY.Inspection this.chkIsGarding.Enabled = false; this.chkIsGarding.Location = new System.Drawing.Point(243, 134); this.chkIsGarding.Name = "chkIsGarding"; - this.chkIsGarding.Size = new System.Drawing.Size(132, 16); + this.chkIsGarding.Size = new System.Drawing.Size(164, 19); this.chkIsGarding.TabIndex = 147; this.chkIsGarding.Text = "是否开启上位机分档"; this.chkIsGarding.UseVisualStyleBackColor = true; @@ -1533,7 +1533,7 @@ namespace JY.Inspection this.metroLabel38.AutoSize = true; this.metroLabel38.Location = new System.Drawing.Point(290, 62); this.metroLabel38.Name = "metroLabel38"; - this.metroLabel38.Size = new System.Drawing.Size(85, 19); + this.metroLabel38.Size = new System.Drawing.Size(91, 20); this.metroLabel38.TabIndex = 138; this.metroLabel38.Text = "NG拉带(6)："; // @@ -1542,7 +1542,7 @@ namespace JY.Inspection this.txtTensionStrap1.Enabled = false; this.txtTensionStrap1.Location = new System.Drawing.Point(368, 28); this.txtTensionStrap1.Name = "txtTensionStrap1"; - this.txtTensionStrap1.Size = new System.Drawing.Size(92, 21); + this.txtTensionStrap1.Size = new System.Drawing.Size(92, 25); this.txtTensionStrap1.TabIndex = 145; // // metroLabel37 @@ -1550,7 +1550,7 @@ namespace JY.Inspection this.metroLabel37.AutoSize = true; this.metroLabel37.Location = new System.Drawing.Point(290, 28); this.metroLabel37.Name = "metroLabel37"; - this.metroLabel37.Size = new System.Drawing.Size(85, 19); + this.metroLabel37.Size = new System.Drawing.Size(91, 20); this.metroLabel37.TabIndex = 139; this.metroLabel37.Text = "NG拉带(5)："; // @@ -1559,7 +1559,7 @@ namespace JY.Inspection this.metroLabel33.AutoSize = true; this.metroLabel33.Location = new System.Drawing.Point(34, 28); this.metroLabel33.Name = "metroLabel33"; - this.metroLabel33.Size = new System.Drawing.Size(82, 19); + this.metroLabel33.Size = new System.Drawing.Size(86, 20); this.metroLabel33.TabIndex = 140; this.metroLabel33.Text = "OK拉带(1)："; // @@ -1569,7 +1569,7 @@ namespace JY.Inspection this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox4.Location = new System.Drawing.Point(0, 0); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(654, 305); + this.groupBox4.Size = new System.Drawing.Size(654, 300); this.groupBox4.TabIndex = 2; this.groupBox4.TabStop = false; this.groupBox4.Text = "电池外观检测面定义"; @@ -1577,7 +1577,7 @@ namespace JY.Inspection // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.Location = new System.Drawing.Point(3, 17); + this.splitContainer2.Location = new System.Drawing.Point(3, 21); this.splitContainer2.Name = "splitContainer2"; // // splitContainer2.Panel1 @@ -1587,7 +1587,7 @@ namespace JY.Inspection // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.pictureBox3); - this.splitContainer2.Size = new System.Drawing.Size(648, 285); + this.splitContainer2.Size = new System.Drawing.Size(648, 276); this.splitContainer2.SplitterDistance = 322; this.splitContainer2.SplitterWidth = 3; this.splitContainer2.TabIndex = 0; @@ -1599,7 +1599,7 @@ namespace JY.Inspection this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image"))); this.pictureBox2.Location = new System.Drawing.Point(0, 0); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(322, 285); + this.pictureBox2.Size = new System.Drawing.Size(322, 276); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox2.TabIndex = 2; this.pictureBox2.TabStop = false; @@ -1610,7 +1610,7 @@ namespace JY.Inspection this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image"))); this.pictureBox3.Location = new System.Drawing.Point(0, 0); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(323, 285); + this.pictureBox3.Size = new System.Drawing.Size(323, 276); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox3.TabIndex = 3; this.pictureBox3.TabStop = false; @@ -1621,7 +1621,7 @@ namespace JY.Inspection this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox3.Location = new System.Drawing.Point(3, 3); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(71, 565); + this.groupBox3.Size = new System.Drawing.Size(71, 556); this.groupBox3.TabIndex = 11; this.groupBox3.TabStop = false; this.groupBox3.Text = "设备状态"; @@ -1647,7 +1647,7 @@ namespace JY.Inspection this.tableLayoutPanel4.Controls.Add(this.btnStart, 0, 0); this.tableLayoutPanel4.Controls.Add(this.metroLabel14, 0, 5); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 17); + this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 21); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 17; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 66F)); @@ -1669,7 +1669,7 @@ namespace JY.Inspection this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 62F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(65, 545); + this.tableLayoutPanel4.Size = new System.Drawing.Size(65, 532); this.tableLayoutPanel4.TabIndex = 5; // // metroLabel2 diff --git a/JY.Inspection/HomeForm.resx b/JY.Inspection/HomeForm.resx index 547e077..93cbb47 100644 --- a/JY.Inspection/HomeForm.resx +++ b/JY.Inspection/HomeForm.resx @@ -331,7 +331,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAE - CgAAAk1TRnQBSQFMAgEBAwEAAaABCAGgAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CgAAAk1TRnQBSQFMAgEBAwEAAbABCAGwAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -382,81 +382,6 @@ 137, 17 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True diff --git a/JY.Inspection/Mes/MESDataCombin.cs b/JY.Inspection/Mes/MESDataCombin.cs index e40f1ad..79466ec 100644 --- a/JY.Inspection/Mes/MESDataCombin.cs +++ b/JY.Inspection/Mes/MESDataCombin.cs @@ -204,43 +204,41 @@ namespace JY.Inspection.Mes } } - //tag1 = new TagDataVOListItem() { tagCode = "WGJA001", tagValue = m.ArrivalBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "入站条码" }; tdvls.Add(tag1); - //tag1 = new TagDataVOListItem() { tagCode = "WGJA002", tagValue = m.DepartureBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "出站条码" }; tdvls.Add(tag1); - //tag1 = new TagDataVOListItem() { tagCode = "WGJA003", tagValue = m.WorkShift, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "班次" }; tdvls.Add(tag1); - //tag1 = new TagDataVOListItem() { tagCode = "WGJA004", tagValue = m.OutTime, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "出站时间" }; tdvls.Add(tag1); + #region 手动赋值 + tdvls.Add(new TagDataVOListItem() + { + tagCode = "VIM_OPERATION_PROCESS", + tagValue = "外观检", + tagTime = m.OutTime, + tagCalculateResult = "Y", + tagRemark = "工艺流程" + }); - //foreach (var item in m.PLCValDic) - //{ - // // TODO 获取采集项配置 - // var cfgItem = Global.systemConfig.CollectItemCfgList - // .Where(it => it.IsEnable && it.PLCRelAddress == item.Key) - // .FirstOrDefault(); + tdvls.Add(new TagDataVOListItem() { + tagCode = "VIM_MODEL", + tagValue = Global.systemConfig.productType, + tagTime = m.OutTime, + tagCalculateResult = "Y", + tagRemark = "型号" + }); - // if (cfgItem == null) - // { - // continue; - // } + tdvls.Add(new TagDataVOListItem() { + tagCode = "VIM_RETEST_MARK", + tagValue = m.IsRepeat ? "1" : "0", + tagTime = m.OutTime, + tagCalculateResult = "Y", + tagRemark = "复测标记" + }); - // // 生成TagDataVoListItem - // tdvls.Add(new TagDataVOListItem() - // { - // tagCode = cfgItem.MesItemCode, - // tagValue = item.Value, - // tagTime = m.OutTime, - // tagCalculateResult = "Y", - // tagRemark = cfgItem.MesItemName - // }); - //} - - //tdvls.Add(new TagDataVOListItem() - //{ - // tagCode = "WGJA021", - // tagValue = m.Result, - // tagTime = m.OutTime, - // tagCalculateResult = "Y", - // tagRemark = "电池总结果" - //}); - //多个 + tdvls.Add(new TagDataVOListItem() + { + tagCode = "VIM_RETEST_TIME", + tagValue = m.OutTime, + tagTime = m.OutTime, + tagCalculateResult = "Y", + tagRemark = "复测时间" + }); + #endregion pl.tagDataVOList = tdvls; prp.payload = JsonHelper.Serialize(pl); diff --git a/JY.Model/DB.Entity/BlankingData.cs b/JY.Model/DB.Entity/BlankingData.cs index 7782549..7c8ee22 100644 --- a/JY.Model/DB.Entity/BlankingData.cs +++ b/JY.Model/DB.Entity/BlankingData.cs @@ -52,6 +52,12 @@ namespace JY.Model [Name("条码对比")] public string TMDB { get; set; } + /// + /// 进站时间 + /// + [SugarColumn(ColumnName = "InTime")] + public string InTime { set; get; } + /// /// 出站时间 /// @@ -59,6 +65,12 @@ namespace JY.Model [Name("出站时间")] public string OutTime { set; get; } + /// + /// 是否复投 + /// + [SugarColumn(ColumnName = "IsRepeat")] + public bool IsRepeat { get; set; } + /// /// 正面(2W/3W) /// diff --git a/JY.Model/Excel/CollectItemCfg.cs b/JY.Model/Excel/CollectItemCfg.cs index 392ab36..dffeb62 100644 --- a/JY.Model/Excel/CollectItemCfg.cs +++ b/JY.Model/Excel/CollectItemCfg.cs @@ -9,8 +9,8 @@ namespace JY.Model.Excel { public class CollectItemCfg { - [Description("PLC相对地址")] - public int? PLCRelAddress { get; set; } + //[Description("PLC相对地址")] + //public int? PLCRelAddress { get; set; } [Description("PLC采集数据含义")] public string PLCItemName { get; set; } diff --git a/数据库/20260814.sql b/数据库/20260814.sql index 11c7f84..cbdd883 100644 --- a/数据库/20260814.sql +++ b/数据库/20260814.sql @@ -7,3 +7,7 @@ ALTER TABLE S1270.dbo.BlankingData ADD CCDI3 int NULL; ALTER TABLE S1270.dbo.BlankingData ADD CCDI4 int NULL; ALTER TABLE S1270.dbo.BlankingData ADD CCDI5 int NULL; ALTER TABLE S1270.dbo.BlankingData ADD CCDI6 int NULL; + +ALTER TABLE S1270.dbo.BlankingData ADD InTime datetime NULL; +ALTER TABLE S1270.dbo.BlankingData ADD IsRepeat int NULL; +