1.界面调整。2.入库时先定位气缸下降。

source/ACSingleStore/FrmAxisDebug.Designer.cs

@@ -223,7 +223,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(737, 318);
+            this.ClientSize = new System.Drawing.Size(707, 318);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.txtInOutPosition);

source/ACSingleStore/FrmStoreBox.cs

@@ -1026,56 +1026,56 @@ namespace OnlineStore.ACSingleStore
         public List<WaitResultInfo> waitResultList = new List<WaitResultInfo>();
          
 
-        private void btnStart_Click(object sender, EventArgs e)
-        {
-            waitResultList = new List<WaitResultInfo>();
-            string deviceName = "";
-            short slvAddr = 0;
-            int position=0;
-            if (chb1.Checked)
-            {
-                position=FormUtil.GetIntValue(txtPosition1);
-                  deviceName = store.Config.Middle_Axis.DeviceName;
-                  slvAddr = store.Config.Middle_Axis.GetAxisValue();
-                if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
-                {
-                    ACServerManager.AbsMove(deviceName, slvAddr, position);
-                    waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.Middle_Axis,position,store.Config.Middle_Axis.TargetSpeed));
-                } 
-            }
-            if (chb2.Checked)
-            {
-                position = FormUtil.GetIntValue(txtPosition2);
-                deviceName = store.Config.UpDown_Axis.DeviceName;
-                slvAddr = store.Config.UpDown_Axis.GetAxisValue();
-                if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
-                {
-                    ACServerManager.AbsMove(deviceName, slvAddr, position);
-                    waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed));
-                } 
-            }
-            if (chb3.Checked)
-            {
-                position = FormUtil.GetIntValue(txtPosition3);
-                deviceName = store.Config.InOut_Axis.DeviceName;
-                slvAddr = store.Config.InOut_Axis.GetAxisValue();
-                if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
-                {
-                    ACServerManager.AbsMove(deviceName, slvAddr, position);
-                    waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed));
-                } 
-            }
-            if (waitResultList.Count > 0)
-            {
-                LOGGER.Info("运动开始");
-            //    MessageBox.Show("运动开始！");
-            }
-            else
-            {
-                MessageBox.Show("未选择运动轴或伺服未打开");
-            }
+        //private void btnStart_Click(object sender, EventArgs e)
+        //{
+        //    waitResultList = new List<WaitResultInfo>();
+        //    string deviceName = "";
+        //    short slvAddr = 0;
+        //    int position=0;
+        //    if (chb1.Checked)
+        //    {
+        //        position=FormUtil.GetIntValue(txtPosition1);
+        //          deviceName = store.Config.Middle_Axis.DeviceName;
+        //          slvAddr = store.Config.Middle_Axis.GetAxisValue();
+        //        if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
+        //        {
+        //            ACServerManager.AbsMove(deviceName, slvAddr, position);
+        //            waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.Middle_Axis,position,store.Config.Middle_Axis.TargetSpeed));
+        //        } 
+        //    }
+        //    if (chb2.Checked)
+        //    {
+        //        position = FormUtil.GetIntValue(txtPosition2);
+        //        deviceName = store.Config.UpDown_Axis.DeviceName;
+        //        slvAddr = store.Config.UpDown_Axis.GetAxisValue();
+        //        if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
+        //        {
+        //            ACServerManager.AbsMove(deviceName, slvAddr, position);
+        //            waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed));
+        //        } 
+        //    }
+        //    if (chb3.Checked)
+        //    {
+        //        position = FormUtil.GetIntValue(txtPosition3);
+        //        deviceName = store.Config.InOut_Axis.DeviceName;
+        //        slvAddr = store.Config.InOut_Axis.GetAxisValue();
+        //        if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
+        //        {
+        //            ACServerManager.AbsMove(deviceName, slvAddr, position);
+        //            waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed));
+        //        } 
+        //    }
+        //    if (waitResultList.Count > 0)
+        //    {
+        //        LOGGER.Info("运动开始");
+        //    //    MessageBox.Show("运动开始！");
+        //    }
+        //    else
+        //    {
+        //        MessageBox.Show("未选择运动轴或伺服未打开");
+        //    }
            
-        }
+        //}
 
         private int GetSlaveAddr()
         {

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -268,7 +268,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                         InStoreLog("入库：SI_01   定位气缸下降");
                         StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown);
-                        LocationUpAndWait();
+                        LocationDownAndWait();
 
                     }
                 }