Skip to content

顾剑亮 / AGVControl_Steel

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d4de4c07 由 张东亮
选项

1

1 个父辈 219c1102
内嵌 并排
正在显示 36 个修改的文件 包含 104 行增加 和 64 行删除
BLL/BLL.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BLL</RootNamespace> <RootNamespace>BLL</RootNamespace>
<AssemblyName>BLL</AssemblyName> <AssemblyName>BLL</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
BLL/obj/Debug/BLL.csproj.CoreCompileInputs.cache
93832d06c0568eb7dc0a05033b179564810293b3 00f5424f3a1ea493a3b9a6b30c41ef3f33cd9381
BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
...@@ -68,3 +68,17 @@ E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCom ...@@ -68,3 +68,17 @@ E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCom
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
DAL/DAL.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DAL</RootNamespace> <RootNamespace>DAL</RootNamespace>
<AssemblyName>DAL</AssemblyName> <AssemblyName>DAL</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
Model/Model.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace> <RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName> <AssemblyName>Model</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
f030d91692fbc548cdafae5e34e95829ff1d782f 1add9d820c816619aab22017895542b1f0792511
Model/obj/Debug/Model.csproj.FileListAbsolute.txt
...@@ -57,3 +57,15 @@ E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.Cor ...@@ -57,3 +57,15 @@ E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.Cor
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\Model.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
UI/App.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
<!--4楼--> <!--4楼-->
...@@ -37,4 +37,4 @@ ...@@ -37,4 +37,4 @@
<add key="WorkAutoDel" value="false"/> <add key="WorkAutoDel" value="false"/>
<add key="21号_3S" value="false"/> <add key="21号_3S" value="false"/>
</appSettings> </appSettings>
</configuration>
\ No newline at end of file \ No newline at end of file
</configuration>
UI/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
// 运行时版本: 4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// 对此文件的更改可能导致不正确的行为，如果 // 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，则所做更改将丢失。 // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace AGVControl_Steel.Properties namespace AGVControl_Steel.Properties {
{ using System;
/// <summary> /// <summary>
/// 强类型资源类，用于查找本地化字符串等。 /// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary> /// </summary>
// 此类是由 StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources internal class Resources {
{
private static global::System.Resources.ResourceManager resourceMan; private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture; private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() internal Resources() {
{
} }
/// <summary> /// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。 /// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager internal static global::System.Resources.ResourceManager ResourceManager {
{ get {
get if (object.ReferenceEquals(resourceMan, null)) {
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AGVControl_Steel.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AGVControl_Steel.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
} }
} }
/// <summary> /// <summary>
/// 覆盖当前线程的 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 {
{ get {
get
{
return resourceCulture; return resourceCulture;
} }
set set {
{
resourceCulture = value; resourceCulture = value;
} }
} }
......
UI/Properties/Settings.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// Runtime Version:4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为，并且如果
// the code is regenerated. // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace AGVControl_Steel.Properties namespace AGVControl_Steel.Properties {
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.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())));
public static Settings Default public static Settings Default {
{ get {
get
{
return defaultInstance; return defaultInstance;
} }
} }
......
UI/UI.csproj
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>AGVControl_Steel</RootNamespace> <RootNamespace>AGVControl_Steel</RootNamespace>
<AssemblyName>AGVControl_Steel</AssemblyName> <AssemblyName>AGVControl_Steel</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>false</Deterministic> <Deterministic>false</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -74,6 +75,7 @@ ...@@ -74,6 +75,7 @@
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
......
UI/bin/Debug/AGVControl_Steel.exe.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
<!--4楼--> <!--4楼-->
...@@ -37,4 +37,4 @@ ...@@ -37,4 +37,4 @@
<add key="WorkAutoDel" value="false"/> <add key="WorkAutoDel" value="false"/>
<add key="21号_3S" value="false"/> <add key="21号_3S" value="false"/>
</appSettings> </appSettings>
</configuration>
\ No newline at end of file \ No newline at end of file
</configuration>
UI/bin/Debug/BLL.dll
此文件类型无法预览
UI/bin/Debug/BLL.pdb
此文件类型无法预览
UI/obj/Debug/UI.csproj.CoreCompileInputs.cache
35e0d644e5213dd7ec751613453ae5a75790eabe 5c1268f885abc88e59a20f2a27a918a50e654404
UI/obj/Debug/UI.csproj.FileListAbsolute.txt
...@@ -100,3 +100,24 @@ E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CoreCompi ...@@ -100,3 +100,24 @@ E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CoreCompi
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CopyComplete E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CopyComplete
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.exe E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.exe
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.pdb E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\log4net.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\AGVControl_Steel.exe.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\AGVControl_Steel.exe
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\AGVControl_Steel.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\BLL.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\Model.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\log4net.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\RestSharp.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\BLL.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\log4net.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\RestSharp.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.AssemblyReference.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.SuggestedBindingRedirects.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.FrmMain.resources
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.Properties.Resources.resources
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.GenerateResource.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CoreCompileInputs.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CopyComplete
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.exe
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.pdb
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!