增加夹爪料盘检测信号

LN
Commit aa9883bd 由 LN 编写于 2020-07-16 16:03:14 +0800
doc/RC1250佳世达IO模块IP地址及伺服站号配置2020-7-8.xlsx
doc/RC1250佳世达IO模块IP地址及伺服站号配置7-8.xlsx
source/AssemblyLineClient/FrmIOStatus.Designer.cs
source/AssemblyLineClient/FrmIOStatus.cs
source/DeviceLibrary/DeviceLibrary.csproj
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
source/DeviceLibrary/model/StoreStep.cs
--- a/doc/RC1250佳世达IO模块IP地址及伺服站号配置2020-7-8.xlsx 0 → 100644
查看文件 @aa9883b
+++ b/doc/RC1250佳世达IO模块IP地址及伺服站号配置2020-7-8.xlsx 0 → 100644
查看文件 @aa9883b
--- a/doc/RC1250佳世达IO模块IP地址及伺服站号配置7-8.xlsx deleted 100644 → 0
查看文件 @f379d31
+++ b/doc/RC1250佳世达IO模块IP地址及伺服站号配置7-8.xlsx deleted 100644 → 0
查看文件 @f379d31
--- a/source/AssemblyLineClient/FrmIOStatus.Designer.cs
查看文件 @aa9883b
+++ b/source/AssemblyLineClient/FrmIOStatus.Designer.cs
查看文件 @aa9883b
@@ -21,6 +21,7 @@
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.button1 = new System.Windows.Forms.Button();
            this.txtDOIndex = new System.Windows.Forms.TextBox();
+            this.chbAutoRead = new System.Windows.Forms.CheckBox();
            this.txtDoName = new System.Windows.Forms.TextBox();
            this.label17 = new System.Windows.Forms.Label();
            this.label14 = new System.Windows.Forms.Label();
@@ -28,7 +29,6 @@
            this.txtWriteTime = new System.Windows.Forms.TextBox();
            this.label5 = new System.Windows.Forms.Label();
            this.cmbWriteIO = new System.Windows.Forms.ComboBox();
-            this.chbAutoRead = new System.Windows.Forms.CheckBox();
            this.groupBox4 = new System.Windows.Forms.GroupBox();
            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
            this.groupBox3 = new System.Windows.Forms.GroupBox();
@@ -55,14 +55,26 @@
            this.btnSW4Run = new System.Windows.Forms.Button();
            this.btnDriveMotor_Run = new System.Windows.Forms.Button();
            this.panel1 = new System.Windows.Forms.Panel();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.btnShuntClose = new System.Windows.Forms.Button();
+            this.btnShuntRun1 = new System.Windows.Forms.Button();
+            this.btnShuntRun2 = new System.Windows.Forms.Button();
+            this.btnShuntStop2 = new System.Windows.Forms.Button();
+            this.btnShuntStop1 = new System.Windows.Forms.Button();
+            this.btnShuntupdown1 = new System.Windows.Forms.Button();
+            this.btnShuntupdown2 = new System.Windows.Forms.Button();
            this.groupBox6 = new System.Windows.Forms.GroupBox();
            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
            this.groupBox1.SuspendLayout();
            this.groupBox4.SuspendLayout();
            this.groupBox3.SuspendLayout();
            this.groupBox2.SuspendLayout();
-            this.groupBox5.SuspendLayout();
            this.panel1.SuspendLayout();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
            this.groupBox6.SuspendLayout();
            this.SuspendLayout();
            // 
@@ -75,6 +87,7 @@
            // 
            this.groupBox1.Controls.Add(this.button1);
            this.groupBox1.Controls.Add(this.txtDOIndex);
+            this.groupBox1.Controls.Add(this.chbAutoRead);
            this.groupBox1.Controls.Add(this.txtDoName);
            this.groupBox1.Controls.Add(this.label17);
            this.groupBox1.Controls.Add(this.label14);
@@ -112,6 +125,21 @@
            this.txtDOIndex.TabIndex = 242;
            this.txtDOIndex.Text = "0";
            // 
+            // chbAutoRead
+            // 
+            this.chbAutoRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.chbAutoRead.AutoSize = true;
+            this.chbAutoRead.Checked = true;
+            this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chbAutoRead.Location = new System.Drawing.Point(335, 20);
+            this.chbAutoRead.Name = "chbAutoRead";
+            this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
+            this.chbAutoRead.TabIndex = 244;
+            this.chbAutoRead.Text = "自动读取";
+            this.chbAutoRead.UseVisualStyleBackColor = true;
+            this.chbAutoRead.Visible = false;
+            // 
            // txtDoName
            // 
            this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -196,21 +224,6 @@
            this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
            this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
            // 
-            // chbAutoRead
-            // 
-            this.chbAutoRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.chbAutoRead.AutoSize = true;
-            this.chbAutoRead.Checked = true;
-            this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbAutoRead.Location = new System.Drawing.Point(329, 192);
-            this.chbAutoRead.Name = "chbAutoRead";
-            this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
-            this.chbAutoRead.TabIndex = 244;
-            this.chbAutoRead.Text = "自动读取";
-            this.chbAutoRead.UseVisualStyleBackColor = true;
-            this.chbAutoRead.Visible = false;
-            // 
            // groupBox4
            // 
            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -218,7 +231,7 @@
            this.groupBox4.Controls.Add(this.tableLayoutPanel2);
            this.groupBox4.Location = new System.Drawing.Point(465, 3);
            this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(225, 545);
