bug修改

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -228,11 +228,13 @@ namespace OnlineStore.DeviceLibrary
             else
             else
             {
             {
                 if (suddenBtn.Equals(IO_VALUE.LOW))
                 if (suddenBtn.Equals(IO_VALUE.LOW))
-                { 
+                {
+                    SetWarnMsg(ResourceControl.startFail,"启动失败：急停未开");
                     LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：急停没开 ！启动失败！");
                     LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：急停没开 ！启动失败！");
                 }
                 }
                 else
                 else
                 {
                 {
+                    SetWarnMsg(ResourceControl.startFailAir,"启动失败：没有气压信号");
                     LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：没有气压信号 ！启动失败！");
                     LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：没有气压信号 ！启动失败！");
                 }
                 }
                 return false;
                 return false;
@@ -1127,7 +1129,8 @@ namespace OnlineStore.DeviceLibrary
                         IO_VALUE checkIO = IOManager.IOValue(IO_Type.TrayCheck_Door);
                         IO_VALUE checkIO = IOManager.IOValue(IO_Type.TrayCheck_Door);
                         int height = GetHeight();
                         int height = GetHeight();
                         //判断料门口是否有料
                         //判断料门口是否有料
-                        if ((checkIO.Equals(IO_VALUE.HIGH)) && height > 0   )
+                        //光栅不遮挡时才扫码
+                        if ((checkIO.Equals(IO_VALUE.HIGH)) &&IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH)&& height > 0   )
                         {
                         {
                             if (!CanStartCode() || IsDebug || InStoreFail || IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                             if (!CanStartCode() || IsDebug || InStoreFail || IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                             {
                             {
@@ -1735,13 +1738,25 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else
             else
             {
             {
-                result = (int)Math.Floor(1F * (Value ) / 4) * 4;
+                result = (int)Math.Floor(1F * (Value) / 4) * 4;
                 if (result <= 8)
                 if (result <= 8)
                 {
                 {
                     result = 8;
                     result = 8;
                 }
                 }
             }
             }
-           
+            if (result >= 36)
+            {
+                result = 44;
+            }
+            else if (result >= 28)
+            {
+                result = 32;
+            }
+            else if (result >= 20)
+            {
+                result = 24;
+            }
+
             return result;
             return result;
         }
         }