Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f0bd4276 由 LN
选项

料架RFID读取不到时，自动重启再重新读取一次

1 个父辈 80c3d0b8
内嵌 并排
正在显示 10 个修改的文件 包含 376 行增加 和 319 行删除
dll/RFID/RFID.ReadAll.dll 0 → 100644
此文件类型无法预览
source/AssemblyLineClient/AssemblyLineClient.csproj
...@@ -55,9 +55,6 @@ ...@@ -55,9 +55,6 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<ItemGroup> <ItemGroup>
<Reference Include="Asa.RFID">
<HintPath>..\..\dll\RFID\Asa.RFID.dll</HintPath>
</Reference>
<Reference Include="Client"> <Reference Include="Client">
<HintPath>..\..\dll\Client.dll</HintPath> <HintPath>..\..\dll\Client.dll</HintPath>
</Reference> </Reference>
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
this.chbMoveStop = new System.Windows.Forms.CheckBox(); this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.lblName = new System.Windows.Forms.Label(); this.lblName = new System.Windows.Forms.Label();
this.btnScan = new System.Windows.Forms.Button(); this.btnScan = new System.Windows.Forms.Button();
this.btnResetRFID = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -147,11 +148,9 @@ ...@@ -147,11 +148,9 @@
this.groupBox1.Controls.Add(this.txtWriteTime); this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(881, 459); this.groupBox1.Location = new System.Drawing.Point(685, 390);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Size = new System.Drawing.Size(604, 99);
this.groupBox1.Size = new System.Drawing.Size(777, 116);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
...@@ -160,11 +159,10 @@ ...@@ -160,11 +159,10 @@
// //
this.txtDOIndex.Enabled = false; this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(305, 66); this.txtDOIndex.Location = new System.Drawing.Point(237, 56);
this.txtDOIndex.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtDOIndex.MaxLength = 10; this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex"; this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(59, 27); this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
this.txtDOIndex.TabIndex = 260; this.txtDOIndex.TabIndex = 260;
this.txtDOIndex.Text = "0"; this.txtDOIndex.Text = "0";
// //
...@@ -172,11 +170,10 @@ ...@@ -172,11 +170,10 @@
// //
this.txtDoName.Enabled = false; this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(89, 66); this.txtDoName.Location = new System.Drawing.Point(69, 56);
this.txtDoName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtDoName.MaxLength = 10; this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName"; this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(148, 27); this.txtDoName.Size = new System.Drawing.Size(116, 23);
this.txtDoName.TabIndex = 259; this.txtDoName.TabIndex = 259;
this.txtDoName.Text = "0"; this.txtDoName.Text = "0";
// //
...@@ -185,10 +182,9 @@ ...@@ -185,10 +182,9 @@
this.label17.AutoSize = true; this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(22, 69); this.label17.Location = new System.Drawing.Point(17, 59);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(56, 20); this.label17.Size = new System.Drawing.Size(46, 17);
this.label17.TabIndex = 258; this.label17.TabIndex = 258;
this.label17.Text = "设备IP:"; this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -198,10 +194,9 @@ ...@@ -198,10 +194,9 @@
this.label14.AutoSize = true; this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(258, 69); this.label14.Location = new System.Drawing.Point(201, 59);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(43, 20); this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 257; this.label14.TabIndex = 257;
this.label14.Text = "地址:"; this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -211,10 +206,9 @@ ...@@ -211,10 +206,9 @@
this.btnOpenDo.BackColor = System.Drawing.Color.White; this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(382, 60); this.btnOpenDo.Location = new System.Drawing.Point(297, 51);
this.btnOpenDo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOpenDo.Name = "btnOpenDo"; this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(141, 40); this.btnOpenDo.Size = new System.Drawing.Size(110, 34);
this.btnOpenDo.TabIndex = 256; this.btnOpenDo.TabIndex = 256;
this.btnOpenDo.Text = "打开"; this.btnOpenDo.Text = "打开";
this.btnOpenDo.UseVisualStyleBackColor = false; this.btnOpenDo.UseVisualStyleBackColor = false;
...@@ -223,11 +217,10 @@ ...@@ -223,11 +217,10 @@
// txtSlaveId // txtSlaveId
// //
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(171, 129); this.txtSlaveId.Location = new System.Drawing.Point(133, 110);
this.txtSlaveId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtSlaveId.MaxLength = 10; this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId"; this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(14, 27); this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
this.txtSlaveId.TabIndex = 255; this.txtSlaveId.TabIndex = 255;
this.txtSlaveId.Text = "0"; this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false; this.txtSlaveId.Visible = false;
...@@ -238,10 +231,9 @@ ...@@ -238,10 +231,9 @@
this.chbAutoRead.Checked = true; this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(406, 67); this.chbAutoRead.Location = new System.Drawing.Point(316, 57);
this.chbAutoRead.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbAutoRead.Name = "chbAutoRead"; this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(91, 24); this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244; this.chbAutoRead.TabIndex = 244;
this.chbAutoRead.Text = "自动读取"; this.chbAutoRead.Text = "自动读取";
this.chbAutoRead.UseVisualStyleBackColor = true; this.chbAutoRead.UseVisualStyleBackColor = true;
...@@ -255,10 +247,9 @@ ...@@ -255,10 +247,9 @@
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22; this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(22, 21); this.cmbWriteIO.Location = new System.Drawing.Point(17, 18);
this.cmbWriteIO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(457, 28); this.cmbWriteIO.Size = new System.Drawing.Size(356, 28);
this.cmbWriteIO.TabIndex = 234; this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName"; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem); this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
...@@ -269,10 +260,9 @@ ...@@ -269,10 +260,9 @@
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White; this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(526, 60); this.btnWriteSingleDO.Location = new System.Drawing.Point(409, 51);
this.btnWriteSingleDO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnWriteSingleDO.Name = "btnWriteSingleDO"; this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(141, 40); this.btnWriteSingleDO.Size = new System.Drawing.Size(110, 34);
this.btnWriteSingleDO.TabIndex = 232; this.btnWriteSingleDO.TabIndex = 232;
this.btnWriteSingleDO.Text = "关闭"; this.btnWriteSingleDO.Text = "关闭";
this.btnWriteSingleDO.UseVisualStyleBackColor = false; this.btnWriteSingleDO.UseVisualStyleBackColor = false;
...@@ -281,11 +271,10 @@ ...@@ -281,11 +271,10 @@
// txtWriteTime // txtWriteTime
// //
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(582, 27); this.txtWriteTime.Location = new System.Drawing.Point(453, 23);
this.txtWriteTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWriteTime.MaxLength = 10; this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime"; this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(84, 27); this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
this.txtWriteTime.TabIndex = 238; this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0"; this.txtWriteTime.Text = "0";
// //
...@@ -294,10 +283,9 @@ ...@@ -294,10 +283,9 @@
this.label5.AutoSize = true; this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(501, 31); this.label5.Location = new System.Drawing.Point(390, 26);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(74, 20); this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237; this.label5.TabIndex = 237;
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -307,11 +295,9 @@ ...@@ -307,11 +295,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(588, 1); this.groupBox4.Location = new System.Drawing.Point(457, 1);
this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox4.Size = new System.Drawing.Size(220, 491);
this.groupBox4.Size = new System.Drawing.Size(283, 578);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -323,13 +309,12 @@ ...@@ -323,13 +309,12 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.ColumnCount = 1; this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 16); this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(269, 554); this.tableLayoutPanel2.Size = new System.Drawing.Size(209, 471);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -337,11 +322,9 @@ ...@@ -337,11 +322,9 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(8, 1); this.groupBox3.Location = new System.Drawing.Point(6, 1);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox3.Size = new System.Drawing.Size(220, 491);
this.groupBox3.Size = new System.Drawing.Size(283, 578);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -353,13 +336,12 @@ ...@@ -353,13 +336,12 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 16); this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(269, 554); this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 471);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox5 // groupBox5
...@@ -387,11 +369,9 @@ ...@@ -387,11 +369,9 @@
this.groupBox5.Controls.Add(this.btnFeedSideWayCylinder); this.groupBox5.Controls.Add(this.btnFeedSideWayCylinder);
this.groupBox5.Controls.Add(this.btnFeedCylinder); this.groupBox5.Controls.Add(this.btnFeedCylinder);
this.groupBox5.Controls.Add(this.btnFeedSideWay); this.groupBox5.Controls.Add(this.btnFeedSideWay);
this.groupBox5.Location = new System.Drawing.Point(1197, 1); this.groupBox5.Location = new System.Drawing.Point(931, 1);
this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox5.Size = new System.Drawing.Size(362, 389);
this.groupBox5.Size = new System.Drawing.Size(465, 458);
this.groupBox5.TabIndex = 255; this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试"; this.groupBox5.Text = "IO操作测试";
...@@ -401,10 +381,9 @@ ...@@ -401,10 +381,9 @@
this.btnOutStopDown.BackColor = System.Drawing.Color.White; this.btnOutStopDown.BackColor = System.Drawing.Color.White;
this.btnOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStopDown.Location = new System.Drawing.Point(216, 211); this.btnOutStopDown.Location = new System.Drawing.Point(168, 179);
this.btnOutStopDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOutStopDown.Name = "btnOutStopDown"; this.btnOutStopDown.Name = "btnOutStopDown";
this.btnOutStopDown.Size = new System.Drawing.Size(197, 40); this.btnOutStopDown.Size = new System.Drawing.Size(153, 34);
this.btnOutStopDown.TabIndex = 272; this.btnOutStopDown.TabIndex = 272;
this.btnOutStopDown.Text = "SL出料阻挡下降"; this.btnOutStopDown.Text = "SL出料阻挡下降";
this.btnOutStopDown.UseVisualStyleBackColor = false; this.btnOutStopDown.UseVisualStyleBackColor = false;
...@@ -415,10 +394,9 @@ ...@@ -415,10 +394,9 @@
this.btnSwStop.BackColor = System.Drawing.Color.White; this.btnSwStop.BackColor = System.Drawing.Color.White;
this.btnSwStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSwStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSwStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSwStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSwStop.Location = new System.Drawing.Point(10, 304); this.btnSwStop.Location = new System.Drawing.Point(8, 258);
this.btnSwStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSwStop.Name = "btnSwStop"; this.btnSwStop.Name = "btnSwStop";
this.btnSwStop.Size = new System.Drawing.Size(197, 40); this.btnSwStop.Size = new System.Drawing.Size(153, 34);
this.btnSwStop.TabIndex = 271; this.btnSwStop.TabIndex = 271;
this.btnSwStop.Text = "环形线阻挡气缸下降"; this.btnSwStop.Text = "环形线阻挡气缸下降";
this.btnSwStop.UseVisualStyleBackColor = false; this.btnSwStop.UseVisualStyleBackColor = false;
...@@ -429,10 +407,9 @@ ...@@ -429,10 +407,9 @@
this.btnFLStop1.BackColor = System.Drawing.Color.White; this.btnFLStop1.BackColor = System.Drawing.Color.White;
this.btnFLStop1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFLStop1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFLStop1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFLStop1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFLStop1.Location = new System.Drawing.Point(12, 302); this.btnFLStop1.Location = new System.Drawing.Point(9, 257);
this.btnFLStop1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFLStop1.Name = "btnFLStop1"; this.btnFLStop1.Name = "btnFLStop1";
this.btnFLStop1.Size = new System.Drawing.Size(197, 40); this.btnFLStop1.Size = new System.Drawing.Size(153, 34);
this.btnFLStop1.TabIndex = 270; this.btnFLStop1.TabIndex = 270;
this.btnFLStop1.Text = "FL阻挡1下降"; this.btnFLStop1.Text = "FL阻挡1下降";
this.btnFLStop1.UseVisualStyleBackColor = false; this.btnFLStop1.UseVisualStyleBackColor = false;
...@@ -443,10 +420,9 @@ ...@@ -443,10 +420,9 @@
this.btnFLStop2Down.BackColor = System.Drawing.Color.White; this.btnFLStop2Down.BackColor = System.Drawing.Color.White;
this.btnFLStop2Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFLStop2Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFLStop2Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFLStop2Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFLStop2Down.Location = new System.Drawing.Point(216, 302); this.btnFLStop2Down.Location = new System.Drawing.Point(168, 257);
this.btnFLStop2Down.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFLStop2Down.Name = "btnFLStop2Down"; this.btnFLStop2Down.Name = "btnFLStop2Down";
this.btnFLStop2Down.Size = new System.Drawing.Size(197, 40); this.btnFLStop2Down.Size = new System.Drawing.Size(153, 34);
this.btnFLStop2Down.TabIndex = 269; this.btnFLStop2Down.TabIndex = 269;
this.btnFLStop2Down.Text = "FL阻挡2下降"; this.btnFLStop2Down.Text = "FL阻挡2下降";
this.btnFLStop2Down.UseVisualStyleBackColor = false; this.btnFLStop2Down.UseVisualStyleBackColor = false;
...@@ -457,10 +433,9 @@ ...@@ -457,10 +433,9 @@
this.btnOLine.BackColor = System.Drawing.Color.White; this.btnOLine.BackColor = System.Drawing.Color.White;
this.btnOLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOLine.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOLine.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOLine.Location = new System.Drawing.Point(216, 27); this.btnOLine.Location = new System.Drawing.Point(168, 23);
this.btnOLine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOLine.Name = "btnOLine"; this.btnOLine.Name = "btnOLine";
this.btnOLine.Size = new System.Drawing.Size(197, 40); this.btnOLine.Size = new System.Drawing.Size(153, 34);
this.btnOLine.TabIndex = 268; this.btnOLine.TabIndex = 268;
this.btnOLine.Text = "SL出料线体运转"; this.btnOLine.Text = "SL出料线体运转";
this.btnOLine.UseVisualStyleBackColor = false; this.btnOLine.UseVisualStyleBackColor = false;
...@@ -472,10 +447,9 @@ ...@@ -472,10 +447,9 @@
this.btnBStopDown.BackColor = System.Drawing.Color.White; this.btnBStopDown.BackColor = System.Drawing.Color.White;
this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBStopDown.Location = new System.Drawing.Point(216, 119); this.btnBStopDown.Location = new System.Drawing.Point(168, 101);
this.btnBStopDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBStopDown.Name = "btnBStopDown"; this.btnBStopDown.Name = "btnBStopDown";
this.btnBStopDown.Size = new System.Drawing.Size(197, 40); this.btnBStopDown.Size = new System.Drawing.Size(153, 34);
this.btnBStopDown.TabIndex = 267; this.btnBStopDown.TabIndex = 267;
this.btnBStopDown.Text = "SL缓冲阻挡下降"; this.btnBStopDown.Text = "SL缓冲阻挡下降";
this.btnBStopDown.UseVisualStyleBackColor = false; this.btnBStopDown.UseVisualStyleBackColor = false;
...@@ -486,10 +460,9 @@ ...@@ -486,10 +460,9 @@
this.btnEStopDown.BackColor = System.Drawing.Color.White; this.btnEStopDown.BackColor = System.Drawing.Color.White;
this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnEStopDown.Location = new System.Drawing.Point(12, 119); this.btnEStopDown.Location = new System.Drawing.Point(9, 101);
this.btnEStopDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnEStopDown.Name = "btnEStopDown"; this.btnEStopDown.Name = "btnEStopDown";
this.btnEStopDown.Size = new System.Drawing.Size(197, 40); this.btnEStopDown.Size = new System.Drawing.Size(153, 34);
this.btnEStopDown.TabIndex = 266; this.btnEStopDown.TabIndex = 266;
this.btnEStopDown.Text = "SL进料阻挡下降"; this.btnEStopDown.Text = "SL进料阻挡下降";
this.btnEStopDown.UseVisualStyleBackColor = false; this.btnEStopDown.UseVisualStyleBackColor = false;
...@@ -500,10 +473,9 @@ ...@@ -500,10 +473,9 @@
this.btnOSWRun.BackColor = System.Drawing.Color.White; this.btnOSWRun.BackColor = System.Drawing.Color.White;
this.btnOSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOSWRun.Location = new System.Drawing.Point(216, 73); this.btnOSWRun.Location = new System.Drawing.Point(168, 62);
this.btnOSWRun.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOSWRun.Name = "btnOSWRun"; this.btnOSWRun.Name = "btnOSWRun";
this.btnOSWRun.Size = new System.Drawing.Size(197, 40); this.btnOSWRun.Size = new System.Drawing.Size(153, 34);
this.btnOSWRun.TabIndex = 265; this.btnOSWRun.TabIndex = 265;
this.btnOSWRun.Text = "SL出口横移电机运转"; this.btnOSWRun.Text = "SL出口横移电机运转";
this.btnOSWRun.UseVisualStyleBackColor = false; this.btnOSWRun.UseVisualStyleBackColor = false;
...@@ -514,10 +486,9 @@ ...@@ -514,10 +486,9 @@
this.btnLSWRun.BackColor = System.Drawing.Color.White; this.btnLSWRun.BackColor = System.Drawing.Color.White;
this.btnLSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLSWRun.Location = new System.Drawing.Point(12, 73); this.btnLSWRun.Location = new System.Drawing.Point(9, 62);
this.btnLSWRun.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLSWRun.Name = "btnLSWRun"; this.btnLSWRun.Name = "btnLSWRun";
this.btnLSWRun.Size = new System.Drawing.Size(197, 40); this.btnLSWRun.Size = new System.Drawing.Size(153, 34);
this.btnLSWRun.TabIndex = 264; this.btnLSWRun.TabIndex = 264;
this.btnLSWRun.Text = "SL定位横移电机运转"; this.btnLSWRun.Text = "SL定位横移电机运转";
this.btnLSWRun.UseVisualStyleBackColor = false; this.btnLSWRun.UseVisualStyleBackColor = false;
...@@ -528,10 +499,9 @@ ...@@ -528,10 +499,9 @@
this.btnLineRun.BackColor = System.Drawing.Color.White; this.btnLineRun.BackColor = System.Drawing.Color.White;
this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineRun.Location = new System.Drawing.Point(12, 27); this.btnLineRun.Location = new System.Drawing.Point(9, 23);
this.btnLineRun.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLineRun.Name = "btnLineRun"; this.btnLineRun.Name = "btnLineRun";
this.btnLineRun.Size = new System.Drawing.Size(197, 40); this.btnLineRun.Size = new System.Drawing.Size(153, 34);
this.btnLineRun.TabIndex = 263; this.btnLineRun.TabIndex = 263;
this.btnLineRun.Text = "SL进料线体运转"; this.btnLineRun.Text = "SL进料线体运转";
this.btnLineRun.UseVisualStyleBackColor = false; this.btnLineRun.UseVisualStyleBackColor = false;
...@@ -542,10 +512,9 @@ ...@@ -542,10 +512,9 @@
this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White; this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White;
this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFL_TopCylinder.Location = new System.Drawing.Point(12, 348); this.btnFL_TopCylinder.Location = new System.Drawing.Point(9, 296);
this.btnFL_TopCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFL_TopCylinder.Name = "btnFL_TopCylinder"; this.btnFL_TopCylinder.Name = "btnFL_TopCylinder";
this.btnFL_TopCylinder.Size = new System.Drawing.Size(197, 40); this.btnFL_TopCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFL_TopCylinder.TabIndex = 262; this.btnFL_TopCylinder.TabIndex = 262;
this.btnFL_TopCylinder.Text = "FL顶升上升"; this.btnFL_TopCylinder.Text = "FL顶升上升";
this.btnFL_TopCylinder.UseVisualStyleBackColor = false; this.btnFL_TopCylinder.UseVisualStyleBackColor = false;
...@@ -556,10 +525,9 @@ ...@@ -556,10 +525,9 @@
this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White; this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSwLocationCylinder.Location = new System.Drawing.Point(216, 304); this.btnSwLocationCylinder.Location = new System.Drawing.Point(168, 258);
this.btnSwLocationCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSwLocationCylinder.Name = "btnSwLocationCylinder"; this.btnSwLocationCylinder.Name = "btnSwLocationCylinder";
this.btnSwLocationCylinder.Size = new System.Drawing.Size(197, 40); this.btnSwLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnSwLocationCylinder.TabIndex = 261; this.btnSwLocationCylinder.TabIndex = 261;
this.btnSwLocationCylinder.Text = "环形线横移定位上升"; this.btnSwLocationCylinder.Text = "环形线横移定位上升";
this.btnSwLocationCylinder.UseVisualStyleBackColor = false; this.btnSwLocationCylinder.UseVisualStyleBackColor = false;
...@@ -570,10 +538,9 @@ ...@@ -570,10 +538,9 @@
this.btnSWTop.BackColor = System.Drawing.Color.White; this.btnSWTop.BackColor = System.Drawing.Color.White;
this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSWTop.Location = new System.Drawing.Point(216, 348); this.btnSWTop.Location = new System.Drawing.Point(168, 296);
this.btnSWTop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSWTop.Name = "btnSWTop"; this.btnSWTop.Name = "btnSWTop";
this.btnSWTop.Size = new System.Drawing.Size(197, 40); this.btnSWTop.Size = new System.Drawing.Size(153, 34);
this.btnSWTop.TabIndex = 260; this.btnSWTop.TabIndex = 260;
this.btnSWTop.Text = "环形线横移顶升上升"; this.btnSWTop.Text = "环形线横移顶升上升";
this.btnSWTop.UseVisualStyleBackColor = false; this.btnSWTop.UseVisualStyleBackColor = false;
...@@ -584,10 +551,9 @@ ...@@ -584,10 +551,9 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White; this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(12, 394); this.btnCloseAll.Location = new System.Drawing.Point(9, 335);
this.btnCloseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(197, 40); this.btnCloseAll.Size = new System.Drawing.Size(153, 34);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
this.btnCloseAll.Text = "关闭所有DO"; this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false; this.btnCloseAll.UseVisualStyleBackColor = false;
...@@ -598,10 +564,9 @@ ...@@ -598,10 +564,9 @@
this.btnOutTopCylinder.BackColor = System.Drawing.Color.White; this.btnOutTopCylinder.BackColor = System.Drawing.Color.White;
this.btnOutTopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutTopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutTopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutTopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutTopCylinder.Location = new System.Drawing.Point(216, 165); this.btnOutTopCylinder.Location = new System.Drawing.Point(168, 140);
this.btnOutTopCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOutTopCylinder.Name = "btnOutTopCylinder"; this.btnOutTopCylinder.Name = "btnOutTopCylinder";
this.btnOutTopCylinder.Size = new System.Drawing.Size(197, 40); this.btnOutTopCylinder.Size = new System.Drawing.Size(153, 34);
this.btnOutTopCylinder.TabIndex = 258; this.btnOutTopCylinder.TabIndex = 258;
this.btnOutTopCylinder.Text = "SL出口顶升上升"; this.btnOutTopCylinder.Text = "SL出口顶升上升";
this.btnOutTopCylinder.UseVisualStyleBackColor = false; this.btnOutTopCylinder.UseVisualStyleBackColor = false;
...@@ -612,10 +577,9 @@ ...@@ -612,10 +577,9 @@
this.btnLocationCylinder.BackColor = System.Drawing.Color.White; this.btnLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationCylinder.Location = new System.Drawing.Point(12, 165); this.btnLocationCylinder.Location = new System.Drawing.Point(9, 140);
this.btnLocationCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLocationCylinder.Name = "btnLocationCylinder"; this.btnLocationCylinder.Name = "btnLocationCylinder";
this.btnLocationCylinder.Size = new System.Drawing.Size(197, 40); this.btnLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnLocationCylinder.TabIndex = 256; this.btnLocationCylinder.TabIndex = 256;
this.btnLocationCylinder.Text = "SL定位气缸上升"; this.btnLocationCylinder.Text = "SL定位气缸上升";
this.btnLocationCylinder.UseVisualStyleBackColor = false; this.btnLocationCylinder.UseVisualStyleBackColor = false;
...@@ -626,10 +590,9 @@ ...@@ -626,10 +590,9 @@
this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White; this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTrayLocationCylinder.Location = new System.Drawing.Point(216, 394); this.btnTrayLocationCylinder.Location = new System.Drawing.Point(168, 335);
this.btnTrayLocationCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder"; this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder";
this.btnTrayLocationCylinder.Size = new System.Drawing.Size(197, 40); this.btnTrayLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnTrayLocationCylinder.TabIndex = 255; this.btnTrayLocationCylinder.TabIndex = 255;
this.btnTrayLocationCylinder.Text = "SL升降盘定位气缸前进"; this.btnTrayLocationCylinder.Text = "SL升降盘定位气缸前进";
this.btnTrayLocationCylinder.UseVisualStyleBackColor = false; this.btnTrayLocationCylinder.UseVisualStyleBackColor = false;
...@@ -640,10 +603,9 @@ ...@@ -640,10 +603,9 @@
this.btnFeedSideWayCylinder.BackColor = System.Drawing.Color.White; this.btnFeedSideWayCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedSideWayCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedSideWayCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWayCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedSideWayCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(12, 211); this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(9, 179);
this.btnFeedSideWayCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFeedSideWayCylinder.Name = "btnFeedSideWayCylinder"; this.btnFeedSideWayCylinder.Name = "btnFeedSideWayCylinder";
this.btnFeedSideWayCylinder.Size = new System.Drawing.Size(197, 40); this.btnFeedSideWayCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFeedSideWayCylinder.TabIndex = 252; this.btnFeedSideWayCylinder.TabIndex = 252;
this.btnFeedSideWayCylinder.Text = "上料横移气缸取料端"; this.btnFeedSideWayCylinder.Text = "上料横移气缸取料端";
this.btnFeedSideWayCylinder.UseVisualStyleBackColor = false; this.btnFeedSideWayCylinder.UseVisualStyleBackColor = false;
...@@ -654,10 +616,9 @@ ...@@ -654,10 +616,9 @@
this.btnFeedCylinder.BackColor = System.Drawing.Color.White; this.btnFeedCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedCylinder.Location = new System.Drawing.Point(216, 255); this.btnFeedCylinder.Location = new System.Drawing.Point(168, 217);
this.btnFeedCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFeedCylinder.Name = "btnFeedCylinder"; this.btnFeedCylinder.Name = "btnFeedCylinder";
this.btnFeedCylinder.Size = new System.Drawing.Size(197, 40); this.btnFeedCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFeedCylinder.TabIndex = 249; this.btnFeedCylinder.TabIndex = 249;
this.btnFeedCylinder.Text = "夹料气缸放松"; this.btnFeedCylinder.Text = "夹料气缸放松";
this.btnFeedCylinder.UseVisualStyleBackColor = false; this.btnFeedCylinder.UseVisualStyleBackColor = false;
...@@ -668,10 +629,9 @@ ...@@ -668,10 +629,9 @@
this.btnFeedSideWay.BackColor = System.Drawing.Color.White; this.btnFeedSideWay.BackColor = System.Drawing.Color.White;
this.btnFeedSideWay.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedSideWay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWay.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedSideWay.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWay.Location = new System.Drawing.Point(12, 255); this.btnFeedSideWay.Location = new System.Drawing.Point(9, 217);
this.btnFeedSideWay.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFeedSideWay.Name = "btnFeedSideWay"; this.btnFeedSideWay.Name = "btnFeedSideWay";
this.btnFeedSideWay.Size = new System.Drawing.Size(197, 40); this.btnFeedSideWay.Size = new System.Drawing.Size(153, 34);
this.btnFeedSideWay.TabIndex = 246; this.btnFeedSideWay.TabIndex = 246;
this.btnFeedSideWay.Text = "上料横移机构上升"; this.btnFeedSideWay.Text = "上料横移机构上升";
this.btnFeedSideWay.UseVisualStyleBackColor = false; this.btnFeedSideWay.UseVisualStyleBackColor = false;
...@@ -681,10 +641,9 @@ ...@@ -681,10 +641,9 @@
// //
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(837, 15); this.chbDebug.Location = new System.Drawing.Point(651, 13);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(104, 28); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247; this.chbDebug.TabIndex = 247;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -697,10 +656,9 @@ ...@@ -697,10 +656,9 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red; this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(522, 25); this.lblThisSta.Location = new System.Drawing.Point(406, 21);
this.lblThisSta.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(1133, 388); this.lblThisSta.Size = new System.Drawing.Size(881, 330);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -711,10 +669,9 @@ ...@@ -711,10 +669,9 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green; this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(1259, 18); this.lblStoreStatus.Location = new System.Drawing.Point(979, 15);
this.lblStoreStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblStoreStatus.Name = "lblStoreStatus"; this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(82, 24); this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245; this.lblStoreStatus.TabIndex = 245;
this.lblStoreStatus.Text = "等待启动"; this.lblStoreStatus.Text = "等待启动";
this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -724,10 +681,9 @@ ...@@ -724,10 +681,9 @@
this.btnStart.BackColor = System.Drawing.Color.White; this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(244, 6); this.btnStart.Location = new System.Drawing.Point(190, 5);
this.btnStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStart.Name = "btnStart"; this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(141, 47); this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.TabIndex = 86; this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试"; this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false; this.btnStart.UseVisualStyleBackColor = false;
...@@ -738,10 +694,9 @@ ...@@ -738,10 +694,9 @@
this.btnStop.BackColor = System.Drawing.Color.White; this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(392, 6); this.btnStop.Location = new System.Drawing.Point(305, 5);
this.btnStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStop.Name = "btnStop"; this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(141, 47); this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.TabIndex = 87; this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止"; this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false; this.btnStop.UseVisualStyleBackColor = false;
...@@ -753,10 +708,9 @@ ...@@ -753,10 +708,9 @@
this.btnReset.Enabled = false; this.btnReset.Enabled = false;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(540, 6); this.btnReset.Location = new System.Drawing.Point(420, 5);
this.btnReset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnReset.Name = "btnReset"; this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(141, 47); this.btnReset.Size = new System.Drawing.Size(110, 40);
this.btnReset.TabIndex = 95; this.btnReset.TabIndex = 95;
this.btnReset.Text = "复位"; this.btnReset.Text = "复位";
this.btnReset.UseVisualStyleBackColor = false; this.btnReset.UseVisualStyleBackColor = false;
...@@ -770,20 +724,18 @@ ...@@ -770,20 +724,18 @@
this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(6, 61); this.tabControl1.Location = new System.Drawing.Point(5, 52);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1680, 619); this.tabControl1.Size = new System.Drawing.Size(1307, 526);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// tabPage3 // tabPage3
// //
this.tabPage3.Controls.Add(this.groupBox6); this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 29); this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1672, 586); this.tabPage3.Size = new System.Drawing.Size(1299, 496);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "状态信息"; this.tabPage3.Text = "状态信息";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -793,6 +745,7 @@ ...@@ -793,6 +745,7 @@
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.btnResetRFID);
this.groupBox6.Controls.Add(this.chbUseTrayCheck); this.groupBox6.Controls.Add(this.chbUseTrayCheck);
this.groupBox6.Controls.Add(this.btnUpdateShelf); this.groupBox6.Controls.Add(this.btnUpdateShelf);
this.groupBox6.Controls.Add(this.txtShelfID); this.groupBox6.Controls.Add(this.txtShelfID);
...@@ -801,11 +754,9 @@ ...@@ -801,11 +754,9 @@
this.groupBox6.Controls.Add(this.lblAgvInfo); this.groupBox6.Controls.Add(this.lblAgvInfo);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta); this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(4, 4); this.groupBox6.Location = new System.Drawing.Point(3, 3);
this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox6.Size = new System.Drawing.Size(1293, 497);
this.groupBox6.Size = new System.Drawing.Size(1662, 585);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
...@@ -814,10 +765,9 @@ ...@@ -814,10 +765,9 @@
// //
this.chbUseTrayCheck.AutoSize = true; this.chbUseTrayCheck.AutoSize = true;
this.chbUseTrayCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbUseTrayCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseTrayCheck.Location = new System.Drawing.Point(361, 525); this.chbUseTrayCheck.Location = new System.Drawing.Point(251, 447);
this.chbUseTrayCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbUseTrayCheck.Name = "chbUseTrayCheck"; this.chbUseTrayCheck.Name = "chbUseTrayCheck";
this.chbUseTrayCheck.Size = new System.Drawing.Size(140, 28); this.chbUseTrayCheck.Size = new System.Drawing.Size(112, 24);
this.chbUseTrayCheck.TabIndex = 283; this.chbUseTrayCheck.TabIndex = 283;
this.chbUseTrayCheck.Text = "启用料盘检测"; this.chbUseTrayCheck.Text = "启用料盘检测";
this.chbUseTrayCheck.UseVisualStyleBackColor = true; this.chbUseTrayCheck.UseVisualStyleBackColor = true;
...@@ -828,10 +778,9 @@ ...@@ -828,10 +778,9 @@
this.btnUpdateShelf.BackColor = System.Drawing.Color.White; this.btnUpdateShelf.BackColor = System.Drawing.Color.White;
this.btnUpdateShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdateShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdateShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateShelf.Location = new System.Drawing.Point(153, 512); this.btnUpdateShelf.Location = new System.Drawing.Point(119, 438);
this.btnUpdateShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdateShelf.Name = "btnUpdateShelf"; this.btnUpdateShelf.Name = "btnUpdateShelf";
this.btnUpdateShelf.Size = new System.Drawing.Size(141, 47); this.btnUpdateShelf.Size = new System.Drawing.Size(110, 40);
this.btnUpdateShelf.TabIndex = 281; this.btnUpdateShelf.TabIndex = 281;
this.btnUpdateShelf.Text = "更改料架号"; this.btnUpdateShelf.Text = "更改料架号";
this.btnUpdateShelf.UseVisualStyleBackColor = false; this.btnUpdateShelf.UseVisualStyleBackColor = false;
...@@ -840,11 +789,10 @@ ...@@ -840,11 +789,10 @@
// txtShelfID // txtShelfID
// //
this.txtShelfID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtShelfID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtShelfID.Location = new System.Drawing.Point(17, 522); this.txtShelfID.Location = new System.Drawing.Point(13, 445);
this.txtShelfID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtShelfID.MaxLength = 6; this.txtShelfID.MaxLength = 6;
this.txtShelfID.Name = "txtShelfID"; this.txtShelfID.Name = "txtShelfID";
this.txtShelfID.Size = new System.Drawing.Size(127, 31); this.txtShelfID.Size = new System.Drawing.Size(100, 26);
this.txtShelfID.TabIndex = 280; this.txtShelfID.TabIndex = 280;
// //
// lblwidth // lblwidth
...@@ -852,10 +800,9 @@ ...@@ -852,10 +800,9 @@
this.lblwidth.AutoSize = true; this.lblwidth.AutoSize = true;
this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblwidth.Location = new System.Drawing.Point(27, 55); this.lblwidth.Location = new System.Drawing.Point(21, 47);
this.lblwidth.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblwidth.Name = "lblwidth"; this.lblwidth.Name = "lblwidth";
this.lblwidth.Size = new System.Drawing.Size(114, 20); this.lblwidth.Size = new System.Drawing.Size(92, 17);
this.lblwidth.TabIndex = 279; this.lblwidth.TabIndex = 279;
this.lblwidth.Text = "当前料盘宽度："; this.lblwidth.Text = "当前料盘宽度：";
// //
...@@ -864,10 +811,9 @@ ...@@ -864,10 +811,9 @@
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(27, 86); this.lblMoveInfo.Location = new System.Drawing.Point(21, 73);
this.lblMoveInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(84, 20); this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 278; this.lblMoveInfo.TabIndex = 278;
this.lblMoveInfo.Text = "运动信息："; this.lblMoveInfo.Text = "运动信息：";
// //
...@@ -876,10 +822,9 @@ ...@@ -876,10 +822,9 @@
this.lblAgvInfo.AutoSize = true; this.lblAgvInfo.AutoSize = true;
this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(27, 25); this.lblAgvInfo.Location = new System.Drawing.Point(21, 21);
this.lblAgvInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblAgvInfo.Name = "lblAgvInfo"; this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(75, 20); this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.TabIndex = 276; this.lblAgvInfo.TabIndex = 276;
this.lblAgvInfo.Text = "AGV 状态"; this.lblAgvInfo.Text = "AGV 状态";
// //
...@@ -890,10 +835,9 @@ ...@@ -890,10 +835,9 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green; this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(522, 304); this.lblInstoreList.Location = new System.Drawing.Point(406, 258);
this.lblInstoreList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(926, 128); this.lblInstoreList.Size = new System.Drawing.Size(720, 109);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// tabPage1 // tabPage1
...@@ -904,11 +848,10 @@ ...@@ -904,11 +848,10 @@
this.tabPage1.Controls.Add(this.groupBox8); this.tabPage1.Controls.Add(this.groupBox8);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage1.Size = new System.Drawing.Size(1672, 586); this.tabPage1.Size = new System.Drawing.Size(1299, 496);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -918,11 +861,9 @@ ...@@ -918,11 +861,9 @@
this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox7.Controls.Add(this.tableLayoutPanel3); this.groupBox7.Controls.Add(this.tableLayoutPanel3);
this.groupBox7.Location = new System.Drawing.Point(298, 1); this.groupBox7.Location = new System.Drawing.Point(232, 1);
this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Name = "groupBox7"; this.groupBox7.Name = "groupBox7";
this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox7.Size = new System.Drawing.Size(220, 491);
this.groupBox7.Size = new System.Drawing.Size(283, 578);
this.groupBox7.TabIndex = 279; this.groupBox7.TabIndex = 279;
this.groupBox7.TabStop = false; this.groupBox7.TabStop = false;
this.groupBox7.Text = "DI列表"; this.groupBox7.Text = "DI列表";
...@@ -934,13 +875,12 @@ ...@@ -934,13 +875,12 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel3.ColumnCount = 1; this.tableLayoutPanel3.ColumnCount = 1;
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.Location = new System.Drawing.Point(8, 16); this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(269, 554); this.tableLayoutPanel3.Size = new System.Drawing.Size(209, 471);
this.tableLayoutPanel3.TabIndex = 102; this.tableLayoutPanel3.TabIndex = 102;
// //
// groupBox8 // groupBox8
...@@ -948,11 +888,9 @@ ...@@ -948,11 +888,9 @@
this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox8.Controls.Add(this.tableLayoutPanel4); this.groupBox8.Controls.Add(this.tableLayoutPanel4);
this.groupBox8.Location = new System.Drawing.Point(881, 1); this.groupBox8.Location = new System.Drawing.Point(685, 1);
this.groupBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox8.Name = "groupBox8"; this.groupBox8.Name = "groupBox8";
this.groupBox8.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox8.Size = new System.Drawing.Size(240, 389);
this.groupBox8.Size = new System.Drawing.Size(309, 458);
this.groupBox8.TabIndex = 280; this.groupBox8.TabIndex = 280;
this.groupBox8.TabStop = false; this.groupBox8.TabStop = false;
this.groupBox8.Text = "DO列表"; this.groupBox8.Text = "DO列表";
...@@ -964,13 +902,12 @@ ...@@ -964,13 +902,12 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel4.ColumnCount = 1; this.tableLayoutPanel4.ColumnCount = 1;
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.Location = new System.Drawing.Point(6, 16); this.tableLayoutPanel4.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 2; this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(294, 434); this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 369);
this.tableLayoutPanel4.TabIndex = 103; this.tableLayoutPanel4.TabIndex = 103;
// //
// tabPage2 // tabPage2
...@@ -979,11 +916,10 @@ ...@@ -979,11 +916,10 @@
this.tabPage2.Controls.Add(this.groupBox9); this.tabPage2.Controls.Add(this.groupBox9);
this.tabPage2.Controls.Add(this.axisMoveControl1); this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Controls.Add(this.groupBox2); this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage2.Size = new System.Drawing.Size(1672, 586); this.tabPage2.Size = new System.Drawing.Size(1299, 496);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 "; this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -998,11 +934,9 @@ ...@@ -998,11 +934,9 @@
this.groupDetial.Controls.Add(this.label2); this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize); this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1); this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(921, 11); this.groupDetial.Location = new System.Drawing.Point(716, 9);
this.groupDetial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupDetial.Name = "groupDetial"; this.groupDetial.Name = "groupDetial";
this.groupDetial.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupDetial.Size = new System.Drawing.Size(381, 296);
this.groupDetial.Size = new System.Drawing.Size(490, 348);
this.groupDetial.TabIndex = 319; this.groupDetial.TabIndex = 319;
this.groupDetial.TabStop = false; this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置"; this.groupDetial.Text = "移栽位置P2详细配置";
...@@ -1011,10 +945,9 @@ ...@@ -1011,10 +945,9 @@
// //
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue; this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(27, 284); this.btnDSave.Location = new System.Drawing.Point(21, 241);
this.btnDSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnDSave.Name = "btnDSave"; this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(121, 40); this.btnDSave.Size = new System.Drawing.Size(94, 34);
this.btnDSave.TabIndex = 322; this.btnDSave.TabIndex = 322;
this.btnDSave.Text = "保存"; this.btnDSave.Text = "保存";
this.btnDSave.UseVisualStyleBackColor = true; this.btnDSave.UseVisualStyleBackColor = true;
...@@ -1025,10 +958,9 @@ ...@@ -1025,10 +958,9 @@
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(27, 202); this.label3.Location = new System.Drawing.Point(21, 172);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(117, 20); this.label3.Size = new System.Drawing.Size(94, 17);
this.label3.TabIndex = 321; this.label3.TabIndex = 321;
this.label3.Text = "升降轴P2位置："; this.label3.Text = "升降轴P2位置：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1039,12 +971,11 @@ ...@@ -1039,12 +971,11 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(27, 238); this.txtDP2.Location = new System.Drawing.Point(21, 202);
this.txtDP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtDP2.MaxLength = 12; this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2"; this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtDP2.Size = new System.Drawing.Size(115, 31); this.txtDP2.Size = new System.Drawing.Size(90, 26);
this.txtDP2.TabIndex = 320; this.txtDP2.TabIndex = 320;
this.txtDP2.Text = "-1"; this.txtDP2.Text = "-1";
// //
...@@ -1052,11 +983,10 @@ ...@@ -1052,11 +983,10 @@
// //
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true; this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 23; this.listDetitalP2.ItemHeight = 20;
this.listDetitalP2.Location = new System.Drawing.Point(170, 35); this.listDetitalP2.Location = new System.Drawing.Point(132, 30);
this.listDetitalP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.listDetitalP2.Name = "listDetitalP2"; this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(266, 280); this.listDetitalP2.Size = new System.Drawing.Size(208, 224);
this.listDetitalP2.TabIndex = 319; this.listDetitalP2.TabIndex = 319;
this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged); this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged);
// //
...@@ -1065,10 +995,9 @@ ...@@ -1065,10 +995,9 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true; this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(27, 154); this.cmbDHeight.Location = new System.Drawing.Point(21, 131);
this.cmbDHeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbDHeight.Name = "cmbDHeight"; this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(115, 31); this.cmbDHeight.Size = new System.Drawing.Size(90, 28);
this.cmbDHeight.TabIndex = 318; this.cmbDHeight.TabIndex = 318;
this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -1077,10 +1006,9 @@ ...@@ -1077,10 +1006,9 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(27, 119); this.label2.Location = new System.Drawing.Point(21, 101);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(84, 20); this.label2.Size = new System.Drawing.Size(68, 17);
this.label2.TabIndex = 317; this.label2.TabIndex = 317;
this.label2.Text = "料盘高度："; this.label2.Text = "料盘高度：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1090,10 +1018,9 @@ ...@@ -1090,10 +1018,9 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true; this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(27, 71); this.cmbDSize.Location = new System.Drawing.Point(21, 60);
this.cmbDSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbDSize.Name = "cmbDSize"; this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(115, 31); this.cmbDSize.Size = new System.Drawing.Size(90, 28);
this.cmbDSize.TabIndex = 316; this.cmbDSize.TabIndex = 316;
this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -1102,10 +1029,9 @@ ...@@ -1102,10 +1029,9 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(27, 35); this.label1.Location = new System.Drawing.Point(21, 30);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(84, 20); this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 315; this.label1.TabIndex = 315;
this.label1.Text = "料盘尺寸："; this.label1.Text = "料盘尺寸：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1119,11 +1045,9 @@ ...@@ -1119,11 +1045,9 @@
this.groupBox9.Controls.Add(this.btnBP1); this.groupBox9.Controls.Add(this.btnBP1);
this.groupBox9.Controls.Add(this.btnBP2); this.groupBox9.Controls.Add(this.btnBP2);
this.groupBox9.Controls.Add(this.txtBP2); this.groupBox9.Controls.Add(this.txtBP2);
this.groupBox9.Location = new System.Drawing.Point(705, 372); this.groupBox9.Location = new System.Drawing.Point(548, 316);
this.groupBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox9.Name = "groupBox9"; this.groupBox9.Name = "groupBox9";
this.groupBox9.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox9.Size = new System.Drawing.Size(520, 143);
this.groupBox9.Size = new System.Drawing.Size(669, 168);
this.groupBox9.TabIndex = 220; this.groupBox9.TabIndex = 220;
this.groupBox9.TabStop = false; this.groupBox9.TabStop = false;
this.groupBox9.Text = "上料提升轴位置配置"; this.groupBox9.Text = "上料提升轴位置配置";
...@@ -1135,11 +1059,10 @@ ...@@ -1135,11 +1059,10 @@
this.btnBP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP3.ForeColor = System.Drawing.Color.Red; this.btnBP3.ForeColor = System.Drawing.Color.Red;
this.btnBP3.Location = new System.Drawing.Point(332, 29); this.btnBP3.Location = new System.Drawing.Point(258, 25);
this.btnBP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBP3.Name = "btnBP3"; this.btnBP3.Name = "btnBP3";
this.btnBP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP3.Size = new System.Drawing.Size(210, 40); this.btnBP3.Size = new System.Drawing.Size(163, 34);
this.btnBP3.TabIndex = 312; this.btnBP3.TabIndex = 312;
this.btnBP3.Text = "上料目标位置P3"; this.btnBP3.Text = "上料目标位置P3";
this.btnBP3.UseVisualStyleBackColor = true; this.btnBP3.UseVisualStyleBackColor = true;
...@@ -1151,12 +1074,11 @@ ...@@ -1151,12 +1074,11 @@
this.txtBP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBP3.Location = new System.Drawing.Point(545, 34); this.txtBP3.Location = new System.Drawing.Point(424, 29);
this.txtBP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtBP3.MaxLength = 12; this.txtBP3.MaxLength = 12;
this.txtBP3.Name = "txtBP3"; this.txtBP3.Name = "txtBP3";
this.txtBP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBP3.Size = new System.Drawing.Size(89, 31); this.txtBP3.Size = new System.Drawing.Size(70, 26);
this.txtBP3.TabIndex = 311; this.txtBP3.TabIndex = 311;
this.txtBP3.Text = "-1"; this.txtBP3.Text = "-1";
// //
...@@ -1165,10 +1087,9 @@ ...@@ -1165,10 +1087,9 @@
this.btnBSave.BackColor = System.Drawing.SystemColors.Control; this.btnBSave.BackColor = System.Drawing.SystemColors.Control;
this.btnBSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBSave.ForeColor = System.Drawing.Color.Red; this.btnBSave.ForeColor = System.Drawing.Color.Red;
this.btnBSave.Location = new System.Drawing.Point(333, 79); this.btnBSave.Location = new System.Drawing.Point(259, 67);
this.btnBSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBSave.Name = "btnBSave"; this.btnBSave.Name = "btnBSave";
this.btnBSave.Size = new System.Drawing.Size(210, 40); this.btnBSave.Size = new System.Drawing.Size(163, 34);
this.btnBSave.TabIndex = 310; this.btnBSave.TabIndex = 310;
this.btnBSave.Text = "保存位置"; this.btnBSave.Text = "保存位置";
this.btnBSave.UseVisualStyleBackColor = false; this.btnBSave.UseVisualStyleBackColor = false;
...@@ -1180,12 +1101,11 @@ ...@@ -1180,12 +1101,11 @@
this.txtBp1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBp1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBp1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBp1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBp1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBp1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBp1.Location = new System.Drawing.Point(231, 35); this.txtBp1.Location = new System.Drawing.Point(180, 30);
this.txtBp1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtBp1.MaxLength = 12; this.txtBp1.MaxLength = 12;
this.txtBp1.Name = "txtBp1"; this.txtBp1.Name = "txtBp1";
this.txtBp1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBp1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBp1.Size = new System.Drawing.Size(89, 31); this.txtBp1.Size = new System.Drawing.Size(70, 26);
this.txtBp1.TabIndex = 309; this.txtBp1.TabIndex = 309;
this.txtBp1.Text = "-1"; this.txtBp1.Text = "-1";
// //
...@@ -1196,11 +1116,10 @@ ...@@ -1196,11 +1116,10 @@
this.btnBP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP1.ForeColor = System.Drawing.Color.Red; this.btnBP1.ForeColor = System.Drawing.Color.Red;
this.btnBP1.Location = new System.Drawing.Point(18, 31); this.btnBP1.Location = new System.Drawing.Point(14, 26);
this.btnBP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBP1.Name = "btnBP1"; this.btnBP1.Name = "btnBP1";
this.btnBP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP1.Size = new System.Drawing.Size(210, 40); this.btnBP1.Size = new System.Drawing.Size(163, 34);
this.btnBP1.TabIndex = 307; this.btnBP1.TabIndex = 307;
this.btnBP1.Text = "上升待机位置P1："; this.btnBP1.Text = "上升待机位置P1：";
this.btnBP1.UseVisualStyleBackColor = true; this.btnBP1.UseVisualStyleBackColor = true;
...@@ -1213,11 +1132,10 @@ ...@@ -1213,11 +1132,10 @@
this.btnBP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP2.ForeColor = System.Drawing.Color.Red; this.btnBP2.ForeColor = System.Drawing.Color.Red;
this.btnBP2.Location = new System.Drawing.Point(18, 79); this.btnBP2.Location = new System.Drawing.Point(14, 67);
this.btnBP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBP2.Name = "btnBP2"; this.btnBP2.Name = "btnBP2";
this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP2.Size = new System.Drawing.Size(210, 40); this.btnBP2.Size = new System.Drawing.Size(163, 34);
this.btnBP2.TabIndex = 306; this.btnBP2.TabIndex = 306;
this.btnBP2.Text = "下降点位置P2"; this.btnBP2.Text = "下降点位置P2";
this.btnBP2.UseVisualStyleBackColor = true; this.btnBP2.UseVisualStyleBackColor = true;
...@@ -1229,21 +1147,19 @@ ...@@ -1229,21 +1147,19 @@
this.txtBP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBP2.Location = new System.Drawing.Point(231, 84); this.txtBP2.Location = new System.Drawing.Point(180, 71);
this.txtBP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtBP2.MaxLength = 12; this.txtBP2.MaxLength = 12;
this.txtBP2.Name = "txtBP2"; this.txtBP2.Name = "txtBP2";
this.txtBP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBP2.Size = new System.Drawing.Size(89, 31); this.txtBP2.Size = new System.Drawing.Size(70, 26);
this.txtBP2.TabIndex = 305; this.txtBP2.TabIndex = 305;
this.txtBP2.Text = "-1"; this.txtBP2.Text = "-1";
// //
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Location = new System.Drawing.Point(18, 5); this.axisMoveControl1.Location = new System.Drawing.Point(14, 4);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(896, 364); this.axisMoveControl1.Size = new System.Drawing.Size(697, 309);
this.axisMoveControl1.TabIndex = 219; this.axisMoveControl1.TabIndex = 219;
// //
// groupBox2 // groupBox2
...@@ -1257,11 +1173,9 @@ ...@@ -1257,11 +1173,9 @@
this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnMoveto); this.groupBox2.Controls.Add(this.btnMoveto);
this.groupBox2.Controls.Add(this.txtSizePosition); this.groupBox2.Controls.Add(this.txtSizePosition);
this.groupBox2.Location = new System.Drawing.Point(28, 372); this.groupBox2.Location = new System.Drawing.Point(22, 316);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox2.Size = new System.Drawing.Size(520, 143);
this.groupBox2.Size = new System.Drawing.Size(669, 168);
this.groupBox2.TabIndex = 218; this.groupBox2.TabIndex = 218;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "移栽升降轴位置配置"; this.groupBox2.Text = "移栽升降轴位置配置";
...@@ -1272,12 +1186,11 @@ ...@@ -1272,12 +1186,11 @@
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(545, 72); this.txtUpdownP3.Location = new System.Drawing.Point(424, 61);
this.txtUpdownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpdownP3.MaxLength = 12; this.txtUpdownP3.MaxLength = 12;
this.txtUpdownP3.Name = "txtUpdownP3"; this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP3.Size = new System.Drawing.Size(89, 31); this.txtUpdownP3.Size = new System.Drawing.Size(70, 26);
this.txtUpdownP3.TabIndex = 312; this.txtUpdownP3.TabIndex = 312;
this.txtUpdownP3.Text = "-1"; this.txtUpdownP3.Text = "-1";
// //
...@@ -1288,11 +1201,10 @@ ...@@ -1288,11 +1201,10 @@
this.btnUpdownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP3.ForeColor = System.Drawing.Color.Blue; this.btnUpdownP3.ForeColor = System.Drawing.Color.Blue;
this.btnUpdownP3.Location = new System.Drawing.Point(332, 67); this.btnUpdownP3.Location = new System.Drawing.Point(258, 57);
this.btnUpdownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdownP3.Name = "btnUpdownP3"; this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(210, 40); this.btnUpdownP3.Size = new System.Drawing.Size(163, 34);
this.btnUpdownP3.TabIndex = 311; this.btnUpdownP3.TabIndex = 311;
this.btnUpdownP3.Text = "移栽升降轴取料位置P3："; this.btnUpdownP3.Text = "移栽升降轴取料位置P3：";
this.btnUpdownP3.UseVisualStyleBackColor = true; this.btnUpdownP3.UseVisualStyleBackColor = true;
...@@ -1303,10 +1215,9 @@ ...@@ -1303,10 +1215,9 @@
this.btnSave.BackColor = System.Drawing.SystemColors.Control; this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue; this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(195, 112); this.btnSave.Location = new System.Drawing.Point(152, 95);
this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(210, 40); this.btnSave.Size = new System.Drawing.Size(163, 34);
this.btnSave.TabIndex = 310; this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置"; this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = false; this.btnSave.UseVisualStyleBackColor = false;
...@@ -1318,12 +1229,11 @@ ...@@ -1318,12 +1229,11 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(545, 28); this.txtP1.Location = new System.Drawing.Point(424, 24);
this.txtP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtP1.MaxLength = 12; this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1"; this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP1.Size = new System.Drawing.Size(89, 31); this.txtP1.Size = new System.Drawing.Size(70, 26);
this.txtP1.TabIndex = 309; this.txtP1.TabIndex = 309;
this.txtP1.Text = "-1"; this.txtP1.Text = "-1";
// //
...@@ -1334,11 +1244,10 @@ ...@@ -1334,11 +1244,10 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue; this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(332, 24); this.btnMoveToP1.Location = new System.Drawing.Point(258, 20);
this.btnMoveToP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMoveToP1.Name = "btnMoveToP1"; this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(210, 40); this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
this.btnMoveToP1.TabIndex = 307; this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1："; this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true; this.btnMoveToP1.UseVisualStyleBackColor = true;
...@@ -1349,10 +1258,9 @@ ...@@ -1349,10 +1258,9 @@
this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbSizeList.FormattingEnabled = true; this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(140, 27); this.cmbSizeList.Location = new System.Drawing.Point(109, 23);
this.cmbSizeList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbSizeList.Name = "cmbSizeList"; this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(183, 31); this.cmbSizeList.Size = new System.Drawing.Size(143, 28);
this.cmbSizeList.TabIndex = 303; this.cmbSizeList.TabIndex = 303;
this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged); this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged);
// //
...@@ -1361,10 +1269,9 @@ ...@@ -1361,10 +1269,9 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(31, 34); this.label4.Location = new System.Drawing.Point(24, 29);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(84, 20); this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 302; this.label4.TabIndex = 302;
this.label4.Text = "料盘尺寸："; this.label4.Text = "料盘尺寸：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1376,11 +1283,10 @@ ...@@ -1376,11 +1283,10 @@
this.btnMoveto.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveto.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveto.ForeColor = System.Drawing.Color.Blue; this.btnMoveto.ForeColor = System.Drawing.Color.Blue;
this.btnMoveto.Location = new System.Drawing.Point(21, 67); this.btnMoveto.Location = new System.Drawing.Point(16, 57);
this.btnMoveto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMoveto.Name = "btnMoveto"; this.btnMoveto.Name = "btnMoveto";
this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveto.Size = new System.Drawing.Size(210, 40); this.btnMoveto.Size = new System.Drawing.Size(163, 34);
this.btnMoveto.TabIndex = 306; this.btnMoveto.TabIndex = 306;
this.btnMoveto.Text = "托盘放料位置P2"; this.btnMoveto.Text = "托盘放料位置P2";
this.btnMoveto.UseVisualStyleBackColor = true; this.btnMoveto.UseVisualStyleBackColor = true;
...@@ -1392,12 +1298,11 @@ ...@@ -1392,12 +1298,11 @@
this.txtSizePosition.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtSizePosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtSizePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSizePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSizePosition.ForeColor = System.Drawing.SystemColors.WindowText; this.txtSizePosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtSizePosition.Location = new System.Drawing.Point(234, 72); this.txtSizePosition.Location = new System.Drawing.Point(182, 61);
this.txtSizePosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtSizePosition.MaxLength = 12; this.txtSizePosition.MaxLength = 12;
this.txtSizePosition.Name = "txtSizePosition"; this.txtSizePosition.Name = "txtSizePosition";
this.txtSizePosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtSizePosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtSizePosition.Size = new System.Drawing.Size(89, 31); this.txtSizePosition.Size = new System.Drawing.Size(70, 26);
this.txtSizePosition.TabIndex = 305; this.txtSizePosition.TabIndex = 305;
this.txtSizePosition.Text = "-1"; this.txtSizePosition.Text = "-1";
// //
...@@ -1414,20 +1319,18 @@ ...@@ -1414,20 +1319,18 @@
this.panel1.Controls.Add(this.btnStart); this.panel1.Controls.Add(this.btnStart);
this.panel1.Controls.Add(this.btnStop); this.panel1.Controls.Add(this.btnStop);
this.panel1.Controls.Add(this.btnReset); this.panel1.Controls.Add(this.btnReset);
this.panel1.Location = new System.Drawing.Point(3, 1); this.panel1.Location = new System.Drawing.Point(2, 1);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1679, 55); this.panel1.Size = new System.Drawing.Size(1306, 47);
this.panel1.TabIndex = 258; this.panel1.TabIndex = 258;
// //
// chbBoxSendShelf // chbBoxSendShelf
// //
this.chbBoxSendShelf.AutoSize = true; this.chbBoxSendShelf.AutoSize = true;
this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBoxSendShelf.Location = new System.Drawing.Point(1068, 15); this.chbBoxSendShelf.Location = new System.Drawing.Point(831, 13);
this.chbBoxSendShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbBoxSendShelf.Name = "chbBoxSendShelf"; this.chbBoxSendShelf.Name = "chbBoxSendShelf";
this.chbBoxSendShelf.Size = new System.Drawing.Size(176, 28); this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24);
this.chbBoxSendShelf.TabIndex = 251; this.chbBoxSendShelf.TabIndex = 251;
this.chbBoxSendShelf.Text = "出库完成送出料架"; this.chbBoxSendShelf.Text = "出库完成送出料架";
this.chbBoxSendShelf.UseVisualStyleBackColor = true; this.chbBoxSendShelf.UseVisualStyleBackColor = true;
...@@ -1437,10 +1340,9 @@ ...@@ -1437,10 +1340,9 @@
// //
this.chbMoveStop.AutoSize = true; this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(953, 15); this.chbMoveStop.Location = new System.Drawing.Point(741, 13);
this.chbMoveStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(104, 28); this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 250; this.chbMoveStop.TabIndex = 250;
this.chbMoveStop.Text = "暂停运动"; this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
...@@ -1451,10 +1353,9 @@ ...@@ -1451,10 +1353,9 @@
this.lblName.BackColor = System.Drawing.Color.DodgerBlue; this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black; this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(6, 6); this.lblName.Location = new System.Drawing.Point(5, 5);
this.lblName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblName.Name = "lblName"; this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(231, 47); this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 249; this.lblName.TabIndex = 249;
this.lblName.Text = "出料流水线"; this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -1464,24 +1365,36 @@ ...@@ -1464,24 +1365,36 @@
this.btnScan.BackColor = System.Drawing.Color.White; this.btnScan.BackColor = System.Drawing.Color.White;
this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnScan.Location = new System.Drawing.Point(687, 6); this.btnScan.Location = new System.Drawing.Point(534, 5);
this.btnScan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnScan.Name = "btnScan"; this.btnScan.Name = "btnScan";
this.btnScan.Size = new System.Drawing.Size(141, 47); this.btnScan.Size = new System.Drawing.Size(110, 40);
this.btnScan.TabIndex = 248; this.btnScan.TabIndex = 248;
this.btnScan.Text = "扫码测试"; this.btnScan.Text = "扫码测试";
this.btnScan.UseVisualStyleBackColor = false; this.btnScan.UseVisualStyleBackColor = false;
this.btnScan.Click += new System.EventHandler(this.btnScan_Click); this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
// //
// btnResetRFID
//
this.btnResetRFID.BackColor = System.Drawing.Color.White;
this.btnResetRFID.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetRFID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetRFID.Location = new System.Drawing.Point(387, 439);
this.btnResetRFID.Name = "btnResetRFID";
this.btnResetRFID.Size = new System.Drawing.Size(110, 40);
this.btnResetRFID.TabIndex = 284;
this.btnResetRFID.Text = "重启RFID";
this.btnResetRFID.UseVisualStyleBackColor = false;
this.btnResetRFID.Click += new System.EventHandler(this.btnResetRFID_Click);
//
// FrmFeedingEquip // FrmFeedingEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1695, 685); this.ClientSize = new System.Drawing.Size(1318, 582);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "FrmFeedingEquip"; this.Name = "FrmFeedingEquip";
...@@ -1609,6 +1522,7 @@ ...@@ -1609,6 +1522,7 @@
private System.Windows.Forms.ComboBox cmbDSize; private System.Windows.Forms.ComboBox cmbDSize;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox chbUseTrayCheck; private System.Windows.Forms.CheckBox chbUseTrayCheck;
private System.Windows.Forms.Button btnResetRFID;
} }
} }
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -779,6 +779,17 @@ namespace OnlineStore.AssemblyLine ...@@ -779,6 +779,17 @@ namespace OnlineStore.AssemblyLine
} }
} }
private void btnResetRFID_Click(object sender, EventArgs e)
{
string ip = RFIDManager.GetRFIP(equipBean.DeviceID, 1);
LogUtil.info(equipBean.Name+ " 手动 ResetRFID [" + ip + "] ");
string msg = "";
bool result = RFIDManager.ResetRFID(ip, out msg);
if (!result)
{
LogUtil.error(Name + "手动 ResetRFID [" + ip + "], 失败：" + msg);
}
}
} }
} }
......
source/AssemblyLineClient/FrmIOMsg.cs
using Asa.RFID; using OnlineStore.DeviceLibrary;
using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -39,9 +39,6 @@ ...@@ -39,9 +39,6 @@
<Reference Include="Asa.Camera.VisionLib"> <Reference Include="Asa.Camera.VisionLib">
<HintPath>..\..\dll\Asa.Camera.VisionLib.dll</HintPath> <HintPath>..\..\dll\Asa.Camera.VisionLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.RFID.ReadAll">
<HintPath>..\..\dll\RFID\Asa.RFID.ReadAll.dll</HintPath>
</Reference>
<Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Client.dll</HintPath> <HintPath>..\..\dll\Client.dll</HintPath>
...@@ -61,6 +58,9 @@ ...@@ -61,6 +58,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath> <HintPath>..\..\dll\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="RFID.ReadAll">
<HintPath>..\..\dll\RFID\RFID.ReadAll.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -787,10 +787,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -787,10 +787,22 @@ namespace OnlineStore.DeviceLibrary
if (CurrShelfId.EndsWith("00")) if (CurrShelfId.EndsWith("00"))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_53_BatchAxisToP1);
InLog("料架号【" + CurrShelfId + "】无效，送出料架，" + MoveInfo.SLog + "：提升伺服到P1点，定位气缸下降"); MoveInfo.NextMoveStep(LineMoveStep.FI_041_ResetRFID);
BatchAxis.AbsMove(MoveInfo, Config.BatchAxisP1, Config.BatchAxis_P1Speed); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down); string ip = RFIDManager.GetRFIP(DeviceID, 1);
InLog("料架号【" + CurrShelfId + "】无效，ResetRFID[" + ip + "], 等待30秒后重新读取");
string msg = "";
bool result=RFIDManager.ResetRFID(ip, out msg);
if (!result)
{
LogUtil.error(Name+ "料架号【" + CurrShelfId + "】无效，ResetRFID[" + ip + "], 失败："+msg);
}
//MoveInfo.NextMoveStep(LineMoveStep.FI_53_BatchAxisToP1);
//InLog("料架号【" + CurrShelfId + "】无效，送出料架，" + MoveInfo.SLog + "：提升伺服到P1点，定位气缸下降");
//BatchAxis.AbsMove(MoveInfo, Config.BatchAxisP1, Config.BatchAxis_P1Speed);
//CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down);
} }
else else
{ {
...@@ -808,7 +820,35 @@ namespace OnlineStore.DeviceLibrary ...@@ -808,7 +820,35 @@ namespace OnlineStore.DeviceLibrary
InLog(" 未检测到料架，入料结束"); InLog(" 未检测到料架，入料结束");
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_041_ResetRFID))
{
if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
{
ReadShelfId();
if (CurrShelfId.EndsWith("00"))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_53_BatchAxisToP1);
InLog("ResetRFID 后，料架号【" + CurrShelfId + "】无效，送出料架，" + MoveInfo.SLog + "：提升伺服到P1点，定位气缸下降");
BatchAxis.AbsMove(MoveInfo, Config.BatchAxisP1, Config.BatchAxis_P1Speed);
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down);
}
else
{
MoveInfo.ShelfNoTray = false;
//定位工位有料架，直接开始入料
MoveInfo.NextMoveStep(LineMoveStep.FI_05_LocationCylinder_Up);
InLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡上升， 定位气缸上升，ResetRFID 后，读取并缓存料架RFID" + CurrShelfId);
UpdateLastShelfID(CurrShelfId);
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SL_LocationCylinder_Up);
}
}
else
{
MoveEndS();
InLog(" ResetRFID 后，未检测到料架，入料结束");
}
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_05_LocationCylinder_Up)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_05_LocationCylinder_Up))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_06_BatchAxisToP2); MoveInfo.NextMoveStep(LineMoveStep.FI_06_BatchAxisToP2);
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
...@@ -311,7 +311,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -311,7 +311,17 @@ namespace OnlineStore.DeviceLibrary
ReadShelfId(); ReadShelfId();
if (CurrShelfId.EndsWith("00")) if (CurrShelfId.EndsWith("00"))
{ {
SendOutShelfOut("料架号【" + CurrShelfId + "】无效"); //SendOutShelfOut("料架号【" + CurrShelfId + "】无效");
MoveInfo.NextMoveStep(LineMoveStep.FO_041_ResetRFID);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
string ip = RFIDManager.GetRFIP(DeviceID, 1);
OutLog("料架号【" + CurrShelfId + "】无效，ResetRFID[" + ip + "], 等待30秒后重新读取");
string msg = "";
bool result = RFIDManager.ResetRFID(ip, out msg);
if (!result)
{
LogUtil.error(Name + "料架号【" + CurrShelfId + "】无效，ResetRFID[" + ip + "], 失败：" + msg);
}
return; return;
} }
...@@ -347,6 +357,50 @@ namespace OnlineStore.DeviceLibrary ...@@ -347,6 +357,50 @@ namespace OnlineStore.DeviceLibrary
MoveEndS(); MoveEndS();
OutLog(" 未检测到料架，料架处理结束"); OutLog(" 未检测到料架，料架处理结束");
} }
}else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_041_ResetRFID))
{
if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
{
ReadShelfId();
if (CurrShelfId.EndsWith("00"))
{
SendOutShelfOut("ResetRFID后，料架号【" + CurrShelfId + "】无效");
return;
}
//判断是否是第一次获取料架，需要从服务器获取此料架的虚拟料架号，若无虚拟料架号，料架可以用
//有虚拟料架号，从服务器获取此料架剩余任务，若无任务，需要送出料架
if (LastOutParam.rfid.Equals("") && NeedCheckShelf)
{
//只有启动后第一个料架才需要验证
NeedCheckShelf = false;
string tempRfid = "";
string msg = SServerManager.findTempRfid(Name, CurrShelfId, out tempRfid);
if (!String.IsNullOrEmpty(msg))
{
LogUtil.error(Name + "ResetRFID后， findTempRfid 【" + CurrShelfId + "】【" + tempRfid + "】结果：" + msg);
}
if (!String.IsNullOrEmpty(tempRfid))
{
//如果虚拟料架号存在，直接送出料架
SendOutShelfOut("ResetRFID后，料架【" + CurrShelfId + "】【" + tempRfid + "】已绑定，不再使用");
return;
}
}
//定位工位有料架，直接开始入料
MoveInfo.NextMoveStep(LineMoveStep.FO_05_LocationUp);
OutLog("定位工位检测到料架：ResetRFID后， " + MoveInfo.SLog + " 缓冲阻挡下降， 定位气缸上升，读取并缓存料架RFID");
UpdateLastShelfID(CurrShelfId);
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SL_LocationCylinder_Up);
}
else
{
MoveEndS();
OutLog("ResetRFID后， 未检测到料架，料架处理结束");
}
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_05_LocationUp)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_05_LocationUp))
{ {
......
source/DeviceLibrary/assemblymanager/RFIDManagercs.cs
 
using Asa.RFID; using RFID;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
...@@ -16,8 +16,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,8 +16,8 @@ namespace OnlineStore.DeviceLibrary
public class RFIDManager public class RFIDManager
{ {
public static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum); public static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
private static Asa.RFID.ReadAll readHao; private static RFID.ReadAll readHao;
private static Asa.RFID.ReadAll readPu; private static RFID.ReadAll readPu;
private static bool IsOpen = false; private static bool IsOpen = false;
private static ConcurrentDictionary<string, List<RfidCacheInfo>> LastRfidMap = new ConcurrentDictionary<string, List<RfidCacheInfo>>(); private static ConcurrentDictionary<string, List<RfidCacheInfo>> LastRfidMap = new ConcurrentDictionary<string, List<RfidCacheInfo>>();
public static void Open() public static void Open()
...@@ -34,10 +34,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -34,10 +34,10 @@ namespace OnlineStore.DeviceLibrary
port = 13000; port = 13000;
} }
LogUtil.info($"RFID Server Open，HaoBin port={port},PuYue port={port+1}"); LogUtil.info($"RFID Server Open，HaoBin port={port},PuYue port={port+1}");
readHao = new Asa.RFID.ReadAll("TheRFID") { Type = Asa.RFID.DeviceType.HaoBin }; readHao = new RFID.ReadAll("TheRFID") { Type = RFID.DeviceType.HaoBin };
readHao.Received += ReadAll_Received; readHao.Received += ReadAll_Received;
readHao.Start(port); readHao.Start(port);
readPu = new Asa.RFID.ReadAll("TheRFID") { Type = Asa.RFID.DeviceType.PuYue }; readPu = new RFID.ReadAll("TheRFID") { Type = RFID.DeviceType.PuYue };
readPu.Received += ReadAll_Received; readPu.Received += ReadAll_Received;
readPu.Start(port+1); readPu.Start(port+1);
IsOpen = true; IsOpen = true;
...@@ -292,6 +292,37 @@ namespace OnlineStore.DeviceLibrary ...@@ -292,6 +292,37 @@ namespace OnlineStore.DeviceLibrary
return new RFIDData(); return new RFIDData();
} }
public static bool ResetRFID(string ip, out string msg)
{
try
{
if (String.IsNullOrEmpty(ip))
{
msg = "RFID IP 为空";
return false;
}
bool result = readPu.Reset(ip, out msg);
if (result)
{
LogUtil.info("readPu ResetRFID [" + ip + "] 成功");
return true;
}
readHao.Reset(ip, out msg);
if (result)
{
LogUtil.info("readHao ResetRFID [" + ip + "] 成功");
return true;
}
}
catch (Exception ex)
{
msg = "ResetRFID[" + ip + "] 出错：" + ex.ToString();
LogUtil.error("ResetRFID[" + ip + "] 出错：" + ex.ToString());
}
return false;
}
public static void Close() public static void Close()
{ {
try try
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -726,6 +726,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -726,6 +726,12 @@ namespace OnlineStore.DeviceLibrary
[Description("入料_定位工位有料架，进料阻挡上升，缓冲阻挡上升， 等待3秒再次检测")] [Description("入料_定位工位有料架，进料阻挡上升，缓冲阻挡上升， 等待3秒再次检测")]
FI_04_WaitTime , FI_04_WaitTime ,
/// <summary>
/// 入口流水线转动，定位工位有料架，未读到料架号，重启RFID后再次尝试
/// </summary>
[Description("入料_定位工位有料架，未读到料架号，重启RFID后再次尝试")]
FI_041_ResetRFID,
/// <summary> /// <summary>
///入料检测： 工位检测信号，缓冲阻挡上升， 定位气缸上升，读取并缓存料架RFID ///入料检测： 工位检测信号，缓冲阻挡上升， 定位气缸上升，读取并缓存料架RFID
...@@ -973,6 +979,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -973,6 +979,11 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
[Description("出料_料串准备_定位工位检测到料架：进料阻挡上升， 等待3秒再次检测")] [Description("出料_料串准备_定位工位检测到料架：进料阻挡上升， 等待3秒再次检测")]
FO_04_WaitTime , FO_04_WaitTime ,
/// <summary>
/// 定位工位检测到料架，读取RFID失败，重启RFID再读一次
/// </summary>
[Description("出料_料串准备_读取RFID失败，重启RFID再读一次")]
FO_041_ResetRFID,
/// <summary> /// <summary>
///出料检测： 缓冲阻挡下降， 定位气缸上升，读取并缓存料架RFID ///出料检测： 缓冲阻挡下降， 定位气缸上升，读取并缓存料架RFID
...@@ -1010,7 +1021,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1010,7 +1021,7 @@ namespace OnlineStore.DeviceLibrary
/// 紧急出料移栽：上料轴下降指定的高度 /// 紧急出料移栽：上料轴下降指定的高度
/// </summary> /// </summary>
[Description("出料_上料轴下降指定的高度")] [Description("出料_上料轴下降指定的高度")]
FO_211_AxisDownMove = 2211, FO_211_AxisDownMove ,
/// <summary> /// <summary>
/// 紧急出料移栽：上料横移机构到取料端 /// 紧急出料移栽：上料横移机构到取料端
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!