From f4c6ac315102c3a64da3a8f2d12b2d9042b5effd Mon Sep 17 00:00:00 2001 From: yirongjin <yirongjin1234@163.com> Date: 周三, 23 7月 2025 14:45:05 +0800 Subject: [PATCH] 1、新增交接文档 2、升级项目框架4.5 --- doc/青汽库口显示.rar | 0 doc/修改项.txt | 16 ++ doc/青汽库口显示/2-8.rar | 0 qqjf-Background/EnumType/EnumType.csproj | 2 qqjf-Background/DeviceWCS/DeviceWCS.csproj | 4 qqjf-Background/DeviceWCS/Properties/Resources.Designer.cs | 54 ++--- qqjf-Background/Models/Models.csproj | 3 qqjf-Background/iWareSda_QQJF/Properties/Resources.Designer.cs | 6 doc/冲压件立体库API_eolinker_api -v20230706-适配冲压AGV.xlsx | 0 qqjf-Background/WebApi_QQJF/WebApi_QQJF.csproj | 10 doc/LA19012-项目售后服务单v1-23-7-10.docx | 0 qqjf-Background/DeviceWCS/Properties/Settings.Designer.cs | 2 doc/青汽库口显示/2-7.rar | 0 qqjf-Background/iWareSda_QQJF/App.config | 40 ++-- qqjf-Background/iWareSda_QQJF/Properties/Settings.Designer.cs | 2 doc/LA19012-1工控机选型.xlsx | 0 qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfString.datasource | 2 qqjf-Background/DeviceWCS/App.config | 16 +- qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.DeleteMainTaskResponse.datasource | 2 doc/LA19012-1-布局图.dwg | 0 qqjf-Background/WebApi_QQJF/Web.config | 77 +++++---- qqjf-Background/iWareSda_QQJF/iWareSda_QQJF.csproj | 2 pj1是大屏代码.txt | 0 doc/LA19012项目干系人.docx | 0 doc/冲压件立体库API_eolinker_api.xlsx | 0 doc/api接口.xlsx | 0 qqjf-Background/IWareDataAccess/IWareDataAccess.csproj | 3 qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfInt.datasource | 2 qqjf-Background/iWareCommon/iWareCommon.csproj | 2 qqjf-Background/DeviceWCS/Web References/tranSRM/Reference.cs | 76 ++++---- doc/20230613.bak | 0 qqjf-Background/IWareDataAccess/App.config | 12 qqjf-Background/DeviceWCS/Web References/srmSER/Reference.cs | 62 +++--- doc/123口电视切换说明.docx | 0 qqjf-Background/DeviceWCS/Web References/rgvSRM/Reference.cs | 52 +++--- doc/LA191012-1-冲压件立体库库口输送线改造-签字版技术协议.pdf | 0 doc/邵长祥整理的登录堡垒机的使用步骤.docx | 0 37 files changed, 233 insertions(+), 214 deletions(-) diff --git "a/doc/123\345\217\243\347\224\265\350\247\206\345\210\207\346\215\242\350\257\264\346\230\216.docx" "b/doc/123\345\217\243\347\224\265\350\247\206\345\210\207\346\215\242\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..c24f360 --- /dev/null +++ "b/doc/123\345\217\243\347\224\265\350\247\206\345\210\207\346\215\242\350\257\264\346\230\216.docx" Binary files differ diff --git a/doc/20230613.bak b/doc/20230613.bak new file mode 100644 index 0000000..044c81c --- /dev/null +++ b/doc/20230613.bak Binary files differ diff --git "a/doc/LA19012-1-\345\270\203\345\261\200\345\233\276.dwg" "b/doc/LA19012-1-\345\270\203\345\261\200\345\233\276.dwg" new file mode 100644 index 0000000..98f11c9 --- /dev/null +++ "b/doc/LA19012-1-\345\270\203\345\261\200\345\233\276.dwg" Binary files differ diff --git "a/doc/LA19012-1\345\267\245\346\216\247\346\234\272\351\200\211\345\236\213.xlsx" "b/doc/LA19012-1\345\267\245\346\216\247\346\234\272\351\200\211\345\236\213.xlsx" new file mode 100644 index 0000000..12968c3 --- /dev/null +++ "b/doc/LA19012-1\345\267\245\346\216\247\346\234\272\351\200\211\345\236\213.xlsx" Binary files differ diff --git "a/doc/LA19012-\351\241\271\347\233\256\345\224\256\345\220\216\346\234\215\345\212\241\345\215\225v1-23-7-10.docx" "b/doc/LA19012-\351\241\271\347\233\256\345\224\256\345\220\216\346\234\215\345\212\241\345\215\225v1-23-7-10.docx" new file mode 100644 index 0000000..9a30710 --- /dev/null +++ "b/doc/LA19012-\351\241\271\347\233\256\345\224\256\345\220\216\346\234\215\345\212\241\345\215\225v1-23-7-10.docx" Binary files differ diff --git "a/doc/LA19012\351\241\271\347\233\256\345\271\262\347\263\273\344\272\272.docx" "b/doc/LA19012\351\241\271\347\233\256\345\271\262\347\263\273\344\272\272.docx" new file mode 100644 index 0000000..15f4af2 --- /dev/null +++ "b/doc/LA19012\351\241\271\347\233\256\345\271\262\347\263\273\344\272\272.docx" Binary files differ diff --git "a/doc/LA191012-1-\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223\345\272\223\345\217\243\350\276\223\351\200\201\347\272\277\346\224\271\351\200\240-\347\255\276\345\255\227\347\211\210\346\212\200\346\234\257\345\215\217\350\256\256.pdf" "b/doc/LA191012-1-\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223\345\272\223\345\217\243\350\276\223\351\200\201\347\272\277\346\224\271\351\200\240-\347\255\276\345\255\227\347\211\210\346\212\200\346\234\257\345\215\217\350\256\256.pdf" new file mode 100644 index 0000000..a1288c8 --- /dev/null +++ "b/doc/LA191012-1-\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223\345\272\223\345\217\243\350\276\223\351\200\201\347\272\277\346\224\271\351\200\240-\347\255\276\345\255\227\347\211\210\346\212\200\346\234\257\345\215\217\350\256\256.pdf" Binary files differ diff --git "a/doc/api\346\216\245\345\217\243.xlsx" "b/doc/api\346\216\245\345\217\243.xlsx" new file mode 100644 index 0000000..c6ef684 --- /dev/null +++ "b/doc/api\346\216\245\345\217\243.xlsx" Binary files differ diff --git "a/doc/\344\277\256\346\224\271\351\241\271.txt" "b/doc/\344\277\256\346\224\271\351\241\271.txt" new file mode 100644 index 0000000..a064478 --- /dev/null +++ "b/doc/\344\277\256\346\224\271\351\241\271.txt" @@ -0,0 +1,16 @@ +鍐插帇浠剁珛搴撹緭閫佺嚎鏀归�� +WCS +1銆佽〃[BASE_DEVICE]澧炲姞4涓珯鐐癸紝68銆�69銆�70銆�71锛� +琛╗TranLock]闇�瑕侀厤缃珯鐐圭粦瀹氱殑RGV锛岀敤浜庡垽鏂槸鍚﹂渶瑕佷腑杞� +2銆丒:\S22016\svn\LA19012\qqjf-Background\iWareSda_QQJF\WCSNEW\WCS.cs +init鏂规硶澧炲姞鐢熸垚鍏ュ簱浠诲姟绾跨▼锛宑reatInTask7 = new Thread(CreateMainTask.CreatInTask) +ReadMainTask鎷嗚В涓讳换鍔℃柟娉曚腑鐢熸垚RGV浠诲姟闇�瑕佸垽鏂柊澧炵珯鐐规槸鍚﹂渶瑕佷腑杞� +3銆丒:\S22016\svn\LA19012\qqjf-Background\iWareSda_QQJF\WCSNEW\鐢熸垚涓讳换鍔CreateMainTask.cs锛� +CreatInTask鏂规硶淇敼璧峰绔欑偣鍒ゆ柇锛屽鍔犳柊澧炵殑绔欑偣 +CreateTask鏂规硶鐢熸垚鍑哄簱浠诲姟鏄鍔犳柊澧炵珯鐐瑰垽鏂� + +SDA +SrmTran_DB鍦板潃閰嶇疆澧炲姞鏂板鐨勭珯鐐� + + + diff --git "a/doc/\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223API_eolinker_api -v20230706-\351\200\202\351\205\215\345\206\262\345\216\213AGV.xlsx" "b/doc/\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223API_eolinker_api -v20230706-\351\200\202\351\205\215\345\206\262\345\216\213AGV.xlsx" new file mode 100644 index 0000000..be935b0 --- /dev/null +++ "b/doc/\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223API_eolinker_api -v20230706-\351\200\202\351\205\215\345\206\262\345\216\213AGV.xlsx" Binary files differ diff --git "a/doc/\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223API_eolinker_api.xlsx" "b/doc/\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223API_eolinker_api.xlsx" new file mode 100644 index 0000000..e3277cc --- /dev/null +++ "b/doc/\345\206\262\345\216\213\344\273\266\347\253\213\344\275\223\345\272\223API_eolinker_api.xlsx" Binary files differ diff --git "a/doc/\351\202\265\351\225\277\347\245\245\346\225\264\347\220\206\347\232\204\347\231\273\345\275\225\345\240\241\345\236\222\346\234\272\347\232\204\344\275\277\347\224\250\346\255\245\351\252\244.docx" "b/doc/\351\202\265\351\225\277\347\245\245\346\225\264\347\220\206\347\232\204\347\231\273\345\275\225\345\240\241\345\236\222\346\234\272\347\232\204\344\275\277\347\224\250\346\255\245\351\252\244.docx" new file mode 100644 index 0000000..8d50ec8 --- /dev/null +++ "b/doc/\351\202\265\351\225\277\347\245\245\346\225\264\347\220\206\347\232\204\347\231\273\345\275\225\345\240\241\345\236\222\346\234\272\347\232\204\344\275\277\347\224\250\346\255\245\351\252\244.docx" Binary files differ diff --git "a/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272.rar" "b/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272.rar" new file mode 100644 index 0000000..f43c880 --- /dev/null +++ "b/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272.rar" Binary files differ diff --git "a/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272/2-7.rar" "b/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272/2-7.rar" new file mode 100644 index 0000000..72975e2 --- /dev/null +++ "b/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272/2-7.rar" Binary files differ diff --git "a/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272/2-8.rar" "b/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272/2-8.rar" new file mode 100644 index 0000000..f972dd0 --- /dev/null +++ "b/doc/\351\235\222\346\261\275\345\272\223\345\217\243\346\230\276\347\244\272/2-8.rar" Binary files differ diff --git "a/pj1\346\230\257\345\244\247\345\261\217\344\273\243\347\240\201.txt" "b/pj1\346\230\257\345\244\247\345\261\217\344\273\243\347\240\201.txt" new file mode 100644 index 0000000..e69de29 --- /dev/null +++ "b/pj1\346\230\257\345\244\247\345\261\217\344\273\243\347\240\201.txt" diff --git a/qqjf-Background/DeviceWCS/App.config b/qqjf-Background/DeviceWCS/App.config index 65ee95b..6d3cdd5 100644 --- a/qqjf-Background/DeviceWCS/App.config +++ b/qqjf-Background/DeviceWCS/App.config @@ -1,14 +1,14 @@ -锘�<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <configuration> <configSections> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <section name="DeviceWCS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + <section name="DeviceWCS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> </sectionGroup> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> </configSections> <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> </startup> <applicationSettings> <DeviceWCS.Properties.Settings> @@ -26,14 +26,14 @@ <entityFramework> <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework"> <parameters> - <parameter value="mssqllocaldb" /> + <parameter value="mssqllocaldb"/> </parameters> </defaultConnectionFactory> <providers> - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/> </providers> </entityFramework> <connectionStrings> - <add name="Model1" connectionString="data source=PC-S22016\SQLEXPRESS;initial catalog=1102;persist security info=True;user id=sa;password=123456;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" /> + <add name="Model1" connectionString="data source=PC-S22016\SQLEXPRESS;initial catalog=1102;persist security info=True;user id=sa;password=123456;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/> </connectionStrings> -</configuration> \ No newline at end of file +</configuration> diff --git a/qqjf-Background/DeviceWCS/DeviceWCS.csproj b/qqjf-Background/DeviceWCS/DeviceWCS.csproj index f477c99..9a14d2c 100644 --- a/qqjf-Background/DeviceWCS/DeviceWCS.csproj +++ b/qqjf-Background/DeviceWCS/DeviceWCS.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>DeviceWCS</RootNamespace> <AssemblyName>DeviceWCS</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -114,6 +115,7 @@ <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DependentUpon>Resources.resx</DependentUpon> + <DesignTime>True</DesignTime> </Compile> <None Include="packages.config" /> <None Include="Properties\Settings.settings"> diff --git a/qqjf-Background/DeviceWCS/Properties/Resources.Designer.cs b/qqjf-Background/DeviceWCS/Properties/Resources.Designer.cs index 9b8db2e..114172d 100644 --- a/qqjf-Background/DeviceWCS/Properties/Resources.Designer.cs +++ b/qqjf-Background/DeviceWCS/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ 锘�//------------------------------------------------------------------------------ // <auto-generated> // 姝や唬鐮佺敱宸ュ叿鐢熸垚銆� -// 杩愯鏃剁増鏈�: 4.0.30319.42000 +// 杩愯鏃剁増鏈�:4.0.30319.42000 // // 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋� -// 閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢涓㈠け銆� +// 閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� // </auto-generated> //------------------------------------------------------------------------------ -namespace DeviceWCS.Properties -{ - - +namespace DeviceWCS.Properties { + using System; + + /// <summary> /// 涓�涓己绫诲瀷鐨勮祫婧愮被锛岀敤浜庢煡鎵炬湰鍦板寲鐨勫瓧绗︿覆绛夈�� /// </summary> @@ -19,51 +19,43 @@ // 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆� // 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen // (浠� /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.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// <summary> - /// 杩斿洖姝ょ被浣跨敤鐨勩�佺紦瀛樼殑 ResourceManager 瀹炰緥銆� + /// 杩斿洖姝ょ被浣跨敤鐨勭紦瀛樼殑 ResourceManager 瀹炰緥銆� /// </summary> [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DeviceWCS.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// <summary> - /// 涓烘墍鏈夎祫婧愭煡鎵鹃噸鍐欏綋鍓嶇嚎绋嬬殑 CurrentUICulture 灞炴�э紝 - /// 鏂规硶鏄娇鐢ㄦ寮虹被鍨嬭祫婧愮被銆� + /// 閲嶅啓褰撳墠绾跨▼鐨� CurrentUICulture 灞炴�э紝瀵� + /// 浣跨敤姝ゅ己绫诲瀷璧勬簮绫荤殑鎵�鏈夎祫婧愭煡鎵炬墽琛岄噸鍐欍�� /// </summary> [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/qqjf-Background/DeviceWCS/Properties/Settings.Designer.cs b/qqjf-Background/DeviceWCS/Properties/Settings.Designer.cs index db60680..f58f75d 100644 --- a/qqjf-Background/DeviceWCS/Properties/Settings.Designer.cs +++ b/qqjf-Background/DeviceWCS/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.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/qqjf-Background/DeviceWCS/Web References/rgvSRM/Reference.cs b/qqjf-Background/DeviceWCS/Web References/rgvSRM/Reference.cs index 0c99a6f..b1c5f9d 100644 --- a/qqjf-Background/DeviceWCS/Web References/rgvSRM/Reference.cs +++ b/qqjf-Background/DeviceWCS/Web References/rgvSRM/Reference.cs @@ -14,16 +14,16 @@ #pragma warning disable 1591 namespace DeviceWCS.rgvSRM { - 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="BasicHttpBinding_IRgvService", Namespace="http://tempuri.org/")] @@ -473,11 +473,11 @@ } /// <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 SendRgvTaskCompletedEventHandler(object sender, SendRgvTaskCompletedEventArgs 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 SendRgvTaskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -499,11 +499,11 @@ } /// <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 SendRgvDeleteCompletedEventHandler(object sender, SendRgvDeleteCompletedEventArgs 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 SendRgvDeleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -525,11 +525,11 @@ } /// <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 SendRgvRlsAlertCompletedEventHandler(object sender, SendRgvRlsAlertCompletedEventArgs 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 SendRgvRlsAlertCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -551,11 +551,11 @@ } /// <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 SendRgvFinishConfirmCompletedEventHandler(object sender, SendRgvFinishConfirmCompletedEventArgs 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 SendRgvFinishConfirmCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -577,11 +577,11 @@ } /// <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 GetRgvInfoCompletedEventHandler(object sender, GetRgvInfoCompletedEventArgs 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 GetRgvInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -603,11 +603,11 @@ } /// <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 IsTaskFinishCompletedEventHandler(object sender, IsTaskFinishCompletedEventArgs 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 IsTaskFinishCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -629,11 +629,11 @@ } /// <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 SendRgvStopCompletedEventHandler(object sender, SendRgvStopCompletedEventArgs 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 SendRgvStopCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -655,11 +655,11 @@ } /// <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 IsRgvReadyCompletedEventHandler(object sender, IsRgvReadyCompletedEventArgs 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 IsRgvReadyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -681,11 +681,11 @@ } /// <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 FinishTaskCompletedEventHandler(object sender, FinishTaskCompletedEventArgs 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 FinishTaskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -707,11 +707,11 @@ } /// <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 GetRgvPosationCompletedEventHandler(object sender, GetRgvPosationCompletedEventArgs 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 GetRgvPosationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -733,11 +733,11 @@ } /// <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 ChangeUsefulCompletedEventHandler(object sender, ChangeUsefulCompletedEventArgs 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 ChangeUsefulCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/qqjf-Background/DeviceWCS/Web References/srmSER/Reference.cs b/qqjf-Background/DeviceWCS/Web References/srmSER/Reference.cs index 103d6ea..4f5f17b 100644 --- a/qqjf-Background/DeviceWCS/Web References/srmSER/Reference.cs +++ b/qqjf-Background/DeviceWCS/Web References/srmSER/Reference.cs @@ -14,16 +14,16 @@ #pragma warning disable 1591 namespace DeviceWCS.srmSER { - 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="BasicHttpBinding_ISrmService", Namespace="http://tempuri.org/")] @@ -592,11 +592,11 @@ } /// <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 GetSrmInfoCompletedEventHandler(object sender, GetSrmInfoCompletedEventArgs 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 GetSrmInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -618,11 +618,11 @@ } /// <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 SendSrmDeleteCompletedEventHandler(object sender, SendSrmDeleteCompletedEventArgs 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 SendSrmDeleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -644,11 +644,11 @@ } /// <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 SendSrmTaskFinishConfirmCompletedEventHandler(object sender, SendSrmTaskFinishConfirmCompletedEventArgs 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 SendSrmTaskFinishConfirmCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -670,11 +670,11 @@ } /// <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 SendSrmEStopCompletedEventHandler(object sender, SendSrmEStopCompletedEventArgs 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 SendSrmEStopCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -696,11 +696,11 @@ } /// <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 SendSrmMoveCompletedEventHandler(object sender, SendSrmMoveCompletedEventArgs 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 SendSrmMoveCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -722,11 +722,11 @@ } /// <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 SendSrmTaskCompletedEventHandler(object sender, SendSrmTaskCompletedEventArgs 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 SendSrmTaskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -748,15 +748,15 @@ } /// <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 SrmRlsAlertCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e); /// <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 IsTaskFinishCompletedEventHandler(object sender, IsTaskFinishCompletedEventArgs 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 IsTaskFinishCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -778,11 +778,11 @@ } /// <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 IsReadyCompletedEventHandler(object sender, IsReadyCompletedEventArgs 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 IsReadyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -804,11 +804,11 @@ } /// <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 FinishTaskCompletedEventHandler(object sender, FinishTaskCompletedEventArgs 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 FinishTaskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -830,11 +830,11 @@ } /// <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 DeleteMainTaskCompletedEventHandler(object sender, DeleteMainTaskCompletedEventArgs 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 DeleteMainTaskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -896,11 +896,11 @@ } /// <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 DeleteMainTaskByContainerNameCompletedEventHandler(object sender, DeleteMainTaskByContainerNameCompletedEventArgs 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 DeleteMainTaskByContainerNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -962,11 +962,11 @@ } /// <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 IsNotAlarmCompletedEventHandler(object sender, IsNotAlarmCompletedEventArgs 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 IsNotAlarmCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -988,11 +988,11 @@ } /// <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 UseAutoMoveCompletedEventHandler(object sender, UseAutoMoveCompletedEventArgs 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 UseAutoMoveCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/qqjf-Background/DeviceWCS/Web References/tranSRM/Reference.cs b/qqjf-Background/DeviceWCS/Web References/tranSRM/Reference.cs index 5e1ad1f..bb28147 100644 --- a/qqjf-Background/DeviceWCS/Web References/tranSRM/Reference.cs +++ b/qqjf-Background/DeviceWCS/Web References/tranSRM/Reference.cs @@ -14,16 +14,16 @@ #pragma warning disable 1591 namespace DeviceWCS.tranSRM { - 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="BasicHttpBinding_ISrmTranService", Namespace="http://tempuri.org/")] @@ -681,11 +681,11 @@ } /// <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 HasTranGoodsCompletedEventHandler(object sender, HasTranGoodsCompletedEventArgs 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 HasTranGoodsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -707,11 +707,11 @@ } /// <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 ErrorTranGoodsCompletedEventHandler(object sender, ErrorTranGoodsCompletedEventArgs 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 ErrorTranGoodsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -733,11 +733,11 @@ } /// <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 GetSrmConveyorStationInfoCompletedEventHandler(object sender, GetSrmConveyorStationInfoCompletedEventArgs 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 GetSrmConveyorStationInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -759,11 +759,11 @@ } /// <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 SendGoodsSizeCompletedEventHandler(object sender, SendGoodsSizeCompletedEventArgs 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 SendGoodsSizeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -785,11 +785,11 @@ } /// <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 SendGoodsReadyCompletedEventHandler(object sender, SendGoodsReadyCompletedEventArgs 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 SendGoodsReadyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -811,11 +811,11 @@ } /// <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 SendWeightOkCompletedEventHandler(object sender, SendWeightOkCompletedEventArgs 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 SendWeightOkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -837,11 +837,11 @@ } /// <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 GetGoodsWeightCompletedEventHandler(object sender, GetGoodsWeightCompletedEventArgs 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 GetGoodsWeightCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -863,11 +863,11 @@ } /// <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 GetGoodsBarcodeCompletedEventHandler(object sender, GetGoodsBarcodeCompletedEventArgs 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 GetGoodsBarcodeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -889,11 +889,11 @@ } /// <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 IsPassedCompletedEventHandler(object sender, IsPassedCompletedEventArgs 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 IsPassedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -915,11 +915,11 @@ } /// <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 SendTranStopCompletedEventHandler(object sender, SendTranStopCompletedEventArgs 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 SendTranStopCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -941,11 +941,11 @@ } /// <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 SendTranDeleteCompletedEventHandler(object sender, SendTranDeleteCompletedEventArgs 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 SendTranDeleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -967,11 +967,11 @@ } /// <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 SendTranResetCompletedEventHandler(object sender, SendTranResetCompletedEventArgs 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 SendTranResetCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -993,11 +993,11 @@ } /// <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 ClearTranGoodsCompletedEventHandler(object sender, ClearTranGoodsCompletedEventArgs 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 ClearTranGoodsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1019,11 +1019,11 @@ } /// <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 FinishTaskCompletedEventHandler(object sender, FinishTaskCompletedEventArgs 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 FinishTaskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1045,11 +1045,11 @@ } /// <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 SendGoodsTypeCompletedEventHandler(object sender, SendGoodsTypeCompletedEventArgs 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 SendGoodsTypeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1071,11 +1071,11 @@ } /// <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 UnlockTranCompletedEventHandler(object sender, UnlockTranCompletedEventArgs 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 UnlockTranCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1097,11 +1097,11 @@ } /// <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 UnFullTranCompletedEventHandler(object sender, UnFullTranCompletedEventArgs 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 UnFullTranCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/qqjf-Background/EnumType/EnumType.csproj b/qqjf-Background/EnumType/EnumType.csproj index ecaed7a..f02d323 100644 --- a/qqjf-Background/EnumType/EnumType.csproj +++ b/qqjf-Background/EnumType/EnumType.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>EnumType</RootNamespace> <AssemblyName>EnumType</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/qqjf-Background/IWareDataAccess/App.config b/qqjf-Background/IWareDataAccess/App.config index 8924bd3..1db8991 100644 --- a/qqjf-Background/IWareDataAccess/App.config +++ b/qqjf-Background/IWareDataAccess/App.config @@ -1,20 +1,20 @@ -锘�<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <configuration> <configSections> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> </configSections> <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> </startup> <entityFramework> <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework"> <parameters> - <parameter value="mssqllocaldb" /> + <parameter value="mssqllocaldb"/> </parameters> </defaultConnectionFactory> <providers> - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/> </providers> </entityFramework> <connectionStrings> @@ -27,4 +27,4 @@ <!--<add name="Model1" connectionString="data source=.;initial catalog=WB20005QingQi-WMS;persist security info=True;user id=sa;password=123456;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />--> <!-- <add name="Model1" connectionString="data source=LAPTOP-9337IBI9\MSSQLSERVER2017;initial catalog=WB20005QingQi-WMS;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />--> </connectionStrings> -</configuration> \ No newline at end of file +</configuration> diff --git a/qqjf-Background/IWareDataAccess/IWareDataAccess.csproj b/qqjf-Background/IWareDataAccess/IWareDataAccess.csproj index 20ba92b..a87863f 100644 --- a/qqjf-Background/IWareDataAccess/IWareDataAccess.csproj +++ b/qqjf-Background/IWareDataAccess/IWareDataAccess.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>IWareDataAccess</RootNamespace> <AssemblyName>IWareDataAccess</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> diff --git a/qqjf-Background/Models/Models.csproj b/qqjf-Background/Models/Models.csproj index b589acc..3b0b5b3 100644 --- a/qqjf-Background/Models/Models.csproj +++ b/qqjf-Background/Models/Models.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Models</RootNamespace> <AssemblyName>Models</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfInt.datasource b/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfInt.datasource index 2d036b6..154dfdf 100644 --- a/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfInt.datasource +++ b/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfInt.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> <GenericObjectDataSource DisplayName="ArrayOfInt" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource"> - <TypeInfo>WebApi_QQJF.SrmServer.ArrayOfInt, Service References.SrmServer.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo> + <TypeInfo>WebApi_QQJF.SrmServer.ArrayOfInt, Service References.SrmServer.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo> </GenericObjectDataSource> \ No newline at end of file diff --git a/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfString.datasource b/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfString.datasource index a6d4260..6a6af94 100644 --- a/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfString.datasource +++ b/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.ArrayOfString.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> <GenericObjectDataSource DisplayName="ArrayOfString" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource"> - <TypeInfo>WebApi_QQJF.SrmServer.ArrayOfString, Service References.SrmServer.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo> + <TypeInfo>WebApi_QQJF.SrmServer.ArrayOfString, Service References.SrmServer.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo> </GenericObjectDataSource> \ No newline at end of file diff --git a/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.DeleteMainTaskResponse.datasource b/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.DeleteMainTaskResponse.datasource index f121cfd..3666069 100644 --- a/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.DeleteMainTaskResponse.datasource +++ b/qqjf-Background/WebApi_QQJF/Service References/SrmServer/WebApi_QQJF.SrmServer.DeleteMainTaskResponse.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> <GenericObjectDataSource DisplayName="DeleteMainTaskResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource"> - <TypeInfo>WebApi_QQJF.SrmServer.DeleteMainTaskResponse, Service References.SrmServer.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo> + <TypeInfo>WebApi_QQJF.SrmServer.DeleteMainTaskResponse, Service References.SrmServer.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo> </GenericObjectDataSource> \ No newline at end of file diff --git a/qqjf-Background/WebApi_QQJF/Web.config b/qqjf-Background/WebApi_QQJF/Web.config index ac4673d..5d79bed 100644 --- a/qqjf-Background/WebApi_QQJF/Web.config +++ b/qqjf-Background/WebApi_QQJF/Web.config @@ -1,19 +1,27 @@ -锘�<?xml version="1.0" encoding="utf-8"?> +锘�<?xml version="1.0"?> <!-- 鏈夊叧濡備綍閰嶇疆 ASP.NET 搴旂敤绋嬪簭鐨勮缁嗕俊鎭紝璇疯闂� http://go.microsoft.com/fwlink/?LinkId=301879 --> <configuration> <appSettings> - <add key="webpages:Version" value="3.0.0.0" /> - <add key="webpages:Enabled" value="false" /> - <add key="ClientValidationEnabled" value="true" /> - <add key="UnobtrusiveJavaScriptEnabled" value="true" /> + <add key="webpages:Version" value="3.0.0.0"/> + <add key="webpages:Enabled" value="false"/> + <add key="ClientValidationEnabled" value="true"/> + <add key="UnobtrusiveJavaScriptEnabled" value="true"/> </appSettings> + <!-- + 鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆� + + 鍙湪 <httpRuntime> 鏍囪涓婅缃互涓嬬壒鎬с�� + <system.Web> + <httpRuntime targetFramework="4.8" /> + </system.Web> + --> <system.web> - <compilation debug="true" targetFramework="4.5" /> - <httpRuntime targetFramework="4.5" /> - <customErrors mode="Off" /> + <compilation debug="true" targetFramework="4.8"/> + <httpRuntime targetFramework="4.5"/> + <customErrors mode="Off"/> </system.web> <system.webServer> <httpProtocol> @@ -27,64 +35,61 @@ <!--<add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />--> </customHeaders> </httpProtocol> - <directoryBrowse enabled="true" /> + <directoryBrowse enabled="true"/> <handlers> - <remove name="ExtensionlessUrlHandler-Integrated-4.0" /> - <remove name="OPTIONSVerbHandler" /> - <remove name="TRACEVerbHandler" /> - <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> + <remove name="ExtensionlessUrlHandler-Integrated-4.0"/> + <remove name="OPTIONSVerbHandler"/> + <remove name="TRACEVerbHandler"/> + <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/> </handlers> </system.webServer> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> - <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> + <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/> + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-5.0.0.0" newVersion="5.0.0.0" /> + <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/> + <bindingRedirect oldVersion="1.0.0.0-5.0.0.0" newVersion="5.0.0.0"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> + <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/> + <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> + <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/> + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" /> + <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/> + <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" /> + <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" /> + <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/> </dependentAssembly> </assemblyBinding> </runtime> <connectionStrings> - <add name="Model1" connectionString="data source=.\SqlExpress;initial catalog=202312061430;persist security info=True;user id=sa;password=123456;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" /> + <add name="Model1" connectionString="data source=.\SqlExpress;initial catalog=202312061430;persist security info=True;user id=sa;password=123456;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/> </connectionStrings> <system.serviceModel> <bindings> <basicHttpBinding> - <binding name="BasicHttpBinding_ISrmService" /> + <binding name="BasicHttpBinding_ISrmService"/> </basicHttpBinding> </bindings> <client> - <endpoint address="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.SrmService/SrmService/" - binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ISrmService" - contract="SrmServer.ISrmService" name="BasicHttpBinding_ISrmService" /> + <endpoint address="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.SrmService/SrmService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ISrmService" contract="SrmServer.ISrmService" name="BasicHttpBinding_ISrmService"/> </client> </system.serviceModel> -</configuration> - +</configuration> \ No newline at end of file diff --git a/qqjf-Background/WebApi_QQJF/WebApi_QQJF.csproj b/qqjf-Background/WebApi_QQJF/WebApi_QQJF.csproj index d6c8c8a..6b3ec60 100644 --- a/qqjf-Background/WebApi_QQJF/WebApi_QQJF.csproj +++ b/qqjf-Background/WebApi_QQJF/WebApi_QQJF.csproj @@ -13,7 +13,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>WebApi_QQJF</RootNamespace> <AssemblyName>WebApi_QQJF</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <MvcBuildViews>false</MvcBuildViews> <UseIISExpress>true</UseIISExpress> <IISExpressSSLPort /> @@ -22,6 +22,7 @@ <IISExpressUseClassicPipelineMode /> <Use64BitIISExpress /> <UseGlobalApplicationHostFile /> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -62,6 +63,7 @@ </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> + <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.Entity" /> <Reference Include="System.Drawing" /> <Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> @@ -72,18 +74,17 @@ <Reference Include="System.Web.Cors, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.AspNet.Cors.5.2.9\lib\net45\System.Web.Cors.dll</HintPath> </Reference> + <Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.Entity" /> <Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.ComponentModel.DataAnnotations" /> - <Reference Include="System.Core" /> - <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="System.Web.Extensions" /> <Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath> </Reference> <Reference Include="System.Web.Http.Cors, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.9\lib\net45\System.Web.Http.Cors.dll</HintPath> </Reference> - <Reference Include="System.Xml.Linq" /> <Reference Include="System.Web" /> <Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Routing" /> @@ -127,6 +128,7 @@ <Private>True</Private> <HintPath>..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath> </Reference> + <Reference Include="System.Xml.Linq" /> <Reference Include="WebGrease"> <Private>True</Private> <HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath> diff --git a/qqjf-Background/iWareCommon/iWareCommon.csproj b/qqjf-Background/iWareCommon/iWareCommon.csproj index c7b1d53..b0d3dec 100644 --- a/qqjf-Background/iWareCommon/iWareCommon.csproj +++ b/qqjf-Background/iWareCommon/iWareCommon.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>iWareCommon</RootNamespace> <AssemblyName>iWareCommon</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <Deterministic>true</Deterministic> <TargetFrameworkProfile /> diff --git a/qqjf-Background/iWareSda_QQJF/App.config b/qqjf-Background/iWareSda_QQJF/App.config index c4fcece..83b623b 100644 --- a/qqjf-Background/iWareSda_QQJF/App.config +++ b/qqjf-Background/iWareSda_QQJF/App.config @@ -1,20 +1,20 @@ -锘�<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <configuration> <configSections> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> </configSections> <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> </startup> <system.serviceModel> - <bindings /> - <client /> + <bindings/> + <client/> <behaviors> <serviceBehaviors> <behavior name=""> - <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" /> - <serviceDebug includeExceptionDetailInFaults="false" /> + <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true"/> + <serviceDebug includeExceptionDetailInFaults="false"/> </behavior> </serviceBehaviors> </behaviors> @@ -22,39 +22,39 @@ <service name="iWareSda_QQJF.SRM.SrmService.SrmService"> <endpoint address="" binding="basicHttpBinding" contract="iWareSda_QQJF.SRM.SrmService.ISrmService"> <identity> - <dns value="localhost" /> + <dns value="localhost"/> </identity> </endpoint> - <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" /> + <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/> <host> <baseAddresses> - <add baseAddress="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.SrmService/SrmService/" /> + <add baseAddress="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.SrmService/SrmService/"/> </baseAddresses> </host> </service> <service name="iWareSda_QQJF.SRMTRAN.SrmTranService.SrmTranService"> <endpoint address="" binding="basicHttpBinding" contract="iWareSda_QQJF.SRMTRAN.SrmTranService.ISrmTranService"> <identity> - <dns value="localhost" /> + <dns value="localhost"/> </identity> </endpoint> - <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" /> + <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/> <host> <baseAddresses> - <add baseAddress="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.SRMTRAN.SrmTranService/SrmTranService/" /> + <add baseAddress="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.SRMTRAN.SrmTranService/SrmTranService/"/> </baseAddresses> </host> </service> <service name="iWareSda_QQJF.RGV.RgvService.RgvService"> <endpoint address="" binding="basicHttpBinding" contract="iWareSda_QQJF.RGV.RgvService.IRgvService"> <identity> - <dns value="localhost" /> + <dns value="localhost"/> </identity> </endpoint> - <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" /> + <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/> <host> <baseAddresses> - <add baseAddress="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.RGV.RgvService/RgvService/" /> + <add baseAddress="http://localhost:8733/Design_Time_Addresses/iWareSda_QQJF.RGV.RgvService/RgvService/"/> </baseAddresses> </host> </service> @@ -63,11 +63,11 @@ <entityFramework> <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework"> <parameters> - <parameter value="mssqllocaldb" /> + <parameter value="mssqllocaldb"/> </parameters> </defaultConnectionFactory> <providers> - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/> </providers> </entityFramework> <connectionStrings> @@ -78,6 +78,6 @@ <!--<add name="Model1" connectionString="data source=.;initial catalog=WB20005QingQi-WMS;persist security info=True;user id=sa;password=123456;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />--> <!--<add name="Model1" connectionString="data source=.;initial catalog=WB20005QingQi-WMS;persist security info=True;user id=sa;password=123abc.com;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /></connectionStrings>--> <!--<add name="Model1" connectionString="data source=.\SqlExpress;initial catalog=WB20005QingQi-WMS;persist security info=True;user id=sa;password=123456;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" />--> - <add name="Model1" connectionString="data source=.\SqlExpress;initial catalog=202312061430;persist security info=True;user id=sa;password=123456;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /> + <add name="Model1" connectionString="data source=.\SqlExpress;initial catalog=202312061430;persist security info=True;user id=sa;password=123456;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient"/> </connectionStrings> -</configuration> \ No newline at end of file +</configuration> diff --git a/qqjf-Background/iWareSda_QQJF/Properties/Resources.Designer.cs b/qqjf-Background/iWareSda_QQJF/Properties/Resources.Designer.cs index b4c5ac4..2d53aaa 100644 --- a/qqjf-Background/iWareSda_QQJF/Properties/Resources.Designer.cs +++ b/qqjf-Background/iWareSda_QQJF/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ // 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆� // 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen // (浠� /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.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ } /// <summary> - /// 浣跨敤姝ゅ己绫诲瀷璧勬簮绫伙紝涓烘墍鏈夎祫婧愭煡鎵� - /// 閲嶅啓褰撳墠绾跨▼鐨� CurrentUICulture 灞炴�с�� + /// 閲嶅啓褰撳墠绾跨▼鐨� CurrentUICulture 灞炴�э紝瀵� + /// 浣跨敤姝ゅ己绫诲瀷璧勬簮绫荤殑鎵�鏈夎祫婧愭煡鎵炬墽琛岄噸鍐欍�� /// </summary> [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/qqjf-Background/iWareSda_QQJF/Properties/Settings.Designer.cs b/qqjf-Background/iWareSda_QQJF/Properties/Settings.Designer.cs index e0f2ea2..d4ba2dc 100644 --- a/qqjf-Background/iWareSda_QQJF/Properties/Settings.Designer.cs +++ b/qqjf-Background/iWareSda_QQJF/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.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/qqjf-Background/iWareSda_QQJF/iWareSda_QQJF.csproj b/qqjf-Background/iWareSda_QQJF/iWareSda_QQJF.csproj index a4a7c16..90bfb3a 100644 --- a/qqjf-Background/iWareSda_QQJF/iWareSda_QQJF.csproj +++ b/qqjf-Background/iWareSda_QQJF/iWareSda_QQJF.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>iWareSda_QQJF</RootNamespace> <AssemblyName>iWareSda_QQJF</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled> <TargetFrameworkProfile /> -- Gitblit v1.9.3