Skip to content

李娜 / SO827-OutletEquip

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d625b9ff 由 LN
选项

1

1 个父辈 4a2e04fb
内嵌 并排
正在显示 4 个修改的文件 包含 17 行增加 和 11 行删除
source/HCSingleStore/FrmEquip.cs
...@@ -561,12 +561,18 @@ namespace OnlineStore.ACSingleStore ...@@ -561,12 +561,18 @@ namespace OnlineStore.ACSingleStore
LogUtil.info("ExitApp 停止" + equip.Name + "运行 "); LogUtil.info("ExitApp 停止" + equip.Name + "运行 ");
equip.StopRun(); equip.StopRun();
} }
IOManager.instance.CloseAllDO(); try
IOManager.instance.CloseAllConnection(); {
AxisManager.instance.CloseAllPort(); IOManager.instance.CloseAllDO();
AxisManager.instance.CloseCard(); IOManager.instance.CloseAllConnection();
RFIDManager.Close(); AxisManager.instance.CloseAllPort();
AgvClient.Dispose(); AxisManager.instance.CloseCard();
RFIDManager.Close();
AgvClient.Dispose();
}catch(Exception ex)
{
LogUtil.error("ExitApp出错：" + ex.ToString());
}
System.Environment.Exit(System.Environment.ExitCode); System.Environment.Exit(System.Environment.ExitCode);
} }
......
source/HCSingleStore/OutletEquip.csproj
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid> <ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.HCSingleStore</RootNamespace> <RootNamespace>OnlineStore.OutletEquip</RootNamespace>
<AssemblyName>HCSingleStore</AssemblyName> <AssemblyName>OutletEquip</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
......
source/HCSingleStore/Properties/Resources.Designer.cs
...@@ -47,8 +47,8 @@ namespace OnlineStore.OutletEquip.Properties { ...@@ -47,8 +47,8 @@ namespace OnlineStore.OutletEquip.Properties {
} }
/// <summary> /// <summary>
/// 重写当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
......
source/HCSingleStore/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace OnlineStore.OutletEquip.Properties { ...@@ -12,7 +12,7 @@ namespace OnlineStore.OutletEquip.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [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 { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!