1

source/ACSingleStore/FrmAxisDebug.cs

@@ -143,11 +143,11 @@ namespace OnlineStore.AutoInOutStore
         {
             if (this.btnInOutMove.BackColor .Equals(System.Drawing.SystemColors.Control))
             {
-                if (StoreManager.Store.InOutAxisCanMove().Equals(false))
-                {
-                    MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return;
-                }
+                //if (StoreManager.Store.InOutAxisCanMove().Equals(false))
+                //{
+                //    MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                //    return;
+                //}
                 int speed = FormUtil.GetIntValue(txtInOutSpeed);
                 if (speed <= 0)
                 {
@@ -230,11 +230,11 @@ namespace OnlineStore.AutoInOutStore
         {
             if (btnInOutMovej.BackColor.Equals(System.Drawing.SystemColors.Control))
             {
-                if (StoreManager.Store.InOutAxisCanMove().Equals(false))
-                {
-                    MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return;
-                }
+                //if (StoreManager.Store.InOutAxisCanMove().Equals(false))
+                //{
+                //    MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                //    return;
+                //}
                 int speed = FormUtil.GetIntValue(txtInOutSpeed);
                 if (speed <= 0)
                 {

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -371,7 +371,7 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.info(LOGGER, StoreName + "开始复位：先定位气缸下降");
                 // 复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
                 StoreMove.NextMoveStep(StoreMoveStep.BOX_H_LocationCylinderBack);
-                LocationDownAndWait();
+                //LocationDownAndWait();
             }
             AutomaticBaiting.StartReset();
             isInPro = false;

source/DeviceLibrary/store/AC_Store.cs

@@ -191,9 +191,9 @@ namespace OnlineStore.DeviceLibrary
                     case StoreStatus.InStoreExecute:
                         aa = ResourceControl.GetString(ResourceControl.InStoreExecute, "入库执行中");
                         break;
-                    case StoreStatus.InTrouble:
-                        aa = ResourceControl.GetString(ResourceControl.InTrouble, "故障中");
-                        break;
+                    //case StoreStatus.InTrouble:
+                    //    aa = ResourceControl.GetString(ResourceControl.InTrouble, "故障中");
+                    //    break;
                     case StoreStatus.OutStoreBoxEnd:
                         aa = ResourceControl.GetString(ResourceControl.OutStoreBoxEnd, "料盘出仓位完成");
                         break;

source/DeviceLibrary/store/StoreMoveStep.cs

@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 3=故障中
         /// </summary>
-        InTrouble = 3,
+        //InTrouble = 3,
         /// <summary>
         /// 4=警告
         /// </summary>

source/DeviceLibrary/store/model/StoreMoveInfo.cs

@@ -337,22 +337,22 @@ namespace OnlineStore.DeviceLibrary
             {
                 return ResourceControl.GetString(ResourceControl.WaitTime, "时间等待：") + "【" + TimeMSeconds + "】";
             }
-            else if (WaitType == (int)Wait_Type.StellMove_4)
-            {
-                return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
-            }
-            else if (WaitType == (int)Wait_Type.ShuoKe_5)
-            {
-                return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
-            }
+            //else if (WaitType == (int)Wait_Type.StellMove_4)
+            //{
+            //    return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
+            //}
+            //else if (WaitType == (int)Wait_Type.ShuoKe_5)
+            //{
+            //    return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
+            //}
             else if (WaitType == (int)Wait_Type.AxisHomeSingle_6)
             {
                 return "【" + AxisInfo.DisplayStr + "】ORG：【" + IoValue + "】 ";
             }
-            else if (WaitType == (int)Wait_Type.WaitHeight_7)
-            {
-                return ResourceControl.GetString(ResourceControl.trayHeight, "料盘高度") + "【" + HeightValue + "】  ";
-            }
+            //else if (WaitType == (int)Wait_Type.WaitHeight_7)
+            //{
+            //    return ResourceControl.GetString(ResourceControl.trayHeight, "料盘高度") + "【" + HeightValue + "】  ";
+            //}
             else if (WaitType == (int)Wait_Type.AxisLimitNegativeSingle_8)
             {
                 return "【" + AxisInfo.DisplayStr + "】" + ResourceControl.GetString(ResourceControl.FuLimit, "负限位") + "【" + IoValue + "】 ";

source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs

@@ -988,7 +988,7 @@ namespace OnlineStore.LoadCSVLibrary
             MustHaveDIList.Add(IO_Type.BatchDoor_Open);
             MustHaveDIList.Add(IO_Type.BatchDoor_Close);
             MustHaveDIList.Add(IO_Type.TrayCheck_Fixture); 
-            MustHaveDIList.Add(IO_Type.CompressAxis_Check);
+            //MustHaveDIList.Add(IO_Type.CompressAxis_Check);
             
 
             MustHaveDIList.Add(IO_Type.DoorClose_LoadMaterial);