bug修改

source/AssemblyLineClient/FrmFeedingEquip.Designer.cs

@@ -706,7 +706,7 @@
             this.SL_ClampCylinder_Relax.TabIndex = 249;
             this.SL_ClampCylinder_Relax.Text = "夹料气缸放松";
             this.SL_ClampCylinder_Relax.UseVisualStyleBackColor = false;
-            this.SL_ClampCylinder_Relax.Click += new System.EventHandler(this.btnFeedCylinder_Click);
+            this.SL_ClampCylinder_Relax.Click += new System.EventHandler(this.SL_ClampCylinder_Relax_Click);
             // 
             // lblThisSta
             // 
@@ -1153,7 +1153,7 @@
             // 
             this.axisMoveControl1.Location = new System.Drawing.Point(6, 4);
             this.axisMoveControl1.Name = "axisMoveControl1";
-            this.axisMoveControl1.Size = new System.Drawing.Size(575, 437);
+            this.axisMoveControl1.Size = new System.Drawing.Size(575, 440);
             this.axisMoveControl1.TabIndex = 219;
             // 
             // groupBox2

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -728,10 +728,10 @@ namespace OnlineStore.AssemblyLine
             DoBtnClick(sender);
         }
 
-        private void btnFeedCylinder_Click(object sender, EventArgs e)
+        private void SL_ClampCylinder_Relax_Click(object sender, EventArgs e)
         {
             LogUtil.info(equipBase.Name + "界面点击：" + SL_ClampCylinder_Work.Text);
-            equipBean.CylinderMove(null, IO_Type.SL_ClampCylinder_Relax, IO_Type.SL_ClampCylinder_Work);
+            equipBean.CylinderMove(null, IO_Type.SL_ClampCylinder_Work, IO_Type.SL_ClampCylinder_Relax);
         }
 
         private void SL_TopCylinder_Down_Click(object sender, EventArgs e)
@@ -767,7 +767,7 @@ namespace OnlineStore.AssemblyLine
         private void SL_ClampCylinder_Work_Click(object sender, EventArgs e)
         {
             LogUtil.info(equipBase.Name + "界面点击：" + SL_ClampCylinder_Relax.Text);
-            equipBean.CylinderMove(null, IO_Type.SL_ClampCylinder_Work, IO_Type.SL_ClampCylinder_Relax);
+            equipBean.CylinderMove(null, IO_Type.SL_ClampCylinder_Relax, IO_Type.SL_ClampCylinder_Work);
         }
 
         private void SL_OutTopCylinder_Down_Click(object sender, EventArgs e)
@@ -787,7 +787,7 @@ namespace OnlineStore.AssemblyLine
                 }
             }
             LogUtil.info(equipBase.Name + "界面点击：" + SL_TrayLocation_After.Text);
-            equipBean.CylinderMove(null, IO_Type.SL_TrayLocation_After, IO_Type.SL_TrayLocation_After);
+            equipBean.CylinderMove(null, IO_Type.SL_TrayLocation_Before, IO_Type.SL_TrayLocation_After);
         }
 
         private void btnOutStore_Click(object sender, EventArgs e)

source/AssemblyLineClient/FrmHYEquip.Designer.cs

@@ -982,7 +982,7 @@
             this.axisMoveControl1.Location = new System.Drawing.Point(5, 3);
             this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.axisMoveControl1.Name = "axisMoveControl1";
-            this.axisMoveControl1.Size = new System.Drawing.Size(566, 420);
+            this.axisMoveControl1.Size = new System.Drawing.Size(566, 440);
             this.axisMoveControl1.TabIndex = 0;
             // 
             // FrmHYEquip

source/AssemblyLineClient/FrmLineStore.cs

@@ -72,8 +72,8 @@ namespace OnlineStore.AssemblyLine
                 return;
             }
 
-            FrmIOTest ioStatus = new FrmIOTest();
-            AddForm("  IO列表查看  ", ioStatus);
+            //FrmIOTest ioStatus = new FrmIOTest();
+            //AddForm("  IO列表查看  ", ioStatus);
             FrmLineIO frmIOStatus = new FrmLineIO();
             AddForm("  流水线IO  ", frmIOStatus);
 

source/AssemblyLineClient/FrmMoveEquip.Designer.cs

@@ -446,7 +446,7 @@
             this.ClampCylinder_Relax.TabIndex = 255;
             this.ClampCylinder_Relax.Text = "夹料气缸放松";
             this.ClampCylinder_Relax.UseVisualStyleBackColor = false;
-            this.ClampCylinder_Relax.Click += new System.EventHandler(this.btnClampSlack_Click);
+            this.ClampCylinder_Relax.Click += new System.EventHandler(this.ClampCylinder_Relax_Click);
             // 
             // BeforeAfterCylinder_Before
             // 
@@ -459,7 +459,7 @@
             this.BeforeAfterCylinder_Before.TabIndex = 249;
             this.BeforeAfterCylinder_Before.Text = "横移前进->>";
             this.BeforeAfterCylinder_Before.UseVisualStyleBackColor = false;
-            this.BeforeAfterCylinder_Before.Click += new System.EventHandler(this.btnBeforeAfterBefore_Click);
+            this.BeforeAfterCylinder_Before.Click += new System.EventHandler(this.BeforeAfterCylinder_Before_Click);
             // 
             // TopCylinder_Up
             // 
@@ -708,7 +708,7 @@
             // 
             this.axisMoveControl1.Location = new System.Drawing.Point(10, 7);
             this.axisMoveControl1.Name = "axisMoveControl1";
-            this.axisMoveControl1.Size = new System.Drawing.Size(567, 420);
+            this.axisMoveControl1.Size = new System.Drawing.Size(567, 440);
             this.axisMoveControl1.TabIndex = 219;
             // 
             // groupBox2

source/AssemblyLineClient/FrmMoveEquip.cs

@@ -593,7 +593,7 @@ namespace OnlineStore.AssemblyLine
             equipBean.CylinderMove(null, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
         }
 
-        private void btnBeforeAfterBefore_Click(object sender, EventArgs e)
+        private void BeforeAfterCylinder_Before_Click(object sender, EventArgs e)
         {
             if (equipBean.CanBeforeAfter())
             {
@@ -636,12 +636,12 @@ namespace OnlineStore.AssemblyLine
         {
 
             LogUtil.info(equipBase.Name + "界面点击：" + ClampCylinder_Relax.Text);
-            equipBase.CylinderMove(null, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
+            equipBase.CylinderMove(null, IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
         }
-        private void btnClampSlack_Click(object sender, EventArgs e)
+        private void ClampCylinder_Relax_Click(object sender, EventArgs e)
         {
             LogUtil.info(equipBase.Name + "界面点击：" + ClampCylinder_Work.Text);
-            equipBase.CylinderMove(null, IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
+            equipBase.CylinderMove(null, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
         }