Skip to content

顾剑亮 / AGVControl_Steel

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

1

1 个父辈 edb1d586
内嵌 并排
正在显示 13 个修改的文件 包含 109 行增加 和 0 行删除
AGVControl_Steel.sln
...@@ -39,6 +39,11 @@ Global ...@@ -39,6 +39,11 @@ Global
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F08F614-2767-456A-80B8-A8FDB19F3988}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|Any CPU.Build.0 = Release|Any CPU {6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|Any CPU.Build.0 = Release|Any CPU
<<<<<<< Updated upstream
=======
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|x64.ActiveCfg = Release|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|x64.Build.0 = Release|Any CPU
>>>>>>> Stashed changes
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
BLL/BLL.csproj
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ConfigHelper, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
......
BLL/obj/Debug/BLL.csproj.CoreCompileInputs.cache
<<<<<<< Updated upstream
00f5424f3a1ea493a3b9a6b30c41ef3f33cd9381 00f5424f3a1ea493a3b9a6b30c41ef3f33cd9381
=======
a74afb787bb464c0dbc0b1401461393e4787795f
>>>>>>> Stashed changes
BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
...@@ -82,3 +82,28 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInput ...@@ -82,3 +82,28 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInput
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete 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.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
<<<<<<< Updated upstream
=======
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\settings\app.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.dll.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
>>>>>>> Stashed changes
Model/Model.csproj
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ConfigHelper, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.11\lib\net45\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.11\lib\net45\log4net.dll</HintPath>
</Reference> </Reference>
......
Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
<<<<<<< Updated upstream
1add9d820c816619aab22017895542b1f0792511 1add9d820c816619aab22017895542b1f0792511
=======
79447146296903cb29b682d89c7989d53c2d73ec
>>>>>>> Stashed changes
Model/obj/Debug/Model.csproj.FileListAbsolute.txt
...@@ -69,3 +69,26 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileI ...@@ -69,3 +69,26 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileI
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete 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.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
<<<<<<< Updated upstream
=======
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\settings\app.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.dll.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\Model.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
>>>>>>> Stashed changes
UI/UI.csproj
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
<ApplicationIcon>图标.ico</ApplicationIcon> <ApplicationIcon>图标.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ConfigHelper, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
......
UI/obj/Debug/UI.csproj.CoreCompileInputs.cache
<<<<<<< Updated upstream
5c1268f885abc88e59a20f2a27a918a50e654404 5c1268f885abc88e59a20f2a27a918a50e654404
=======
5f8235700f6c1e5bc0f483284a186564c221ad2f
>>>>>>> Stashed changes
UI/obj/Debug/UI.csproj.FileListAbsolute.txt
...@@ -121,3 +121,35 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CoreCompileInputs. ...@@ -121,3 +121,35 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CoreCompileInputs.
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CopyComplete 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.exe
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.pdb E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.pdb
<<<<<<< Updated upstream
=======
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\settings\app.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.dll.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.AssemblyReference.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.SuggestedBindingRedirects.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.FrmMain.resources
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.Properties.Resources.resources
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.GenerateResource.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.exe
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\log4net.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\AGVControl_Steel.exe.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\AGVControl_Steel.exe
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\AGVControl_Steel.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\BLL.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\log4net.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\RestSharp.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\BLL.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\Model.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\log4net.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\bin\Debug\RestSharp.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CopyComplete
>>>>>>> Stashed changes
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!