Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a542bb55 由 几米阳光
选项

轴报警检测间隔修改。停止料仓后清理界面显示

1 个父辈 5ea90f59
内嵌 并排
正在显示 3 个修改的文件 包含 45 行增加 和 111 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -92,10 +92,8 @@
this.btnStartAuTo = new System.Windows.Forms.Button();
this.label9 = new System.Windows.Forms.Label();
this.txtJiange = new System.Windows.Forms.TextBox();
this.txtAxisRunTime = new System.Windows.Forms.TextBox();
this.txtComP1 = new System.Windows.Forms.TextBox();
this.txtInOutP2 = new System.Windows.Forms.TextBox();
this.txtStoreRunTime = new System.Windows.Forms.TextBox();
this.txtInOutP1 = new System.Windows.Forms.TextBox();
this.txtMiddleP1 = new System.Windows.Forms.TextBox();
this.txtUpDownP7 = new System.Windows.Forms.TextBox();
......@@ -118,12 +116,10 @@
this.btnInOutP2 = new System.Windows.Forms.Button();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.btnMiddleP1 = new System.Windows.Forms.Button();
this.label34 = new System.Windows.Forms.Label();
this.btnUpDownP7 = new System.Windows.Forms.Button();
this.btnUpDownP8 = new System.Windows.Forms.Button();
this.btnUpDownP1 = new System.Windows.Forms.Button();
this.btnUpDownP2 = new System.Windows.Forms.Button();
this.label32 = new System.Windows.Forms.Label();
this.btnComP3 = new System.Windows.Forms.Button();
this.btnComP2 = new System.Windows.Forms.Button();
this.btnInOutP3 = new System.Windows.Forms.Button();
......@@ -183,7 +179,6 @@
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(620, 40);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.Text = "？";
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// groupBox5
......@@ -238,7 +233,7 @@
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(152, 256);
this.label16.Location = new System.Drawing.Point(152, 247);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(112, 17);
this.label16.TabIndex = 295;
......@@ -247,7 +242,7 @@
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(152, 227);
this.label15.Location = new System.Drawing.Point(152, 218);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(124, 17);
this.label15.TabIndex = 294;
......@@ -256,7 +251,7 @@
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(152, 194);
this.label14.Location = new System.Drawing.Point(152, 185);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(100, 17);
this.label14.TabIndex = 293;
......@@ -265,7 +260,7 @@
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(5, 256);
this.label11.Location = new System.Drawing.Point(5, 247);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(114, 17);
this.label11.TabIndex = 292;
......@@ -274,14 +269,14 @@
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(121, 253);
this.txtHomeStatus.Location = new System.Drawing.Point(121, 244);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// button2
//
this.button2.Location = new System.Drawing.Point(278, 249);
this.button2.Location = new System.Drawing.Point(278, 240);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(105, 33);
this.button2.TabIndex = 290;
......@@ -292,7 +287,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(44, 225);
this.label10.Location = new System.Drawing.Point(44, 216);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(75, 17);
this.label10.TabIndex = 289;
......@@ -301,14 +296,14 @@
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(121, 222);
this.txtBusyStatus.Location = new System.Drawing.Point(121, 213);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// button1
//
this.button1.Location = new System.Drawing.Point(278, 216);
this.button1.Location = new System.Drawing.Point(278, 207);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(105, 33);
this.button1.TabIndex = 287;
......@@ -319,7 +314,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(51, 194);
this.label2.Location = new System.Drawing.Point(51, 185);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17);
this.label2.TabIndex = 286;
......@@ -328,14 +323,14 @@
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(121, 191);
this.txtAlarmStatus.Location = new System.Drawing.Point(121, 182);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
//
// btnGetAlarm
//
this.btnGetAlarm.Location = new System.Drawing.Point(278, 183);
this.btnGetAlarm.Location = new System.Drawing.Point(278, 174);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(105, 33);
this.btnGetAlarm.TabIndex = 284;
......@@ -665,9 +660,9 @@
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(22, 461);
this.richTextBox1.Location = new System.Drawing.Point(22, 465);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(568, 250);
this.richTextBox1.Size = new System.Drawing.Size(568, 246);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
//
......@@ -697,7 +692,7 @@
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(603, 445);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(396, 193);
this.groupBox1.Size = new System.Drawing.Size(433, 193);
this.groupBox1.TabIndex = 217;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态";
......@@ -882,10 +877,8 @@
this.groupBox2.Controls.Add(this.btnStartAuTo);
this.groupBox2.Controls.Add(this.label9);
this.groupBox2.Controls.Add(this.txtJiange);
this.groupBox2.Controls.Add(this.txtAxisRunTime);
this.groupBox2.Controls.Add(this.txtComP1);
this.groupBox2.Controls.Add(this.txtInOutP2);
this.groupBox2.Controls.Add(this.txtStoreRunTime);
this.groupBox2.Controls.Add(this.txtInOutP1);
this.groupBox2.Controls.Add(this.txtMiddleP1);
this.groupBox2.Controls.Add(this.txtUpDownP7);
......@@ -908,12 +901,10 @@
this.groupBox2.Controls.Add(this.btnInOutP2);
this.groupBox2.Controls.Add(this.btnInOutP1);
this.groupBox2.Controls.Add(this.btnMiddleP1);
this.groupBox2.Controls.Add(this.label34);
this.groupBox2.Controls.Add(this.btnUpDownP7);
this.groupBox2.Controls.Add(this.btnUpDownP8);
this.groupBox2.Controls.Add(this.btnUpDownP1);
this.groupBox2.Controls.Add(this.btnUpDownP2);
this.groupBox2.Controls.Add(this.label32);
this.groupBox2.Controls.Add(this.btnComP3);
this.groupBox2.Controls.Add(this.btnComP2);
this.groupBox2.Controls.Add(this.btnInOutP3);
......@@ -924,7 +915,7 @@
this.groupBox2.Controls.Add(this.btnUpDownP4);
this.groupBox2.Location = new System.Drawing.Point(22, 28);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(568, 423);
this.groupBox2.Size = new System.Drawing.Size(568, 432);
this.groupBox2.TabIndex = 100;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "料仓操作";
......@@ -991,21 +982,6 @@
this.txtJiange.TabIndex = 221;
this.txtJiange.Text = "0";
//
// txtAxisRunTime
//
this.txtAxisRunTime.AcceptsReturn = true;
this.txtAxisRunTime.BackColor = System.Drawing.SystemColors.Window;
this.txtAxisRunTime.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAxisRunTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisRunTime.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAxisRunTime.Location = new System.Drawing.Point(366, 426);
this.txtAxisRunTime.MaxLength = 0;
this.txtAxisRunTime.Name = "txtAxisRunTime";
this.txtAxisRunTime.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAxisRunTime.Size = new System.Drawing.Size(142, 23);
this.txtAxisRunTime.TabIndex = 185;
this.txtAxisRunTime.Text = "0";
//
// txtComP1
//
this.txtComP1.AcceptsReturn = true;
......@@ -1036,21 +1012,6 @@
this.txtInOutP2.TabIndex = 212;
this.txtInOutP2.Text = "-17000";
//
// txtStoreRunTime
//
this.txtStoreRunTime.AcceptsReturn = true;
this.txtStoreRunTime.BackColor = System.Drawing.SystemColors.Window;
this.txtStoreRunTime.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtStoreRunTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtStoreRunTime.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtStoreRunTime.Location = new System.Drawing.Point(89, 426);
this.txtStoreRunTime.MaxLength = 0;
this.txtStoreRunTime.Name = "txtStoreRunTime";
this.txtStoreRunTime.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtStoreRunTime.Size = new System.Drawing.Size(142, 23);
this.txtStoreRunTime.TabIndex = 183;
this.txtStoreRunTime.Text = "0";
//
// txtInOutP1
//
this.txtInOutP1.AcceptsReturn = true;
......@@ -1383,21 +1344,6 @@
this.btnMiddleP1.UseVisualStyleBackColor = true;
this.btnMiddleP1.Click += new System.EventHandler(this.btnMiddleP1_Click);
//
// label34
//
this.label34.AutoSize = true;
this.label34.BackColor = System.Drawing.Color.White;
this.label34.Cursor = System.Windows.Forms.Cursors.Default;
this.label34.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label34.ForeColor = System.Drawing.SystemColors.ControlText;
this.label34.Location = new System.Drawing.Point(15, 430);
this.label34.Name = "label34";
this.label34.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label34.Size = new System.Drawing.Size(68, 17);
this.label34.TabIndex = 182;
this.label34.Text = "运行时间：";
this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnUpDownP7
//
this.btnUpDownP7.AutoSize = true;
......@@ -1470,21 +1416,6 @@
this.btnUpDownP2.UseVisualStyleBackColor = true;
this.btnUpDownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
//
// label32
//
this.label32.AutoSize = true;
this.label32.BackColor = System.Drawing.Color.White;
this.label32.Cursor = System.Windows.Forms.Cursors.Default;
this.label32.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label32.ForeColor = System.Drawing.SystemColors.ControlText;
this.label32.Location = new System.Drawing.Point(280, 429);
this.label32.Name = "label32";
this.label32.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label32.Size = new System.Drawing.Size(80, 17);
this.label32.TabIndex = 184;
this.label32.Text = "轴转动时间：";
this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnComP3
//
this.btnComP3.AutoSize = true;
......@@ -1649,28 +1580,28 @@
// 启动ToolStripMenuItem
//
this.启动ToolStripMenuItem.Name = "启动ToolStripMenuItem";
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.启动ToolStripMenuItem.Text = "启动";
this.启动ToolStripMenuItem.Click += new System.EventHandler(this.启动ToolStripMenuItem_Click);
//
// 停止ToolStripMenuItem
//
this.停止ToolStripMenuItem.Name = "停止ToolStripMenuItem";
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.停止ToolStripMenuItem.Text = "停止";
this.停止ToolStripMenuItem.Click += new System.EventHandler(this.停止ToolStripMenuItem_Click);
//
// 复位ToolStripMenuItem
//
this.复位ToolStripMenuItem.Name = "复位ToolStripMenuItem";
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.复位ToolStripMenuItem.Text = "复位";
this.复位ToolStripMenuItem.Click += new System.EventHandler(this.复位ToolStripMenuItem_Click);
//
// 回待机点ToolStripMenuItem
//
this.回待机点ToolStripMenuItem.Name = "回待机点ToolStripMenuItem";
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.回待机点ToolStripMenuItem.Text = "回待机点";
this.回待机点ToolStripMenuItem.Click += new System.EventHandler(this.回待机点ToolStripMenuItem_Click);
//
......@@ -1804,12 +1735,13 @@
this.groupBox4.Controls.Add(this.txtPosition2);
this.groupBox4.Controls.Add(this.txtPosition1);
this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(1013, 445);
this.groupBox4.Location = new System.Drawing.Point(1042, 445);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(232, 193);
this.groupBox4.Size = new System.Drawing.Size(203, 193);
this.groupBox4.TabIndex = 267;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "移动测试";
this.groupBox4.Visible = false;
//
// btnStart
//
......@@ -1939,10 +1871,6 @@
private System.Windows.Forms.TextBox lblCountPulse;
private System.Windows.Forms.Button btnComAlarmClear;
private System.Windows.Forms.GroupBox groupBox5;
public System.Windows.Forms.TextBox txtAxisRunTime;
public System.Windows.Forms.Label label32;
public System.Windows.Forms.TextBox txtStoreRunTime;
public System.Windows.Forms.Label label34;
public System.Windows.Forms.Button btnComP1;
public System.Windows.Forms.TextBox txtComP1;
public System.Windows.Forms.Button btnInOutP2;
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -137,8 +137,7 @@ namespace OnlineStore.ACSingleStore
}
private DateTime preReadModblsTime = DateTime.Now;
private void timer1_Tick(object sender, EventArgs e)
{
{
//验证运动是否完成
//CheckWait();
......@@ -168,18 +167,12 @@ namespace OnlineStore.ACSingleStore
}
lblThisSta.Text = store.GetRunStr();
DateTime time = DateTime.Now;
if (store != null && store.storeRunStatus != StoreRunStatus.Wait)
{
txtAxisRunTime.Text = store.GetAxisRunTime(store.Config.Middle_Axis.GetAxisValue()).ToString(@"dd\.hh\:mm\:ss");
txtStoreRunTime.Text = store.GetStoreRunTime().ToString(@"dd\.hh\:mm\:ss");
}
//复位按钮状态显示
if (复位ToolStripMenuItem.Enabled == false)
{
if ((store.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || store.storeRunStatus.Equals(StoreRunStatus.Reset))
&&store.alarmType.Equals(StoreAlarmType.None))
&& store.alarmType.Equals(StoreAlarmType.None))
{
}
else
......@@ -197,11 +190,12 @@ namespace OnlineStore.ACSingleStore
}
}
lblWarnMsg.Text = store.WarnMsg;
if (store.KNDIOValue(IO_Type.Left_Door_LimitSingle).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关";
} if (store.KNDIOValue(IO_Type.Right_Door_LimitSingle).Equals(IO_VALUE.LOW))
}
if (store.KNDIOValue(IO_Type.Right_Door_LimitSingle).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关";
}
......@@ -234,6 +228,12 @@ namespace OnlineStore.ACSingleStore
}
}
}
else
{
lblThisSta.Text = "等待启动";
lblWarnMsg.Text = "";
btnStartAuTo.Text = "开始自动出入库";
}
}
private void ReadPosistion()
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -669,6 +669,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public override void StopRun()
{
WarnMsg = "";
autoNext = false;
serverConnectTimer.Enabled = false;
StopMove();
......@@ -1093,10 +1094,16 @@ namespace OnlineStore.DeviceLibrary
private DateTime checkAlarmTime = DateTime.Now;
public bool CheckAxisAlarm()
{
TimeSpan span = DateTime.Now - checkAlarmTime;
if (span.TotalSeconds < 2)
//在回原点，复位，出入库时，检测报警间隔减小
if (storeRunStatus.Equals(StoreRunStatus.Busy) || storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
{ }
else
{
return false;
TimeSpan span = DateTime.Now - checkAlarmTime;
if (span.TotalSeconds < 2)
{
return false;
}
}
checkAlarmTime = DateTime.Now;
bool isInAlarm = false;
......@@ -1156,7 +1163,6 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + "StopMove");
KNDIOMove(IO_Type.Door_Down, IO_VALUE.LOW);
KNDIOMove(IO_Type.Door_Up, IO_VALUE.LOW);
Thread.Sleep(100);
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!