Skip to content

张东亮 / SO1057-XLRStore

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

忽略料叉信号时屏蔽对应库位

1 个父辈 9d102103
内嵌 并排
正在显示 2 个修改的文件 包含 88 行增加 和 85 行删除
source/XLRStoreClient/FrmXLRStore.Designer.cs
......@@ -124,7 +124,7 @@
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1342, 643);
this.tabControl1.Size = new System.Drawing.Size(1342, 649);
this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
......@@ -132,9 +132,9 @@
// tabPage1
//
this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1334, 607);
this.tabPage1.Size = new System.Drawing.Size(1334, 616);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 运行日志 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -147,7 +147,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(5, 3);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1323, 596);
this.logBox.Size = new System.Drawing.Size(1323, 605);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -155,9 +155,9 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.panel1);
this.tabPage2.Location = new System.Drawing.Point(4, 32);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(192, 64);
this.tabPage2.Size = new System.Drawing.Size(1334, 616);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -168,7 +168,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(192, 64);
this.panel1.Size = new System.Drawing.Size(1334, 616);
this.panel1.TabIndex = 1;
//
// tableLayoutPanel1
......@@ -193,7 +193,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(192, 64);
this.tableLayoutPanel1.Size = new System.Drawing.Size(1334, 616);
this.tableLayoutPanel1.TabIndex = 0;
//
// InputControl
......@@ -204,11 +204,11 @@
this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2);
this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.InputControl.EquipText = "上料机构";
this.InputControl.Location = new System.Drawing.Point(4, 43);
this.InputControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.InputControl.Location = new System.Drawing.Point(4, 383);
this.InputControl.Margin = new System.Windows.Forms.Padding(4);
this.InputControl.MoveInfo = "暂无出入库";
this.InputControl.Name = "InputControl";
this.InputControl.Size = new System.Drawing.Size(184, 4);
this.InputControl.Size = new System.Drawing.Size(1326, 109);
this.InputControl.TabIndex = 5;
this.InputControl.WorkStatus = "暂未启动";
//
......@@ -218,11 +218,11 @@
this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA1.ColorStatus = System.Drawing.Color.White;
this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA1.Location = new System.Drawing.Point(4, 25);
this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlA1.Location = new System.Drawing.Point(4, 209);
this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlA1.Name = "ReelControlA1";
this.ReelControlA1.ReelText = "暂存区物料";
this.ReelControlA1.Size = new System.Drawing.Size(88, 1);
this.ReelControlA1.Size = new System.Drawing.Size(659, 79);
this.ReelControlA1.TabIndex = 0;
//
// ReelControlA2
......@@ -231,11 +231,11 @@
this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA2.ColorStatus = System.Drawing.Color.White;
this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA2.Location = new System.Drawing.Point(4, 34);
this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlA2.Location = new System.Drawing.Point(4, 296);
this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlA2.Name = "ReelControlA2";
this.ReelControlA2.ReelText = "暂存区物料";
this.ReelControlA2.Size = new System.Drawing.Size(88, 1);
this.ReelControlA2.Size = new System.Drawing.Size(659, 79);
this.ReelControlA2.TabIndex = 1;
//
// ReelControlB1
......@@ -244,11 +244,11 @@
this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB1.ColorStatus = System.Drawing.Color.White;
this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB1.Location = new System.Drawing.Point(100, 25);
this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlB1.Location = new System.Drawing.Point(671, 209);
this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlB1.Name = "ReelControlB1";
this.ReelControlB1.ReelText = "暂存区物料";
this.ReelControlB1.Size = new System.Drawing.Size(88, 1);
this.ReelControlB1.Size = new System.Drawing.Size(659, 79);
this.ReelControlB1.TabIndex = 2;
//
// ReelControlB2
......@@ -257,11 +257,11 @@
this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB2.ColorStatus = System.Drawing.Color.White;
this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB2.Location = new System.Drawing.Point(100, 34);
this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlB2.Location = new System.Drawing.Point(671, 296);
this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlB2.Name = "ReelControlB2";
this.ReelControlB2.ReelText = "暂存区物料";
this.ReelControlB2.Size = new System.Drawing.Size(88, 1);
this.ReelControlB2.Size = new System.Drawing.Size(659, 79);
this.ReelControlB2.TabIndex = 3;
//
// BoxControl
......@@ -273,10 +273,10 @@
this.BoxControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.BoxControl.EquipText = "存储机构";
this.BoxControl.Location = new System.Drawing.Point(4, 4);
this.BoxControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BoxControl.Margin = new System.Windows.Forms.Padding(4);
this.BoxControl.MoveInfo = "暂无出入库";
this.BoxControl.Name = "BoxControl";
this.BoxControl.Size = new System.Drawing.Size(184, 13);
this.BoxControl.Size = new System.Drawing.Size(1326, 197);
this.BoxControl.TabIndex = 4;
this.BoxControl.WorkStatus = "暂未启动";
//
......@@ -287,11 +287,11 @@
this.ShelfAControl.ColorStatus = System.Drawing.Color.White;
this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfAControl.EquipText = "A料口";
this.ShelfAControl.Location = new System.Drawing.Point(4, 55);
this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ShelfAControl.Location = new System.Drawing.Point(4, 500);
this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4);
this.ShelfAControl.MoveInfo = "暂无出入库";
this.ShelfAControl.Name = "ShelfAControl";
this.ShelfAControl.Size = new System.Drawing.Size(88, 5);
this.ShelfAControl.Size = new System.Drawing.Size(659, 112);
this.ShelfAControl.TabIndex = 6;
this.ShelfAControl.WorkStatus = "暂未启动";
//
......@@ -302,11 +302,11 @@
this.ShelfBControl.ColorStatus = System.Drawing.Color.White;
this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfBControl.EquipText = "B料口";
this.ShelfBControl.Location = new System.Drawing.Point(100, 55);
this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ShelfBControl.Location = new System.Drawing.Point(671, 500);
this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4);
this.ShelfBControl.MoveInfo = "暂无出入库";
this.ShelfBControl.Name = "ShelfBControl";
this.ShelfBControl.Size = new System.Drawing.Size(88, 5);
this.ShelfBControl.Size = new System.Drawing.Size(659, 112);
this.ShelfBControl.TabIndex = 7;
this.ShelfBControl.WorkStatus = "暂未启动";
//
......@@ -327,24 +327,24 @@
this.toolStripSeparator8,
this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(125, 74);
this.contextMenuStrip1.Size = new System.Drawing.Size(113, 62);
//
// 显示ToolStripMenuItem
//
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(124, 32);
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(121, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(109, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 32);
this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26);
this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
......@@ -367,68 +367,68 @@
this.toolStripSeparator2,
this.退出ToolStripMenuItem});
this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem";
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(118, 31);
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(96, 25);
this.操作ToolStripMenuItem.Text = " 设备操作 ";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(173, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(173, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(173, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(173, 6);
//
// 启用配置模式ToolStripMenuItem
//
this.启用配置模式ToolStripMenuItem.Enabled = false;
this.启用配置模式ToolStripMenuItem.Name = "启用配置模式ToolStripMenuItem";
this.启用配置模式ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.启用配置模式ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.启用配置模式ToolStripMenuItem.Text = "启用配置模式";
this.启用配置模式ToolStripMenuItem.Click += new System.EventHandler(this.启用配置模式ToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
......@@ -449,85 +449,85 @@
this.toolStripSeparator9,
this.解锁舱门ToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(112, 31);
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25);
this.设置TToolStripMenuItem.Text = "设备调试 ";
//
// 忽略当次料叉检查ToolStripMenuItem
//
this.忽略当次料叉检查ToolStripMenuItem.Name = "忽略当次料叉检查ToolStripMenuItem";
this.忽略当次料叉检查ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.忽略当次料叉检查ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.忽略当次料叉检查ToolStripMenuItem.Text = "忽略当次料叉检查";
this.忽略当次料叉检查ToolStripMenuItem.Click += new System.EventHandler(this.忽略当次料叉检查ToolStripMenuItem_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(255, 6);
this.toolStripSeparator13.Size = new System.Drawing.Size(205, 6);
//
// a料口重置料串ToolStripMenuItem
//
this.a料口重置料串ToolStripMenuItem.Name = "a料口重置料串ToolStripMenuItem";
this.a料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.a料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.a料口重置料串ToolStripMenuItem.Text = "A料口重置料串";
this.a料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.a料口重置料串ToolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(255, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(205, 6);
this.toolStripSeparator6.Visible = false;
//
// b料口重置料串ToolStripMenuItem
//
this.b料口重置料串ToolStripMenuItem.Name = "b料口重置料串ToolStripMenuItem";
this.b料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.b料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.b料口重置料串ToolStripMenuItem.Text = "B料口重置料串";
this.b料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.b料口重置料串ToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(255, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(205, 6);
//
// 二维码学习ToolStripMenuItem
//
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(255, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(205, 6);
//
// 托盘初始化ToolStripMenuItem
//
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(255, 6);
this.toolStripSeparator16.Size = new System.Drawing.Size(205, 6);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(258, 32);
this.toolStripMenuItem3.Size = new System.Drawing.Size(208, 26);
this.toolStripMenuItem3.Text = "脆盘料号配置";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(255, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(205, 6);
//
// 解锁舱门ToolStripMenuItem
//
this.解锁舱门ToolStripMenuItem.Name = "解锁舱门ToolStripMenuItem";
this.解锁舱门ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.解锁舱门ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.解锁舱门ToolStripMenuItem.Text = "解锁舱门";
this.解锁舱门ToolStripMenuItem.Click += new System.EventHandler(this.解锁舱门ToolStripMenuItem_Click);
//
......@@ -540,37 +540,37 @@
this.toolStripSeparator11,
this.版本号ToolStripMenuItem});
this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(84, 31);
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25);
this.帮助ToolStripMenuItem.Text = " 系统 ";
//
// 清空日志ToolStripMenuItem
//
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(175, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(175, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6);
//
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......@@ -589,7 +589,7 @@
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1348, 35);
this.menuStrip1.Size = new System.Drawing.Size(1348, 29);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -605,37 +605,37 @@
this.禁用安全光栅ToolStripMenuItem,
this.启用门禁ToolStripMenuItem});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(106, 31);
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.运行参数ToolStripMenuItem.Text = "运行参数";
//
// 开机自动启动ToolStripMenuItem
//
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(254, 32);
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.开机自动启动ToolStripMenuItem.Text = "开机自动启动";
this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(251, 6);
this.toolStripSeparator15.Size = new System.Drawing.Size(203, 6);
//
// 启用蜂鸣器ToolStripMenuItem
//
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(254, 32);
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator25
//
this.toolStripSeparator25.Name = "toolStripSeparator25";
this.toolStripSeparator25.Size = new System.Drawing.Size(251, 6);
this.toolStripSeparator25.Size = new System.Drawing.Size(203, 6);
//
// aGVCancelStateToolStripMenuItem
//
this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem";
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(254, 32);
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
this.aGVCancelStateToolStripMenuItem.Visible = false;
this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click);
......@@ -643,20 +643,20 @@
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(251, 6);
this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6);
this.toolStripSeparator17.Visible = false;
//
// 禁用安全光栅ToolStripMenuItem
//
this.禁用安全光栅ToolStripMenuItem.Name = "禁用安全光栅ToolStripMenuItem";
this.禁用安全光栅ToolStripMenuItem.Size = new System.Drawing.Size(254, 32);
this.禁用安全光栅ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.禁用安全光栅ToolStripMenuItem.Text = "启用安全光栅";
this.禁用安全光栅ToolStripMenuItem.Click += new System.EventHandler(this.启用安全光栅ToolStripMenuItem_Click);
//
// 启用门禁ToolStripMenuItem
//
this.启用门禁ToolStripMenuItem.Name = "启用门禁ToolStripMenuItem";
this.启用门禁ToolStripMenuItem.Size = new System.Drawing.Size(254, 32);
this.启用门禁ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用门禁ToolStripMenuItem.Text = "启用门禁";
this.启用门禁ToolStripMenuItem.Click += new System.EventHandler(this.启用门禁ToolStripMenuItem_Click);
//
......@@ -664,7 +664,7 @@
//
this.设备恢复ToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.设备恢复ToolStripMenuItem.Name = "设备恢复ToolStripMenuItem";
this.设备恢复ToolStripMenuItem.Size = new System.Drawing.Size(106, 31);
this.设备恢复ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.设备恢复ToolStripMenuItem.Text = "设备恢复";
this.设备恢复ToolStripMenuItem.Visible = false;
this.设备恢复ToolStripMenuItem.Click += new System.EventHandler(this.设备恢复ToolStripMenuItem_Click);
......@@ -672,7 +672,7 @@
// 忽略行走机构运行期间A侧料叉ToolStripMenuItem
//
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem.Name = "忽略行走机构运行期间A侧料叉ToolStripMenuItem";
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem.Size = new System.Drawing.Size(220, 31);
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem.Size = new System.Drawing.Size(177, 25);
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem.Text = "忽略运行期间A侧料叉";
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem.Visible = false;
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem.Click += new System.EventHandler(this.忽略行走机构运行期间A侧料叉ToolStripMenuItem_Click);
......@@ -680,7 +680,7 @@
// 忽略行走机构运行期间B侧料叉ToolStripMenuItem1
//
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Name = "忽略行走机构运行期间B侧料叉ToolStripMenuItem1";
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Size = new System.Drawing.Size(219, 31);
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Size = new System.Drawing.Size(176, 25);
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Text = "忽略运行期间B侧料叉";
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Visible = false;
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Click += new System.EventHandler(this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1_Click);
......@@ -692,12 +692,12 @@
this.tableLayoutPanel2.Controls.Add(this.tabControl1, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 35);
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 29);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1348, 686);
this.tableLayoutPanel2.Size = new System.Drawing.Size(1348, 692);
this.tableLayoutPanel2.TabIndex = 97;
//
// tableLayoutPanel3
......@@ -741,9 +741,9 @@
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lblStatus});
this.statusStrip1.Location = new System.Drawing.Point(0, 695);
this.statusStrip1.Location = new System.Drawing.Point(0, 699);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1348, 26);
this.statusStrip1.Size = new System.Drawing.Size(1348, 22);
this.statusStrip1.TabIndex = 98;
this.statusStrip1.Text = "statusStrip1";
//
......@@ -751,7 +751,7 @@
//
this.lblStatus.ForeColor = System.Drawing.Color.Green;
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(69, 20);
this.lblStatus.Size = new System.Drawing.Size(56, 17);
this.lblStatus.Text = "等待启动";
//
// FrmXLRStore
......
source/XLRStoreClient/FrmXLRStore.cs
......@@ -555,7 +555,7 @@ namespace OnlineStore.XLRStore
{
lbldiancifa.Text = "干燥机电磁阀关闭";
}
if (StoreManager.XLRStore?.boxEquip?.MoveStop??false)
if (StoreManager.XLRStore?.boxEquip?.MoveStop ?? false)
{
设备恢复ToolStripMenuItem.Visible = true;
......@@ -856,6 +856,9 @@ namespace OnlineStore.XLRStore
private void 忽略当次料叉检查ToolStripMenuItem_Click(object sender, EventArgs e)
{
StoreManager.XLRStore.boxEquip.ignoreCurFork = true;
bool disablePos = ConfigHelper.Config.Get("料叉信号异常屏蔽库位启用", true);
if (disablePos)
DisablePos(StoreManager.XLRStore?.boxEquip?.MoveInfo?.MoveParam?.PosInfo?.PosId ?? "", StoreManager.XLRStore?.boxEquip?.MoveInfo?.MoveParam?.PosInfo?.barcode ?? "");
LogUtil.info(StoreManager.XLRStore.boxEquip.Name + "点击：忽略当次料叉检查");
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!