1

source/AssemblyLineClient/FrmFeedingEquip.Designer.cs

@@ -35,8 +35,9 @@
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
-            this.Toroid_LocationCylinder = new System.Windows.Forms.Button();
-            this.btnToroid_TopCylinder = new System.Windows.Forms.Button();
+            this.btnFL_TopCylinder = new System.Windows.Forms.Button();
+            this.btnSwLocationCylinder = new System.Windows.Forms.Button();
+            this.btnSWTop = new System.Windows.Forms.Button();
             this.btnCloseAll = new System.Windows.Forms.Button();
             this.btnCloseAll = new System.Windows.Forms.Button();
             this.btnOutTopCylinder = new System.Windows.Forms.Button();
             this.btnOutTopCylinder = new System.Windows.Forms.Button();
             this.btnLocationCylinder = new System.Windows.Forms.Button();
             this.btnLocationCylinder = new System.Windows.Forms.Button();
@@ -116,7 +117,6 @@
             this.label46 = new System.Windows.Forms.Label();
             this.label46 = new System.Windows.Forms.Label();
             this.label49 = new System.Windows.Forms.Label();
             this.label49 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.btnFL_TopCylinder = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -139,6 +139,7 @@
             // 
             // 
             // groupBox1
             // groupBox1
             // 
             // 
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.groupBox1.Controls.Add(this.txtDOIndex);
             this.groupBox1.Controls.Add(this.txtDOIndex);
             this.groupBox1.Controls.Add(this.txtDoName);
             this.groupBox1.Controls.Add(this.txtDoName);
             this.groupBox1.Controls.Add(this.label17);
             this.groupBox1.Controls.Add(this.label17);
@@ -151,9 +152,9 @@
             this.groupBox1.Controls.Add(this.txtWriteTime);
             this.groupBox1.Controls.Add(this.txtWriteTime);
             this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox1.Location = new System.Drawing.Point(3, 494);
+            this.groupBox1.Location = new System.Drawing.Point(3, 527);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(394, 245);
+            this.groupBox1.Size = new System.Drawing.Size(394, 243);
             this.groupBox1.TabIndex = 105;
             this.groupBox1.TabIndex = 105;
             this.groupBox1.TabStop = false;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "DO写入";
             this.groupBox1.Text = "DO写入";
@@ -300,7 +301,7 @@
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
             this.groupBox4.Location = new System.Drawing.Point(488, 6);
             this.groupBox4.Location = new System.Drawing.Point(488, 6);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(240, 485);
+            this.groupBox4.Size = new System.Drawing.Size(240, 516);
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabStop = false;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "DO列表";
             this.groupBox4.Text = "DO列表";
@@ -317,7 +318,7 @@
             this.tableLayoutPanel2.RowCount = 2;
             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.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(229, 465);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 496);
             this.tableLayoutPanel2.TabIndex = 103;
             this.tableLayoutPanel2.TabIndex = 103;
             // 
             // 
             // groupBox3
             // groupBox3
@@ -327,7 +328,7 @@
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Location = new System.Drawing.Point(6, 6);
             this.groupBox3.Location = new System.Drawing.Point(6, 6);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(240, 485);
+            this.groupBox3.Size = new System.Drawing.Size(240, 516);
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabStop = false;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "DI列表";
             this.groupBox3.Text = "DI列表";
@@ -344,7 +345,7 @@
             this.tableLayoutPanel1.RowCount = 2;
             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.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(229, 465);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 496);
             this.tableLayoutPanel1.TabIndex = 102;
             this.tableLayoutPanel1.TabIndex = 102;
             // 
             // 
             // groupBox5
             // groupBox5
@@ -353,8 +354,8 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox5.Controls.Add(this.btnFL_TopCylinder);
             this.groupBox5.Controls.Add(this.btnFL_TopCylinder);
-            this.groupBox5.Controls.Add(this.Toroid_LocationCylinder);
-            this.groupBox5.Controls.Add(this.btnToroid_TopCylinder);
+            this.groupBox5.Controls.Add(this.btnSwLocationCylinder);
+            this.groupBox5.Controls.Add(this.btnSWTop);
             this.groupBox5.Controls.Add(this.btnCloseAll);
             this.groupBox5.Controls.Add(this.btnCloseAll);
             this.groupBox5.Controls.Add(this.btnOutTopCylinder);
             this.groupBox5.Controls.Add(this.btnOutTopCylinder);
             this.groupBox5.Controls.Add(this.btnLocationCylinder);
             this.groupBox5.Controls.Add(this.btnLocationCylinder);
@@ -364,36 +365,49 @@
             this.groupBox5.Controls.Add(this.btnFeedSideWay);
             this.groupBox5.Controls.Add(this.btnFeedSideWay);
             this.groupBox5.Location = new System.Drawing.Point(974, 6);
             this.groupBox5.Location = new System.Drawing.Point(974, 6);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(340, 485);
+            this.groupBox5.Size = new System.Drawing.Size(384, 516);
             this.groupBox5.TabIndex = 255;
             this.groupBox5.TabIndex = 255;
             this.groupBox5.TabStop = false;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "IO操作测试";
             this.groupBox5.Text = "IO操作测试";
             // 
             // 
-            // Toroid_LocationCylinder
-            // 
-            this.Toroid_LocationCylinder.BackColor = System.Drawing.Color.White;
-            this.Toroid_LocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.Toroid_LocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Toroid_LocationCylinder.Location = new System.Drawing.Point(162, 160);
-            this.Toroid_LocationCylinder.Name = "Toroid_LocationCylinder";
-            this.Toroid_LocationCylinder.Size = new System.Drawing.Size(140, 34);
-            this.Toroid_LocationCylinder.TabIndex = 261;
-            this.Toroid_LocationCylinder.Text = "环形线横移定位上升";
-            this.Toroid_LocationCylinder.UseVisualStyleBackColor = false;
-            this.Toroid_LocationCylinder.Click += new System.EventHandler(this.Toroid_LocationCylinder_Click);
-            // 
-            // btnToroid_TopCylinder
-            // 
-            this.btnToroid_TopCylinder.BackColor = System.Drawing.Color.White;
-            this.btnToroid_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnToroid_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnToroid_TopCylinder.Location = new System.Drawing.Point(14, 160);
-            this.btnToroid_TopCylinder.Name = "btnToroid_TopCylinder";
-            this.btnToroid_TopCylinder.Size = new System.Drawing.Size(140, 34);
-            this.btnToroid_TopCylinder.TabIndex = 260;
-            this.btnToroid_TopCylinder.Text = "环形线横移顶升上升";
-            this.btnToroid_TopCylinder.UseVisualStyleBackColor = false;
-            this.btnToroid_TopCylinder.Click += new System.EventHandler(this.btnToroid_TopCylinder_Click);
+            // btnFL_TopCylinder
+            // 
+            this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White;
+            this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnFL_TopCylinder.Location = new System.Drawing.Point(16, 160);
+            this.btnFL_TopCylinder.Name = "btnFL_TopCylinder";
+            this.btnFL_TopCylinder.Size = new System.Drawing.Size(140, 34);
+            this.btnFL_TopCylinder.TabIndex = 262;
+            this.btnFL_TopCylinder.Text = "FL顶升上升";
+            this.btnFL_TopCylinder.UseVisualStyleBackColor = false;
+            this.btnFL_TopCylinder.Click += new System.EventHandler(this.btnFL_TopCylinder_Click);
+            // 
+            // btnSwLocationCylinder
+            // 
+            this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White;
+            this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSwLocationCylinder.Location = new System.Drawing.Point(162, 206);
+            this.btnSwLocationCylinder.Name = "btnSwLocationCylinder";
+            this.btnSwLocationCylinder.Size = new System.Drawing.Size(140, 34);
+            this.btnSwLocationCylinder.TabIndex = 261;
+            this.btnSwLocationCylinder.Text = "环形线横移定位上升";
+            this.btnSwLocationCylinder.UseVisualStyleBackColor = false;
+            this.btnSwLocationCylinder.Click += new System.EventHandler(this.Toroid_LocationCylinder_Click);
+            // 
+            // btnSWTop
+            // 
+            this.btnSWTop.BackColor = System.Drawing.Color.White;
+            this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSWTop.Location = new System.Drawing.Point(162, 160);
+            this.btnSWTop.Name = "btnSWTop";
+            this.btnSWTop.Size = new System.Drawing.Size(140, 34);
+            this.btnSWTop.TabIndex = 260;
+            this.btnSWTop.Text = "环形线横移顶升上升";
+            this.btnSWTop.UseVisualStyleBackColor = false;
+            this.btnSWTop.Click += new System.EventHandler(this.btnToroid_TopCylinder_Click);
             // 
             // 
             // btnCloseAll
             // btnCloseAll
             // 
             // 
@@ -507,7 +521,7 @@
             this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.lblThisSta.Location = new System.Drawing.Point(124, 19);
             this.lblThisSta.Location = new System.Drawing.Point(124, 19);
             this.lblThisSta.Name = "lblThisSta";
             this.lblThisSta.Name = "lblThisSta";
-            this.lblThisSta.Size = new System.Drawing.Size(781, 77);
+            this.lblThisSta.Size = new System.Drawing.Size(825, 77);
             this.lblThisSta.TabIndex = 246;
             this.lblThisSta.TabIndex = 246;
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -601,7 +615,7 @@
             this.tabControl1.Location = new System.Drawing.Point(5, 69);
             this.tabControl1.Location = new System.Drawing.Point(5, 69);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1329, 775);
+            this.tabControl1.Size = new System.Drawing.Size(1373, 806);
             this.tabControl1.TabIndex = 257;
             this.tabControl1.TabIndex = 257;
             // 
             // 
             // tabPage1
             // tabPage1
@@ -616,20 +630,21 @@
             this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1321, 745);
+            this.tabPage1.Size = new System.Drawing.Size(1365, 776);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "    IO列表     ";
             this.tabPage1.Text = "    IO列表     ";
             this.tabPage1.UseVisualStyleBackColor = true;
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // 
             // groupBox6
             // groupBox6
             // 
             // 
-            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox6.Controls.Add(this.lblTrayNum);
             this.groupBox6.Controls.Add(this.lblTrayNum);
             this.groupBox6.Controls.Add(this.lblInstoreList);
             this.groupBox6.Controls.Add(this.lblInstoreList);
             this.groupBox6.Controls.Add(this.lblThisSta);
             this.groupBox6.Controls.Add(this.lblThisSta);
-            this.groupBox6.Location = new System.Drawing.Point(403, 496);
+            this.groupBox6.Location = new System.Drawing.Point(403, 527);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(911, 245);
+            this.groupBox6.Size = new System.Drawing.Size(955, 245);
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabStop = false;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "消息";
             this.groupBox6.Text = "消息";
@@ -655,7 +670,7 @@
             this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.lblInstoreList.Location = new System.Drawing.Point(6, 115);
             this.lblInstoreList.Location = new System.Drawing.Point(6, 115);
             this.lblInstoreList.Name = "lblInstoreList";
             this.lblInstoreList.Name = "lblInstoreList";
-            this.lblInstoreList.Size = new System.Drawing.Size(900, 81);
+            this.lblInstoreList.Size = new System.Drawing.Size(944, 81);
             this.lblInstoreList.TabIndex = 277;
             this.lblInstoreList.TabIndex = 277;
             // 
             // 
             // groupBox7
             // groupBox7
@@ -665,7 +680,7 @@
             this.groupBox7.Controls.Add(this.tableLayoutPanel3);
             this.groupBox7.Controls.Add(this.tableLayoutPanel3);
             this.groupBox7.Location = new System.Drawing.Point(247, 6);
             this.groupBox7.Location = new System.Drawing.Point(247, 6);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Size = new System.Drawing.Size(240, 485);
+            this.groupBox7.Size = new System.Drawing.Size(240, 516);
             this.groupBox7.TabIndex = 279;
             this.groupBox7.TabIndex = 279;
             this.groupBox7.TabStop = false;
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "DI列表";
             this.groupBox7.Text = "DI列表";
@@ -682,7 +697,7 @@
             this.tableLayoutPanel3.RowCount = 2;
             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.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(229, 465);
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(229, 496);
             this.tableLayoutPanel3.TabIndex = 102;
             this.tableLayoutPanel3.TabIndex = 102;
             // 
             // 
             // groupBox8
             // groupBox8
@@ -692,7 +707,7 @@
             this.groupBox8.Controls.Add(this.tableLayoutPanel4);
             this.groupBox8.Controls.Add(this.tableLayoutPanel4);
             this.groupBox8.Location = new System.Drawing.Point(728, 6);
             this.groupBox8.Location = new System.Drawing.Point(728, 6);
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.Name = "groupBox8";
-            this.groupBox8.Size = new System.Drawing.Size(240, 485);
+            this.groupBox8.Size = new System.Drawing.Size(240, 516);
             this.groupBox8.TabIndex = 280;
             this.groupBox8.TabIndex = 280;
             this.groupBox8.TabStop = false;
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "DO列表";
             this.groupBox8.Text = "DO列表";
@@ -709,7 +724,7 @@
             this.tableLayoutPanel4.RowCount = 2;
             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.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(229, 465);
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 496);
             this.tableLayoutPanel4.TabIndex = 103;
             this.tableLayoutPanel4.TabIndex = 103;
             // 
             // 
             // tabPage2
             // tabPage2
@@ -1414,27 +1429,14 @@
             this.panel1.Controls.Add(this.btnReset);
             this.panel1.Controls.Add(this.btnReset);
             this.panel1.Location = new System.Drawing.Point(2, 1);
             this.panel1.Location = new System.Drawing.Point(2, 1);
             this.panel1.Name = "panel1";
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1328, 68);
+            this.panel1.Size = new System.Drawing.Size(1372, 68);
             this.panel1.TabIndex = 258;
             this.panel1.TabIndex = 258;
             // 
             // 
-            // btnFL_TopCylinder
-            // 
-            this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White;
-            this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnFL_TopCylinder.Location = new System.Drawing.Point(14, 206);
-            this.btnFL_TopCylinder.Name = "btnFL_TopCylinder";
-            this.btnFL_TopCylinder.Size = new System.Drawing.Size(140, 34);
-            this.btnFL_TopCylinder.TabIndex = 262;
-            this.btnFL_TopCylinder.Text = "FL顶升上升";
-            this.btnFL_TopCylinder.UseVisualStyleBackColor = false;
-            this.btnFL_TopCylinder.Click += new System.EventHandler(this.btnFL_TopCylinder_Click);
-            // 
             // FrmFeedingEquip
             // FrmFeedingEquip
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1340, 850);
+            this.ClientSize = new System.Drawing.Size(1384, 881);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -1566,8 +1568,8 @@
         private System.Windows.Forms.TextBox txtDoName;
         private System.Windows.Forms.TextBox txtDoName;
         private System.Windows.Forms.Label label17;
         private System.Windows.Forms.Label label17;
         private System.Windows.Forms.Label label14;
         private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Button Toroid_LocationCylinder;
-        private System.Windows.Forms.Button btnToroid_TopCylinder;
+        private System.Windows.Forms.Button btnSwLocationCylinder;
+        private System.Windows.Forms.Button btnSWTop;
         private System.Windows.Forms.Button btnFL_TopCylinder;
         private System.Windows.Forms.Button btnFL_TopCylinder;
     }
     }
 }
 }

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -393,7 +393,7 @@ namespace OnlineStore.AssemblyLine
         }
         }
         private void btnToroid_TopCylinder_Click(object sender, EventArgs e)
         private void btnToroid_TopCylinder_Click(object sender, EventArgs e)
         {
         {
-            BtnMove(btnToroid_TopCylinder, "环形线横移顶升上升", "环形线横移顶升下降", IO_Type.Toroid_TopCylinder_Down, IO_Type.Toroid_TopCylinder_Up);
+            BtnMove(btnSWTop, "环形线横移顶升上升", "环形线横移顶升下降", IO_Type.SW_TopCylinder_Down, IO_Type.SW_TopCylinder_Up);
         }
         }
 
 
         private void btnFL_TopCylinder_Click(object sender, EventArgs e)
         private void btnFL_TopCylinder_Click(object sender, EventArgs e)
@@ -402,7 +402,7 @@ namespace OnlineStore.AssemblyLine
         }
         }
         private void Toroid_LocationCylinder_Click(object sender, EventArgs e)
         private void Toroid_LocationCylinder_Click(object sender, EventArgs e)
         {
         {
-            BtnMove(Toroid_LocationCylinder, "SL升降盘定位气缸前进", "SL升降盘定位气缸后退", IO_Type.Toroid_LocationCylinder_Down, IO_Type.Toroid_LocationCylinder_Up);
+            BtnMove(btnSwLocationCylinder, "环形线横移定位上升", "环形线横移定位下降", IO_Type.SW_LocationCylinder_Down, IO_Type.SW_LocationCylinder_Up);
         }
         }
         private void btnOpenAxis_Click(object sender, EventArgs e)
         private void btnOpenAxis_Click(object sender, EventArgs e)
         {
         {

source/AssemblyLineClient/FrmIOStatus.Designer.cs

@@ -39,17 +39,21 @@
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.btnSw3Location = new System.Windows.Forms.Button();
+            this.btnSw3Top = new System.Windows.Forms.Button();
+            this.btnSw2Location = new System.Windows.Forms.Button();
+            this.btnSw2Top = new System.Windows.Forms.Button();
+            this.btnSw1Location = new System.Windows.Forms.Button();
+            this.btnSw4Location = new System.Windows.Forms.Button();
+            this.btnSw4Top = new System.Windows.Forms.Button();
+            this.btnSw1Top = new System.Windows.Forms.Button();
+            this.btnSw3Run = new System.Windows.Forms.Button();
+            this.btnSw2Run = new System.Windows.Forms.Button();
+            this.btnSw1Run = new System.Windows.Forms.Button();
             this.lblTrayNum = new System.Windows.Forms.Label();
             this.lblTrayNum = new System.Windows.Forms.Label();
             this.btnCloseAll = new System.Windows.Forms.Button();
             this.btnCloseAll = new System.Windows.Forms.Button();
-            this.btnSwStop3 = new System.Windows.Forms.Button();
-            this.btnSwStop1 = new System.Windows.Forms.Button();
-            this.btnStop02 = new System.Windows.Forms.Button();
-            this.btnStop01 = new System.Windows.Forms.Button();
-            this.btn34Top = new System.Windows.Forms.Button();
-            this.btn12Top = new System.Windows.Forms.Button();
-            this.btnSw34Run = new System.Windows.Forms.Button();
-            this.btnSw12Run = new System.Windows.Forms.Button();
-            this.btnInTopCylinderUp = new System.Windows.Forms.Button();
+            this.btnNGCylinder = 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.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -80,7 +84,7 @@
             this.groupBox1.Controls.Add(this.cmbWriteIO);
             this.groupBox1.Controls.Add(this.cmbWriteIO);
             this.groupBox1.Controls.Add(this.txtSlaveId);
             this.groupBox1.Controls.Add(this.txtSlaveId);
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox1.Location = new System.Drawing.Point(521, 5);
+            this.groupBox1.Location = new System.Drawing.Point(738, 5);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Size = new System.Drawing.Size(343, 190);
             this.groupBox1.Size = new System.Drawing.Size(343, 190);
             this.groupBox1.TabIndex = 105;
             this.groupBox1.TabIndex = 105;
@@ -233,7 +237,7 @@
             this.chbAutoRead.Checked = true;
             this.chbAutoRead.Checked = true;
             this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
             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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbAutoRead.Location = new System.Drawing.Point(-180, 660);
+            this.chbAutoRead.Location = new System.Drawing.Point(57, 833);
             this.chbAutoRead.Name = "chbAutoRead";
             this.chbAutoRead.Name = "chbAutoRead";
             this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
             this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
             this.chbAutoRead.TabIndex = 244;
             this.chbAutoRead.TabIndex = 244;
@@ -245,9 +249,9 @@
             this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             | System.Windows.Forms.AnchorStyles.Left)));
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
-            this.groupBox4.Location = new System.Drawing.Point(262, 5);
+            this.groupBox4.Location = new System.Drawing.Point(490, 5);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(240, 690);
+            this.groupBox4.Size = new System.Drawing.Size(240, 868);
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabStop = false;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "DO列表";
             this.groupBox4.Text = "DO列表";
@@ -264,7 +268,7 @@
             this.tableLayoutPanel2.RowCount = 2;
             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.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(229, 670);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 848);
             this.tableLayoutPanel2.TabIndex = 103;
             this.tableLayoutPanel2.TabIndex = 103;
             // 
             // 
             // groupBox3
             // groupBox3
@@ -274,7 +278,7 @@
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Location = new System.Drawing.Point(6, 5);
             this.groupBox3.Location = new System.Drawing.Point(6, 5);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(240, 690);
+            this.groupBox3.Size = new System.Drawing.Size(240, 868);
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabStop = false;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "DI列表";
             this.groupBox3.Text = "DI列表";
@@ -291,7 +295,7 @@
             this.tableLayoutPanel1.RowCount = 2;
             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.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(229, 670);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 848);
             this.tableLayoutPanel1.TabIndex = 102;
             this.tableLayoutPanel1.TabIndex = 102;
             // 
             // 
             // groupBox2
             // groupBox2
@@ -299,13 +303,12 @@
             this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             | System.Windows.Forms.AnchorStyles.Left)));
             this.groupBox2.Controls.Add(this.tableLayoutPanel3);
             this.groupBox2.Controls.Add(this.tableLayoutPanel3);
-            this.groupBox2.Location = new System.Drawing.Point(234, 97);
+            this.groupBox2.Location = new System.Drawing.Point(248, 5);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(230, 598);
+            this.groupBox2.Size = new System.Drawing.Size(240, 868);
             this.groupBox2.TabIndex = 245;
             this.groupBox2.TabIndex = 245;
             this.groupBox2.TabStop = false;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "DI列表";
             this.groupBox2.Text = "DI列表";
-            this.groupBox2.Visible = false;
             // 
             // 
             // tableLayoutPanel3
             // tableLayoutPanel3
             // 
             // 
@@ -319,36 +322,174 @@
             this.tableLayoutPanel3.RowCount = 2;
             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.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(219, 578);
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(229, 848);
             this.tableLayoutPanel3.TabIndex = 102;
             this.tableLayoutPanel3.TabIndex = 102;
             // 
             // 
             // groupBox5
             // 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.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.lblTrayNum);
             this.groupBox5.Controls.Add(this.btnCloseAll);
             this.groupBox5.Controls.Add(this.btnCloseAll);
-            this.groupBox5.Controls.Add(this.btnSwStop3);
-            this.groupBox5.Controls.Add(this.btnSwStop1);
-            this.groupBox5.Controls.Add(this.btnStop02);
-            this.groupBox5.Controls.Add(this.btnStop01);
-            this.groupBox5.Controls.Add(this.btn34Top);
-            this.groupBox5.Controls.Add(this.btn12Top);
-            this.groupBox5.Controls.Add(this.btnSw34Run);
-            this.groupBox5.Controls.Add(this.btnSw12Run);
-            this.groupBox5.Controls.Add(this.btnInTopCylinderUp);
+            this.groupBox5.Controls.Add(this.btnNGCylinder);
+            this.groupBox5.Controls.Add(this.btnSW4Run);
             this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
             this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
-            this.groupBox5.Location = new System.Drawing.Point(521, 201);
+            this.groupBox5.Location = new System.Drawing.Point(738, 201);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(343, 292);
+            this.groupBox5.Size = new System.Drawing.Size(343, 672);
             this.groupBox5.TabIndex = 246;
             this.groupBox5.TabIndex = 246;
             this.groupBox5.TabStop = false;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "IO操作测试";
             this.groupBox5.Text = "IO操作测试";
             // 
             // 
+            // btnSw3Location
+            // 
+            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(22, 266);
+            this.btnSw3Location.Name = "btnSw3Location";
+            this.btnSw3Location.Size = new System.Drawing.Size(140, 34);
+            this.btnSw3Location.TabIndex = 285;
+            this.btnSw3Location.Text = "环形线横移3定位上升";
+            this.btnSw3Location.UseVisualStyleBackColor = true;
+            this.btnSw3Location.Click += new System.EventHandler(this.btnSw3Location_Click);
+            // 
+            // btnSw3Top
+            // 
+            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(22, 313);
+            this.btnSw3Top.Name = "btnSw3Top";
+            this.btnSw3Top.Size = new System.Drawing.Size(140, 34);
+            this.btnSw3Top.TabIndex = 284;
+            this.btnSw3Top.Text = "环形线横移3顶升上升";
+            this.btnSw3Top.UseVisualStyleBackColor = true;
+            this.btnSw3Top.Click += new System.EventHandler(this.btnSw3Top_Click);
+            // 
+            // btnSw2Location
+            // 
+            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(185, 172);
+            this.btnSw2Location.Name = "btnSw2Location";
+            this.btnSw2Location.Size = new System.Drawing.Size(140, 34);
+            this.btnSw2Location.TabIndex = 283;
+            this.btnSw2Location.Text = "环形线横移2定位上升";
+            this.btnSw2Location.UseVisualStyleBackColor = true;
+            this.btnSw2Location.Click += new System.EventHandler(this.btnSw2Location_Click);
+            // 
+            // btnSw2Top
+            // 
+            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(185, 219);
+            this.btnSw2Top.Name = "btnSw2Top";
+            this.btnSw2Top.Size = new System.Drawing.Size(140, 34);
+            this.btnSw2Top.TabIndex = 282;
+            this.btnSw2Top.Text = "环形线横移2顶升上升";
+            this.btnSw2Top.UseVisualStyleBackColor = true;
+            this.btnSw2Top.Click += new System.EventHandler(this.btnSw2Top_Click);
+            // 
+            // btnSw1Location
+            // 
+            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(22, 172);
+            this.btnSw1Location.Name = "btnSw1Location";
+            this.btnSw1Location.Size = new System.Drawing.Size(140, 34);
+            this.btnSw1Location.TabIndex = 281;
+            this.btnSw1Location.Text = "环形线横移1定位上升";
+            this.btnSw1Location.UseVisualStyleBackColor = true;
+            this.btnSw1Location.Click += new System.EventHandler(this.btnSw1Location_Click);
+            // 
+            // btnSw4Location
+            // 
+            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(185, 266);
+            this.btnSw4Location.Name = "btnSw4Location";
+            this.btnSw4Location.Size = new System.Drawing.Size(140, 34);
+            this.btnSw4Location.TabIndex = 276;
+            this.btnSw4Location.Text = "环形线横移4定位上升";
+            this.btnSw4Location.UseVisualStyleBackColor = true;
+            this.btnSw4Location.Click += new System.EventHandler(this.btnSw4Location_Click);
+            // 
+            // btnSw4Top
+            // 
+            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(185, 313);
+            this.btnSw4Top.Name = "btnSw4Top";
+            this.btnSw4Top.Size = new System.Drawing.Size(140, 34);
+            this.btnSw4Top.TabIndex = 269;
+            this.btnSw4Top.Text = "环形线横移4顶升上升";
+            this.btnSw4Top.UseVisualStyleBackColor = true;
+            this.btnSw4Top.Click += new System.EventHandler(this.btn34Top_Click);
+            // 
+            // btnSw1Top
+            // 
+            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(22, 219);
+            this.btnSw1Top.Name = "btnSw1Top";
+            this.btnSw1Top.Size = new System.Drawing.Size(140, 34);
+            this.btnSw1Top.TabIndex = 280;
+            this.btnSw1Top.Text = "环形线横移1顶升上升";
+            this.btnSw1Top.UseVisualStyleBackColor = true;
+            this.btnSw1Top.Click += new System.EventHandler(this.btnSw1Top_Click);
+            // 
+            // btnSw3Run
+            // 
+            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(22, 125);
+            this.btnSw3Run.Name = "btnSw3Run";
+            this.btnSw3Run.Size = new System.Drawing.Size(140, 34);
+            this.btnSw3Run.TabIndex = 279;
+            this.btnSw3Run.Text = "环形线横移3电机运转";
+            this.btnSw3Run.UseVisualStyleBackColor = true;
+            this.btnSw3Run.Click += new System.EventHandler(this.btnSw3Run_Click);
+            // 
+            // btnSw2Run
+            // 
+            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(185, 78);
+            this.btnSw2Run.Name = "btnSw2Run";
+            this.btnSw2Run.Size = new System.Drawing.Size(140, 34);
+            this.btnSw2Run.TabIndex = 278;
+            this.btnSw2Run.Text = "环形线横移2电机运转";
+            this.btnSw2Run.UseVisualStyleBackColor = true;
+            this.btnSw2Run.Click += new System.EventHandler(this.btnSw2Run_Click);
+            // 
+            // btnSw1Run
+            // 
+            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(22, 78);
+            this.btnSw1Run.Name = "btnSw1Run";
+            this.btnSw1Run.Size = new System.Drawing.Size(140, 34);
+            this.btnSw1Run.TabIndex = 277;
+            this.btnSw1Run.Text = "环形线横移1电机运转";
+            this.btnSw1Run.UseVisualStyleBackColor = true;
+            this.btnSw1Run.Click += new System.EventHandler(this.btnSw1Run_Click);
+            // 
             // lblTrayNum
             // lblTrayNum
             // 
             // 
             this.lblTrayNum.AutoSize = true;
             this.lblTrayNum.AutoSize = true;
             this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblTrayNum.Location = new System.Drawing.Point(182, 244);
