eee

.gitignore

@@ -15,3 +15,5 @@ packages/
 *.nupkg
 project.lock.json
 /.idea
+/ERPOMS/.vs/ERPOMS.csproj.dtbcache.json
+/TradeManage/.vs/TradeManage.csproj.dtbcache.json

ERPOMS/ERPOMS.csproj

@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ERPOMS</RootNamespace>
     <AssemblyName>ERPOMS</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

ERPOMS/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细信息，请访问
   https://go.microsoft.com/fwlink/?LinkId=169433
@@ -13,7 +13,7 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="true" targetFramework="4.6.1" />
+    <compilation debug="true" targetFramework="4.6.2"/>
     <httpRuntime/>
     <pages controlRenderingCompatibilityVersion="4.0">
       <namespaces>

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

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

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())));

TradeServer/TradeServer.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TradeServer</RootNamespace>
     <AssemblyName>TradeServer</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>

TradeServer/app.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>

TradeServer/bin/Debug/TradeManage.dll.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
     <sectionGroup name="businessObjects">
@@ -24,7 +24,7 @@
   <system.web>
     <sessionState mode="InProc" timeout="600"/>
     <httpRuntime executionTimeout="409600" maxRequestLength="2097151" requestValidationMode="2.0"/>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="true" targetFramework="4.6.2">
       <assemblies>
         <!--<add assembly="CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>-->
         <add assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
@@ -33,7 +33,12 @@
         <add assembly="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
         <add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
         <add assembly="System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-      <add assembly="CrystalDecisions.CrystalReports.Engine, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" /><add assembly="CrystalDecisions.ReportSource, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" /><add assembly="CrystalDecisions.Shared, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" /><add assembly="CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" /><add assembly="CrystalDecisions.ReportAppServer.ClientDoc, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" /></assemblies>
+        <!--<add assembly="CrystalDecisions.CrystalReports.Engine, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />
+      <add assembly="CrystalDecisions.ReportSource, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />
+      <add assembly="CrystalDecisions.Shared, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />
+      <add assembly="CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />
+      <add assembly="CrystalDecisions.ReportAppServer.ClientDoc, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />-->
+      </assemblies>
     </compilation>
     <!--
             通过 <authentication> 节可以配置 ASP.NET 用来 
@@ -129,6 +134,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

TradeServer/bin/Debug/TradeManageNew.dll.config

@@ -22,7 +22,7 @@
   -->
   <system.web>
     <httpRuntime maxRequestLength="1048576" executionTimeout="3600" />
-    <compilation debug="true" targetFramework="4.6.1" />
+    <compilation debug="true" targetFramework="4.6.2" />
     <authentication mode="Forms">
       <forms loginUrl="~/Account/Login.aspx" timeout="2880" />
     </authentication>
@@ -63,11 +63,11 @@
     </scripting>
   </system.web.extensions>
   <appSettings>
-	  <add key="ConnectionString" value="server=.;database=ERPYY;uid=sa;pwd=hz123456" />
+    <!--<add key="ConnectionString" value="server=.;database=ERPYY;uid=sa;pwd=hz123456" />-->
     <!--<add key="ConnectionString" value="server=101.37.88.86;database=erp;uid=sa;pwd=erp@yeyuan123456New"/>-->
     <!--<add key="ConnectionString" value="server=60.12.218.120;database=erp;uid=KJERP;pwd=KJERP123456"/>-->
     <!--<add key="ConnectionString" value="server=192.168.1.16;database=newerp;uid=erpadmin;pwd=erp@12345" />-->
-	  <!--<add key="ConnectionString" value="server=192.168.1.16;database=newerpbak_cwk;uid=erpadmin;pwd=erp@12345"/>-->
+    <add key="ConnectionString" value="server=192.168.1.16;database=newerpbak_cwk;uid=erpadmin;pwd=erp@12345;TrustServerCertificate=True;" />
     <add key="PDAversion" value="1.0.1" />
   </appSettings>
   <system.webServer>
@@ -109,6 +109,50 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.ProtectedData" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

TradeServer/bin/Debug/TradeServer.exe.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>

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