+            this.groupBox4.Size = new System.Drawing.Size(225, 560);
            this.groupBox4.TabIndex = 104;
            this.groupBox4.TabStop = false;
            this.groupBox4.Text = "DO列表";
@@ -236,7 +249,7 @@
            this.tableLayoutPanel2.RowCount = 2;
            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(214, 525);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(214, 540);
            this.tableLayoutPanel2.TabIndex = 103;
            // 
            // groupBox3
@@ -246,7 +259,7 @@
            this.groupBox3.Controls.Add(this.tableLayoutPanel1);
            this.groupBox3.Location = new System.Drawing.Point(6, 3);
            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(225, 545);
+            this.groupBox3.Size = new System.Drawing.Size(225, 560);
            this.groupBox3.TabIndex = 103;
            this.groupBox3.TabStop = false;
            this.groupBox3.Text = "DI列表";
@@ -264,7 +277,7 @@
            this.tableLayoutPanel1.RowCount = 2;
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(214, 525);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(214, 540);
            this.tableLayoutPanel1.TabIndex = 102;
            // 
            // groupBox2
@@ -274,7 +287,7 @@
            this.groupBox2.Controls.Add(this.tableLayoutPanel3);
            this.groupBox2.Location = new System.Drawing.Point(235, 3);
            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(225, 545);
+            this.groupBox2.Size = new System.Drawing.Size(225, 560);
            this.groupBox2.TabIndex = 245;
            this.groupBox2.TabStop = false;
            this.groupBox2.Text = "DI列表";
@@ -291,35 +304,16 @@
            this.tableLayoutPanel3.RowCount = 2;
            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(214, 525);
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(214, 540);
            this.tableLayoutPanel3.TabIndex = 102;
            // 
            // groupBox5
            // 
            this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
            | System.Windows.Forms.AnchorStyles.Left)));
-            this.groupBox5.Controls.Add(this.button2);
-            this.groupBox5.Controls.Add(this.btnsw2StopDown);
-            this.groupBox5.Controls.Add(this.chbAutoRead);
-            this.groupBox5.Controls.Add(this.btnSw3Location);
-            this.groupBox5.Controls.Add(this.btnSw3Top);
-            this.groupBox5.Controls.Add(this.btnSw2Location);
-            this.groupBox5.Controls.Add(this.btnSw2Top);
-            this.groupBox5.Controls.Add(this.btnSw1Location);
-            this.groupBox5.Controls.Add(this.btnSw4Location);
-            this.groupBox5.Controls.Add(this.btnSw4Top);
-            this.groupBox5.Controls.Add(this.btnSw1Top);
-            this.groupBox5.Controls.Add(this.btnSw3Run);
-            this.groupBox5.Controls.Add(this.btnSw2Run);
-            this.groupBox5.Controls.Add(this.btnSw1Run);
-            this.groupBox5.Controls.Add(this.lblTrayNum);
-            this.groupBox5.Controls.Add(this.btnCloseAll);
-            this.groupBox5.Controls.Add(this.btnNGCylinder);
-            this.groupBox5.Controls.Add(this.btnSW4Run);
-            this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
            this.groupBox5.Location = new System.Drawing.Point(926, 126);
            this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(404, 422);
+            this.groupBox5.Size = new System.Drawing.Size(404, 437);
            this.groupBox5.TabIndex = 246;
            this.groupBox5.TabStop = false;
            this.groupBox5.Text = "IO操作测试";
@@ -328,7 +322,7 @@
            // 
            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button2.Location = new System.Drawing.Point(22, 183);
+            this.button2.Location = new System.Drawing.Point(17, 169);
            this.button2.Name = "button2";
            this.button2.Size = new System.Drawing.Size(153, 37);
            this.button2.TabIndex = 287;
@@ -340,7 +334,7 @@
            // 
            this.btnsw2StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnsw2StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnsw2StopDown.Location = new System.Drawing.Point(22, 346);
+            this.btnsw2StopDown.Location = new System.Drawing.Point(17, 327);
            this.btnsw2StopDown.Name = "btnsw2StopDown";
            this.btnsw2StopDown.Size = new System.Drawing.Size(153, 37);
            this.btnsw2StopDown.TabIndex = 286;
@@ -352,7 +346,7 @@
            // 
            this.btnSw3Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw3Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw3Location.Location = new System.Drawing.Point(185, 231);
+            this.btnSw3Location.Location = new System.Drawing.Point(180, 212);
            this.btnSw3Location.Name = "btnSw3Location";
            this.btnSw3Location.Size = new System.Drawing.Size(153, 37);
            this.btnSw3Location.TabIndex = 285;
@@ -364,7 +358,7 @@
            // 
            this.btnSw3Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw3Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw3Top.Location = new System.Drawing.Point(185, 269);
+            this.btnSw3Top.Location = new System.Drawing.Point(180, 250);
            this.btnSw3Top.Name = "btnSw3Top";
            this.btnSw3Top.Size = new System.Drawing.Size(153, 37);
            this.btnSw3Top.TabIndex = 284;
@@ -376,7 +370,7 @@
            // 
            this.btnSw2Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw2Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw2Location.Location = new System.Drawing.Point(22, 231);
+            this.btnSw2Location.Location = new System.Drawing.Point(17, 212);
            this.btnSw2Location.Name = "btnSw2Location";
            this.btnSw2Location.Size = new System.Drawing.Size(153, 37);
            this.btnSw2Location.TabIndex = 283;
@@ -388,7 +382,7 @@
            // 
            this.btnSw2Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw2Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw2Top.Location = new System.Drawing.Point(22, 269);
