1

DeviceLibrary/manager/work/TSAVBean.cs

@@ -396,7 +396,8 @@ namespace TSA_V.DeviceLibrary
             //            PUSICANControl.HomeMove(LWidthManager.Line_NodeAddr);
             resetStep = ResetStep.XYHomeMove_3;
             LastResetChangeTime = DateTime.Now; 
-            LogUtil.info(Name + "重置中 " + resetStep + "：所有轴已连接， 旋转轴开始原点返回");
+            CylinderMove(IOManager.StopCylinder_Down, IOManager.StopCylinder_Up, false);
+            LogUtil.info(Name + "重置中 " + resetStep + "：所有轴已连接， 旋转轴开始原点返回，阻挡气缸上升");
         }
         private static void ToRunning(string msg)
         {

TSA-V/FrmHistorySearch.cs

@@ -54,14 +54,14 @@ namespace TSA_V
             {
                 DgvOperateInfo.Rows.Clear();
                 if (data.Length == 0)
-                    MessageBox.Show("没有找到记录");
+                    MessageBox.Show(ResourceCulture.GetString("没有找到记录"));
                 else
                     for (int i = 0; i < data.Length; i++)
                         DgvOperateInfo.Rows.Add(data[i]);
             }
             else
             {
-                MessageBox.Show("查询出错", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show(ResourceCulture.GetString("查询出错"), "", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
 
@@ -74,14 +74,14 @@ namespace TSA_V
             {
                 DgvPointInfo.Rows.Clear();
                 if (data.Length == 0)
-                    MessageBox.Show("没有找到记录");
+                    MessageBox.Show(ResourceCulture.GetString("没有找到记录"));
                 else
                     for (int i = 0; i < data.Length; i++)
                         DgvPointInfo.Rows.Add(data[i]);
             }
             else
             {
-                MessageBox.Show("查询出错", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show(ResourceCulture.GetString("查询出错"), "", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
 

TSA-V/Properties/Resource.en-US.resx

@@ -2717,4 +2717,11 @@
   <data name = "handWork" xml:space = "preserve"> <value> Assembling </value>   </data>
   <data name = "handCount" xml:space = "preserve"> <value> Number  </value>   </data>
   <data name = "handTime" xml:space = "preserve"> <value> Total Time </value>   </data>
+
+  <data name="查询出错" xml:space="preserve">
+    <value>Query Error</value>
+  </data>
+  <data name="没有找到记录" xml:space="preserve">
+    <value>No records found</value>
+  </data>
 </root>
\ No newline at end of file

TSA-V/ResourceCulture.cs

@@ -895,7 +895,7 @@ namespace TSA_V
         /// <summary>
         /// 无
         /// </summary>
-        internal static readonly string Type_None= "无";
+        internal static readonly string Type_None= "Type_None";
 
         internal static readonly string CreateNew = "CreateNew";
     }

TSA-V/workForm/FrmAOICheck.cs

@@ -146,6 +146,8 @@ namespace TSA_V
             }
         }
         public string defFile = @"G:\1.bmp";
+
+        [HandleProcessCorruptedStateExceptions]
         private int AoiCheck()
         {
             GC.Collect(0, GCCollectionMode.Forced);
@@ -258,6 +260,10 @@ namespace TSA_V
                 }
                 chbAllShow.Enabled = true  ;
             }
+            catch (AccessViolationException e)
+            {
+                LogUtil.error("检测出错 AccessViolationException 异常 ." + e.ToString());
+            }
             catch (Exception ex)
             {
                 lblError.Text = ResourceCulture.GetString("执行检测失败", "执行检测失败");