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

Merge branch 'master' of https://gitee.com/weixin2015/1257-upper-computer-SQLServer

Browse Source
This commit is contained in:
fy
2025-09-05 15:20:08 +08:00
parent b331bf3ae1 5158ef7a04
commit b83c497566
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LargeSquareOne/FrmDataMonitor.Designer.cs
Generated
+30 -30
View File
@@ -62,11 +62,12 @@
this.rtb_Info = new System.Windows.Forms.RichTextBox();
this.groupBoxEX5 = new JinYuan.ControlLib.GroupBoxEX();
this.dgvBlankingData = new System.Windows.Forms.DataGridView();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column33 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column33 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column138 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -103,7 +104,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();
@@ -499,9 +499,9 @@
this.dgvBlankingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn1,
this.dataGridViewTextBoxColumn2,
this.Column32,
this.Column33,
this.dataGridViewTextBoxColumn5,
this.Column33,
this.Column32,
this.Column29,
this.Column3,
this.Column138,
@@ -571,6 +571,14 @@
this.dgvBlankingData.TabIndex = 10;
this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick);
//
// imageList1
//
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
this.imageList1.Images.SetKeyName(0, "info.png");
this.imageList1.Images.SetKeyName(1, "error.png");
this.imageList1.Images.SetKeyName(2, "warning.png");
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "ChannelNo";
@@ -590,14 +598,15 @@
this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.dataGridViewTextBoxColumn2.Width = 160;
//
// Column32
// dataGridViewTextBoxColumn5
//
this.Column32.DataPropertyName = "CSBYHPROCESSNAME";
this.Column32.HeaderText = "工序名";
this.Column32.MinimumWidth = 8;
this.Column32.Name = "Column32";
this.Column32.ReadOnly = true;
this.Column32.Width = 150;
this.dataGridViewTextBoxColumn5.DataPropertyName = "CSBYHCODEA";
this.dataGridViewTextBoxColumn5.HeaderText = "芯包条码";
this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.dataGridViewTextBoxColumn5.Width = 210;
//
// Column33
//
@@ -608,15 +617,14 @@
this.Column33.ReadOnly = true;
this.Column33.Width = 150;
//
// dataGridViewTextBoxColumn5
// Column32
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "CSBYHCODEA";
this.dataGridViewTextBoxColumn5.HeaderText = "芯包条码";
this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.dataGridViewTextBoxColumn5.Width = 210;
this.Column32.DataPropertyName = "CSBYHPROCESSNAME";
this.Column32.HeaderText = "工序";
this.Column32.MinimumWidth = 8;
this.Column32.Name = "Column32";
this.Column32.ReadOnly = true;
this.Column32.Width = 150;
//
// Column29
//
@@ -881,14 +889,6 @@
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);
@@ -947,9 +947,9 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column139;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
private System.Windows.Forms.DataGridViewTextBoxColumn Column32;
private System.Windows.Forms.DataGridViewTextBoxColumn Column33;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
private System.Windows.Forms.DataGridViewTextBoxColumn Column33;
private System.Windows.Forms.DataGridViewTextBoxColumn Column32;
private System.Windows.Forms.DataGridViewTextBoxColumn Column29;
private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
private System.Windows.Forms.DataGridViewTextBoxColumn Column138;
LargeSquareOne/FrmDataMonitor.resx
+2 -2
View File
@@ -144,13 +144,13 @@
<metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column32.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column33.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Column32.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column29.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">