+            this.btnSw2Top.Location = new System.Drawing.Point(17, 250);
            this.btnSw2Top.Name = "btnSw2Top";
            this.btnSw2Top.Size = new System.Drawing.Size(153, 37);
            this.btnSw2Top.TabIndex = 282;
@@ -400,7 +394,7 @@
            // 
            this.btnSw1Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw1Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw1Location.Location = new System.Drawing.Point(185, 69);
+            this.btnSw1Location.Location = new System.Drawing.Point(180, 55);
            this.btnSw1Location.Name = "btnSw1Location";
            this.btnSw1Location.Size = new System.Drawing.Size(153, 37);
            this.btnSw1Location.TabIndex = 281;
@@ -412,7 +406,7 @@
            // 
            this.btnSw4Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw4Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw4Location.Location = new System.Drawing.Point(22, 69);
+            this.btnSw4Location.Location = new System.Drawing.Point(17, 55);
            this.btnSw4Location.Name = "btnSw4Location";
            this.btnSw4Location.Size = new System.Drawing.Size(153, 37);
            this.btnSw4Location.TabIndex = 276;
@@ -424,7 +418,7 @@
            // 
            this.btnSw4Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw4Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw4Top.Location = new System.Drawing.Point(22, 107);
+            this.btnSw4Top.Location = new System.Drawing.Point(17, 93);
            this.btnSw4Top.Name = "btnSw4Top";
            this.btnSw4Top.Size = new System.Drawing.Size(153, 37);
            this.btnSw4Top.TabIndex = 269;
@@ -436,7 +430,7 @@
            // 
            this.btnSw1Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw1Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw1Top.Location = new System.Drawing.Point(185, 107);
+            this.btnSw1Top.Location = new System.Drawing.Point(180, 93);
            this.btnSw1Top.Name = "btnSw1Top";
            this.btnSw1Top.Size = new System.Drawing.Size(153, 37);
            this.btnSw1Top.TabIndex = 280;
@@ -448,7 +442,7 @@
            // 
            this.btnSw3Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw3Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw3Run.Location = new System.Drawing.Point(185, 307);
+            this.btnSw3Run.Location = new System.Drawing.Point(180, 288);
            this.btnSw3Run.Name = "btnSw3Run";
            this.btnSw3Run.Size = new System.Drawing.Size(153, 37);
            this.btnSw3Run.TabIndex = 279;
@@ -460,7 +454,7 @@
            // 
            this.btnSw2Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw2Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw2Run.Location = new System.Drawing.Point(22, 307);
+            this.btnSw2Run.Location = new System.Drawing.Point(17, 288);
            this.btnSw2Run.Name = "btnSw2Run";
            this.btnSw2Run.Size = new System.Drawing.Size(153, 37);
            this.btnSw2Run.TabIndex = 278;
@@ -472,7 +466,7 @@
            // 
            this.btnSw1Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSw1Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw1Run.Location = new System.Drawing.Point(185, 145);
+            this.btnSw1Run.Location = new System.Drawing.Point(180, 131);
            this.btnSw1Run.Name = "btnSw1Run";
            this.btnSw1Run.Size = new System.Drawing.Size(153, 37);
            this.btnSw1Run.TabIndex = 277;
@@ -485,7 +479,7 @@
            this.lblTrayNum.AutoSize = true;
            this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblTrayNum.Location = new System.Drawing.Point(26, 394);
+            this.lblTrayNum.Location = new System.Drawing.Point(14, 371);
            this.lblTrayNum.Name = "lblTrayNum";
            this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
            this.lblTrayNum.TabIndex = 275;
@@ -498,7 +492,7 @@
            this.btnCloseAll.BackColor = System.Drawing.Color.White;
            this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCloseAll.Location = new System.Drawing.Point(185, 372);
+            this.btnCloseAll.Location = new System.Drawing.Point(180, 351);
            this.btnCloseAll.Name = "btnCloseAll";
            this.btnCloseAll.Size = new System.Drawing.Size(153, 37);
            this.btnCloseAll.TabIndex = 274;
@@ -510,7 +504,7 @@
            // 
            this.btnNGCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnNGCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnNGCylinder.Location = new System.Drawing.Point(185, 20);
+            this.btnNGCylinder.Location = new System.Drawing.Point(180, 6);
            this.btnNGCylinder.Name = "btnNGCylinder";
            this.btnNGCylinder.Size = new System.Drawing.Size(153, 37);
            this.btnNGCylinder.TabIndex = 268;
@@ -523,7 +517,7 @@
            // 
            this.btnSW4Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSW4Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSW4Run.Location = new System.Drawing.Point(22, 145);
+            this.btnSW4Run.Location = new System.Drawing.Point(17, 131);
            this.btnSW4Run.Name = "btnSW4Run";
            this.btnSW4Run.Size = new System.Drawing.Size(153, 37);
            this.btnSW4Run.TabIndex = 262;
@@ -535,7 +529,7 @@
            // 
            this.btnDriveMotor_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnDriveMotor_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnDriveMotor_Run.Location = new System.Drawing.Point(22, 20);
+            this.btnDriveMotor_Run.Location = new System.Drawing.Point(17, 6);
            this.btnDriveMotor_Run.Name = "btnDriveMotor_Run";
            this.btnDriveMotor_Run.Size = new System.Drawing.Size(153, 37);
            this.btnDriveMotor_Run.TabIndex = 260;
@@ -546,6 +540,7 @@
            // panel1
            // 
            this.panel1.AutoScroll = true;
+            this.panel1.Controls.Add(this.tabControl1);
            this.panel1.Controls.Add(this.groupBox6);
            this.panel1.Controls.Add(this.groupBox4);
            this.panel1.Controls.Add(this.groupBox3);
