Skip to content

李娜 / SO827-AssemblyLine

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

夹爪增加复位和错误码展示功能。

1 个父辈 4ee510c8
内嵌 并排
正在显示 8 个修改的文件 包含 137 行增加 和 89 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
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(320, 242); this.btnCloseAll.Location = new System.Drawing.Point(320, 231);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(140, 34); this.btnCloseAll.Size = new System.Drawing.Size(140, 34);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
this.groupDO.Controls.Add(this.SL_MoveCylinder_Take); this.groupDO.Controls.Add(this.SL_MoveCylinder_Take);
this.groupDO.Location = new System.Drawing.Point(468, 119); this.groupDO.Location = new System.Drawing.Point(468, 119);
this.groupDO.Name = "groupDO"; this.groupDO.Name = "groupDO";
this.groupDO.Size = new System.Drawing.Size(501, 300); this.groupDO.Size = new System.Drawing.Size(501, 274);
this.groupDO.TabIndex = 255; this.groupDO.TabIndex = 255;
this.groupDO.TabStop = false; this.groupDO.TabStop = false;
this.groupDO.Text = "IO操作测试"; this.groupDO.Text = "IO操作测试";
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
this.SL_MoveCylinder_Give.BackColor = System.Drawing.Color.White; this.SL_MoveCylinder_Give.BackColor = System.Drawing.Color.White;
this.SL_MoveCylinder_Give.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_MoveCylinder_Give.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_MoveCylinder_Give.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_MoveCylinder_Give.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_MoveCylinder_Give.Location = new System.Drawing.Point(169, 242); this.SL_MoveCylinder_Give.Location = new System.Drawing.Point(169, 231);
this.SL_MoveCylinder_Give.Name = "SL_MoveCylinder_Give"; this.SL_MoveCylinder_Give.Name = "SL_MoveCylinder_Give";
this.SL_MoveCylinder_Give.Size = new System.Drawing.Size(140, 34); this.SL_MoveCylinder_Give.Size = new System.Drawing.Size(140, 34);
this.SL_MoveCylinder_Give.TabIndex = 279; this.SL_MoveCylinder_Give.TabIndex = 279;
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
this.SL_LocationCylinder_Down.BackColor = System.Drawing.Color.White; this.SL_LocationCylinder_Down.BackColor = System.Drawing.Color.White;
this.SL_LocationCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_LocationCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_LocationCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_LocationCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_LocationCylinder_Down.Location = new System.Drawing.Point(320, 190); this.SL_LocationCylinder_Down.Location = new System.Drawing.Point(320, 186);
this.SL_LocationCylinder_Down.Name = "SL_LocationCylinder_Down"; this.SL_LocationCylinder_Down.Name = "SL_LocationCylinder_Down";
this.SL_LocationCylinder_Down.Size = new System.Drawing.Size(140, 34); this.SL_LocationCylinder_Down.Size = new System.Drawing.Size(140, 34);
this.SL_LocationCylinder_Down.TabIndex = 278; this.SL_LocationCylinder_Down.TabIndex = 278;
...@@ -442,7 +442,7 @@ ...@@ -442,7 +442,7 @@
this.SL_FixedCylinder_Down.BackColor = System.Drawing.Color.White; this.SL_FixedCylinder_Down.BackColor = System.Drawing.Color.White;
this.SL_FixedCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_FixedCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_FixedCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_FixedCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_FixedCylinder_Down.Location = new System.Drawing.Point(169, 190); this.SL_FixedCylinder_Down.Location = new System.Drawing.Point(169, 186);
this.SL_FixedCylinder_Down.Name = "SL_FixedCylinder_Down"; this.SL_FixedCylinder_Down.Name = "SL_FixedCylinder_Down";
this.SL_FixedCylinder_Down.Size = new System.Drawing.Size(140, 34); this.SL_FixedCylinder_Down.Size = new System.Drawing.Size(140, 34);
this.SL_FixedCylinder_Down.TabIndex = 277; this.SL_FixedCylinder_Down.TabIndex = 277;
...@@ -455,7 +455,7 @@ ...@@ -455,7 +455,7 @@
this.SL_TopCylinder_Down.BackColor = System.Drawing.Color.White; this.SL_TopCylinder_Down.BackColor = System.Drawing.Color.White;
this.SL_TopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_TopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_TopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_TopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TopCylinder_Down.Location = new System.Drawing.Point(17, 190); this.SL_TopCylinder_Down.Location = new System.Drawing.Point(17, 186);
this.SL_TopCylinder_Down.Name = "SL_TopCylinder_Down"; this.SL_TopCylinder_Down.Name = "SL_TopCylinder_Down";
this.SL_TopCylinder_Down.Size = new System.Drawing.Size(140, 34); this.SL_TopCylinder_Down.Size = new System.Drawing.Size(140, 34);
this.SL_TopCylinder_Down.TabIndex = 276; this.SL_TopCylinder_Down.TabIndex = 276;
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
this.SL_TopCylinder_Up.BackColor = System.Drawing.Color.White; this.SL_TopCylinder_Up.BackColor = System.Drawing.Color.White;
this.SL_TopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_TopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_TopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_TopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TopCylinder_Up.Location = new System.Drawing.Point(17, 150); this.SL_TopCylinder_Up.Location = new System.Drawing.Point(17, 146);
this.SL_TopCylinder_Up.Name = "SL_TopCylinder_Up"; this.SL_TopCylinder_Up.Name = "SL_TopCylinder_Up";
this.SL_TopCylinder_Up.Size = new System.Drawing.Size(140, 34); this.SL_TopCylinder_Up.Size = new System.Drawing.Size(140, 34);
this.SL_TopCylinder_Up.TabIndex = 274; this.SL_TopCylinder_Up.TabIndex = 274;
...@@ -481,7 +481,7 @@ ...@@ -481,7 +481,7 @@
this.SL_FixedCylinder_Up.BackColor = System.Drawing.Color.White; this.SL_FixedCylinder_Up.BackColor = System.Drawing.Color.White;
this.SL_FixedCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_FixedCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_FixedCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_FixedCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_FixedCylinder_Up.Location = new System.Drawing.Point(169, 150); this.SL_FixedCylinder_Up.Location = new System.Drawing.Point(169, 146);
this.SL_FixedCylinder_Up.Name = "SL_FixedCylinder_Up"; this.SL_FixedCylinder_Up.Name = "SL_FixedCylinder_Up";
this.SL_FixedCylinder_Up.Size = new System.Drawing.Size(140, 34); this.SL_FixedCylinder_Up.Size = new System.Drawing.Size(140, 34);
this.SL_FixedCylinder_Up.TabIndex = 273; this.SL_FixedCylinder_Up.TabIndex = 273;
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
this.SL_LocationCylinder_Up.BackColor = System.Drawing.Color.White; this.SL_LocationCylinder_Up.BackColor = System.Drawing.Color.White;
this.SL_LocationCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_LocationCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_LocationCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_LocationCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_LocationCylinder_Up.Location = new System.Drawing.Point(320, 150); this.SL_LocationCylinder_Up.Location = new System.Drawing.Point(320, 146);
this.SL_LocationCylinder_Up.Name = "SL_LocationCylinder_Up"; this.SL_LocationCylinder_Up.Name = "SL_LocationCylinder_Up";
this.SL_LocationCylinder_Up.Size = new System.Drawing.Size(140, 34); this.SL_LocationCylinder_Up.Size = new System.Drawing.Size(140, 34);
this.SL_LocationCylinder_Up.TabIndex = 256; this.SL_LocationCylinder_Up.TabIndex = 256;
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
this.SL_MoveCylinder_Take.BackColor = System.Drawing.Color.White; this.SL_MoveCylinder_Take.BackColor = System.Drawing.Color.White;
this.SL_MoveCylinder_Take.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.SL_MoveCylinder_Take.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_MoveCylinder_Take.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.SL_MoveCylinder_Take.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_MoveCylinder_Take.Location = new System.Drawing.Point(17, 242); this.SL_MoveCylinder_Take.Location = new System.Drawing.Point(17, 231);
this.SL_MoveCylinder_Take.Name = "SL_MoveCylinder_Take"; this.SL_MoveCylinder_Take.Name = "SL_MoveCylinder_Take";
this.SL_MoveCylinder_Take.Size = new System.Drawing.Size(140, 34); this.SL_MoveCylinder_Take.Size = new System.Drawing.Size(140, 34);
this.SL_MoveCylinder_Take.TabIndex = 252; this.SL_MoveCylinder_Take.TabIndex = 252;
...@@ -747,9 +747,9 @@ ...@@ -747,9 +747,9 @@
// //
// clampJawControl1 // clampJawControl1
// //
this.clampJawControl1.Location = new System.Drawing.Point(462, 422); this.clampJawControl1.Location = new System.Drawing.Point(464, 395);
this.clampJawControl1.Name = "clampJawControl1"; this.clampJawControl1.Name = "clampJawControl1";
this.clampJawControl1.Size = new System.Drawing.Size(507, 167); this.clampJawControl1.Size = new System.Drawing.Size(507, 208);
this.clampJawControl1.TabIndex = 280; this.clampJawControl1.TabIndex = 280;
// //
// tabPage2 // tabPage2
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox5 = new System.Windows.Forms.GroupBox();
this.label7 = new System.Windows.Forms.Label();
this.txtPosId = new System.Windows.Forms.TextBox(); this.txtPosId = new System.Windows.Forms.TextBox();
this.btnClear = new System.Windows.Forms.Button(); this.btnClear = new System.Windows.Forms.Button();
this.clampJawControl1 = new OnlineStore.AssemblyLine.useControl.ClampJawControl(); this.clampJawControl1 = new OnlineStore.AssemblyLine.useControl.ClampJawControl();
...@@ -163,7 +162,7 @@ ...@@ -163,7 +162,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(414, 187); this.groupBox1.Location = new System.Drawing.Point(414, 187);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(269, 148); this.groupBox1.Size = new System.Drawing.Size(286, 148);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
...@@ -360,7 +359,7 @@ ...@@ -360,7 +359,7 @@
this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before); this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before);
this.groupDO.Controls.Add(this.TopCylinder_Up); this.groupDO.Controls.Add(this.TopCylinder_Up);
this.groupDO.Controls.Add(this.UpDownCylinder_Up); this.groupDO.Controls.Add(this.UpDownCylinder_Up);
this.groupDO.Location = new System.Drawing.Point(414, 338); this.groupDO.Location = new System.Drawing.Point(414, 402);
this.groupDO.Name = "groupDO"; this.groupDO.Name = "groupDO";
this.groupDO.Size = new System.Drawing.Size(556, 111); this.groupDO.Size = new System.Drawing.Size(556, 111);
this.groupDO.TabIndex = 255; this.groupDO.TabIndex = 255;
...@@ -519,28 +518,18 @@ ...@@ -519,28 +518,18 @@
// //
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.label7);
this.groupBox5.Controls.Add(this.txtPosId); this.groupBox5.Controls.Add(this.txtPosId);
this.groupBox5.Controls.Add(this.btnClear); this.groupBox5.Controls.Add(this.btnClear);
this.groupBox5.Location = new System.Drawing.Point(414, 451); this.groupBox5.Location = new System.Drawing.Point(414, 337);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(407, 61); this.groupBox5.Size = new System.Drawing.Size(286, 61);
this.groupBox5.TabIndex = 280; this.groupBox5.TabIndex = 280;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
// //
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(14, 28);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(47, 17);
this.label7.TabIndex = 284;
this.label7.Text = "库位号:";
//
// txtPosId // txtPosId
// //
this.txtPosId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtPosId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosId.Location = new System.Drawing.Point(72, 23); this.txtPosId.Location = new System.Drawing.Point(5, 23);
this.txtPosId.Name = "txtPosId"; this.txtPosId.Name = "txtPosId";
this.txtPosId.Size = new System.Drawing.Size(150, 26); this.txtPosId.Size = new System.Drawing.Size(150, 26);
this.txtPosId.TabIndex = 283; this.txtPosId.TabIndex = 283;
...@@ -549,7 +538,7 @@ ...@@ -549,7 +538,7 @@
// //
this.btnClear.BackColor = System.Drawing.Color.White; this.btnClear.BackColor = System.Drawing.Color.White;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.Location = new System.Drawing.Point(233, 19); this.btnClear.Location = new System.Drawing.Point(166, 19);
this.btnClear.Name = "btnClear"; this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 35); this.btnClear.Size = new System.Drawing.Size(105, 35);
this.btnClear.TabIndex = 286; this.btnClear.TabIndex = 286;
...@@ -559,9 +548,9 @@ ...@@ -559,9 +548,9 @@
// //
// clampJawControl1 // clampJawControl1
// //
this.clampJawControl1.Location = new System.Drawing.Point(686, 182); this.clampJawControl1.Location = new System.Drawing.Point(703, 182);
this.clampJawControl1.Name = "clampJawControl1"; this.clampJawControl1.Name = "clampJawControl1";
this.clampJawControl1.Size = new System.Drawing.Size(291, 157); this.clampJawControl1.Size = new System.Drawing.Size(274, 220);
this.clampJawControl1.TabIndex = 279; this.clampJawControl1.TabIndex = 279;
// //
// groupBox6 // groupBox6
...@@ -1142,7 +1131,6 @@ ...@@ -1142,7 +1131,6 @@
private System.Windows.Forms.Label lblP3List; private System.Windows.Forms.Label lblP3List;
private useControl.ClampJawControl clampJawControl1; private useControl.ClampJawControl clampJawControl1;
private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtPosId; private System.Windows.Forms.TextBox txtPosId;
private System.Windows.Forms.Button btnClear; private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.GroupBox groupBox7; private System.Windows.Forms.GroupBox groupBox7;
......
source/AssemblyLineClient/useControl/ClampJawControl.Designer.cs
...@@ -30,14 +30,16 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -30,14 +30,16 @@ namespace OnlineStore.AssemblyLine.useControl
private void InitializeComponent() private void InitializeComponent()
{ {
this.groupClamp = new System.Windows.Forms.GroupBox(); this.groupClamp = new System.Windows.Forms.GroupBox();
this.lblEmpty = new System.Windows.Forms.Label();
this.btnHome = new System.Windows.Forms.Button();
this.lblMoveOk = new System.Windows.Forms.Label();
this.lblPosition = new System.Windows.Forms.Label();
this.lblForce = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btnClampWork = new System.Windows.Forms.Button(); this.btnClampWork = new System.Windows.Forms.Button();
this.btnClampRelax = new System.Windows.Forms.Button(); this.btnClampRelax = new System.Windows.Forms.Button();
this.lblForce = new System.Windows.Forms.Label(); this.lblErrorCode = new System.Windows.Forms.Label();
this.lblPosition = new System.Windows.Forms.Label(); this.btnReset = new System.Windows.Forms.Button();
this.lblMoveOk = new System.Windows.Forms.Label();
this.btnHome = new System.Windows.Forms.Button();
this.lblEmpty = new System.Windows.Forms.Label();
this.groupClamp.SuspendLayout(); this.groupClamp.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -46,6 +48,8 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -46,6 +48,8 @@ namespace OnlineStore.AssemblyLine.useControl
this.groupClamp.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupClamp.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.groupClamp.Controls.Add(this.btnReset);
this.groupClamp.Controls.Add(this.lblErrorCode);
this.groupClamp.Controls.Add(this.lblEmpty); this.groupClamp.Controls.Add(this.lblEmpty);
this.groupClamp.Controls.Add(this.btnHome); this.groupClamp.Controls.Add(this.btnHome);
this.groupClamp.Controls.Add(this.lblMoveOk); this.groupClamp.Controls.Add(this.lblMoveOk);
...@@ -57,16 +61,65 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -57,16 +61,65 @@ namespace OnlineStore.AssemblyLine.useControl
this.groupClamp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupClamp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupClamp.Location = new System.Drawing.Point(7, 4); this.groupClamp.Location = new System.Drawing.Point(7, 4);
this.groupClamp.Name = "groupClamp"; this.groupClamp.Name = "groupClamp";
this.groupClamp.Size = new System.Drawing.Size(266, 146); this.groupClamp.Size = new System.Drawing.Size(272, 182);
this.groupClamp.TabIndex = 283; this.groupClamp.TabIndex = 283;
this.groupClamp.TabStop = false; this.groupClamp.TabStop = false;
this.groupClamp.Text = "夹爪操作"; this.groupClamp.Text = "夹爪操作";
// //
// lblEmpty
//
this.lblEmpty.AutoSize = true;
this.lblEmpty.Location = new System.Drawing.Point(159, 71);
this.lblEmpty.Name = "lblEmpty";
this.lblEmpty.Size = new System.Drawing.Size(44, 17);
this.lblEmpty.TabIndex = 290;
this.lblEmpty.Text = "有料？";
//
// btnHome
//
this.btnHome.BackColor = System.Drawing.Color.White;
this.btnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHome.Location = new System.Drawing.Point(18, 24);
this.btnHome.Name = "btnHome";
this.btnHome.Size = new System.Drawing.Size(120, 34);
this.btnHome.TabIndex = 289;
this.btnHome.Text = "夹爪回原点";
this.btnHome.UseVisualStyleBackColor = false;
this.btnHome.Click += new System.EventHandler(this.btnHome_Click);
//
// lblMoveOk
//
this.lblMoveOk.AutoSize = true;
this.lblMoveOk.Location = new System.Drawing.Point(159, 97);
this.lblMoveOk.Name = "lblMoveOk";
this.lblMoveOk.Size = new System.Drawing.Size(68, 17);
this.lblMoveOk.TabIndex = 288;
this.lblMoveOk.Text = "运动到位？";
//
// lblPosition
//
this.lblPosition.AutoSize = true;
this.lblPosition.Location = new System.Drawing.Point(159, 45);
this.lblPosition.Name = "lblPosition";
this.lblPosition.Size = new System.Drawing.Size(68, 17);
this.lblPosition.TabIndex = 287;
this.lblPosition.Text = "实时位置：";
//
// lblForce
//
this.lblForce.AutoSize = true;
this.lblForce.Location = new System.Drawing.Point(159, 19);
this.lblForce.Name = "lblForce";
this.lblForce.Size = new System.Drawing.Size(68, 17);
this.lblForce.TabIndex = 286;
this.lblForce.Text = "实时出力：";
//
// linkLabel1 // linkLabel1
// //
this.linkLabel1.AutoSize = true; this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.linkLabel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.linkLabel1.Location = new System.Drawing.Point(159, 115); this.linkLabel1.Location = new System.Drawing.Point(159, 149);
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(37, 20); this.linkLabel1.Size = new System.Drawing.Size(37, 20);
this.linkLabel1.TabIndex = 285; this.linkLabel1.TabIndex = 285;
...@@ -79,7 +132,7 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -79,7 +132,7 @@ namespace OnlineStore.AssemblyLine.useControl
this.btnClampWork.BackColor = System.Drawing.Color.White; this.btnClampWork.BackColor = System.Drawing.Color.White;
this.btnClampWork.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampWork.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampWork.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampWork.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampWork.Location = new System.Drawing.Point(18, 104); this.btnClampWork.Location = new System.Drawing.Point(18, 102);
this.btnClampWork.Name = "btnClampWork"; this.btnClampWork.Name = "btnClampWork";
this.btnClampWork.Size = new System.Drawing.Size(120, 34); this.btnClampWork.Size = new System.Drawing.Size(120, 34);
this.btnClampWork.TabIndex = 282; this.btnClampWork.TabIndex = 282;
...@@ -92,7 +145,7 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -92,7 +145,7 @@ namespace OnlineStore.AssemblyLine.useControl
this.btnClampRelax.BackColor = System.Drawing.Color.White; this.btnClampRelax.BackColor = System.Drawing.Color.White;
this.btnClampRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampRelax.Location = new System.Drawing.Point(18, 64); this.btnClampRelax.Location = new System.Drawing.Point(18, 63);
this.btnClampRelax.Name = "btnClampRelax"; this.btnClampRelax.Name = "btnClampRelax";
this.btnClampRelax.Size = new System.Drawing.Size(120, 34); this.btnClampRelax.Size = new System.Drawing.Size(120, 34);
this.btnClampRelax.TabIndex = 281; this.btnClampRelax.TabIndex = 281;
...@@ -100,61 +153,34 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -100,61 +153,34 @@ namespace OnlineStore.AssemblyLine.useControl
this.btnClampRelax.UseVisualStyleBackColor = false; this.btnClampRelax.UseVisualStyleBackColor = false;
this.btnClampRelax.Click += new System.EventHandler(this.btnClampRelax_Click); this.btnClampRelax.Click += new System.EventHandler(this.btnClampRelax_Click);
// //
// lblForce // lblErrorCode
// //
this.lblForce.AutoSize = true; this.lblErrorCode.AutoSize = true;
this.lblForce.Location = new System.Drawing.Point(159, 19); this.lblErrorCode.ForeColor = System.Drawing.Color.Red;
this.lblForce.Name = "lblForce"; this.lblErrorCode.Location = new System.Drawing.Point(159, 123);
this.lblForce.Size = new System.Drawing.Size(68, 17); this.lblErrorCode.Name = "lblErrorCode";
this.lblForce.TabIndex = 286; this.lblErrorCode.Size = new System.Drawing.Size(0, 17);
this.lblForce.Text = "实时出力："; this.lblErrorCode.TabIndex = 291;
//
// lblPosition
//
this.lblPosition.AutoSize = true;
this.lblPosition.Location = new System.Drawing.Point(159, 43);
this.lblPosition.Name = "lblPosition";
this.lblPosition.Size = new System.Drawing.Size(68, 17);
this.lblPosition.TabIndex = 287;
this.lblPosition.Text = "实时位置：";
// //
// lblMoveOk // btnReset
// //
this.lblMoveOk.AutoSize = true; this.btnReset.BackColor = System.Drawing.Color.White;
this.lblMoveOk.Location = new System.Drawing.Point(159, 91); this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.lblMoveOk.Name = "lblMoveOk"; this.btnReset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveOk.Size = new System.Drawing.Size(68, 17); this.btnReset.Location = new System.Drawing.Point(18, 141);
this.lblMoveOk.TabIndex = 288; this.btnReset.Name = "btnReset";
this.lblMoveOk.Text = "运动到位？"; this.btnReset.Size = new System.Drawing.Size(120, 34);
// this.btnReset.TabIndex = 292;
// btnHome this.btnReset.Text = "夹爪复位";
// this.btnReset.UseVisualStyleBackColor = false;
this.btnHome.BackColor = System.Drawing.Color.White; this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
this.btnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHome.Location = new System.Drawing.Point(18, 24);
this.btnHome.Name = "btnHome";
this.btnHome.Size = new System.Drawing.Size(120, 34);
this.btnHome.TabIndex = 289;
this.btnHome.Text = "夹爪回原点";
this.btnHome.UseVisualStyleBackColor = false;
this.btnHome.Click += new System.EventHandler(this.btnHome_Click);
//
// lblEmpty
//
this.lblEmpty.AutoSize = true;
this.lblEmpty.Location = new System.Drawing.Point(159, 67);
this.lblEmpty.Name = "lblEmpty";
this.lblEmpty.Size = new System.Drawing.Size(44, 17);
this.lblEmpty.TabIndex = 290;
this.lblEmpty.Text = "有料？";
// //
// ClampJawControl // ClampJawControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupClamp); this.Controls.Add(this.groupClamp);
this.Name = "ClampJawControl"; this.Name = "ClampJawControl";
this.Size = new System.Drawing.Size(279, 155); this.Size = new System.Drawing.Size(285, 191);
this.Load += new System.EventHandler(this.ClampJawControl_Load); this.Load += new System.EventHandler(this.ClampJawControl_Load);
this.groupClamp.ResumeLayout(false); this.groupClamp.ResumeLayout(false);
this.groupClamp.PerformLayout(); this.groupClamp.PerformLayout();
...@@ -173,5 +199,7 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -173,5 +199,7 @@ namespace OnlineStore.AssemblyLine.useControl
private System.Windows.Forms.Label lblMoveOk; private System.Windows.Forms.Label lblMoveOk;
private System.Windows.Forms.Button btnHome; private System.Windows.Forms.Button btnHome;
private System.Windows.Forms.Label lblEmpty; private System.Windows.Forms.Label lblEmpty;
private System.Windows.Forms.Label lblErrorCode;
private System.Windows.Forms.Button btnReset;
} }
} }
source/AssemblyLineClient/useControl/ClampJawControl.cs
...@@ -58,7 +58,15 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -58,7 +58,15 @@ namespace OnlineStore.AssemblyLine.useControl
} }
lblPosition.Text = "实时位置：" + clampJaw.GetPosition(); lblPosition.Text = "实时位置：" + clampJaw.GetPosition();
lblForce.Text = "实时出力：" + clampJaw.GetTorque(); lblForce.Text = "实时出力：" + clampJaw.GetTorque();
int code = clampJaw.GetErrorCode();
if (code > 0)
{
lblErrorCode.Text = "错误码：" + code;
}
else
{
lblErrorCode.Text = "";
}
} }
private void btnClampRelax_Click(object sender, EventArgs e) private void btnClampRelax_Click(object sender, EventArgs e)
...@@ -78,5 +86,11 @@ namespace OnlineStore.AssemblyLine.useControl ...@@ -78,5 +86,11 @@ namespace OnlineStore.AssemblyLine.useControl
LogUtil.info(JName + "界面点击：" + btnHome.Text); LogUtil.info(JName + "界面点击：" + btnHome.Text);
clampJaw.GoHome(); clampJaw.GoHome();
} }
private void btnReset_Click(object sender, EventArgs e)
{
LogUtil.info(JName + "界面点击：" + btnReset.Text);
clampJaw.Reset();
}
} }
} }
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -115,6 +115,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -115,6 +115,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogInfo("复位前，清理出库高度：" + OutStoreHeight); LogInfo("复位前，清理出库高度：" + OutStoreHeight);
} }
ClampJwa.Reset();
//复位时设置状态为none //复位时设置状态为none
AgvClient.SetStatus(Config.AgvInName); AgvClient.SetStatus(Config.AgvInName);
AgvClient.SetStatus(Config.AgvOutName); AgvClient.SetStatus(Config.AgvOutName);
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
...@@ -95,6 +95,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -95,6 +95,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.StopDown1, IO_VALUE.LOW); IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW); IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
} }
ClampJwa.Reset();
isInPro = false; isInPro = false;
} }
......
source/DeviceLibrary/baan/ClampJawBean.cs
...@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary
public string Name = ""; public string Name = "";
public ConfigClampJaw config = null; public ConfigClampJaw config = null;
public Rmaxis rmaxis = null; public Rmaxis rmaxis = null;
public ClampJawBean (ConfigClampJaw config) public ClampJawBean(ConfigClampJaw config)
{ {
this.config = config; this.config = config;
Name = config.DisplayStr + "(" + config.PortName + "_" + config.AxisNo + ")"; Name = config.DisplayStr + "(" + config.PortName + "_" + config.AxisNo + ")";
...@@ -152,5 +152,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -152,5 +152,21 @@ namespace OnlineStore.DeviceLibrary
rmaxis.Push(force, distance, config.Velocity); rmaxis.Push(force, distance, config.Velocity);
} }
} }
public void Reset()
{
if (rmaxis != null && rmaxis.IsPortOpen)
{
rmaxis.ResetError();
}
}
public int GetErrorCode()
{
if (rmaxis != null && rmaxis.IsPortOpen)
{
return rmaxis.ErrorCode;
}
return 0;
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!