ee

TradeManage/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace TradeManage.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())));

TradeManage/Service References/ServiceReference1/TradeManage.ServiceReference1.WL_TrackList.datasource

@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="WL_TrackList" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>TradeManage.ServiceReference1.WL_TrackList, TradeManage, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>TradeManage.ServiceReference1.WL_TrackList, Service References.ServiceReference1.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>

TradeManage/TradeManage.csproj

@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TradeManage</RootNamespace>
     <AssemblyName>TradeManage</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

TradeManage/Web References/WebReference/Reference.cs

@@ -14,16 +14,16 @@
 #pragma warning disable 1591
 
 namespace TradeManage.WebReference {
-    using System;
-    using System.Web.Services;
     using System.Diagnostics;
-    using System.Web.Services.Protocols;
+    using System;
     using System.Xml.Serialization;
     using System.ComponentModel;
+    using System.Web.Services.Protocols;
+    using System.Web.Services;
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="TrackServerSoap", Namespace="http://tempuri.org/")]
@@ -121,7 +121,7 @@ namespace TradeManage.WebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -192,11 +192,11 @@ namespace TradeManage.WebReference {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     public delegate void GetTrackCompletedEventHandler(object sender, GetTrackCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetTrackCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {

TradeManage/Web References/WebReference/WL_TrackModel.datasource

@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="WL_TrackModel" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>TradeManage.WebReference.WL_TrackModel, TradeManage, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>TradeManage.WebReference.WL_TrackModel, Web References.WebReference.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>

TradeManage/Web.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"/>

TradeManage/bin/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>

TradeManage/bin/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>

TradeManage/obj/Debug/TradeManage.csproj.FileListAbsolute.txt

@@ -339,3 +339,50 @@ C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeManage\bin
 C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeManage\bin\itextsharp.dll
 C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeManage\bin\itextsharp.xml
 C:\Users\cmj\source\Workspaces\汇众\学校2\ERPSvn\TradeManage\TradeManage\bin\System.Net.Http.dll
+D:\WorkProjects\ERP\TradeManage\bin\x86\pdfium.dll
+D:\WorkProjects\ERP\TradeManage\bin\TradeManage.dll.config
+D:\WorkProjects\ERP\TradeManage\bin\TradeManage.dll
+D:\WorkProjects\ERP\TradeManage\bin\TradeManage.pdb
+D:\WorkProjects\ERP\TradeManage\bin\ApiNew.dll
+D:\WorkProjects\ERP\TradeManage\bin\NetLibrary.dll
+D:\WorkProjects\ERP\TradeManage\bin\TradeData.dll
+D:\WorkProjects\ERP\TradeManage\bin\TradeManageNew.dll
+D:\WorkProjects\ERP\TradeManage\bin\TradeModel.dll
+D:\WorkProjects\ERP\TradeManage\bin\MWSOrders_2013-09-01_v2018-10-31.dll
+D:\WorkProjects\ERP\TradeManage\bin\MWSProducts_2011-10-01_v2017-03-22.dll
+D:\WorkProjects\ERP\TradeManage\bin\MarketplaceWebService.dll
+D:\WorkProjects\ERP\TradeManage\bin\DirectShowLib-2005.dll
+D:\WorkProjects\ERP\TradeManage\bin\ICSharpCode.SharpZipLib.dll
+D:\WorkProjects\ERP\TradeManage\bin\Aspose.Words.dll
+D:\WorkProjects\ERP\TradeManage\bin\MarketplaceWebServiceOrders.dll
+D:\WorkProjects\ERP\TradeManage\bin\System.Net.Http.dll
+D:\WorkProjects\ERP\TradeManage\bin\BarcodeLib.dll
+D:\WorkProjects\ERP\TradeManage\bin\zxing.dll
+D:\WorkProjects\ERP\TradeManage\bin\LazopSdk.dll
+D:\WorkProjects\ERP\TradeManage\bin\Spire.Pdf.dll
+D:\WorkProjects\ERP\TradeManage\bin\itextsharp.dll
+D:\WorkProjects\ERP\TradeManage\bin\BouncyCastle.Crypto.dll
+D:\WorkProjects\ERP\TradeManage\bin\TradeUsedSale.dll
+D:\WorkProjects\ERP\TradeManage\bin\PdfiumViewer.dll
+D:\WorkProjects\ERP\TradeManage\bin\linq2db.dll
+D:\WorkProjects\ERP\TradeManage\bin\MWSClientCsRuntime-1.0.dll
+D:\WorkProjects\ERP\TradeManage\bin\Microsoft.mshtml.dll
+D:\WorkProjects\ERP\TradeManage\bin\ApiNew.pdb
+D:\WorkProjects\ERP\TradeManage\bin\NetLibrary.pdb
+D:\WorkProjects\ERP\TradeManage\bin\NetLibrary.dll.config
+D:\WorkProjects\ERP\TradeManage\bin\TradeData.pdb
+D:\WorkProjects\ERP\TradeManage\bin\TradeManageNew.pdb
+D:\WorkProjects\ERP\TradeManage\bin\TradeManageNew.dll.config
+D:\WorkProjects\ERP\TradeManage\bin\TradeModel.pdb
+D:\WorkProjects\ERP\TradeManage\bin\zxing.xml
+D:\WorkProjects\ERP\TradeManage\bin\Spire.Pdf.xml
+D:\WorkProjects\ERP\TradeManage\bin\itextsharp.xml
+D:\WorkProjects\ERP\TradeManage\bin\TradeUsedSale.pdb
+D:\WorkProjects\ERP\TradeManage\bin\PdfiumViewer.xml
+D:\WorkProjects\ERP\TradeManage\bin\linq2db.xml
+D:\WorkProjects\ERP\TradeManage\bin\nl\PdfiumViewer.resources.dll
+D:\WorkProjects\ERP\TradeManage\obj\Debug\TradeManage.csproj.AssemblyReference.cache
+D:\WorkProjects\ERP\TradeManage\obj\Debug\TradeManage.csproj.CoreCompileInputs.cache
+D:\WorkProjects\ERP\TradeManage\obj\Debug\TradeMan.196EBF0B.Up2Date
+D:\WorkProjects\ERP\TradeManage\obj\Debug\TradeManage.dll
+D:\WorkProjects\ERP\TradeManage\obj\Debug\TradeManage.pdb