@@ -558,6 +553,146 @@
            this.panel1.Size = new System.Drawing.Size(1334, 571);
            this.panel1.TabIndex = 248;
            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Location = new System.Drawing.Point(924, 129);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(407, 434);
+            this.tabControl1.TabIndex = 288;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.btnsw2StopDown);
+            this.tabPage1.Controls.Add(this.lblTrayNum);
+            this.tabPage1.Controls.Add(this.btnDriveMotor_Run);
+            this.tabPage1.Controls.Add(this.btnCloseAll);
+            this.tabPage1.Controls.Add(this.btnSw3Location);
+            this.tabPage1.Controls.Add(this.button2);
+            this.tabPage1.Controls.Add(this.btnSw3Top);
+            this.tabPage1.Controls.Add(this.btnSW4Run);
+            this.tabPage1.Controls.Add(this.btnSw2Location);
+            this.tabPage1.Controls.Add(this.btnSw2Top);
+            this.tabPage1.Controls.Add(this.btnNGCylinder);
+            this.tabPage1.Controls.Add(this.btnSw3Run);
+            this.tabPage1.Controls.Add(this.btnSw1Run);
+            this.tabPage1.Controls.Add(this.btnSw2Run);
+            this.tabPage1.Controls.Add(this.btnSw1Top);
+            this.tabPage1.Controls.Add(this.btnSw4Top);
+            this.tabPage1.Controls.Add(this.btnSw4Location);
+            this.tabPage1.Controls.Add(this.btnSw1Location);
+            this.tabPage1.Location = new System.Drawing.Point(4, 26);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(399, 404);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "  IO操作测试  ";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.btnShuntClose);
+            this.tabPage2.Controls.Add(this.btnShuntRun1);
+            this.tabPage2.Controls.Add(this.btnShuntRun2);
+            this.tabPage2.Controls.Add(this.btnShuntStop2);
+            this.tabPage2.Controls.Add(this.btnShuntStop1);
+            this.tabPage2.Controls.Add(this.btnShuntupdown1);
+            this.tabPage2.Controls.Add(this.btnShuntupdown2);
+            this.tabPage2.Location = new System.Drawing.Point(4, 26);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(399, 404);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "  分流横移操作  ";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // btnShuntClose
+            // 
+            this.btnShuntClose.BackColor = System.Drawing.Color.White;
+            this.btnShuntClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnShuntClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnShuntClose.Location = new System.Drawing.Point(183, 184);
+            this.btnShuntClose.Name = "btnShuntClose";
+            this.btnShuntClose.Size = new System.Drawing.Size(153, 37);
+            this.btnShuntClose.TabIndex = 294;
+            this.btnShuntClose.Text = "关闭所有分流DO";
+            this.btnShuntClose.UseVisualStyleBackColor = false;
+            this.btnShuntClose.Click += new System.EventHandler(this.btnShuntClose_Click);
+            // 
+            // btnShuntRun1
+            // 
+            this.btnShuntRun1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnShuntRun1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnShuntRun1.Location = new System.Drawing.Point(20, 127);
+            this.btnShuntRun1.Name = "btnShuntRun1";
+            this.btnShuntRun1.Size = new System.Drawing.Size(153, 37);
+            this.btnShuntRun1.TabIndex = 288;
+            this.btnShuntRun1.Text = "分流横移机构1皮带运行";
+            this.btnShuntRun1.UseVisualStyleBackColor = true;
+            this.btnShuntRun1.Click += new System.EventHandler(this.btnShuntRun1_Click);
+            // 
+            // btnShuntRun2
+            // 
+            this.btnShuntRun2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnShuntRun2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnShuntRun2.Location = new System.Drawing.Point(183, 127);
+            this.btnShuntRun2.Name = "btnShuntRun2";
+            this.btnShuntRun2.Size = new System.Drawing.Size(153, 37);
+            this.btnShuntRun2.TabIndex = 291;
+            this.btnShuntRun2.Text = "分流横移机构2皮带运行";
+            this.btnShuntRun2.UseVisualStyleBackColor = true;
+            this.btnShuntRun2.Click += new System.EventHandler(this.btnShuntRun2_Click);
+            // 
+            // btnShuntStop2
+            // 
+            this.btnShuntStop2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnShuntStop2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnShuntStop2.Location = new System.Drawing.Point(183, 22);
+            this.btnShuntStop2.Name = "btnShuntStop2";
+            this.btnShuntStop2.Size = new System.Drawing.Size(153, 37);
+            this.btnShuntStop2.TabIndex = 292;
+            this.btnShuntStop2.Text = "分流后端阻挡下降";
+            this.btnShuntStop2.UseVisualStyleBackColor = true;
+            this.btnShuntStop2.Click += new System.EventHandler(this.btnShuntStop2_Click);
+            // 
+            // btnShuntStop1
+            // 
+            this.btnShuntStop1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnShuntStop1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnShuntStop1.Location = new System.Drawing.Point(20, 22);
+            this.btnShuntStop1.Name = "btnShuntStop1";
+            this.btnShuntStop1.Size = new System.Drawing.Size(153, 37);
+            this.btnShuntStop1.TabIndex = 289;
+            this.btnShuntStop1.Text = "分流前端阻挡下降";
+            this.btnShuntStop1.UseVisualStyleBackColor = true;
+            this.btnShuntStop1.Click += new System.EventHandler(this.btnShuntStop1_Click);
+            // 
+            // btnShuntupdown1
+            // 
+            this.btnShuntupdown1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnShuntupdown1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnShuntupdown1.Location = new System.Drawing.Point(20, 75);
+            this.btnShuntupdown1.Name = "btnShuntupdown1";
+            this.btnShuntupdown1.Size = new System.Drawing.Size(153, 37);
+            this.btnShuntupdown1.TabIndex = 290;
+            this.btnShuntupdown1.Text = "分流横移机构1上升";
+            this.btnShuntupdown1.UseVisualStyleBackColor = true;
+            this.btnShuntupdown1.Click += new System.EventHandler(this.btnShuntupdown1_Click);
+            // 
+            // btnShuntupdown2
+            // 
+            this.btnShuntupdown2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnShuntupdown2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnShuntupdown2.Location = new System.Drawing.Point(183, 75);
+            this.btnShuntupdown2.Name = "btnShuntupdown2";
+            this.btnShuntupdown2.Size = new System.Drawing.Size(153, 37);
+            this.btnShuntupdown2.TabIndex = 293;
+            this.btnShuntupdown2.Text = "分流横移机构2上升";
+            this.btnShuntupdown2.UseVisualStyleBackColor = true;
+            this.btnShuntupdown2.Click += new System.EventHandler(this.btnShuntupdown2_Click);
+            // 
            // groupBox6
            // 
            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -565,7 +700,7 @@
            this.groupBox6.Controls.Add(this.tableLayoutPanel4);
            this.groupBox6.Location = new System.Drawing.Point(693, 3);
            this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(225, 545);
