diff --git a/LargeSquareOne/FrmDataMonitor.Designer.cs b/LargeSquareOne/FrmDataMonitor.Designer.cs
index fb47d16..5b38b69 100644
--- a/LargeSquareOne/FrmDataMonitor.Designer.cs
+++ b/LargeSquareOne/FrmDataMonitor.Designer.cs
@@ -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;
diff --git a/LargeSquareOne/FrmDataMonitor.resx b/LargeSquareOne/FrmDataMonitor.resx
index eb9bfb5..848a504 100644
--- a/LargeSquareOne/FrmDataMonitor.resx
+++ b/LargeSquareOne/FrmDataMonitor.resx
@@ -144,13 +144,13 @@
True
-
+
True
True
-
+
True