+            this.lblTrayNum.Location = new System.Drawing.Point(182, 392);
             this.lblTrayNum.Name = "lblTrayNum";
             this.lblTrayNum.Name = "lblTrayNum";
             this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
             this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
             this.lblTrayNum.TabIndex = 275;
             this.lblTrayNum.TabIndex = 275;
@@ -360,7 +501,7 @@
             this.btnCloseAll.BackColor = System.Drawing.Color.White;
             this.btnCloseAll.BackColor = System.Drawing.Color.White;
             this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCloseAll.Location = new System.Drawing.Point(22, 235);
+            this.btnCloseAll.Location = new System.Drawing.Point(22, 383);
             this.btnCloseAll.Name = "btnCloseAll";
             this.btnCloseAll.Name = "btnCloseAll";
             this.btnCloseAll.Size = new System.Drawing.Size(140, 34);
             this.btnCloseAll.Size = new System.Drawing.Size(140, 34);
             this.btnCloseAll.TabIndex = 274;
             this.btnCloseAll.TabIndex = 274;
@@ -368,113 +509,29 @@
             this.btnCloseAll.UseVisualStyleBackColor = false;
             this.btnCloseAll.UseVisualStyleBackColor = false;
             this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
             this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
             // 
             // 
-            // btnSwStop3
-            // 
-            this.btnSwStop3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSwStop3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSwStop3.Location = new System.Drawing.Point(172, 151);
-            this.btnSwStop3.Name = "btnSwStop3";
-            this.btnSwStop3.Size = new System.Drawing.Size(140, 34);
-            this.btnSwStop3.TabIndex = 273;
-            this.btnSwStop3.Text = "横移轨道3阻挡下降";
-            this.btnSwStop3.UseVisualStyleBackColor = true;
-            this.btnSwStop3.Click += new System.EventHandler(this.btnSwStop3_Click);
-            // 
-            // btnSwStop1
-            // 
-            this.btnSwStop1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSwStop1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSwStop1.Location = new System.Drawing.Point(22, 151);
-            this.btnSwStop1.Name = "btnSwStop1";
-            this.btnSwStop1.Size = new System.Drawing.Size(140, 34);
-            this.btnSwStop1.TabIndex = 272;
-            this.btnSwStop1.Text = "横移轨道1阻挡下降";
-            this.btnSwStop1.UseVisualStyleBackColor = true;
-            this.btnSwStop1.Click += new System.EventHandler(this.btnSwStop1_Click);
-            // 
-            // btnStop02
-            // 
-            this.btnStop02.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStop02.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStop02.Location = new System.Drawing.Point(172, 71);
-            this.btnStop02.Name = "btnStop02";
-            this.btnStop02.Size = new System.Drawing.Size(140, 34);
-            this.btnStop02.TabIndex = 271;
-            this.btnStop02.Text = "阻挡气缸0-2下降";
-            this.btnStop02.UseVisualStyleBackColor = false;
-            this.btnStop02.Click += new System.EventHandler(this.btnStop02_Click);
-            // 
-            // btnStop01
-            // 
-            this.btnStop01.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStop01.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStop01.Location = new System.Drawing.Point(22, 71);
-            this.btnStop01.Name = "btnStop01";
-            this.btnStop01.Size = new System.Drawing.Size(140, 34);
-            this.btnStop01.TabIndex = 270;
-            this.btnStop01.Text = "阻挡气缸0-1下降";
-            this.btnStop01.UseVisualStyleBackColor = false;
-            this.btnStop01.Click += new System.EventHandler(this.btnStop01_Click);
-            // 
-            // btn34Top
-            // 
-            this.btn34Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btn34Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn34Top.Location = new System.Drawing.Point(172, 191);
-            this.btn34Top.Name = "btn34Top";
-            this.btn34Top.Size = new System.Drawing.Size(140, 34);
-            this.btn34Top.TabIndex = 269;
-            this.btn34Top.Text = "横移轨道3.4顶升上升";
-            this.btn34Top.UseVisualStyleBackColor = true;
-            this.btn34Top.Click += new System.EventHandler(this.btn34Top_Click);
-            // 
-            // btn12Top
-            // 
-            this.btn12Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btn12Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn12Top.Location = new System.Drawing.Point(22, 191);
-            this.btn12Top.Name = "btn12Top";
-            this.btn12Top.Size = new System.Drawing.Size(140, 34);
-            this.btn12Top.TabIndex = 268;
-            this.btn12Top.Text = "横移轨道1.2顶升上升";
-            this.btn12Top.UseVisualStyleBackColor = true;
-            this.btn12Top.Click += new System.EventHandler(this.btn12Top_Click);
-            // 
-            // btnSw34Run
-            // 
-            this.btnSw34Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSw34Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw34Run.Location = new System.Drawing.Point(172, 111);
-            this.btnSw34Run.Name = "btnSw34Run";
-            this.btnSw34Run.Size = new System.Drawing.Size(140, 34);
-            this.btnSw34Run.TabIndex = 266;
-            this.btnSw34Run.Text = "横移轨道3.4驱动";
-            this.btnSw34Run.UseVisualStyleBackColor = true;
-            this.btnSw34Run.Click += new System.EventHandler(this.btnSw34Run_Click);
-            // 
-            // btnSw12Run
-            // 
-            this.btnSw12Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSw12Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSw12Run.Location = new System.Drawing.Point(22, 111);
-            this.btnSw12Run.Name = "btnSw12Run";
-            this.btnSw12Run.Size = new System.Drawing.Size(140, 34);
-            this.btnSw12Run.TabIndex = 264;
-            this.btnSw12Run.Text = "横移轨道1.2驱动";
-            this.btnSw12Run.UseVisualStyleBackColor = true;
-            this.btnSw12Run.Click += new System.EventHandler(this.btnSw12Run_Click);
-            // 
-            // btnInTopCylinderUp
-            // 
-            this.btnInTopCylinderUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnInTopCylinderUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnInTopCylinderUp.Location = new System.Drawing.Point(172, 31);
-            this.btnInTopCylinderUp.Name = "btnInTopCylinderUp";
-            this.btnInTopCylinderUp.Size = new System.Drawing.Size(140, 34);
-            this.btnInTopCylinderUp.TabIndex = 262;
-            this.btnInTopCylinderUp.Text = "上料工位顶升气缸上升";
-            this.btnInTopCylinderUp.UseVisualStyleBackColor = true;
-            this.btnInTopCylinderUp.Click += new System.EventHandler(this.btnInTopCylinderUp_Click);
+            // btnNGCylinder
+            // 
+            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, 31);
+            this.btnNGCylinder.Name = "btnNGCylinder";
+            this.btnNGCylinder.Size = new System.Drawing.Size(140, 34);
+            this.btnNGCylinder.TabIndex = 268;
+            this.btnNGCylinder.Text = "NG料盘退出气缸前进";
+            this.btnNGCylinder.UseVisualStyleBackColor = true;
+            this.btnNGCylinder.Click += new System.EventHandler(this.btnNGCylinder_Click);
+            // 
+            // btnSW4Run
+            // 
+            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(185, 125);
+            this.btnSW4Run.Name = "btnSW4Run";
+            this.btnSW4Run.Size = new System.Drawing.Size(140, 34);
+            this.btnSW4Run.TabIndex = 262;
+            this.btnSW4Run.Text = "环形线横移4电机运转";
+            this.btnSW4Run.UseVisualStyleBackColor = true;
+            this.btnSW4Run.Click += new System.EventHandler(this.btnSWRun_Click);
             // 
             // 
             // btnDriveMotor_Run
             // btnDriveMotor_Run
             // 
             // 
@@ -484,7 +541,7 @@
             this.btnDriveMotor_Run.Name = "btnDriveMotor_Run";
             this.btnDriveMotor_Run.Name = "btnDriveMotor_Run";
             this.btnDriveMotor_Run.Size = new System.Drawing.Size(140, 34);
             this.btnDriveMotor_Run.Size = new System.Drawing.Size(140, 34);
             this.btnDriveMotor_Run.TabIndex = 260;
             this.btnDriveMotor_Run.TabIndex = 260;
-            this.btnDriveMotor_Run.Text = "驱动电机正转";
+            this.btnDriveMotor_Run.Text = "驱动电机1234正转";
             this.btnDriveMotor_Run.UseVisualStyleBackColor = false;
             this.btnDriveMotor_Run.UseVisualStyleBackColor = false;
             this.btnDriveMotor_Run.Click += new System.EventHandler(this.btnDriveMotor_Run_Click);
             this.btnDriveMotor_Run.Click += new System.EventHandler(this.btnDriveMotor_Run_Click);
             // 
             // 
@@ -499,14 +556,14 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1147, 708);
+            this.panel1.Size = new System.Drawing.Size(1384, 881);
             this.panel1.TabIndex = 248;
             this.panel1.TabIndex = 248;
             // 
             // 
             // FrmIOStatus
             // FrmIOStatus
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1147, 708);
+            this.ClientSize = new System.Drawing.Size(1384, 881);
             this.Controls.Add(this.chbAutoRead);
             this.Controls.Add(this.chbAutoRead);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.panel1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -553,20 +610,24 @@
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
         private System.Windows.Forms.GroupBox groupBox5;
         private System.Windows.Forms.GroupBox groupBox5;
-        private System.Windows.Forms.Button btnInTopCylinderUp;
+        private System.Windows.Forms.Button btnSW4Run;
         private System.Windows.Forms.Button btnDriveMotor_Run;
         private System.Windows.Forms.Button btnDriveMotor_Run;
-        private System.Windows.Forms.Button btn34Top;
-        private System.Windows.Forms.Button btn12Top;
-        private System.Windows.Forms.Button btnSw34Run;
-        private System.Windows.Forms.Button btnSw12Run;
-        private System.Windows.Forms.Button btnStop01;
-        private System.Windows.Forms.Button btnStop02;
-        private System.Windows.Forms.Button btnSwStop3;
-        private System.Windows.Forms.Button btnSwStop1;
+        private System.Windows.Forms.Button btnSw4Top;
+        private System.Windows.Forms.Button btnNGCylinder;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.CheckBox checkBox1;
         private System.Windows.Forms.CheckBox checkBox1;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.Label lblTrayNum;
         private System.Windows.Forms.Label lblTrayNum;
+        private System.Windows.Forms.Button btnSw4Location;
+        private System.Windows.Forms.Button btnSw3Run;
+        private System.Windows.Forms.Button btnSw2Run;
+        private System.Windows.Forms.Button btnSw1Run;
+        private System.Windows.Forms.Button btnSw3Location;
+        private System.Windows.Forms.Button btnSw3Top;
+        private System.Windows.Forms.Button btnSw2Location;
+        private System.Windows.Forms.Button btnSw2Top;
+        private System.Windows.Forms.Button btnSw1Location;
+        private System.Windows.Forms.Button btnSw1Top;
     }
     }
 }
 }
 
 

source/AssemblyLineClient/FrmIOStatus.cs

@@ -33,7 +33,7 @@ namespace OnlineStore.AssemblyLine
         Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
         Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
         private void LoadIOList()
         private void LoadIOList()
         {
         {
-            int count = 20;
+            int count = 30;
             int roleindex = 0;
             int roleindex = 0;
             this.tableLayoutPanel1.RowStyles.Clear();
             this.tableLayoutPanel1.RowStyles.Clear();
             this.tableLayoutPanel1.RowCount = count;
             this.tableLayoutPanel1.RowCount = count;
@@ -229,173 +229,126 @@ namespace OnlineStore.AssemblyLine
         {  
         {  
             timer1.Start();
             timer1.Start();
         }
         }
-
-        private void btnDriveMotor_Run_Click(object sender, EventArgs e)
+        protected void BtnMove(Button btn, string defaultText, string targetText, string ioHighType)
         {
         {
-            if (btnDriveMotor_Run.Text.Equals("驱动电机正转"))
+            LogUtil.info("点击【" + btn.Text + "】 ");
+            if (btn.Text.Equals(defaultText))
             {
             {
-                btnDriveMotor_Run.Text = "驱动电机停止";
-                btnDriveMotor_Run.BackColor = Color.Aqua;
-                IOManager.IOMove(IO_Type.DriveMotor_Run, IO_VALUE.HIGH );
+                LineManager.Line.IOMove(ioHighType, IO_VALUE.HIGH);
+                btn.Text = targetText;
+                btn.BackColor = Color.Aqua;
             }
             }
             else
             else
             {
             {
-                IOManager.IOMove(IO_Type.DriveMotor_Run, IO_VALUE.LOW );
-                btnDriveMotor_Run.Text = "驱动电机正转";
-                btnDriveMotor_Run.BackColor = Color.White;
+                LineManager.Line.IOMove(ioHighType, IO_VALUE.LOW);
+                btn.Text = defaultText;
+                btn.BackColor = Color.White;
             }
             }
         }
         }
-         
-        private void btnInTopCylinderUp_Click(object sender, EventArgs e)
-        {
-            if (btnInTopCylinderUp.Text.Equals("上料工位顶升气缸上升"))
-            {
-                LineManager.Line.CylinderMove(null, IO_Type.InStore_TopCylinder_Down, IO_Type.InStore_TopCylinder_Up);
-                btnInTopCylinderUp.Text = "上料工位顶升气缸下降";
-                btnInTopCylinderUp.BackColor = Color.Aqua;
-            }
-            else
-            {
-                LineManager.Line.CylinderMove(null, IO_Type.InStore_TopCylinder_Up, IO_Type.InStore_TopCylinder_Down);
-                btnInTopCylinderUp.Text = "上料工位顶升气缸上升";
-                btnInTopCylinderUp.BackColor = Color.SkyBlue;
-            }
-        } 
 
 
-        private void btn12Top_Click(object sender, EventArgs e)
+        protected void BtnMove(Button btn, string defaultText, string targetText, string ioLowType, string ioHighType)
         {
         {
-            if (btn12Top.Text.Equals("横移轨道1.2顶升上升"))
+            LogUtil.info("点击【" + btn.Text + "】 ");
+            if (btn.Text.Equals(defaultText))
             {
             {
-                btn12Top.Text = "横移轨道1.2顶升下降";
-                btn12Top.BackColor = Color.Aqua;
-                LineManager.Line.SideWay12TopCylinderMove(IO_VALUE.LOW, IO_VALUE.HIGH, null);
+                LineManager.Line.CylinderMove(null, ioLowType, ioHighType);
+                btn.Text = targetText;
+                btn.BackColor = Color.Aqua;
             }
             }
             else
             else
             {
             {
-                btn12Top.Text = "横移轨道1.2顶升上升"; 
-                LineManager.Line.SideWay12TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, null);
-                btn12Top.BackColor = Color.SkyBlue;
+                LineManager.Line.CylinderMove(null, ioHighType, ioLowType);
+                btn.Text = defaultText;
+                btn.BackColor = Color.SkyBlue;
             }
             }
         }
         }
-
-        private void btn34Top_Click(object sender, EventArgs e)
+        private void btnDriveMotor_Run_Click(object sender, EventArgs e)
         {
         {
-            if (btn34Top.Text.Equals("横移轨道3.4顶升上升"))
+            if (btnDriveMotor_Run.Text.Equals("驱动电机1234正转"))
             {
             {
-                btn34Top.Text = "横移轨道3.4顶升下降";
-                btn34Top.BackColor = Color.Aqua;
-                LineManager.Line.SideWay34TopCylinderMove(IO_VALUE.LOW, IO_VALUE.HIGH, null);
+                btnDriveMotor_Run.Text = "驱动电机1234停止";
+                btnDriveMotor_Run.BackColor = Color.Aqua;
+                IOManager.IOMove(IO_Type.DriveMotor_Run1, IO_VALUE.HIGH);
+                IOManager.IOMove(IO_Type.DriveMotor_Run2, IO_VALUE.HIGH);
+                IOManager.IOMove(IO_Type.DriveMotor_Run3, IO_VALUE.HIGH);
+                IOManager.IOMove(IO_Type.DriveMotor_Run4, IO_VALUE.HIGH);
             }
             }
             else
             else
             {
             {
-                btn34Top.Text = "横移轨道3.4顶升上升";
-                btn34Top.BackColor = Color.SkyBlue;
-                LineManager.Line.SideWay34TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, null);
+                IOManager.IOMove(IO_Type.DriveMotor_Run1, IO_VALUE.LOW);
+                IOManager.IOMove(IO_Type.DriveMotor_Run2, IO_VALUE.LOW);
+                IOManager.IOMove(IO_Type.DriveMotor_Run3, IO_VALUE.LOW);
+                IOManager.IOMove(IO_Type.DriveMotor_Run4, IO_VALUE.LOW);
+                btnDriveMotor_Run.Text = "驱动电机1234正转";
+                btnDriveMotor_Run.BackColor = Color.White;
             }
             }
         }
         }
+         
+        private void btnSWRun_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnSW4Run, "环形线横移4电机运转", "环形线横移4电机停止", IO_Type.SW4_MotorRun); 
+        } 
 
 
-        private void btnSw12Run_Click(object sender, EventArgs e)
+        private void btnNGCylinder_Click(object sender, EventArgs e)
         {
         {
-            if (btnSw12Run.Text.Equals("横移轨道1.2驱动"))
-            {
-                IOManager.IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.HIGH);
-                btnSw12Run.Text = "横移轨道1.2停止";
-                btnSw12Run.BackColor = Color.Aqua;
-            }
-            else
-            {
-                IOManager.IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.LOW); 
-                btnSw12Run.Text = "横移轨道1.2驱动";
-                btnSw12Run.BackColor = Color.White;
-            }
+            BtnMove(btnNGCylinder, "NG料盘退出气缸前进", "NG料盘退出气缸后退", IO_Type.NGCylinder_After, IO_Type.NGCylinder_Before); 
         }
         }
 
 
-       
-        private void btnSw34Run_Click(object sender, EventArgs e)
+         
+        private void btnCloseAll_Click(object sender, EventArgs e)
         {
         {
+            IOManager.instance.CloseAllDO();
+        }
 
 
-            if (btnSw34Run.Text.Equals("横移轨道3.4驱动"))
-            {
-                IOManager.IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.HIGH);
-                btnSw34Run.Text = "横移轨道3.4停止";
-                btnSw34Run.BackColor = Color.Aqua;
-            }
-            else
-            {
-                IOManager.IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.LOW);
-                btnSw34Run.Text = "横移轨道3.4驱动";
-                btnSw34Run.BackColor = Color.White;
-            }
+        private void btnSw1Run_Click(object sender, EventArgs e)
+        { 
+            BtnMove(btnSw1Run, "环形线横移1电机运转", "环形线横移1电机停止", IO_Type.SW1_MotorRun);
         }
         }
 
 
-        private void btnStop01_Click(object sender, EventArgs e)
-        {
-            if (btnStop01.Text.Equals("阻挡气缸0-1下降"))
-            {
-                IOManager.IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
-                btnStop01.Text = "阻挡气缸0-1上升";
-                btnStop01.BackColor = Color.Aqua;
-            }
-            else
-            {
-                IOManager.IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
-                btnStop01.Text = "阻挡气缸0-1下降";
-                btnStop01.BackColor = Color.White;
-            }
+        private void btnSw2Run_Click(object sender, EventArgs e)
+        { 
+            BtnMove(btnSw2Run, "环形线横移2电机运转", "环形线横移2电机停止", IO_Type.SW2_MotorRun);
         }
         }
 
 
-        private void btnStop02_Click(object sender, EventArgs e)
-        {
-            if (btnStop02.Text.Equals("阻挡气缸0-2下降"))
-            {
-                IOManager.IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
-                btnStop02.Text = "阻挡气缸0-2上升";
-                btnStop02.BackColor = Color.Aqua;
-            }
-            else
-            {
-                IOManager.IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
-                btnStop02.Text = "阻挡气缸0-2下降";
-                btnStop02.BackColor = Color.White;
-            }
+        private void btnSw3Run_Click(object sender, EventArgs e)
+        { 
+            BtnMove(btnSw3Run, "环形线横移3电机运转", "环形线横移3电机停止", IO_Type.SW3_MotorRun);
+        }
 
 
+        private void btnSw1Location_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnSw4Top, "环形线横移4定位上升", "环形线横移4定位下降", IO_Type.SW4_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
+        } 
+        private void btnSw2Location_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnSw2Top, "环形线横移2定位上升", "环形线横移2定位下降", IO_Type.SW2_LocationCylinder_Down, IO_Type.SW2_LocationCylinder_Up);
+        } 
+        private void btnSw3Location_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnSw3Top, "环形线横移3定位上升", "环形线横移3定位下降", IO_Type.SW3_LocationCylinder_Down, IO_Type.SW3_LocationCylinder_Up); 
+        } 
+        private void btnSw4Location_Click(object sender, EventArgs e)
+        { 
+            BtnMove(btnSw4Top, "环形线横移4定位上升", "环形线横移4定位下降", IO_Type.SW4_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
         }
         }
 
 
-        private void btnSwStop1_Click(object sender, EventArgs e)
+        private void btnSw1Top_Click(object sender, EventArgs e)
         {
         {
-            if (btnSwStop1.Text.Equals("横移轨道1阻挡下降"))
-            {
-                IOManager.IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.HIGH);
-                btnSwStop1.Text = "横移轨道1阻挡上升";
-                btnSwStop1.BackColor = Color.Aqua;
-            }
-            else
-            {
-                IOManager.IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
-                btnSwStop1.Text = "横移轨道1阻挡下降";
-                btnSwStop1.BackColor = Color.SkyBlue;
-            }
+            BtnMove(btnSw1Top, "环形线横移1顶升上升", "环形线横移1顶升下降", IO_Type.SW1_TopCylinder_Down, IO_Type.SW1_TopCylinder_Up);
         }
         }
 
 
-        private void btnSwStop3_Click(object sender, EventArgs e)
+        private void btnSw2Top_Click(object sender, EventArgs e)
         {
         {
-            if (btnSwStop3.Text.Equals("横移轨道3阻挡下降"))
-            {
-                IOManager.IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.HIGH);
-                btnSwStop3.Text = "横移轨道3阻挡上升";
-                btnSwStop3.BackColor = Color.Aqua;
-            }
-            else
-            {
-                IOManager.IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.LOW);
-                btnSwStop3.Text = "横移轨道3阻挡下降";
-                btnSwStop3.BackColor = Color.SkyBlue;
-            }
+            BtnMove(btnSw2Top, "环形线横移2顶升上升", "环形线横移2顶升下降", IO_Type.SW2_TopCylinder_Down, IO_Type.SW2_TopCylinder_Up);
         }
         }
 
 
-        private void btnCloseAll_Click(object sender, EventArgs e)
+        private void btnSw3Top_Click(object sender, EventArgs e)
         {
         {
-            IOManager.instance.CloseAllDO();
+            BtnMove(btnSw3Top, "环形线横移3顶升上升", "环形线横移3顶升下降", IO_Type.SW3_TopCylinder_Down, IO_Type.SW3_TopCylinder_Up);
+        }
+        private void btn34Top_Click(object sender, EventArgs e)
+        {
+            BtnMove(btnSw4Top, "环形线横移4顶升上升", "环形线横移4顶升下降", IO_Type.SW4_TopCylinder_Down, IO_Type.SW4_TopCylinder_Up);
         }
         }
     }
     }
 }
 }

source/AssemblyLineClient/FrmMoveEquip.Designer.cs

@@ -19,6 +19,14 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMoveEquip));
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMoveEquip));
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtDOIndex = new System.Windows.Forms.TextBox();
+            this.txtDoName = new System.Windows.Forms.TextBox();
+            this.label17 = new System.Windows.Forms.Label();
+            this.label14 = new System.Windows.Forms.Label();
+            this.btnOpenDo = new System.Windows.Forms.Button();
+            this.btnWriteSingleDO = new System.Windows.Forms.Button();
+            this.txtWriteTime = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
             this.txtSlaveId = new System.Windows.Forms.TextBox();
             this.txtSlaveId = new System.Windows.Forms.TextBox();
             this.chbAutoRead = new System.Windows.Forms.CheckBox();
             this.chbAutoRead = new System.Windows.Forms.CheckBox();
             this.cmbWriteIO = new System.Windows.Forms.ComboBox();
             this.cmbWriteIO = new System.Windows.Forms.ComboBox();
@@ -102,14 +110,6 @@
             this.label46 = new System.Windows.Forms.Label();
             this.label46 = new System.Windows.Forms.Label();
             this.label49 = new System.Windows.Forms.Label();
             this.label49 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.txtDOIndex = new System.Windows.Forms.TextBox();
-            this.txtDoName = new System.Windows.Forms.TextBox();
-            this.label17 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.btnOpenDo = new System.Windows.Forms.Button();
-            this.btnWriteSingleDO = new System.Windows.Forms.Button();
-            this.txtWriteTime = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -149,6 +149,100 @@
             this.groupBox1.TabStop = false;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "DO写入";
             this.groupBox1.Text = "DO写入";
             // 
             // 