+            this.groupBox6.Size = new System.Drawing.Size(225, 560);
            this.groupBox6.TabIndex = 105;
            this.groupBox6.TabStop = false;
            this.groupBox6.Text = "DO列表";
@@ -583,7 +718,7 @@
            this.tableLayoutPanel4.RowCount = 2;
            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(214, 525);
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(214, 540);
            this.tableLayoutPanel4.TabIndex = 103;
            // 
            // FrmIOStatus
@@ -605,9 +740,11 @@
            this.groupBox4.ResumeLayout(false);
            this.groupBox3.ResumeLayout(false);
            this.groupBox2.ResumeLayout(false);
-            this.groupBox5.ResumeLayout(false);
-            this.groupBox5.PerformLayout();
            this.panel1.ResumeLayout(false);
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage1.PerformLayout();
+            this.tabPage2.ResumeLayout(false);
            this.groupBox6.ResumeLayout(false);
            this.ResumeLayout(false);
@@ -655,6 +792,16 @@
        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
        private System.Windows.Forms.Button btnsw2StopDown;
        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.Button btnShuntRun1;
+        private System.Windows.Forms.Button btnShuntRun2;
+        private System.Windows.Forms.Button btnShuntStop2;
+        private System.Windows.Forms.Button btnShuntStop1;
+        private System.Windows.Forms.Button btnShuntupdown1;
+        private System.Windows.Forms.Button btnShuntupdown2;
+        private System.Windows.Forms.Button btnShuntClose;
    }
 }
--- a/source/AssemblyLineClient/FrmIOStatus.cs
查看文件 @aa9883b
+++ b/source/AssemblyLineClient/FrmIOStatus.cs
查看文件 @aa9883b
@@ -33,7 +33,7 @@ namespace OnlineStore.AssemblyLine
        Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
        private void LoadIOList()
        {
-            int count = 16;
+            int count = 18;
            int roleindex = 0;
            this.tableLayoutPanel1.RowStyles.Clear();
            this.tableLayoutPanel1.RowCount = count;
@@ -49,11 +49,11 @@ namespace OnlineStore.AssemblyLine
            foreach (ConfigIO ioValue in LineManager.Config.DIList.Values)
            {
                IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
-                if (DIControlList.Count > count)
+                if (DIControlList.Count >= count)
                {
-                    roleindex = DIControlList.Count - count-1;
+                   // roleindex = DIControlList.Count - count-1;
                    this.tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
-                    this.tableLayoutPanel3.Controls.Add(control, 0, roleindex);                  
+                    this.tableLayoutPanel3.Controls.Add(control, 0, roleindex - count);                  
                }
                else
                {
@@ -187,7 +187,8 @@ namespace OnlineStore.AssemblyLine
        }
        private void FrmStoreIOStatus_Load(object sender, EventArgs e)
        {
-           // KNDAIManager.NeedShow = true;
+            // KNDAIManager.NeedShow = true;
+            tabControl1.TabPages.RemoveAt(1);
        }
        private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e)
@@ -364,5 +365,49 @@ namespace OnlineStore.AssemblyLine
        {
            BtnMove(button2, "环形线横移4阻挡下降", "环形线横移4阻挡上升", IO_Type.SW4_StopDown);
        }
+        private void btnShuntStop1_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnShuntStop1, "分流前端阻挡下降", "分流前端阻挡上升", IO_Type.Shunt_StopDown_Front); 
+        }
+        private void btnShuntStop2_Click(object sender, EventArgs e)
+        {  
+            BtnMove(btnShuntStop2, "分流后端阻挡下降", "分流后端阻挡上升", IO_Type.Shunt_StopDown_Back);
+        }
+        private void btnShuntupdown1_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnShuntupdown1 , "分流横移机构1上升", "分流横移机构1下降", IO_Type.Shunt_UpdownCylinder_Down1, IO_Type.Shunt_UpdownCylinder_Up1);
+        }
+        private void btnShuntupdown2_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnShuntupdown2, "分流横移机构2上升", "分流横移机构2下降", IO_Type.Shunt_UpdownCylinder_Down2, IO_Type.Shunt_UpdownCylinder_Up2);
+        }
+        private void btnShuntRun1_Click(object sender, EventArgs e)
+        { 
+            BtnMove(btnShuntRun1, "分流横移机构1皮带运行", "分流横移机构1皮带停止", IO_Type.Shunt_MotorRun1);
+        }
+        private void btnShuntRun2_Click(object sender, EventArgs e)
+        { 
+            BtnMove(btnShuntRun2, "分流横移机构2皮带运行", "分流横移机构2皮带停止", IO_Type.Shunt_MotorRun2);
+        }
+        private void btnShuntClose_Click(object sender, EventArgs e)
+        {
+            IOManager.IOMove(IO_Type.Shunt_StopDown_Front, IO_VALUE.LOW);
+            IOManager.IOMove(IO_Type.Shunt_StopDown_Back, IO_VALUE.LOW);
+            IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Down1, IO_VALUE.LOW);
+            IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Up1, IO_VALUE.LOW);
+            IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Down2, IO_VALUE.LOW);
+            IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Up2, IO_VALUE.LOW);
+            IOManager.IOMove(IO_Type.Shunt_MotorRun1, IO_VALUE.LOW);
+            IOManager.IOMove(IO_Type.Shunt_MotorRun2, IO_VALUE.LOW); 
+        }
    }
 }
