Skip to content

孙克 / RC1250-AssemblyLine

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

增加分流2功能

1 个父辈 ea3d159f
内嵌 并排
正在显示 10 个修改的文件 包含 957 行增加 和 141 行删除
RC1250-AssemblyLine.sln
...@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLineClient", "sourc ...@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLineClient", "sourc
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLineSystem", "source\AssemblyLineSystem\AssemblyLineSystem.csproj", "{7DE7A34B-77A5-465B-985B-1219FE0A9615}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLineSystem", "source\AssemblyLineSystem\AssemblyLineSystem.csproj", "{7DE7A34B-77A5-465B-985B-1219FE0A9615}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ABBRobotTest", "ABBRobotTest\ABBRobotTest.csproj", "{C147236C-D1E7-4CD1-9344-79C948110F8F}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -47,10 +45,6 @@ Global ...@@ -47,10 +45,6 @@ Global
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE7A34B-77A5-465B-985B-1219FE0A9615}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.Build.0 = Release|Any CPU {7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.Build.0 = Release|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
source/AssemblyLineClient/FrmIOStatus.Designer.cs
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
this.btnSW4Run = new System.Windows.Forms.Button(); this.btnSW4Run = new System.Windows.Forms.Button();
this.btnDriveMotor_Run = new System.Windows.Forms.Button(); this.btnDriveMotor_Run = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabIoControl = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.btnShuntClose = new System.Windows.Forms.Button(); this.btnShuntClose = new System.Windows.Forms.Button();
...@@ -65,6 +65,14 @@ ...@@ -65,6 +65,14 @@
this.btnShuntStop1 = new System.Windows.Forms.Button(); this.btnShuntStop1 = new System.Windows.Forms.Button();
this.btnShuntupdown1 = new System.Windows.Forms.Button(); this.btnShuntupdown1 = new System.Windows.Forms.Button();
this.btnShuntupdown2 = new System.Windows.Forms.Button(); this.btnShuntupdown2 = new System.Windows.Forms.Button();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.btnShunt2Close = new System.Windows.Forms.Button();
this.btnShunt2Run1 = new System.Windows.Forms.Button();
this.btnShunt2Run2 = new System.Windows.Forms.Button();
this.btnShunt2Stop2 = new System.Windows.Forms.Button();
this.btnShunt2Stop1 = new System.Windows.Forms.Button();
this.btnShunt2updown1 = new System.Windows.Forms.Button();
this.btnShunt2updown2 = new System.Windows.Forms.Button();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
...@@ -72,9 +80,10 @@ ...@@ -72,9 +80,10 @@
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabIoControl.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -540,7 +549,7 @@ ...@@ -540,7 +549,7 @@
// panel1 // panel1
// //
this.panel1.AutoScroll = true; this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.tabControl1); this.panel1.Controls.Add(this.tabIoControl);
this.panel1.Controls.Add(this.groupBox6); this.panel1.Controls.Add(this.groupBox6);
this.panel1.Controls.Add(this.groupBox4); this.panel1.Controls.Add(this.groupBox4);
this.panel1.Controls.Add(this.groupBox3); this.panel1.Controls.Add(this.groupBox3);
...@@ -553,15 +562,16 @@ ...@@ -553,15 +562,16 @@
this.panel1.Size = new System.Drawing.Size(1316, 571); this.panel1.Size = new System.Drawing.Size(1316, 571);
this.panel1.TabIndex = 248; this.panel1.TabIndex = 248;
// //
// tabControl1 // tabIoControl
// //
this.tabControl1.Controls.Add(this.tabPage1); this.tabIoControl.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabIoControl.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(924, 129); this.tabIoControl.Controls.Add(this.tabPage3);
this.tabControl1.Name = "tabControl1"; this.tabIoControl.Location = new System.Drawing.Point(924, 129);
this.tabControl1.SelectedIndex = 0; this.tabIoControl.Name = "tabIoControl";
this.tabControl1.Size = new System.Drawing.Size(380, 434); this.tabIoControl.SelectedIndex = 0;
this.tabControl1.TabIndex = 288; this.tabIoControl.Size = new System.Drawing.Size(380, 434);
this.tabIoControl.TabIndex = 288;
// //
// tabPage1 // tabPage1
// //
...@@ -605,7 +615,7 @@ ...@@ -605,7 +615,7 @@
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(372, 404); this.tabPage2.Size = new System.Drawing.Size(372, 404);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 分流横移操作 "; this.tabPage2.Text = " 分流横移1操作 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
// //
// btnShuntClose // btnShuntClose
...@@ -693,6 +703,107 @@ ...@@ -693,6 +703,107 @@
this.btnShuntupdown2.UseVisualStyleBackColor = true; this.btnShuntupdown2.UseVisualStyleBackColor = true;
this.btnShuntupdown2.Click += new System.EventHandler(this.btnShuntupdown2_Click); this.btnShuntupdown2.Click += new System.EventHandler(this.btnShuntupdown2_Click);
// //
// tabPage3
//
this.tabPage3.Controls.Add(this.btnShunt2Close);
this.tabPage3.Controls.Add(this.btnShunt2Run1);
this.tabPage3.Controls.Add(this.btnShunt2Run2);
this.tabPage3.Controls.Add(this.btnShunt2Stop2);
this.tabPage3.Controls.Add(this.btnShunt2Stop1);
this.tabPage3.Controls.Add(this.btnShunt2updown1);
this.tabPage3.Controls.Add(this.btnShunt2updown2);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(372, 404);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 分流横移2操作";
this.tabPage3.UseVisualStyleBackColor = true;
//
// btnShunt2Close
//
this.btnShunt2Close.BackColor = System.Drawing.Color.White;
this.btnShunt2Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2Close.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2Close.Location = new System.Drawing.Point(181, 195);
this.btnShunt2Close.Name = "btnShunt2Close";
this.btnShunt2Close.Size = new System.Drawing.Size(153, 37);
this.btnShunt2Close.TabIndex = 301;
this.btnShunt2Close.Text = "关闭所有分流2DO";
this.btnShunt2Close.UseVisualStyleBackColor = false;
this.btnShunt2Close.Click += new System.EventHandler(this.btnShunt2Close_Click);
//
// btnShunt2Run1
//
this.btnShunt2Run1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2Run1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2Run1.Location = new System.Drawing.Point(18, 128);
this.btnShunt2Run1.Name = "btnShunt2Run1";
this.btnShunt2Run1.Size = new System.Drawing.Size(153, 37);
this.btnShunt2Run1.TabIndex = 295;
this.btnShunt2Run1.Text = "分流2-机构1皮带运行";
this.btnShunt2Run1.UseVisualStyleBackColor = true;
this.btnShunt2Run1.Click += new System.EventHandler(this.btnShunt2Run1_Click);
//
// btnShunt2Run2
//
this.btnShunt2Run2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2Run2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2Run2.Location = new System.Drawing.Point(181, 128);
this.btnShunt2Run2.Name = "btnShunt2Run2";
this.btnShunt2Run2.Size = new System.Drawing.Size(153, 37);
this.btnShunt2Run2.TabIndex = 298;
this.btnShunt2Run2.Text = "分流2-机构2皮带运行";
this.btnShunt2Run2.UseVisualStyleBackColor = true;
this.btnShunt2Run2.Click += new System.EventHandler(this.btnShunt2Run2_Click);
//
// btnShunt2Stop2
//
this.btnShunt2Stop2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2Stop2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2Stop2.Location = new System.Drawing.Point(181, 23);
this.btnShunt2Stop2.Name = "btnShunt2Stop2";
this.btnShunt2Stop2.Size = new System.Drawing.Size(153, 37);
this.btnShunt2Stop2.TabIndex = 299;
this.btnShunt2Stop2.Text = "分流2-后端阻挡下降";
this.btnShunt2Stop2.UseVisualStyleBackColor = true;
this.btnShunt2Stop2.Click += new System.EventHandler(this.btnShunt2Stop2_Click);
//
// btnShunt2Stop1
//
this.btnShunt2Stop1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2Stop1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2Stop1.Location = new System.Drawing.Point(18, 23);
this.btnShunt2Stop1.Name = "btnShunt2Stop1";
this.btnShunt2Stop1.Size = new System.Drawing.Size(153, 37);
this.btnShunt2Stop1.TabIndex = 296;
this.btnShunt2Stop1.Text = "分流2-前端阻挡下降";
this.btnShunt2Stop1.UseVisualStyleBackColor = true;
this.btnShunt2Stop1.Click += new System.EventHandler(this.btnShunt2Stop1_Click);
//
// btnShunt2updown1
//
this.btnShunt2updown1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2updown1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2updown1.Location = new System.Drawing.Point(18, 76);
this.btnShunt2updown1.Name = "btnShunt2updown1";
this.btnShunt2updown1.Size = new System.Drawing.Size(153, 37);
this.btnShunt2updown1.TabIndex = 297;
this.btnShunt2updown1.Text = "分流2-机构1上升";
this.btnShunt2updown1.UseVisualStyleBackColor = true;
this.btnShunt2updown1.Click += new System.EventHandler(this.btnShunt2updown1_Click);
//
// btnShunt2updown2
//
this.btnShunt2updown2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2updown2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2updown2.Location = new System.Drawing.Point(181, 76);
this.btnShunt2updown2.Name = "btnShunt2updown2";
this.btnShunt2updown2.Size = new System.Drawing.Size(153, 37);
this.btnShunt2updown2.TabIndex = 300;
this.btnShunt2updown2.Text = "分流2-机构2上升";
this.btnShunt2updown2.UseVisualStyleBackColor = true;
this.btnShunt2updown2.Click += new System.EventHandler(this.btnShunt2updown2_Click);
//
// groupBox6 // groupBox6
// //
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
...@@ -741,10 +852,11 @@ ...@@ -741,10 +852,11 @@
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false); this.tabIoControl.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout(); this.tabPage1.PerformLayout();
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.groupBox6.ResumeLayout(false); this.groupBox6.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
...@@ -792,7 +904,7 @@ ...@@ -792,7 +904,7 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
private System.Windows.Forms.Button btnsw2StopDown; private System.Windows.Forms.Button btnsw2StopDown;
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabControl tabIoControl;
private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.Button btnShuntRun1; private System.Windows.Forms.Button btnShuntRun1;
...@@ -802,6 +914,14 @@ ...@@ -802,6 +914,14 @@
private System.Windows.Forms.Button btnShuntupdown1; private System.Windows.Forms.Button btnShuntupdown1;
private System.Windows.Forms.Button btnShuntupdown2; private System.Windows.Forms.Button btnShuntupdown2;
private System.Windows.Forms.Button btnShuntClose; private System.Windows.Forms.Button btnShuntClose;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.Button btnShunt2Close;
private System.Windows.Forms.Button btnShunt2Run1;
private System.Windows.Forms.Button btnShunt2Run2;
private System.Windows.Forms.Button btnShunt2Stop2;
private System.Windows.Forms.Button btnShunt2Stop1;
private System.Windows.Forms.Button btnShunt2updown1;
private System.Windows.Forms.Button btnShunt2updown2;
} }
} }
source/AssemblyLineClient/FrmIOStatus.cs
...@@ -409,5 +409,41 @@ namespace OnlineStore.AssemblyLine ...@@ -409,5 +409,41 @@ namespace OnlineStore.AssemblyLine
IOManager.IOMove(IO_Type.Shunt_MotorRun1, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_MotorRun1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_MotorRun2, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_MotorRun2, IO_VALUE.LOW);
} }
private void btnShunt2Stop1_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Stop1, "分流2-前端阻挡下降", "分流2-前端阻挡上升", IO_Type.Shunt2_StopDown1_Front);
}
private void btnShunt2Stop2_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Stop2, "分流2-后端阻挡下降", "分流2-后端阻挡上升", IO_Type.Shunt2_StopDown2_Back);
}
private void btnShunt2updown1_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2updown1, "分流2-机构1上升", "分流2-机构1下降", IO_Type.Shunt2_TopCylinder_Down1, IO_Type.Shunt2_TopCylinder_Up1);
}
private void btnShunt2updown2_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2updown2, "分流2-机构1上升", "分流2-机构1下降", IO_Type.Shunt2_TopCylinder_Down2, IO_Type.Shunt2_TopCylinder_Up2);
}
private void btnShunt2Run1_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Run1, "分流2-机构1皮带运行", "分流2-机构1皮带停止", IO_Type.Shunt2_MotorRun1);
}
private void btnShunt2Run2_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Run2, "分流2-机构2皮带运行", "分流2-机构2皮带停止", IO_Type.Shunt2_MotorRun2);
}
private void btnShunt2Close_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_StopDown2_Back, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Down1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Up1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Down2, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Up2, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_MotorRun2, IO_VALUE.LOW);
}
} }
} }
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -32,16 +32,18 @@ ...@@ -32,16 +32,18 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLineStore)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLineStore));
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.listView1 = new System.Windows.Forms.ListView(); this.panel1 = new System.Windows.Forms.Panel();
this.chbShunt2 = new System.Windows.Forms.CheckBox();
this.btnShunt2Reset = new System.Windows.Forms.Button();
this.btnShuntReset = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.chbShunt = new System.Windows.Forms.CheckBox(); this.chbShunt = new System.Windows.Forms.CheckBox();
this.btnShuntReset = new System.Windows.Forms.Button();
this.chbTrayCheck = new System.Windows.Forms.CheckBox(); this.chbTrayCheck = new System.Windows.Forms.CheckBox();
this.chbBuzzer = new System.Windows.Forms.CheckBox(); this.chbBuzzer = new System.Windows.Forms.CheckBox();
this.btnClearLog = new System.Windows.Forms.Button();
this.chbAGV = new System.Windows.Forms.CheckBox(); this.chbAGV = new System.Windows.Forms.CheckBox();
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.chkDebug = new System.Windows.Forms.CheckBox(); this.listView1 = new System.Windows.Forms.ListView();
this.btnClearLog = new System.Windows.Forms.Button();
this.logBox = new System.Windows.Forms.RichTextBox(); this.logBox = new System.Windows.Forms.RichTextBox();
this.lblCID = new System.Windows.Forms.Label(); this.lblCID = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
...@@ -80,7 +82,6 @@ ...@@ -80,7 +82,6 @@
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.停止TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.停止TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.入库模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.设置TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.设置TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
...@@ -104,8 +105,16 @@ ...@@ -104,8 +105,16 @@
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.运行参数ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.开机自动启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
this.启用蜂鸣器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.aGVCancelStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.panel1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
...@@ -131,8 +140,9 @@ ...@@ -131,8 +140,9 @@
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.listView1); this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Controls.Add(this.groupBox2); this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.listView1);
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Controls.Add(this.lblCID); this.tabPage1.Controls.Add(this.lblCID);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
...@@ -145,135 +155,159 @@ ...@@ -145,135 +155,159 @@
this.tabPage1.Text = "状态信息"; this.tabPage1.Text = "状态信息";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// listView1 // panel1
//
this.panel1.Controls.Add(this.chbShunt2);
this.panel1.Controls.Add(this.btnShunt2Reset);
this.panel1.Controls.Add(this.btnShuntReset);
this.panel1.Location = new System.Drawing.Point(720, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(179, 157);
this.panel1.TabIndex = 199;
//
// chbShunt2
//
this.chbShunt2.AutoSize = true;
this.chbShunt2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt2.Location = new System.Drawing.Point(22, 72);
this.chbShunt2.Name = "chbShunt2";
this.chbShunt2.Size = new System.Drawing.Size(120, 24);
this.chbShunt2.TabIndex = 202;
this.chbShunt2.Text = "禁用分流横移2";
this.chbShunt2.UseVisualStyleBackColor = true;
this.chbShunt2.CheckedChanged += new System.EventHandler(this.chbShunt2_CheckedChanged);
//
// btnShunt2Reset
//
this.btnShunt2Reset.BackColor = System.Drawing.Color.White;
this.btnShunt2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2Reset.Location = new System.Drawing.Point(18, 105);
this.btnShunt2Reset.Name = "btnShunt2Reset";
this.btnShunt2Reset.Size = new System.Drawing.Size(133, 40);
this.btnShunt2Reset.TabIndex = 201;
this.btnShunt2Reset.Text = "分流横移2复位";
this.btnShunt2Reset.UseVisualStyleBackColor = false;
this.btnShunt2Reset.Click += new System.EventHandler(this.btnShunt2Reset_Click);
// //
this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) // btnShuntReset
| System.Windows.Forms.AnchorStyles.Left))); //
this.listView1.BackColor = System.Drawing.Color.White; this.btnShuntReset.BackColor = System.Drawing.Color.White;
this.listView1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnShuntReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.listView1.FullRowSelect = true; this.btnShuntReset.Location = new System.Drawing.Point(18, 12);
this.listView1.GridLines = true; this.btnShuntReset.Name = "btnShuntReset";
this.listView1.HideSelection = false; this.btnShuntReset.Size = new System.Drawing.Size(133, 40);
this.listView1.Location = new System.Drawing.Point(9, 7); this.btnShuntReset.TabIndex = 199;
this.listView1.MultiSelect = false; this.btnShuntReset.Text = "分流横移1复位";
this.listView1.Name = "listView1"; this.btnShuntReset.UseVisualStyleBackColor = false;
this.listView1.Size = new System.Drawing.Size(705, 599); this.btnShuntReset.Click += new System.EventHandler(this.btnShuntReset_Click);
this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged);
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.chbShunt); this.groupBox2.Controls.Add(this.chbShunt);
this.groupBox2.Controls.Add(this.btnShuntReset);
this.groupBox2.Controls.Add(this.chbTrayCheck); this.groupBox2.Controls.Add(this.chbTrayCheck);
this.groupBox2.Controls.Add(this.chbBuzzer); this.groupBox2.Controls.Add(this.chbBuzzer);
this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Controls.Add(this.chbAGV); this.groupBox2.Controls.Add(this.chbAGV);
this.groupBox2.Controls.Add(this.chbAutoRun); this.groupBox2.Controls.Add(this.chbAutoRun);
this.groupBox2.Controls.Add(this.chkDebug);
this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox2.Location = new System.Drawing.Point(720, 4); this.groupBox2.Location = new System.Drawing.Point(395, 32);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(308, 157); this.groupBox2.Size = new System.Drawing.Size(298, 117);
this.groupBox2.TabIndex = 196; this.groupBox2.TabIndex = 196;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Visible = false;
// //
// chbShunt // chbShunt
// //
this.chbShunt.AutoSize = true; this.chbShunt.AutoSize = true;
this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt.Location = new System.Drawing.Point(8, 77); this.chbShunt.Location = new System.Drawing.Point(8, 77);
this.chbShunt.Name = "chbShunt"; this.chbShunt.Name = "chbShunt";
this.chbShunt.Size = new System.Drawing.Size(140, 24); this.chbShunt.Size = new System.Drawing.Size(130, 21);
this.chbShunt.TabIndex = 200; this.chbShunt.TabIndex = 200;
this.chbShunt.Text = "禁用分流横移功能"; this.chbShunt.Text = "禁用分流横移1功能";
this.chbShunt.UseVisualStyleBackColor = true; this.chbShunt.UseVisualStyleBackColor = true;
this.chbShunt.CheckedChanged += new System.EventHandler(this.chbShunt_CheckedChanged); this.chbShunt.CheckedChanged += new System.EventHandler(this.chbShunt_CheckedChanged);
// //
// btnShuntReset
//
this.btnShuntReset.BackColor = System.Drawing.Color.White;
this.btnShuntReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShuntReset.Location = new System.Drawing.Point(16, 112);
this.btnShuntReset.Name = "btnShuntReset";
this.btnShuntReset.Size = new System.Drawing.Size(118, 35);
this.btnShuntReset.TabIndex = 199;
this.btnShuntReset.Text = "分流横移模块复位";
this.btnShuntReset.UseVisualStyleBackColor = false;
this.btnShuntReset.Click += new System.EventHandler(this.btnShuntReset_Click);
//
// chbTrayCheck // chbTrayCheck
// //
this.chbTrayCheck.AutoSize = true; this.chbTrayCheck.AutoSize = true;
this.chbTrayCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbTrayCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbTrayCheck.Location = new System.Drawing.Point(154, 17); this.chbTrayCheck.Location = new System.Drawing.Point(154, 17);
this.chbTrayCheck.Name = "chbTrayCheck"; this.chbTrayCheck.Name = "chbTrayCheck";
this.chbTrayCheck.Size = new System.Drawing.Size(140, 24); this.chbTrayCheck.Size = new System.Drawing.Size(123, 21);
this.chbTrayCheck.TabIndex = 197; this.chbTrayCheck.TabIndex = 197;
this.chbTrayCheck.Text = "启用托盘顺序检测"; this.chbTrayCheck.Text = "启用托盘顺序检测";
this.chbTrayCheck.UseVisualStyleBackColor = true; this.chbTrayCheck.UseVisualStyleBackColor = true;
this.chbTrayCheck.Visible = false;
this.chbTrayCheck.CheckedChanged += new System.EventHandler(this.chbTrayCheck_CheckedChanged); this.chbTrayCheck.CheckedChanged += new System.EventHandler(this.chbTrayCheck_CheckedChanged);
// //
// chbBuzzer // chbBuzzer
// //
this.chbBuzzer.AutoSize = true; this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(8, 47); this.chbBuzzer.Location = new System.Drawing.Point(8, 47);
this.chbBuzzer.Name = "chbBuzzer"; this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24); this.chbBuzzer.Size = new System.Drawing.Size(87, 21);
this.chbBuzzer.TabIndex = 196; this.chbBuzzer.TabIndex = 196;
this.chbBuzzer.Text = "启用蜂鸣器"; this.chbBuzzer.Text = "启用蜂鸣器";
this.chbBuzzer.UseVisualStyleBackColor = true; this.chbBuzzer.UseVisualStyleBackColor = true;
this.chbBuzzer.CheckedChanged += new System.EventHandler(this.chbBuzzer_CheckedChanged); this.chbBuzzer.CheckedChanged += new System.EventHandler(this.chbBuzzer_CheckedChanged);
// //
// btnClearLog
//
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(154, 77);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(85, 35);
this.btnClearLog.TabIndex = 190;
this.btnClearLog.Text = "清空日志";
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// chbAGV // chbAGV
// //
this.chbAGV.AutoSize = true; 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAGV.Location = new System.Drawing.Point(154, 47); this.chbAGV.Location = new System.Drawing.Point(154, 47);
this.chbAGV.Name = "chbAGV"; this.chbAGV.Name = "chbAGV";
this.chbAGV.Size = new System.Drawing.Size(138, 24); this.chbAGV.Size = new System.Drawing.Size(121, 21);
this.chbAGV.TabIndex = 198; this.chbAGV.TabIndex = 198;
this.chbAGV.Text = "AGV cancelState"; this.chbAGV.Text = "AGV cancelState";
this.chbAGV.UseVisualStyleBackColor = true; this.chbAGV.UseVisualStyleBackColor = true;
this.chbAGV.Visible = false;
this.chbAGV.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); this.chbAGV.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
// //
// chbAutoRun // chbAutoRun
// //
this.chbAutoRun.AutoSize = true; 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(8, 17); this.chbAutoRun.Location = new System.Drawing.Point(8, 17);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(112, 24); this.chbAutoRun.Size = new System.Drawing.Size(99, 21);
this.chbAutoRun.TabIndex = 94; this.chbAutoRun.TabIndex = 94;
this.chbAutoRun.Text = "开机自动启动"; this.chbAutoRun.Text = "开机自动启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged); this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
// //
// chkDebug // listView1
//
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(154, 77);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194;
this.chkDebug.Text = "debug";
this.chkDebug.UseVisualStyleBackColor = true;
//
// btnClearLog
// //
this.btnClearLog.BackColor = System.Drawing.Color.White; this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.Location = new System.Drawing.Point(154, 112); this.listView1.BackColor = System.Drawing.Color.White;
this.btnClearLog.Name = "btnClearLog"; this.listView1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Size = new System.Drawing.Size(118, 35); this.listView1.FullRowSelect = true;
this.btnClearLog.TabIndex = 190; this.listView1.GridLines = true;
this.btnClearLog.Text = "清空日志"; this.listView1.HideSelection = false;
this.btnClearLog.UseVisualStyleBackColor = false; this.listView1.Location = new System.Drawing.Point(9, 7);
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click); this.listView1.MultiSelect = false;
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(705, 599);
this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged);
// //
// logBox // logBox
// //
...@@ -312,7 +346,7 @@ ...@@ -312,7 +346,7 @@
this.groupBox3.Controls.Add(this.cmbTray); this.groupBox3.Controls.Add(this.cmbTray);
this.groupBox3.Controls.Add(this.btnUpdateTray); this.groupBox3.Controls.Add(this.btnUpdateTray);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(448, 72); this.groupBox3.Location = new System.Drawing.Point(720, 97);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(600, 61); this.groupBox3.Size = new System.Drawing.Size(600, 61);
this.groupBox3.TabIndex = 197; this.groupBox3.TabIndex = 197;
...@@ -421,7 +455,7 @@ ...@@ -421,7 +455,7 @@
// //
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(1034, 21); this.lblMoveInfo.Location = new System.Drawing.Point(925, 7);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17); this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 196; this.lblMoveInfo.TabIndex = 196;
...@@ -538,9 +572,9 @@ ...@@ -538,9 +572,9 @@
this.lblWarnMsg.AutoEllipsis = true; this.lblWarnMsg.AutoEllipsis = true;
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(308, 3); this.lblWarnMsg.Location = new System.Drawing.Point(351, 3);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1028, 75); this.lblWarnMsg.Size = new System.Drawing.Size(985, 75);
this.lblWarnMsg.TabIndex = 96; this.lblWarnMsg.TabIndex = 96;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -596,7 +630,6 @@ ...@@ -596,7 +630,6 @@
this.toolStripSeparator3, this.toolStripSeparator3,
this.停止TToolStripMenuItem, this.停止TToolStripMenuItem,
this.toolStripSeparator5, this.toolStripSeparator5,
this.入库模式ToolStripMenuItem,
this.toolStripSeparator2, this.toolStripSeparator2,
this.退出ToolStripMenuItem}); this.退出ToolStripMenuItem});
this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem"; this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem";
...@@ -644,13 +677,6 @@ ...@@ -644,13 +677,6 @@
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6);
// //
// 入库模式ToolStripMenuItem
//
this.入库模式ToolStripMenuItem.Name = "入库模式ToolStripMenuItem";
this.入库模式ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.入库模式ToolStripMenuItem.Text = "入库模式";
this.入库模式ToolStripMenuItem.Visible = false;
//
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
...@@ -687,7 +713,7 @@ ...@@ -687,7 +713,7 @@
// 扫码测试ToolStripMenuItem // 扫码测试ToolStripMenuItem
// //
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem"; this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试"; this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Visible = false; this.扫码测试ToolStripMenuItem.Visible = false;
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click); this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
...@@ -695,73 +721,73 @@ ...@@ -695,73 +721,73 @@
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator6.Visible = false; this.toolStripSeparator6.Visible = false;
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习"; this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click); this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
// //
// 托盘初始化ToolStripMenuItem // 托盘初始化ToolStripMenuItem
// //
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem"; this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码"; this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click); this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
// //
// iO模块状态ToolStripMenuItem // iO模块状态ToolStripMenuItem
// //
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem"; this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.iO模块状态ToolStripMenuItem.Text = "IO模块状态"; this.iO模块状态ToolStripMenuItem.Text = "IO模块状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click); this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
// //
// toolStripSeparator13 // toolStripSeparator13
// //
this.toolStripSeparator13.Name = "toolStripSeparator13"; this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6);
// //
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(176, 26); this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "AGV调试"; this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
// //
// toolStripSeparator14 // toolStripSeparator14
// //
this.toolStripSeparator14.Name = "toolStripSeparator14"; this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
// //
// 查看托盘信息ToolStripMenuItem // 查看托盘信息ToolStripMenuItem
// //
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem"; this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息"; this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click); this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
// //
// 清空托盘信息ToolStripMenuItem // 清空托盘信息ToolStripMenuItem
// //
this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem"; this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息"; this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click); this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
// //
...@@ -814,6 +840,7 @@ ...@@ -814,6 +840,7 @@
this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.操作ToolStripMenuItem, this.操作ToolStripMenuItem,
this.运行参数ToolStripMenuItem,
this.设置TToolStripMenuItem, this.设置TToolStripMenuItem,
this.帮助ToolStripMenuItem}); this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
...@@ -822,6 +849,56 @@ ...@@ -822,6 +849,56 @@
this.menuStrip1.TabIndex = 4; this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
// 运行参数ToolStripMenuItem
//
this.运行参数ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.开机自动启动ToolStripMenuItem,
this.toolStripSeparator15,
this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator16,
this.aGVCancelStateToolStripMenuItem,
this.toolStripSeparator17});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.运行参数ToolStripMenuItem.Text = "运行参数";
//
// 开机自动启动ToolStripMenuItem
//
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
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(203, 6);
//
// 启用蜂鸣器ToolStripMenuItem
//
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(203, 6);
//
// aGVCancelStateToolStripMenuItem
//
this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem";
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click);
//
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6);
this.toolStripSeparator17.Visible = false;
//
// FrmLineStore // FrmLineStore
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -845,6 +922,8 @@ ...@@ -845,6 +922,8 @@
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout(); this.tabPage1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
...@@ -877,7 +956,6 @@ ...@@ -877,7 +956,6 @@
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label lblWarnMsg; private System.Windows.Forms.Label lblWarnMsg;
private System.Windows.Forms.CheckBox chkDebug;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.TextBox txtPosId; private System.Windows.Forms.TextBox txtPosId;
private System.Windows.Forms.ComboBox cmbBoxIndex; private System.Windows.Forms.ComboBox cmbBoxIndex;
...@@ -909,7 +987,6 @@ ...@@ -909,7 +987,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripMenuItem 停止TToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 停止TToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripMenuItem 入库模式ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem 退出ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 退出ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 设置TToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 设置TToolStripMenuItem;
...@@ -935,6 +1012,16 @@ ...@@ -935,6 +1012,16 @@
private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.Button btnShuntReset; private System.Windows.Forms.Button btnShuntReset;
private System.Windows.Forms.CheckBox chbShunt; private System.Windows.Forms.CheckBox chbShunt;
private System.Windows.Forms.ToolStripMenuItem 运行参数ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 开机自动启动ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 启用蜂鸣器ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.CheckBox chbShunt2;
private System.Windows.Forms.Button btnShunt2Reset;
private System.Windows.Forms.ToolStripMenuItem aGVCancelStateToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator17;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -125,6 +125,22 @@ namespace OnlineStore.AssemblyLine ...@@ -125,6 +125,22 @@ namespace OnlineStore.AssemblyLine
{ {
cmbTray.Items.Add(i.ToString()); cmbTray.Items.Add(i.ToString());
} }
if (autoValue.Equals(1))
{
开机自动启动ToolStripMenuItem.Text = gouStr + " 开机自动启动";
}
else
{
开机自动启动ToolStripMenuItem.Text = "开机自动启动";
}
if (LineManager.UseBuzzer)
{
启用蜂鸣器ToolStripMenuItem.Text =gouStr+ "启用蜂鸣器";
}
else
{
启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
}
cmbTrayType.SelectedIndex = 0; cmbTrayType.SelectedIndex = 0;
cmbTray.SelectedIndex = 0; cmbTray.SelectedIndex = 0;
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
...@@ -436,11 +452,6 @@ namespace OnlineStore.AssemblyLine ...@@ -436,11 +452,6 @@ namespace OnlineStore.AssemblyLine
LogUtil.ClearLog(); LogUtil.ClearLog();
} }
private void debug_enable_checkBox_CheckedChanged(object sender, EventArgs e)
{
LogUtil.debug_opened = chkDebug.Checked;
}
private void btnCopyLog_Click(object sender, EventArgs e) private void btnCopyLog_Click(object sender, EventArgs e)
{ {
Clipboard.SetDataObject(logBox.Text); Clipboard.SetDataObject(logBox.Text);
...@@ -488,7 +499,15 @@ namespace OnlineStore.AssemblyLine ...@@ -488,7 +499,15 @@ namespace OnlineStore.AssemblyLine
//if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing)) //if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing))
//{ //{
// //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）"; // //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
//}
if (AgvClient.CurrCancelState)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
lblStatus.Text = lineBean.GetRunStr() + canScanCode; lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString(); string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time+ LineManager.Line.WarnMsg + "\r\n"; string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time+ LineManager.Line.WarnMsg + "\r\n";
...@@ -1000,7 +1019,7 @@ namespace OnlineStore.AssemblyLine ...@@ -1000,7 +1019,7 @@ namespace OnlineStore.AssemblyLine
MessageBox.Show(lineBean.Name + "流水线未启动，无法复位"); MessageBox.Show(lineBean.Name + "流水线未启动，无法复位");
return; return;
} }
LogUtil.info(Name + "点击 分流模块复位 按钮复位"); LogUtil.info(Name + "点击 分流模块1复位 按钮复位");
lineBean.ShuntStop(); lineBean.ShuntStop();
} }
...@@ -1015,7 +1034,106 @@ namespace OnlineStore.AssemblyLine ...@@ -1015,7 +1034,106 @@ namespace OnlineStore.AssemblyLine
return; return;
} }
lineBean.DisableShunt = (chbShunt.Checked); lineBean.DisableShunt = (chbShunt.Checked);
LogUtil.info("勾选 禁用分流横移功能：lineBean.DisableShunt =" + lineBean.DisableShunt); LogUtil.info("勾选 禁用分流横移1功能：lineBean.DisableShunt =" + lineBean.DisableShunt);
}
private string gouStr = "✔";
private void 开机自动启动ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (开机自动启动ToolStripMenuItem.Text.Contains(gouStr))
{
ConfigAppSettings.SaveValue(Setting_Init.App_AutoRun, 0);
ManagerUtil.AutoRun(Application.ExecutablePath, false);
开机自动启动ToolStripMenuItem.Text = "开机自动启动";
}
else
{
ConfigAppSettings.SaveValue(Setting_Init.App_AutoRun, 1);
ManagerUtil.AutoRun(Application.ExecutablePath, true);
开机自动启动ToolStripMenuItem.Text = gouStr + "开机自动启动";
}
LogUtil.info(Name + " 点击：" + 开机自动启动ToolStripMenuItem.Text);
}
private void 启用蜂鸣器ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = !启用蜂鸣器ToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(LineManager.UseBuzzer))
{
return;
}
LineManager.UseBuzzer = result;
ConfigAppSettings.SaveValue(Setting_Init.UseBuzzer, (LineManager.UseBuzzer ? 1 : 0));
if (result)
{
启用蜂鸣器ToolStripMenuItem.Text = gouStr + " 启用蜂鸣器";
}
else
{
启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
}
LogUtil.info(Name + " 点击：" + 启用蜂鸣器ToolStripMenuItem.Text);
} }
private void btnShunt2Reset_Click(object sender, EventArgs e)
{
if (lineBean.runStatus.Equals(LineRunStatus.Wait))
{
MessageBox.Show(lineBean.Name + "流水线未启动，无法复位");
return;
}
LogUtil.info(Name + "点击 分流模块2复位 按钮复位");
lineBean.Shunt2Stop();
}
private void chbShunt2_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (chbShunt2.Checked.Equals(lineBean.DisableShunt2))
{
return;
}
lineBean.DisableShunt2 = (chbShunt2.Checked);
LogUtil.info("勾选 禁用分流横移2功能：lineBean.DisableShunt2 =" + lineBean.DisableShunt2);
}
private void aGVCancelStateToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = !aGVCancelStateToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(AgvClient.CurrCancelState))
{
return;
}
AgvClient.SetCancelState(result);
//robot.XrayBean.OpenXLine = result;
if (result)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
LogUtil.info(Name + " 点击：" + aGVCancelStateToolStripMenuItem.Text);
}
} }
} }
source/AssemblyLineClient/记录.txt
20200825 20200902
入料模块获取库位号时不等待料串上升到位。 增加分流横移2，位置在进仓4-5，进仓14-15中间。
当是首盘料时，如果到达出料口4且空闲中，抓料到皮带线。 横移条件：
1，进仓，15,16,17,18 ，料仓入库
2. 紧急料，需要到出料四
3. 入库NG料，需要到出料四
4. 必须走皮带线3,皮带线4的出料
20200825
入料模块获取库位号时不等待料串上升到位。
当是首盘料时，如果到达出料口4且空闲中，抓料到皮带线。
20200817 20200817
紧急出料从入料NG口出 紧急出料从入料NG口出
分盘料从入料4出 分盘料从入料4出
20200812 20200812
分流bug修改。 分流bug修改。
httpPost方法修改。 httpPost方法修改。
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -66,7 +66,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -66,7 +66,8 @@ namespace OnlineStore.DeviceLibrary
this.DeviceID = lineConfig.Id; this.DeviceID = lineConfig.Id;
SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41"); SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41");
SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23"); SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23");
Shunt_MoveInfo = new LineMoveInfo(DeviceID, "分流横移"); Shunt_MoveInfo = new LineMoveInfo(DeviceID, "分流横移1");
Shunt2_MoveInfo = new LineMoveInfo(DeviceID, "分流横移2");
MoveInfo = new LineMoveInfo(DeviceID, "[流水线-Move] "); MoveInfo = new LineMoveInfo(DeviceID, "[流水线-Move] ");
Name = (" 流水线_" + Config.CID + " ").ToUpper(); Name = (" 流水线_" + Config.CID + " ").ToUpper();
...@@ -363,8 +364,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -363,8 +364,11 @@ namespace OnlineStore.DeviceLibrary
//分流模块复位 //分流模块复位
ShuntStop(); ShuntStop();
Shunt2Stop();
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1); CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1);
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2); CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up2, IO_Type.Shunt2_TopCylinder_Down2);
} }
public override bool Reset() public override bool Reset()
...@@ -464,6 +468,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -464,6 +468,7 @@ namespace OnlineStore.DeviceLibrary
SideWayStop(); SideWayStop();
ShuntStop(); ShuntStop();
Shunt2Stop();
runStatus = LineRunStatus.Wait; runStatus = LineRunStatus.Wait;
ledProcessTimer.Enabled = false; ledProcessTimer.Enabled = false;
...@@ -509,6 +514,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -509,6 +514,7 @@ namespace OnlineStore.DeviceLibrary
SideWayStop(); SideWayStop();
ShuntStop(); ShuntStop();
Shunt2Stop();
foreach (EquipBase equip in this.AllEquipMap.Values) foreach (EquipBase equip in this.AllEquipMap.Values)
{ {
if (equip.runStatus>LineRunStatus.Wait) if (equip.runStatus>LineRunStatus.Wait)
...@@ -815,6 +821,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -815,6 +821,8 @@ namespace OnlineStore.DeviceLibrary
SideWayTimerProcess(); SideWayTimerProcess();
ShuntTimerProcess(); ShuntTimerProcess();
Shunt2TimerProcess();
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -911,6 +919,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -911,6 +919,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW); IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW);
SideWayStop(); SideWayStop();
ShuntStop(); ShuntStop();
Shunt2Stop();
} }
protected override void ResetProcess() protected override void ResetProcess()
...@@ -1017,8 +1026,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1017,8 +1026,10 @@ namespace OnlineStore.DeviceLibrary
msg += "横移41托盘：" + Sw41TrayNum.ToString().PadLeft(2,'0') + "：" + SW41_MoveInfo.MoveType + " " + SW41_MoveInfo.MoveStep + "\n"; msg += "横移41托盘：" + Sw41TrayNum.ToString().PadLeft(2,'0') + "：" + SW41_MoveInfo.MoveType + " " + SW41_MoveInfo.MoveStep + "\n";
msg += "横移23托盘：" + Sw23TrayNum.ToString().PadLeft(2,'0') + "：" + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n"; msg += "横移23托盘：" + Sw23TrayNum.ToString().PadLeft(2,'0') + "：" + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n";
msg += "分流托盘： " + ShuntTrayNum + " (" + ShuntWaitTrayNum + ")\n"; //msg += "分流1托盘： " + ShuntTrayNum + " (" + ShuntWaitTrayNum + ")\n";
msg += "分流横移： " + Shunt_MoveInfo.MoveType + " " + Shunt_MoveInfo.MoveStep + "\n"; msg += "分流1： " + Shunt_MoveInfo.MoveType + " " + Shunt_MoveInfo.MoveStep +" "+ ShuntTrayNum + " (" + ShuntWaitTrayNum + ") " + "\n";
//msg += "分流2托盘： " + Shunt2TrayNum + " (" + Shunt2WaitTrayNum + ")\n";
msg += "分流2： " + Shunt2_MoveInfo.MoveType + " " + Shunt2_MoveInfo.MoveStep + " " + Shunt2TrayNum + "\n";
return msg; return msg;
} }
......
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
...@@ -24,7 +24,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -24,7 +24,7 @@ namespace OnlineStore.DeviceLibrary
/// 判断进仓9第二个阻挡是否可以下降 /// 判断进仓9第二个阻挡是否可以下降
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public bool Move9CanStop2Down(int deviceId, int trayNum) internal bool Move9CanStop2Down(int deviceId, int trayNum)
{ {
if (DisableShunt) if (DisableShunt)
{ {
...@@ -60,7 +60,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -60,7 +60,7 @@ namespace OnlineStore.DeviceLibrary
/// 判断分流阻挡2是否可以下降 /// 判断分流阻挡2是否可以下降
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public bool ShuntStop2CanDown() private bool ShuntStop2CanDown()
{ {
if (DisableShunt) if (DisableShunt)
{ {
...@@ -358,7 +358,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -358,7 +358,6 @@ namespace OnlineStore.DeviceLibrary
outMsg = ""; outMsg = "";
try try
{ {
int lineNum = DeviceID % 100;
TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum); TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum);
if (!trayInfo.IsFull) if (!trayInfo.IsFull)
{ {
......
source/DeviceLibrary/assemblyLine/LineBean_Shunt2.cs 0 → 100644
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
partial class LineBean
{
public bool DisableShunt2 = false;
private Stopwatch Shunt2Check1Watch = new Stopwatch();//前端检测1
private Stopwatch Shunt2Check4Watch = new Stopwatch();//阻挡2检测
private bool Shunt2Pro = false;
private DateTime Shunt2ProTime = DateTime.Now;
private static LineMoveInfo Shunt2_MoveInfo = null;
internal int Shunt2TrayNum = 0;
private DateTime shunt2_Stop2DownTime = DateTime.Now;
/// <summary>
/// 判断进仓5是否可以开始托盘处理，分流2顶升1需要没有托盘
/// </summary>
/// <returns></returns>
internal bool Move5CanProcessTray(int deviceId )
{
if (DisableShunt2)
{
return true;
}
if (!deviceId.Equals(5))
{
return true;
}
if ( IOValue(IO_Type.Shunt2_Check1_Front).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.Shunt2_Check2_Middle).Equals(IO_VALUE.LOW))
{
if (Shunt2_MoveInfo.MoveType.Equals(LineMoveType.None) ||
(Shunt2_MoveInfo.MoveStep >= LineMoveStep.Shunt09_Top1Down))
{
if (CylinderIsOk(IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1))
{
LogUtil.debug("Move5ProcessTray ,[" + deviceId + "] ,return true ");
return true;
}
else
{
CylinderMove(null, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
}
}
}
return false;
}
/// <summary>
/// 判断分流后端阻挡2是否可以下降
/// </summary>
/// <returns></returns>
private bool Shunt2Stop2CanDown()
{
if (DisableShunt2)
{
return true;
}
if (IOValue(IO_Type.Shunt2_Check3_Back).Equals(IO_VALUE.LOW) && IOValue(IO_Type.Shunt2_StopDown2_Back).Equals(IO_VALUE.LOW))
{
if ((Shunt2_MoveInfo.MoveType.Equals(LineMoveType.None) ||
Shunt2_MoveInfo.MoveStep <= LineMoveStep.Shunt03_WaitCheck1Low))
{
if (CylinderIsOk(IO_Type.Shunt2_TopCylinder_Up2, IO_Type.Shunt2_TopCylinder_Down2))
{
return true;
}
else
{
CylinderMove(null, IO_Type.Shunt2_TopCylinder_Up2, IO_Type.Shunt2_TopCylinder_Down2);
}
}
}
return false;
}
/// <summary>
/// 判断分流横移2 升降2是否可上升
/// </summary>
/// <returns></returns>
private bool Shunt2_Updown2CanUp()
{
TimeSpan span = DateTime.Now - shunt2_Stop2DownTime;
if (span.TotalMilliseconds >= 4000)
{
if (IOValue(IO_Type.Shunt2_StopDown2_Back).Equals(IO_VALUE.LOW)
&& IOValue(IO_Type.Shunt2_Check3_Back).Equals(IO_VALUE.LOW))
{
if (TrayManager.checkWatch(shunt2_check3LowWatch, 200, false))
{
return true;
}
}
}
return false;
}
public void Shunt2Stop()
{
Shunt2Check1Watch.Stop();
Shunt2Check4Watch.Stop();
Shunt2_MoveInfo.EndMove();
if (DisableShunt2)
{
IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.HIGH);
IOMove(IO_Type.Shunt2_StopDown2_Back, IO_VALUE.HIGH);
}
else
{
IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.LOW);
IOMove(IO_Type.Shunt2_StopDown2_Back, IO_VALUE.LOW);
}
CheckAndMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW);
CheckAndMove(IO_Type.Shunt2_MotorRun2, IO_VALUE.LOW);
CylinderMove(null, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
CylinderMove(null, IO_Type.Shunt2_TopCylinder_Up2, IO_Type.Shunt2_TopCylinder_Down2);
}
private Stopwatch shunt2_check3LowWatch = new Stopwatch();
private void Shunt2TimerProcess()
{
if (DisableShunt2)
{
return;
}
TimeSpan span = DateTime.Now - Shunt2ProTime;
if (Shunt2Pro && span.TotalSeconds < 5)
{
return;
}
try
{
Shunt2Pro = true;
Shunt2ProTime = DateTime.Now;
if (!CanProcessLine())
{
Shunt2Pro = false;
return;
}
if (IOValue(IO_Type.Shunt2_Check3_Back).Equals(IO_VALUE.LOW))
{
TrayManager.checkWatch(shunt2_check3LowWatch, 30000, false);
}
else
{
shunt2_check3LowWatch.Stop();
}
if (Shunt2_MoveInfo.MoveType.Equals(LineMoveType.None))
{
if (IOValue(IO_Type.Shunt2_Check1_Front).Equals(IO_VALUE.HIGH)&& IOValue(IO_Type.Shunt2_Check2_Middle).Equals(IO_VALUE.HIGH))
{
if (TrayManager.checkWatch(Shunt2Check1Watch, 400, true))
{
Shunt2_MoveInfo.NewMove(LineMoveType.InStore);
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt01_WaitTime);
//读取进仓5处的托盘号
Shunt2TrayNum = RFIDManager.GetTrayNum(5, false);
Shunt2Log("分流横移2：托盘号【"+Shunt2TrayNum+"】等待阻挡1亮，阻挡2亮，阻挡1上升，升降1下降 ");
CylinderMove(Shunt2_MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1,true);
CheckAndMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.LOW);
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check1_Front, IO_VALUE.HIGH));
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check2_Middle, IO_VALUE.HIGH));
}
}
else
{
Shunt2Check1Watch.Stop();
}
}
else
{
Shunt2Check1Watch.Stop();
Shunt2BusyProcess();
}
//升降2处过托盘
if (IOValue(IO_Type.Shunt2_Check4_BStop).Equals(IO_VALUE.HIGH) )
{
if (TrayManager.checkWatch(Shunt2Check4Watch, 300, false))
{
if (Shunt2Stop2CanDown())
{
shunt2_Stop2DownTime = DateTime.Now;
IOMove(IO_Type.Shunt2_StopDown2_Back, IO_VALUE.HIGH, 1500);
Shunt2Check4Watch.Stop();
}
}
}
else
{
Shunt2Check4Watch.Stop();
}
}
catch (Exception ex)
{
LogUtil.error(Name + "Shunt2TimerProcess 出错：", ex);
}
Shunt2Pro = false;
}
private void Shunt2BusyProcess()
{
if (Shunt2_MoveInfo.IsInWait)
{
CheckWait(Shunt2_MoveInfo);
}
if (Shunt2_MoveInfo.IsInWait)
{
return;
}
if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt01_WaitTime))
{
string msg = "";
if (TrayNeedShunt2(Shunt2TrayNum, out msg))
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt05_Top1Up);
LogUtil.info(Name + "[" + Shunt2TrayNum + "]" + "分流横移2：" + msg + " 需要分流，阻挡1上升，升降1上升 ,等待升降2是否可上升 ，进仓5结束托盘处理,清理托盘号");
CheckAndMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW);
CheckAndMove(IO_Type.Shunt2_MotorRun2, IO_VALUE.LOW);
CylinderMove(Shunt2_MoveInfo, IO_Type.Shunt2_TopCylinder_Down1, IO_Type.Shunt2_TopCylinder_Up1);
if (Shunt2_Updown2CanUp())
{
CylinderMove(Shunt2_MoveInfo, IO_Type.Shunt2_TopCylinder_Down2, IO_Type.Shunt2_TopCylinder_Up2);
//Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_TopCylinder_Down2, IO_VALUE.LOW));
}
LineManager.Line.MoveEquipMap[5].EndProcessTray();
}
else
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt02_Stop1Down);
LogUtil.info(Name + "[" + Shunt2TrayNum + "]" + "分流横移2： 不需要分流，直接放行，Shunt2_StopDown1_Front 下降1200 ");
IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.HIGH, 1200);
}
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt02_Stop1Down))
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt03_WaitCheck1Low);
Shunt2Log("分流横移2： 不需要分流，等待检测1信号消失 ");
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check1_Front, IO_VALUE.LOW));
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt03_WaitCheck1Low))
{
Shunt2_MoveInfo.EndMove();
Shunt2Log("分流横移2： 已离开 ");
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt05_Top1Up))
{
if (Shunt2_Updown2CanUp())
{
if (CylinderIsOk(IO_Type.Shunt2_TopCylinder_Down1, IO_Type.Shunt2_TopCylinder_Up1) &&
CylinderIsOk(IO_Type.Shunt2_TopCylinder_Down2, IO_Type.Shunt2_TopCylinder_Up2))
{
Shunt208_DriveMotorMove();
}
else
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt07_Top2Up);
Shunt2Log("分流横移2：升降2开始上升 ");
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(600));
CylinderMove(Shunt2_MoveInfo, IO_Type.Shunt2_TopCylinder_Down2, IO_Type.Shunt2_TopCylinder_Up2);
//Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_TopCylinder_Down2, IO_VALUE.LOW));
}
}
else if (Shunt2_MoveInfo.IsTimeOut(120))
{
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待分流横移22可以上升[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
LogUtil.error(WarnMsg, DeviceID * 1000 + 12);
Alarm(LineAlarmType.IoSingleTimeOut);
}
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt07_Top2Up))
{
Shunt208_DriveMotorMove();
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt08_DriveMotorMove))
{
if (IOValue(IO_Type.Shunt2_Check2_Middle).Equals(IO_VALUE.LOW) && IOValue(IO_Type.Shunt2_Check1_Front).Equals(IO_VALUE.LOW))
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt09_Top1Down);
Shunt2Log("分流横移2：升降1先下降 ");
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
CylinderMove(null, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt10_WaitCheck);
Shunt2Log("分流横移2：再次等待检测2low，检测3high，停止皮带线1 ");
IOMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW);
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check3_Back, IO_VALUE.HIGH));
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check2_Middle, IO_VALUE.LOW));
}
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt09_Top1Down))
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt10_WaitCheck);
Shunt2Log("分流横移2：再次等待检测2low，检测3high，停止皮带线1 ");
IOMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW);
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check3_Back, IO_VALUE.HIGH));
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check2_Middle, IO_VALUE.LOW));
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt10_WaitCheck))
{
if (IOValue(IO_Type.Shunt2_Check3_Back).Equals(IO_VALUE.HIGH))
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt11_TopDown);
Shunt2Log("分流横移2：升降2下降 ,皮带线2停止 ");
CylinderMove(Shunt2_MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
CylinderMove(Shunt2_MoveInfo, IO_Type.Shunt2_TopCylinder_Up2, IO_Type.Shunt2_TopCylinder_Down2);
CheckAndMove(IO_Type.Shunt2_MotorRun2, IO_VALUE.LOW);
CheckAndMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW);
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW));
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_MotorRun2, IO_VALUE.LOW));
}
}
else if (Shunt2_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt11_TopDown))
{
Shunt2_MoveInfo.EndMove();
Shunt2Log("分流横移2： 已离开 ");
}
}
private void Shunt208_DriveMotorMove()
{
Shunt2_MoveInfo.NextMoveStep(LineMoveStep.Shunt08_DriveMotorMove);
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1500));
Shunt2Log("分流横移2：两边皮带线开始转动，等待检测2low，检测3high ");
IOMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.HIGH);
IOMove(IO_Type.Shunt2_MotorRun2, IO_VALUE.HIGH);
CylinderMove(Shunt2_MoveInfo, IO_Type.Shunt2_TopCylinder_Down2, IO_Type.Shunt2_TopCylinder_Up2);
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_MotorRun1, IO_VALUE.HIGH));
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_MotorRun2, IO_VALUE.HIGH));
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check1_Front, IO_VALUE.LOW));
Shunt2_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt2_Check2_Middle, IO_VALUE.LOW));
}
private bool TrayNeedShunt2(int trayNum, out string outMsg)
{
outMsg = "";
try
{
TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum);
if (!trayInfo.IsFull)
{
return false;
}
InOutParam inoup = trayInfo.InoutPar;
if (trayInfo.InOrOutStore.Equals(ReelType.InStore))
{
int storeId = inoup.GetStoreId();
if (inoup.InStoreNg)
{
outMsg = "入料NG料";
return true;
}
else if (storeId >= 15 && storeId <= 18)
{
outMsg = "15-18仓入库";
return true;
}
}
else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore))
{
if (inoup.urgentReel.Equals(true))
{
outMsg = "紧急出料";
return true;
}
//必须走皮带线34的料
else if (inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
{
if (inoup.smallReel)
{
if (inoup.rfidLoc >= 70 && inoup.rfidLoc <= 72)
{
// 70,71,72时只能分配到3 / 4号皮带线;
//mustLine = new List<int> { 3, 4 };
outMsg = "出库小料" + inoup.rfidLoc;
return true;
}
}
else
{
//7 - 11优先走3 / 4号皮带线
if (inoup.rfidLoc >= 7)
{
//firstLine = new List<int> { 3, 4 };
outMsg = "出库大料" + inoup.rfidLoc;
return true;
}
}
}
}
}
catch (Exception ex)
{
LogUtil.error("TrayNeedShunt2出错：" + ex.ToString());
}
return false;
}
private void Shunt2Log(string msg)
{
LogUtil.debug(Name + "["+Shunt2TrayNum+"]"+msg);
}
}
}
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -583,13 +583,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -583,13 +583,15 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " StartCheckFixture " + " 不在空闲中，直接返回 "); LogUtil.error(Name + " StartCheckFixture " + " 不在空闲中，直接返回 ");
return; return;
} }
bool canpro = LineManager.Line.Move5CanProcessTray(DeviceID);
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
{ {
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, true)) if (canpro && TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, true))
{ {
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）"); CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）");
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.LOW));
...@@ -600,7 +602,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -600,7 +602,7 @@ namespace OnlineStore.DeviceLibrary
bool check2IsOk = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false); bool check2IsOk = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH))
{ {
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk) if (canpro && TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk)
{ {
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
...@@ -655,8 +657,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -655,8 +657,11 @@ namespace OnlineStore.DeviceLibrary
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_FixtureCheck); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_FixtureCheck);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升，等待 阻挡2托盘检测=1）"); CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升，等待 阻挡2托盘检测=1）");
// IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.LOW)); if (DeviceID.Equals(5))
{
SecondMoveInfo.TimeOutSeconds = 15;
}
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_FixtureCheck)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_FixtureCheck))
...@@ -862,5 +867,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -862,5 +867,22 @@ namespace OnlineStore.DeviceLibrary
} }
#endregion #endregion
#region 如果是进仓5，托盘横移后直接结束处理
internal void EndProcessTray()
{
if (DeviceID.Equals(5))
{
if(SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)&&SecondMoveInfo.MoveStep<= LineMoveStep.MIO_04_Wait)
{
UpdateTrayNum();
LogUtil.info(Name + " EndProcessTray ,结束当前托盘["+currTrayNum+"]处理【" + SecondMoveInfo.MoveType + "】【" + SecondMoveInfo.MoveStep + "】 ");
SecondMoveInfo.EndMove();
}
}
}
#endregion
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!