+            // txtDOIndex
+            // 
+            this.txtDOIndex.Enabled = false;
+            this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDOIndex.Location = new System.Drawing.Point(328, 67);
+            this.txtDOIndex.MaxLength = 10;
+            this.txtDOIndex.Name = "txtDOIndex";
+            this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
+            this.txtDOIndex.TabIndex = 276;
+            this.txtDOIndex.Text = "0";
+            // 
+            // txtDoName
+            // 
+            this.txtDoName.Enabled = false;
+            this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDoName.Location = new System.Drawing.Point(71, 67);
+            this.txtDoName.MaxLength = 10;
+            this.txtDoName.Name = "txtDoName";
+            this.txtDoName.Size = new System.Drawing.Size(116, 23);
+            this.txtDoName.TabIndex = 275;
+            this.txtDoName.Text = "0";
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label17.Location = new System.Drawing.Point(19, 70);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(46, 17);
+            this.label17.TabIndex = 274;
+            this.label17.Text = "设备IP:";
+            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label14.Location = new System.Drawing.Point(272, 70);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(35, 17);
+            this.label14.TabIndex = 273;
+            this.label14.Text = "地址:";
+            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // btnOpenDo
+            // 
+            this.btnOpenDo.BackColor = System.Drawing.Color.White;
+            this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnOpenDo.Location = new System.Drawing.Point(169, 107);
+            this.btnOpenDo.Name = "btnOpenDo";
+            this.btnOpenDo.Size = new System.Drawing.Size(100, 34);
+            this.btnOpenDo.TabIndex = 272;
+            this.btnOpenDo.Text = "打开";
+            this.btnOpenDo.UseVisualStyleBackColor = false;
+            this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
+            // 
+            // btnWriteSingleDO
+            // 
+            this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
+            this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnWriteSingleDO.Location = new System.Drawing.Point(275, 107);
+            this.btnWriteSingleDO.Name = "btnWriteSingleDO";
+            this.btnWriteSingleDO.Size = new System.Drawing.Size(100, 34);
+            this.btnWriteSingleDO.TabIndex = 269;
+            this.btnWriteSingleDO.Text = "关闭";
+            this.btnWriteSingleDO.UseVisualStyleBackColor = false;
+            this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
+            // 
+            // txtWriteTime
+            // 
+            this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtWriteTime.Location = new System.Drawing.Point(82, 113);
+            this.txtWriteTime.MaxLength = 10;
+            this.txtWriteTime.Name = "txtWriteTime";
+            this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
+            this.txtWriteTime.TabIndex = 271;
+            this.txtWriteTime.Text = "0";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label5.Location = new System.Drawing.Point(19, 116);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(60, 17);
+            this.label5.TabIndex = 270;
+            this.label5.Text = "定时(ms):";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // txtSlaveId
             // txtSlaveId
             // 
             // 
             this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -197,7 +291,7 @@
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
             this.groupBox4.Location = new System.Drawing.Point(251, 6);
             this.groupBox4.Location = new System.Drawing.Point(251, 6);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(240, 634);
+            this.groupBox4.Size = new System.Drawing.Size(240, 764);
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabStop = false;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "DO列表";
             this.groupBox4.Text = "DO列表";
@@ -214,7 +308,7 @@
             this.tableLayoutPanel2.RowCount = 2;
             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.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(229, 614);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 744);
             this.tableLayoutPanel2.TabIndex = 103;
             this.tableLayoutPanel2.TabIndex = 103;
             // 
             // 
             // groupBox3
             // groupBox3
@@ -224,7 +318,7 @@
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Location = new System.Drawing.Point(6, 6);
             this.groupBox3.Location = new System.Drawing.Point(6, 6);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(240, 634);
+            this.groupBox3.Size = new System.Drawing.Size(240, 764);
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabStop = false;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "DI列表";
             this.groupBox3.Text = "DI列表";
@@ -241,7 +335,7 @@
             this.tableLayoutPanel1.RowCount = 2;
             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.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(229, 614);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 744);
             this.tableLayoutPanel1.TabIndex = 102;
             this.tableLayoutPanel1.TabIndex = 102;
             // 
             // 
             // groupBox5
             // groupBox5
@@ -257,7 +351,7 @@
             this.groupBox5.Controls.Add(this.btnTopUp);
             this.groupBox5.Controls.Add(this.btnTopUp);
             this.groupBox5.Location = new System.Drawing.Point(897, 6);
             this.groupBox5.Location = new System.Drawing.Point(897, 6);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(382, 208);
+            this.groupBox5.Size = new System.Drawing.Size(459, 208);
             this.groupBox5.TabIndex = 255;
             this.groupBox5.TabIndex = 255;
             this.groupBox5.TabStop = false;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "IO操作测试";
             this.groupBox5.Text = "IO操作测试";
@@ -466,7 +560,7 @@
             this.tabControl1.Location = new System.Drawing.Point(5, 69);
             this.tabControl1.Location = new System.Drawing.Point(5, 69);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1296, 676);
+            this.tabControl1.Size = new System.Drawing.Size(1373, 806);
             this.tabControl1.TabIndex = 257;
             this.tabControl1.TabIndex = 257;
             // 
             // 
             // tabPage1
             // tabPage1
@@ -479,19 +573,22 @@
             this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1288, 646);
+            this.tabPage1.Size = new System.Drawing.Size(1365, 776);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "    IO列表     ";
             this.tabPage1.Text = "    IO列表     ";
             this.tabPage1.UseVisualStyleBackColor = true;
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // 
             // groupBox6
             // groupBox6
             // 
             // 
+            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox6.Controls.Add(this.lblTrayNum);
             this.groupBox6.Controls.Add(this.lblTrayNum);
             this.groupBox6.Controls.Add(this.lblInstoreList);
             this.groupBox6.Controls.Add(this.lblInstoreList);
             this.groupBox6.Controls.Add(this.lblThisSta);
             this.groupBox6.Controls.Add(this.lblThisSta);
             this.groupBox6.Location = new System.Drawing.Point(498, 221);
             this.groupBox6.Location = new System.Drawing.Point(498, 221);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(781, 419);
+            this.groupBox6.Size = new System.Drawing.Size(858, 549);
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabStop = false;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "消息";
             this.groupBox6.Text = "消息";
@@ -1208,6 +1305,8 @@
             // 
             // 
             // panel1
             // panel1
             // 
             // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.Controls.Add(this.chbDebug);
             this.panel1.Controls.Add(this.chbDebug);
             this.panel1.Controls.Add(this.lblStoreStatus);
             this.panel1.Controls.Add(this.lblStoreStatus);
             this.panel1.Controls.Add(this.btnOutStore);
             this.panel1.Controls.Add(this.btnOutStore);
@@ -1217,108 +1316,14 @@
             this.panel1.Controls.Add(this.btnReset);
             this.panel1.Controls.Add(this.btnReset);
             this.panel1.Location = new System.Drawing.Point(2, 1);
             this.panel1.Location = new System.Drawing.Point(2, 1);
             this.panel1.Name = "panel1";
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1295, 68);
+            this.panel1.Size = new System.Drawing.Size(1369, 68);
             this.panel1.TabIndex = 258;
             this.panel1.TabIndex = 258;
             // 
             // 
-            // txtDOIndex
-            // 
-            this.txtDOIndex.Enabled = false;
-            this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDOIndex.Location = new System.Drawing.Point(328, 67);
-            this.txtDOIndex.MaxLength = 10;
-            this.txtDOIndex.Name = "txtDOIndex";
-            this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
-            this.txtDOIndex.TabIndex = 276;
-            this.txtDOIndex.Text = "0";
-            // 
-            // txtDoName
-            // 
-            this.txtDoName.Enabled = false;
-            this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDoName.Location = new System.Drawing.Point(71, 67);
-            this.txtDoName.MaxLength = 10;
-            this.txtDoName.Name = "txtDoName";
-            this.txtDoName.Size = new System.Drawing.Size(116, 23);
-            this.txtDoName.TabIndex = 275;
-            this.txtDoName.Text = "0";
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label17.Location = new System.Drawing.Point(19, 70);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(46, 17);
-            this.label17.TabIndex = 274;
-            this.label17.Text = "设备IP:";
-            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label14.Location = new System.Drawing.Point(272, 70);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(35, 17);
-            this.label14.TabIndex = 273;
-            this.label14.Text = "地址:";
-            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // btnOpenDo
-            // 
-            this.btnOpenDo.BackColor = System.Drawing.Color.White;
-            this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOpenDo.Location = new System.Drawing.Point(169, 107);
-            this.btnOpenDo.Name = "btnOpenDo";
-            this.btnOpenDo.Size = new System.Drawing.Size(100, 34);
-            this.btnOpenDo.TabIndex = 272;
-            this.btnOpenDo.Text = "打开";
-            this.btnOpenDo.UseVisualStyleBackColor = false;
-            this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
-            // 
-            // btnWriteSingleDO
-            // 
-            this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
-            this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnWriteSingleDO.Location = new System.Drawing.Point(275, 107);
-            this.btnWriteSingleDO.Name = "btnWriteSingleDO";
-            this.btnWriteSingleDO.Size = new System.Drawing.Size(100, 34);
-            this.btnWriteSingleDO.TabIndex = 269;
-            this.btnWriteSingleDO.Text = "关闭";
-            this.btnWriteSingleDO.UseVisualStyleBackColor = false;
-            this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
-            // 
-            // txtWriteTime
-            // 
-            this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtWriteTime.Location = new System.Drawing.Point(82, 113);
-            this.txtWriteTime.MaxLength = 10;
-            this.txtWriteTime.Name = "txtWriteTime";
-            this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
-            this.txtWriteTime.TabIndex = 271;
-            this.txtWriteTime.Text = "0";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label5.Location = new System.Drawing.Point(19, 116);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(60, 17);
-            this.label5.TabIndex = 270;
-            this.label5.Text = "定时(ms):";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
             // FrmMoveEquip
             // FrmMoveEquip
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1307, 751);
+            this.ClientSize = new System.Drawing.Size(1384, 881);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

source/AssemblyLineClient/FrmProvidingEquip.Designer.cs

@@ -233,7 +233,7 @@
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
             this.groupBox4.Location = new System.Drawing.Point(251, 6);
             this.groupBox4.Location = new System.Drawing.Point(251, 6);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(240, 634);
+            this.groupBox4.Size = new System.Drawing.Size(240, 764);
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabStop = false;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "DO列表";
             this.groupBox4.Text = "DO列表";
@@ -250,7 +250,7 @@
             this.tableLayoutPanel2.RowCount = 2;
             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.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(229, 614);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 744);
             this.tableLayoutPanel2.TabIndex = 103;
             this.tableLayoutPanel2.TabIndex = 103;
             // 
             // 
             // groupBox3
             // groupBox3
@@ -260,7 +260,7 @@
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
             this.groupBox3.Location = new System.Drawing.Point(6, 6);
             this.groupBox3.Location = new System.Drawing.Point(6, 6);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(240, 634);
+            this.groupBox3.Size = new System.Drawing.Size(240, 764);
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabStop = false;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "DI列表";
             this.groupBox3.Text = "DI列表";
@@ -277,7 +277,7 @@
             this.tableLayoutPanel1.RowCount = 2;
             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.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(229, 614);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 744);
             this.tableLayoutPanel1.TabIndex = 102;
             this.tableLayoutPanel1.TabIndex = 102;
             // 
             // 
             // groupBox5
             // groupBox5
@@ -293,7 +293,7 @@
             this.groupBox5.Controls.Add(this.btnTopUp);
             this.groupBox5.Controls.Add(this.btnTopUp);
             this.groupBox5.Location = new System.Drawing.Point(897, 6);
             this.groupBox5.Location = new System.Drawing.Point(897, 6);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(382, 208);
+            this.groupBox5.Size = new System.Drawing.Size(459, 208);
             this.groupBox5.TabIndex = 255;
             this.groupBox5.TabIndex = 255;
             this.groupBox5.TabStop = false;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "IO操作测试";
             this.groupBox5.Text = "IO操作测试";
@@ -488,7 +488,7 @@
             this.tabControl1.Location = new System.Drawing.Point(5, 69);
             this.tabControl1.Location = new System.Drawing.Point(5, 69);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1296, 676);
+            this.tabControl1.Size = new System.Drawing.Size(1373, 806);
             this.tabControl1.TabIndex = 257;
             this.tabControl1.TabIndex = 257;
             // 
             // 
             // tabPage1
             // tabPage1
@@ -501,19 +501,22 @@
             this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1288, 646);
+            this.tabPage1.Size = new System.Drawing.Size(1365, 776);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "    IO列表     ";
             this.tabPage1.Text = "    IO列表     ";
             this.tabPage1.UseVisualStyleBackColor = true;
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // 
             // groupBox6
             // groupBox6
             // 
             // 
+            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox6.Controls.Add(this.lblTrayNum);
             this.groupBox6.Controls.Add(this.lblTrayNum);
             this.groupBox6.Controls.Add(this.lblInstoreList);
             this.groupBox6.Controls.Add(this.lblInstoreList);
             this.groupBox6.Controls.Add(this.lblThisSta);
             this.groupBox6.Controls.Add(this.lblThisSta);
             this.groupBox6.Location = new System.Drawing.Point(498, 221);
             this.groupBox6.Location = new System.Drawing.Point(498, 221);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(781, 419);
+            this.groupBox6.Size = new System.Drawing.Size(858, 543);
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabStop = false;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "消息";
             this.groupBox6.Text = "消息";
@@ -542,6 +545,8 @@
             // 
             // 
             // panel1
             // panel1
             // 
             // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.Controls.Add(this.chbDebug);
             this.panel1.Controls.Add(this.chbDebug);
             this.panel1.Controls.Add(this.lblStoreStatus);
             this.panel1.Controls.Add(this.lblStoreStatus);
             this.panel1.Controls.Add(this.btnOutStore);
             this.panel1.Controls.Add(this.btnOutStore);
@@ -550,14 +555,14 @@
             this.panel1.Controls.Add(this.btnReset);
             this.panel1.Controls.Add(this.btnReset);
             this.panel1.Location = new System.Drawing.Point(2, 1);
             this.panel1.Location = new System.Drawing.Point(2, 1);
             this.panel1.Name = "panel1";
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1295, 68);
+            this.panel1.Size = new System.Drawing.Size(1372, 68);
             this.panel1.TabIndex = 258;
             this.panel1.TabIndex = 258;
             // 
             // 
             // FrmProvidingEquip
             // FrmProvidingEquip
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1307, 751);
+            this.ClientSize = new System.Drawing.Size(1384, 881);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv

@@ -2,6 +2,7 @@
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
+PRO,0,对应的横移模块,SidesWayNum,1,,,,,
 ,,,,,,,,,
 ,,,,,,,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
@@ -52,19 +53,19 @@ DI,0,SL1上料横移气缸取料端,SL_FeedSideWayCylinder_Take,5,192.168.200.22,0,SL1上
 DI,0,SL1上料横移气缸放料端,SL_FeedSideWayCylinder_Emptying,6,192.168.200.22,0,SL1上料横移气缸放料端,X127,X127
 DI,0,SL1上料横移气缸放料端,SL_FeedSideWayCylinder_Emptying,6,192.168.200.22,0,SL1上料横移气缸放料端,X127,X127
 DI,0,SL1上料气缸放松端,SL_FeedCylinder_Slack,7,192.168.200.22,0,SL1上料气缸放松端,X128,X128
 DI,0,SL1上料气缸放松端,SL_FeedCylinder_Slack,7,192.168.200.22,0,SL1上料气缸放松端,X128,X128
 DI,0,SL1上料气缸夹紧端,SL_FeedCylinder_Tighten,8,192.168.200.22,0,SL1上料气缸夹紧端,X129,X129
 DI,0,SL1上料气缸夹紧端,SL_FeedCylinder_Tighten,8,192.168.200.22,0,SL1上料气缸夹紧端,X129,X129
-DI,0,环形线横移1托盘检测,Toroid_SideWay_TrayCheck,9,192.168.200.22,0,环形线横移1托盘检测,X130,X130
-DI,0,环形线横移1料盘检测1,Toroid_SideWay_ReelCheck,10,192.168.200.22,0,环形线横移1料盘检测1,X131,X131
-DI,0,环形线横移1顶升上升端,Toroid_TopCylinder_Up,11,192.168.200.22,0,环形线横移1顶升上升端,X132,X132
-DI,0,环形线横移1顶升下降端,Toroid_TopCylinder_Down,12,192.168.200.22,0,环形线横移1顶升下降端,X133,X133
-DI,0,环形线横移1定位上升端,Toroid_LocationCylinder_Up,13,192.168.200.22,0,环形线横移1定位上升端,X134,X134
-DI,0,环形线横移1定位下降端,Toroid_LocationCylinder_Down,14,192.168.200.22,0,环形线横移1定位下降端,X135,X135
+DI,1000,环形线横移1托盘检测,SW1_SideWay_TrayCheck,9,192.168.200.22,0,环形线横移1托盘检测,X130,X130
+DI,1000,环形线横移1料盘检测1,SW1_SideWay_ReelCheck,10,192.168.200.22,0,环形线横移1料盘检测1,X131,X131
+DI,1000,环形线横移1顶升上升端,SW1_TopCylinder_Up,11,192.168.200.22,0,环形线横移1顶升上升端,X132,X132
+DI,1000,环形线横移1顶升下降端,SW1_TopCylinder_Down,12,192.168.200.22,0,环形线横移1顶升下降端,X133,X133
+DI,1000,环形线横移1定位上升端,SW1_LocationCylinder_Up,13,192.168.200.22,0,环形线横移1定位上升端,X134,X134
+DI,1000,环形线横移1定位下降端,SW1_LocationCylinder_Down,14,192.168.200.22,0,环形线横移1定位下降端,X135,X135
 DI,0,SL1线体出口横移检测,SL_SideWay_OutCheck,15,192.168.200.22,0,SL1线体出口横移检测,X136,X136
 DI,0,SL1线体出口横移检测,SL_SideWay_OutCheck,15,192.168.200.22,0,SL1线体出口横移检测,X136,X136
 ,,,,,,,,,
 ,,,,,,,,,
 DO,0,SL1状态指示灯,SL_HddLed,0,192.168.200.21,0,SL1状态指示灯,Y101,Y101
 DO,0,SL1状态指示灯,SL_HddLed,0,192.168.200.21,0,SL1状态指示灯,Y101,Y101
 DO,0,SL1进料线体运转,SL_Line_Run,1,192.168.200.21,0,SL1进料线体运转,Y102,Y102
 DO,0,SL1进料线体运转,SL_Line_Run,1,192.168.200.21,0,SL1进料线体运转,Y102,Y102
 DO,0,SL1线体定位横移电机运转,SL_LocationSideWay_Run,2,192.168.200.21,0,SL1线体定位横移电机运转,Y103,Y103
 DO,0,SL1线体定位横移电机运转,SL_LocationSideWay_Run,2,192.168.200.21,0,SL1线体定位横移电机运转,Y103,Y103
 DO,0,SL1线体出口横移电机运转,SL_OutSideWay_Run,3,192.168.200.21,0,SL1线体出口横移电机运转,Y104,Y104
 DO,0,SL1线体出口横移电机运转,SL_OutSideWay_Run,3,192.168.200.21,0,SL1线体出口横移电机运转,Y104,Y104
-DO,0,环形线横移1电机运转,Toroid_Motor_Run,4,192.168.200.21,0,环形线横移1电机运转,Y105,Y105
+DO,1000,环形线横移1电机运转,SW1_Motor_Run,4,192.168.200.21,0,环形线横移1电机运转,Y105,Y105
 DO,0,SL1进料阻挡下降SOL,SL_Entry_StopDown,5,192.168.200.21,0,SL1进料阻挡下降SOL,Y106,Y106
 DO,0,SL1进料阻挡下降SOL,SL_Entry_StopDown,5,192.168.200.21,0,SL1进料阻挡下降SOL,Y106,Y106
 DO,0,SL1缓冲阻挡,SL_Buffer_StopDown,6,192.168.200.21,0,SL1缓冲阻挡,Y107,Y107
 DO,0,SL1缓冲阻挡,SL_Buffer_StopDown,6,192.168.200.21,0,SL1缓冲阻挡,Y107,Y107
 DO,0,SL1出料阻挡下降SOL,SL_Out_StopDown,7,192.168.200.21,0,SL1出料阻挡下降SOL,Y108,Y108
 DO,0,SL1出料阻挡下降SOL,SL_Out_StopDown,7,192.168.200.21,0,SL1出料阻挡下降SOL,Y108,Y108
@@ -80,10 +81,10 @@ DO,0,SL1上料气缸放松SOL,SL_FeedCylinder_Slack,0,192.168.200.22,0,SL1上料气缸放松
 DO,0,SL1上料气缸夹紧SOL,SL_FeedCylinder_Tighten,1,192.168.200.22,0,SL1上料气缸夹紧SOL,Y122,Y122
 DO,0,SL1上料气缸夹紧SOL,SL_FeedCylinder_Tighten,1,192.168.200.22,0,SL1上料气缸夹紧SOL,Y122,Y122
 DO,0,SL1升降盘定位气缸1前进SOL,SL_TrayLocationCylinder_Before,2,192.168.200.22,0,SL1升降盘定位气缸1前进SOL,Y123,Y123
 DO,0,SL1升降盘定位气缸1前进SOL,SL_TrayLocationCylinder_Before,2,192.168.200.22,0,SL1升降盘定位气缸1前进SOL,Y123,Y123
 DO,0,SL1升降盘定位气缸1后退SOL,SL_TrayLocationCylinder_After,3,192.168.200.22,0,SL1升降盘定位气缸1后退SOL,Y124,Y124
 DO,0,SL1升降盘定位气缸1后退SOL,SL_TrayLocationCylinder_After,3,192.168.200.22,0,SL1升降盘定位气缸1后退SOL,Y124,Y124
-DO,0,环形线横移1顶升上升SOL,Toroid_TopCylinder_Up,4,192.168.200.22,0,环形线横移1顶升上升SOL,Y125,Y125
-DO,0,环形线横移1顶升下降SOL,Toroid_TopCylinder_Down,5,192.168.200.22,0,环形线横移1顶升下降SOL,Y126,Y126
-DO,0,环形线横移1定位上升SOL,Toroid_LocationCylinder_Up,6,192.168.200.22,0,环形线横移1定位上升SOL,Y127,Y127
-DO,0,环形线横移1定位下降SOL,Toroid_LocationCylinder_Down,7,192.168.200.22,0,环形线横移1定位下降SOL,Y128,Y128
+DO,1000,环形线横移1顶升上升SOL,SW1_TopCylinder_Up,4,192.168.200.22,0,环形线横移1顶升上升SOL,Y125,Y125
+DO,1000,环形线横移1顶升下降SOL,SW1_TopCylinder_Down,5,192.168.200.22,0,环形线横移1顶升下降SOL,Y126,Y126
+DO,1000,环形线横移1定位上升SOL,SW1_LocationCylinder_Up,6,192.168.200.22,0,环形线横移1定位上升SOL,Y127,Y127
+DO,1000,环形线横移1定位下降SOL,SW1_LocationCylinder_Down,7,192.168.200.22,0,环形线横移1定位下降SOL,Y128,Y128
 DO,0,SL1提升伺服刹车ON,SL_UpAxis_BreakOn,8,192.168.200.22,0,SL1提升伺服刹车ON,Y129,Y129
 DO,0,SL1提升伺服刹车ON,SL_UpAxis_BreakOn,8,192.168.200.22,0,SL1提升伺服刹车ON,Y129,Y129
 DO,0,SL1移载1伺服刹车ON,SL_MoveAxis_BreakOn,9,192.168.200.22,0,SL1移载1伺服刹车ON,Y130,Y130
 DO,0,SL1移载1伺服刹车ON,SL_MoveAxis_BreakOn,9,192.168.200.22,0,SL1移载1伺服刹车ON,Y130,Y130
 DO,0,SL1提升伺服运转ON,SL_UpAxis_ServoOn,10,192.168.200.22,0,SL1提升伺服运转ON,Y131,Y131
 DO,0,SL1提升伺服运转ON,SL_UpAxis_ServoOn,10,192.168.200.22,0,SL1提升伺服运转ON,Y131,Y131

source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv

@@ -2,6 +2,7 @@
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
+PRO,0,对应的横移模块,SidesWayNum,0,,,,,
 ,,,,,,,,,
 ,,,,,,,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,

source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv

@@ -2,6 +2,7 @@
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
+PRO,0,对应的横移模块,SidesWayNum,2,,,,,
 ,,,,,,,,,
 ,,,,,,,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
@@ -52,19 +53,19 @@ DI,0,SL3上料横移气缸取料端,SL_FeedSideWayCylinder_Take,5,192.168.200.26,0,SL3上
 DI,0,SL3上料横移气缸放料端,SL_FeedSideWayCylinder_Emptying,6,192.168.200.26,0,SL3上料横移气缸放料端,X207,X207
 DI,0,SL3上料横移气缸放料端,SL_FeedSideWayCylinder_Emptying,6,192.168.200.26,0,SL3上料横移气缸放料端,X207,X207
 DI,0,SL3上料气缸放松端,SL_FeedCylinder_Slack,7,192.168.200.26,0,SL3上料气缸放松端,X208,X208
 DI,0,SL3上料气缸放松端,SL_FeedCylinder_Slack,7,192.168.200.26,0,SL3上料气缸放松端,X208,X208
 DI,0,SL3上料气缸夹紧端,SL_FeedCylinder_Tighten,8,192.168.200.26,0,SL3上料气缸夹紧端,X209,X209
 DI,0,SL3上料气缸夹紧端,SL_FeedCylinder_Tighten,8,192.168.200.26,0,SL3上料气缸夹紧端,X209,X209
