T1增加启用点位编辑复选框

source/AssemblyLineClient/FrmFeedingEquip.Designer.cs

@@ -64,6 +64,7 @@
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.clampJawControl1 = new OnlineStore.AssemblyLine.useControl.ClampJawControl();
             this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.chbPointEdit = new System.Windows.Forms.CheckBox();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.lblTestMsg = new System.Windows.Forms.Label();
             this.btnTestStop = new System.Windows.Forms.Button();
@@ -634,6 +635,7 @@
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.Size = new System.Drawing.Size(993, 645);
             this.tabControl1.TabIndex = 257;
+            this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
             // 
             // tabPage3
             // 
@@ -771,6 +773,7 @@
             // 
             // tabPage2
             // 
+            this.tabPage2.Controls.Add(this.chbPointEdit);
             this.tabPage2.Controls.Add(this.groupBox5);
             this.tabPage2.Controls.Add(this.groupDetial);
             this.tabPage2.Controls.Add(this.groupBox9);
@@ -784,6 +787,18 @@
             this.tabPage2.Text = "     伺服信息     ";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
+            // chbPointEdit
+            // 
+            this.chbPointEdit.AutoSize = true;
+            this.chbPointEdit.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chbPointEdit.Location = new System.Drawing.Point(525, 529);
+            this.chbPointEdit.Name = "chbPointEdit";
+            this.chbPointEdit.Size = new System.Drawing.Size(112, 24);
+            this.chbPointEdit.TabIndex = 321;
+            this.chbPointEdit.Text = "启用点位编辑";
+            this.chbPointEdit.UseVisualStyleBackColor = true;
+            this.chbPointEdit.CheckedChanged += new System.EventHandler(this.chbPointEdit_CheckedChanged);
+            // 
             // groupBox5
             // 
             this.groupBox5.Controls.Add(this.lblTestMsg);
@@ -866,7 +881,7 @@
             this.groupDetial.Controls.Add(this.label1);
             this.groupDetial.Location = new System.Drawing.Point(498, 316);
             this.groupDetial.Name = "groupDetial";
-            this.groupDetial.Size = new System.Drawing.Size(478, 204);
+            this.groupDetial.Size = new System.Drawing.Size(478, 196);
             this.groupDetial.TabIndex = 319;
             this.groupDetial.TabStop = false;
             this.groupDetial.Text = "移栽位置P2详细配置";
@@ -1290,6 +1305,7 @@
             this.groupBox6.PerformLayout();
             this.tabPage1.ResumeLayout(false);
             this.tabPage2.ResumeLayout(false);
+            this.tabPage2.PerformLayout();
             this.groupBox5.ResumeLayout(false);
             this.groupBox5.PerformLayout();
             this.groupDetial.ResumeLayout(false);
@@ -1386,6 +1402,7 @@
         private System.Windows.Forms.Label lblP2List;
         private useControl.ClampJawControl clampJawControl1;
         private System.Windows.Forms.Button btnHlhasReel;
+        private System.Windows.Forms.CheckBox chbPointEdit;
     }
 }
 

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -270,6 +270,8 @@ namespace OnlineStore.AssemblyLine
             lblTargetP3.Text = "目标P3：" + equipBean.Config.BatchAxisP3 ;
             lblTestMsg.Text = "";
             TargetP3 = equipBean.Config.BatchAxisP3;
+
+            PointEdit(false );
             IsLoad = true;
         }
 
@@ -886,6 +888,29 @@ namespace OnlineStore.AssemblyLine
                 LogUtil.info(equipBean.Name + "界面点击：" + btnHlhasReel.Text + ",设置ClampEmptyMove=true ");
             }
         }
+        private void PointEdit(bool enable)
+        {
+            this.groupBox2.Enabled = enable;
+            this.groupBox9.Enabled = enable;
+            this.groupDetial.Enabled = enable;
+        }
+        private void chbPointEdit_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!IsLoad)
+            {
+                return;
+            }
+            PointEdit(chbPointEdit.Checked);
+        }
+
+        private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (!IsLoad)
+            {
+                return;
+            }
+            chbPointEdit.Checked = false;
+        }
     }
 
 }

source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip.csv

@@ -9,6 +9,6 @@ PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8000,,,,,,,,,,,,
 PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=9000,,,,,,,,,,,,
 PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000,,,,,,,,,,,,
 PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0,,,,,,,,,,,,
-PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,1200,,,,,,,,,,,,
-PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,900,,,,,,,,,,,,
-PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,900,,,,,,,,,,,,
+PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,1209,,,,,,,,,,,,
+PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,9009,,,,,,,,,,,,
+PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,9009,,,,,,,,,,,,

source/LoadCVSLibrary/storeConfig/config/MoveEquip_Config.cs

@@ -250,7 +250,7 @@ namespace OnlineStore.LoadCSVLibrary
                 this.UpdownAxis_P3Speed = config.UpdownAxis_P3Speed;
             }
         }
-
+        
 
         ///// <summary>s
         ///// PRO,0,移栽上下轴下降速度,UpdownAxis_DownSpeed,500,,,,,