Skip to content

孙克 / RC1250-ACPackingStore

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

显示agv cancelState状态

1 个父辈 08ca6c52
内嵌 并排
正在显示 4 个修改的文件 包含 30 行增加 和 9 行删除
source/ACPackingStore/FrmStore.Designer.cs
......@@ -72,6 +72,7 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label1 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox4.SuspendLayout();
......@@ -99,6 +100,7 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.label1);
this.tabPage1.Controls.Add(this.lblServerMsg);
this.tabPage1.Controls.Add(this.chbAGV);
this.tabPage1.Controls.Add(this.groupBox4);
......@@ -131,7 +133,7 @@
//
this.chbAGV.AutoSize = true;
this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAGV.Location = new System.Drawing.Point(36, 470);
this.chbAGV.Location = new System.Drawing.Point(36, 461);
this.chbAGV.Name = "chbAGV";
this.chbAGV.Size = new System.Drawing.Size(138, 24);
this.chbAGV.TabIndex = 200;
......@@ -143,7 +145,7 @@
//
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
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(6, 118);
this.groupBox4.Location = new System.Drawing.Point(6, 116);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(229, 171);
this.groupBox4.TabIndex = 199;
......@@ -195,7 +197,7 @@
//
this.chbDoorCanMove.AutoSize = true;
this.chbDoorCanMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDoorCanMove.Location = new System.Drawing.Point(36, 434);
this.chbDoorCanMove.Location = new System.Drawing.Point(36, 425);
this.chbDoorCanMove.Name = "chbDoorCanMove";
this.chbDoorCanMove.Size = new System.Drawing.Size(126, 24);
this.chbDoorCanMove.TabIndex = 197;
......@@ -207,7 +209,7 @@
//
this.chbAutoShelfInstore.AutoSize = true;
this.chbAutoShelfInstore.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoShelfInstore.Location = new System.Drawing.Point(36, 393);
this.chbAutoShelfInstore.Location = new System.Drawing.Point(36, 384);
this.chbAutoShelfInstore.Name = "chbAutoShelfInstore";
this.chbAutoShelfInstore.Size = new System.Drawing.Size(154, 24);
this.chbAutoShelfInstore.TabIndex = 196;
......@@ -219,7 +221,7 @@
//
this.chbUseBuzzer.AutoSize = true;
this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseBuzzer.Location = new System.Drawing.Point(36, 352);
this.chbUseBuzzer.Location = new System.Drawing.Point(36, 343);
this.chbUseBuzzer.Name = "chbUseBuzzer";
this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbUseBuzzer.TabIndex = 195;
......@@ -231,7 +233,7 @@
//
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(36, 511);
this.chkDebug.Location = new System.Drawing.Point(36, 502);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(132, 24);
this.chkDebug.TabIndex = 194;
......@@ -243,7 +245,7 @@
//
this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(36, 311);
this.chbAutoRun.Location = new System.Drawing.Point(36, 302);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94;
......@@ -255,7 +257,7 @@
//
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(13, 558);
this.btnCopyLog.Location = new System.Drawing.Point(14, 584);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191;
......@@ -267,7 +269,7 @@
//
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(124, 558);
this.btnClearLog.Location = new System.Drawing.Point(125, 584);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190;
......@@ -485,6 +487,16 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(10, 539);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(219, 29);
this.label1.TabIndex = 202;
this.label1.Text = "label1";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -561,6 +573,7 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.CheckBox chbAGV;
private System.Windows.Forms.Label lblServerMsg;
private System.Windows.Forms.Label label1;
}
}
source/ACPackingStore/FrmStore.cs
......@@ -407,6 +407,7 @@ namespace OnlineStore.ACPackingStore
{
chbAutoShelfInstore.Checked=store.AutoShelfInstore;
}
label1.Text = "agvClient.CancelState=" + AgvClient.getState();
lblWarnMsg.Text = msg;
LogM();
}
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
......@@ -339,6 +339,7 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_H06_MiddleAxisToP1:
LogInfo(MoveInfo.MoveType + ": 完成");
MoveEndToRuningStatus();
AgvClient.SetCancelState(AgvClient.CurrCancelState);
break;
case StoreMoveStep.BOX_H54_InOutToP1:
......@@ -356,6 +357,7 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_H56_OtherAxisToP1:
LogInfo("到待机状态完成");
MoveEndToRuningStatus();
AgvClient.SetCancelState(AgvClient.CurrCancelState);
break;
default: break;
......
source/DeviceLibrary/agvClient/AgvClient.cs
......@@ -71,6 +71,11 @@ namespace OnlineStore.DeviceLibrary
{
CurrCancelState = isCancel;
agvClient.CancelState = isCancel;
LogUtil.info("设置 agvClient.CancelState = " + isCancel);
}
public static bool getState()
{
return agvClient.CancelState;
}
public static Dictionary<string, DateTime> closeDoorTimeMap = new Dictionary<string, DateTime>();
private static void AgvClient_CloseDoor(string id, string rfid)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!