Skip to content

李娜 / SO827-AssemblyLine

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

1

1 个父辈 ac468ee4
内嵌 并排
正在显示 4 个修改的文件 包含 52 行增加 和 47 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -106,7 +106,6 @@
this.aGVCancelStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.自动保存托盘信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
this.contextMenuStrip_control = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
this.toolName = new System.Windows.Forms.ToolStripMenuItem();
......@@ -784,8 +783,7 @@
this.toolStripSeparator25,
this.aGVCancelStateToolStripMenuItem,
this.toolStripSeparator17,
this.自动保存托盘信息ToolStripMenuItem,
this.toolStripSeparator24});
this.自动保存托盘信息ToolStripMenuItem});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.运行参数ToolStripMenuItem.Text = "运行参数";
......@@ -834,11 +832,6 @@
this.自动保存托盘信息ToolStripMenuItem.Visible = false;
this.自动保存托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.自动保存托盘信息ToolStripMenuItem_Click);
//
// toolStripSeparator24
//
this.toolStripSeparator24.Name = "toolStripSeparator24";
this.toolStripSeparator24.Size = new System.Drawing.Size(203, 6);
//
// contextMenuStrip_control
//
this.contextMenuStrip_control.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -1048,7 +1041,6 @@
private System.Windows.Forms.PictureBox picLine;
private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.ToolStripMenuItem 自动保存托盘信息ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator24;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator25;
private System.Windows.Forms.Label lblCardMsg;
private System.Windows.Forms.GroupBox groupBox2;
......
source/AssemblyLineClient/useControl/ClampJawControl.Designer.cs
......@@ -30,11 +30,11 @@ namespace OnlineStore.AssemblyLine.useControl
private void InitializeComponent()
{
this.groupClamp = new System.Windows.Forms.GroupBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.chbEmpty = new System.Windows.Forms.CheckBox();
this.chbPosition = new System.Windows.Forms.CheckBox();
this.btnClampWork = new System.Windows.Forms.Button();
this.btnClampRelax = new System.Windows.Forms.Button();
this.chbPosition = new System.Windows.Forms.CheckBox();
this.chbEmpty = new System.Windows.Forms.CheckBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.groupClamp.SuspendLayout();
this.SuspendLayout();
//
......@@ -48,6 +48,7 @@ namespace OnlineStore.AssemblyLine.useControl
this.groupClamp.Controls.Add(this.chbPosition);
this.groupClamp.Controls.Add(this.btnClampWork);
this.groupClamp.Controls.Add(this.btnClampRelax);
this.groupClamp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupClamp.Location = new System.Drawing.Point(7, 4);
this.groupClamp.Name = "groupClamp";
this.groupClamp.Size = new System.Drawing.Size(218, 158);
......@@ -55,6 +56,40 @@ namespace OnlineStore.AssemblyLine.useControl
this.groupClamp.TabStop = false;
this.groupClamp.Text = "夹爪操作";
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.linkLabel1.Location = new System.Drawing.Point(167, 121);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(37, 20);
this.linkLabel1.TabIndex = 285;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "查询";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// chbEmpty
//
this.chbEmpty.AutoSize = true;
this.chbEmpty.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbEmpty.Location = new System.Drawing.Point(102, 120);
this.chbEmpty.Name = "chbEmpty";
this.chbEmpty.Size = new System.Drawing.Size(56, 24);
this.chbEmpty.TabIndex = 284;
this.chbEmpty.Text = "空抓";
this.chbEmpty.UseVisualStyleBackColor = true;
//
// chbPosition
//
this.chbPosition.AutoSize = true;
this.chbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPosition.Location = new System.Drawing.Point(9, 120);
this.chbPosition.Name = "chbPosition";
this.chbPosition.Size = new System.Drawing.Size(84, 24);
this.chbPosition.TabIndex = 283;
this.chbPosition.Text = "运动到位";
this.chbPosition.UseVisualStyleBackColor = true;
//
// btnClampWork
//
this.btnClampWork.BackColor = System.Drawing.Color.White;
......@@ -81,40 +116,6 @@ namespace OnlineStore.AssemblyLine.useControl
this.btnClampRelax.UseVisualStyleBackColor = false;
this.btnClampRelax.Click += new System.EventHandler(this.btnClampRelax_Click);
//
// chbPosition
//
this.chbPosition.AutoSize = true;
this.chbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPosition.Location = new System.Drawing.Point(9, 120);
this.chbPosition.Name = "chbPosition";
this.chbPosition.Size = new System.Drawing.Size(84, 24);
this.chbPosition.TabIndex = 283;
this.chbPosition.Text = "运动到位";
this.chbPosition.UseVisualStyleBackColor = true;
//
// chbEmpty
//
this.chbEmpty.AutoSize = true;
this.chbEmpty.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbEmpty.Location = new System.Drawing.Point(102, 120);
this.chbEmpty.Name = "chbEmpty";
this.chbEmpty.Size = new System.Drawing.Size(56, 24);
this.chbEmpty.TabIndex = 284;
this.chbEmpty.Text = "空抓";
this.chbEmpty.UseVisualStyleBackColor = true;
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.linkLabel1.Location = new System.Drawing.Point(167, 121);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(37, 20);
this.linkLabel1.TabIndex = 285;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "查询";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// ClampJawControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -350,7 +350,7 @@ namespace OnlineStore.DeviceLibrary
protected override void BaseTimerProcess()
{
if (runStatus.Equals(LineRunStatus.Wait))
if (runStatus.Equals(LineRunStatus.Wait)&&(IOManager.instance!=null))
{
//取新的Io状态
IO_VALUE fuweiValue = IOValue(IO_Type.SL_Reset_BTN);
......
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
......@@ -61,6 +61,10 @@ namespace OnlineStore.DeviceLibrary
public static IO_VALUE IOValue(string ioType, int subType)
{
if (instance == null)
{
return IO_VALUE.None;
}
IO_VALUE ioValue = IO_VALUE.None;
ConfigIO configIo = GetDI(ioType, subType);
if (configIo == null)
......@@ -88,6 +92,10 @@ namespace OnlineStore.DeviceLibrary
}
public static IO_VALUE DOValue(string ioType, int subType = 0)
{
if (instance == null)
{
return IO_VALUE.None;
}
IO_VALUE ioValue = IO_VALUE.None;
ConfigIO configIo = GetDO(ioType, subType);
......@@ -103,6 +111,10 @@ namespace OnlineStore.DeviceLibrary
}
public static IO_VALUE DIValue(string ioType, int subType)
{
if (instance == null)
{
return IO_VALUE.None;
}
IO_VALUE ioValue = IO_VALUE.None;
ConfigIO configIo = GetDI(ioType, subType);
if (configIo != null)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!