Commit bc45c7da LN

1

1 个父辈 4016eb2b
...@@ -165,7 +165,6 @@ ...@@ -165,7 +165,6 @@
this.btnAxisP = new System.Windows.Forms.Button(); this.btnAxisP = new System.Windows.Forms.Button();
this.btnIO = new System.Windows.Forms.Button(); this.btnIO = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.lblCid = new System.Windows.Forms.Label();
this.btnScanTest = new System.Windows.Forms.Button(); this.btnScanTest = new System.Windows.Forms.Button();
this.cmbShelfPosition = new System.Windows.Forms.ComboBox(); this.cmbShelfPosition = new System.Windows.Forms.ComboBox();
this.groupShelf = new System.Windows.Forms.GroupBox(); this.groupShelf = new System.Windows.Forms.GroupBox();
...@@ -199,11 +198,13 @@ ...@@ -199,11 +198,13 @@
// //
// lblWarnMsg // lblWarnMsg
// //
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(12, 61); this.lblWarnMsg.Location = new System.Drawing.Point(12, 61);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(471, 54); this.lblWarnMsg.Size = new System.Drawing.Size(744, 54);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -256,7 +257,7 @@ ...@@ -256,7 +257,7 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(6, 6); this.groupAxis.Location = new System.Drawing.Point(6, 6);
this.groupAxis.Name = "groupAxis"; this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(529, 351); this.groupAxis.Size = new System.Drawing.Size(558, 351);
this.groupAxis.TabIndex = 216; this.groupAxis.TabIndex = 216;
this.groupAxis.TabStop = false; this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动"; this.groupAxis.Text = "伺服运动";
...@@ -746,7 +747,7 @@ ...@@ -746,7 +747,7 @@
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(6, 368); this.groupBox1.Location = new System.Drawing.Point(6, 368);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(529, 182); this.groupBox1.Size = new System.Drawing.Size(558, 182);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态"; this.groupBox1.Text = "伺服状态";
...@@ -964,9 +965,9 @@ ...@@ -964,9 +965,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(7, 224); this.groupInout.Location = new System.Drawing.Point(7, 201);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(503, 545); this.groupInout.Size = new System.Drawing.Size(503, 562);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -1550,7 +1551,7 @@ ...@@ -1550,7 +1551,7 @@
this.groupBox3.Controls.Add(this.lblMoveEquipInfo); this.groupBox3.Controls.Add(this.lblMoveEquipInfo);
this.groupBox3.Controls.Add(this.lblWarnMsg); this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.lblThisSta); this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(7, 96); this.groupBox3.Location = new System.Drawing.Point(7, 73);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(762, 124); this.groupBox3.Size = new System.Drawing.Size(762, 124);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
...@@ -1573,7 +1574,7 @@ ...@@ -1573,7 +1574,7 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(225, 48); this.chbDebug.Location = new System.Drawing.Point(1243, 10);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(93, 25); this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
...@@ -1588,10 +1589,10 @@ ...@@ -1588,10 +1589,10 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
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(775, 94); this.tabControl1.Location = new System.Drawing.Point(775, 71);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(554, 675); this.tabControl1.Size = new System.Drawing.Size(583, 692);
this.tabControl1.TabIndex = 272; this.tabControl1.TabIndex = 272;
// //
// tabPage1 // tabPage1
...@@ -1601,7 +1602,7 @@ ...@@ -1601,7 +1602,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(546, 642); this.tabPage1.Size = new System.Drawing.Size(575, 659);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 "; this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -1613,7 +1614,7 @@ ...@@ -1613,7 +1614,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(546, 642); this.tabPage2.Size = new System.Drawing.Size(575, 659);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 温湿度 "; this.tabPage2.Text = " 温湿度 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -1963,7 +1964,8 @@ ...@@ -1963,7 +1964,8 @@
// //
// panel1 // panel1
// //
this.panel1.Controls.Add(this.lblCid); this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.btnScanTest); this.panel1.Controls.Add(this.btnScanTest);
this.panel1.Controls.Add(this.btnStoreHome); this.panel1.Controls.Add(this.btnStoreHome);
this.panel1.Controls.Add(this.btnAxisOff); this.panel1.Controls.Add(this.btnAxisOff);
...@@ -1974,22 +1976,11 @@ ...@@ -1974,22 +1976,11 @@
this.panel1.Controls.Add(this.btnStoreStart); this.panel1.Controls.Add(this.btnStoreStart);
this.panel1.Controls.Add(this.btnStoreStop); this.panel1.Controls.Add(this.btnStoreStop);
this.panel1.Controls.Add(this.btnSotreReset); this.panel1.Controls.Add(this.btnSotreReset);
this.panel1.Location = new System.Drawing.Point(7, 2); this.panel1.Location = new System.Drawing.Point(7, 7);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1316, 83); this.panel1.Size = new System.Drawing.Size(1347, 55);
this.panel1.TabIndex = 273; this.panel1.TabIndex = 273;
// //
// lblCid
//
this.lblCid.AutoSize = true;
this.lblCid.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCid.ForeColor = System.Drawing.Color.Blue;
this.lblCid.Location = new System.Drawing.Point(23, 54);
this.lblCid.Name = "lblCid";
this.lblCid.Size = new System.Drawing.Size(34, 19);
this.lblCid.TabIndex = 273;
this.lblCid.Text = "CID";
//
// btnScanTest // btnScanTest
// //
this.btnScanTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnScanTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -2026,9 +2017,9 @@ ...@@ -2026,9 +2017,9 @@
this.groupShelf.Controls.Add(this.btnUpdownPA2); this.groupShelf.Controls.Add(this.btnUpdownPA2);
this.groupShelf.Controls.Add(this.cmbShelfPosition); this.groupShelf.Controls.Add(this.cmbShelfPosition);
this.groupShelf.Enabled = false; this.groupShelf.Enabled = false;
this.groupShelf.Location = new System.Drawing.Point(517, 224); this.groupShelf.Location = new System.Drawing.Point(517, 201);
this.groupShelf.Name = "groupShelf"; this.groupShelf.Name = "groupShelf";
this.groupShelf.Size = new System.Drawing.Size(252, 545); this.groupShelf.Size = new System.Drawing.Size(252, 562);
this.groupShelf.TabIndex = 274; this.groupShelf.TabIndex = 274;
this.groupShelf.TabStop = false; this.groupShelf.TabStop = false;
this.groupShelf.Text = "料架位置"; this.groupShelf.Text = "料架位置";
...@@ -2096,7 +2087,7 @@ ...@@ -2096,7 +2087,7 @@
this.txtMPA.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMPA.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMPA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMPA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMPA.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMPA.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMPA.Location = new System.Drawing.Point(136, 135); this.txtMPA.Location = new System.Drawing.Point(136, 244);
this.txtMPA.MaxLength = 0; this.txtMPA.MaxLength = 0;
this.txtMPA.Name = "txtMPA"; this.txtMPA.Name = "txtMPA";
this.txtMPA.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMPA.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -2112,7 +2103,7 @@ ...@@ -2112,7 +2103,7 @@
this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button5.Location = new System.Drawing.Point(19, 130); this.button5.Location = new System.Drawing.Point(18, 239);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button5.Size = new System.Drawing.Size(114, 33); this.button5.Size = new System.Drawing.Size(114, 33);
...@@ -2128,7 +2119,7 @@ ...@@ -2128,7 +2119,7 @@
this.txtUpdownPA1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownPA1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownPA1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownPA1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownPA1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownPA1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownPA1.Location = new System.Drawing.Point(137, 188); this.txtUpdownPA1.Location = new System.Drawing.Point(136, 144);
this.txtUpdownPA1.MaxLength = 0; this.txtUpdownPA1.MaxLength = 0;
this.txtUpdownPA1.Name = "txtUpdownPA1"; this.txtUpdownPA1.Name = "txtUpdownPA1";
this.txtUpdownPA1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownPA1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -2143,7 +2134,7 @@ ...@@ -2143,7 +2134,7 @@
this.txtUpdownPA2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownPA2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownPA2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownPA2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownPA2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownPA2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownPA2.Location = new System.Drawing.Point(137, 241); this.txtUpdownPA2.Location = new System.Drawing.Point(136, 194);
this.txtUpdownPA2.MaxLength = 0; this.txtUpdownPA2.MaxLength = 0;
this.txtUpdownPA2.Name = "txtUpdownPA2"; this.txtUpdownPA2.Name = "txtUpdownPA2";
this.txtUpdownPA2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownPA2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -2158,7 +2149,7 @@ ...@@ -2158,7 +2149,7 @@
this.btnUpdownPA1.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpdownPA1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownPA1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownPA1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownPA1.ForeColor = System.Drawing.Color.Red; this.btnUpdownPA1.ForeColor = System.Drawing.Color.Red;
this.btnUpdownPA1.Location = new System.Drawing.Point(19, 183); this.btnUpdownPA1.Location = new System.Drawing.Point(18, 139);
this.btnUpdownPA1.Name = "btnUpdownPA1"; this.btnUpdownPA1.Name = "btnUpdownPA1";
this.btnUpdownPA1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownPA1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownPA1.Size = new System.Drawing.Size(114, 33); this.btnUpdownPA1.Size = new System.Drawing.Size(114, 33);
...@@ -2174,7 +2165,7 @@ ...@@ -2174,7 +2165,7 @@
this.btnUpdownPA2.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpdownPA2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownPA2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownPA2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownPA2.ForeColor = System.Drawing.Color.Red; this.btnUpdownPA2.ForeColor = System.Drawing.Color.Red;
this.btnUpdownPA2.Location = new System.Drawing.Point(19, 236); this.btnUpdownPA2.Location = new System.Drawing.Point(18, 189);
this.btnUpdownPA2.Name = "btnUpdownPA2"; this.btnUpdownPA2.Name = "btnUpdownPA2";
this.btnUpdownPA2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownPA2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownPA2.Size = new System.Drawing.Size(114, 33); this.btnUpdownPA2.Size = new System.Drawing.Size(114, 33);
...@@ -2187,7 +2178,7 @@ ...@@ -2187,7 +2178,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1335, 775); this.ClientSize = new System.Drawing.Size(1364, 775);
this.Controls.Add(this.groupShelf); this.Controls.Add(this.groupShelf);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
...@@ -2367,7 +2358,6 @@ ...@@ -2367,7 +2358,6 @@
private System.Windows.Forms.Label lblMoveEquipInfo; private System.Windows.Forms.Label lblMoveEquipInfo;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button btnScanTest; private System.Windows.Forms.Button btnScanTest;
private System.Windows.Forms.Label lblCid;
private System.Windows.Forms.ComboBox cmbShelfPosition; private System.Windows.Forms.ComboBox cmbShelfPosition;
private System.Windows.Forms.GroupBox groupShelf; private System.Windows.Forms.GroupBox groupShelf;
public System.Windows.Forms.TextBox txtInoutPA; public System.Windows.Forms.TextBox txtInoutPA;
......
...@@ -46,7 +46,7 @@ namespace OnlineStore.ACPackingStore ...@@ -46,7 +46,7 @@ namespace OnlineStore.ACPackingStore
this.Close(); this.Close();
return; return;
} }
this.lblCid.Text = BoxBean.CID; this.groupBox3.Text ="设备["+ BoxBean.CID+"]状态";
this.Text = BoxBean.Name; this.Text = BoxBean.Name;
//txtSpeed.Text = BoxBean.Config.CompressAxis_EndSpeed.ToString(); //txtSpeed.Text = BoxBean.Config.CompressAxis_EndSpeed.ToString();
cmbAxisList.DataSource = new List<ConfigMoveAxis>(BoxBean.moveAxisList); cmbAxisList.DataSource = new List<ConfigMoveAxis>(BoxBean.moveAxisList);
......
...@@ -18,6 +18,14 @@ ...@@ -18,6 +18,14 @@
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnStopMove = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.btnCamerLed = new System.Windows.Forms.Button();
this.btnTopDown = new System.Windows.Forms.Button();
this.btnTopUp = new System.Windows.Forms.Button();
this.btnNGDoorDown = new System.Windows.Forms.Button();
this.btnNGDoorUp = new System.Windows.Forms.Button();
this.txtSlaveId = new System.Windows.Forms.TextBox();
this.btnOpenDo = new System.Windows.Forms.Button(); this.btnOpenDo = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
...@@ -39,14 +47,8 @@ ...@@ -39,14 +47,8 @@
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.txtSlaveId = new System.Windows.Forms.TextBox(); this.btnStoreOn = new System.Windows.Forms.Button();
this.btnNGDoorDown = new System.Windows.Forms.Button(); this.btnBlow = new System.Windows.Forms.Button();
this.btnNGDoorUp = new System.Windows.Forms.Button();
this.btnTopDown = new System.Windows.Forms.Button();
this.btnTopUp = new System.Windows.Forms.Button();
this.btnCamerLed = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.btnStopMove = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -61,6 +63,8 @@ ...@@ -61,6 +63,8 @@
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox1.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.groupBox1.Controls.Add(this.btnBlow);
this.groupBox1.Controls.Add(this.btnStoreOn);
this.groupBox1.Controls.Add(this.btnStopMove); this.groupBox1.Controls.Add(this.btnStopMove);
this.groupBox1.Controls.Add(this.button4); this.groupBox1.Controls.Add(this.button4);
this.groupBox1.Controls.Add(this.btnCamerLed); this.groupBox1.Controls.Add(this.btnCamerLed);
...@@ -87,11 +91,106 @@ ...@@ -87,11 +91,106 @@
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(485, 12); this.groupBox1.Location = new System.Drawing.Point(485, 12);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(332, 496); this.groupBox1.Size = new System.Drawing.Size(332, 517);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
// //
// btnStopMove
//
this.btnStopMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStopMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopMove.Location = new System.Drawing.Point(175, 423);
this.btnStopMove.Name = "btnStopMove";
this.btnStopMove.Size = new System.Drawing.Size(125, 34);
this.btnStopMove.TabIndex = 292;
this.btnStopMove.Text = "线体停止转动";
this.btnStopMove.UseVisualStyleBackColor = false;
this.btnStopMove.Click += new System.EventHandler(this.btnStopMove_Click);
//
// button4
//
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(41, 423);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(125, 34);
this.button4.TabIndex = 291;
this.button4.Text = "线体正转";
this.button4.UseVisualStyleBackColor = false;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// btnCamerLed
//
this.btnCamerLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamerLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamerLed.Location = new System.Drawing.Point(41, 469);
this.btnCamerLed.Name = "btnCamerLed";
this.btnCamerLed.Size = new System.Drawing.Size(125, 34);
this.btnCamerLed.TabIndex = 290;
this.btnCamerLed.Text = "打开光源";
this.btnCamerLed.UseVisualStyleBackColor = false;
this.btnCamerLed.Click += new System.EventHandler(this.btnCamerLed_Click);
//
// btnTopDown
//
this.btnTopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopDown.Location = new System.Drawing.Point(175, 279);
this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(125, 34);
this.btnTopDown.TabIndex = 289;
this.btnTopDown.Text = "顶升装置下降";
this.btnTopDown.UseVisualStyleBackColor = false;
this.btnTopDown.Click += new System.EventHandler(this.btnTopDown_Click);
//
// btnTopUp
//
this.btnTopUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopUp.Location = new System.Drawing.Point(41, 279);
this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(125, 34);
this.btnTopUp.TabIndex = 288;
this.btnTopUp.Text = "顶升装置上升";
this.btnTopUp.UseVisualStyleBackColor = false;
this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click);
//
// btnNGDoorDown
//
this.btnNGDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNGDoorDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNGDoorDown.Location = new System.Drawing.Point(175, 231);
this.btnNGDoorDown.Name = "btnNGDoorDown";
this.btnNGDoorDown.Size = new System.Drawing.Size(125, 34);
this.btnNGDoorDown.TabIndex = 287;
this.btnNGDoorDown.Text = "NG料口门下降";
this.btnNGDoorDown.UseVisualStyleBackColor = false;
this.btnNGDoorDown.Click += new System.EventHandler(this.btnNGDoorDown_Click);
//
// btnNGDoorUp
//
this.btnNGDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNGDoorUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNGDoorUp.Location = new System.Drawing.Point(41, 231);
this.btnNGDoorUp.Name = "btnNGDoorUp";
this.btnNGDoorUp.Size = new System.Drawing.Size(125, 34);
this.btnNGDoorUp.TabIndex = 286;
this.btnNGDoorUp.Text = "NG料口门上升";
this.btnNGDoorUp.UseVisualStyleBackColor = false;
this.btnNGDoorUp.Click += new System.EventHandler(this.btnNGDoorUp_Click);
//
// txtSlaveId
//
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(6, 108);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(43, 23);
this.txtSlaveId.TabIndex = 283;
this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false;
//
// btnOpenDo // btnOpenDo
// //
this.btnOpenDo.BackColor = System.Drawing.Color.White; this.btnOpenDo.BackColor = System.Drawing.Color.White;
...@@ -349,100 +448,29 @@ ...@@ -349,100 +448,29 @@
this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 570); this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 570);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// txtSlaveId // btnStoreOn
// //
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStoreOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.txtSlaveId.Location = new System.Drawing.Point(6, 108); this.btnStoreOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.MaxLength = 10; this.btnStoreOn.Location = new System.Drawing.Point(175, 375);
this.txtSlaveId.Name = "txtSlaveId"; this.btnStoreOn.Name = "btnStoreOn";
this.txtSlaveId.Size = new System.Drawing.Size(43, 23); this.btnStoreOn.Size = new System.Drawing.Size(125, 34);
this.txtSlaveId.TabIndex = 283; this.btnStoreOn.TabIndex = 293;
this.txtSlaveId.Text = "0"; this.btnStoreOn.Text = "料仓运转ON";
this.txtSlaveId.Visible = false; this.btnStoreOn.UseVisualStyleBackColor = false;
// this.btnStoreOn.Click += new System.EventHandler(this.btnStoreOn_Click);
// btnNGDoorDown //
// // btnBlow
this.btnNGDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; //
this.btnNGDoorDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBlow.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNGDoorDown.Location = new System.Drawing.Point(175, 231); this.btnBlow.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNGDoorDown.Name = "btnNGDoorDown"; this.btnBlow.Location = new System.Drawing.Point(175, 469);
this.btnNGDoorDown.Size = new System.Drawing.Size(125, 34); this.btnBlow.Name = "btnBlow";
this.btnNGDoorDown.TabIndex = 287; this.btnBlow.Size = new System.Drawing.Size(125, 34);
this.btnNGDoorDown.Text = "NG料口门下降"; this.btnBlow.TabIndex = 294;
this.btnNGDoorDown.UseVisualStyleBackColor = false; this.btnBlow.Text = "开始吹气";
this.btnNGDoorDown.Click += new System.EventHandler(this.btnNGDoorDown_Click); this.btnBlow.UseVisualStyleBackColor = false;
// this.btnBlow.Click += new System.EventHandler(this.btnBlow_Click);
// btnNGDoorUp
//
this.btnNGDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNGDoorUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNGDoorUp.Location = new System.Drawing.Point(41, 231);
this.btnNGDoorUp.Name = "btnNGDoorUp";
this.btnNGDoorUp.Size = new System.Drawing.Size(125, 34);
this.btnNGDoorUp.TabIndex = 286;
this.btnNGDoorUp.Text = "NG料口门上升";
this.btnNGDoorUp.UseVisualStyleBackColor = false;
this.btnNGDoorUp.Click += new System.EventHandler(this.btnNGDoorUp_Click);
//
// btnTopDown
//
this.btnTopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopDown.Location = new System.Drawing.Point(175, 279);
this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(125, 34);
this.btnTopDown.TabIndex = 289;
this.btnTopDown.Text = "顶升装置下降";
this.btnTopDown.UseVisualStyleBackColor = false;
this.btnTopDown.Click += new System.EventHandler(this.btnTopDown_Click);
//
// btnTopUp
//
this.btnTopUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopUp.Location = new System.Drawing.Point(41, 279);
this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(125, 34);
this.btnTopUp.TabIndex = 288;
this.btnTopUp.Text = "顶升装置上升";
this.btnTopUp.UseVisualStyleBackColor = false;
this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click);
//
// btnCamerLed
//
this.btnCamerLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamerLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamerLed.Location = new System.Drawing.Point(175, 375);
this.btnCamerLed.Name = "btnCamerLed";
this.btnCamerLed.Size = new System.Drawing.Size(125, 34);
this.btnCamerLed.TabIndex = 290;
this.btnCamerLed.Text = "打开光源";
this.btnCamerLed.UseVisualStyleBackColor = false;
this.btnCamerLed.Click += new System.EventHandler(this.btnCamerLed_Click);
//
// button4
//
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(41, 423);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(125, 34);
this.button4.TabIndex = 291;
this.button4.Text = "线体正转";
this.button4.UseVisualStyleBackColor = false;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// btnStopMove
//
this.btnStopMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStopMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopMove.Location = new System.Drawing.Point(175, 423);
this.btnStopMove.Name = "btnStopMove";
this.btnStopMove.Size = new System.Drawing.Size(125, 34);
this.btnStopMove.TabIndex = 292;
this.btnStopMove.Text = "线体停止转动";
this.btnStopMove.UseVisualStyleBackColor = false;
this.btnStopMove.Click += new System.EventHandler(this.btnStopMove_Click);
// //
// FrmIOStatus // FrmIOStatus
// //
...@@ -503,6 +531,8 @@ ...@@ -503,6 +531,8 @@
private System.Windows.Forms.Button btnStopMove; private System.Windows.Forms.Button btnStopMove;
private System.Windows.Forms.Button button4; private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button btnCamerLed; private System.Windows.Forms.Button btnCamerLed;
private System.Windows.Forms.Button btnStoreOn;
private System.Windows.Forms.Button btnBlow;
} }
} }
...@@ -312,5 +312,15 @@ namespace OnlineStore.ACPackingStore ...@@ -312,5 +312,15 @@ namespace OnlineStore.ACPackingStore
boxBean.IOMove(IO_Type.Line_Run, IO_VALUE.LOW); boxBean.IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
boxBean.IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW); boxBean.IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
} }
private void btnStoreOn_Click(object sender, EventArgs e)
{
BtnMove(btnStoreOn, "料仓运转ON", "料仓运转OFF", IO_Type.Run_Signal);
}
private void btnBlow_Click(object sender, EventArgs e)
{
BtnMove(btnBlow, "开始吹气", "停止吹气", IO_Type.StartOrStopBlow);
}
} }
} }
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!