-DI,0,环形线横移2托盘检测,Toroid_SideWay_TrayCheck,9,192.168.200.26,0,环形线横移2托盘检测,X210,X210
-DI,0,环形线横移2料盘检测1,Toroid_SideWay_ReelCheck,10,192.168.200.26,0,环形线横移2料盘检测1,X211,X211
-DI,0,环形线横移2顶升上升端,Toroid_TopCylinder_Up,11,192.168.200.26,0,环形线横移2顶升上升端,X212,X212
-DI,0,环形线横移2顶升下降端,Toroid_TopCylinder_Down,12,192.168.200.26,0,环形线横移2顶升下降端,X213,X213
-DI,0,环形线横移2定位上升端,Toroid_LocationCylinder_Up,13,192.168.200.26,0,环形线横移2定位上升端,X214,X214
-DI,0,环形线横移2定位下降端,Toroid_LocationCylinder_Down,14,192.168.200.26,0,环形线横移2定位下降端,X215,X215
+DI,1000,环形线横移2托盘检测,SW2_TrayCheck,9,192.168.200.26,0,环形线横移2托盘检测,X210,X210
+DI,1000,环形线横移2料盘检测1,SW2_ReelCheck,10,192.168.200.26,0,环形线横移2料盘检测1,X211,X211
+DI,1000,环形线横移2顶升上升端,SW2_TopCylinder_Up,11,192.168.200.26,0,环形线横移2顶升上升端,X212,X212
+DI,1000,环形线横移2顶升下降端,SW2_TopCylinder_Down,12,192.168.200.26,0,环形线横移2顶升下降端,X213,X213
+DI,1000,环形线横移2定位上升端,SW2_LocationCylinder_Up,13,192.168.200.26,0,环形线横移2定位上升端,X214,X214
+DI,1000,环形线横移2定位下降端,SW2_LocationCylinder_Down,14,192.168.200.26,0,环形线横移2定位下降端,X215,X215
 DI,0,SL3线体出口横移检测,SL_SideWay_OutCheck,15,192.168.200.26,0,SL3线体出口横移检测,X216,X216
 DI,0,SL3线体出口横移检测,SL_SideWay_OutCheck,15,192.168.200.26,0,SL3线体出口横移检测,X216,X216
 ,,,,,,,,,
 ,,,,,,,,,
 DO,0,SL3状态指示灯,SL_HddLed,0,192.168.200.25,0,SL3状态指示灯,Y181,Y181
 DO,0,SL3状态指示灯,SL_HddLed,0,192.168.200.25,0,SL3状态指示灯,Y181,Y181
 DO,0,SL3进料线体运转,SL_Line_Run,1,192.168.200.25,0,SL3进料线体运转,Y182,Y182
 DO,0,SL3进料线体运转,SL_Line_Run,1,192.168.200.25,0,SL3进料线体运转,Y182,Y182
 DO,0,SL3线体定位横移电机运转,SL_LocationSideWay_Run,2,192.168.200.25,0,SL3线体定位横移电机运转,Y183,Y183
 DO,0,SL3线体定位横移电机运转,SL_LocationSideWay_Run,2,192.168.200.25,0,SL3线体定位横移电机运转,Y183,Y183
 DO,0,SL3线体出口横移电机运转,SL_OutSideWay_Run,3,192.168.200.25,0,SL3线体出口横移电机运转,Y184,Y184
 DO,0,SL3线体出口横移电机运转,SL_OutSideWay_Run,3,192.168.200.25,0,SL3线体出口横移电机运转,Y184,Y184
-DO,0,环形线横移2电机运转,Toroid_Motor_Run,4,192.168.200.25,0,环形线横移2电机运转,Y185,Y185
+DO,1000,环形线横移2电机运转,SW2_Motor_Run,4,192.168.200.25,0,环形线横移2电机运转,Y185,Y185
 DO,0,SL3进料阻挡下降SOL,SL_Entry_StopDown,5,192.168.200.25,0,SL3进料阻挡下降SOL,Y186,Y186
 DO,0,SL3进料阻挡下降SOL,SL_Entry_StopDown,5,192.168.200.25,0,SL3进料阻挡下降SOL,Y186,Y186
 DO,0,SL3缓冲阻挡,SL_Buffer_StopDown,6,192.168.200.25,0,SL3缓冲阻挡,Y187,Y187
 DO,0,SL3缓冲阻挡,SL_Buffer_StopDown,6,192.168.200.25,0,SL3缓冲阻挡,Y187,Y187
 DO,0,SL3出料阻挡下降SOL,SL_Out_StopDown,7,192.168.200.25,0,SL3出料阻挡下降SOL,Y188,Y188
 DO,0,SL3出料阻挡下降SOL,SL_Out_StopDown,7,192.168.200.25,0,SL3出料阻挡下降SOL,Y188,Y188
@@ -80,10 +81,10 @@ DO,0,SL3上料气缸放松SOL,SL_FeedCylinder_Slack,0,192.168.200.26,0,SL3上料气缸放松
 DO,0,SL3上料气缸夹紧SOL,SL_FeedCylinder_Tighten,1,192.168.200.26,0,SL3上料气缸夹紧SOL,Y202,Y202
 DO,0,SL3上料气缸夹紧SOL,SL_FeedCylinder_Tighten,1,192.168.200.26,0,SL3上料气缸夹紧SOL,Y202,Y202
 DO,0,SL3升降盘定位气缸1前进SOL,SL_TrayLocationCylinder_Before,2,192.168.200.26,0,SL3升降盘定位气缸1前进SOL,Y203,Y203
 DO,0,SL3升降盘定位气缸1前进SOL,SL_TrayLocationCylinder_Before,2,192.168.200.26,0,SL3升降盘定位气缸1前进SOL,Y203,Y203
 DO,0,SL3升降盘定位气缸1后退SOL,SL_TrayLocationCylinder_After,3,192.168.200.26,0,SL3升降盘定位气缸1后退SOL,Y204,Y204
 DO,0,SL3升降盘定位气缸1后退SOL,SL_TrayLocationCylinder_After,3,192.168.200.26,0,SL3升降盘定位气缸1后退SOL,Y204,Y204
-DO,0,环形线横移2顶升上升SOL,Toroid_TopCylinder_Up,4,192.168.200.26,0,环形线横移2顶升上升SOL,Y205,Y205
-DO,0,环形线横移2顶升下降SOL,Toroid_TopCylinder_Down,5,192.168.200.26,0,环形线横移2顶升下降SOL,Y206,Y206
-DO,0,环形线横移2定位上升SOL,Toroid_LocationCylinder_Up,6,192.168.200.26,0,环形线横移2定位上升SOL,Y207,Y207
-DO,0,环形线横移2定位下降SOL,Toroid_LocationCylinder_Down,7,192.168.200.26,0,环形线横移2定位下降SOL,Y208,Y208
+DO,1000,环形线横移2顶升上升SOL,SW2_TopCylinder_Up,4,192.168.200.26,0,环形线横移2顶升上升SOL,Y205,Y205
+DO,1000,环形线横移2顶升下降SOL,SW2_TopCylinder_Down,5,192.168.200.26,0,环形线横移2顶升下降SOL,Y206,Y206
+DO,1000,环形线横移2定位上升SOL,SW2_LocationCylinder_Up,6,192.168.200.26,0,环形线横移2定位上升SOL,Y207,Y207
+DO,1000,环形线横移2定位下降SOL,SW2_LocationCylinder_Down,7,192.168.200.26,0,环形线横移2定位下降SOL,Y208,Y208
 DO,0,SL3提升伺服刹车ON,SL_UpAxis_BreakOn,8,192.168.200.26,0,SL3提升伺服刹车ON,Y209,Y209
 DO,0,SL3提升伺服刹车ON,SL_UpAxis_BreakOn,8,192.168.200.26,0,SL3提升伺服刹车ON,Y209,Y209
 DO,0,SL3移载3伺服刹车ON,SL_MoveAxis_BreakOn,9,192.168.200.26,0,SL3移载3伺服刹车ON,Y210,Y210
 DO,0,SL3移载3伺服刹车ON,SL_MoveAxis_BreakOn,9,192.168.200.26,0,SL3移载3伺服刹车ON,Y210,Y210
 DO,0,SL3提升伺服运转ON,SL_UpAxis_ServoOn,10,192.168.200.26,0,SL3提升伺服运转ON,Y211,Y211
 DO,0,SL3提升伺服运转ON,SL_UpAxis_ServoOn,10,192.168.200.26,0,SL3提升伺服运转ON,Y211,Y211

source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv

@@ -2,6 +2,7 @@
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
+PRO,0,对应的横移模块,SidesWayNum,3,,,,,
 ,,,,,,,,,
 ,,,,,,,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 AXIS,0,批量上料轴,Batch_Axis,2,COM1,0,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
 PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
@@ -52,19 +53,19 @@ DI,0,SL4上料横移气缸取料端,SL_FeedSideWayCylinder_Take,5,192.168.200.28,0,SL4上
 DI,0,SL4上料横移气缸放料端,SL_FeedSideWayCylinder_Emptying,6,192.168.200.28,0,SL4上料横移气缸放料端,X247,X247
 DI,0,SL4上料横移气缸放料端,SL_FeedSideWayCylinder_Emptying,6,192.168.200.28,0,SL4上料横移气缸放料端,X247,X247
 DI,0,SL4上料气缸放松端,SL_FeedCylinder_Slack,7,192.168.200.28,0,SL4上料气缸放松端,X248,X248
 DI,0,SL4上料气缸放松端,SL_FeedCylinder_Slack,7,192.168.200.28,0,SL4上料气缸放松端,X248,X248
 DI,0,SL4上料气缸夹紧端,SL_FeedCylinder_Tighten,8,192.168.200.28,0,SL4上料气缸夹紧端,X249,X249
 DI,0,SL4上料气缸夹紧端,SL_FeedCylinder_Tighten,8,192.168.200.28,0,SL4上料气缸夹紧端,X249,X249
-DI,0,环形线横移3托盘检测,Toroid_SideWay_TrayCheck,9,192.168.200.28,0,环形线横移3托盘检测,X250,X250
-DI,0,环形线横移3料盘检测1,Toroid_SideWay_ReelCheck,10,192.168.200.28,0,环形线横移3料盘检测1,X251,X251
-DI,0,环形线横移3顶升上升端,Toroid_TopCylinder_Up,11,192.168.200.28,0,环形线横移3顶升上升端,X252,X252
-DI,0,环形线横移3顶升下降端,Toroid_TopCylinder_Down,12,192.168.200.28,0,环形线横移3顶升下降端,X253,X253
-DI,0,环形线横移3定位上升端,Toroid_LocationCylinder_Up,13,192.168.200.28,0,环形线横移3定位上升端,X254,X254
-DI,0,环形线横移3定位下降端,Toroid_LocationCylinder_Down,14,192.168.200.28,0,环形线横移3定位下降端,X255,X255
+DI,1000,环形线横移3托盘检测,SW3_TrayCheck,9,192.168.200.28,0,环形线横移3托盘检测,X250,X250
+DI,1000,环形线横移3料盘检测1,SW3_ReelCheck,10,192.168.200.28,0,环形线横移3料盘检测1,X251,X251
+DI,1000,环形线横移3顶升上升端,SW3_TopCylinder_Up,11,192.168.200.28,0,环形线横移3顶升上升端,X252,X252
+DI,1000,环形线横移3顶升下降端,SW3_TopCylinder_Down,12,192.168.200.28,0,环形线横移3顶升下降端,X253,X253
+DI,1000,环形线横移3定位上升端,SW3_LocationCylinder_Up,13,192.168.200.28,0,环形线横移3定位上升端,X254,X254
+DI,1000,环形线横移3定位下降端,SW3_LocationCylinder_Down,14,192.168.200.28,0,环形线横移3定位下降端,X255,X255
 DI,0,SL4线体出口横移检测,SL_SideWay_OutCheck,15,192.168.200.28,0,SL4线体出口横移检测,X256,X256
 DI,0,SL4线体出口横移检测,SL_SideWay_OutCheck,15,192.168.200.28,0,SL4线体出口横移检测,X256,X256
 ,,,,,,,,,
 ,,,,,,,,,
 DO,0,SL4状态指示灯,SL_HddLed,0,192.168.200.27,0,SL4状态指示灯,Y221,Y221
 DO,0,SL4状态指示灯,SL_HddLed,0,192.168.200.27,0,SL4状态指示灯,Y221,Y221
 DO,0,SL4进料线体运转,SL_Line_Run,1,192.168.200.27,0,SL4进料线体运转,Y222,Y222
 DO,0,SL4进料线体运转,SL_Line_Run,1,192.168.200.27,0,SL4进料线体运转,Y222,Y222
 DO,0,SL4线体定位横移电机运转,SL_LocationSideWay_Run,2,192.168.200.27,0,SL4线体定位横移电机运转,Y223,Y223
 DO,0,SL4线体定位横移电机运转,SL_LocationSideWay_Run,2,192.168.200.27,0,SL4线体定位横移电机运转,Y223,Y223
 DO,0,SL4线体出口横移电机运转,SL_OutSideWay_Run,3,192.168.200.27,0,SL4线体出口横移电机运转,Y224,Y224
 DO,0,SL4线体出口横移电机运转,SL_OutSideWay_Run,3,192.168.200.27,0,SL4线体出口横移电机运转,Y224,Y224
-DO,0,横移4电机运转,Toroid_Motor_Run,4,192.168.200.27,0,横移4电机运转,Y225,Y225
+DO,1000,环行线横移3电机运转,SW3_Motor_Run,4,192.168.200.27,0,环行线横移3电机运转,Y225,Y225
 DO,0,SL4进料阻挡下降SOL,SL_Entry_StopDown,5,192.168.200.27,0,SL4进料阻挡下降SOL,Y226,Y226
 DO,0,SL4进料阻挡下降SOL,SL_Entry_StopDown,5,192.168.200.27,0,SL4进料阻挡下降SOL,Y226,Y226
 DO,0,SL4缓冲阻挡,SL_Buffer_StopDown,6,192.168.200.27,0,SL4缓冲阻挡,Y227,Y227
 DO,0,SL4缓冲阻挡,SL_Buffer_StopDown,6,192.168.200.27,0,SL4缓冲阻挡,Y227,Y227
 DO,0,SL4出料阻挡下降SOL,SL_Out_StopDown,7,192.168.200.27,0,SL4出料阻挡下降SOL,Y228,Y228
 DO,0,SL4出料阻挡下降SOL,SL_Out_StopDown,7,192.168.200.27,0,SL4出料阻挡下降SOL,Y228,Y228
@@ -80,10 +81,10 @@ DO,0,SL4上料气缸放松SOL,SL_FeedCylinder_Slack,0,192.168.200.28,0,SL4上料气缸放松
 DO,0,SL4上料气缸夹紧SOL,SL_FeedCylinder_Tighten,1,192.168.200.28,0,SL4上料气缸夹紧SOL,Y242,Y242
 DO,0,SL4上料气缸夹紧SOL,SL_FeedCylinder_Tighten,1,192.168.200.28,0,SL4上料气缸夹紧SOL,Y242,Y242
 DO,0,SL4升降盘定位气缸1前进SOL,SL_TrayLocationCylinder_Before,2,192.168.200.28,0,SL4升降盘定位气缸1前进SOL,Y243,Y243
 DO,0,SL4升降盘定位气缸1前进SOL,SL_TrayLocationCylinder_Before,2,192.168.200.28,0,SL4升降盘定位气缸1前进SOL,Y243,Y243
 DO,0,SL4升降盘定位气缸1后退SOL,SL_TrayLocationCylinder_After,3,192.168.200.28,0,SL4升降盘定位气缸1后退SOL,Y244,Y244
 DO,0,SL4升降盘定位气缸1后退SOL,SL_TrayLocationCylinder_After,3,192.168.200.28,0,SL4升降盘定位气缸1后退SOL,Y244,Y244
-DO,0,环形线横移3顶升上升SOL,Toroid_TopCylinder_Up,4,192.168.200.28,0,环形线横移3顶升上升SOL,Y245,Y245
-DO,0,环形线横移3顶升下降SOL,Toroid_TopCylinder_Down,5,192.168.200.28,0,环形线横移3顶升下降SOL,Y246,Y246
-DO,0,环形线横移3定位上升SOL,Toroid_LocationCylinder_Up,6,192.168.200.28,0,环形线横移3定位上升SOL,Y247,Y247
-DO,0,环形线横移3定位下降SOL,Toroid_LocationCylinder_Down,7,192.168.200.28,0,环形线横移3定位下降SOL,Y248,Y248
+DO,1000,环形线横移3顶升上升SOL,SW3_TopCylinder_Up,4,192.168.200.28,0,环形线横移3顶升上升SOL,Y245,Y245
+DO,1000,环形线横移3顶升下降SOL,SW3_TopCylinder_Down,5,192.168.200.28,0,环形线横移3顶升下降SOL,Y246,Y246
+DO,1000,环形线横移3定位上升SOL,SW3_LocationCylinder_Up,6,192.168.200.28,0,环形线横移3定位上升SOL,Y247,Y247
+DO,1000,环形线横移3定位下降SOL,SW3_LocationCylinder_Down,7,192.168.200.28,0,环形线横移3定位下降SOL,Y248,Y248
 DO,0,SL4提升伺服刹车ON,SL_UpAxis_BreakOn,8,192.168.200.28,0,SL4提升伺服刹车ON,Y249,Y249
 DO,0,SL4提升伺服刹车ON,SL_UpAxis_BreakOn,8,192.168.200.28,0,SL4提升伺服刹车ON,Y249,Y249
 DO,0,SL4移载4伺服刹车ON,SL_MoveAxis_BreakOn,9,192.168.200.28,0,SL4移载4伺服刹车ON,Y250,Y250
 DO,0,SL4移载4伺服刹车ON,SL_MoveAxis_BreakOn,9,192.168.200.28,0,SL4移载4伺服刹车ON,Y250,Y250
 DO,0,SL4提升伺服运转ON,SL_UpAxis_ServoOn,10,192.168.200.28,0,SL4提升伺服运转ON,Y251,Y251
 DO,0,SL4提升伺服运转ON,SL_UpAxis_ServoOn,10,192.168.200.28,0,SL4提升伺服运转ON,Y251,Y251

source/DeviceLibrary/LineConfig/Config_Line.csv

@@ -23,8 +23,8 @@ DI,0,联动,Start_BTN,2,192.168.200.11,0,联动,X003,X003
 DI,0,气压检测,Airpressure_Check,3,192.168.200.11,0,气压检测,X004,X004
 DI,0,气压检测,Airpressure_Check,3,192.168.200.11,0,气压检测,X004,X004
 DI,0,NG料盘推出气缸前进端,NGCylinder_Before,4,192.168.200.11,0,NG料盘推出气缸前进端,X005,X005
 DI,0,NG料盘推出气缸前进端,NGCylinder_Before,4,192.168.200.11,0,NG料盘推出气缸前进端,X005,X005
 DI,0,NG料盘推出气缸后退端,NGCylinder_After,5,192.168.200.11,0,NG料盘推出气缸后退端,X006,X006
 DI,0,NG料盘推出气缸后退端,NGCylinder_After,5,192.168.200.11,0,NG料盘推出气缸后退端,X006,X006
-DI,0,环形线横移4定位上升端,TopCylinder_UP,6,192.168.200.11,0,环形线横移4定位上升端,X007,X007
-DI,0,环形线横移4定位下降端,TopCylinder_Down,7,192.168.200.11,0,环形线横移4定位下降端,X008,X008
+DI,0,环形线横移4定位上升端,SW4_LocationCylinder_Up,6,192.168.200.11,0,环形线横移4定位上升端,X007,X007
+DI,0,环形线横移4定位下降端,SW4_LocationCylinder_Down,7,192.168.200.11,0,环形线横移4定位下降端,X008,X008
 ,0,,,8,192.168.200.11,0,,X009,X009
 ,0,,,8,192.168.200.11,0,,X009,X009
 ,0,,,9,192.168.200.11,0,,X010,X010
 ,0,,,9,192.168.200.11,0,,X010,X010
 ,0,,,10,192.168.200.11,0,,X011,X011
 ,0,,,10,192.168.200.11,0,,X011,X011
@@ -38,15 +38,15 @@ DO,0,待机状态（指示灯）,AutoRun_HddLed,0,192.168.200.11,0,待机状态（指示灯）,Y00
 DO,0,运行状态（指示灯）,RunSign_HddLed,1,192.168.200.11,0,运行状态（指示灯）,Y002,Y002
 DO,0,运行状态（指示灯）,RunSign_HddLed,1,192.168.200.11,0,运行状态（指示灯）,Y002,Y002
 DO,0,故障状态（指示灯）,Alarm_HddLed,2,192.168.200.11,0,故障状态（指示灯）,Y003,Y003
 DO,0,故障状态（指示灯）,Alarm_HddLed,2,192.168.200.11,0,故障状态（指示灯）,Y003,Y003
 DO,0,故障状态（蜂鸣器）,Alarm_Buzzer,3,192.168.200.11,0,故障状态（蜂鸣器）,Y004,Y004
 DO,0,故障状态（蜂鸣器）,Alarm_Buzzer,3,192.168.200.11,0,故障状态（蜂鸣器）,Y004,Y004
-DO,0,驱动电机1正转,DriveMotor_1,4,192.168.200.11,0,驱动电机1正转,Y005,Y005
-DO,0,驱动电机2正转,DriveMotor_2,5,192.168.200.11,0,驱动电机2正转,Y006,Y006
-DO,0,驱动电机3正转,DriveMotor_3,6,192.168.200.11,0,驱动电机3正转,Y007,Y007
-DO,0,驱动电机4正转,DriveMotor_4,7,192.168.200.11,0,驱动电机4正转,Y008,Y008
-DO,0,环形线横移4电机运转,DriveMotor_Run,8,192.168.200.11,0,环形线横移4电机运转,Y009,Y009
+DO,0,驱动电机1正转,DriveMotor_Run1,4,192.168.200.11,0,驱动电机1正转,Y005,Y005
+DO,0,驱动电机2正转,DriveMotor_Run2,5,192.168.200.11,0,驱动电机2正转,Y006,Y006
+DO,0,驱动电机3正转,DriveMotor_Run3,6,192.168.200.11,0,驱动电机3正转,Y007,Y007
+DO,0,驱动电机4正转,DriveMotor_Run4,7,192.168.200.11,0,驱动电机4正转,Y008,Y008
+DO,0,环形线横移4电机运转,SW4_MotorRun,8,192.168.200.11,0,环形线横移4电机运转,Y009,Y009
 DO,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,192.168.200.11,0,NG料盘推出气缸前进SOL,Y010,Y010
 DO,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,192.168.200.11,0,NG料盘推出气缸前进SOL,Y010,Y010
 DO,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,192.168.200.11,0,NG料盘推出气缸后退SOL,Y011,Y011
 DO,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,192.168.200.11,0,NG料盘推出气缸后退SOL,Y011,Y011
-DO,0,环形线横移4定位上升SOL,TopCylinder_UP,11,192.168.200.11,0,环形线横移4定位上升SOL,Y012,Y012
-DO,0,环形线横移4定位下降SOL,TopCylinder_Down,12,192.168.200.11,0,环形线横移4定位下降SOL,Y013,Y013
+DO,0,环形线横移4定位上升SOL,SW4_LocationCylinder_Up,11,192.168.200.11,0,环形线横移4定位上升SOL,Y012,Y012
+DO,0,环形线横移4定位下降SOL,SW4_LocationCylinder_Down,12,192.168.200.11,0,环形线横移4定位下降SOL,Y013,Y013
 ,0,,,13,192.168.200.11,0,,Y014,Y014
 ,0,,,13,192.168.200.11,0,,Y014,Y014
 ,0,,,14,192.168.200.11,0,,Y015,Y015
 ,0,,,14,192.168.200.11,0,,Y015,Y015
 ,0,,,15,192.168.200.11,0,,Y016,Y016
 ,0,,,15,192.168.200.11,0,,Y016,Y016

source/DeviceLibrary/LineConfig/Config_ProvidingEquip_4.csv

 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
- 
\ No newline at end of file
+PRO,0,对应的横移模块,SidesWayNum,4,,,,,

source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_17.csv

@@ -36,17 +36,17 @@ DI,18,进仓18夹料放松端,ClampCylinder_Tighten,1,192.168.200.46,0,进仓18夹料放松端
 DI,18,进仓18升降上升端,UpDownCylinder_Up,2,192.168.200.46,0,进仓18升降上升端,X553,X553
 DI,18,进仓18升降上升端,UpDownCylinder_Up,2,192.168.200.46,0,进仓18升降上升端,X553,X553
 DI,18,进仓18升降下降端,UpDownCylinder_Down,3,192.168.200.46,0,进仓18升降下降端,X554,X554
 DI,18,进仓18升降下降端,UpDownCylinder_Down,3,192.168.200.46,0,进仓18升降下降端,X554,X554
 DI,204,出料4阻挡1托盘检测,StopCylinder_Check1,4,192.168.200.46,0,出料4阻挡1托盘检测,X555,X555
 DI,204,出料4阻挡1托盘检测,StopCylinder_Check1,4,192.168.200.46,0,出料4阻挡1托盘检测,X555,X555
-DI,204,环形线横移4托盘检测,StopCylinder_Check2,5,192.168.200.46,0,环形线横移4托盘检测,X556,X556
-DI,204,环形线横移4顶升上升SOL,TrayCheck,6,192.168.200.46,0,环形线横移4顶升上升SOL,X557,X557
-DI,204,环形线横移4顶升下降SOL,TopCylinder_UP,7,192.168.200.46,0,环形线横移4顶升下降SOL,X558,X558
-DI,204,环形线横移4顶升下降端,TopCylinder_Down,8,192.168.200.46,,环形线横移4顶升下降端,X559,X559
-DI,204,出料4前后气缸前进端,BeforeAfterCylinder_Before,9,192.168.200.46,,出料4前后气缸前进端,X560,X560
-DI,204,出料4前后气缸后退端,BeforeAfterCylinder_After,10,192.168.200.46,,出料4前后气缸后退端,X561,X561
-DI,204,出料4夹料气缸夹紧端,ClampCylinder_Slack,11,192.168.200.46,,出料4夹料气缸夹紧端,X562,X562
-DI,204,出料4夹料气缸放松端,ClampCylinder_Tighten,12,192.168.200.46,,出料4夹料气缸放松端,X563,X563
-DI,204,出料4上下气缸上升端,UpDownCylinder_Up,13,192.168.200.46,,出料4上下气缸上升端,X564,X564
-DI,204,出料4上下气缸下降端,UpDownCylinder_Down,14,192.168.200.46,,出料4上下气缸下降端,X565,X565
-,,,,15,192.168.200.46,,,X566,X566
+DI,1000,环形线横移4托盘检测,SW4_SideWay_TrayCheck,5,192.168.200.46,0,环形线横移4托盘检测,X556,X556
+DI,1000,环形线横移4料盘检测1,SW4_SideWay_ReelCheck,6,192.168.200.46,0,环形线横移4料盘检测1,X557,X557
+DI,1000,环形线横移4顶升上升端,SW4_TopCylinder_Up,7,192.168.200.46,0,环形线横移4顶升上升端,X558,X558
+DI,1000,环形线横移4顶升下降端,SW4_TopCylinder_Down,8,192.168.200.46,0,环形线横移4顶升下降端,X559,X559
+DI,204,出料4前后气缸前进端,BeforeAfterCylinder_Before,9,192.168.200.46,0,出料4前后气缸前进端,X560,X560
+DI,204,出料4前后气缸后退端,BeforeAfterCylinder_After,10,192.168.200.46,0,出料4前后气缸后退端,X561,X561
+DI,204,出料4夹料气缸夹紧端,ClampCylinder_Slack,11,192.168.200.46,0,出料4夹料气缸夹紧端,X562,X562
+DI,204,出料4夹料气缸放松端,ClampCylinder_Tighten,12,192.168.200.46,0,出料4夹料气缸放松端,X563,X563
+DI,204,出料4上下气缸上升端,UpDownCylinder_Up,13,192.168.200.46,0,出料4上下气缸上升端,X564,X564
+DI,204,出料4上下气缸下降端,UpDownCylinder_Down,14,192.168.200.46,0,出料4上下气缸下降端,X565,X565
+,,,,15,192.168.200.46,0,,X566,X566
 ,,,,,,,,,
 ,,,,,,,,,
 DO,17,进仓17阻挡1下降SOL,StopCylinder_Down1,0,192.168.200.45,0,进仓17阻挡1下降SOL,Y531,Y531
 DO,17,进仓17阻挡1下降SOL,StopCylinder_Down1,0,192.168.200.45,0,进仓17阻挡1下降SOL,Y531,Y531
 DO,17,进仓17阻挡2下降SOL,StopCylinder_Down2,1,192.168.200.45,0,进仓17阻挡2下降SOL,Y532,Y532
 DO,17,进仓17阻挡2下降SOL,StopCylinder_Down2,1,192.168.200.45,0,进仓17阻挡2下降SOL,Y532,Y532