--- a/source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @aa9883b
+++ b/source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @aa9883b
@@ -70,6 +70,7 @@
  <ItemGroup>
    <Compile Include="agvClient\AgvClient.cs" />
    <Compile Include="assemblyLine\FeedingEquip_OutStore.cs" />
+    <Compile Include="assemblyLine\LineBean_Shunt.cs" />
    <Compile Include="assemblyLine\OutTrayLineBean.cs" />
    <Compile Include="assemblymanager\ALineManager.cs" />
    <Compile Include="assemblyLine\DischargeLine.cs" />

--- a/source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
查看文件 @aa9883b
+++ b/source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
查看文件 @aa9883b
@@ -64,7 +64,7 @@ DI,0,SL1上料横移气缸放料端,SL_MoveCylinder_Give,6,PRO_AOI_IP_12,0,SL1上料横移气
 DI,0,SL1上料气缸放松端,SL_MoveCylinder_Slack,7,PRO_AOI_IP_12,0,SL1上料气缸放松端,X128,X128
 DI,0,SL1上料气缸夹紧端,SL_MoveCylinder_Tighten,8,PRO_AOI_IP_12,0,SL1上料气缸夹紧端,X129,X129
 DI,1000,环形线横移1托盘检测,SW1_TrayCheck,9,PRO_AOI_IP_12,0,环形线横移1托盘检测,X130,X130
-,1000,环形线横移1料盘检测1,SW1_ReelCheck,10,PRO_AOI_IP_12,0,环形线横移1料盘检测1,X131,X131
+DI,0,上料1夹爪料盘检测,ReelCheck,10,PRO_AOI_IP_12,0,上料1夹爪料盘检测,X131,X131
 DI,1000,环形线横移1顶升上升端,SW1_TopCylinder_Up,11,PRO_AOI_IP_12,0,环形线横移1顶升上升端,X132,X132
 DI,1000,环形线横移1顶升下降端,SW1_TopCylinder_Down,12,PRO_AOI_IP_12,0,环形线横移1顶升下降端,X133,X133
 DI,1000,环形线横移1定位上升端,SW1_LocationCylinder_Up,13,PRO_AOI_IP_12,0,环形线横移1定位上升端,X134,X134

--- a/source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
查看文件 @aa9883b
+++ b/source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
查看文件 @aa9883b
@@ -65,7 +65,7 @@ DI,0,SL2上料气缸放松端,SL_MoveCylinder_Slack,7,PRO_AOI_IP_14,0,SL2上料气缸放松端
 DI,0,SL2上料气缸夹紧端,SL_MoveCylinder_Tighten,8,PRO_AOI_IP_14,0,SL2上料气缸夹紧端,X169,X169
 DI,0,FL1阻挡检测,FL_StopCheck,9,PRO_AOI_IP_14,0,FL1阻挡检测,X170,X170
 DI,0,FL1托盘检测,FL_TrayCheck,10,PRO_AOI_IP_14,0,FL1托盘检测,X171,X171
-DI,0,FL1料盘检测1,FL_ReelCheck,11,PRO_AOI_IP_14,0,FL1料盘检测1,X172,X172
+DI,0,上料2夹爪料盘检测,ReelCheck,11,PRO_AOI_IP_14,0,上料2夹爪料盘检测,X172,X172
 DI,0,FL1顶升上升端,FL_TopCylinder_Up,12,PRO_AOI_IP_14,0,FL1顶升上升端,X173,X173
 DI,0,FL1顶升下降端,FL_TopCylinder_Down,13,PRO_AOI_IP_14,0,FL1顶升下降端,X174,X174
 ,,,,14,PRO_AOI_IP_14,0,,X175,X175

