1

source/HCSingleStore/FrmEquip.cs

@@ -561,12 +561,18 @@ namespace OnlineStore.ACSingleStore
                     LogUtil.info("ExitApp 停止" + equip.Name + "运行 ");
                     equip.StopRun();
                 }
-                IOManager.instance.CloseAllDO();
-                IOManager.instance.CloseAllConnection();
-                AxisManager.instance.CloseAllPort();
-                AxisManager.instance.CloseCard();
-                RFIDManager.Close();
-                AgvClient.Dispose();
+                try
+                {
+                    IOManager.instance.CloseAllDO();
+                    IOManager.instance.CloseAllConnection();
+                    AxisManager.instance.CloseAllPort();
+                    AxisManager.instance.CloseCard();
+                    RFIDManager.Close();
+                    AgvClient.Dispose();
+                }catch(Exception ex)
+                {
+                    LogUtil.error("ExitApp出错：" + ex.ToString());
+                }
 
                 System.Environment.Exit(System.Environment.ExitCode);
             }

source/HCSingleStore/OutletEquip.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OnlineStore.HCSingleStore</RootNamespace>
-    <AssemblyName>HCSingleStore</AssemblyName>
+    <RootNamespace>OnlineStore.OutletEquip</RootNamespace>
+    <AssemblyName>OutletEquip</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />

source/HCSingleStore/Properties/Resources.Designer.cs

@@ -47,8 +47,8 @@ namespace OnlineStore.OutletEquip.Properties {
         }
         
         /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {

source/HCSingleStore/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace OnlineStore.OutletEquip.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));