Skip to content

张东亮 / SO1057-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4dba1553 由 张东亮
选项

1

1 个父辈 15f87227
内嵌 并排
正在显示 2 个修改的文件 包含 55 行增加 和 55 行删除
source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs
......@@ -279,7 +279,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsTimeOut(60))
{
MoveTimeOut(MoveInfo, "" + moveBean.Name + "获取料盘高度完成");
MoveTimeOut(MoveInfo, "" + moveBean.Name + "获取料盘高度超时");
}
}
else if (MoveInfo.IsStep(StepEnum.II13_GetPosId))
......
source/XLRStoreClient/useControl/AxisMoveControl.Designer.cs
......@@ -64,6 +64,7 @@
this.lblAxisPrfMode = new System.Windows.Forms.Label();
this.label50 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.btnIOJog = new System.Windows.Forms.Button();
this.btnEndHome = new System.Windows.Forms.Button();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btnAxisStop = new System.Windows.Forms.Button();
......@@ -90,7 +91,6 @@
this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnIOJog = new System.Windows.Forms.Button();
this.groupAxis.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panel1.SuspendLayout();
......@@ -109,7 +109,7 @@
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(3, 3);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(478, 395);
this.groupAxis.Size = new System.Drawing.Size(483, 394);
this.groupAxis.TabIndex = 218;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
......@@ -120,7 +120,7 @@
this.lblAxisType.Location = new System.Drawing.Point(8, 395);
this.lblAxisType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxisType.Name = "lblAxisType";
this.lblAxisType.Size = new System.Drawing.Size(0, 17);
this.lblAxisType.Size = new System.Drawing.Size(0, 20);
this.lblAxisType.TabIndex = 306;
//
// lblStatus
......@@ -129,7 +129,7 @@
this.lblStatus.Location = new System.Drawing.Point(8, 376);
this.lblStatus.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(0, 17);
this.lblStatus.Size = new System.Drawing.Size(0, 20);
this.lblStatus.TabIndex = 305;
this.lblStatus.Visible = false;
//
......@@ -180,7 +180,7 @@
this.label7.Location = new System.Drawing.Point(249, 110);
this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(59, 17);
this.label7.Size = new System.Drawing.Size(73, 20);
this.label7.TabIndex = 26;
this.label7.Text = "最大力矩:";
//
......@@ -190,7 +190,7 @@
this.lblMaxLmt.Location = new System.Drawing.Point(314, 110);
this.lblMaxLmt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMaxLmt.Name = "lblMaxLmt";
this.lblMaxLmt.Size = new System.Drawing.Size(17, 17);
this.lblMaxLmt.Size = new System.Drawing.Size(21, 20);
this.lblMaxLmt.TabIndex = 25;
this.lblMaxLmt.Text = "...";
//
......@@ -200,7 +200,7 @@
this.label12.Location = new System.Drawing.Point(124, 110);
this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(59, 17);
this.label12.Size = new System.Drawing.Size(73, 20);
this.label12.TabIndex = 21;
this.label12.Text = "反向力矩:";
//
......@@ -210,7 +210,7 @@
this.label13.Location = new System.Drawing.Point(6, 110);
this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(59, 17);
this.label13.Size = new System.Drawing.Size(73, 20);
this.label13.TabIndex = 22;
this.label13.Text = "正向力矩:";
//
......@@ -220,7 +220,7 @@
this.lblPosLmt.Location = new System.Drawing.Point(69, 110);
this.lblPosLmt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblPosLmt.Name = "lblPosLmt";
this.lblPosLmt.Size = new System.Drawing.Size(17, 17);
this.lblPosLmt.Size = new System.Drawing.Size(21, 20);
this.lblPosLmt.TabIndex = 23;
this.lblPosLmt.Text = "...";
//
......@@ -230,7 +230,7 @@
this.lblNegLmt.Location = new System.Drawing.Point(189, 110);
this.lblNegLmt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblNegLmt.Name = "lblNegLmt";
this.lblNegLmt.Size = new System.Drawing.Size(17, 17);
this.lblNegLmt.Size = new System.Drawing.Size(21, 20);
this.lblNegLmt.TabIndex = 24;
this.lblNegLmt.Text = "...";
//
......@@ -240,7 +240,7 @@
this.lblAlarmcode.Location = new System.Drawing.Point(379, 60);
this.lblAlarmcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAlarmcode.Name = "lblAlarmcode";
this.lblAlarmcode.Size = new System.Drawing.Size(68, 17);
this.lblAlarmcode.Size = new System.Drawing.Size(85, 20);
this.lblAlarmcode.TabIndex = 20;
this.lblAlarmcode.Text = "错误码:160";
this.lblAlarmcode.Visible = false;
......@@ -251,7 +251,7 @@
this.label4.Location = new System.Drawing.Point(250, 85);
this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 17);
this.label4.Size = new System.Drawing.Size(73, 20);
this.label4.TabIndex = 18;
this.label4.Text = "回原状态:";
//
......@@ -261,7 +261,7 @@
this.lblhomeSts.Location = new System.Drawing.Point(315, 85);
this.lblhomeSts.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblhomeSts.Name = "lblhomeSts";
this.lblhomeSts.Size = new System.Drawing.Size(17, 17);
this.lblhomeSts.Size = new System.Drawing.Size(21, 20);
this.lblhomeSts.TabIndex = 17;
this.lblhomeSts.Text = "...";
//
......@@ -271,7 +271,7 @@
this.label2.Location = new System.Drawing.Point(379, 85);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 17);
this.label2.Size = new System.Drawing.Size(88, 20);
this.label2.TabIndex = 11;
this.label2.Text = "实际加速度:";
this.label2.Visible = false;
......@@ -282,7 +282,7 @@
this.lblAxEncAcc.Location = new System.Drawing.Point(447, 85);
this.lblAxEncAcc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncAcc.Name = "lblAxEncAcc";
this.lblAxEncAcc.Size = new System.Drawing.Size(17, 17);
this.lblAxEncAcc.Size = new System.Drawing.Size(21, 20);
this.lblAxEncAcc.TabIndex = 12;
this.lblAxEncAcc.Text = "...";
this.lblAxEncAcc.Visible = false;
......@@ -383,7 +383,7 @@
this.label53.Location = new System.Drawing.Point(125, 85);
this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(59, 17);
this.label53.Size = new System.Drawing.Size(73, 20);
this.label53.TabIndex = 1;
this.label53.Text = "规划速度:";
//
......@@ -393,7 +393,7 @@
this.label56.Location = new System.Drawing.Point(7, 85);
this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label56.Name = "label56";
this.label56.Size = new System.Drawing.Size(59, 17);
this.label56.Size = new System.Drawing.Size(73, 20);
this.label56.TabIndex = 1;
this.label56.Text = "实际速度:";
//
......@@ -403,7 +403,7 @@
this.label55.Location = new System.Drawing.Point(7, 60);
this.label55.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label55.Name = "label55";
this.label55.Size = new System.Drawing.Size(59, 17);
this.label55.Size = new System.Drawing.Size(73, 20);
this.label55.TabIndex = 1;
this.label55.Text = "实际位置:";
//
......@@ -413,7 +413,7 @@
this.label52.Location = new System.Drawing.Point(125, 60);
this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label52.Name = "label52";
this.label52.Size = new System.Drawing.Size(59, 17);
this.label52.Size = new System.Drawing.Size(73, 20);
this.label52.TabIndex = 1;
this.label52.Text = "规划位置:";
//
......@@ -423,7 +423,7 @@
this.lblAxEncVel.Location = new System.Drawing.Point(70, 85);
this.lblAxEncVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncVel.Name = "lblAxEncVel";
this.lblAxEncVel.Size = new System.Drawing.Size(17, 17);
this.lblAxEncVel.Size = new System.Drawing.Size(21, 20);
this.lblAxEncVel.TabIndex = 1;
this.lblAxEncVel.Text = "...";
//
......@@ -433,7 +433,7 @@
this.lblAxPrfVel.Location = new System.Drawing.Point(190, 85);
this.lblAxPrfVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfVel.Name = "lblAxPrfVel";
this.lblAxPrfVel.Size = new System.Drawing.Size(17, 17);
this.lblAxPrfVel.Size = new System.Drawing.Size(21, 20);
this.lblAxPrfVel.TabIndex = 1;
this.lblAxPrfVel.Text = "...";
//
......@@ -443,7 +443,7 @@
this.lblAxEncPos.Location = new System.Drawing.Point(70, 60);
this.lblAxEncPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncPos.Name = "lblAxEncPos";
this.lblAxEncPos.Size = new System.Drawing.Size(17, 17);
this.lblAxEncPos.Size = new System.Drawing.Size(21, 20);
this.lblAxEncPos.TabIndex = 1;
this.lblAxEncPos.Text = "...";
//
......@@ -453,7 +453,7 @@
this.lblAxPrfPos.Location = new System.Drawing.Point(190, 60);
this.lblAxPrfPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfPos.Name = "lblAxPrfPos";
this.lblAxPrfPos.Size = new System.Drawing.Size(17, 17);
this.lblAxPrfPos.Size = new System.Drawing.Size(21, 20);
this.lblAxPrfPos.TabIndex = 1;
this.lblAxPrfPos.Text = "...";
//
......@@ -463,7 +463,7 @@
this.lblAxisPrfMode.Location = new System.Drawing.Point(315, 60);
this.lblAxisPrfMode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxisPrfMode.Name = "lblAxisPrfMode";
this.lblAxisPrfMode.Size = new System.Drawing.Size(17, 17);
this.lblAxisPrfMode.Size = new System.Drawing.Size(21, 20);
this.lblAxisPrfMode.TabIndex = 1;
this.lblAxisPrfMode.Text = "...";
//
......@@ -473,7 +473,7 @@
this.label50.Location = new System.Drawing.Point(250, 60);
this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label50.Name = "label50";
this.label50.Size = new System.Drawing.Size(59, 17);
this.label50.Size = new System.Drawing.Size(73, 20);
this.label50.TabIndex = 1;
this.label50.Text = "规划模式:";
//
......@@ -510,6 +510,18 @@
this.panel1.Size = new System.Drawing.Size(469, 236);
this.panel1.TabIndex = 219;
//
// btnIOJog
//
this.btnIOJog.BackColor = System.Drawing.Color.Red;
this.btnIOJog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIOJog.Location = new System.Drawing.Point(13, 192);
this.btnIOJog.Name = "btnIOJog";
this.btnIOJog.Size = new System.Drawing.Size(135, 40);
this.btnIOJog.TabIndex = 335;
this.btnIOJog.Text = "IO点动";
this.btnIOJog.UseVisualStyleBackColor = false;
this.btnIOJog.Click += new System.EventHandler(this.btnIOJog_Click);
//
// btnEndHome
//
this.btnEndHome.BackColor = System.Drawing.SystemColors.Control;
......@@ -531,7 +543,7 @@
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(184, 134);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(32, 17);
this.linkLabel1.Size = new System.Drawing.Size(39, 20);
this.linkLabel1.TabIndex = 333;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "复制";
......@@ -576,7 +588,7 @@
this.cmbAxis.FormattingEnabled = true;
this.cmbAxis.Location = new System.Drawing.Point(57, 8);
this.cmbAxis.Name = "cmbAxis";
this.cmbAxis.Size = new System.Drawing.Size(184, 28);
this.cmbAxis.Size = new System.Drawing.Size(184, 31);
this.cmbAxis.TabIndex = 301;
this.cmbAxis.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
......@@ -616,7 +628,7 @@
this.txtMiddleSpeed.Location = new System.Drawing.Point(75, 160);
this.txtMiddleSpeed.MaxLength = 6;
this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(73, 26);
this.txtMiddleSpeed.Size = new System.Drawing.Size(73, 31);
this.txtMiddleSpeed.TabIndex = 331;
this.txtMiddleSpeed.Text = "100";
//
......@@ -661,7 +673,7 @@
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtASpeed.Size = new System.Drawing.Size(69, 26);
this.txtASpeed.Size = new System.Drawing.Size(69, 31);
this.txtASpeed.TabIndex = 251;
this.txtASpeed.Text = "200";
//
......@@ -670,7 +682,7 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(10, 165);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.Size = new System.Drawing.Size(84, 20);
this.label1.TabIndex = 329;
this.label1.Text = "点动速度：";
//
......@@ -683,7 +695,7 @@
this.label47.Location = new System.Drawing.Point(107, 99);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(59, 17);
this.label47.Size = new System.Drawing.Size(73, 20);
this.label47.TabIndex = 250;
this.label47.Text = "目标速度:";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -694,7 +706,7 @@
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(10, 133);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.Size = new System.Drawing.Size(73, 20);
this.label8.TabIndex = 255;
this.label8.Text = "实时位置:";
//
......@@ -720,7 +732,7 @@
this.txtAxisPosition.Location = new System.Drawing.Point(75, 128);
this.txtAxisPosition.Name = "txtAxisPosition";
this.txtAxisPosition.ReadOnly = true;
this.txtAxisPosition.Size = new System.Drawing.Size(103, 26);
this.txtAxisPosition.Size = new System.Drawing.Size(103, 31);
this.txtAxisPosition.TabIndex = 38;
//
// btnAxisAMove
......@@ -746,7 +758,7 @@
this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label49.Location = new System.Drawing.Point(2, 14);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.Size = new System.Drawing.Size(64, 20);
this.label49.TabIndex = 233;
this.label49.Text = "AC伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -761,7 +773,7 @@
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAPosition.Size = new System.Drawing.Size(69, 26);
this.txtAPosition.Size = new System.Drawing.Size(69, 31);
this.txtAPosition.TabIndex = 244;
this.txtAPosition.Text = "3000";
//
......@@ -772,7 +784,7 @@
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(18, 100);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17);
this.label46.Size = new System.Drawing.Size(43, 20);
this.label46.TabIndex = 239;
this.label46.Text = "地址:";
this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -786,7 +798,7 @@
this.label48.Location = new System.Drawing.Point(107, 57);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(59, 17);
this.label48.Size = new System.Drawing.Size(73, 20);
this.label48.TabIndex = 243;
this.label48.Text = "目标位置:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -798,7 +810,7 @@
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(18, 58);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(35, 17);
this.label45.Size = new System.Drawing.Size(43, 20);
this.label45.TabIndex = 240;
this.label45.Text = "设备:";
this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -810,7 +822,7 @@
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true;
this.txtAxisValue.Size = new System.Drawing.Size(41, 26);
this.txtAxisValue.Size = new System.Drawing.Size(41, 31);
this.txtAxisValue.TabIndex = 242;
this.txtAxisValue.Text = "0";
//
......@@ -821,7 +833,7 @@
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true;
this.txtAxisDeviceName.Size = new System.Drawing.Size(41, 26);
this.txtAxisDeviceName.Size = new System.Drawing.Size(41, 31);
this.txtAxisDeviceName.TabIndex = 241;
this.txtAxisDeviceName.Text = "0";
//
......@@ -833,31 +845,19 @@
this.lblServerOn.ForeColor = System.Drawing.Color.Red;
this.lblServerOn.Location = new System.Drawing.Point(32, 115);
this.lblServerOn.Name = "lblServerOn";
this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.Size = new System.Drawing.Size(0, 25);
this.lblServerOn.TabIndex = 268;
//
// timer1
//
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// btnIOJog
//
this.btnIOJog.BackColor = System.Drawing.Color.Red;
this.btnIOJog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIOJog.Location = new System.Drawing.Point(13, 192);
this.btnIOJog.Name = "btnIOJog";
this.btnIOJog.Size = new System.Drawing.Size(135, 40);
this.btnIOJog.TabIndex = 335;
this.btnIOJog.Text = "IO点动";
this.btnIOJog.UseVisualStyleBackColor = false;
this.btnIOJog.Click += new System.EventHandler(this.btnIOJog_Click);
//
// AxisMoveControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(486, 403);
this.Size = new System.Drawing.Size(491, 402);
this.Load += new System.EventHandler(this.AxisMoveControl_Load);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!