bug修改

source/VerticalStoreClinet/FrmStoreBox.Designer.cs

@@ -725,9 +725,9 @@
             this.btnMP1.Location = new System.Drawing.Point(18, 126);
             this.btnMP1.Name = "btnMP1";
             this.btnMP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.btnMP1.Size = new System.Drawing.Size(113, 33);
+            this.btnMP1.Size = new System.Drawing.Size(114, 33);
             this.btnMP1.TabIndex = 193;
-            this.btnMP1.Text = "旋转轴待机点P1:";
+            this.btnMP1.Text = "旋转轴-待机点P1:";
             this.btnMP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnMP1.UseVisualStyleBackColor = false;
             this.btnMP1.Click += new System.EventHandler(this.btnMiddleP1_Click);
@@ -743,9 +743,9 @@
             this.btnMiddleP2.Location = new System.Drawing.Point(18, 164);
             this.btnMiddleP2.Name = "btnMiddleP2";
             this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.btnMiddleP2.Size = new System.Drawing.Size(113, 33);
+            this.btnMiddleP2.Size = new System.Drawing.Size(114, 33);
             this.btnMiddleP2.TabIndex = 191;
-            this.btnMiddleP2.Text = "旋转轴库位点P2:";
+            this.btnMiddleP2.Text = "旋转轴-库位点P2:";
             this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnMiddleP2.UseVisualStyleBackColor = false;
             this.btnMiddleP2.Click += new System.EventHandler(this.btnMiddleP2_Click);

source/VerticalStoreClinet/VerticalStoreClient.csproj

@@ -116,12 +116,6 @@
       <DependentUpon>FrmStoreBox.cs</DependentUpon>
     </Compile>
     <Compile Include="ManagerUtil.cs" />
-    <Compile Include="positionTool\FrmPositionTool.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="positionTool\FrmPositionTool.Designer.cs">
-      <DependentUpon>FrmPositionTool.cs</DependentUpon>
-    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="useControl\AxisMoveControl.cs">
@@ -151,9 +145,6 @@
     <EmbeddedResource Include="FrmStoreBox.resx">
       <DependentUpon>FrmStoreBox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="positionTool\FrmPositionTool.resx">
-      <DependentUpon>FrmPositionTool.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

source/VerticalStoreClinet/useControl/AxisMoveControl.Designer.cs

@@ -120,8 +120,7 @@
             this.groupAxis.Size = new System.Drawing.Size(541, 383);
             this.groupAxis.TabIndex = 217;
             this.groupAxis.TabStop = false;
-            this.groupAxis.Text = "伺服运动";
-            this.groupAxis.Enter += new System.EventHandler(this.groupAxis_Enter);
+            this.groupAxis.Text = "伺服运动"; 
             // 
             // linkLabel1
             // 

source/VerticalStoreClinet/useControl/AxisMoveControl.cs

@@ -156,16 +156,12 @@ namespace OnlineStore.ACPackingStore
             this.txtHomeSingle.Text = ACServerManager.GetHomeSingle(PortName, SlvAddr).ToString();
             this.txtLimit1.Text = ACServerManager.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
             this.txtLimit2.Text = ACServerManager.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
-        }
 
-        private void btnReadPosition_Click(object sender, EventArgs e)
-        {
-            ReadPosistion();
+            UpdatePosition();
         }
 
-        private void ReadPosistion()
+        private void btnReadPosition_Click(object sender, EventArgs e)
         {
-           
             //判断私服是否打开、
             if (ACServerManager.ServerOnStatus(PortName, SlvAddr))
             {
@@ -175,29 +171,9 @@ namespace OnlineStore.ACPackingStore
             {
                 txtServoStatue.Text = "✘";
             }
-         //  ReadA(BoxBean.Config.Middle_Axis, lblActual1, lblTargetP1, txtMiddleTarget, axis_1_Alarm);
-          //  ReadA(BoxBean.Config.UpDown_Axis, lblActual2, lblTargetP2, txtUpdownTarget, axis_2_Alarm);
-          //  ReadA(BoxBean.Config.InOut_Axis, lblActual3, lblTargetP3, txtInoutTarget, axis_3_Alarm);
-           //ReadA(BoxBean.Config.Comp_Axis, lblActual4, lblTargetP4, txt4Target, axis_4_Alarm);
 
-        }
-        private void ReadA(ConfigMoveAxis axis, TextBox lblActual, TextBox lblTarget, TextBox lblT, IOStatusControl sta)
-        {
-     
-            if (ACServerManager.ServerOnStatus(axis.DeviceName, axis.GetAxisValue()))
-            {
-                sta.IOValue = ACServerManager.GetAlarmStatus(axis.DeviceName, axis.GetAxisValue());
-                int tP = ACServerManager.GetTargetPosition(axis.DeviceName, axis.GetAxisValue());
-                lblTarget.Text = string.Format("{0:d}", tP);
-                int aP = ACServerManager.GetActualtPosition(axis.DeviceName, axis.GetAxisValue());
-                lblActual.Text = string.Format("{0:d}", aP);
-                lblT.Text = axis.TargetPosition.ToString();
-                if (axis.IsSameAxis(PortName, SlvAddr))
-                {
-                    txtP.Text = lblActual.Text;
-                }
-            }
-        }
+            UpdatePosition();
+        } 
         private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (comboBox1.SelectedIndex >= 0)
@@ -233,13 +209,7 @@ namespace OnlineStore.ACPackingStore
         {
             moveAxis.TargetPosition = targetPosition;
             ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
-        }
-
-        private void groupAxis_Enter(object sender, EventArgs e)
-        {
-
-        }
-
+        } 
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
             Clipboard.SetDataObject(txtP.Text, true);