Skip to content

张东亮 / SO1131-XLRStore

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

光栅屏蔽逻辑恢复

1 个父辈 c4230ad4
内嵌 并排
正在显示 2 个修改的文件 包含 16 行增加 和 15 行删除
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
......@@ -581,11 +581,12 @@ namespace OnlineStore.DeviceLibrary
}
else if (CurrSecurityAccess.Equals(1))
{
if (!StoreManager.DisSecurityAccess)
{
SecurityAccessReset();
}
else if (IOValue(IO_Type.Shelf_SafetyRasterSignal).Equals(IO_VALUE.HIGH) &&
//if (!StoreManager.DisSecurityAccess)
//{
// SecurityAccessReset();
//}
//else
if (IOValue(IO_Type.Shelf_SafetyRasterSignal).Equals(IO_VALUE.HIGH) &&
IOValue(IO_Type.TurnoverBox_SafetyRasterSignal).Equals(IO_VALUE.HIGH))
{
SecurityAccessReset();
......
source/XLRStoreClient/FrmXLRStore.Designer.cs
......@@ -584,52 +584,52 @@
// 开机自动启动ToolStripMenuItem
//
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(221, 32);
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.开机自动启动ToolStripMenuItem.Text = "开机自动启动";
this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(218, 6);
this.toolStripSeparator15.Size = new System.Drawing.Size(221, 6);
//
// 启用蜂鸣器ToolStripMenuItem
//
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(221, 32);
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator25
//
this.toolStripSeparator25.Name = "toolStripSeparator25";
this.toolStripSeparator25.Size = new System.Drawing.Size(218, 6);
this.toolStripSeparator25.Size = new System.Drawing.Size(221, 6);
//
// aGVCancelStateToolStripMenuItem
//
this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem";
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(221, 32);
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.aGVCancelStateToolStripMenuItem.Text = "AGV信号屏蔽";
this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click);
//
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(218, 6);
this.toolStripSeparator17.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator17.Visible = false;
//
// 禁用安全光栅ToolStripMenuItem
//
this.禁用安全光栅ToolStripMenuItem.Name = "禁用安全光栅ToolStripMenuItem";
this.禁用安全光栅ToolStripMenuItem.Size = new System.Drawing.Size(221, 32);
this.禁用安全光栅ToolStripMenuItem.Text = "启用安全光栅";
this.禁用安全光栅ToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.禁用安全光栅ToolStripMenuItem.Text = "禁用安全光栅";
this.禁用安全光栅ToolStripMenuItem.Click += new System.EventHandler(this.启用安全光栅ToolStripMenuItem_Click);
//
// 启用门禁ToolStripMenuItem
//
this.启用门禁ToolStripMenuItem.Name = "启用门禁ToolStripMenuItem";
this.启用门禁ToolStripMenuItem.Size = new System.Drawing.Size(221, 32);
this.启用门禁ToolStripMenuItem.Text = "启用门禁";
this.启用门禁ToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.启用门禁ToolStripMenuItem.Text = "禁用门禁";
this.启用门禁ToolStripMenuItem.Click += new System.EventHandler(this.启用门禁ToolStripMenuItem_Click);
//
// FrmXLRStore
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!