SoftwareGroup/602_FD
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1111

Browse Source
This commit is contained in:
ldw
2025-09-26 17:38:01 +08:00
parent 114977f726
commit 0efdb118b6
5 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.ControlCenter/ControlCenter_Plc.cs
+1 -1
View File
@@ -2193,7 +2193,7 @@ namespace JinYuan.ControlCenters
CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}");
LoggerHelp.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}");
Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); });
//Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); });
//数据存储 - 异步处理
Task.Run(() =>
{
JinYuan.Models/BGearEntity.cs
+5 -17
View File
@@ -69,13 +69,7 @@ namespace JinYuan.Models
public int CCD18 { get; set; }
public int CCD19 { get; set; }
public int CCD20 { get; set; }
public int CCD21 { get; set; }
public int CCD22 { get; set; }
public int CCD23 { get; set; }
public int CCD24 { get; set; }
public int CCD25 { get; set; }
public int CCD26 { get; set; }
public int CCD27 { get; set; }
/// <summary>
/// 电芯1_厚度数据1
/// </summary>
@@ -117,13 +111,7 @@ namespace JinYuan.Models
public string CCDResult18 { get; set; }
public string CCDResult19 { get; set; }
public string CCDResult20 { get; set; }
public string CCDResult21 { get; set; }
public string CCDResult22 { get; set; }
public string CCDResult23 { get; set; }
public string CCDResult24 { get; set; }
public string CCDResult25 { get; set; }
public string CCDResult26 { get; set; }
public string CCDResult27 { get; set; }
/// <summary>
/// 芯包条码
@@ -166,7 +154,7 @@ namespace JinYuan.Models
/// 备注
/// </summary>
public string Remark { get; set; }
public string TestTime { get; set; }
//public string TestTime { get; set; }
public string RFID { get; set; }
public string ScanBarRes { get; set; }
@@ -221,10 +209,10 @@ namespace JinYuan.Models
/// <summary>
/// 结果数据是否上传MES
/// </summary>
public string Flag1 { get; set; }
//public string Flag1 { get; set; }
public string Info { get; set; }
//public string Info { get; set; }
/// <summary>
/// 进出站电池等级
/// </summary>
JinYuan.VirtualDataLibrary/DBSQL.cs
+1 -6
View File
@@ -101,12 +101,7 @@ namespace JinYuan.VirtualDataLibrary
}
public string GetBGearEntityByBarcode(List<string> listBarCode)
{
string strSql = $@"SELECT ChannelNo,[BarCode],[CSBYHASCANNINGTIME],[UpState],[MaterialCode],[CCDResult1],[CCDResult2],[CCDResult3],[CCDResult4],[CCDResult5],[CCDResult6],[CCDResult7],[CCDResult8],[CCDResult9],[CCDResult10],[CCDResult11],[CCDResult12],[CCDResult13],[CCDResult14],[CCDResult15],[CCDResult16],[CCDResult17],[CCDResult18],[CCDResult19],[CCDResult20],[CCDResult21],[CCDResult22],[CCDResult23],[CCDResult24],[CCDResult25],[CCDResult26],[CCDResult27],[CSBYHOUTSTATIONJUDGMENTRESULT],[CSBYHPROCESSNAME],[CSBYHSCHEDULE],[CSBYHINSTATIONTIME],[CSBYHOUTSTATIONTIME],[RethrowNum],[Flag],[Remark],[Result],[ThicknessPLCResult1]
,[ThicknessPLCResult2]
,[ThicknessPLCResult3]
,[ThicknessResult1]
,[ThicknessResult2]
,[ThicknessResult3] FROM BGearEntity WHERE BarCode in ('{string.Join("','", listBarCode)}')";
string strSql = $@"SELECT * FROM BGearEntity WHERE BarCode in ('{string.Join("','", listBarCode)}')";
return strSql;
}
LargeSquareOne/FrmDataMonitor.Designer.cs
Generated
+26 -26
View File
@@ -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();
@@ -76,7 +77,6 @@
this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column102 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.tableLayoutPanel1.SuspendLayout();
this.groupBoxEX3.SuspendLayout();
this.groupBoxEX2.SuspendLayout();
@@ -108,7 +108,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
@@ -127,7 +127,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 = "操作设置";
@@ -136,7 +136,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, 103);
this.btSatrt.Location = new System.Drawing.Point(42, 24);
this.btSatrt.Margin = new System.Windows.Forms.Padding(2);
this.btSatrt.Name = "btSatrt";
this.btSatrt.Padding = new System.Windows.Forms.Padding(2);
@@ -213,11 +213,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 = "参数";
@@ -239,7 +239,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;
@@ -278,12 +278,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 = "进站";
@@ -344,7 +344,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, 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);
@@ -418,11 +418,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 = "日志记录";
@@ -437,7 +437,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 = "";
//
@@ -449,11 +449,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 = "出站";
@@ -520,10 +520,18 @@
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 = "序号";
@@ -551,7 +559,7 @@
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "CSBYHCODEA";
this.dataGridViewTextBoxColumn5.DataPropertyName = "BarCode";
this.dataGridViewTextBoxColumn5.HeaderText = "芯包条码";
this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
@@ -635,21 +643,13 @@
this.Column3.ReadOnly = true;
this.Column3.Width = 400;
//
// 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);
LargeSquareOne/FrmDataMonitor.resx
+1 -1
View File
@@ -188,7 +188,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
DQAAAk1TRnQBSQFMAgEBAwEAAZABAgGQAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
DQAAAk1TRnQBSQFMAgEBAwEAAZgBAgGYAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1
ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2