diff --git a/.gitignore b/.gitignore index 072cc97..09ff496 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ packages/ *.nupkg project.lock.json /.idea +/ERPOMS/.vs/ERPOMS.csproj.dtbcache.json +/TradeManage/.vs/TradeManage.csproj.dtbcache.json diff --git a/ERPOMS/ERPOMS.csproj b/ERPOMS/ERPOMS.csproj index 4e5fac0..e8c8a40 100644 --- a/ERPOMS/ERPOMS.csproj +++ b/ERPOMS/ERPOMS.csproj @@ -14,7 +14,7 @@ Properties ERPOMS ERPOMS - v4.6.1 + v4.6.2 true diff --git a/ERPOMS/Web.config b/ERPOMS/Web.config index 74a5310..76b1aa5 100644 --- a/ERPOMS/Web.config +++ b/ERPOMS/Web.config @@ -1,4 +1,4 @@ - + - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/ERPOMS/obj/Debug/ERPOMS.csproj.FileListAbsolute.txt b/ERPOMS/obj/Debug/ERPOMS.csproj.FileListAbsolute.txt index bb7f9be..027e4ea 100644 --- a/ERPOMS/obj/Debug/ERPOMS.csproj.FileListAbsolute.txt +++ b/ERPOMS/obj/Debug/ERPOMS.csproj.FileListAbsolute.txt @@ -193,3 +193,7 @@ E:\工作项目代码\SVN代码库\TradeManage\ERPOMS\bin\Spire.Pdf.xml E:\工作项目代码\SVN代码库\TradeManage\ERPOMS\bin\itextsharp.xml E:\工作项目代码\SVN代码库\TradeManage\ERPOMS\bin\PdfiumViewer.xml E:\工作项目代码\SVN代码库\TradeManage\ERPOMS\bin\nl\PdfiumViewer.resources.dll +D:\WorkProjects\ERP\ERPOMS\obj\Debug\ERPOMS.csproj.AssemblyReference.cache +D:\WorkProjects\ERP\ERPOMS\obj\Debug\ERPOMS.csproj.CoreCompileInputs.cache +D:\WorkProjects\ERP\ERPOMS\obj\Debug\ERPOMS.dll +D:\WorkProjects\ERP\ERPOMS\obj\Debug\ERPOMS.pdb diff --git a/TradeServer/Properties/Resources.Designer.cs b/TradeServer/Properties/Resources.Designer.cs index 4bbadf3..f5f3760 100644 --- a/TradeServer/Properties/Resources.Designer.cs +++ b/TradeServer/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace TradeServer.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen // (以 /str 作为命令选项),或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace TradeServer.Properties { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性,对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/TradeServer/Properties/Settings.Designer.cs b/TradeServer/Properties/Settings.Designer.cs index a97ab7d..b1939aa 100644 --- a/TradeServer/Properties/Settings.Designer.cs +++ b/TradeServer/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace TradeServer.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TradeServer/TradeServer.csproj b/TradeServer/TradeServer.csproj index 4ca687a..56f86cc 100644 --- a/TradeServer/TradeServer.csproj +++ b/TradeServer/TradeServer.csproj @@ -9,7 +9,7 @@ Properties TradeServer TradeServer - v4.6.1 + v4.6.2 512 SAK SAK diff --git a/TradeServer/app.config b/TradeServer/app.config index 943d15e..5fbc3fe 100644 --- a/TradeServer/app.config +++ b/TradeServer/app.config @@ -1,39 +1,39 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/TradeServer/bin/Debug/ApiNew.dll b/TradeServer/bin/Debug/ApiNew.dll index 6bd98f2..25b2b11 100644 Binary files a/TradeServer/bin/Debug/ApiNew.dll and b/TradeServer/bin/Debug/ApiNew.dll differ diff --git a/TradeServer/bin/Debug/ApiNew.pdb b/TradeServer/bin/Debug/ApiNew.pdb index 08bbd71..da96fa4 100644 Binary files a/TradeServer/bin/Debug/ApiNew.pdb and b/TradeServer/bin/Debug/ApiNew.pdb differ diff --git a/TradeServer/bin/Debug/TradeManage.dll b/TradeServer/bin/Debug/TradeManage.dll index 985fb4d..99af95e 100644 Binary files a/TradeServer/bin/Debug/TradeManage.dll and b/TradeServer/bin/Debug/TradeManage.dll differ diff --git a/TradeServer/bin/Debug/TradeManage.dll.config b/TradeServer/bin/Debug/TradeManage.dll.config index 5abeba4..603e40a 100644 --- a/TradeServer/bin/Debug/TradeManage.dll.config +++ b/TradeServer/bin/Debug/TradeManage.dll.config @@ -1,17 +1,17 @@ - + -
+
-
+
- + - - - + + + - - - - - - - + + + + + + + + - + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - + + - + - - + + - - - + + + - - - + + + @@ -126,9 +131,13 @@ - - + + + + + + - + \ No newline at end of file diff --git a/TradeServer/bin/Debug/TradeManage.pdb b/TradeServer/bin/Debug/TradeManage.pdb index 4cff3cd..3e483ba 100644 Binary files a/TradeServer/bin/Debug/TradeManage.pdb and b/TradeServer/bin/Debug/TradeManage.pdb differ diff --git a/TradeServer/bin/Debug/TradeManageNew.dll b/TradeServer/bin/Debug/TradeManageNew.dll index 8e9d514..3292698 100644 Binary files a/TradeServer/bin/Debug/TradeManageNew.dll and b/TradeServer/bin/Debug/TradeManageNew.dll differ diff --git a/TradeServer/bin/Debug/TradeManageNew.dll.config b/TradeServer/bin/Debug/TradeManageNew.dll.config index 9f909ac..2fb8413 100644 --- a/TradeServer/bin/Debug/TradeManageNew.dll.config +++ b/TradeServer/bin/Debug/TradeManageNew.dll.config @@ -22,7 +22,7 @@ --> - + @@ -47,13 +47,13 @@ - - - - - - - + + + + + + + @@ -63,12 +63,12 @@ - + - - + + @@ -109,6 +109,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/TradeServer/bin/Debug/TradeManageNew.pdb b/TradeServer/bin/Debug/TradeManageNew.pdb index 4f833d8..6ce1503 100644 Binary files a/TradeServer/bin/Debug/TradeManageNew.pdb and b/TradeServer/bin/Debug/TradeManageNew.pdb differ diff --git a/TradeServer/bin/Debug/TradeServer.exe b/TradeServer/bin/Debug/TradeServer.exe index 35b7ac3..a449416 100644 Binary files a/TradeServer/bin/Debug/TradeServer.exe and b/TradeServer/bin/Debug/TradeServer.exe differ diff --git a/TradeServer/bin/Debug/TradeServer.exe.config b/TradeServer/bin/Debug/TradeServer.exe.config index 943d15e..5fbc3fe 100644 --- a/TradeServer/bin/Debug/TradeServer.exe.config +++ b/TradeServer/bin/Debug/TradeServer.exe.config @@ -1,39 +1,39 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/TradeServer/bin/Debug/TradeServer.pdb b/TradeServer/bin/Debug/TradeServer.pdb index 45a40e2..173e429 100644 Binary files a/TradeServer/bin/Debug/TradeServer.pdb and b/TradeServer/bin/Debug/TradeServer.pdb differ diff --git a/TradeServer/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/TradeServer/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 4015f4f..749d914 100644 Binary files a/TradeServer/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/TradeServer/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TradeServer/obj/Debug/TradeServer.csproj.FileListAbsolute.txt b/TradeServer/obj/Debug/TradeServer.csproj.FileListAbsolute.txt index 3acc93b..d7442b8 100644 --- a/TradeServer/obj/Debug/TradeServer.csproj.FileListAbsolute.txt +++ b/TradeServer/obj/Debug/TradeServer.csproj.FileListAbsolute.txt @@ -451,3 +451,62 @@ C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeServer\obj C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeServer\obj\Debug\TradeServer.csproj.CopyComplete C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeServer\obj\Debug\TradeServer.exe C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeServer\obj\Debug\TradeServer.pdb +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeServer.csproj.AssemblyReference.cache +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeServer.Form1.resources +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeServer.Properties.Resources.resources +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeServer.csproj.GenerateResource.cache +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeServer.csproj.CoreCompileInputs.cache +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeServer.exe +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeServer.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\Setup.ini +D:\WorkProjects\ERP\TradeServer\bin\Debug\x86\pdfium.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeServer.exe.config +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeServer.exe +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeServer.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\ApiNew.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\MWSClientCsRuntime-1.0.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\MWSOrders_2013-09-01_v2017-02-22.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\NetLibrary.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\Newtonsoft.Json.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeData.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeManage.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeManageNew.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeModel.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\MWSOrders_2013-09-01_v2018-10-31.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\MWSProducts_2011-10-01_v2017-03-22.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\MarketplaceWebService.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\Web References.WebReference.Reference.cs.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\DirectShowLib-2005.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\ICSharpCode.SharpZipLib.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\NPOI.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\Aspose.Words.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\MarketplaceWebServiceOrders.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\System.Net.Http.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\BarcodeLib.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\zxing.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\LazopSdk.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\Spire.Pdf.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\itextsharp.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\BouncyCastle.Crypto.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeUsedSale.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\PdfiumViewer.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\linq2db.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\Microsoft.mshtml.dll +D:\WorkProjects\ERP\TradeServer\bin\Debug\ApiNew.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\NetLibrary.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\NetLibrary.dll.config +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeData.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeManageNew.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeManageNew.dll.config +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeManage.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeManage.dll.config +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeModel.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\Newtonsoft.Json.xml +D:\WorkProjects\ERP\TradeServer\bin\Debug\zxing.xml +D:\WorkProjects\ERP\TradeServer\bin\Debug\Spire.Pdf.xml +D:\WorkProjects\ERP\TradeServer\bin\Debug\itextsharp.xml +D:\WorkProjects\ERP\TradeServer\bin\Debug\TradeUsedSale.pdb +D:\WorkProjects\ERP\TradeServer\bin\Debug\PdfiumViewer.xml +D:\WorkProjects\ERP\TradeServer\bin\Debug\linq2db.xml +D:\WorkProjects\ERP\TradeServer\bin\Debug\nl\PdfiumViewer.resources.dll +D:\WorkProjects\ERP\TradeServer\obj\Debug\TradeSer.9F44EFFF.Up2Date diff --git a/TradeServer/obj/Debug/TradeServer.exe b/TradeServer/obj/Debug/TradeServer.exe index 35b7ac3..a449416 100644 Binary files a/TradeServer/obj/Debug/TradeServer.exe and b/TradeServer/obj/Debug/TradeServer.exe differ diff --git a/TradeServer/obj/Debug/TradeServer.pdb b/TradeServer/obj/Debug/TradeServer.pdb index 45a40e2..173e429 100644 Binary files a/TradeServer/obj/Debug/TradeServer.pdb and b/TradeServer/obj/Debug/TradeServer.pdb differ