@@ -70,8 +70,8 @@ DO,18,进仓18升降上升SOL,UpDownCylinder_Up,2,192.168.200.46,0,进仓18升降上升SOL,Y
 DO,18,进仓18升降下降SOL,UpDownCylinder_Down,3,192.168.200.46,0,进仓18升降下降SOL,Y554,Y554
 DO,18,进仓18升降下降SOL,UpDownCylinder_Down,3,192.168.200.46,0,进仓18升降下降SOL,Y554,Y554
 DO,204,出料4阻挡1下降SOL,StopCylinder_Down1,4,192.168.200.46,0,出料4阻挡1下降SOL,Y555,Y555
 DO,204,出料4阻挡1下降SOL,StopCylinder_Down1,4,192.168.200.46,0,出料4阻挡1下降SOL,Y555,Y555
 DO,204,出料4阻挡2下降SOL,StopCylinder_Down2,5,192.168.200.46,0,出料4阻挡2下降SOL,Y556,Y556
 DO,204,出料4阻挡2下降SOL,StopCylinder_Down2,5,192.168.200.46,0,出料4阻挡2下降SOL,Y556,Y556
-DO,204,出料4顶升上升SOL,TopCylinder_UP,6,192.168.200.46,0,出料4顶升上升SOL,Y557,Y557
-DO,204,出料4顶升下降SOL,TopCylinder_Down,7,192.168.200.46,0,出料4顶升下降SOL,Y558,Y558
+DO,1000,环形线横移4顶升上升SOL,SW4_TopCylinder_Up,6,192.168.200.46,0,环形线横移4顶升上升SOL,Y557,Y557
+DO,1000,环形线横移4顶升下降SOL,SW4_TopCylinder_Down,7,192.168.200.46,0,环形线横移4顶升下降SOL,Y558,Y558
 DO,204,出料4前后气缸前进SOL,BeforeAfterCylinder_Before,8,192.168.200.46,,出料4前后气缸前进SOL,Y559,Y559
 DO,204,出料4前后气缸前进SOL,BeforeAfterCylinder_Before,8,192.168.200.46,,出料4前后气缸前进SOL,Y559,Y559
 DO,204,出料4前后气缸后退SOL,BeforeAfterCylinder_After,9,192.168.200.46,,出料4前后气缸后退SOL,Y560,Y560
 DO,204,出料4前后气缸后退SOL,BeforeAfterCylinder_After,9,192.168.200.46,,出料4前后气缸后退SOL,Y560,Y560
 DO,204,出料4夹料气缸夹紧SOL,ClampCylinder_Slack,10,192.168.200.46,,出料4夹料气缸夹紧SOL,Y561,Y561
 DO,204,出料4夹料气缸夹紧SOL,ClampCylinder_Slack,10,192.168.200.46,,出料4夹料气缸夹紧SOL,Y561,Y561
@@ -80,3 +80,4 @@ DO,204,出料4上下气缸上升SOL,UpDownCylinder_Up,12,192.168.200.46,,出料4上下气缸上
 DO,204,出料4上下气缸下降SOL,UpDownCylinder_Down,13,192.168.200.46,,出料4上下气缸下降SOL,Y564,Y564
 DO,204,出料4上下气缸下降SOL,UpDownCylinder_Down,13,192.168.200.46,,出料4上下气缸下降SOL,Y564,Y564
 ,,,,14,192.168.200.46,,,Y565,Y565
 ,,,,14,192.168.200.46,,,Y565,Y565
 ,,,,15,192.168.200.46,,,Y566,Y566
 ,,,,15,192.168.200.46,,,Y566,Y566
+,,,,,,,,,
\ No newline at end of file

source/DeviceLibrary/assemblyLine/AssemblyLineManager.cs

@@ -137,7 +137,7 @@ namespace OnlineStore.DeviceLibrary
                             disChargeLineMap.Add(subType, moveConfig);
                             disChargeLineMap.Add(subType, moveConfig);
                             allConfigMap.Add(subType, moveConfig);
                             allConfigMap.Add(subType, moveConfig);
                         }
                         }
-
+                        Config.SetIO(1000);
                         Line = new LineBean(Config, moveECMap, feedingECMap, providingECMap, disChargeLineMap);
                         Line = new LineBean(Config, moveECMap, feedingECMap, providingECMap, disChargeLineMap);
                         LogUtil.info(LOGGER, "加载 完成！");
                         LogUtil.info(LOGGER, "加载 完成！");
                         return true;
                         return true;
@@ -157,31 +157,7 @@ namespace OnlineStore.DeviceLibrary
             return false;
             return false;
         }
         }
          
          
-        /// <summary>
-        /// 获取阻挡气缸检测类型
-        /// </summary>
-        /// <returns></returns>
-        public static string GetStopIoType(int stopCylinderIOType)
-        {
-            string type = IO_Type.Fixture_Check_1;
-            switch (stopCylinderIOType)
-            {
-                case 1:
-                    type = IO_Type.Fixture_Check_1;
-                    break;
-                case 2:
-                    type = IO_Type.Fixture_Check_2;
-                    break;
-                case 3:
-                    type = IO_Type.Fixture_Check_3;
-                    break;
-                case 4:
-                    type = IO_Type.Fixture_Check_4;
-                    break;
-            }
-            return type;
-        }
-
+      
         public static void SaveMoveEquipConfig(MoveEquip_Config config)
         public static void SaveMoveEquipConfig(MoveEquip_Config config)
         {
         {
             try
             try

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         protected override void CheckFixtureProcess()
         protected override void CheckFixtureProcess()
         {
         {
-            if (!LineManager.Line.isCanProcessLine())
+            if (!LineManager.Line.LineCanRun())
             {
             {
                 return;
                 return;
             }
             }

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -81,9 +81,8 @@ namespace OnlineStore.DeviceLibrary
             BusyMoveProcess();
             BusyMoveProcess();
             //判断流水线打开了才可以运行 
             //判断流水线打开了才可以运行 
             if (MoveInfo.MoveType.Equals(LineMoveType.None))
             if (MoveInfo.MoveType.Equals(LineMoveType.None))
-            {
-                LineBean lineBean = LineManager.Line;
-                if (lineBean.isCanProcessLine() && IOManager.IOValue(IO_Type.DriveMotor_Run, 0).Equals(IO_VALUE.HIGH) && lineBean.runStatus >= LineRunStatus.Runing && lineBean.IsSleep.Equals(false))
+            { 
+                if (LineManager.Line.CanProcessLine())
                 {
                 {
                     // LogUtil.info("StartCheckFixture");
                     // LogUtil.info("StartCheckFixture");
                     //     StartCheckFixture();
                     //     StartCheckFixture();

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -239,13 +239,13 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             TrayManager.ErrorStoreId = -1;
             TrayManager.ErrorStoreId = -1;
 
 
-            IOMove(IO_Type.DriveMotor_Run, IO_VALUE.LOW);
-            //上料气缸下降
-            CylinderMove(null, IO_Type.InStore_TopCylinder_Up, IO_Type.InStore_TopCylinder_Down);
+            WriteDrivetMotorRun( IO_VALUE.LOW);
+            //NG气缸后退
+            CylinderMove(null, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
 
 
-            //阻挡都上升
-            IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
-            IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
+            ////阻挡都上升
+            //IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
+            //IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
             //横移轨道下降
             //横移轨道下降
             SideWayReset();
             SideWayReset();
         }
         }
@@ -323,13 +323,13 @@ namespace OnlineStore.DeviceLibrary
             LogUtil.info( Name + ",停止运行，总运行时间：" + span.ToString());
             LogUtil.info( Name + ",停止运行，总运行时间：" + span.ToString());
         }
         }
 
 
-        public override void Alarm(LineAlarmType alarmType, string alarmDetial, string alarmMsg, LineMoveType storeMoveType)
+        public override void Alarm(LineAlarmType alarmType )
         {
         {
             if (this.alarmType.Equals(alarmType))
             if (this.alarmType.Equals(alarmType))
             {
             {
                 return;
                 return;
             }
             }
-            SaveAlarmInfo(alarmType, alarmDetial, alarmMsg, storeMoveType);
+           // SaveAlarmInfo(alarmType, alarmDetial, alarmMsg, storeMoveType);
             this.alarmType = alarmType;
             this.alarmType = alarmType;
             if (alarmType == LineAlarmType.SuddenStop)
             if (alarmType == LineAlarmType.SuddenStop)
             {
             {
@@ -366,11 +366,11 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return true;
                 return true;
             }
             }
-            //判断是否有操作
-            if (IOValue(IO_Type.InStore_TrayCheck1).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.HIGH))
-            {
-                return true;
-            }
+            ////判断是否有操作
+            //if (IOValue(IO_Type.InStore_TrayCheck1).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.HIGH))
+            //{
+            //    return true;
+            //}
             if (MoveInfo.MoveType.Equals(LineMoveType.None).Equals(false))
             if (MoveInfo.MoveType.Equals(LineMoveType.None).Equals(false))
             {
             {
                 return true;
                 return true;
@@ -393,19 +393,27 @@ namespace OnlineStore.DeviceLibrary
             return false;
             return false;
 
 
         }
         }
+
+        private void WriteDrivetMotorRun(IO_VALUE value)
+        {
+            IOMove(IO_Type.DriveMotor_Run1, value);
+            IOMove(IO_Type.DriveMotor_Run2, value);
+            IOMove(IO_Type.DriveMotor_Run3, value);
+            IOMove(IO_Type.DriveMotor_Run4, value);
+        }
         private void UpdateSleep(bool isS)
         private void UpdateSleep(bool isS)
         {
         {
             if (isS != IsSleep)
             if (isS != IsSleep)
             {
             {
                 if (isS)
                 if (isS)
                 {
                 {
-                    LogUtil.info( Name + "***********更新为休眠状态");
-                    IOMove(IO_Type.DriveMotor_Run, IO_VALUE.LOW);
+                    LogUtil.info(Name + "***********更新为休眠状态");
+                    WriteDrivetMotorRun(IO_VALUE.LOW);
                 }
                 }
                 else
                 else
                 {
                 {
-                    LogUtil.info( Name + "***********更新为工作状态");
-                    IOMove(IO_Type.DriveMotor_Run, IO_VALUE.HIGH);
+                    LogUtil.info(Name + "***********更新为工作状态");
+                    WriteDrivetMotorRun(IO_VALUE.HIGH);
                 }
                 }
             }
             }
             IsSleep = isS;
             IsSleep = isS;
@@ -572,7 +580,7 @@ namespace OnlineStore.DeviceLibrary
                     //急停按钮和气压检测按钮需要一起使用  
                     //急停按钮和气压检测按钮需要一起使用  
                       if (suddenBtn .Equals( IO_VALUE.LOW))
                       if (suddenBtn .Equals( IO_VALUE.LOW))
                     {
                     {
-                        Alarm(LineAlarmType.SuddenStop, "1", WarnMsg, LineMoveType.None);
+                        Alarm(LineAlarmType.SuddenStop );
                     }
                     }
                     if (fuweiValue.Equals(IO_VALUE.HIGH) && (!fuweiValue.Equals(lastFuwei)))
                     if (fuweiValue.Equals(IO_VALUE.HIGH) && (!fuweiValue.Equals(lastFuwei)))
                     {
                     {
@@ -618,21 +626,21 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             Thread.Sleep(1);
             Thread.Sleep(1);
         }
         }
-        public string GetINVMsg()
-        {
-            if (IOValue(IO_Type.DriveMotor_Run).Equals(IO_VALUE.HIGH))
-            {
-                if (IOValue(IO_Type.DriveMotor_INV1).Equals(IO_VALUE.LOW))
-                {
-                    return "   驱动电机INV1状态异常";
-                }
-                else if (IOValue(IO_Type.DriveMotor_INV2).Equals(IO_VALUE.LOW))
-                {
-                    return "   驱动电机INV2状态异常";
-                }
-            }
-            return "";
-        }
+        //public string GetINVMsg()
+        //{
+        //    if (IOValue(IO_Type.DriveMotor_Run).Equals(IO_VALUE.HIGH))
+        //    {
+        //        if (IOValue(IO_Type.DriveMotor_INV1).Equals(IO_VALUE.LOW))
+        //        {
+        //            return "   驱动电机INV1状态异常";
+        //        }
+        //        else if (IOValue(IO_Type.DriveMotor_INV2).Equals(IO_VALUE.LOW))
+        //        {
+        //            return "   驱动电机INV2状态异常";
+        //        }
+        //    }
+        //    return "";
+        //}
         /// <summary>
         /// <summary>
         /// 定时处理，监听信号，监听IO
         /// 定时处理，监听信号，监听IO
         /// </summary> 
         /// </summary> 
@@ -724,7 +732,7 @@ namespace OnlineStore.DeviceLibrary
                         SetWarnMsg("持续"+Config.AirCheckSeconds+"秒未检测到气压信号");
                         SetWarnMsg("持续"+Config.AirCheckSeconds+"秒未检测到气压信号");
                         //SendAlarmCode(0, LineAlarm.NoAirCheck);
                         //SendAlarmCode(0, LineAlarm.NoAirCheck);
                         airValue = IO_VALUE.LOW;
                         airValue = IO_VALUE.LOW;
-                        Alarm(LineAlarmType.NoAirCheck, "2", WarnMsg, LineMoveType.None);
+                        Alarm(LineAlarmType.NoAirCheck );
                     }
                     }
                 }
                 }
                 else
                 else
@@ -954,9 +962,14 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             MoveInfo.EndMove();
             MoveInfo.EndMove();
 
 
-            IOMove(IO_Type.DriveMotor_Run, IO_VALUE.LOW);
-            IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
-            IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
+            WriteDrivetMotorRun(  IO_VALUE.LOW);
+            IOMove(IO_Type.NGCylinder_After, IO_VALUE.LOW);
+            IOMove(IO_Type.NGCylinder_Before, IO_VALUE.LOW);
+            IOMove(IO_Type.SW4_MotorRun, IO_VALUE.LOW);
+            IOMove(IO_Type.SW4_TopCylinder_Down, IO_VALUE.LOW);
+            IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW);
+            //IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
+            //IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
 
 
             SideWayStop();
             SideWayStop();
         }
         }
@@ -989,7 +1002,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 PreIsHasProcess = false;
                 PreIsHasProcess = false;
                 //打开流水线
                 //打开流水线
-                IOMove(IO_Type.DriveMotor_Run, IO_VALUE.HIGH);
+                WriteDrivetMotorRun(  IO_VALUE.HIGH);
                 //所有原点重置完成
                 //所有原点重置完成
                 runStatus = LineRunStatus.Runing;
                 runStatus = LineRunStatus.Runing;
                 LogUtil.info( Name + "所有设备重置完成，打开流水线，开始运转！");
                 LogUtil.info( Name + "所有设备重置完成，打开流水线，开始运转！");
@@ -998,16 +1011,11 @@ namespace OnlineStore.DeviceLibrary
         private bool ResetSingleISOk()
         private bool ResetSingleISOk()
         {
         {
             //气缸需要到位 
             //气缸需要到位 
-            if (IOValue(IO_Type.SidesWay1_TopCylinder_Down).Equals(IO_VALUE.HIGH) &&
-                IOValue(IO_Type.SidesWay2_TopCylinder_Down).Equals(IO_VALUE.HIGH) &&
-                IOValue(IO_Type.SidesWay3_TopCylinder_Down).Equals(IO_VALUE.HIGH) &&
-                    IOValue(IO_Type.SidesWay4_TopCylinder_Down).Equals(IO_VALUE.HIGH) &&
-                    IOValue(IO_Type.SidesWay4_TopCylinder_Up).Equals(IO_VALUE.LOW) &&
-                    IOValue(IO_Type.SidesWay4_TopCylinder_Up).Equals(IO_VALUE.LOW) &&
-                    IOValue(IO_Type.SidesWay4_TopCylinder_Up).Equals(IO_VALUE.LOW) &&
-                    IOValue(IO_Type.SidesWay4_TopCylinder_Up).Equals(IO_VALUE.LOW) &&
-                    IOValue(IO_Type.InStore_TopCylinder_Down).Equals(IO_VALUE.HIGH) &&
-                    IOValue(IO_Type.InStore_TopCylinder_Up).Equals(IO_VALUE.LOW))
+            if (IOValue(IO_Type.SW4_TopCylinder_Down).Equals(IO_VALUE.HIGH) &&
+                IOValue(IO_Type.NGCylinder_After).Equals(IO_VALUE.HIGH) && 
+                    IOValue(IO_Type.SW4_TopCylinder_Up).Equals(IO_VALUE.LOW) &&
+                    IOValue(IO_Type.NGCylinder_Before).Equals(IO_VALUE.LOW)
+                  )
             {
             {
                 return true;
                 return true;
             }
             }

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -23,7 +23,7 @@ namespace OnlineStore.DeviceLibrary
         private DateTime WaitOutGoTime = DateTime.Now;
         private DateTime WaitOutGoTime = DateTime.Now;
 
 
 
 
-        public bool isCanProcessLine()
+        public bool LineCanRun()
         {
         {
             if (IOValue(IO_Type.Line_Run).Equals(IO_VALUE.HIGH))
             if (IOValue(IO_Type.Line_Run).Equals(IO_VALUE.HIGH))
             {
             {
@@ -31,6 +31,30 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
+
+        public bool CanProcessLine(bool isCheckSleep = true)
+        {
+            if (LineCanRun() && 
+                IOManager.IOValue(IO_Type.DriveMotor_Run1, 0).Equals(IO_VALUE.HIGH) &&
+                IOManager.IOValue(IO_Type.DriveMotor_Run2, 0).Equals(IO_VALUE.HIGH) &&
+                IOManager.IOValue(IO_Type.DriveMotor_Run3, 0).Equals(IO_VALUE.HIGH) &&
+                IOManager.IOValue(IO_Type.DriveMotor_Run4, 0).Equals(IO_VALUE.HIGH)                  )
+            {
+                if (isCheckSleep)
+                {
+                    if (runStatus >= LineRunStatus.Runing && IsSleep.Equals(false))
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                } 
+                return true;
+            }
+            return false;
+        }
         private bool isInprocess = false;
         private bool isInprocess = false;
         private DateTime lastProTime = DateTime.Now;
         private DateTime lastProTime = DateTime.Now;
         private void InOutTimerProcess()
         private void InOutTimerProcess()
@@ -45,143 +69,143 @@ namespace OnlineStore.DeviceLibrary
                 isInprocess = true;
                 isInprocess = true;
                 lastProTime = DateTime.Now;
                 lastProTime = DateTime.Now;
                 //出入料口条件： 各料仓无报警（ 伺服）， 各移栽装置处 于原位待机，  检测夹具IO，驱动电机运转 
                 //出入料口条件： 各料仓无报警（ 伺服）， 各移栽装置处 于原位待机，  检测夹具IO，驱动电机运转 
-                if (!isCanProcessLine() || IOValue(IO_Type.DriveMotor_Run).Equals(IO_VALUE.LOW))
+                if (!CanProcessLine(false))
                 {
                 {
                     isWaitOutGo = false;
                     isWaitOutGo = false;
                     isInprocess = false;
                     isInprocess = false;
                     return;
                     return;
                 }
                 }
 
 
-                if (IOValue(IO_Type.Fixture_Check_4).Equals(IO_VALUE.LOW))
-                {
-                    IsWaitToScan = false;
-                    IsWaitEmptyGo = false;
+                //if (IOValue(IO_Type.Fixture_Check_4).Equals(IO_VALUE.LOW))
+                //{
+                //    IsWaitToScan = false;
+                //    IsWaitEmptyGo = false;
 
 
-                    //出料口有空托盘才可以放行，StopCylinder_Check=出料是否有托盘。OutStore_TrayCheck=出料托盘是否有料盘
-                    if (IOValue(IO_Type.StopCylinder_Check).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.OutStore_TrayCheck).Equals(IO_VALUE.LOW))
-                    {
-                        //延迟一秒钟放行
-                        if (!isWaitOutGo)
-                        {
-                            WaitOutGoTime = DateTime.Now.AddMilliseconds(500);
-                            isWaitOutGo = true;
-                        }
-                        else if (DateTime.Now > WaitOutGoTime)
-                        {
-                            LogUtil.debug(Name + "检测到出料口有空托盘， 且入料口没有托盘，,等待500后下降阻挡气缸1（出料口阻挡）");
-                            IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
-                            isWaitOutGo = false;
-                        }
-                    }
-                    else
-                    {
-                        isWaitOutGo = false;
-                    }
-                }
-                else
-                {
-                    isWaitOutGo = false;
-                    //上料工位有盘，阻挡1需要上升
-                    if (IOValue(IO_Type.StopCylinder_Down1).Equals(IO_VALUE.HIGH))
-                    {
-                        IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
-                    }
+                //    //出料口有空托盘才可以放行，StopCylinder_Check=出料是否有托盘。OutStore_TrayCheck=出料托盘是否有料盘
+                //    if (IOValue(IO_Type.StopCylinder_Check).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.OutStore_TrayCheck).Equals(IO_VALUE.LOW))
+                //    {
+                //        //延迟一秒钟放行
+                //        if (!isWaitOutGo)
+                //        {
+                //            WaitOutGoTime = DateTime.Now.AddMilliseconds(500);
+                //            isWaitOutGo = true;
+                //        }
+                //        else if (DateTime.Now > WaitOutGoTime)
+                //        {
+                //            LogUtil.debug(Name + "检测到出料口有空托盘， 且入料口没有托盘，,等待500后下降阻挡气缸1（出料口阻挡）");
+                //            IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
+                //            isWaitOutGo = false;
+                //        }
+                //    }
+                //    else
+                //    {
+                //        isWaitOutGo = false;
+                //    }
+                //}
+                //else
+                //{
+                //    isWaitOutGo = false;
+                //    //上料工位有盘，阻挡1需要上升
+                //    if (IOValue(IO_Type.StopCylinder_Down1).Equals(IO_VALUE.HIGH))
+                //    {
+                //        IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
+                //    }
 
 
-                    int trayNum = TrayManager.GetNum(0);
-                    if (trayNum > 0)
-                    {
-                        //先判断是空盘还是有料盘     
-                        if ((IOValue(IO_Type.InStore_TrayCheck1).Equals(IO_VALUE.HIGH)) || (IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.HIGH)))
-                        {
-                            //有料盘，直接扫码通过    。如果移栽在出库过程中，不能扫码 
-                            IsWaitEmptyGo = false;
-                            if (!IsScanCode && CanScanCode())
-                            {
-                                if (!IsWaitToScan)
-                                {
-                                    UpdateSleep(false);
-                                    IsWaitToScan = true;
-                                    NextScanTime = DateTime.Now.AddMilliseconds(1500);
-                                    LogUtil.debug(Name + "有料托盘【" + trayNum + "】等待1.5秒后开始扫码");
-                                }
-                                else if (DateTime.Now > NextScanTime)
-                                {
-                                    UpdateSleep(false);
-                                    IsWaitToScan = false;
-                                    //进入忙碌状态，开始扫码枪
-                                    LogUtil.debug(Name + "有料托盘【" + trayNum + "】，已经等待1.5秒，开始扫码");
-                                    //判断盘号是否正确
-                                    if (TrayManager.RightTrayCode(trayNum, preTrayNum, true))
-                                    {
-                                        GetCameraCode();
-                                    }
-                                    else
-                                    {
-                                        string msg = Name + "  托盘顺序错乱，上个托盘号【" + preTrayNum + "】当前有料托盘【" + trayNum + "】最大盘号【" + TrayManager.MaxTrayNum + "】";
-                                        TrayManager.UpdateTrayNumError(0, msg);
-                                        LogUtil.error(msg);
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        { //无料盘，若需要空盘，放行通过
-                            IsWaitToScan = false;
-                            IsScanCode = false;
-                            if (!IsWaitEmptyGo)
-                            {
-                                IsWaitEmptyGo = true;
-                                NextEmptyGo = DateTime.Now.AddMilliseconds(500);
-                            }
-                            else if (DateTime.Now > NextEmptyGo)
-                            {
-                                trayNum = TrayManager.GetNum(0);
-                                IsWaitEmptyGo = false;
-                                isNotScanCode = false;
-                                TrayManager.UpdateFixtureValue(trayNum, false, 0);
+                //    int trayNum = TrayManager.GetNum(0);
+                //    if (trayNum > 0)
+                //    {
+                //        //先判断是空盘还是有料盘     
+                //        if ((IOValue(IO_Type.InStore_TrayCheck1).Equals(IO_VALUE.HIGH)) || (IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.HIGH)))
+                //        {
+                //            //有料盘，直接扫码通过    。如果移栽在出库过程中，不能扫码 
+                //            IsWaitEmptyGo = false;
+                //            if (!IsScanCode && CanScanCode())
+                //            {
+                //                if (!IsWaitToScan)
+                //                {
+                //                    UpdateSleep(false);
+                //                    IsWaitToScan = true;
+                //                    NextScanTime = DateTime.Now.AddMilliseconds(1500);
+                //                    LogUtil.debug(Name + "有料托盘【" + trayNum + "】等待1.5秒后开始扫码");
+                //                }
+                //                else if (DateTime.Now > NextScanTime)
+                //                {
+                //                    UpdateSleep(false);
+                //                    IsWaitToScan = false;
+                //                    //进入忙碌状态，开始扫码枪
+                //                    LogUtil.debug(Name + "有料托盘【" + trayNum + "】，已经等待1.5秒，开始扫码");
+                //                    //判断盘号是否正确
+                //                    if (TrayManager.RightTrayCode(trayNum, preTrayNum, true))
+                //                    {
+                //                        GetCameraCode();
+                //                    }
+                //                    else
+                //                    {
+                //                        string msg = Name + "  托盘顺序错乱，上个托盘号【" + preTrayNum + "】当前有料托盘【" + trayNum + "】最大盘号【" + TrayManager.MaxTrayNum + "】";
+                //                        TrayManager.UpdateTrayNumError(0, msg);
+                //                        LogUtil.error(msg);
+                //                    }
+                //                }
+                //            }
+                //        }
+                //        else
+                //        { //无料盘，若需要空盘，放行通过
+                //            IsWaitToScan = false;
+                //            IsScanCode = false;
+                //            if (!IsWaitEmptyGo)
+                //            {
+                //                IsWaitEmptyGo = true;
+                //                NextEmptyGo = DateTime.Now.AddMilliseconds(500);
+                //            }
+                //            else if (DateTime.Now > NextEmptyGo)
+                //            {
+                //                trayNum = TrayManager.GetNum(0);
+                //                IsWaitEmptyGo = false;
+                //                isNotScanCode = false;
+                //                TrayManager.UpdateFixtureValue(trayNum, false, 0);
 
 
-                                //判断盘号是否正确
-                                if (TrayManager.RightTrayCode(trayNum, preTrayNum, true))
-                                {
-                                    bool isNeedGo = false;
-                                    //判断是否需要空盘  或者还有有 料盘 的托盘，一直走
-                                    if (TrayManager.isNeedEmptyTray())
-                                    {
-                                        isNeedGo = true;
-                                        LogUtil.info(Name + "  检测到空托盘【" + trayNum + "】并等待500， 放盘通过");
-                                    }
-                                    else if (TrayManager.IsHasFullOutFixture())
-                                    {
-                                        isNeedGo = true;
-                                        LogUtil.info(Name + "  检测到空托盘【" + trayNum + "】并等待500 ，还有没有出库完成的，放盘通过");
-                                    }
+                //                //判断盘号是否正确
+                //                if (TrayManager.RightTrayCode(trayNum, preTrayNum, true))
+                //                {
+                //                    bool isNeedGo = false;
+                //                    //判断是否需要空盘  或者还有有 料盘 的托盘，一直走
+                //                    if (TrayManager.isNeedEmptyTray())
+                //                    {
+                //                        isNeedGo = true;
+                //                        LogUtil.info(Name + "  检测到空托盘【" + trayNum + "】并等待500， 放盘通过");
+                //                    }
+                //                    else if (TrayManager.IsHasFullOutFixture())
+                //                    {
+                //                        isNeedGo = true;
+                //                        LogUtil.info(Name + "  检测到空托盘【" + trayNum + "】并等待500 ，还有没有出库完成的，放盘通过");
+                //                    }
 
 
-                                    if (isNeedGo)
-                                    {
-                                        UpdateSleep(false);
-                                        //放行操作
-                                        preTrayNum = trayNum;
-                                        StartOutStoreMove(null);
-                                    }
-                                }
-                                else
-                                {
-                                    string msg = Name + " 托盘顺序错乱，上个托盘号【" + preTrayNum + "】当前空托盘【" + trayNum + "】最大盘号【" + TrayManager.MaxTrayNum + "】";
-                                    TrayManager.UpdateTrayNumError(0, msg);
-                                    LogUtil.error(msg);
-                                }
+                //                    if (isNeedGo)
+                //                    {
+                //                        UpdateSleep(false);
+                //                        //放行操作
+                //                        preTrayNum = trayNum;
+                //                        StartOutStoreMove(null);
+                //                    }
+                //                }
+                //                else
+                //                {
+                //                    string msg = Name + " 托盘顺序错乱，上个托盘号【" + preTrayNum + "】当前空托盘【" + trayNum + "】最大盘号【" + TrayManager.MaxTrayNum + "】";
+                //                    TrayManager.UpdateTrayNumError(0, msg);
+                //                    LogUtil.error(msg);
+                //                }
 
 
-                            }
-                        }
-                    }
-                    else
-                    {
-                        IsWaitToScan = false;
-                        IsWaitEmptyGo = false;
-                        LogUtil.debug(Name +  "检测到Fixture_Check_4亮，但是托盘号为0，不处理托盘~");
-                    }
+                //            }
+                //        }
+                //    }
+                //    else
+                //    {
+                //        IsWaitToScan = false;
+                //        IsWaitEmptyGo = false;
+                //        LogUtil.debug(Name +  "检测到Fixture_Check_4亮，但是托盘号为0，不处理托盘~");
+                //    }
 
 
-                }
+                //}
 
 
             }
             }
             catch (Exception ex)
             catch (Exception ex)
@@ -278,7 +302,7 @@ namespace OnlineStore.DeviceLibrary
                                 ConfigIO io = Config.getWaitIO(wait.IoType);
                                 ConfigIO io = Config.getWaitIO(wait.IoType);
 
 
                                 WarnMsg = Name + " 等待" + NotOkMsg + "超时";
                                 WarnMsg = Name + " 等待" + NotOkMsg + "超时";
-                                Alarm(LineAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, checkWaitInfo.MoveType);
+                                Alarm(LineAlarmType.IoSingleTimeOut );
                                 LogUtil.error(checkWaitInfo.Name + "：" + checkWaitInfo.MoveStep + "等待" + NotOkMsg + "超时", 14);
                                 LogUtil.error(checkWaitInfo.Name + "：" + checkWaitInfo.MoveStep + "等待" + NotOkMsg + "超时", 14);
 
 
                                 isOk = false;
                                 isOk = false;
@@ -331,7 +355,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     WarnMsg = checkWaitInfo.Name + "[" + checkWaitInfo.MoveStep + "][" + NotOkMsg + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
                     WarnMsg = checkWaitInfo.Name + "[" + checkWaitInfo.MoveStep + "][" + NotOkMsg + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
                     LogUtil.error(WarnMsg, 100);
                     LogUtil.error(WarnMsg, 100);
-                    Alarm(LineAlarmType.IoSingleTimeOut, "", WarnMsg, checkWaitInfo.MoveType);
+                    Alarm(LineAlarmType.IoSingleTimeOut );
                 }
                 }
             }
             }
             catch (Exception ex)
             catch (Exception ex)
@@ -357,7 +381,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         protected override void OutStoreProcess()
         protected override void OutStoreProcess()
         {
         {
-            if (!isCanProcessLine())
+            if (!LineCanRun())
             {
             {
                 return;
                 return;
             }
             }
@@ -369,38 +393,38 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return;
                 return;
             }
             }
-            switch (MoveInfo.MoveStep)
-            {
-                //if (StoreMove.MoveStep == StoreMoveStep.LO_00_Wait100)
-                case LineMoveStep.LO_00_Wait100:
-                    MoveInfo.NextMoveStep(LineMoveStep.LO_01_StopCylinder2Down);
-                    InOutLog("出库处理：(LO_01_StopCylinder2Down 流水线出库，阻挡气缸0-1上升，阻挡气缸0-2下降, ) 开始");
-                    IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
-                    IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
-                    MoveInfo.EndStepWait();
-                    break;
-                case LineMoveStep.LO_01_StopCylinder2Down:
-                    MoveInfo.NextMoveStep(LineMoveStep.LO_02_FixtureCheck);
-                    InOutLog("出库处理：(LO_02_FixtureCheck  检测夹具检测4=0 ) 开始");
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check_4, IO_VALUE.LOW));
-                    break;
-                case LineMoveStep.LO_02_FixtureCheck:
-                    MoveInfo.NextMoveStep(LineMoveStep.LO_03_StopCylinder2Up);
-                    InOutLog("出库处理：(LO_03_StopCylinder2Up1Down  ， 阻挡气缸0-2上升 ) 开始 ");
-                    //      IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
-                    IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); break;
-                case LineMoveStep.LO_03_StopCylinder2Up:
-                    IsScanCode = false;
-                    MoveInfo.EndMove();
-                    runStatus = LineRunStatus.Runing;
-                    lineStatus = LineStatus.StoreOnline;
-                    InOutLog("出库处理：放行完成！ ");
-                    break;
-                default:
-                    break;
+            //switch (MoveInfo.MoveStep)
+            //{
+            //    //if (StoreMove.MoveStep == StoreMoveStep.LO_00_Wait100)
+            //    case LineMoveStep.LO_00_Wait100:
+            //        MoveInfo.NextMoveStep(LineMoveStep.LO_01_StopCylinder2Down);
+            //        InOutLog("出库处理：(LO_01_StopCylinder2Down 流水线出库，阻挡气缸0-1上升，阻挡气缸0-2下降, ) 开始");
+            //        IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
+            //        IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
+            //        MoveInfo.EndStepWait();
+            //        break;
+            //    case LineMoveStep.LO_01_StopCylinder2Down:
+            //        MoveInfo.NextMoveStep(LineMoveStep.LO_02_FixtureCheck);
+            //        InOutLog("出库处理：(LO_02_FixtureCheck  检测夹具检测4=0 ) 开始");
+            //        MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check_4, IO_VALUE.LOW));
+            //        break;
+            //    case LineMoveStep.LO_02_FixtureCheck:
+            //        MoveInfo.NextMoveStep(LineMoveStep.LO_03_StopCylinder2Up);
+            //        InOutLog("出库处理：(LO_03_StopCylinder2Up1Down  ， 阻挡气缸0-2上升 ) 开始 ");
+            //        //      IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
+            //        IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
+            //        MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); break;
+            //    case LineMoveStep.LO_03_StopCylinder2Up:
+            //        IsScanCode = false;
+            //        MoveInfo.EndMove();
+            //        runStatus = LineRunStatus.Runing;
+            //        lineStatus = LineStatus.StoreOnline;
+            //        InOutLog("出库处理：放行完成！ ");
+            //        break;
+            //    default:
+            //        break;
 
 
-            }
+            //}
         }
         }
         #endregion
         #endregion
 
 
