扫码修改

source/Common/util/LogUtil.cs

@@ -100,20 +100,20 @@ namespace OnlineStore.Common
         }
         }
         public static void error(ILog log, string errorMsg)
         public static void error(ILog log, string errorMsg)
         {
         {
-            if (!lasErrorLogList.Contains(errorMsg))
-            {
+            ///*if (!lasE*/rrorLogList.Contains(errorMsg))
+            //{
                 log.Error(log.Logger.Name + " - " + errorMsg);
                 log.Error(log.Logger.Name + " - " + errorMsg);
                 if (logBox == null)
                 if (logBox == null)
                 {
                 {
                     return;
                     return;
                 }
                 }
                 AddToBox(errorMsg, Color.Red);
                 AddToBox(errorMsg, Color.Red);
-            } 
-            lasErrorLogList.Add(errorMsg);
-            if (lasErrorLogList.Count > errCount)
-            {
-                lasErrorLogList.RemoveAt(0);
-            }
+            //} 
+            //lasErrorLogList.Add(errorMsg);
+            //if (lasErrorLogList.Count > errCount)
+            //{
+            //    lasErrorLogList.RemoveAt(0);
+            //}
         }
         }
         private static void AddToBox(string msg, Color color)
         private static void AddToBox(string msg, Color color)
         {
         {

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -217,6 +217,8 @@ namespace OnlineStore.DeviceLibrary
         #region 原点返回和复位处理
         #region 原点返回和复位处理
         private void ReturnHome()
         private void ReturnHome()
         {
         {
+            isInSuddenDown = false;
+            isNoAirCheck = false;
             WarnMsg = "";
             WarnMsg = "";
             CurrInOutACount = 0;
             CurrInOutACount = 0;
             CurrInOutCount = 0;
             CurrInOutCount = 0;

source/DeviceLibrary/halcon/CodeManager.cs

@@ -189,7 +189,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 if (!result.Equals(""))
                 if (!result.Equals(""))
                 {
                 {
-                    return "=1+0x0-7x" + height + "=" + result;
+                    return "=1+0x0-13x" + height + "=" + result;
                 }
                 }
             }catch(Exception ex)
             }catch(Exception ex)
             {
             {