--- a/source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @aa9883b
+++ b/source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @aa9883b
@@ -898,14 +898,27 @@ namespace OnlineStore.DeviceLibrary
            }
            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_22_BatchAxisDown))
            {
-                FI_23_GetPosID();
+                if (Config.DIList.ContainsKey(IO_Type.ReelCheck) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.LOW))
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.FI_23_WaitReelCheck);
+                    InLog(" " + MoveInfo.SLog + " 等待料盘检测信号：ReelCheck");
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ReelCheck, IO_VALUE.HIGH));
+                }
+                else
+                {
+                    FI_24_GetPosID();
+                }
            }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_23_GetPosID))
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_23_WaitReelCheck))
+            {
+                FI_24_GetPosID();
+            }
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_GetPosID))
            {
                if (getPosTask.IsCompleted && LastPosParam != null)
                {
-                    MoveInfo.NextMoveStep(LineMoveStep.FI_24_WaitTray);
+                    MoveInfo.NextMoveStep(LineMoveStep.FI_25_WaitTray);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100)); 
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
                    InLog(" " + MoveInfo.SLog + " 开始拦截空托盘  " + LastPosParam.ToStr() + "");
                    ClearTimeoutAlarm("获取库位号超时");
@@ -917,11 +930,11 @@ namespace OnlineStore.DeviceLibrary
                    Alarm(LineAlarmType.IoSingleTimeOut);
                }
            }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_WaitTray))//TODO
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray))//TODO
            {
                if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_11_CodeRember))
                {
-                    MoveInfo.NextMoveStep(LineMoveStep.FI_25_CylinderDown);
+                    MoveInfo.NextMoveStep(LineMoveStep.FI_26_CylinderDown);
                    CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down);
                    if (Config.SidesWayNum > 0)
                    {
@@ -939,36 +952,29 @@ namespace OnlineStore.DeviceLibrary
                    Alarm(LineAlarmType.IoSingleTimeOut);
                }
            }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_CylinderDown))
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_26_CylinderDown))
            {
-                MoveInfo.NextMoveStep(LineMoveStep.FI_26_CylinderRelax);
+                MoveInfo.NextMoveStep(LineMoveStep.FI_27_CylinderRelax);
                InLog("料盘移栽" + MoveInfo.SLog + "：上料气缸放松");
                CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Tighten, IO_Type.SL_MoveCylinder_Slack);
                ClearTimeoutAlarm("等待空托盘到达超时");
            }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_26_CylinderRelax))
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_27_CylinderRelax))
-            {
+            { 
-                //if (Config.SidesWayNum.Equals(1))
+                MoveInfo.NextMoveStep(LineMoveStep.FI_28_WaitCylinderUp);
-                //{
-                //    FI_28_CylinderUp();
-                //}
-                //else
-                //{
-                MoveInfo.NextMoveStep(LineMoveStep.FI_27_WaitCylinderUp);
                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
                MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_MoveCylinder_Down, IO_VALUE.LOW));
-                CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
+                CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up); 
-                //}
                TrayPreMove();
            }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_27_WaitCylinderUp))
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_28_WaitCylinderUp))
            {
                TrayMoveOk();
-                FI_28_CylinderUp();
+                FI_29_CylinderUp();
            }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_28_CylinderUp))
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_29_CylinderUp))
            {
-                MoveInfo.NextMoveStep(LineMoveStep.FI_29_UpDownAxisToP1);
+                MoveInfo.NextMoveStep(LineMoveStep.FI_30_UpDownAxisToP1);
                //   InLog("料盘移栽" + MoveInfo.SLog + "：升降伺服到P1点");
                TrayMoveOk(true);
                if (!UpdownAxis.IsInPosition(Config.UpDownAxisP1))
@@ -981,7 +987,7 @@ namespace OnlineStore.DeviceLibrary
                    InLog("料盘移栽" + MoveInfo.SLog + "：升降轴已在P1点，托盘放行");
                }
            }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_29_UpDownAxisToP1))
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_30_UpDownAxisToP1))
            {
                if (getPosTask == null || getPosTask.IsCompleted)
                {
@@ -1077,9 +1083,9 @@ namespace OnlineStore.DeviceLibrary
        }
        private Task getPosTask = null;
        private InOutParam  LastPosParam = null;
-        private void FI_23_GetPosID()
+        private void FI_24_GetPosID()
        {
-            MoveInfo.NextMoveStep(LineMoveStep.FI_23_GetPosID);
+            MoveInfo.NextMoveStep(LineMoveStep.FI_24_GetPosID);
            InLog("清空LastPosResult，从服务器获取入库库位");
            MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1500));
            LastPosParam = null;
@@ -1127,9 +1133,9 @@ namespace OnlineStore.DeviceLibrary
            });
        }