@@ -425,7 +449,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         protected override void InStoreProcess()
         protected override void InStoreProcess()
         {
         {
-            if (!isCanProcessLine())
+            if (!LineCanRun())
             {
             {
                 return;
                 return;
             }
             }
@@ -437,59 +461,59 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return;
                 return;
             }
             }
-            switch (MoveInfo.MoveStep)
-            {
-                case LineMoveStep.LI_00_Wait100:
-                    //判断是否可以入库
-                    string posId = MoveInfo.MoveParam.PosId;
-                    int id = MoveInfo.MoveParam.GetStoreId();
-                    bool result = LineServer.RightInPosId(id, posId);
-                    MoveEquip moveEquip = null;
-                    MoveEquipMap.TryGetValue(id, out moveEquip);
-                    if (!result || moveEquip == null)
-                    {
-                        LogUtil.error("入库处理：入库验证失败【" + id + "】【" + posId + "】,结束入库");
-                        IsScanCode = false;
-                        MoveInfo.EndMove();
-                        runStatus = LineRunStatus.Runing;
-                        lineStatus = LineStatus.StoreOnline;
-                    }
-                    else
-                    {
-                        preTrayNum = MoveInfo.MoveParam.TrayNumber;
-                        lock (moveEquip.waitInListLock)
-                        {
-                            //如果当前正在出入库中，需要记录下来，等待空闲时执行
-                            LogUtil.info(moveEquip.Name + " 入库命令： " + MoveInfo.MoveParam.ToStr() + "已验证完成 ，写入排队列表中等待！");
-                            moveEquip.waitInStoreList.Add(MoveInfo.MoveParam);
-                        }
-                        MoveInfo.NextMoveStep(LineMoveStep.LI_01_StopCylinder2Down);
-                        InOutLog("入库处理：(LI_01_StopCylinder2Down  ，阻挡气缸0-1上升，阻挡气缸0-2下降  ) 开始");
-                        IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
-                        IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
-                    }
-                    break;
-                case LineMoveStep.LI_01_StopCylinder2Down:
-                    MoveInfo.NextMoveStep(LineMoveStep.LI_02_FixtureCheck);
-                    InOutLog("入库处理：(LI_02_CheckX3X4  等待夹具检测4=0 ) 开始");
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check_4, IO_VALUE.LOW));
-                    break;
-                case LineMoveStep.LI_02_FixtureCheck:
-                    MoveInfo.NextMoveStep(LineMoveStep.LI_03_StopCylinder2Up);
-                    InOutLog("入库处理：(LI_03_StopCylinder2Up1Down   阻挡气缸0-2上升) 开始 ");
-                    //  IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
-                    IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
-                    break;
-                case LineMoveStep.LI_03_StopCylinder2Up:
-                    IsScanCode = false;
-                    MoveInfo.EndMove();
-                    runStatus = LineRunStatus.Runing;
-                    lineStatus = LineStatus.StoreOnline;
-                    InOutLog(Name + "入库处理：放行完成！ ");
-                    break;
-                default: break;
-            }
+            //switch (MoveInfo.MoveStep)
+            //{
+            //    case LineMoveStep.LI_00_Wait100:
+            //        //判断是否可以入库
+            //        string posId = MoveInfo.MoveParam.PosId;
+            //        int id = MoveInfo.MoveParam.GetStoreId();
+            //        bool result = LineServer.RightInPosId(id, posId);
+            //        MoveEquip moveEquip = null;
+            //        MoveEquipMap.TryGetValue(id, out moveEquip);
+            //        if (!result || moveEquip == null)
+            //        {
+            //            LogUtil.error("入库处理：入库验证失败【" + id + "】【" + posId + "】,结束入库");
+            //            IsScanCode = false;
+            //            MoveInfo.EndMove();
+            //            runStatus = LineRunStatus.Runing;
+            //            lineStatus = LineStatus.StoreOnline;
+            //        }
+            //        else
+            //        {
+            //            preTrayNum = MoveInfo.MoveParam.TrayNumber;
+            //            lock (moveEquip.waitInListLock)
+            //            {
+            //                //如果当前正在出入库中，需要记录下来，等待空闲时执行
+            //                LogUtil.info(moveEquip.Name + " 入库命令： " + MoveInfo.MoveParam.ToStr() + "已验证完成 ，写入排队列表中等待！");
+            //                moveEquip.waitInStoreList.Add(MoveInfo.MoveParam);
+            //            }
+            //            MoveInfo.NextMoveStep(LineMoveStep.LI_01_StopCylinder2Down);
+            //            InOutLog("入库处理：(LI_01_StopCylinder2Down  ，阻挡气缸0-1上升，阻挡气缸0-2下降  ) 开始");
+            //            IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
+            //            IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
+            //        }
+            //        break;
+            //    case LineMoveStep.LI_01_StopCylinder2Down:
+            //        MoveInfo.NextMoveStep(LineMoveStep.LI_02_FixtureCheck);
+            //        InOutLog("入库处理：(LI_02_CheckX3X4  等待夹具检测4=0 ) 开始");
+            //        MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check_4, IO_VALUE.LOW));
+            //        break;
+            //    case LineMoveStep.LI_02_FixtureCheck:
+            //        MoveInfo.NextMoveStep(LineMoveStep.LI_03_StopCylinder2Up);
+            //        InOutLog("入库处理：(LI_03_StopCylinder2Up1Down   阻挡气缸0-2上升) 开始 ");
+            //        //  IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
+            //        IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
+            //        MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
+            //        break;
+            //    case LineMoveStep.LI_03_StopCylinder2Up:
+            //        IsScanCode = false;
+            //        MoveInfo.EndMove();
+            //        runStatus = LineRunStatus.Runing;
+            //        lineStatus = LineStatus.StoreOnline;
+            //        InOutLog(Name + "入库处理：放行完成！ ");
+            //        break;
+            //    default: break;
+            //}
 
 
         }
         }
         #endregion
         #endregion
@@ -533,44 +557,44 @@ namespace OnlineStore.DeviceLibrary
             SW12_MoveInfo.EndMove();
             SW12_MoveInfo.EndMove();
             SW34_MoveInfo.EndMove();
             SW34_MoveInfo.EndMove();
 
 
-            IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.LOW);
-            IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.LOW);
+            //IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.LOW);
+            //IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.LOW);
 
 
-            //阻挡气缸先上升
-            IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
-            IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.LOW);
+            ////阻挡气缸先上升
+            //IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
+            //IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.LOW);
         }
         }
         public void SideWay12TopCylinderMove(IO_VALUE downValue, IO_VALUE upValue, LineMoveInfo moveInfo = null)
         public void SideWay12TopCylinderMove(IO_VALUE downValue, IO_VALUE upValue, LineMoveInfo moveInfo = null)
         {
         {
-            IOMove(IO_Type.SidesWay12_TopCylinder_Down, downValue);
-            IOMove(IO_Type.SidesWay12_TopCylinder_Up, upValue);
+            //IOMove(IO_Type.SidesWay12_TopCylinder_Down, downValue);
+            //IOMove(IO_Type.SidesWay12_TopCylinder_Up, upValue);
 
 
-            if (moveInfo != null)
-            {
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_TopCylinder_Down, downValue));
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_TopCylinder_Up, upValue));
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_TopCylinder_Down, downValue));
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_TopCylinder_Up, upValue));
+            //if (moveInfo != null)
+            //{
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_TopCylinder_Down, downValue));
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_TopCylinder_Up, upValue));
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_TopCylinder_Down, downValue));
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_TopCylinder_Up, upValue));
 
 
-                moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay12_TopCylinder_Down, downValue));
-                moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay12_TopCylinder_Up, upValue));
-            }
+            //    moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay12_TopCylinder_Down, downValue));
+            //    moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay12_TopCylinder_Up, upValue));
+            //}
         }
         }
         public void SideWay34TopCylinderMove(IO_VALUE downValue, IO_VALUE upValue, LineMoveInfo moveInfo = null)
         public void SideWay34TopCylinderMove(IO_VALUE downValue, IO_VALUE upValue, LineMoveInfo moveInfo = null)
         {
         {
-            IOMove(IO_Type.SidesWay34_TopCylinder_Down, downValue);
-            IOMove(IO_Type.SidesWay34_TopCylinder_Up, upValue);
+            //IOMove(IO_Type.SidesWay34_TopCylinder_Down, downValue);
+            //IOMove(IO_Type.SidesWay34_TopCylinder_Up, upValue);
 
 
-            if (moveInfo != null)
-            {
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_TopCylinder_Down, downValue));
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_TopCylinder_Up, upValue));
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_TopCylinder_Down, downValue));
-                moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_TopCylinder_Up, upValue));
+            //if (moveInfo != null)
+            //{
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_TopCylinder_Down, downValue));
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_TopCylinder_Up, upValue));
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_TopCylinder_Down, downValue));
+            //    moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_TopCylinder_Up, upValue));
 
 
-                moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay34_TopCylinder_Down, downValue));
-                moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay34_TopCylinder_Up, upValue));
-            }
+            //    moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay34_TopCylinder_Down, downValue));
+            //    moveInfo.WriteIoList.Add(WriteIOInfo.NInfo(IO_Type.SidesWay34_TopCylinder_Up, upValue));
+            //}
         }
         }
         /// <summary>
         /// <summary>
         /// 判断横移轨道34是否有托盘
         /// 判断横移轨道34是否有托盘
@@ -578,15 +602,15 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         /// <returns></returns>
         public bool SideWay34HasTray()
         public bool SideWay34HasTray()
         {
         {
-            //正在横移中，且托盘顶升气缸未下降
-            if (SW34_MoveInfo.MoveType.Equals(LineMoveType.None).Equals(false) && SW34_MoveInfo.MoveStep <= LineMoveStep.SW07_TopCylinderDown)
-            {
-                return true;
-            }
-            if (IOValue(IO_Type.SidesWay3_FixtureCheck).Equals(IO_VALUE.HIGH))
-            {
-                return true;
-            }
+            ////正在横移中，且托盘顶升气缸未下降
+            //if (SW34_MoveInfo.MoveType.Equals(LineMoveType.None).Equals(false) && SW34_MoveInfo.MoveStep <= LineMoveStep.SW07_TopCylinderDown)
+            //{
+            //    return true;
+            //}
+            //if (IOValue(IO_Type.SidesWay3_FixtureCheck).Equals(IO_VALUE.HIGH))
+            //{
+            //    return true;
+            //}
             return false;
             return false;
         }
         }
         private DateTime SideWay12Ntime = DateTime.Now;
         private DateTime SideWay12Ntime = DateTime.Now;
@@ -607,93 +631,93 @@ namespace OnlineStore.DeviceLibrary
             try
             try
             {
             {
                 sdIsInprocess = true; sdlastProTime = DateTime.Now;
                 sdIsInprocess = true; sdlastProTime = DateTime.Now;
-                //流水线转动中，并且在忙碌或出入库处理中，需要处理移栽
-                if (IOValue(IO_Type.DriveMotor_Run).Equals(IO_VALUE.HIGH) && runStatus >= LineRunStatus.Runing)
-                {
-                    if (SW12_MoveInfo.MoveType.Equals(LineMoveType.None) && IOValue(IO_Type.SidesWay2_FixtureCheck).Equals(IO_VALUE.LOW))
-                    {
-                        TimeSpan span12 = DateTime.Now - SideWay12Ntime;
-                        //检测到阻挡夹具信号后，阻挡气缸下降，等待有夹具信号，阻挡气缸上升，
-                        //顶升气缸上升到位，开始流水线转动，检测到出口信号后，停止转动，顶升气缸下降，阻挡2下降，盘通过
-                        if (IOValue(IO_Type.SidesWay1_StopFixtureCheck).Equals(IO_VALUE.HIGH))
-                        {
-                            if (SideWay12IsWait && span12.TotalSeconds > 1)
-                            {
-                                SWLog("横移轨道阻挡1检测到托盘，开始移动托盘，下降横移气缸12");
-                                SW12_MoveInfo.NewMove(LineMoveType.InStore);
-                                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW00_Wait);
-                                SideWay12TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW12_MoveInfo);
-                            }
-                            else if (!SideWay12IsWait)
-                            {
-                                SideWay12IsWait = true;
-                                SideWay12Ntime = DateTime.Now;
-                            }
-                        }
-                        else if (IOValue(IO_Type.SidesWay1_FixtureCheck).Equals(IO_VALUE.HIGH))
-                        {
-                            if (SideWay12IsWait && span12.TotalSeconds > 1)
-                            {
-                                SWLog("横移轨道1检测到托盘，阻挡1上升，等待横移1夹具检测信号");
-                                SW12_MoveInfo.NewMove(LineMoveType.InStore);
-                                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
-                                IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
-                                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_FixtureCheck, IO_VALUE.HIGH));
-                            }
-                            else if (!SideWay12IsWait)
-                            {
-                                SideWay12IsWait = true;
-                                SideWay12Ntime = DateTime.Now;
-                            }
-                        }
-                        else
-                        {
-                            SideWay12IsWait = false;
-                        }
-                    }
-                    else
-                    {
-                        SideWay12IsWait = false;
-                        SideWay12BusyProcess();
-                    }
+                ////流水线转动中，并且在忙碌或出入库处理中，需要处理移栽
+                //if (IOValue(IO_Type.DriveMotor_Run).Equals(IO_VALUE.HIGH) && runStatus >= LineRunStatus.Runing)
+                //{
+                //    if (SW12_MoveInfo.MoveType.Equals(LineMoveType.None) && IOValue(IO_Type.SidesWay2_FixtureCheck).Equals(IO_VALUE.LOW))
+                //    {
+                //        TimeSpan span12 = DateTime.Now - SideWay12Ntime;
+                //        //检测到阻挡夹具信号后，阻挡气缸下降，等待有夹具信号，阻挡气缸上升，
+                //        //顶升气缸上升到位，开始流水线转动，检测到出口信号后，停止转动，顶升气缸下降，阻挡2下降，盘通过
+                //        if (IOValue(IO_Type.SidesWay1_StopFixtureCheck).Equals(IO_VALUE.HIGH))
+                //        {
+                //            if (SideWay12IsWait && span12.TotalSeconds > 1)
+                //            {
+                //                SWLog("横移轨道阻挡1检测到托盘，开始移动托盘，下降横移气缸12");
+                //                SW12_MoveInfo.NewMove(LineMoveType.InStore);
+                //                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW00_Wait);
+                //                SideWay12TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW12_MoveInfo);
+                //            }
+                //            else if (!SideWay12IsWait)
+                //            {
+                //                SideWay12IsWait = true;
+                //                SideWay12Ntime = DateTime.Now;
+                //            }
+                //        }
+                //        else if (IOValue(IO_Type.SidesWay1_FixtureCheck).Equals(IO_VALUE.HIGH))
+                //        {
+                //            if (SideWay12IsWait && span12.TotalSeconds > 1)
+                //            {
+                //                SWLog("横移轨道1检测到托盘，阻挡1上升，等待横移1夹具检测信号");
+                //                SW12_MoveInfo.NewMove(LineMoveType.InStore);
+                //                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
+                //                IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
+                //                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_FixtureCheck, IO_VALUE.HIGH));
+                //            }
+                //            else if (!SideWay12IsWait)
+                //            {
+                //                SideWay12IsWait = true;
+                //                SideWay12Ntime = DateTime.Now;
+                //            }
+                //        }
+                //        else
+                //        {
+                //            SideWay12IsWait = false;
+                //        }
+                //    }
+                //    else
+                //    {
+                //        SideWay12IsWait = false;
+                //        SideWay12BusyProcess();
+                //    }
 
 
-                    if (SW34_MoveInfo.MoveType.Equals(LineMoveType.None) && IOValue(IO_Type.SidesWay4_FixtureCheck).Equals(IO_VALUE.LOW))
-                    {
-                        TimeSpan span34 = DateTime.Now - SideWay34Ntime;
-                        //检测到阻挡夹具信号后，阻挡气缸下降，等待有夹具信号，阻挡气缸上升，
-                        //顶升气缸上升到位，开始流水线转动，检测到出口信号后，停止转动，顶升气缸下降，阻挡4下降，盘通过
-                        if (IOValue(IO_Type.SidesWay3_FixtureCheck).Equals(IO_VALUE.HIGH))
-                        {
-                            if (SideWay34IsWait && span34.TotalSeconds > 1)
-                            {
-                                SWLog("横移轨道3检测到托盘，开始移动托盘");
-                                SW34_MoveInfo.NewMove(LineMoveType.InStore);
-                                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopCylinderDown);
-                                IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.HIGH);
-                                SideWay34TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW34_MoveInfo);
-                            }
-                            else if (!SideWay34IsWait)
-                            {
-                                SideWay34IsWait = true;
-                                SideWay34Ntime = DateTime.Now;
-                            }
-                        }
-                        else
-                        {
-                            SideWay34IsWait = false;
-                        }
-                    }
-                    else
-                    {
-                        SideWay34IsWait = false;
-                        SideWay34BusyProcess();
-                    }
-                }
-                else
-                {
-                    SideWay34IsWait = false;
-                    SideWay12IsWait = false;
-                }
+                //    if (SW34_MoveInfo.MoveType.Equals(LineMoveType.None) && IOValue(IO_Type.SidesWay4_FixtureCheck).Equals(IO_VALUE.LOW))
+                //    {
+                //        TimeSpan span34 = DateTime.Now - SideWay34Ntime;
+                //        //检测到阻挡夹具信号后，阻挡气缸下降，等待有夹具信号，阻挡气缸上升，
+                //        //顶升气缸上升到位，开始流水线转动，检测到出口信号后，停止转动，顶升气缸下降，阻挡4下降，盘通过
+                //        if (IOValue(IO_Type.SidesWay3_FixtureCheck).Equals(IO_VALUE.HIGH))
+                //        {
+                //            if (SideWay34IsWait && span34.TotalSeconds > 1)
+                //            {
+                //                SWLog("横移轨道3检测到托盘，开始移动托盘");
+                //                SW34_MoveInfo.NewMove(LineMoveType.InStore);
+                //                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopCylinderDown);
+                //                IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.HIGH);
+                //                SideWay34TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW34_MoveInfo);
+                //            }
+                //            else if (!SideWay34IsWait)
+                //            {
+                //                SideWay34IsWait = true;
+                //                SideWay34Ntime = DateTime.Now;
+                //            }
+                //        }
+                //        else
+                //        {
+                //            SideWay34IsWait = false;
+                //        }
+                //    }
+                //    else
+                //    {
+                //        SideWay34IsWait = false;
+                //        SideWay34BusyProcess();
+                //    }
+                //}
+                //else
+                //{
+                //    SideWay34IsWait = false;
+                //    SideWay12IsWait = false;
+                //}
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
@@ -712,76 +736,76 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return;
                 return;
             }
             }
