diff --git a/WindowsFormsApp1/MES_PLC_Control.csproj b/WindowsFormsApp1/MES_PLC_Control.csproj
index 8569eb6..75b0099 100644
--- a/WindowsFormsApp1/MES_PLC_Control.csproj
+++ b/WindowsFormsApp1/MES_PLC_Control.csproj
@@ -87,12 +87,6 @@
Line_Insert.cs
-
- Form
-
-
- LinePLC_Insert.cs
-
Form
@@ -153,12 +147,6 @@
FLow_Insert.cs
-
- Form
-
-
- LinePLC_Manage.cs
-
Form
@@ -177,6 +165,18 @@
Angleaddress_Manage.cs
+
+ Form
+
+
+ ScanForm_DZ.cs
+
+
+ Form
+
+
+ ScanForm_SSQ.cs
+
Form
@@ -231,10 +231,10 @@
MESUrl.cs
+
-
@@ -265,9 +265,6 @@
Line_Insert.cs
-
- LinePLC_Insert.cs
-
MESUrl_Insert.cs
@@ -298,9 +295,6 @@
Flow_Manage.cs
-
- LinePLC_Manage.cs
-
Line_Manage.cs
@@ -310,6 +304,12 @@
Angleaddress_Manage.cs
+
+ ScanForm_DZ.cs
+
+
+ ScanForm_SSQ.cs
+
Torqueaddress_Manage.cs
diff --git a/WindowsFormsApp1/MainForm.Designer.cs b/WindowsFormsApp1/MainForm.Designer.cs
index 005430f..30ef193 100644
--- a/WindowsFormsApp1/MainForm.Designer.cs
+++ b/WindowsFormsApp1/MainForm.Designer.cs
@@ -36,7 +36,6 @@
this.用户管理ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.产线管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.产线基础信息管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.产线关联PLC管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pLC管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pLC通讯设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pLC地址设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -46,22 +45,18 @@
this.扫码枪配置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.扫码枪配置ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.扭力角度扭矩设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.螺丝枪扭力设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.扭力曲线配置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.压力曲线设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.系统参数配置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
- this.gropb = new System.Windows.Forms.GroupBox();
- this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel();
- this.Tray盘 = new System.Windows.Forms.Label();
- this.Tray盘二维码 = new System.Windows.Forms.Label();
- this.原料包装LOT号 = new System.Windows.Forms.GroupBox();
- this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
- this.MES提示信息 = new System.Windows.Forms.Label();
- this.MES提示 = new System.Windows.Forms.Label();
- this.LOT号显示 = new System.Windows.Forms.Label();
- this.LOT号 = new System.Windows.Forms.Label();
- this.胶水上下线 = new System.Windows.Forms.Button();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel();
+ this.PLC1状态 = new System.Windows.Forms.Label();
+ this.PLC1名称 = new System.Windows.Forms.Label();
+ this.PLC1机台状态 = new System.Windows.Forms.Label();
+ this.PLC1时间 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel();
this.事件4时间 = new System.Windows.Forms.Label();
@@ -76,19 +71,27 @@
this.事件3 = new System.Windows.Forms.Label();
this.事件4 = new System.Windows.Forms.Label();
this.事件4结果 = new System.Windows.Forms.Label();
+ this.gropb = new System.Windows.Forms.GroupBox();
+ this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel();
+ this.MES提示信息 = new System.Windows.Forms.Label();
+ this.Tray盘 = new System.Windows.Forms.Label();
+ this.原料包装LOT号 = new System.Windows.Forms.GroupBox();
+ this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
+ this.Tray盘二维码 = new System.Windows.Forms.Label();
+ this.MES提示 = new System.Windows.Forms.Label();
+ this.LOT号显示 = new System.Windows.Forms.Label();
+ this.LOT号 = new System.Windows.Forms.Label();
+ this.胶水上下线 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
- this.机台状态 = new System.Windows.Forms.Label();
- this.PLC通讯时间 = new System.Windows.Forms.Label();
this.MES通讯时间 = new System.Windows.Forms.Label();
- this.PLC链接状态 = new System.Windows.Forms.Label();
this.MES链接状态 = new System.Windows.Forms.Label();
this.当前时间 = new System.Windows.Forms.Label();
this.操作人员ID = new System.Windows.Forms.Label();
- this.机台编号 = new System.Windows.Forms.Label();
- this.段别 = new System.Windows.Forms.Label();
- this.线别 = new System.Windows.Forms.Label();
+ this.linetype = new System.Windows.Forms.Label();
+ this.linecode = new System.Windows.Forms.Label();
+ this.linename = new System.Windows.Forms.Label();
this.开始处理 = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
@@ -99,21 +102,42 @@
this.底部注释4 = new System.Windows.Forms.Label();
this.底部注释5 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
- this.螺丝枪扭力设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.剩余寿命 = new System.Windows.Forms.Label();
+ this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel();
+ this.linemode = new System.Windows.Forms.Label();
+ this.lineremark1 = new System.Windows.Forms.Label();
+ this.lineremark2 = new System.Windows.Forms.Label();
+ this.lineremark3 = new System.Windows.Forms.Label();
+ this.lineremark4 = new System.Windows.Forms.Label();
+ this.lineremark5 = new System.Windows.Forms.Label();
+ this.lineremark6 = new System.Windows.Forms.Label();
+ this.lineremark7 = new System.Windows.Forms.Label();
+ this.barcode1 = new System.Windows.Forms.Label();
+ this.barcode2 = new System.Windows.Forms.Label();
+ this.barcode3 = new System.Windows.Forms.Label();
+ this.barcode4 = new System.Windows.Forms.Label();
+ this.barcode5 = new System.Windows.Forms.Label();
+ this.barcode6 = new System.Windows.Forms.Label();
+ this.barcode7 = new System.Windows.Forms.Label();
+ this.barcode8 = new System.Windows.Forms.Label();
+ this.barcode9 = new System.Windows.Forms.Label();
this.menuStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.tableLayoutPanel4.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.tableLayoutPanel9.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.tableLayoutPanel7.SuspendLayout();
this.gropb.SuspendLayout();
this.tableLayoutPanel6.SuspendLayout();
this.原料包装LOT号.SuspendLayout();
this.tableLayoutPanel5.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.tableLayoutPanel7.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tableLayoutPanel8.SuspendLayout();
+ this.tableLayoutPanel10.SuspendLayout();
this.SuspendLayout();
//
// menuStrip1
@@ -170,8 +194,7 @@
// 产线管理ToolStripMenuItem
//
this.产线管理ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.产线基础信息管理ToolStripMenuItem,
- this.产线关联PLC管理ToolStripMenuItem});
+ this.产线基础信息管理ToolStripMenuItem});
this.产线管理ToolStripMenuItem.Name = "产线管理ToolStripMenuItem";
this.产线管理ToolStripMenuItem.Size = new System.Drawing.Size(145, 40);
this.产线管理ToolStripMenuItem.Text = "产线管理";
@@ -183,13 +206,6 @@
this.产线基础信息管理ToolStripMenuItem.Text = "产线基础信息管理";
this.产线基础信息管理ToolStripMenuItem.Click += new System.EventHandler(this.产线基础信息管理ToolStripMenuItem_Click);
//
- // 产线关联PLC管理ToolStripMenuItem
- //
- this.产线关联PLC管理ToolStripMenuItem.Name = "产线关联PLC管理ToolStripMenuItem";
- this.产线关联PLC管理ToolStripMenuItem.Size = new System.Drawing.Size(359, 44);
- this.产线关联PLC管理ToolStripMenuItem.Text = "产线关联PLC管理";
- this.产线关联PLC管理ToolStripMenuItem.Click += new System.EventHandler(this.产线关联PLC管理ToolStripMenuItem_Click);
- //
// pLC管理ToolStripMenuItem
//
this.pLC管理ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -249,7 +265,7 @@
// 扫码枪配置ToolStripMenuItem1
//
this.扫码枪配置ToolStripMenuItem1.Name = "扫码枪配置ToolStripMenuItem1";
- this.扫码枪配置ToolStripMenuItem1.Size = new System.Drawing.Size(315, 44);
+ this.扫码枪配置ToolStripMenuItem1.Size = new System.Drawing.Size(331, 44);
this.扫码枪配置ToolStripMenuItem1.Text = "COM口配置";
this.扫码枪配置ToolStripMenuItem1.Click += new System.EventHandler(this.扫码枪配置ToolStripMenuItem1_Click);
//
@@ -260,16 +276,23 @@
this.扭力角度扭矩设置ToolStripMenuItem.Text = "螺丝枪角度设置";
this.扭力角度扭矩设置ToolStripMenuItem.Click += new System.EventHandler(this.扭力角度扭矩设置ToolStripMenuItem_Click);
//
+ // 螺丝枪扭力设置ToolStripMenuItem
+ //
+ this.螺丝枪扭力设置ToolStripMenuItem.Name = "螺丝枪扭力设置ToolStripMenuItem";
+ this.螺丝枪扭力设置ToolStripMenuItem.Size = new System.Drawing.Size(331, 44);
+ this.螺丝枪扭力设置ToolStripMenuItem.Text = "螺丝枪扭力设置";
+ this.螺丝枪扭力设置ToolStripMenuItem.Click += new System.EventHandler(this.螺丝枪扭力设置ToolStripMenuItem_Click);
+ //
// 扭力曲线配置ToolStripMenuItem
//
this.扭力曲线配置ToolStripMenuItem.Name = "扭力曲线配置ToolStripMenuItem";
- this.扭力曲线配置ToolStripMenuItem.Size = new System.Drawing.Size(315, 44);
+ this.扭力曲线配置ToolStripMenuItem.Size = new System.Drawing.Size(331, 44);
this.扭力曲线配置ToolStripMenuItem.Text = "扭力曲线配置";
//
// 压力曲线设置ToolStripMenuItem
//
this.压力曲线设置ToolStripMenuItem.Name = "压力曲线设置ToolStripMenuItem";
- this.压力曲线设置ToolStripMenuItem.Size = new System.Drawing.Size(315, 44);
+ this.压力曲线设置ToolStripMenuItem.Size = new System.Drawing.Size(331, 44);
this.压力曲线设置ToolStripMenuItem.Text = "压力曲线设置";
//
// 系统参数配置ToolStripMenuItem
@@ -292,10 +315,10 @@
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(5);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 4;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 13.69908F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 49.35109F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 32.90072F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.049116F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23.69995F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 49.35099F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 22.89995F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.049108F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1613, 935);
this.tableLayoutPanel1.TabIndex = 6;
//
@@ -304,13 +327,15 @@
this.tableLayoutPanel4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.tableLayoutPanel4.ColumnCount = 2;
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 76.54172F));
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 23.45828F));
+ this.tableLayoutPanel4.ColumnCount = 3;
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel4.Controls.Add(this.groupBox4, 1, 0);
+ this.tableLayoutPanel4.Controls.Add(this.groupBox2, 2, 0);
this.tableLayoutPanel4.Controls.Add(this.gropb, 0, 1);
this.tableLayoutPanel4.Controls.Add(this.原料包装LOT号, 0, 0);
- this.tableLayoutPanel4.Controls.Add(this.groupBox2, 1, 0);
- this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 131);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 224);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 60.04619F));
@@ -318,156 +343,93 @@
this.tableLayoutPanel4.Size = new System.Drawing.Size(1607, 455);
this.tableLayoutPanel4.TabIndex = 8;
//
- // gropb
+ // groupBox4
//
- this.gropb.Controls.Add(this.tableLayoutPanel6);
- this.gropb.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gropb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.gropb.Location = new System.Drawing.Point(3, 276);
- this.gropb.Name = "gropb";
- this.gropb.Size = new System.Drawing.Size(1224, 176);
- this.gropb.TabIndex = 1;
- this.gropb.TabStop = false;
- this.gropb.Text = "Tray盘二维码";
+ this.groupBox4.Controls.Add(this.tableLayoutPanel9);
+ this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox4.Location = new System.Drawing.Point(1127, 3);
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.Size = new System.Drawing.Size(154, 267);
+ this.groupBox4.TabIndex = 4;
+ this.groupBox4.TabStop = false;
+ this.groupBox4.Text = "PLC链接";
//
- // tableLayoutPanel6
+ // tableLayoutPanel9
//
- this.tableLayoutPanel6.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
- this.tableLayoutPanel6.ColumnCount = 2;
- this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 80F));
- this.tableLayoutPanel6.Controls.Add(this.Tray盘, 0, 0);
- this.tableLayoutPanel6.Controls.Add(this.Tray盘二维码, 1, 0);
- this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 35);
- this.tableLayoutPanel6.Name = "tableLayoutPanel6";
- this.tableLayoutPanel6.RowCount = 1;
- this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel6.Size = new System.Drawing.Size(1218, 138);
- this.tableLayoutPanel6.TabIndex = 1;
+ this.tableLayoutPanel9.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
+ this.tableLayoutPanel9.ColumnCount = 1;
+ this.tableLayoutPanel9.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel9.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+ this.tableLayoutPanel9.Controls.Add(this.PLC1状态, 0, 0);
+ this.tableLayoutPanel9.Controls.Add(this.PLC1名称, 0, 1);
+ this.tableLayoutPanel9.Controls.Add(this.PLC1机台状态, 0, 2);
+ this.tableLayoutPanel9.Controls.Add(this.PLC1时间, 0, 3);
+ this.tableLayoutPanel9.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel9.Location = new System.Drawing.Point(3, 35);
+ this.tableLayoutPanel9.Name = "tableLayoutPanel9";
+ this.tableLayoutPanel9.RowCount = 4;
+ this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 52F));
+ this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16F));
+ this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16F));
+ this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16F));
+ this.tableLayoutPanel9.Size = new System.Drawing.Size(148, 229);
+ this.tableLayoutPanel9.TabIndex = 0;
//
- // Tray盘
+ // PLC1状态
//
- this.Tray盘.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.Tray盘.AutoSize = true;
- this.Tray盘.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.Tray盘.Location = new System.Drawing.Point(8, 27);
- this.Tray盘.Name = "Tray盘";
- this.Tray盘.Size = new System.Drawing.Size(228, 84);
- this.Tray盘.TabIndex = 3;
- this.Tray盘.Text = "Tray盘二维码:";
+ this.PLC1状态.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.PLC1状态.AutoSize = true;
+ this.PLC1状态.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.PLC1状态.Location = new System.Drawing.Point(28, 28);
+ this.PLC1状态.Name = "PLC1状态";
+ this.PLC1状态.Size = new System.Drawing.Size(91, 62);
+ this.PLC1状态.TabIndex = 0;
+ this.PLC1状态.Text = "OK";
//
- // Tray盘二维码
+ // PLC1名称
//
- this.Tray盘二维码.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.Tray盘二维码.AutoSize = true;
- this.Tray盘二维码.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.Tray盘二维码.Location = new System.Drawing.Point(397, 7);
- this.Tray盘二维码.Name = "Tray盘二维码";
- this.Tray盘二维码.Size = new System.Drawing.Size(667, 124);
- this.Tray盘二维码.TabIndex = 2;
- this.Tray盘二维码.Text = "Tray盘二维码:92139129312381928938";
+ this.PLC1名称.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.PLC1名称.AutoSize = true;
+ this.PLC1名称.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.PLC1名称.Location = new System.Drawing.Point(26, 121);
+ this.PLC1名称.Name = "PLC1名称";
+ this.PLC1名称.Size = new System.Drawing.Size(96, 28);
+ this.PLC1名称.TabIndex = 12;
+ this.PLC1名称.Text = "label6";
//
- // 原料包装LOT号
+ // PLC1机台状态
//
- this.原料包装LOT号.Controls.Add(this.tableLayoutPanel5);
- this.原料包装LOT号.Dock = System.Windows.Forms.DockStyle.Fill;
- this.原料包装LOT号.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.原料包装LOT号.Location = new System.Drawing.Point(3, 3);
- this.原料包装LOT号.Name = "原料包装LOT号";
- this.原料包装LOT号.Size = new System.Drawing.Size(1224, 267);
- this.原料包装LOT号.TabIndex = 0;
- this.原料包装LOT号.TabStop = false;
- this.原料包装LOT号.Text = "原料包装LOT号";
+ this.PLC1机台状态.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.PLC1机台状态.AutoSize = true;
+ this.PLC1机台状态.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.PLC1机台状态.Location = new System.Drawing.Point(26, 157);
+ this.PLC1机台状态.Name = "PLC1机台状态";
+ this.PLC1机台状态.Size = new System.Drawing.Size(96, 28);
+ this.PLC1机台状态.TabIndex = 2;
+ this.PLC1机台状态.Text = "label6";
//
- // tableLayoutPanel5
+ // PLC1时间
//
- this.tableLayoutPanel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.tableLayoutPanel5.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
- this.tableLayoutPanel5.ColumnCount = 3;
- this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.22222F));
- this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 66.66666F));
- this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
- this.tableLayoutPanel5.Controls.Add(this.MES提示信息, 1, 1);
- this.tableLayoutPanel5.Controls.Add(this.MES提示, 0, 1);
- this.tableLayoutPanel5.Controls.Add(this.LOT号显示, 0, 0);
- this.tableLayoutPanel5.Controls.Add(this.LOT号, 1, 0);
- this.tableLayoutPanel5.Controls.Add(this.胶水上下线, 2, 0);
- this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 35);
- this.tableLayoutPanel5.Name = "tableLayoutPanel5";
- this.tableLayoutPanel5.RowCount = 2;
- this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel5.Size = new System.Drawing.Size(1218, 229);
- this.tableLayoutPanel5.TabIndex = 0;
- //
- // MES提示信息
- //
- this.MES提示信息.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.MES提示信息.AutoSize = true;
- this.MES提示信息.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.MES提示信息.Location = new System.Drawing.Point(376, 140);
- this.MES提示信息.Name = "MES提示信息";
- this.MES提示信息.Size = new System.Drawing.Size(598, 62);
- this.MES提示信息.TabIndex = 5;
- this.MES提示信息.Text = "MES提示信息:11111";
- //
- // MES提示
- //
- this.MES提示.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.MES提示.AutoSize = true;
- this.MES提示.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.MES提示.Location = new System.Drawing.Point(32, 150);
- this.MES提示.Name = "MES提示";
- this.MES提示.Size = new System.Drawing.Size(207, 42);
- this.MES提示.TabIndex = 4;
- this.MES提示.Text = "MES提示:";
- //
- // LOT号显示
- //
- this.LOT号显示.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.LOT号显示.AutoSize = true;
- this.LOT号显示.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.LOT号显示.Location = new System.Drawing.Point(11, 36);
- this.LOT号显示.Name = "LOT号显示";
- this.LOT号显示.Size = new System.Drawing.Size(249, 42);
- this.LOT号显示.TabIndex = 2;
- this.LOT号显示.Text = "LOT号显示:";
- //
- // LOT号
- //
- this.LOT号.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.LOT号.AutoSize = true;
- this.LOT号.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.LOT号.Location = new System.Drawing.Point(327, 26);
- this.LOT号.Name = "LOT号";
- this.LOT号.Size = new System.Drawing.Size(697, 62);
- this.LOT号.TabIndex = 0;
- this.LOT号.Text = "LOT号:23199191919191";
- //
- // 胶水上下线
- //
- this.胶水上下线.Dock = System.Windows.Forms.DockStyle.Fill;
- this.胶水上下线.Location = new System.Drawing.Point(1084, 4);
- this.胶水上下线.Name = "胶水上下线";
- this.tableLayoutPanel5.SetRowSpan(this.胶水上下线, 2);
- this.胶水上下线.Size = new System.Drawing.Size(130, 221);
- this.胶水上下线.TabIndex = 3;
- this.胶水上下线.Text = "胶水/三防漆\r\n上下线";
- this.胶水上下线.UseVisualStyleBackColor = true;
- this.胶水上下线.Click += new System.EventHandler(this.胶水上下线_Click);
+ this.PLC1时间.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.PLC1时间.AutoSize = true;
+ this.PLC1时间.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.PLC1时间.Location = new System.Drawing.Point(26, 195);
+ this.PLC1时间.Name = "PLC1时间";
+ this.PLC1时间.Size = new System.Drawing.Size(96, 28);
+ this.PLC1时间.TabIndex = 8;
+ this.PLC1时间.Text = "label4";
//
// groupBox2
//
this.groupBox2.Controls.Add(this.tableLayoutPanel7);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox2.Location = new System.Drawing.Point(1233, 3);
+ this.groupBox2.Location = new System.Drawing.Point(1287, 3);
this.groupBox2.Name = "groupBox2";
this.tableLayoutPanel4.SetRowSpan(this.groupBox2, 2);
- this.groupBox2.Size = new System.Drawing.Size(371, 449);
- this.groupBox2.TabIndex = 2;
+ this.groupBox2.Size = new System.Drawing.Size(317, 449);
+ this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "MES事件结果";
//
@@ -499,7 +461,7 @@
this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
- this.tableLayoutPanel7.Size = new System.Drawing.Size(365, 411);
+ this.tableLayoutPanel7.Size = new System.Drawing.Size(311, 411);
this.tableLayoutPanel7.TabIndex = 0;
//
// 事件4时间
@@ -507,9 +469,9 @@
this.事件4时间.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件4时间.AutoSize = true;
this.事件4时间.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件4时间.Location = new System.Drawing.Point(189, 372);
+ this.事件4时间.Location = new System.Drawing.Point(166, 368);
this.事件4时间.Name = "事件4时间";
- this.事件4时间.Size = new System.Drawing.Size(168, 34);
+ this.事件4时间.Size = new System.Drawing.Size(134, 42);
this.事件4时间.TabIndex = 11;
this.事件4时间.Text = "事件4时间";
//
@@ -518,9 +480,9 @@
this.事件3时间.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件3时间.AutoSize = true;
this.事件3时间.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件3时间.Location = new System.Drawing.Point(7, 372);
+ this.事件3时间.Location = new System.Drawing.Point(11, 368);
this.事件3时间.Name = "事件3时间";
- this.事件3时间.Size = new System.Drawing.Size(168, 34);
+ this.事件3时间.Size = new System.Drawing.Size(134, 42);
this.事件3时间.TabIndex = 10;
this.事件3时间.Text = "事件3时间";
//
@@ -529,9 +491,9 @@
this.事件2时间.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件2时间.AutoSize = true;
this.事件2时间.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件2时间.Location = new System.Drawing.Point(189, 167);
+ this.事件2时间.Location = new System.Drawing.Point(166, 164);
this.事件2时间.Name = "事件2时间";
- this.事件2时间.Size = new System.Drawing.Size(168, 34);
+ this.事件2时间.Size = new System.Drawing.Size(134, 40);
this.事件2时间.TabIndex = 9;
this.事件2时间.Text = "事件2时间";
//
@@ -540,9 +502,9 @@
this.事件1时间.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件1时间.AutoSize = true;
this.事件1时间.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件1时间.Location = new System.Drawing.Point(7, 167);
+ this.事件1时间.Location = new System.Drawing.Point(11, 164);
this.事件1时间.Name = "事件1时间";
- this.事件1时间.Size = new System.Drawing.Size(168, 34);
+ this.事件1时间.Size = new System.Drawing.Size(134, 40);
this.事件1时间.TabIndex = 8;
this.事件1时间.Text = "事件1时间";
//
@@ -551,7 +513,7 @@
this.事件2.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件2.AutoSize = true;
this.事件2.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件2.Location = new System.Drawing.Point(223, 126);
+ this.事件2.Location = new System.Drawing.Point(183, 126);
this.事件2.Name = "事件2";
this.事件2.Size = new System.Drawing.Size(100, 34);
this.事件2.TabIndex = 3;
@@ -562,7 +524,7 @@
this.事件1.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件1.AutoSize = true;
this.事件1.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件1.Location = new System.Drawing.Point(41, 126);
+ this.事件1.Location = new System.Drawing.Point(28, 126);
this.事件1.Name = "事件1";
this.事件1.Size = new System.Drawing.Size(100, 34);
this.事件1.TabIndex = 2;
@@ -573,7 +535,7 @@
this.事件2结果.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件2结果.AutoSize = true;
this.事件2结果.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件2结果.Location = new System.Drawing.Point(228, 30);
+ this.事件2结果.Location = new System.Drawing.Point(187, 30);
this.事件2结果.Name = "事件2结果";
this.事件2结果.Size = new System.Drawing.Size(91, 62);
this.事件2结果.TabIndex = 1;
@@ -584,7 +546,7 @@
this.事件1结果.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件1结果.AutoSize = true;
this.事件1结果.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件1结果.Location = new System.Drawing.Point(46, 30);
+ this.事件1结果.Location = new System.Drawing.Point(32, 30);
this.事件1结果.Name = "事件1结果";
this.事件1结果.Size = new System.Drawing.Size(91, 62);
this.事件1结果.TabIndex = 0;
@@ -595,7 +557,7 @@
this.事件3结果.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件3结果.AutoSize = true;
this.事件3结果.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件3结果.Location = new System.Drawing.Point(46, 234);
+ this.事件3结果.Location = new System.Drawing.Point(32, 234);
this.事件3结果.Name = "事件3结果";
this.事件3结果.Size = new System.Drawing.Size(91, 62);
this.事件3结果.TabIndex = 4;
@@ -606,7 +568,7 @@
this.事件3.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件3.AutoSize = true;
this.事件3.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件3.Location = new System.Drawing.Point(41, 330);
+ this.事件3.Location = new System.Drawing.Point(28, 330);
this.事件3.Name = "事件3";
this.事件3.Size = new System.Drawing.Size(100, 34);
this.事件3.TabIndex = 6;
@@ -617,7 +579,7 @@
this.事件4.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件4.AutoSize = true;
this.事件4.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件4.Location = new System.Drawing.Point(223, 330);
+ this.事件4.Location = new System.Drawing.Point(183, 330);
this.事件4.Name = "事件4";
this.事件4.Size = new System.Drawing.Size(100, 34);
this.事件4.TabIndex = 7;
@@ -628,12 +590,156 @@
this.事件4结果.Anchor = System.Windows.Forms.AnchorStyles.None;
this.事件4结果.AutoSize = true;
this.事件4结果.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.事件4结果.Location = new System.Drawing.Point(228, 234);
+ this.事件4结果.Location = new System.Drawing.Point(187, 234);
this.事件4结果.Name = "事件4结果";
this.事件4结果.Size = new System.Drawing.Size(91, 62);
this.事件4结果.TabIndex = 5;
this.事件4结果.Text = "OK";
//
+ // gropb
+ //
+ this.tableLayoutPanel4.SetColumnSpan(this.gropb, 2);
+ this.gropb.Controls.Add(this.tableLayoutPanel6);
+ this.gropb.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gropb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.gropb.Location = new System.Drawing.Point(3, 276);
+ this.gropb.Name = "gropb";
+ this.gropb.Size = new System.Drawing.Size(1278, 176);
+ this.gropb.TabIndex = 1;
+ this.gropb.TabStop = false;
+ this.gropb.Text = "Tray盘二维码";
+ //
+ // tableLayoutPanel6
+ //
+ this.tableLayoutPanel6.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
+ this.tableLayoutPanel6.ColumnCount = 2;
+ this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 80F));
+ this.tableLayoutPanel6.Controls.Add(this.MES提示信息, 1, 0);
+ this.tableLayoutPanel6.Controls.Add(this.Tray盘, 0, 0);
+ this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 35);
+ this.tableLayoutPanel6.Name = "tableLayoutPanel6";
+ this.tableLayoutPanel6.RowCount = 1;
+ this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel6.Size = new System.Drawing.Size(1272, 138);
+ this.tableLayoutPanel6.TabIndex = 1;
+ //
+ // MES提示信息
+ //
+ this.MES提示信息.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.MES提示信息.AutoSize = true;
+ this.MES提示信息.Font = new System.Drawing.Font("宋体", 21.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.MES提示信息.Location = new System.Drawing.Point(401, 18);
+ this.MES提示信息.Name = "MES提示信息";
+ this.MES提示信息.Size = new System.Drawing.Size(724, 102);
+ this.MES提示信息.TabIndex = 6;
+ this.MES提示信息.Text = "MES提示信息:11111333332222222222222222";
+ //
+ // Tray盘
+ //
+ this.Tray盘.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.Tray盘.AutoSize = true;
+ this.Tray盘.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Tray盘.Location = new System.Drawing.Point(24, 48);
+ this.Tray盘.Name = "Tray盘";
+ this.Tray盘.Size = new System.Drawing.Size(207, 42);
+ this.Tray盘.TabIndex = 3;
+ this.Tray盘.Text = "MES提示:";
+ //
+ // 原料包装LOT号
+ //
+ this.原料包装LOT号.Controls.Add(this.tableLayoutPanel5);
+ this.原料包装LOT号.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.原料包装LOT号.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.原料包装LOT号.Location = new System.Drawing.Point(3, 3);
+ this.原料包装LOT号.Name = "原料包装LOT号";
+ this.原料包装LOT号.Size = new System.Drawing.Size(1118, 267);
+ this.原料包装LOT号.TabIndex = 0;
+ this.原料包装LOT号.TabStop = false;
+ this.原料包装LOT号.Text = "原料包装LOT号";
+ //
+ // tableLayoutPanel5
+ //
+ this.tableLayoutPanel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.tableLayoutPanel5.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
+ this.tableLayoutPanel5.ColumnCount = 3;
+ this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.22222F));
+ this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 66.66666F));
+ this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
+ this.tableLayoutPanel5.Controls.Add(this.Tray盘二维码, 1, 1);
+ this.tableLayoutPanel5.Controls.Add(this.MES提示, 0, 1);
+ this.tableLayoutPanel5.Controls.Add(this.LOT号显示, 0, 0);
+ this.tableLayoutPanel5.Controls.Add(this.LOT号, 1, 0);
+ this.tableLayoutPanel5.Controls.Add(this.胶水上下线, 2, 0);
+ this.tableLayoutPanel5.Controls.Add(this.剩余寿命, 2, 2);
+ this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel10, 0, 2);
+ this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 35);
+ this.tableLayoutPanel5.Name = "tableLayoutPanel5";
+ this.tableLayoutPanel5.RowCount = 3;
+ this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
+ this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
+ this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel5.Size = new System.Drawing.Size(1112, 229);
+ this.tableLayoutPanel5.TabIndex = 0;
+ //
+ // Tray盘二维码
+ //
+ this.Tray盘二维码.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.Tray盘二维码.AutoSize = true;
+ this.Tray盘二维码.Font = new System.Drawing.Font("宋体", 21.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Tray盘二维码.Location = new System.Drawing.Point(328, 60);
+ this.Tray盘二维码.Name = "Tray盘二维码";
+ this.Tray盘二维码.Size = new System.Drawing.Size(577, 51);
+ this.Tray盘二维码.TabIndex = 2;
+ this.Tray盘二维码.Text = "托盘二维码:921391293";
+ //
+ // MES提示
+ //
+ this.MES提示.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.MES提示.AutoSize = true;
+ this.MES提示.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.MES提示.Location = new System.Drawing.Point(31, 65);
+ this.MES提示.Name = "MES提示";
+ this.MES提示.Size = new System.Drawing.Size(186, 42);
+ this.MES提示.TabIndex = 4;
+ this.MES提示.Text = "托盘码:";
+ //
+ // LOT号显示
+ //
+ this.LOT号显示.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.LOT号显示.AutoSize = true;
+ this.LOT号显示.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.LOT号显示.Location = new System.Drawing.Point(73, 8);
+ this.LOT号显示.Name = "LOT号显示";
+ this.LOT号显示.Size = new System.Drawing.Size(102, 42);
+ this.LOT号显示.TabIndex = 2;
+ this.LOT号显示.Text = "SN:";
+ //
+ // LOT号
+ //
+ this.LOT号.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.LOT号.AutoSize = true;
+ this.LOT号.Font = new System.Drawing.Font("宋体", 21.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.LOT号.Location = new System.Drawing.Point(405, 3);
+ this.LOT号.Name = "LOT号";
+ this.LOT号.Size = new System.Drawing.Size(423, 51);
+ this.LOT号.TabIndex = 0;
+ this.LOT号.Text = "LOT号:23199191";
+ //
+ // 胶水上下线
+ //
+ this.胶水上下线.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.胶水上下线.Location = new System.Drawing.Point(990, 4);
+ this.胶水上下线.Name = "胶水上下线";
+ this.tableLayoutPanel5.SetRowSpan(this.胶水上下线, 2);
+ this.胶水上下线.Size = new System.Drawing.Size(118, 107);
+ this.胶水上下线.TabIndex = 3;
+ this.胶水上下线.Text = "材料\r\n上下线";
+ this.胶水上下线.UseVisualStyleBackColor = true;
+ this.胶水上下线.Click += new System.EventHandler(this.胶水上下线_Click);
+ //
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -645,7 +751,7 @@
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(1605, 120);
+ this.groupBox1.Size = new System.Drawing.Size(1605, 213);
this.groupBox1.TabIndex = 4;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "处理界面";
@@ -669,7 +775,7 @@
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(1577, 68);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(1577, 161);
this.tableLayoutPanel3.TabIndex = 4;
//
// tableLayoutPanel2
@@ -678,97 +784,63 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
- this.tableLayoutPanel2.ColumnCount = 5;
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
- this.tableLayoutPanel2.Controls.Add(this.机台状态, 3, 1);
- this.tableLayoutPanel2.Controls.Add(this.PLC通讯时间, 4, 1);
- this.tableLayoutPanel2.Controls.Add(this.MES通讯时间, 1, 1);
- this.tableLayoutPanel2.Controls.Add(this.PLC链接状态, 2, 1);
- this.tableLayoutPanel2.Controls.Add(this.MES链接状态, 0, 1);
- this.tableLayoutPanel2.Controls.Add(this.当前时间, 4, 0);
- this.tableLayoutPanel2.Controls.Add(this.操作人员ID, 3, 0);
- this.tableLayoutPanel2.Controls.Add(this.机台编号, 2, 0);
- this.tableLayoutPanel2.Controls.Add(this.段别, 1, 0);
- this.tableLayoutPanel2.Controls.Add(this.线别, 0, 0);
+ this.tableLayoutPanel2.ColumnCount = 6;
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+ this.tableLayoutPanel2.Controls.Add(this.lineremark7, 2, 2);
+ this.tableLayoutPanel2.Controls.Add(this.lineremark6, 1, 2);
+ this.tableLayoutPanel2.Controls.Add(this.lineremark5, 0, 2);
+ this.tableLayoutPanel2.Controls.Add(this.lineremark4, 3, 1);
+ this.tableLayoutPanel2.Controls.Add(this.lineremark3, 2, 1);
+ this.tableLayoutPanel2.Controls.Add(this.lineremark2, 1, 1);
+ this.tableLayoutPanel2.Controls.Add(this.lineremark1, 0, 1);
+ this.tableLayoutPanel2.Controls.Add(this.linemode, 3, 0);
+ this.tableLayoutPanel2.Controls.Add(this.MES通讯时间, 5, 1);
+ this.tableLayoutPanel2.Controls.Add(this.MES链接状态, 4, 1);
+ this.tableLayoutPanel2.Controls.Add(this.当前时间, 5, 0);
+ this.tableLayoutPanel2.Controls.Add(this.操作人员ID, 4, 0);
+ this.tableLayoutPanel2.Controls.Add(this.linetype, 2, 0);
+ this.tableLayoutPanel2.Controls.Add(this.linecode, 1, 0);
+ this.tableLayoutPanel2.Controls.Add(this.linename, 0, 0);
this.tableLayoutPanel2.Location = new System.Drawing.Point(161, 5);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(5);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
- this.tableLayoutPanel2.RowCount = 2;
+ this.tableLayoutPanel2.RowCount = 3;
this.tableLayoutPanel3.SetRowSpan(this.tableLayoutPanel2, 3);
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(1411, 58);
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(1411, 151);
this.tableLayoutPanel2.TabIndex = 3;
//
- // 机台状态
- //
- this.机台状态.AutoSize = true;
- this.机台状态.Dock = System.Windows.Forms.DockStyle.Fill;
- this.机台状态.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.机台状态.Location = new System.Drawing.Point(852, 29);
- this.机台状态.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.机台状态.Name = "机台状态";
- this.机台状态.Size = new System.Drawing.Size(271, 28);
- this.机台状态.TabIndex = 17;
- this.机台状态.Text = "机台状态:None";
- this.机台状态.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // PLC通讯时间
- //
- this.PLC通讯时间.AutoSize = true;
- this.PLC通讯时间.Dock = System.Windows.Forms.DockStyle.Fill;
- this.PLC通讯时间.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.PLC通讯时间.Location = new System.Drawing.Point(1134, 29);
- this.PLC通讯时间.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.PLC通讯时间.Name = "PLC通讯时间";
- this.PLC通讯时间.Size = new System.Drawing.Size(271, 28);
- this.PLC通讯时间.TabIndex = 16;
- this.PLC通讯时间.Text = "PLC通讯时间:None";
- this.PLC通讯时间.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
// MES通讯时间
//
this.MES通讯时间.AutoSize = true;
this.MES通讯时间.Dock = System.Windows.Forms.DockStyle.Fill;
this.MES通讯时间.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.MES通讯时间.Location = new System.Drawing.Point(288, 29);
+ this.MES通讯时间.Location = new System.Drawing.Point(1177, 51);
this.MES通讯时间.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.MES通讯时间.Name = "MES通讯时间";
- this.MES通讯时间.Size = new System.Drawing.Size(271, 28);
+ this.tableLayoutPanel2.SetRowSpan(this.MES通讯时间, 2);
+ this.MES通讯时间.Size = new System.Drawing.Size(228, 99);
this.MES通讯时间.TabIndex = 15;
this.MES通讯时间.Text = "MES通讯时间:None";
this.MES通讯时间.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // PLC链接状态
- //
- this.PLC链接状态.AutoSize = true;
- this.PLC链接状态.Dock = System.Windows.Forms.DockStyle.Fill;
- this.PLC链接状态.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.PLC链接状态.Location = new System.Drawing.Point(570, 29);
- this.PLC链接状态.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.PLC链接状态.Name = "PLC链接状态";
- this.PLC链接状态.Size = new System.Drawing.Size(271, 28);
- this.PLC链接状态.TabIndex = 14;
- this.PLC链接状态.Text = "PLC链接状态:None";
- this.PLC链接状态.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
// MES链接状态
//
this.MES链接状态.AutoSize = true;
this.MES链接状态.Dock = System.Windows.Forms.DockStyle.Fill;
this.MES链接状态.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.MES链接状态.Location = new System.Drawing.Point(6, 29);
+ this.MES链接状态.Location = new System.Drawing.Point(943, 51);
this.MES链接状态.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.MES链接状态.Name = "MES链接状态";
- this.MES链接状态.Size = new System.Drawing.Size(271, 28);
+ this.tableLayoutPanel2.SetRowSpan(this.MES链接状态, 2);
+ this.MES链接状态.Size = new System.Drawing.Size(223, 99);
this.MES链接状态.TabIndex = 12;
this.MES链接状态.Text = "MES链接状态:None";
this.MES链接状态.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -778,10 +850,10 @@
this.当前时间.AutoSize = true;
this.当前时间.Dock = System.Windows.Forms.DockStyle.Fill;
this.当前时间.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.当前时间.Location = new System.Drawing.Point(1134, 1);
+ this.当前时间.Location = new System.Drawing.Point(1177, 1);
this.当前时间.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.当前时间.Name = "当前时间";
- this.当前时间.Size = new System.Drawing.Size(271, 27);
+ this.当前时间.Size = new System.Drawing.Size(228, 49);
this.当前时间.TabIndex = 11;
this.当前时间.Text = "当前时间:";
this.当前时间.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -791,62 +863,62 @@
this.操作人员ID.AutoSize = true;
this.操作人员ID.Dock = System.Windows.Forms.DockStyle.Fill;
this.操作人员ID.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.操作人员ID.Location = new System.Drawing.Point(852, 1);
+ this.操作人员ID.Location = new System.Drawing.Point(943, 1);
this.操作人员ID.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.操作人员ID.Name = "操作人员ID";
- this.操作人员ID.Size = new System.Drawing.Size(271, 27);
+ this.操作人员ID.Size = new System.Drawing.Size(223, 49);
this.操作人员ID.TabIndex = 6;
this.操作人员ID.Text = "操作人员ID:";
this.操作人员ID.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // 机台编号
+ // linetype
//
- this.机台编号.AutoSize = true;
- this.机台编号.Dock = System.Windows.Forms.DockStyle.Fill;
- this.机台编号.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.机台编号.Location = new System.Drawing.Point(570, 1);
- this.机台编号.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.机台编号.Name = "机台编号";
- this.机台编号.Size = new System.Drawing.Size(271, 27);
- this.机台编号.TabIndex = 5;
- this.机台编号.Text = "机台编号:";
- this.机台编号.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.linetype.AutoSize = true;
+ this.linetype.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.linetype.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.linetype.Location = new System.Drawing.Point(475, 1);
+ this.linetype.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.linetype.Name = "linetype";
+ this.linetype.Size = new System.Drawing.Size(223, 49);
+ this.linetype.TabIndex = 5;
+ this.linetype.Text = "机台编号:";
+ this.linetype.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // 段别
+ // linecode
//
- this.段别.AutoSize = true;
- this.段别.Dock = System.Windows.Forms.DockStyle.Fill;
- this.段别.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.段别.Location = new System.Drawing.Point(288, 1);
- this.段别.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.段别.Name = "段别";
- this.段别.Size = new System.Drawing.Size(271, 27);
- this.段别.TabIndex = 4;
- this.段别.Text = "段别:";
- this.段别.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.linecode.AutoSize = true;
+ this.linecode.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.linecode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.linecode.Location = new System.Drawing.Point(241, 1);
+ this.linecode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.linecode.Name = "linecode";
+ this.linecode.Size = new System.Drawing.Size(223, 49);
+ this.linecode.TabIndex = 4;
+ this.linecode.Text = "段别:";
+ this.linecode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // 线别
+ // linename
//
- this.线别.AutoSize = true;
- this.线别.Dock = System.Windows.Forms.DockStyle.Fill;
- this.线别.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.线别.Location = new System.Drawing.Point(6, 1);
- this.线别.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.线别.Name = "线别";
- this.线别.Size = new System.Drawing.Size(271, 27);
- this.线别.TabIndex = 3;
- this.线别.Text = "线别:";
- this.线别.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.linename.AutoSize = true;
+ this.linename.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.linename.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.linename.Location = new System.Drawing.Point(6, 1);
+ this.linename.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.linename.Name = "linename";
+ this.linename.Size = new System.Drawing.Size(224, 49);
+ this.linename.TabIndex = 3;
+ this.linename.Text = "线别:";
+ this.linename.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// 开始处理
//
this.开始处理.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.开始处理.Dock = System.Windows.Forms.DockStyle.Fill;
this.开始处理.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.开始处理.Location = new System.Drawing.Point(19, 10);
+ this.开始处理.Location = new System.Drawing.Point(19, 20);
this.开始处理.Margin = new System.Windows.Forms.Padding(4);
this.开始处理.Name = "开始处理";
- this.开始处理.Size = new System.Drawing.Size(118, 46);
+ this.开始处理.Size = new System.Drawing.Size(118, 120);
this.开始处理.TabIndex = 1;
this.开始处理.Text = "开始处理";
this.开始处理.UseVisualStyleBackColor = false;
@@ -859,11 +931,11 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.richTextBox1);
this.groupBox3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox3.Location = new System.Drawing.Point(4, 593);
+ this.groupBox3.Location = new System.Drawing.Point(4, 686);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox3.Size = new System.Drawing.Size(1605, 299);
+ this.groupBox3.Size = new System.Drawing.Size(1605, 206);
this.groupBox3.TabIndex = 6;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "日志页面";
@@ -877,7 +949,7 @@
this.richTextBox1.Location = new System.Drawing.Point(18, 42);
this.richTextBox1.Margin = new System.Windows.Forms.Padding(5);
this.richTextBox1.Name = "richTextBox1";
- this.richTextBox1.Size = new System.Drawing.Size(1574, 244);
+ this.richTextBox1.Size = new System.Drawing.Size(1574, 151);
this.richTextBox1.TabIndex = 0;
this.richTextBox1.Text = "";
//
@@ -963,12 +1035,263 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
- // 螺丝枪扭力设置ToolStripMenuItem
+ // 剩余寿命
//
- this.螺丝枪扭力设置ToolStripMenuItem.Name = "螺丝枪扭力设置ToolStripMenuItem";
- this.螺丝枪扭力设置ToolStripMenuItem.Size = new System.Drawing.Size(331, 44);
- this.螺丝枪扭力设置ToolStripMenuItem.Text = "螺丝枪扭力设置";
- this.螺丝枪扭力设置ToolStripMenuItem.Click += new System.EventHandler(this.螺丝枪扭力设置ToolStripMenuItem_Click);
+ this.剩余寿命.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.剩余寿命.AutoSize = true;
+ this.剩余寿命.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.剩余寿命.Location = new System.Drawing.Point(1001, 143);
+ this.剩余寿命.Name = "剩余寿命";
+ this.剩余寿命.Size = new System.Drawing.Size(96, 56);
+ this.剩余寿命.TabIndex = 5;
+ this.剩余寿命.Text = "剩余寿命";
+ //
+ // tableLayoutPanel10
+ //
+ this.tableLayoutPanel10.ColumnCount = 3;
+ this.tableLayoutPanel5.SetColumnSpan(this.tableLayoutPanel10, 2);
+ this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel10.Controls.Add(this.barcode9, 2, 2);
+ this.tableLayoutPanel10.Controls.Add(this.barcode8, 1, 2);
+ this.tableLayoutPanel10.Controls.Add(this.barcode7, 0, 2);
+ this.tableLayoutPanel10.Controls.Add(this.barcode6, 2, 1);
+ this.tableLayoutPanel10.Controls.Add(this.barcode5, 1, 1);
+ this.tableLayoutPanel10.Controls.Add(this.barcode4, 0, 1);
+ this.tableLayoutPanel10.Controls.Add(this.barcode3, 2, 0);
+ this.tableLayoutPanel10.Controls.Add(this.barcode2, 1, 0);
+ this.tableLayoutPanel10.Controls.Add(this.barcode1, 0, 0);
+ this.tableLayoutPanel10.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel10.Location = new System.Drawing.Point(4, 118);
+ this.tableLayoutPanel10.Name = "tableLayoutPanel10";
+ this.tableLayoutPanel10.RowCount = 3;
+ this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel10.Size = new System.Drawing.Size(979, 107);
+ this.tableLayoutPanel10.TabIndex = 6;
+ //
+ // linemode
+ //
+ this.linemode.AutoSize = true;
+ this.linemode.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.linemode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.linemode.Location = new System.Drawing.Point(709, 1);
+ this.linemode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.linemode.Name = "linemode";
+ this.linemode.Size = new System.Drawing.Size(223, 49);
+ this.linemode.TabIndex = 16;
+ this.linemode.Text = "机台编号:";
+ this.linemode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lineremark1
+ //
+ this.lineremark1.AutoSize = true;
+ this.lineremark1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lineremark1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lineremark1.Location = new System.Drawing.Point(6, 51);
+ this.lineremark1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lineremark1.Name = "lineremark1";
+ this.lineremark1.Size = new System.Drawing.Size(224, 49);
+ this.lineremark1.TabIndex = 17;
+ this.lineremark1.Text = "机台编号:";
+ this.lineremark1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lineremark2
+ //
+ this.lineremark2.AutoSize = true;
+ this.lineremark2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lineremark2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lineremark2.Location = new System.Drawing.Point(241, 51);
+ this.lineremark2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lineremark2.Name = "lineremark2";
+ this.lineremark2.Size = new System.Drawing.Size(223, 49);
+ this.lineremark2.TabIndex = 18;
+ this.lineremark2.Text = "机台编号:";
+ this.lineremark2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lineremark3
+ //
+ this.lineremark3.AutoSize = true;
+ this.lineremark3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lineremark3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lineremark3.Location = new System.Drawing.Point(475, 51);
+ this.lineremark3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lineremark3.Name = "lineremark3";
+ this.lineremark3.Size = new System.Drawing.Size(223, 49);
+ this.lineremark3.TabIndex = 19;
+ this.lineremark3.Text = "机台编号:";
+ this.lineremark3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lineremark4
+ //
+ this.lineremark4.AutoSize = true;
+ this.lineremark4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lineremark4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lineremark4.Location = new System.Drawing.Point(709, 51);
+ this.lineremark4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lineremark4.Name = "lineremark4";
+ this.lineremark4.Size = new System.Drawing.Size(223, 49);
+ this.lineremark4.TabIndex = 20;
+ this.lineremark4.Text = "机台编号:";
+ this.lineremark4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lineremark5
+ //
+ this.lineremark5.AutoSize = true;
+ this.lineremark5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lineremark5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lineremark5.Location = new System.Drawing.Point(6, 101);
+ this.lineremark5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lineremark5.Name = "lineremark5";
+ this.lineremark5.Size = new System.Drawing.Size(224, 49);
+ this.lineremark5.TabIndex = 21;
+ this.lineremark5.Text = "机台编号:";
+ this.lineremark5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lineremark6
+ //
+ this.lineremark6.AutoSize = true;
+ this.lineremark6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lineremark6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lineremark6.Location = new System.Drawing.Point(241, 101);
+ this.lineremark6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lineremark6.Name = "lineremark6";
+ this.lineremark6.Size = new System.Drawing.Size(223, 49);
+ this.lineremark6.TabIndex = 22;
+ this.lineremark6.Text = "机台编号:";
+ this.lineremark6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lineremark7
+ //
+ this.lineremark7.AutoSize = true;
+ this.lineremark7.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lineremark7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lineremark7.Location = new System.Drawing.Point(475, 101);
+ this.lineremark7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lineremark7.Name = "lineremark7";
+ this.lineremark7.Size = new System.Drawing.Size(223, 49);
+ this.lineremark7.TabIndex = 23;
+ this.lineremark7.Text = "机台编号:";
+ this.lineremark7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode1
+ //
+ this.barcode1.AutoSize = true;
+ this.barcode1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode1.Location = new System.Drawing.Point(5, 0);
+ this.barcode1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode1.Name = "barcode1";
+ this.barcode1.Size = new System.Drawing.Size(316, 35);
+ this.barcode1.TabIndex = 22;
+ this.barcode1.Text = "机台编号:";
+ this.barcode1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode2
+ //
+ this.barcode2.AutoSize = true;
+ this.barcode2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode2.Location = new System.Drawing.Point(331, 0);
+ this.barcode2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode2.Name = "barcode2";
+ this.barcode2.Size = new System.Drawing.Size(316, 35);
+ this.barcode2.TabIndex = 23;
+ this.barcode2.Text = "机台编号:";
+ this.barcode2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode3
+ //
+ this.barcode3.AutoSize = true;
+ this.barcode3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode3.Location = new System.Drawing.Point(657, 0);
+ this.barcode3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode3.Name = "barcode3";
+ this.barcode3.Size = new System.Drawing.Size(317, 35);
+ this.barcode3.TabIndex = 24;
+ this.barcode3.Text = "机台编号:";
+ this.barcode3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode4
+ //
+ this.barcode4.AutoSize = true;
+ this.barcode4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode4.Location = new System.Drawing.Point(5, 35);
+ this.barcode4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode4.Name = "barcode4";
+ this.barcode4.Size = new System.Drawing.Size(316, 35);
+ this.barcode4.TabIndex = 25;
+ this.barcode4.Text = "机台编号:";
+ this.barcode4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode5
+ //
+ this.barcode5.AutoSize = true;
+ this.barcode5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode5.Location = new System.Drawing.Point(331, 35);
+ this.barcode5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode5.Name = "barcode5";
+ this.barcode5.Size = new System.Drawing.Size(316, 35);
+ this.barcode5.TabIndex = 26;
+ this.barcode5.Text = "机台编号:";
+ this.barcode5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode6
+ //
+ this.barcode6.AutoSize = true;
+ this.barcode6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode6.Location = new System.Drawing.Point(657, 35);
+ this.barcode6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode6.Name = "barcode6";
+ this.barcode6.Size = new System.Drawing.Size(317, 35);
+ this.barcode6.TabIndex = 27;
+ this.barcode6.Text = "机台编号:";
+ this.barcode6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode7
+ //
+ this.barcode7.AutoSize = true;
+ this.barcode7.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode7.Location = new System.Drawing.Point(5, 70);
+ this.barcode7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode7.Name = "barcode7";
+ this.barcode7.Size = new System.Drawing.Size(316, 37);
+ this.barcode7.TabIndex = 28;
+ this.barcode7.Text = "机台编号:";
+ this.barcode7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode8
+ //
+ this.barcode8.AutoSize = true;
+ this.barcode8.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode8.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode8.Location = new System.Drawing.Point(331, 70);
+ this.barcode8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode8.Name = "barcode8";
+ this.barcode8.Size = new System.Drawing.Size(316, 37);
+ this.barcode8.TabIndex = 29;
+ this.barcode8.Text = "机台编号:";
+ this.barcode8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // barcode9
+ //
+ this.barcode9.AutoSize = true;
+ this.barcode9.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.barcode9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.barcode9.Location = new System.Drawing.Point(657, 70);
+ this.barcode9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.barcode9.Name = "barcode9";
+ this.barcode9.Size = new System.Drawing.Size(317, 37);
+ this.barcode9.TabIndex = 30;
+ this.barcode9.Text = "机台编号:";
+ this.barcode9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// MainForm
//
@@ -988,15 +1311,18 @@
this.menuStrip1.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel4.ResumeLayout(false);
+ this.groupBox4.ResumeLayout(false);
+ this.tableLayoutPanel9.ResumeLayout(false);
+ this.tableLayoutPanel9.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.tableLayoutPanel7.ResumeLayout(false);
+ this.tableLayoutPanel7.PerformLayout();
this.gropb.ResumeLayout(false);
this.tableLayoutPanel6.ResumeLayout(false);
this.tableLayoutPanel6.PerformLayout();
this.原料包装LOT号.ResumeLayout(false);
this.tableLayoutPanel5.ResumeLayout(false);
this.tableLayoutPanel5.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.tableLayoutPanel7.ResumeLayout(false);
- this.tableLayoutPanel7.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.tableLayoutPanel3.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
@@ -1004,6 +1330,8 @@
this.groupBox3.ResumeLayout(false);
this.tableLayoutPanel8.ResumeLayout(false);
this.tableLayoutPanel8.PerformLayout();
+ this.tableLayoutPanel10.ResumeLayout(false);
+ this.tableLayoutPanel10.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1029,9 +1357,9 @@
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ToolStripMenuItem 扭力曲线配置ToolStripMenuItem;
private System.Windows.Forms.Label 操作人员ID;
- private System.Windows.Forms.Label 机台编号;
- private System.Windows.Forms.Label 段别;
- private System.Windows.Forms.Label 线别;
+ private System.Windows.Forms.Label linetype;
+ private System.Windows.Forms.Label linecode;
+ private System.Windows.Forms.Label linename;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.ToolStripMenuItem 产线管理ToolStripMenuItem;
private System.Windows.Forms.RichTextBox richTextBox1;
@@ -1039,9 +1367,7 @@
private System.Windows.Forms.Button 开始处理;
private System.Windows.Forms.Label MES链接状态;
private System.Windows.Forms.Label 当前时间;
- private System.Windows.Forms.Label PLC通讯时间;
private System.Windows.Forms.Label MES通讯时间;
- private System.Windows.Forms.Label PLC链接状态;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel8;
private System.Windows.Forms.Label 底部注释1;
private System.Windows.Forms.Label 底部注释2;
@@ -1057,31 +1383,54 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
private System.Windows.Forms.Label LOT号显示;
private System.Windows.Forms.Label LOT号;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.TableLayoutPanel tableLayoutPanel7;
- private System.Windows.Forms.Label 事件4;
- private System.Windows.Forms.Label 事件3;
- private System.Windows.Forms.Label 事件4结果;
- private System.Windows.Forms.Label 事件3结果;
- private System.Windows.Forms.Label 事件2;
- private System.Windows.Forms.Label 事件1;
- private System.Windows.Forms.Label 事件2结果;
- private System.Windows.Forms.Label 事件1结果;
private System.Windows.Forms.Timer timer1;
- private System.Windows.Forms.Label 事件4时间;
- private System.Windows.Forms.Label 事件3时间;
- private System.Windows.Forms.Label 事件2时间;
- private System.Windows.Forms.Label 事件1时间;
- private System.Windows.Forms.Label 机台状态;
private System.Windows.Forms.Button 胶水上下线;
- private System.Windows.Forms.Label MES提示信息;
private System.Windows.Forms.Label MES提示;
private System.Windows.Forms.ToolStripMenuItem 产线基础信息管理ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem 产线关联PLC管理ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pLC报警设置ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 扭力角度扭矩设置ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 压力曲线设置ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 螺丝枪扭力设置ToolStripMenuItem;
+ private System.Windows.Forms.GroupBox groupBox4;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel9;
+ private System.Windows.Forms.Label PLC1时间;
+ private System.Windows.Forms.Label PLC1机台状态;
+ private System.Windows.Forms.Label PLC1状态;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel7;
+ private System.Windows.Forms.Label 事件4时间;
+ private System.Windows.Forms.Label 事件3时间;
+ private System.Windows.Forms.Label 事件2时间;
+ private System.Windows.Forms.Label 事件1时间;
+ private System.Windows.Forms.Label 事件2;
+ private System.Windows.Forms.Label 事件1;
+ private System.Windows.Forms.Label 事件2结果;
+ private System.Windows.Forms.Label 事件1结果;
+ private System.Windows.Forms.Label 事件3结果;
+ private System.Windows.Forms.Label 事件3;
+ private System.Windows.Forms.Label 事件4;
+ private System.Windows.Forms.Label 事件4结果;
+ private System.Windows.Forms.Label PLC1名称;
+ private System.Windows.Forms.Label MES提示信息;
+ private System.Windows.Forms.Label 剩余寿命;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel10;
+ private System.Windows.Forms.Label lineremark7;
+ private System.Windows.Forms.Label lineremark6;
+ private System.Windows.Forms.Label lineremark5;
+ private System.Windows.Forms.Label lineremark4;
+ private System.Windows.Forms.Label lineremark3;
+ private System.Windows.Forms.Label lineremark2;
+ private System.Windows.Forms.Label lineremark1;
+ private System.Windows.Forms.Label linemode;
+ private System.Windows.Forms.Label barcode9;
+ private System.Windows.Forms.Label barcode8;
+ private System.Windows.Forms.Label barcode7;
+ private System.Windows.Forms.Label barcode6;
+ private System.Windows.Forms.Label barcode5;
+ private System.Windows.Forms.Label barcode4;
+ private System.Windows.Forms.Label barcode3;
+ private System.Windows.Forms.Label barcode2;
+ private System.Windows.Forms.Label barcode1;
}
}
diff --git a/WindowsFormsApp1/MainForm.cs b/WindowsFormsApp1/MainForm.cs
index 2daab0a..2521d8b 100644
--- a/WindowsFormsApp1/MainForm.cs
+++ b/WindowsFormsApp1/MainForm.cs
@@ -27,9 +27,6 @@ namespace WindowsFormsApp1
{
public partial class MainForm : Form
{
- //private Thread thread_plc1;
- //private Thread thread_plc2;
-
public MainForm()
{
InitializeComponent();
@@ -44,10 +41,19 @@ namespace WindowsFormsApp1
FormRecover();
- 线别.Text = "线别:" + Init.t_Line.linename;
- 段别.Text = "段别:" + Init.t_Line.linemode;
- 机台编号.Text = "机台编号:" + Init.t_Line.linecode;
- 操作人员ID.Text = "操作人员ID:" + Init.t_User.username;
+ linename.Text = Init.t_Line.linename;
+ linecode.Text = Init.t_Line.linecode;
+ linetype.Text = Init.t_Line.linetype;
+ linemode.Text = Init.t_Line.linemode;
+ lineremark1.Text = Init.t_Line.lineremark1;
+ lineremark2.Text = Init.t_Line.lineremark2;
+ lineremark3.Text = Init.t_Line.lineremark3;
+ lineremark4.Text = Init.t_Line.lineremark4;
+ lineremark5.Text = Init.t_Line.lineremark5;
+ lineremark6.Text = Init.t_Line.lineremark6;
+ lineremark7.Text = Init.t_Line.lineremark7;
+
+ 操作人员ID.Text = Init.t_User.username;
}
@@ -62,6 +68,7 @@ namespace WindowsFormsApp1
break;
}
+ ChangeBarcode();
if (Plc == null)
{
@@ -74,8 +81,9 @@ namespace WindowsFormsApp1
var openresult = siemensHelp.OpenConn();
if (!openresult.Success)
{
- PLC链接状态.Text = "PLC链接状态:NG";
- PLC链接状态.BackColor = Color.Red;
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
LogExecute.logNet.WriteError($"{Plc.plcip}建立S7连接失败");
continue;
}
@@ -83,15 +91,16 @@ namespace WindowsFormsApp1
List plcaddress = Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id);
List angleaddress = Init.t_Angleaddresses.FindAll(a => a.plcid == Plc.id);
List torqueaddress = Init.t_Torqueaddresses.FindAll(a => a.plcid == Plc.id);
-
+ List pressurecurveaddress = Init.t_Pressurecurves.FindAll(a => a.plcid == Plc.id);
plcdata PlcData = new plcdata();
var resdresult = siemensHelp.ReadAddress(plcaddress, PlcData);
if (!resdresult.Success)
{
- PLC链接状态.Text = "PLC链接状态:NG";
- PLC链接状态.BackColor = Color.Red;
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
LogExecute.logNet.WriteError($"{Plc.plcip}读取全部地址处理错误:处理停止");
continue;
}
@@ -101,17 +110,19 @@ namespace WindowsFormsApp1
var haertresult = siemensHelp.WriteAddress(plcaddress, PlcData);
if (!haertresult.Success)
{
- PLC链接状态.Text = "PLC链接状态:NG";
- PLC链接状态.BackColor = Color.Red;
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
LogExecute.logNet.WriteError($"{Plc.plcip}写入心跳错误:处理停止");
continue;
}
DateTime Plc_Time = DateTime.Now;
- PLC链接状态.Text = "PLC链接状态:OK";
- PLC链接状态.BackColor = SystemColors.Control;
- PLC通讯时间.Text = "PLC通讯时间:" + Plc_Time.ToString("MM-dd HH:mm:ss");
+ //PLC链接状态.Text = "PLC链接状态:OK";
+ //PLC链接状态.BackColor = SystemColors.Control;
+ //PLC通讯时间.Text = "PLC通讯时间:" + Plc_Time.ToString("MM-dd HH:mm:ss");
+ PLC_Form(Plc, plcstate.OK, Plc_Time);
#endregion
ApiClient apiClient = new ApiClient();
@@ -119,7 +130,7 @@ namespace WindowsFormsApp1
#region 机台状态及报警
//机台状态
- 机台状态.Text = "机台状态:" + Enum.GetName(typeof(plcstatus), Init.Plcstatus);
+ //机台状态.Text = "机台状态:" + Enum.GetName(typeof(plcstatus), Init.Plcstatus);
int oldstatus = Init.Plcstatus;
if (PlcData.Read_Status != 0)
{
@@ -159,7 +170,7 @@ namespace WindowsFormsApp1
//机台报警
if (PlcData.Read_Status == (short)plcstatus.停机)
{
- 机台状态.BackColor = Color.Red;
+ //机台状态.BackColor = Color.Red;
if (oldstatus != (short)plcstatus.停机)
{
//反馈报警
@@ -196,7 +207,7 @@ namespace WindowsFormsApp1
}
else
{
- 机台状态.BackColor = SystemColors.Control;
+ //机台状态.BackColor = SystemColors.Control;
}
#endregion
#region 判断及查找流程
@@ -214,8 +225,9 @@ namespace WindowsFormsApp1
var writeresult = siemensHelp.WriteAddress(plcaddress, PlcData);
if (!writeresult.Success)
{
- PLC链接状态.Text = "PLC链接状态:NG";
- PLC链接状态.BackColor = Color.Red;
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
LogExecute.logNet.WriteError($"{Plc.plcip}写入地址处理错误:处理停止");
}
continue;
@@ -254,9 +266,36 @@ namespace WindowsFormsApp1
continue;
}
}
+ if (nowflow.dzscan)
+ {
+ //扫码
+ ScanForm_DZ scanForm = new ScanForm_DZ();
+ DialogResult scan_result = scanForm.ShowDialog();
+ if (scan_result == DialogResult.OK)
+ {
+ string returnValue = scanForm.ReturnValue;
+ otherdata.JS_SN = returnValue;
+
+ Init.ScanString = returnValue;
+ }
+ else
+ {
+ continue;
+ }
+ }
if (nowflow.finalpressurecurve)
{
//压力曲线
+ var pressurecurveaddress_result = siemensHelp.ReadAddress(pressurecurveaddress);
+ if (!pressurecurveaddress_result.Success)
+ {
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
+ LogExecute.logNet.WriteError($"{Plc.plcip}压力曲线数据地址处理错误:处理停止");
+ continue;
+ }
+ otherdata.FinalPressureCurve = pressurecurveaddress_result.Data;
}
//if (nowflow.finaltorquecurve)
//{
@@ -268,8 +307,9 @@ namespace WindowsFormsApp1
var finaltorquevalue_result = siemensHelp.ReadAddress(torqueaddress);
if (!finaltorquevalue_result.Success)
{
- PLC链接状态.Text = "PLC链接状态:NG";
- PLC链接状态.BackColor = Color.Red;
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
LogExecute.logNet.WriteError($"{Plc.plcip}螺丝枪扭力数据地址处理错误:处理停止");
continue;
}
@@ -286,8 +326,9 @@ namespace WindowsFormsApp1
var finalanglevaluue_result = siemensHelp.ReadAddress(angleaddress);
if (!finalanglevaluue_result.Success)
{
- PLC链接状态.Text = "PLC链接状态:NG";
- PLC链接状态.BackColor = Color.Red;
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
LogExecute.logNet.WriteError($"{Plc.plcip}螺丝枪角度数据地址处理错误:处理停止");
continue;
}
@@ -301,13 +342,20 @@ namespace WindowsFormsApp1
#region 调用后端接口
var result = apiClient.CallFunctionByName(nowinterface.code, PlcData, otherdata);
+ if (result.IsShow)
+ {
+ MES提示信息.Visible = true;
+ MES提示信息.Text = DateTime.Now.ToString("HH:mm:ss") + ":" + result.Msg;
+ }
+
if (result.Success)
{
var writeresult = siemensHelp.WriteAddress(plcaddress, PlcData);
if (!writeresult.Success)
{
- PLC链接状态.Text = "PLC链接状态:NG";
- PLC链接状态.BackColor = Color.Red;
+ //PLC链接状态.Text = "PLC链接状态:NG";
+ //PLC链接状态.BackColor = Color.Red;
+ PLC_Form(Plc, plcstate.NG, DateTime.Now);
LogExecute.logNet.WriteError($"{Plc.plcip}写入地址处理错误:处理停止");
continue;
}
@@ -347,20 +395,27 @@ namespace WindowsFormsApp1
}
#region 开始及结束处理按钮
+
private void 开始处理_Click(object sender, EventArgs e)
{
if (开始处理.Text == "开始处理")
{
SQLiteHelper sQLiteHelper_plc = new db.SQLiteHelper();
- var plc_sqlresult = sQLiteHelper_plc.QueryAll();
+ var plc_sqlresult = sQLiteHelper_plc.QuerySingle(a=>a.id == Init.t_Line.plcid);
if (!plc_sqlresult.Success)
{
MessageBox.Show("无法初始化PLC信息,无法开始处理!");
return;
}
- var plc_result = plc_sqlresult.Data.FindAll(a => Init.t_Lineplcs.Select(p => p.plcid).Contains(a.id));
+ SQLiteHelper sQLiteHelper_key = new db.SQLiteHelper();
+ var key_sqlresult = sQLiteHelper_key.QueryAll();
+ if (!key_sqlresult.Success)
+ {
+ MessageBox.Show("无法初始化信息信息,无法开始处理!");
+ return;
+ }
SQLiteHelper sQLiteHelper_flow = new db.SQLiteHelper();
var flow_result = sQLiteHelper_flow.Query(a => a.flowid == Init.t_Line.flowid);
@@ -394,6 +449,14 @@ namespace WindowsFormsApp1
return;
}
+ SQLiteHelper sQLiteHelper_pressurecurve = new db.SQLiteHelper();
+ var pressurecurve_result = sQLiteHelper_pressurecurve.QueryAll();
+ if (!pressurecurve_result.Success)
+ {
+ MessageBox.Show("无法初始化压力曲线信息,无法开始处理!");
+ return;
+ }
+
SQLiteHelper sQLiteHelper_interface = new db.SQLiteHelper();
var interface_result = sQLiteHelper_interface.QueryAll();
if (!interface_result.Success)
@@ -418,7 +481,9 @@ namespace WindowsFormsApp1
Init.t_Plcaddresses = address_result.Data;
Init.t_Angleaddresses = angleaddress_result.Data;
Init.t_Torqueaddresses = torqueaddress_result.Data;
+ Init.t_Pressurecurves = pressurecurve_result.Data;
Init.t_Interfaces = interface_result.Data;
+ Init.t_Keyvalues = key_sqlresult.Data;
#endregion
#region 初始化COM口服务
try
@@ -463,6 +528,8 @@ namespace WindowsFormsApp1
底部注释2.Text = "气密仪COM-Ready";
底部注释2.Visible = true;
}
+
+ 胶水上下线.Enabled = true;
}
}
}
@@ -474,19 +541,17 @@ namespace WindowsFormsApp1
#endregion
Init.threadHelps = new List();
- foreach (var plc in plc_result)
+ var plc = plc_sqlresult.Data;
+ plc.plchelp = new SiemensHelp(plc.plcip, plc.timeout);
+ ThreadHelp threadHelp = new ThreadHelp();
+ if (!threadHelp.isrunning1)
{
- plc.plchelp = new SiemensHelp(plc.plcip, plc.timeout);
- ThreadHelp threadHelp = new ThreadHelp();
- if (!threadHelp.isrunning1)
- {
- threadHelp.cancellationTokenSource1 = new CancellationTokenSource();
- threadHelp.Thread = new Thread(() => build(plc, threadHelp.cancellationTokenSource1.Token));
- threadHelp.Thread.Start();
- threadHelp.isrunning1 = true;
- }
- Init.threadHelps.Add(threadHelp);
+ threadHelp.cancellationTokenSource1 = new CancellationTokenSource();
+ threadHelp.Thread = new Thread(() => build(plc, threadHelp.cancellationTokenSource1.Token));
+ threadHelp.Thread.Start();
+ threadHelp.isrunning1 = true;
}
+ Init.threadHelps.Add(threadHelp);
开始处理.Text = "停止处理";
开始处理.BackColor = Color.Red;
@@ -546,12 +611,6 @@ namespace WindowsFormsApp1
lINE_Manage.ShowDialog();
}
- private void 产线关联PLC管理ToolStripMenuItem_Click(object sender, EventArgs e)
- {
- LinePLC_Manage lINEPLC_Manage = new LinePLC_Manage();
- lINEPLC_Manage.ShowDialog();
- }
-
private void 系统参数配置ToolStripMenuItem_Click(object sender, EventArgs e)
{
KeyValue keyValue = new KeyValue();
@@ -656,16 +715,15 @@ namespace WindowsFormsApp1
MES通讯时间.Text = "MES通讯时间:None";
MES通讯时间.BackColor = SystemColors.Control;
- PLC链接状态.Text = "PLC链接状态:None";
- PLC链接状态.BackColor = SystemColors.Control;
+ PLC1名称.Visible = false;
- PLC通讯时间.Text = "PLC通讯时间:None";
- PLC通讯时间.BackColor = SystemColors.Control;
+ PLC1状态.Visible = false;
- 机台状态.Text = "机台状态:None";
- 机台状态.BackColor = SystemColors.Control;
+ PLC1机台状态.Visible = false;
- 胶水上下线.Enabled = false;
+ PLC1时间.Visible = false;
+
+ //胶水上下线.Enabled = false;
MES提示信息.Visible = false;
LOT号.Visible = false;
@@ -693,6 +751,83 @@ namespace WindowsFormsApp1
底部注释4.Visible = false;
底部注释5.Visible = false;
+ 剩余寿命.Visible = false;
+ barcode1.Visible = false;
+ barcode2.Visible = false;
+ barcode3.Visible = false;
+ barcode4.Visible = false;
+ barcode5.Visible = false;
+ barcode6.Visible = false;
+ barcode7.Visible = false;
+ barcode8.Visible = false;
+ barcode9.Visible = false;
+
+ }
+
+ public void ChangeBarcode()
+ {
+ 剩余寿命.Visible = true;
+ barcode1.Visible = true;
+ barcode2.Visible = true;
+ barcode3.Visible = true;
+ barcode4.Visible = true;
+ barcode5.Visible = true;
+ barcode6.Visible = true;
+ barcode7.Visible = true;
+ barcode8.Visible = true;
+ barcode9.Visible = true;
+
+ var power = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Power");
+ var i_barcode1 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode1");
+ var i_barcode2 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode2");
+ var i_barcode3 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode3");
+ var i_barcode4 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode4");
+ var i_barcode5 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode5");
+ var i_barcode6 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode6");
+ var i_barcode7 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode7");
+ var i_barcode8 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode8");
+ var i_barcode9 = Init.t_Keyvalues.FirstOrDefault(a => a.key == "Barcode9");
+
+ 剩余寿命.Text = power == null ? "": power.value;
+ barcode1.Text = i_barcode1 == null ? "":i_barcode1.value;
+ barcode2.Text = i_barcode2 == null ? "":i_barcode2.value;
+ barcode3.Text = i_barcode3 == null ? "":i_barcode3.value;
+ barcode4.Text = i_barcode4 == null ? "":i_barcode4.value;
+ barcode5.Text = i_barcode5 == null ? "":i_barcode5.value;
+ barcode6.Text = i_barcode6 == null ? "":i_barcode6.value;
+ barcode7.Text = i_barcode7 == null ? "":i_barcode7.value;
+ barcode8.Text = i_barcode8 == null ? "":i_barcode8.value;
+ barcode9.Text = i_barcode9 == null ? "":i_barcode9.value;
+ }
+
+ public void PLC_Form(t_plc plc, plcstate state, DateTime time)
+ {
+ string plcname = plc.plcname + ":" + plc.plcip;
+ string datetime = time.ToString("HH:mm:ss");
+ PLC1名称.Visible = true;
+ PLC1状态.Visible = true;
+ PLC1机台状态.Visible = true;
+ PLC1时间.Visible = true;
+ PLC1名称.Text = plcname;
+ PLC1状态.Text = state.ToString();
+ PLC1机台状态.Text = Enum.GetName(typeof(plcstatus), Init.Plcstatus);
+ PLC1时间.Text = datetime;
+ if (PLC1状态.Text == plcstate.NG.ToString())
+ {
+ PLC1状态.BackColor = Color.Red;
+ }
+ else
+ {
+ PLC1状态.BackColor = SystemColors.Control;
+ }
+ if (PLC1机台状态.Text == plcstatus.停机.ToString())
+ {
+ PLC1机台状态.BackColor = Color.Red;
+ }
+ else
+ {
+ PLC1机台状态.BackColor = SystemColors.Control;
+ }
}
public void MES_MsgfORM(string name, mesresult result, DateTime dateTime)
@@ -808,14 +943,8 @@ namespace WindowsFormsApp1
#region 其他业务处理
private void 胶水上下线_Click(object sender, EventArgs e)
{
- ScanForm scanForm = new ScanForm();
+ ScanForm_SSQ scanForm = new ScanForm_SSQ();
DialogResult result = scanForm.ShowDialog();
- if (result == DialogResult.OK)
- {
- string returnValue = scanForm.ReturnValue;
- MessageBox.Show($"返回值是:{returnValue}");
- //调用三防漆之类的接口
- }
}
public void AirtightPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
{
@@ -896,8 +1025,6 @@ namespace WindowsFormsApp1
LogExecute.logNet.WriteError($"通过气密仪获取到压力参数失败,错误原因{ex.Message}");
}
}
-
-
#endregion
diff --git a/WindowsFormsApp1/Program.cs b/WindowsFormsApp1/Program.cs
index 54a1787..bf5ae90 100644
--- a/WindowsFormsApp1/Program.cs
+++ b/WindowsFormsApp1/Program.cs
@@ -46,9 +46,11 @@ namespace WindowsFormsApp1
public static List t_Angleaddresses;
public static List t_Torqueaddresses;
+ public static List t_Pressurecurves;
+
+ public static List t_Keyvalues;
public static t_line t_Line;
- public static List t_Lineplcs;
public static List threadHelps;
public static string ScanString;
diff --git a/WindowsFormsApp1/form/Angleaddress_Manage.Designer.cs b/WindowsFormsApp1/form/Angleaddress_Manage.Designer.cs
index 85ec473..e4a7bb2 100644
--- a/WindowsFormsApp1/form/Angleaddress_Manage.Designer.cs
+++ b/WindowsFormsApp1/form/Angleaddress_Manage.Designer.cs
@@ -34,10 +34,6 @@
this.关闭 = new System.Windows.Forms.Button();
this.查询 = new System.Windows.Forms.Button();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
- this.label1 = new System.Windows.Forms.Label();
- this.comboBox1 = new System.Windows.Forms.ComboBox();
- this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
- this.button1 = new System.Windows.Forms.Button();
this.id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.plcname = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.code = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -47,6 +43,8 @@
this.addresstype = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.addresstypelegth = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.button1 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
@@ -83,8 +81,8 @@
this.dataGridView1.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
- this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
+ this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
@@ -114,77 +112,16 @@
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle3;
- this.dataGridView1.Location = new System.Drawing.Point(6, 127);
+ this.dataGridView1.Location = new System.Drawing.Point(6, 5);
this.dataGridView1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowHeadersWidth = 72;
- this.tableLayoutPanel1.SetRowSpan(this.dataGridView1, 3);
+ this.tableLayoutPanel1.SetRowSpan(this.dataGridView1, 4);
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(1624, 682);
+ this.dataGridView1.Size = new System.Drawing.Size(1624, 804);
this.dataGridView1.TabIndex = 8;
//
- // label1
- //
- this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(4, 27);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(253, 68);
- this.label1.TabIndex = 12;
- this.label1.Text = "选择需要编辑的PLC编号:";
- //
- // comboBox1
- //
- this.comboBox1.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Location = new System.Drawing.Point(278, 40);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(4);
- this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(409, 41);
- this.comboBox1.TabIndex = 13;
- //
- // tableLayoutPanel1
- //
- this.tableLayoutPanel1.ColumnCount = 3;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.07911F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 74.9177F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.00319F));
- this.tableLayoutPanel1.Controls.Add(this.button1, 2, 2);
- this.tableLayoutPanel1.Controls.Add(this.comboBox1, 1, 0);
- this.tableLayoutPanel1.Controls.Add(this.dataGridView1, 0, 1);
- this.tableLayoutPanel1.Controls.Add(this.关闭, 2, 3);
- this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
- this.tableLayoutPanel1.Controls.Add(this.查询, 2, 0);
- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
- this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 4;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 45F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(1818, 814);
- this.tableLayoutPanel1.TabIndex = 14;
- //
- // button1
- //
- this.button1.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.button1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(1650, 541);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(153, 56);
- this.button1.TabIndex = 15;
- this.button1.Text = "新增";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
// id
//
this.id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
@@ -270,7 +207,42 @@
this.remark.Name = "remark";
this.remark.ReadOnly = true;
//
- // PlcAddress_Manage
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 3;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.07911F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 74.9177F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.00319F));
+ this.tableLayoutPanel1.Controls.Add(this.button1, 2, 2);
+ this.tableLayoutPanel1.Controls.Add(this.关闭, 2, 3);
+ this.tableLayoutPanel1.Controls.Add(this.查询, 2, 0);
+ this.tableLayoutPanel1.Controls.Add(this.dataGridView1, 0, 0);
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 4;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 45F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1818, 814);
+ this.tableLayoutPanel1.TabIndex = 14;
+ //
+ // button1
+ //
+ this.button1.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.button1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button1.Location = new System.Drawing.Point(1650, 541);
+ this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(153, 56);
+ this.button1.TabIndex = 15;
+ this.button1.Text = "新增";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // Angleaddress_Manage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -278,14 +250,13 @@
this.Controls.Add(this.tableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Margin = new System.Windows.Forms.Padding(4);
- this.Name = "PlcAddress_Manage";
+ this.Name = "Angleaddress_Manage";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "PLCADDRESS_Manage";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.PLCADDRESS_Manage_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.tableLayoutPanel1.ResumeLayout(false);
- this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
}
@@ -295,8 +266,6 @@
private System.Windows.Forms.Button 关闭;
private System.Windows.Forms.Button 查询;
private System.Windows.Forms.DataGridView dataGridView1;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.DataGridViewTextBoxColumn id;
diff --git a/WindowsFormsApp1/form/Angleaddress_Manage.cs b/WindowsFormsApp1/form/Angleaddress_Manage.cs
index 9a75b35..a2210ea 100644
--- a/WindowsFormsApp1/form/Angleaddress_Manage.cs
+++ b/WindowsFormsApp1/form/Angleaddress_Manage.cs
@@ -21,7 +21,7 @@ namespace WindowsFormsApp1.form
private void 查询_Click(object sender, EventArgs e)
{
- GetInfo((int)comboBox1.SelectedValue);
+ GetInfo();
}
private void 保存_Click(object sender, EventArgs e)
@@ -33,7 +33,7 @@ namespace WindowsFormsApp1.form
if (result.Success)
{
MessageBox.Show("更新成功");
- GetInfo((int)comboBox1.SelectedValue);
+ GetInfo();
}
else
{
@@ -62,13 +62,6 @@ namespace WindowsFormsApp1.form
return;
}
- var list = result_combox.Data.FindAll(a => Init.t_Lineplcs.Select(p => p.plcid).Contains(a.id));
-
- // 绑定数据源到 ComboBox
- comboBox1.DataSource = list;
- comboBox1.DisplayMember = "plcname";
- comboBox1.ValueMember = "id";
-
var result1 = new List