-        private void FI_28_CylinderUp()
+        private void FI_29_CylinderUp()
        {
-            MoveInfo.NextMoveStep(LineMoveStep.FI_28_CylinderUp);
+            MoveInfo.NextMoveStep(LineMoveStep.FI_29_CylinderUp);
            MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
            CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
            //如果是小料盘，且升降轴需要上升，
@@ -1523,7 +1529,7 @@ namespace OnlineStore.DeviceLibrary
                    if (trayCanUse && runStatus.Equals(LineRunStatus.Busy) && MoveInfo.MoveType.Equals(LineMoveType.InStore))
                    {
                        //入料执行中， 且需要空托盘
-                        if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_WaitTray) && MoveInfo.IsInWait.Equals(false))
+                        if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray) && MoveInfo.IsInWait.Equals(false))
                        //if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
                        {

--- a/source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs 0 → 100644
查看文件 @aa9883b
+++ b/source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs 0 → 100644
查看文件 @aa9883b
+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
+    { 
+    }
+}
--- a/source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
查看文件 @aa9883b
+++ b/source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
查看文件 @aa9883b
@@ -206,7 +206,7 @@ namespace OnlineStore.DeviceLibrary
        }
        private static void SaveImageToFile(string deviceName, string cameraName, HalconDotNet.HObject bitmap)
        {
-            string date = DateTime.Now.ToString("yyyyMMddHHmmss") + "-" + DateTime.Now.Millisecond.ToString().PadLeft(4, '0');
+            string date = deviceName.Trim().Replace('_', '-') + "-" + DateTime.Now.ToString("yyyyMMdd-HHmmss") + "-" + DateTime.Now.Millisecond.ToString().PadLeft(4, '0');
            string dire = @"D:\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\";
            string iamgeName = date + ".bmp";
            try

--- a/source/DeviceLibrary/model/StoreStep.cs
查看文件 @aa9883b
+++ b/source/DeviceLibrary/model/StoreStep.cs
查看文件 @aa9883b
@@ -464,6 +464,63 @@ namespace OnlineStore.DeviceLibrary
        #endregion
+        #region 分流横移处理  6000 开始
+        Shunt00_Wait = 6000,
+        /// <summary>
+        /// 阻挡气缸下降
+        /// </summary>
+        Shunt01_StopDown = 6001,
+        /// <summary>
+        /// 等待到托盘信号后，需要持续一段时间
+        /// </summary>
+        Shunt02_WaitCheckTime = 6002,
+        /// <summary>
+        /// 等待到托盘信号后，需要持续一段时间
+        /// </summary>
+        Shunt03_WaitTime = 6003,
+        /// <summary>
+        /// 等待轨道1夹具检测信号，等待横移3或横移1无托盘
+        /// </summary>
+        Shunt04_WaitCanUp = 6004,
+        /// <summary>
+        /// 定位气缸下降
+        /// </summary>
+        Shunt05_LocationDown = 6005,
+        /// <summary>
+        /// 横移轨道顶升气缸上升
+        /// </summary>
+        Shunt06_TopCylinderUp = 6006,
+        /// <summary>
+        /// 等待第二个横移没有托盘
+        /// </summary>
+        Shunt07_WaitNoTray = 6007,
+        /// <summary>
+        /// 横移轨道点击转动
+        /// </summary>
+        Shunt08_DriveMotorMove = 6008,
+        /// <summary>
+        /// 收到横移轨道2夹具检测信号
+        /// </summary>
+        Shunt09_WaitOutCheck = 6009,
+        /// <summary>
+        /// 等待出口信号持续一段时间
+        /// </summary>
+        Shunt10_WatOutFixture2 = 6010,
+        /// <summary>
+        /// 停止横移轨道转动，横移轨道顶升气缸下降
+        /// </summary>
+        Shunt11_TopDown = 6011,
+        /// <summary>
+        /// 等待托盘流出，上升阻挡气缸
+        /// </summary>
+        Shunt12_WaitTrayGo = 6012,
+        #endregion
        #region 入料装置原点返回，10000开始
        /// <summary>
@@ -665,37 +722,44 @@ namespace OnlineStore.DeviceLibrary
        /// 提升轴下降到料盘不溢出的位置
        /// </summary>
        FI_22_BatchAxisDown,
+        /// <summary>
+        /// 等待料盘检测信号
+        /// </summary>
+        FI_23_WaitReelCheck,
        /// <summary>
        ///  料盘移栽：从服务器获取入库库位号
        /// </summary>
-        FI_23_GetPosID,
+        FI_24_GetPosID,
        /// <summary>
        ///  料盘移栽：等待空托盘到达，移栽伺服下降到P2，并预扫码
        /// </summary>
-        FI_24_WaitTray,
+        FI_25_WaitTray,
        /// <summary>
        /// 料盘移栽：  上料机构下降
        /// </summary>
-        FI_25_CylinderDown,
+        FI_26_CylinderDown,
        /// <summary>
        /// 料盘移栽： 上料气缸放松
        /// </summary>
-        FI_26_CylinderRelax,
+        FI_27_CylinderRelax,
        /// <summary>
        /// 料盘移栽： 上料横移机构上升
        /// </summary>
-        FI_27_WaitCylinderUp,
+        FI_28_WaitCylinderUp,
        /// <summary>
        ///  料盘移栽：上料横移机构上升，定位或者顶升可以先下降
        /// </summary>
-        FI_28_CylinderUp,
+        FI_29_CylinderUp,
        /// <summary>
        ///  料盘移栽：升降伺服到P1点
        /// </summary>
-        FI_29_UpDownAxisToP1,
+        FI_30_UpDownAxisToP1,
@@ -706,30 +770,30 @@ namespace OnlineStore.DeviceLibrary
        /// <summary>
        /// 上料完成，升降盘定位气缸后退
        /// </summary>
-        FI_32_TrayLocationCylinder_After = 11032,
+        FI_32_TrayLocationCylinder_After,
        /// <summary>
        /// 上料完成，提升伺服到P1点
        /// </summary>
-        FI_33_BatchAxisToP1 = 11033,
+        FI_33_BatchAxisToP1,
        /// <summary>
        /// 上料完成，等待出料线体无料架
        /// </summary>
-        FI_34_OutCheck = 11034,
+        FI_34_OutCheck,
        /// <summary>
        /// 上料完成，出口顶升气缸上升
        /// </summary>
-        FI_35_OutTopCylinder_Up = 11035,
+        FI_35_OutTopCylinder_Up ,
        /// <summary>
        ///上料完成， 线体横移电机运转，等待料架到达出口
        /// </summary>
-        FI_36_SideWayLineRun = 11036,
+        FI_36_SideWayLineRun ,
        /// <summary>
        ///上料完成，等待料架到达出口
        /// </summary>
-        FI_37_WaitShelfGo=11307,
+        FI_37_WaitShelfGo,
        /// <summary>
        ///上料完成， 料架到达出口，线体横移电机停止