-            if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW00_Wait))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopCylinderDown);
-                SWLog("横移轨道12：阻挡1下降，最多下降1000     ");
-                IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.HIGH);
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopCylinderDown))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
-                SWLog("横移轨道12：阻挡1上升，等待横移1夹具检测信号     ");
-                IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_FixtureCheck, IO_VALUE.HIGH));
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW02_WaitFixtureCheck))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp);
-                SWLog("横移轨道12：顶升气缸上升  ,横移1阻挡上升  ,至少等待1000 ");
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
-                SideWay12TopCylinderMove(IO_VALUE.LOW, IO_VALUE.HIGH, SW12_MoveInfo);
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW03_TopCylinderUp))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW04_DriveMotorMove);
-                SWLog("横移轨道12：开始转动电机  ,等待1000，等待SidesWay2_FixtureCheck=1,  SidesWay1_FixtureCheck=0 ");
-                IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.HIGH);
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.HIGH));
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_FixtureCheck, IO_VALUE.LOW));
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW04_DriveMotorMove))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW05_WaitOutFixtureCheck);
-                SWLog("横移轨道12：等待托盘到达出口     ");
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.HIGH));
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW05_WaitOutFixtureCheck))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW06_WatOutFixture2);
-                SWLog("横移轨道12：再次验证托盘是否在出口处     ");
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.HIGH));
+            //if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW00_Wait))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopCylinderDown);
+            //    SWLog("横移轨道12：阻挡1下降，最多下降1000     ");
+            //    IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.HIGH);
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopCylinderDown))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
+            //    SWLog("横移轨道12：阻挡1上升，等待横移1夹具检测信号     ");
+            //    IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_FixtureCheck, IO_VALUE.HIGH));
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW02_WaitFixtureCheck))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp);
+            //    SWLog("横移轨道12：顶升气缸上升  ,横移1阻挡上升  ,至少等待1000 ");
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //    IOMove(IO_Type.SidesWay1_StopCylinderDown, IO_VALUE.LOW);
+            //    SideWay12TopCylinderMove(IO_VALUE.LOW, IO_VALUE.HIGH, SW12_MoveInfo);
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW03_TopCylinderUp))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW04_DriveMotorMove);
+            //    SWLog("横移轨道12：开始转动电机  ,等待1000，等待SidesWay2_FixtureCheck=1,  SidesWay1_FixtureCheck=0 ");
+            //    IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.HIGH);
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.HIGH));
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay1_FixtureCheck, IO_VALUE.LOW));
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW04_DriveMotorMove))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW05_WaitOutFixtureCheck);
+            //    SWLog("横移轨道12：等待托盘到达出口     ");
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.HIGH));
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW05_WaitOutFixtureCheck))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW06_WatOutFixture2);
+            //    SWLog("横移轨道12：再次验证托盘是否在出口处     ");
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.HIGH));
 
 
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW06_WatOutFixture2))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW07_TopCylinderDown);
-                SWLog("横移轨道12：托盘已到达出口，顶升气缸下降     ");
-                SideWay12TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW12_MoveInfo);
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_TopCylinderDown))
-            {
-                SW12_MoveInfo.NextMoveStep(LineMoveStep.SW09_WaitTrayGo);
-                SWLog("横移轨道12：等待SidesWay2_FixtureCheck=0，最多等待5秒，关闭横移电机 ");
-                IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.LOW);
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.LOW));
-                SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
-                SW12_MoveInfo.OneWaitCanEndStep = true;
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW08_StopDrive))
-            {
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW06_WatOutFixture2))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW07_TopCylinderDown);
+            //    SWLog("横移轨道12：托盘已到达出口，顶升气缸下降     ");
+            //    SideWay12TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW12_MoveInfo);
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_TopCylinderDown))
+            //{
+            //    SW12_MoveInfo.NextMoveStep(LineMoveStep.SW09_WaitTrayGo);
+            //    SWLog("横移轨道12：等待SidesWay2_FixtureCheck=0，最多等待5秒，关闭横移电机 ");
+            //    IOMove(IO_Type.SidesWay12_DriveMotor, IO_VALUE.LOW);
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay2_FixtureCheck, IO_VALUE.LOW));
+            //    SW12_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
+            //    SW12_MoveInfo.OneWaitCanEndStep = true;
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW08_StopDrive))
+            //{
 
 
-            }
-            else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW09_WaitTrayGo))
-            {
-                SW12_MoveInfo.EndMove();
-                SWLog("横移轨道12：横移结束     ");
-            }
+            //}
+            //else if (SW12_MoveInfo.MoveStep.Equals(LineMoveStep.SW09_WaitTrayGo))
+            //{
+            //    SW12_MoveInfo.EndMove();
+            //    SWLog("横移轨道12：横移结束     ");
+            //}
         }
         }
 
 
         private void SideWay34BusyProcess()
         private void SideWay34BusyProcess()
@@ -794,75 +818,75 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return;
                 return;
             }
             }
-            if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW00_Wait))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopCylinderDown);
-                SWLog("横移轨道34：阻挡3下降，最多下降1000     ");
-                IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.HIGH);
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopCylinderDown))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
-                SWLog("横移轨道34：横移3阻挡上升，等待横移3夹具检测信号     ");
-                IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.LOW);
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_FixtureCheck, IO_VALUE.HIGH));
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW02_WaitFixtureCheck))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp);
-                SWLog("横移轨道34：顶升气缸上升  ,横移3阻挡上升,至少等待1000   ");
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.LOW);
-                SideWay34TopCylinderMove(IO_VALUE.LOW, IO_VALUE.HIGH, SW34_MoveInfo);
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW03_TopCylinderUp))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW04_DriveMotorMove);
-                SWLog("横移轨道34：开始转动电机  ，等待1000 ，等待SidesWay4_FixtureCheck=1 ,SidesWay3_FixtureCheck=0 ");
-                IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.HIGH);
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.HIGH));
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_FixtureCheck, IO_VALUE.LOW));
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW04_DriveMotorMove))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW05_WaitOutFixtureCheck);
-                SWLog("横移轨道34：等待托盘到达出口     ");
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.HIGH));
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW05_WaitOutFixtureCheck))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW06_WatOutFixture2);
-                SWLog("横移轨道34：再次验证托盘是否到达出口     ");
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.HIGH));
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW06_WatOutFixture2))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW07_TopCylinderDown);
-                SWLog("横移轨道34：托盘已到达出口，顶升气缸下降     ");
-                SideWay34TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW34_MoveInfo);
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_TopCylinderDown))
-            {
-                SW34_MoveInfo.NextMoveStep(LineMoveStep.SW09_WaitTrayGo);
-                SWLog("横移轨道34：等待SidesWay4_FixtureCheck=0 ,最多等待5秒，关闭横移电机    ");
-                IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.LOW);
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.LOW));
-                SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
-                SW34_MoveInfo.OneWaitCanEndStep = true;
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW08_StopDrive))
-            {
+            //if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW00_Wait))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopCylinderDown);
+            //    SWLog("横移轨道34：阻挡3下降，最多下降1000     ");
+            //    IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.HIGH);
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopCylinderDown))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
+            //    SWLog("横移轨道34：横移3阻挡上升，等待横移3夹具检测信号     ");
+            //    IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.LOW);
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_FixtureCheck, IO_VALUE.HIGH));
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW02_WaitFixtureCheck))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp);
+            //    SWLog("横移轨道34：顶升气缸上升  ,横移3阻挡上升,至少等待1000   ");
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //    IOMove(IO_Type.SidesWay3_StopCylinderDown, IO_VALUE.LOW);
+            //    SideWay34TopCylinderMove(IO_VALUE.LOW, IO_VALUE.HIGH, SW34_MoveInfo);
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW03_TopCylinderUp))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW04_DriveMotorMove);
+            //    SWLog("横移轨道34：开始转动电机  ，等待1000 ，等待SidesWay4_FixtureCheck=1 ,SidesWay3_FixtureCheck=0 ");
+            //    IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.HIGH);
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.HIGH));
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay3_FixtureCheck, IO_VALUE.LOW));
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW04_DriveMotorMove))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW05_WaitOutFixtureCheck);
+            //    SWLog("横移轨道34：等待托盘到达出口     ");
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.HIGH));
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW05_WaitOutFixtureCheck))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW06_WatOutFixture2);
+            //    SWLog("横移轨道34：再次验证托盘是否到达出口     ");
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.HIGH));
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW06_WatOutFixture2))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW07_TopCylinderDown);
+            //    SWLog("横移轨道34：托盘已到达出口，顶升气缸下降     ");
+            //    SideWay34TopCylinderMove(IO_VALUE.HIGH, IO_VALUE.LOW, SW34_MoveInfo);
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_TopCylinderDown))
+            //{
+            //    SW34_MoveInfo.NextMoveStep(LineMoveStep.SW09_WaitTrayGo);
+            //    SWLog("横移轨道34：等待SidesWay4_FixtureCheck=0 ,最多等待5秒，关闭横移电机    ");
+            //    IOMove(IO_Type.SidesWay34_DriveMotor, IO_VALUE.LOW);
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SidesWay4_FixtureCheck, IO_VALUE.LOW));
+            //    SW34_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
+            //    SW34_MoveInfo.OneWaitCanEndStep = true;
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW08_StopDrive))
+            //{
 
 
-            }
-            else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW09_WaitTrayGo))
-            {
-                SW34_MoveInfo.EndMove();
-                SWLog("横移轨道34：横移结束     ");
-            }
+            //}
+            //else if (SW34_MoveInfo.MoveStep.Equals(LineMoveStep.SW09_WaitTrayGo))
+            //{
+            //    SW34_MoveInfo.EndMove();
+            //    SWLog("横移轨道34：横移结束     ");
+            //}
         }
         }
 
 
         private void SWLog(string msg)
         private void SWLog(string msg)
@@ -875,11 +899,11 @@ namespace OnlineStore.DeviceLibrary
 
 
         public int GetWidth()
         public int GetWidth()
         {
         {
-            //根据料盘检测信号
-            if (IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.HIGH))
-            {
-                return 13;
-            }
+            ////根据料盘检测信号
+            //if (IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.HIGH))
+            //{
+            //    return 13;
+            //}
             return 7;
             return 7;
         }
         }
         public int GetHeight()
         public int GetHeight()
@@ -893,28 +917,28 @@ namespace OnlineStore.DeviceLibrary
         private int Get7Height()
         private int Get7Height()
         {
         {
             int result = 0;
             int result = 0;
-            if (IOValue(IO_Type.InStore_TrayCheck1).Equals(IO_VALUE.LOW))
-            {
-                return result;
-            }
-            int ai1 = AIManager.GetAIValue(Config.AIDI1_Addr);
-            int ai2 = AIManager.GetAIValue(Config.AIDI2_Addr);
-            double ai1Value = AIManager.ConvertAI(ai1, Config.AIDI1_DefaultPosition);
-            double ai2Value = AIManager.ConvertAI(ai2, Config.AIDI2_DefaultPosition);
-            result = CalHeight(ai1Value, ai2Value);
+            //if (IOValue(IO_Type.InStore_TrayCheck1).Equals(IO_VALUE.LOW))
+            //{
+            //    return result;
+            //}
+            //int ai1 = AIManager.GetAIValue(Config.AIDI1_Addr);
+            //int ai2 = AIManager.GetAIValue(Config.AIDI2_Addr);
+            //double ai1Value = AIManager.ConvertAI(ai1, Config.AIDI1_DefaultPosition);
+            //double ai2Value = AIManager.ConvertAI(ai2, Config.AIDI2_DefaultPosition);
+            //result = CalHeight(ai1Value, ai2Value);
             return result;
             return result;
         }
         }
         private int Get13Height()
         private int Get13Height()
         {
         {
 
 
             int result = 0;
             int result = 0;
-            if (IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.LOW))
-            {
-                return result;
-            }
-            double ai1Value = AIManager.ConvertAI(AIManager.GetAIValue(Config.AIDI3_Addr), Config.AIDI3_DefaultPosition);
-            double ai2Value = AIManager.ConvertAI(AIManager.GetAIValue(Config.AIDI4_Addr), Config.AIDI4_DefaultPosition);
-            result = CalHeight(ai1Value, ai2Value);
+            //if (IOValue(IO_Type.InStore_TrayCheck2).Equals(IO_VALUE.LOW))
+            //{
+            //    return result;
+            //}
+            //double ai1Value = AIManager.ConvertAI(AIManager.GetAIValue(Config.AIDI3_Addr), Config.AIDI3_DefaultPosition);
+            //double ai2Value = AIManager.ConvertAI(AIManager.GetAIValue(Config.AIDI4_Addr), Config.AIDI4_DefaultPosition);
+            //result = CalHeight(ai1Value, ai2Value);
             return result;
             return result;
         }
         }
 
 

source/DeviceLibrary/assemblyLine/MoveEquip.cs

