测宽修改

source/Common/bean/Bean.cs

@@ -236,18 +236,18 @@ namespace OnlineStore.Common
         /// <summary>
         /// <summary>
         /// 升降轴
         /// 升降轴
         /// </summary>
         /// </summary>
-        public static string updownAxis = "device.updownAxis";
+        public static string updownAxis = "device_updownAxis";
         /// <summary>
         /// <summary>
         /// 旋转轴
         /// 旋转轴
         /// </summary>
         /// </summary>
-        public static string middleAxis = "device.middleAxis";
+        public static string middleAxis = "device_middleAxis";
         /// <summary>
         /// <summary>
         /// 进出轴
         /// 进出轴
         /// </summary>
         /// </summary>
-        public static string inoutAxis = "device.inoutAxis";
+        public static string inoutAxis = "device_inoutAxis";
         /// <summary>
         /// <summary>
         /// 批量上下料轴
         /// 批量上下料轴
         /// </summary>
         /// </summary>
-        public static string batchAxis = "device.batchAxis";
+        public static string batchAxis = "device_batchAxis";
     }
     }
 }
 }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -446,6 +446,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 int relValue = -2000;
                 int relValue = -2000;
                 LogUtil.debug("压紧轴相对位置：" + relValue);
                 LogUtil.debug("压紧轴相对位置：" + relValue);
+                MeteringSignal.StopCheck();
                 StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, relValue, false));
                 StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, relValue, false));
                 ShuoKeControls.RelativeMove(Config.CompressAxis_Slv, relValue);
                 ShuoKeControls.RelativeMove(Config.CompressAxis_Slv, relValue);
                 Thread.Sleep(100);
                 Thread.Sleep(100);
@@ -464,6 +465,10 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     MeteringSignal.StartCheck(targetPosition, ShuoKeControls.GetABSPosition(Config.CompressAxis_Slv));
                     MeteringSignal.StartCheck(targetPosition, ShuoKeControls.GetABSPosition(Config.CompressAxis_Slv));
                 }
                 }
+                else
+                {
+                    MeteringSignal.StopCheck();
+                }
                 StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, targetPosition, false));
                 StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, targetPosition, false));
                 ShuoKeControls.AbsMove(Config.CompressAxis_Slv, targetPosition);
                 ShuoKeControls.AbsMove(Config.CompressAxis_Slv, targetPosition);
                 Thread.Sleep(100);
                 Thread.Sleep(100);

source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs

@@ -342,7 +342,8 @@ namespace OnlineStore.DeviceLibrary
                     LastWidth = StoreManager.Config.Default_TrayWidth;
                     LastWidth = StoreManager.Config.Default_TrayWidth;
                     if (LastWidth.Equals(0))
                     if (LastWidth.Equals(0))
                     {
                     {
-                        if (KND.IOValue(IO_Type.WidthCheck1).Equals(IO_VALUE.HIGH) && KND.IOValue(IO_Type.WidthCheck2).Equals(IO_VALUE.HIGH))
+                        //料盘检测2亮为13寸盘，其他都认为是7寸盘
+                        if (KND.IOValue(IO_Type.WidthCheck2).Equals(IO_VALUE.HIGH))
                         {
                         {
                             LastWidth = 13;
                             LastWidth = 13;
                         }
                         }