@@ -88,9 +88,8 @@ namespace OnlineStore.DeviceLibrary
             BusyMoveProcess(); 
             BusyMoveProcess(); 
             //判断流水线打开了才可以运行 
             //判断流水线打开了才可以运行 
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
-            {
-                LineBean lineBean = LineManager.Line;
-                if (lineBean.isCanProcessLine() && IOManager.IOValue(IO_Type.DriveMotor_Run, 0).Equals(IO_VALUE.HIGH) && lineBean.runStatus >= LineRunStatus.Runing && lineBean.IsSleep.Equals(false))
+            { 
+                if (LineManager.Line.CanProcessLine())
                 {
                 {
                     // LogUtil.info("StartCheckFixture");
                     // LogUtil.info("StartCheckFixture");
                     StartCheckFixture();
                     StartCheckFixture();

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -453,7 +453,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         protected override void CheckFixtureProcess()
         protected override void CheckFixtureProcess()
         {
         {
-            if (!LineManager.Line.isCanProcessLine())
+            if (!LineManager.Line.LineCanRun())
             {
             {
                 return;
                 return;
             }
             }

source/DeviceLibrary/assemblyLine/ProvidingEquip.cs

@@ -79,7 +79,7 @@ namespace OnlineStore.DeviceLibrary
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
             {
             {
                 LineBean lineBean = LineManager.Line;
                 LineBean lineBean = LineManager.Line;
-                if (lineBean.isCanProcessLine() && IOManager.IOValue(IO_Type.DriveMotor_Run, 0).Equals(IO_VALUE.HIGH) && lineBean.runStatus >= LineRunStatus.Runing && lineBean.IsSleep.Equals(false))
+                if (LineManager.Line.CanProcessLine())
                 {
                 {
                     StartCheckFixture();
                     StartCheckFixture();
                 }
                 }

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -48,7 +48,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         protected override void CheckFixtureProcess()
         protected override void CheckFixtureProcess()
         {
         {
-            if (!LineManager.Line.isCanProcessLine())
+            if (!LineManager.Line.LineCanRun())
             {
             {
                 return;
                 return;
             }
             }

source/LoadCVSLibrary/storeConfig/config/FeedingEquip_Config.cs

@@ -26,7 +26,13 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         /// </summary>
         [ConfigProAttribute("IsDebug")]
         [ConfigProAttribute("IsDebug")]
         public int IsDebug { get; set; }
         public int IsDebug { get; set; }
-         
+
+
+        /// <summary>
+        ///  PRO,0,对应的横移模块,SidesWayNum,3,,,,,
+        /// </summary>
+        [ConfigProAttribute("SidesWayNum",false)]
+        public int SidesWayNum { get; set; }
 
 
         /// <summary>
         /// <summary>
         ///   PRO	0	移栽上下运动是否使用伺服 UpDownUseAxis	1
         ///   PRO	0	移栽上下运动是否使用伺服 UpDownUseAxis	1

source/LoadCVSLibrary/storeConfig/config/IO_Type.cs

@@ -51,71 +51,71 @@ namespace OnlineStore.LoadCSVLibrary
         ///  DI	0	气压检测 Airpressure_Check	4	 	气压检测 X05 DI-05
         ///  DI	0	气压检测 Airpressure_Check	4	 	气压检测 X05 DI-05
         /// </summary>
         /// </summary>
         public static string Airpressure_Check = "Airpressure_Check";
         public static string Airpressure_Check = "Airpressure_Check";
-        /// <summary>
-        ///  DI	0	上料工位料盘检测1 InStore_TrayCheck1	5	 	上料工位料盘检测1 X06 DI-06
-        /// </summary>
-        public static string InStore_TrayCheck1 = "InStore_TrayCheck1";
-        /// <summary>
-        ///  DI	0	上料工位料盘检测2 InStore_TrayCheck2	6	 	上料工位料盘检测2 X07 DI-07
-        /// </summary>
-        public static string InStore_TrayCheck2 = "InStore_TrayCheck2";
-        /// <summary>
-        ///  DI	0	阻挡0-1夹具检测 StopCylinder_Check	7	 	阻挡0-1夹具检测 X08 DI-08
-        /// </summary>
-        public static string StopCylinder_Check = "StopCylinder_Check";
-        /// <summary>
-        ///  DI	0	上料工位夹具检测0-1	Fixture_Check_1	8	 	上料工位夹具检测0-1	X09 DI-09
-        /// </summary>
-        public static string Fixture_Check_1 = "Fixture_Check_1";
-        /// <summary>
-        ///  DI	0	上料工位夹具检测0-2	Fixture_Check_2	9	 	上料工位夹具检测0-2	X10 DI-10
-        /// </summary>
-        public static string Fixture_Check_2 = "Fixture_Check_2";
-        /// <summary>
-        ///  DI	0	上料工位夹具检测0-3	Fixture_Check_3	10	 	上料工位夹具检测0-3	X11 DI-11
-        /// </summary>
-        public static string Fixture_Check_3 = "Fixture_Check_3";
-        /// <summary>
-        ///  DI	0	上料工位夹具检测0-4	Fixture_Check_4	11	 	上料工位夹具检测0-4	X12 DI-12
-        /// </summary>
-        public static string Fixture_Check_4 = "Fixture_Check_4";
+        ///// <summary>
+        /////  DI	0	上料工位料盘检测1 InStore_TrayCheck1	5	 	上料工位料盘检测1 X06 DI-06
+        ///// </summary>
+        //public static string InStore_TrayCheck1 = "InStore_TrayCheck1";
+        ///// <summary>
+        /////  DI	0	上料工位料盘检测2 InStore_TrayCheck2	6	 	上料工位料盘检测2 X07 DI-07
+        ///// </summary>
+        //public static string InStore_TrayCheck2 = "InStore_TrayCheck2";
+        ///// <summary>
+        /////  DI	0	阻挡0-1夹具检测 StopCylinder_Check	7	 	阻挡0-1夹具检测 X08 DI-08
+        ///// </summary>
+        //public static string StopCylinder_Check = "StopCylinder_Check";
+        ///// <summary>
+        /////  DI	0	上料工位夹具检测0-1	Fixture_Check_1	8	 	上料工位夹具检测0-1	X09 DI-09
+        ///// </summary>
+        //public static string Fixture_Check_1 = "Fixture_Check_1";
+        ///// <summary>
+        /////  DI	0	上料工位夹具检测0-2	Fixture_Check_2	9	 	上料工位夹具检测0-2	X10 DI-10
+        ///// </summary>
+        //public static string Fixture_Check_2 = "Fixture_Check_2";
+        ///// <summary>
+        /////  DI	0	上料工位夹具检测0-3	Fixture_Check_3	10	 	上料工位夹具检测0-3	X11 DI-11
+        ///// </summary>
+        //public static string Fixture_Check_3 = "Fixture_Check_3";
+        ///// <summary>
+        /////  DI	0	上料工位夹具检测0-4	Fixture_Check_4	11	 	上料工位夹具检测0-4	X12 DI-12
+        ///// </summary>
+        //public static string Fixture_Check_4 = "Fixture_Check_4";
        
        
-        /// <summary>
-        ///  DI	0	横移轨道1阻挡夹具检测 SidesWay1_StopFixtureCheck	14	 	横移轨道1阻挡夹具检测 X15 DI-15
-        /// </summary>
-        public static string SidesWay1_StopFixtureCheck = "SidesWay1_StopFixtureCheck";
-        /// <summary>
-        ///  DI	0	横移轨道1夹具检测 SidesWay1_FixtureCheck	15	 	横移轨道1夹具检测 X16 DI-16
-        /// </summary>
-        public static string SidesWay1_FixtureCheck = "SidesWay1_FixtureCheck";
-        /// <summary>
-        ///  DI	0	横移轨道1顶升气缸上升端 SidesWay1_TopCylinder_Up	16	 	横移轨道1顶升气缸上升端 X17 DI-17
-        /// </summary>
-        public static string SidesWay1_TopCylinder_Up = "SidesWay1_TopCylinder_Up";
-        /// <summary>
-        ///  DI	0	横移轨道1顶升气缸下降端 SidesWay1_TopCylinder_Down	17	 	横移轨道1顶升气缸下降端 X18 DI-18
-        /// </summary>
-        public static string SidesWay1_TopCylinder_Down = "SidesWay1_TopCylinder_Down";
-        /// <summary>
-        ///  DI	0	横移轨道2夹具检测 SidesWay2_FixtureCheck	18	 	横移轨道2夹具检测 X19 DI-19
-        /// </summary>
-        public static string SidesWay2_FixtureCheck = "SidesWay2_FixtureCheck";
-        /// <summary>
-        ///  DI	0	横移轨道2顶升气缸上升端 SidesWay2_TopCylinder_Up	19	 	横移轨道2顶升气缸上升端 X20 DI-20
-        /// </summary>
-        public static string SidesWay2_TopCylinder_Up = "SidesWay2_TopCylinder_Up";
-        /// <summary>
-        ///  DI	0	横移轨道2顶升气缸下降端 SidesWay2_TopCylinder_Down	20	 	横移轨道2顶升气缸下降端 X21 DI-21
-        /// </summary>
-        public static string SidesWay2_TopCylinder_Down = "SidesWay2_TopCylinder_Down";
-        /// <summary>
-        ///  DI	0	驱动电机INV1状态 DriveMotor_INV1	21	 	驱动电机INV1状态 X22 DI-22
-        /// </summary>
-        public static string DriveMotor_INV1 = "DriveMotor_INV1";
-        /// <summary>
-        ///  DI	0	驱动电机INV2状态 DriveMotor_INV2	22	 	驱动电机INV2状态 X23 DI-23
-        /// </summary>
-        public static string DriveMotor_INV2 = "DriveMotor_INV2";
+        ///// <summary>
+        /////  DI	0	横移轨道1阻挡夹具检测 SidesWay1_StopFixtureCheck	14	 	横移轨道1阻挡夹具检测 X15 DI-15
+        ///// </summary>
+        //public static string SidesWay1_StopFixtureCheck = "SidesWay1_StopFixtureCheck";
+        ///// <summary>
+        /////  DI	0	横移轨道1夹具检测 SidesWay1_FixtureCheck	15	 	横移轨道1夹具检测 X16 DI-16
+        ///// </summary>
+        //public static string SidesWay1_FixtureCheck = "SidesWay1_FixtureCheck";
+        ///// <summary>
+        /////  DI	0	横移轨道1顶升气缸上升端 SidesWay1_TopCylinder_Up	16	 	横移轨道1顶升气缸上升端 X17 DI-17
+        ///// </summary>
+        //public static string SidesWay1_TopCylinder_Up = "SidesWay1_TopCylinder_Up";
+        ///// <summary>
+        /////  DI	0	横移轨道1顶升气缸下降端 SidesWay1_TopCylinder_Down	17	 	横移轨道1顶升气缸下降端 X18 DI-18
+        ///// </summary>
+        //public static string SidesWay1_TopCylinder_Down = "SidesWay1_TopCylinder_Down";
+        ///// <summary>
+        /////  DI	0	横移轨道2夹具检测 SidesWay2_FixtureCheck	18	 	横移轨道2夹具检测 X19 DI-19
+        ///// </summary>
+        //public static string SidesWay2_FixtureCheck = "SidesWay2_FixtureCheck";
+        ///// <summary>
+        /////  DI	0	横移轨道2顶升气缸上升端 SidesWay2_TopCylinder_Up	19	 	横移轨道2顶升气缸上升端 X20 DI-20
+        ///// </summary>
+        //public static string SidesWay2_TopCylinder_Up = "SidesWay2_TopCylinder_Up";
+        ///// <summary>
+        /////  DI	0	横移轨道2顶升气缸下降端 SidesWay2_TopCylinder_Down	20	 	横移轨道2顶升气缸下降端 X21 DI-21
+        ///// </summary>
+        //public static string SidesWay2_TopCylinder_Down = "SidesWay2_TopCylinder_Down";
+        ///// <summary>
+        /////  DI	0	驱动电机INV1状态 DriveMotor_INV1	21	 	驱动电机INV1状态 X22 DI-22
+        ///// </summary>
+        //public static string DriveMotor_INV1 = "DriveMotor_INV1";
+        ///// <summary>
+        /////  DI	0	驱动电机INV2状态 DriveMotor_INV2	22	 	驱动电机INV2状态 X23 DI-23
+        ///// </summary>
+        //public static string DriveMotor_INV2 = "DriveMotor_INV2";
         /// <summary>
         /// <summary>
         ///  DO	0	待机状态（指示灯）	AutoRun_HddLed	24	 	待机状态（指示灯）	Y01 DO-01
         ///  DO	0	待机状态（指示灯）	AutoRun_HddLed	24	 	待机状态（指示灯）	Y01 DO-01
         /// </summary>
         /// </summary>
@@ -131,18 +131,18 @@ namespace OnlineStore.LoadCSVLibrary
     
     
 
 
 
 
-        /// <summary>
-        ///      DO	0	驱动电机正转 DriveMotor_Run	27	 	驱动电机正转 Y04 DO-04
-        /// </summary>
-        public static string DriveMotor_Run = "DriveMotor_Run";
-        /// <summary>
-        ///  DO	0	横移电机1.2驱动 SidesWay12_DriveMotor	28	 	横移电机1.2驱动 Y05 DO-05
-        /// </summary>
-        public static string SidesWay12_DriveMotor = "SidesWay12_DriveMotor";
-        /// <summary>
-        ///  DO	0	横移电机3.4驱动 SidesWay34_DriveMotor	29	 	横移电机3.4驱动 Y06 DO-06
-        /// </summary>
-        public static string SidesWay34_DriveMotor = "SidesWay34_DriveMotor";
+        ///// <summary>
+        /////      DO	0	驱动电机正转 DriveMotorRun	27	 	驱动电机正转 Y04 DO-04
+        ///// </summary>
+        //public static string DriveMotorRun = "DriveMotorRun";
+        ///// <summary>
+        /////  DO	0	横移电机1.2驱动 SidesWay12_DriveMotor	28	 	横移电机1.2驱动 Y05 DO-05
+        ///// </summary>
+        //public static string SidesWay12_DriveMotor = "SidesWay12_DriveMotor";
+        ///// <summary>
+        /////  DO	0	横移电机3.4驱动 SidesWay34_DriveMotor	29	 	横移电机3.4驱动 Y06 DO-06
+        ///// </summary>
+        //public static string SidesWay34_DriveMotor = "SidesWay34_DriveMotor";
         
         
          
          
      
      
@@ -155,78 +155,78 @@ namespace OnlineStore.LoadCSVLibrary
         ///  DO	0	阻挡气缸0-2下降SOL StopCylinder_Down2	17			阻挡气缸0-2下降SOL Y12 DO-12
         ///  DO	0	阻挡气缸0-2下降SOL StopCylinder_Down2	17			阻挡气缸0-2下降SOL Y12 DO-12
         /// </summary>
         /// </summary>
         public static string StopCylinder_Down2 = "StopCylinder_Down2";
         public static string StopCylinder_Down2 = "StopCylinder_Down2";
-        /// <summary>
-        ///   DO	0	横移轨道1阻挡下降SOL SidesWay1_StopCylinderDown	     DO-13
-        /// </summary>
-        public static string SidesWay1_StopCylinderDown = "SidesWay1_StopCylinderDown";
-        /// <summary>
-        ///   DO	0	上料工位顶升气缸上升SOL InStore_TopCylinder_Up	     DO-16
-        /// </summary>
-        public static string InStore_TopCylinder_Up = "InStore_TopCylinder_Up";
-        /// <summary>
-        ///   DO	0	上料工位顶升气缸下降SOL InStore_TopCylinder_Down	     DO-17
-        /// </summary>
-        public static string InStore_TopCylinder_Down = "InStore_TopCylinder_Down";
-        /// <summary>
-        ///   DO	0	横移轨道3阻挡下降SOL SidesWay3_StopCylinderDown	     DO-33
-        /// </summary>
-        public static string SidesWay3_StopCylinderDown = "SidesWay3_StopCylinderDown";
-        /// <summary>
-        ///   DO	0	横移轨道3.4顶升气缸上升SOL SidesWay34_TopCylinder_Up	     DO-44
-        /// </summary>
-        public static string SidesWay34_TopCylinder_Up = "SidesWay34_TopCylinder_Up";
+        ///// <summary>
+        /////   DO	0	横移轨道1阻挡下降SOL SidesWay1_StopCylinderDown	     DO-13
+        ///// </summary>
+        //public static string SidesWay1_StopCylinderDown = "SidesWay1_StopCylinderDown";
+        ///// <summary>
+        /////   DO	0	上料工位顶升气缸上升SOL InStore_TopCylinder_Up	     DO-16
+        ///// </summary>
+        //public static string InStore_TopCylinder_Up = "InStore_TopCylinder_Up";
+        ///// <summary>
+        /////   DO	0	上料工位顶升气缸下降SOL InStore_TopCylinder_Down	     DO-17
+        ///// </summary>
+        //public static string InStore_TopCylinder_Down = "InStore_TopCylinder_Down";
+        ///// <summary>
+        /////   DO	0	横移轨道3阻挡下降SOL SidesWay3_StopCylinderDown	     DO-33
+        ///// </summary>
+        //public static string SidesWay3_StopCylinderDown = "SidesWay3_StopCylinderDown";
+        ///// <summary>
+        /////   DO	0	横移轨道3.4顶升气缸上升SOL SidesWay34_TopCylinder_Up	     DO-44
+        ///// </summary>
+        //public static string SidesWay34_TopCylinder_Up = "SidesWay34_TopCylinder_Up";
         
         
         
         
-        /// <summary>
-        ///  DO	0	横移轨道3.4顶升气缸下降SOL SidesWay34_TopCylinder_Down	     DO-45
-        /// </summary>
-        public static string SidesWay34_TopCylinder_Down = "SidesWay34_TopCylinder_Down";
-        /// <summary>
-        ///   DI	0	横移轨道3阻挡夹具检测 SidesWay3_StopFixtureCheck	     DI-84
-        /// </summary>
-        public static string SidesWay3_StopFixtureCheck = "SidesWay3_StopFixtureCheck";
-        /// <summary>
-        ///  DI	0	横移轨道3夹具检测 SidesWay3_FixtureCheck	     DI-85
-        /// </summary>
-        public static string SidesWay3_FixtureCheck = "SidesWay3_FixtureCheck";
-        /// <summary>
-        ///   DI	0	横移轨道3顶升气缸上升端 SidesWay3_TopCylinder_Up	     DI-86
-        /// </summary>
-        public static string SidesWay3_TopCylinder_Up = "SidesWay3_TopCylinder_Up";
-        /// <summary>
-        ///    DI	0	横移轨道3顶升气缸下降端 SidesWay3_TopCylinder_Down	     DI-87
-        /// </summary>
-        public static string SidesWay3_TopCylinder_Down = "SidesWay3_TopCylinder_Down";
-        /// <summary>
-        ///  DI	0	横移轨道4夹具检测 SidesWay4_FixtureCheck	     DI-88
-        /// </summary>
-        public static string SidesWay4_FixtureCheck = "SidesWay4_FixtureCheck";
-        /// <summary>
-        ///    DI	0	横移轨道4顶升气缸上升端 SidesWay4_TopCylinder_Up	    DI-89
-        /// </summary>
-        public static string SidesWay4_TopCylinder_Up = "SidesWay4_TopCylinder_Up";
+        ///// <summary>
+        /////  DO	0	横移轨道3.4顶升气缸下降SOL SidesWay34_TopCylinder_Down	     DO-45
+        ///// </summary>
+        //public static string SidesWay34_TopCylinder_Down = "SidesWay34_TopCylinder_Down";
+        ///// <summary>
+        /////   DI	0	横移轨道3阻挡夹具检测 SidesWay3_StopFixtureCheck	     DI-84
+        ///// </summary>
+        //public static string SidesWay3_StopFixtureCheck = "SidesWay3_StopFixtureCheck";
+        ///// <summary>
+        /////  DI	0	横移轨道3夹具检测 SidesWay3_FixtureCheck	     DI-85
+        ///// </summary>
+        //public static string SidesWay3_FixtureCheck = "SidesWay3_FixtureCheck";
+        ///// <summary>
+        /////   DI	0	横移轨道3顶升气缸上升端 SidesWay3_TopCylinder_Up	     DI-86
+        ///// </summary>
+        //public static string SidesWay3_TopCylinder_Up = "SidesWay3_TopCylinder_Up";
+        ///// <summary>
+        /////    DI	0	横移轨道3顶升气缸下降端 SidesWay3_TopCylinder_Down	     DI-87
+        ///// </summary>
+        //public static string SidesWay3_TopCylinder_Down = "SidesWay3_TopCylinder_Down";
+        ///// <summary>
+        /////  DI	0	横移轨道4夹具检测 SidesWay4_FixtureCheck	     DI-88
+        ///// </summary>
+        //public static string SidesWay4_FixtureCheck = "SidesWay4_FixtureCheck";
+        ///// <summary>
+        /////    DI	0	横移轨道4顶升气缸上升端 SidesWay4_TopCylinder_Up	    DI-89
+        ///// </summary>
+        //public static string SidesWay4_TopCylinder_Up = "SidesWay4_TopCylinder_Up";
 
 
         
         
-        /// <summary>
-        ///   DI	0	横移轨道4顶升气缸下降端 SidesWay4_TopCylinder_Down	    DI-90
-        /// </summary>
-        public static string SidesWay4_TopCylinder_Down = "SidesWay4_TopCylinder_Down";
-        /// <summary>
-        ///    DI	0	出料工位夹具检测 OutStore_FixtureCheck	      DI-102
-        /// </summary>
-        public static string OutStore_FixtureCheck = "OutStore_FixtureCheck";
-        /// <summary>
-        ///   DI	0	出料工位料盘检测 OutStore_TrayCheck	    DI-103
-        /// </summary>
-        public static string OutStore_TrayCheck = "OutStore_TrayCheck";
-        /// <summary>
-        ///    DO	0	横移轨道1.2顶升气缸上升SOL SidesWay12_TopCylinder_Up	     DO-67
-        /// </summary>
-        public static string SidesWay12_TopCylinder_Up = "SidesWay12_TopCylinder_Up";
-        /// <summary>
-        ///   DO	0	横移轨道1.2顶升气缸下降SOL SidesWay12_TopCylinder_Down	     DO-68
-        /// </summary>
-        public static string SidesWay12_TopCylinder_Down = "SidesWay12_TopCylinder_Down";
+        ///// <summary>
+        /////   DI	0	横移轨道4顶升气缸下降端 SidesWay4_TopCylinder_Down	    DI-90
+        ///// </summary>
+        //public static string SidesWay4_TopCylinder_Down = "SidesWay4_TopCylinder_Down";
+        ///// <summary>
+        /////    DI	0	出料工位夹具检测 OutStore_FixtureCheck	      DI-102
+        ///// </summary>
+        //public static string OutStore_FixtureCheck = "OutStore_FixtureCheck";
+        ///// <summary>
+        /////   DI	0	出料工位料盘检测 OutStore_TrayCheck	    DI-103
+        ///// </summary>
+        //public static string OutStore_TrayCheck = "OutStore_TrayCheck";
+        ///// <summary>
+        /////    DO	0	横移轨道1.2顶升气缸上升SOL SidesWay12_TopCylinder_Up	     DO-67
+        ///// </summary>
+        //public static string SidesWay12_TopCylinder_Up = "SidesWay12_TopCylinder_Up";
+        ///// <summary>
+        /////   DO	0	横移轨道1.2顶升气缸下降SOL SidesWay12_TopCylinder_Down	     DO-68
+        ///// </summary>
+        //public static string SidesWay12_TopCylinder_Down = "SidesWay12_TopCylinder_Down";
 
 
          
          
         /// <summary>
         /// <summary>
@@ -308,22 +308,35 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         /// </summary>
         public static string Alarm_Buzzer = "Alarm_Buzzer";
         public static string Alarm_Buzzer = "Alarm_Buzzer";
         /// <summary>
         /// <summary>
-        ///  DO   驱动电机1正转,DriveMotor_1, Y005
+        ///  DO   驱动电机1正转,DriveMotor_Run1, Y005
         /// </summary>
         /// </summary>
-        public static string DriveMotor_1 = "DriveMotor_1";
+        public static string DriveMotor_Run1 = "DriveMotor_Run1";
         /// <summary>
         /// <summary>
-        ///  DO   驱动电机2正转,DriveMotor_2, ,Y006
+        ///  DO   驱动电机2正转,DriveMotor_Run2, ,Y006
         /// </summary>
         /// </summary>
-        public static string DriveMotor_2 = "DriveMotor_2";
+        public static string DriveMotor_Run2 = "DriveMotor_Run2";
         /// <summary>
         /// <summary>
-        ///  DO   驱动电机3正转,DriveMotor_3, Y007
+        ///  DO   驱动电机3正转,DriveMotor_Run3, Y007
         /// </summary>
         /// </summary>
-        public static string DriveMotor_3 = "DriveMotor_3";
+        public static string DriveMotor_Run3 = "DriveMotor_Run3";
         /// <summary>
         /// <summary>
-        ///  DO   驱动电机4正转,DriveMotor_4, Y008
+        ///  DO   驱动电机4正转,DriveMotor_Run4, Y008
         /// </summary>
         /// </summary>
-        public static string DriveMotor_4 = "DriveMotor_4";
+        public static string DriveMotor_Run4 = "DriveMotor_Run4";
+
+        ///// <summary>
+        ///// DO	0	环形线横移4电机运转	DriveMotorRun   Y009 
+        ///// </summary>
+        //public static string SW4_DriveMotor = "SW_DriveMotor";
 
 
+        ///// <summary>
+        /////     DI/DO 	环形线横移4定位上升端 SW_TopCylinder_UP	    X007
+        ///// </summary>
+        //public static string SW4_TopCylinder_UP = "SW4_TopCylinder_UP";
+        ///// <summary>
+        /////   DI/DO	环形线横移4定位下降端 SW_TopCylinder_Down	    X008
+        ///// </summary>
+        //public static string SW4_TopCylinder_Down = "SW4_TopCylinder_Down";
         #endregion
         #endregion
 
 
 
 
@@ -527,30 +540,7 @@ namespace OnlineStore.LoadCSVLibrary
         ///   DI	/DO SL1上料气缸夹紧端 SL_FeedCylinder_Tighten X129
         ///   DI	/DO SL1上料气缸夹紧端 SL_FeedCylinder_Tighten X129
         /// </summary>
         /// </summary>
         public static string SL_FeedCylinder_Tighten = "SL_FeedCylinder_Tighten";
         public static string SL_FeedCylinder_Tighten = "SL_FeedCylinder_Tighten";
-        /// <summary>
-        ///   DI 环形线横移1托盘检测 Toroid_SideWay_TrayCheck X130
-        /// </summary>
-        public static string Toroid_SideWay_TrayCheck = "Toroid_SideWay_TrayCheck";
-        /// <summary>
-        ///   DI 环形线横移1料盘检测1 Toroid_SideWay_ReelCheck X131
-        /// </summary>
-        public static string Toroid_SideWay_ReelCheck = "Toroid_SideWay_ReelCheck";
-        /// <summary>
-        ///   DI	/DO 环形线横移1顶升上升端 Toroid_TopCylinder_Up X132
-        /// </summary>
-        public static string Toroid_TopCylinder_Up = "Toroid_TopCylinder_Up";
-        /// <summary>
-        ///   DI	/DO 环形线横移1顶升下降端 Toroid_TopCylinder_Down X133
-        /// </summary>
-        public static string Toroid_TopCylinder_Down = "Toroid_TopCylinder_Down";
-        /// <summary>
-        ///   DI	/DO 环形线横移1定位上升端 Toroid_LocationCylinder_Up X134
-        /// </summary>
-        public static string Toroid_LocationCylinder_Up = "Toroid_LocationCylinder_Up";
-        /// <summary>
-        ///   DI	/DO 环形线横移1定位下降端 Toroid_LocationCylinder_Down X135
-        /// </summary>
-        public static string Toroid_LocationCylinder_Down = "Toroid_LocationCylinder_Down";
+      
         /// <summary>
         /// <summary>
         ///   DI SL1线体出口横移检测 SL_SideWay_OutCheck X136
         ///   DI SL1线体出口横移检测 SL_SideWay_OutCheck X136
         /// </summary>
         /// </summary>
@@ -573,10 +563,7 @@ namespace OnlineStore.LoadCSVLibrary
         ///   DO		SL1线体出口横移电机运转 SL_OutSideWay_Run                   Y104
         ///   DO		SL1线体出口横移电机运转 SL_OutSideWay_Run                   Y104
         /// </summary>
         /// </summary>
         public static string SL_OutSideWay_Run = "SL_OutSideWay_Run";
         public static string SL_OutSideWay_Run = "SL_OutSideWay_Run";
-        /// <summary>
-        ///   DO		环形线横移1电机运转 Toroid_Motor_Run          Y105
-        /// </summary>
-        public static string Toroid_Motor_Run = "Toroid_Motor_Run";
+     
         /// <summary>
         /// <summary>
         ///     DO		SL1进料阻挡下降SOL SL_Entry_StopDown                   Y106
         ///     DO		SL1进料阻挡下降SOL SL_Entry_StopDown                   Y106
         /// </summary>
         /// </summary>
@@ -648,9 +635,158 @@ namespace OnlineStore.LoadCSVLibrary
         ///     DO	 	FL1阻挡2下降SOL FL_Stop2Down                        Y166
         ///     DO	 	FL1阻挡2下降SOL FL_Stop2Down                        Y166
         /// </summary>
         /// </summary>
         public static string FL_Stop2Down = "FL_Stop2Down";
         public static string FL_Stop2Down = "FL_Stop2Down";
-      
+
         #endregion
         #endregion
 
 
+        #region 环行线横移
+
+        /// <summary>
+        ///   DI 环形线横移1托盘检测 SW_TrayCheck X130
+        /// </summary>
+        public static string SW_TrayCheck = "SW_TrayCheck";
+        /// <summary>
+        ///   DI 环形线横移1料盘检测1 SW_ReelCheck X131
+        /// </summary>
+        public static string SW_ReelCheck = "SW_ReelCheck";
+        /// <summary>
+        ///   DI	/DO 环形线横移1顶升上升端 SW_TopCylinder_Up X132
+        /// </summary>
+        public static string SW_TopCylinder_Up = "SW_TopCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移1顶升下降端 SW_TopCylinder_Down X133
+        /// </summary>
+        public static string SW_TopCylinder_Down = "SW_TopCylinder_Down";
+        /// <summary>
+        ///   DI	/DO 环形线横移1定位上升端 SW_LocationCylinder_Up X134
+        /// </summary>
+        public static string SW_LocationCylinder_Up = "SW_LocationCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移1定位下降端 SW_LocationCylinder_Down X135
+        /// </summary>
+        public static string SW_LocationCylinder_Down = "SW_LocationCylinder_Down";
+        /// <summary>
+        ///   DO		环形线横移1电机运转 SW_MotorRun          Y105
+        /// </summary>
+        public static string SW_MotorRun = "SW_MotorRun";
+
+        /// <summary>
+        ///   DI 环形线横移1托盘检测 SW1_TrayCheck X130
+        /// </summary>
+        public static string SW1_TrayCheck = "SW1_TrayCheck";
+        /// <summary>
+        ///   DI 环形线横移1料盘检测1 SW1_ReelCheck X131
+        /// </summary>
+        public static string SW1_ReelCheck = "SW1_ReelCheck";
+        /// <summary>
+        ///   DI	/DO 环形线横移1顶升上升端 SW1_TopCylinder_Up X132
+        /// </summary>
+        public static string SW1_TopCylinder_Up = "SW1_TopCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移1顶升下降端 SW1_TopCylinder_Down X133
+        /// </summary>
+        public static string SW1_TopCylinder_Down = "SW1_TopCylinder_Down";
+        /// <summary>
+        ///   DI	/DO 环形线横移1定位上升端 SW1_LocationCylinder_Up X134
+        /// </summary>
+        public static string SW1_LocationCylinder_Up = "SW1_LocationCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移1定位下降端 SW1_LocationCylinder_Down X135
+        /// </summary>
+        public static string SW1_LocationCylinder_Down = "SW1_LocationCylinder_Down";
+        /// <summary>
+        ///   DO		环形线横移1电机运转 SW1_MotorRun          Y105
+        /// </summary>
+        public static string SW1_MotorRun = "SW1_MotorRun";
+
+        /// <summary>
+        ///   DI 环形线横移2托盘检测 SW2_TrayCheck X210
+        /// </summary>
+        public static string SW2_TrayCheck = "SW2_TrayCheck";
+        /// <summary>
+        ///   DI 环形线横移2料盘检测1 SW2_ReelCheck X211
+        /// </summary>
+        public static string SW2_ReelCheck = "SW2_ReelCheck";
+        /// <summary>
+        ///   DI	/DO 环形线横移2顶升上升端 SW2_TopCylinder_Up  X212 
+        /// </summary>
+        public static string SW2_TopCylinder_Up = "SW2_TopCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移2顶升下降端 SW2_TopCylinder_Down X213
+        /// </summary>
+        public static string SW2_TopCylinder_Down = "SW2_TopCylinder_Down";
+        /// <summary>
+        ///   DI	/DO 环形线横移2定位上升端 SW2_LocationCylinder_Up X214
+        /// </summary>
+        public static string SW2_LocationCylinder_Up = "SW2_LocationCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移2定位下降端 SW2_LocationCylinder_Down X215
+        /// </summary>
+        public static string SW2_LocationCylinder_Down = "SW2_LocationCylinder_Down";
+        /// <summary>
+        ///   DO		环形线横移2电机运转 SW2_MotorRun          Y185
+        /// </summary>
+        public static string SW2_MotorRun = "SW2_MotorRun";
+         
+
+        /// <summary>
+        ///   DI 环形线横移3托盘检测 SW3_TrayCheck X250
+        /// </summary>
+        public static string SW3_TrayCheck = "SW3_TrayCheck";
+        /// <summary>
+        ///   DI 环形线横移3料盘检测1 SW3_ReelCheck X251
+        /// </summary>
+        public static string SW3_ReelCheck = "SW3_ReelCheck";
+        /// <summary>
+        ///   DI	/DO 环形线横移3顶升上升端 SW3_TopCylinder_Up X252
+        /// </summary>
+        public static string SW3_TopCylinder_Up = "SW3_TopCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移3顶升下降端 SW3_TopCylinder_Down X253
+        /// </summary>
+        public static string SW3_TopCylinder_Down = "SW3_TopCylinder_Down";
+        /// <summary>
+        ///   DI	/DO 环形线横移3定位上升端 SW3_LocationCylinder_Up X254
+        /// </summary>
+        public static string SW3_LocationCylinder_Up = "SW3_LocationCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移3定位下降端 SW3_LocationCylinder_Down X255
+        /// </summary>
+        public static string SW3_LocationCylinder_Down = "SW3_LocationCylinder_Down";
+        /// <summary>
+        ///   DO		环形线横移3电机运转 SW3_MotorRun          Y225
+        /// </summary>
+        public static string SW3_MotorRun = "SW3_MotorRun";
+
+        /// <summary>
+        ///   DI 环形线横移4托盘检测 SW4_TrayCheck X556
+        /// </summary>
+        public static string SW4_TrayCheck = "SW4_TrayCheck";
+        /// <summary>
+        ///   DI 环形线横移4料盘检测1 SW4_ReelCheck X557
+        /// </summary>
+        public static string SW4_ReelCheck = "SW4_ReelCheck";
+        /// <summary>
+        ///   DI	/DO 环形线横移4顶升上升端 SW4_TopCylinder_Up X558
+        /// </summary>
+        public static string SW4_TopCylinder_Up = "SW4_TopCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移4顶升下降端 SW4_TopCylinder_Down X559
+        /// </summary>
+        public static string SW4_TopCylinder_Down = "SW4_TopCylinder_Down";
+        /// <summary>
+        ///   DI	/DO 环形线横移4定位上升端 SW4_LocationCylinder_Up X007
+        /// </summary>
+        public static string SW4_LocationCylinder_Up = "SW4_LocationCylinder_Up";
+        /// <summary>
+        ///   DI	/DO 环形线横移4定位下降端 SW4_LocationCylinder_Down X008
+        /// </summary>
+        public static string SW4_LocationCylinder_Down = "SW4_LocationCylinder_Down";
+        /// <summary>
+        ///   DO		环形线横移4电机运转 SW4_MotorRun          Y009
+        /// </summary>
+        public static string SW4_MotorRun = "SW4_MotorRun";
+
+        #endregion
 
 
     }
     }
     public enum IO_VALUE
     public enum IO_VALUE

source/LoadCVSLibrary/storeConfig/config/Line_Config.cs

@@ -225,11 +225,11 @@ namespace OnlineStore.LoadCSVLibrary
             MustHaveDOList.Add(IO_Type.RunSign_HddLed);
             MustHaveDOList.Add(IO_Type.RunSign_HddLed);
             MustHaveDOList.Add(IO_Type.Alarm_HddLed);
             MustHaveDOList.Add(IO_Type.Alarm_HddLed);
             MustHaveDOList.Add(IO_Type.Alarm_Buzzer);
             MustHaveDOList.Add(IO_Type.Alarm_Buzzer);
-            MustHaveDOList.Add(IO_Type.DriveMotor_1);
-            MustHaveDOList.Add(IO_Type.DriveMotor_2);
-            MustHaveDOList.Add(IO_Type.DriveMotor_3);
-            MustHaveDOList.Add(IO_Type.DriveMotor_4);
-            MustHaveDOList.Add(IO_Type.DriveMotor_Run);
+            MustHaveDOList.Add(IO_Type.DriveMotor_Run1);
+            MustHaveDOList.Add(IO_Type.DriveMotor_Run2);
+            MustHaveDOList.Add(IO_Type.DriveMotor_Run3);
+            MustHaveDOList.Add(IO_Type.DriveMotor_Run4);
+            MustHaveDOList.Add(IO_Type.SW4_MotorRun);
             MustHaveDOList.Add(IO_Type.NGCylinder_Before);
             MustHaveDOList.Add(IO_Type.NGCylinder_Before);
             MustHaveDOList.Add(IO_Type.NGCylinder_After);
             MustHaveDOList.Add(IO_Type.NGCylinder_After);
             MustHaveDOList.Add(IO_Type.TopCylinder_UP);
             MustHaveDOList.Add(IO_Type.TopCylinder_UP);

source/LoadCVSLibrary/storeConfig/config/ProvidingEquip_Config.cs

@@ -26,7 +26,12 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         /// </summary>
         [ConfigProAttribute("IsDebug")]
         [ConfigProAttribute("IsDebug")]
         public int IsDebug { get; set; }
         public int IsDebug { get; set; }
- 
-        
+
+        /// <summary>
+        ///  PRO,0,对应的横移模块,SidesWayNum,3,,,,,
+        /// </summary>
+        [ConfigProAttribute("SidesWayNum", false)]
+        public int SidesWayNum { get; set; }
+
     }
     }
 }
 }

source/LoadCVSLibrary/storeConfig/config/StoreConfig.cs

@@ -78,7 +78,7 @@ namespace OnlineStore.LoadCSVLibrary
             this.DType = type;
             this.DType = type;
             this.ConfigFilePath = filepath;
             this.ConfigFilePath = filepath;
         }
         }
-
+        private int LineSubType = 1000;
         public virtual void LoadConfig(List<ConfigBase> configList)
         public virtual void LoadConfig(List<ConfigBase> configList)
         {
         {
             DIList = new Dictionary<string, ConfigIO>();
             DIList = new Dictionary<string, ConfigIO>();
@@ -131,6 +131,18 @@ namespace OnlineStore.LoadCSVLibrary
                         }
                         }
                         if (io.SubType > 0)
                         if (io.SubType > 0)
                         {
                         {
+                            if (io.SubType.Equals(LineSubType))
+                            {
+                                string newType = io.ProName.Replace("SW1_", "SW_").Replace("SW2_", "SW_").Replace("SW3_", "SW_").Replace("SW4_", "SW_");
+                                if (DIList.ContainsKey(newType))
+                                {
+                                    LOGGER.Error("配置DI：[" + io.ToString() + "] ProName重复 ");
+                                }
+                                else
+                                {
+                                    this.DIList.Add(newType, io);
+                                }
+                            }
                             if (!SubDIList.ContainsKey(io.SubType))
                             if (!SubDIList.ContainsKey(io.SubType))
                             {
                             {
                                 SubDIList.Add(io.SubType, new Dictionary<string, ConfigIO>());
                                 SubDIList.Add(io.SubType, new Dictionary<string, ConfigIO>());
@@ -171,6 +183,18 @@ namespace OnlineStore.LoadCSVLibrary
                         }
                         }
                         if (io.SubType > 0)
                         if (io.SubType > 0)
                         {
                         {
+                            if (io.SubType.Equals(LineSubType))
+                            {
+                                string newType = io.ProName.Replace("SW1_", "SW_").Replace("SW2_", "SW_").Replace("SW3_", "SW_").Replace("SW4_", "SW_");
+                                if (DOList.ContainsKey(newType))
+                                {
+                                    LOGGER.Error("配置DO：[" + io.ToString() + "] ProName重复 ");
+                                }
+                                else
+                                {
+                                    this.DOList.Add(newType, io);
+                                }
+                            }
                             if (!SubDOList.ContainsKey(io.SubType))
                             if (!SubDOList.ContainsKey(io.SubType))
                             {
                             {
                                 SubDOList.Add(io.SubType, new Dictionary<string, ConfigIO>());
                                 SubDOList.Add(io.SubType, new Dictionary<string, ConfigIO>());