From 3e837690e8a1d3b6e86f3db72d2d84eab1bc7114 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 6月 2025 17:10:50 +0800
Subject: [PATCH] 修复提交
---
DEmon/VirtualSrm/Properties/Settings.Designer.cs | 2
DEmon/iWareLog/App.config | 6
DEmon/iWareCc/Properties/Resources.Designer.cs | 8
DEmon/iWareDataCore/TASK/Service/MainTaskService.cs | 2
DEmon/iWareCc/App.config | 34 ++--
DEmon/WebWIPAPI/Web.config | 72 ++++----
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource | 2
DEmon/iWareCc/iWareCc.csproj | 3
DEmon/VirtualSrm/Properties/Resources.Designer.cs | 6
DEmon/VirtualSrm/VirtualSrm.csproj | 3
DEmon/iWareCc/Conveyor/Service/GateService.cs | 2
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetGateInfoResponse.datasource | 2
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfosResponse.datasource | 2
DEmon/iWareDataCore/iWareDataCore.csproj | 3
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource | 2
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfoResponse.datasource | 2
DEmon/VirtualConveyor/Properties/Settings.Designer.cs | 2
DEmon/VirtualConveyor/App.config | 12
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource | 2
DEmon/iWareDataCore/App.config | 10
DEmon/OpcAccess/Properties/Resources.Designer.cs | 6
DEmon/WebWIPAPI/Properties/Resources.Designer.cs | 6
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource | 2
DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs | 2
DEmon/VirtualConveyor/VirtualConveyor.csproj | 3
DEmon/iWarePod/Web.config | 116 +++++++-------
DEmon/iWareCommon/iWareCommon.csproj | 3
DEmon/iWareLog/Properties/Resources.Designer.cs | 8
DEmon/iWarePod/iWarePod.csproj | 3
DEmon/iWareCommon/App.config | 10
DEmon/OpcAccess/OpcAccess.csproj | 2
DEmon/iWarePod/Properties/Resources.Designer.cs | 6
DEmon/WebWIPAPI/WebWIPAPI.csproj | 5
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfoResponse.datasource | 2
DEmon/iWareWebservice/Web.config | 40 +++--
DEmon/VirtualSrm/App.config | 12
DEmon/iWareDataCore/Properties/Resources.Designer.cs | 8
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource | 2
DEmon/iWareWebservice/iWareWebservice.csproj | 3
DEmon/VirtualConveyor/Properties/Resources.Designer.cs | 6
DEmon/iWareCc/DoStackerTaskAuto/Chain/选择一个未执行的堆垛机的任务.cs | 3
DEmon/iWareLog/iWareLog.csproj | 3
DEmon/iWareCommon/Properties/Resources.Designer.cs | 6
43 files changed, 229 insertions(+), 205 deletions(-)
diff --git a/DEmon/OpcAccess/OpcAccess.csproj b/DEmon/OpcAccess/OpcAccess.csproj
index 8d7e27f..1f615d5 100644
--- a/DEmon/OpcAccess/OpcAccess.csproj
+++ b/DEmon/OpcAccess/OpcAccess.csproj
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpcAccess</RootNamespace>
<AssemblyName>OpcAccess</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
diff --git a/DEmon/OpcAccess/Properties/Resources.Designer.cs b/DEmon/OpcAccess/Properties/Resources.Designer.cs
index b6fbff7..432b12a 100644
--- a/DEmon/OpcAccess/Properties/Resources.Designer.cs
+++ b/DEmon/OpcAccess/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/DEmon/VirtualConveyor/App.config b/DEmon/VirtualConveyor/App.config
index 750945b..cc64fdf 100644
--- a/DEmon/VirtualConveyor/App.config
+++ b/DEmon/VirtualConveyor/App.config
@@ -1,22 +1,20 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
</configSections>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<system.serviceModel>
<bindings>
<basicHttpBinding>
- <binding name="BasicHttpBinding_IOpcWcfService" />
+ <binding name="BasicHttpBinding_IOpcWcfService"/>
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.0.169:8733/Design_Time_Addresses/iWareOpc.Wcf/OpcWcfService/"
- binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IOpcWcfService"
- contract="OpcWcfService.IOpcWcfService" name="BasicHttpBinding_IOpcWcfService" />
+ <endpoint address="http://192.168.0.169:8733/Design_Time_Addresses/iWareOpc.Wcf/OpcWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IOpcWcfService" contract="OpcWcfService.IOpcWcfService" name="BasicHttpBinding_IOpcWcfService"/>
</client>
</system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/DEmon/VirtualConveyor/Properties/Resources.Designer.cs b/DEmon/VirtualConveyor/Properties/Resources.Designer.cs
index 4505907..b60c51c 100644
--- a/DEmon/VirtualConveyor/Properties/Resources.Designer.cs
+++ b/DEmon/VirtualConveyor/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/DEmon/VirtualConveyor/Properties/Settings.Designer.cs b/DEmon/VirtualConveyor/Properties/Settings.Designer.cs
index 7db9c18..30c64c6 100644
--- a/DEmon/VirtualConveyor/Properties/Settings.Designer.cs
+++ b/DEmon/VirtualConveyor/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.6.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/DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs b/DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs
index 794238a..eec0bbf 100644
--- a/DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs
+++ b/DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs
@@ -1,7 +1,7 @@
锘�//------------------------------------------------------------------------------
// <auto-generated>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.18444
+// 杩愯鏃剁増鏈�:4.0.30319.42000
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
diff --git a/DEmon/VirtualConveyor/VirtualConveyor.csproj b/DEmon/VirtualConveyor/VirtualConveyor.csproj
index 86a6828..1b2ac42 100644
--- a/DEmon/VirtualConveyor/VirtualConveyor.csproj
+++ b/DEmon/VirtualConveyor/VirtualConveyor.csproj
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualConveyor</RootNamespace>
<AssemblyName>VirtualConveyor</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/DEmon/VirtualSrm/App.config b/DEmon/VirtualSrm/App.config
index 089f606..43cb29b 100644
--- a/DEmon/VirtualSrm/App.config
+++ b/DEmon/VirtualSrm/App.config
@@ -1,22 +1,20 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
</configSections>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<system.serviceModel>
<bindings>
<basicHttpBinding>
- <binding name="BasicHttpBinding_IOpcWcfService" />
+ <binding name="BasicHttpBinding_IOpcWcfService"/>
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.43.121:8733/Design_Time_Addresses/iWareOpc.Wcf/OpcWcfService/"
- binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IOpcWcfService"
- contract="OpcWcfService.IOpcWcfService" name="BasicHttpBinding_IOpcWcfService" />
+ <endpoint address="http://192.168.43.121:8733/Design_Time_Addresses/iWareOpc.Wcf/OpcWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IOpcWcfService" contract="OpcWcfService.IOpcWcfService" name="BasicHttpBinding_IOpcWcfService"/>
</client>
</system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/DEmon/VirtualSrm/Properties/Resources.Designer.cs b/DEmon/VirtualSrm/Properties/Resources.Designer.cs
index 6a18ff2..366ac78 100644
--- a/DEmon/VirtualSrm/Properties/Resources.Designer.cs
+++ b/DEmon/VirtualSrm/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/DEmon/VirtualSrm/Properties/Settings.Designer.cs b/DEmon/VirtualSrm/Properties/Settings.Designer.cs
index ab25a20..15951ba 100644
--- a/DEmon/VirtualSrm/Properties/Settings.Designer.cs
+++ b/DEmon/VirtualSrm/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.6.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/DEmon/VirtualSrm/VirtualSrm.csproj b/DEmon/VirtualSrm/VirtualSrm.csproj
index 1f3fe22..d8752f2 100644
--- a/DEmon/VirtualSrm/VirtualSrm.csproj
+++ b/DEmon/VirtualSrm/VirtualSrm.csproj
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualSrm</RootNamespace>
<AssemblyName>VirtualSrm</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/DEmon/WebWIPAPI/Properties/Resources.Designer.cs b/DEmon/WebWIPAPI/Properties/Resources.Designer.cs
index 004f45f..0ae5583 100644
--- a/DEmon/WebWIPAPI/Properties/Resources.Designer.cs
+++ b/DEmon/WebWIPAPI/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/DEmon/WebWIPAPI/Web.config b/DEmon/WebWIPAPI/Web.config
index fe0834f..6bdc355 100644
--- a/DEmon/WebWIPAPI/Web.config
+++ b/DEmon/WebWIPAPI/Web.config
@@ -1,35 +1,41 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-
-
+锘�<?xml version="1.0"?>
<configuration>
- <appSettings>
- <add key="webpages:Version" value="2.0.0.0" />
- <add key="webpages:Enabled" value="false" />
- <add key="PreserveLoginUrl" value="true" />
- <add key="ClientValidationEnabled" value="true" />
- <add key="UnobtrusiveJavaScriptEnabled" value="true" />
- <add key="aspnet:MaxJsonDeserializerMembers" value="2147483647" />
- </appSettings>
+ <appSettings>
+ <add key="webpages:Version" value="2.0.0.0"/>
+ <add key="webpages:Enabled" value="false"/>
+ <add key="PreserveLoginUrl" value="true"/>
+ <add key="ClientValidationEnabled" value="true"/>
+ <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+ <add key="aspnet:MaxJsonDeserializerMembers" value="2147483647"/>
+ </appSettings>
+ <location path="." inheritInChildApplications="false">
+ <system.web>
+ <httpRuntime targetFramework="4.5"/>
+ <compilation debug="true" targetFramework="4.5"/>
+ <pages>
+ <namespaces>
+ <add namespace="System.Web.Helpers"/>
+ <add namespace="System.Web.Mvc"/>
+ <add namespace="System.Web.Mvc.Ajax"/>
+ <add namespace="System.Web.Mvc.Html"/>
+ <add namespace="System.Web.Routing"/>
+ <add namespace="System.Web.WebPages"/>
+ </namespaces>
+ </pages>
+ </system.web>
+ </location>
+ <system.webServer>
+ <validation validateIntegratedModeConfiguration="false"/>
+ </system.webServer>
+ <!--
+ 鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
- <location path="." inheritInChildApplications="false">
- <system.web>
- <httpRuntime targetFramework="4.5" />
- <compilation debug="true" targetFramework="4.5" />
-
- <pages>
- <namespaces>
- <add namespace="System.Web.Helpers" />
- <add namespace="System.Web.Mvc" />
- <add namespace="System.Web.Mvc.Ajax" />
- <add namespace="System.Web.Mvc.Html" />
- <add namespace="System.Web.Routing" />
- <add namespace="System.Web.WebPages" />
- </namespaces>
- </pages>
- </system.web>
- </location>
-
- <system.webServer>
- <validation validateIntegratedModeConfiguration="false" />
- </system.webServer>
-</configuration>
+ 鍙湪 <httpRuntime> 鏍囪涓婅缃互涓嬬壒鎬с��
+ <system.Web>
+ <httpRuntime targetFramework="4.8" />
+ </system.Web>
+ -->
+ <system.web>
+ <compilation targetFramework="4.8"/>
+ </system.web>
+</configuration>
\ No newline at end of file
diff --git a/DEmon/WebWIPAPI/WebWIPAPI.csproj b/DEmon/WebWIPAPI/WebWIPAPI.csproj
index 0cf0e74..4f79c80 100644
--- a/DEmon/WebWIPAPI/WebWIPAPI.csproj
+++ b/DEmon/WebWIPAPI/WebWIPAPI.csproj
@@ -13,13 +13,16 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebWIPAPI</RootNamespace>
<AssemblyName>WebWIPAPI</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
+ <TargetFrameworkProfile />
+ <Use64BitIISExpress />
+ <UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/DEmon/iWareCc/App.config b/DEmon/iWareCc/App.config
index dd014a3..a97ea7c 100644
--- a/DEmon/iWareCc/App.config
+++ b/DEmon/iWareCc/App.config
@@ -1,15 +1,15 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
- <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>
<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>
@@ -18,15 +18,15 @@
<service name="iWareCc.WCF.ControlCenter.ControlCenterWcfService">
<endpoint address="" binding="basicHttpBinding" contract="iWareCc.WCF.ControlCenter.IControlCenterWcfService">
<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://192.168.1.200:8733/Design_Time_Addresses/iWareCc.WCF.ControlCenter/ControlCenterWcfService/" />
+ <add baseAddress="http://192.168.1.200:8733/Design_Time_Addresses/iWareCc.WCF.ControlCenter/ControlCenterWcfService/"/>
</baseAddresses>
</host>
</service>
@@ -35,7 +35,7 @@
<behaviors>
<serviceBehaviors>
<behavior name="">
- <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" />
+ <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true"/>
<serviceDebug includeExceptionDetailInFaults="true"/>
</behavior>
</serviceBehaviors>
@@ -43,30 +43,28 @@
<bindings>
<basicHttpBinding>
- <binding name="BasicHttpBinding_IOpcWcfService" />
+ <binding name="BasicHttpBinding_IOpcWcfService"/>
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.1.200:8733/Design_Time_Addresses/iWareOpc.Wcf/OpcWcfService/"
- binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IOpcWcfService"
- contract="OpcWcfService.IOpcWcfService" name="BasicHttpBinding_IOpcWcfService" />
+ <endpoint address="http://192.168.1.200:8733/Design_Time_Addresses/iWareOpc.Wcf/OpcWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IOpcWcfService" contract="OpcWcfService.IOpcWcfService" name="BasicHttpBinding_IOpcWcfService"/>
</client>
</system.serviceModel>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
+ <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<connectionStrings>
- <add name="DbModelExcel" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_EXCEL;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
- <add name="DbModelLog" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_LOG;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
- <add name="DbModelCore" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_CORE;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+ <add name="DbModelExcel" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_EXCEL;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
+ <add name="DbModelLog" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_LOG;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
+ <add name="DbModelCore" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_CORE;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/DEmon/iWareCc/Conveyor/Service/GateService.cs b/DEmon/iWareCc/Conveyor/Service/GateService.cs
index 9704f8b..967a7d3 100644
--- a/DEmon/iWareCc/Conveyor/Service/GateService.cs
+++ b/DEmon/iWareCc/Conveyor/Service/GateService.cs
@@ -327,7 +327,7 @@
GateDatagramProp prop = new GateDatagramAnalyze().SCAnalyze(ASCIIEncoding.ASCII.GetBytes(msg));
if (!string.IsNullOrEmpty(prop.MaterialCode))
{
- GateEntity.RCheckMaterialCode = prop.MaterialCode.Trim();
+ GateEntity.RCheckMaterialCode = prop.MaterialCode.Replace("\r", "").Replace("\0", "").Trim();
}
}
catch (Exception ex)
diff --git "a/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs"
index d8b484f..f18f42e 100644
--- "a/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs"
@@ -61,7 +61,7 @@
return;
}
- var task = dbModel.TASKPartTasks.OrderByDescending(x => x.priority).ThenBy(x => x.createtime).FirstOrDefault(x => x.type == (int)EPartTaskType.鍫嗗灈鏈轰换鍔� && x.isreleased == (int)EYesOrNo.鍚� && x.isfinished == (int)EYesOrNo.鍚� && x.equipid == Stacker.Equipment.Id);
+ var task = dbModel.TASKPartTasks.OrderByDescending(x=>x.maintasktype == (int)EMainTaskType.鍑哄簱浠诲姟).OrderByDescending(x => x.priority).ThenBy(x => x.createtime).FirstOrDefault(x => x.type == (int)EPartTaskType.鍫嗗灈鏈轰换鍔� && x.isreleased == (int)EYesOrNo.鍚� && x.isfinished == (int)EYesOrNo.鍚� && x.equipid == Stacker.Equipment.Id);
if (task == null)
{
@@ -86,6 +86,7 @@
return;
}
}
+ // 杩欐浠ｇ爜鎴戝笇鏈涘湪鍑哄簱鍙ｆ湁鏂欏拰褰撳墠鏈夋湭瀹屾垚鐨勫嚭搴撹緭閫佺嚎浠诲姟鏃秚ask鏃秚ask涓嶅彇鍑哄簱浠诲姟鎬庝箞淇敼浠ｇ爜
DecompositionTaskContainer.PartTask = new PartTaskEntity(task);
LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鎵ц鍫嗗灈鏈轰换鍔℃祦绋�/" + Stacker.Equipment.EquipName, "閫夋嫨涓�涓湭鎵ц鐨勫爢鍨涙満鐨勪换鍔�:{0}", DecompositionTaskContainer.PartTask.Id);
diff --git a/DEmon/iWareCc/Properties/Resources.Designer.cs b/DEmon/iWareCc/Properties/Resources.Designer.cs
index 1213056..c9240fa 100644
--- a/DEmon/iWareCc/Properties/Resources.Designer.cs
+++ b/DEmon/iWareCc/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
锘�//------------------------------------------------------------------------------
// <auto-generated>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.18444
+// 杩愯鏃剁増鏈�:4.0.30319.42000
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
@@ -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/DEmon/iWareCc/iWareCc.csproj b/DEmon/iWareCc/iWareCc.csproj
index f941b31..31c81e2 100644
--- a/DEmon/iWareCc/iWareCc.csproj
+++ b/DEmon/iWareCc/iWareCc.csproj
@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareCc</RootNamespace>
<AssemblyName>iWareCc</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>bb4a7afd</NuGetPackageImportStamp>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/DEmon/iWareCommon/App.config b/DEmon/iWareCommon/App.config
index ba20005..c0d0303 100644
--- a/DEmon/iWareCommon/App.config
+++ b/DEmon/iWareCommon/App.config
@@ -1,13 +1,13 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
- <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>
<entityFramework>
- <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+ <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
<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>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/DEmon/iWareCommon/Properties/Resources.Designer.cs b/DEmon/iWareCommon/Properties/Resources.Designer.cs
index 7f3345f..533031a 100644
--- a/DEmon/iWareCommon/Properties/Resources.Designer.cs
+++ b/DEmon/iWareCommon/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/DEmon/iWareCommon/iWareCommon.csproj b/DEmon/iWareCommon/iWareCommon.csproj
index ac80c0d..88c7843 100644
--- a/DEmon/iWareCommon/iWareCommon.csproj
+++ b/DEmon/iWareCommon/iWareCommon.csproj
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareCommon</RootNamespace>
<AssemblyName>iWareCommon</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/DEmon/iWareDataCore/App.config b/DEmon/iWareDataCore/App.config
index 24b3652..b3eb19e 100644
--- a/DEmon/iWareDataCore/App.config
+++ b/DEmon/iWareDataCore/App.config
@@ -1,4 +1,4 @@
-锘�<?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 -->
@@ -6,11 +6,11 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
+ <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<connectionStrings>
-<add name="DbModelCore" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_CORE;user id=sa;password=123abc.com;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /></connectionStrings>
-</configuration>
\ No newline at end of file
+<add name="DbModelCore" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_CORE;user id=sa;password=123abc.com;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient"/></connectionStrings>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/DEmon/iWareDataCore/Properties/Resources.Designer.cs b/DEmon/iWareDataCore/Properties/Resources.Designer.cs
index 632cfce..12f27d1 100644
--- a/DEmon/iWareDataCore/Properties/Resources.Designer.cs
+++ b/DEmon/iWareDataCore/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
锘�//------------------------------------------------------------------------------
// <auto-generated>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.18444
+// 杩愯鏃剁増鏈�:4.0.30319.42000
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
@@ -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/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs b/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs
index 31e7827..bcb210a 100644
--- a/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs
+++ b/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs
@@ -271,7 +271,7 @@
}
catch (Exception ex)
{
-
+ LogTextHelper.WriteLine(Resources.LogDir+"@/MainTask/", ex.Message + "浼犲叆鍙傛暟" + ida.ToString());
msg = ex.Message;
return -1;
}
diff --git a/DEmon/iWareDataCore/iWareDataCore.csproj b/DEmon/iWareDataCore/iWareDataCore.csproj
index 2a73e32..3c0274e 100644
--- a/DEmon/iWareDataCore/iWareDataCore.csproj
+++ b/DEmon/iWareDataCore/iWareDataCore.csproj
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareDataCore</RootNamespace>
<AssemblyName>iWareDataCore</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/DEmon/iWareLog/App.config b/DEmon/iWareLog/App.config
index a391dc5..01a9739 100644
--- a/DEmon/iWareLog/App.config
+++ b/DEmon/iWareLog/App.config
@@ -1,8 +1,8 @@
-锘�<?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 -->
</configSections>
<connectionStrings>
- <add name="DbModelLog" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_LOG;user id=sa;password=123abc.com;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /></connectionStrings>
-</configuration>
\ No newline at end of file
+ <add name="DbModelLog" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_LOG;user id=sa;password=123abc.com;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient"/></connectionStrings>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/DEmon/iWareLog/Properties/Resources.Designer.cs b/DEmon/iWareLog/Properties/Resources.Designer.cs
index cf1cbac..e131ce0 100644
--- a/DEmon/iWareLog/Properties/Resources.Designer.cs
+++ b/DEmon/iWareLog/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
锘�//------------------------------------------------------------------------------
// <auto-generated>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.18444
+// 杩愯鏃剁増鏈�:4.0.30319.42000
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
@@ -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/DEmon/iWareLog/iWareLog.csproj b/DEmon/iWareLog/iWareLog.csproj
index 583399c..36dbd8e 100644
--- a/DEmon/iWareLog/iWareLog.csproj
+++ b/DEmon/iWareLog/iWareLog.csproj
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareLog</RootNamespace>
<AssemblyName>iWareLog</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/DEmon/iWarePod/Properties/Resources.Designer.cs b/DEmon/iWarePod/Properties/Resources.Designer.cs
index 3e776e5..ab9c690 100644
--- a/DEmon/iWarePod/Properties/Resources.Designer.cs
+++ b/DEmon/iWarePod/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/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource
index 6645b22..4fd001b 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ConveyorInfoEntity" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.ConveyorInfoEntity, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.ConveyorInfoEntity, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource
index 448d1ea..19c104d 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GateInfoEntity" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.GateInfoEntity, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GateInfoEntity, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfoResponse.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfoResponse.datasource
index ef56679..67d64e3 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfoResponse.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfoResponse.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetConveyorInfoResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfoResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfoResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource
index 6d9e887..17dc5ca 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetConveyorInfosResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfosResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfosResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetGateInfoResponse.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetGateInfoResponse.datasource
index 8b965f1..cdb6331 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetGateInfoResponse.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetGateInfoResponse.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetGateInfoResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.GetGateInfoResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetGateInfoResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfoResponse.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfoResponse.datasource
index 3a52cbc..b252165 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfoResponse.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfoResponse.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetStackInfoResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfoResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfoResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfosResponse.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfosResponse.datasource
index 15d3de4..d84dbe4 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfosResponse.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfosResponse.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetStackInfosResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfosResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfosResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource
index 6e7a468..39c971e 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="SendAndChackMaterialResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource
index 980aa1b..806c48b 100644
--- a/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource
+++ b/DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="StackerInfoEntity" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>iWarePod.ControlCenterWcfService.StackerInfoEntity, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.StackerInfoEntity, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
diff --git a/DEmon/iWarePod/Web.config b/DEmon/iWarePod/Web.config
index 36b749c..141431e 100644
--- a/DEmon/iWarePod/Web.config
+++ b/DEmon/iWarePod/Web.config
@@ -1,63 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
<configuration>
- <appSettings>
- <add key="webpages:Version" value="2.0.0.0"/>
- <add key="webpages:Enabled" value="false"/>
- <add key="PreserveLoginUrl" value="true"/>
- <add key="ClientValidationEnabled" value="true"/>
- <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
- </appSettings>
+ <appSettings>
+ <add key="webpages:Version" value="2.0.0.0"/>
+ <add key="webpages:Enabled" value="false"/>
+ <add key="PreserveLoginUrl" value="true"/>
+ <add key="ClientValidationEnabled" value="true"/>
+ <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+ </appSettings>
+ <!--
+ 鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
- <system.web>
- <httpRuntime targetFramework="4.5"/>
- <compilation debug="true" targetFramework="4.5"/>
- <pages>
- <namespaces>
- <add namespace="System.Web.Helpers"/>
- <add namespace="System.Web.Mvc"/>
- <add namespace="System.Web.Mvc.Ajax"/>
- <add namespace="System.Web.Mvc.Html"/>
- <add namespace="System.Web.Routing"/>
- <add namespace="System.Web.WebPages"/>
- </namespaces>
- </pages>
- </system.web>
-
- <system.webServer>
- <validation validateIntegratedModeConfiguration="false"/>
- <handlers>
- <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit"/>
- <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit"/>
- <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
- <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0"/>
- <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0"/>
- <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
- </handlers>
- <directoryBrowse enabled="true"/>
- </system.webServer>
-
- <system.serviceModel>
- <bindings>
- <basicHttpBinding>
- <binding name="BasicHttpBinding_IControlCenterWcfService"/>
- </basicHttpBinding>
- </bindings>
- <client>
- <endpoint address="http://127.0.0.1:8733/Design_Time_Addresses/iWareCc.WCF.ControlCenter/ControlCenterWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IControlCenterWcfService" contract="ControlCenterWcfService.IControlCenterWcfService" name="BasicHttpBinding_IControlCenterWcfService"/>
- </client>
- </system.serviceModel>
-
+ 鍙湪 <httpRuntime> 鏍囪涓婅缃互涓嬬壒鎬с��
+ <system.Web>
+ <httpRuntime targetFramework="4.8" />
+ </system.Web>
+ -->
+ <system.web>
+ <httpRuntime targetFramework="4.5"/>
+ <compilation debug="true" targetFramework="4.8"/>
+ <pages>
+ <namespaces>
+ <add namespace="System.Web.Helpers"/>
+ <add namespace="System.Web.Mvc"/>
+ <add namespace="System.Web.Mvc.Ajax"/>
+ <add namespace="System.Web.Mvc.Html"/>
+ <add namespace="System.Web.Routing"/>
+ <add namespace="System.Web.WebPages"/>
+ </namespaces>
+ </pages>
+ </system.web>
+ <system.webServer>
+ <validation validateIntegratedModeConfiguration="false"/>
+ <handlers>
+ <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit"/>
+ <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit"/>
+ <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
+ <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0"/>
+ <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0"/>
+ <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+ </handlers>
+ <directoryBrowse enabled="true"/>
+ </system.webServer>
+ <system.serviceModel>
+ <bindings>
+ <basicHttpBinding>
+ <binding name="BasicHttpBinding_IControlCenterWcfService"/>
+ </basicHttpBinding>
+ </bindings>
+ <client>
+ <endpoint address="http://127.0.0.1:8733/Design_Time_Addresses/iWareCc.WCF.ControlCenter/ControlCenterWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IControlCenterWcfService" contract="ControlCenterWcfService.IControlCenterWcfService" name="BasicHttpBinding_IControlCenterWcfService"/>
+ </client>
+ </system.serviceModel>
<connectionStrings>
<add name="DbModelExcel" connectionString="data source=.;initial catalog=WGQ_WB19011_EXCEL;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
<add name="DbModelLog" connectionString="data source=.;initial catalog=WGQ_WB19011_LOG;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
<add name="DbModelCore" connectionString="data source=.;initial catalog=WGQ_WB19011_CORE;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
</connectionStrings>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
-</configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/DEmon/iWarePod/iWarePod.csproj b/DEmon/iWarePod/iWarePod.csproj
index 2eca1db..bc26dd6 100644
--- a/DEmon/iWarePod/iWarePod.csproj
+++ b/DEmon/iWarePod/iWarePod.csproj
@@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWarePod</RootNamespace>
<AssemblyName>iWarePod</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
@@ -24,6 +24,7 @@
<TypeScriptToolsVersion>1.0</TypeScriptToolsVersion>
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/DEmon/iWareWebservice/Web.config b/DEmon/iWareWebservice/Web.config
index 6c6a5ef..b5f222d 100644
--- a/DEmon/iWareWebservice/Web.config
+++ b/DEmon/iWareWebservice/Web.config
@@ -1,28 +1,36 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0"?>
<!--
鏈夊叧濡備綍閰嶇疆 ASP.NET 搴旂敤绋嬪簭鐨勮缁嗕俊鎭紝璇疯闂�
https://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
- <connectionStrings>
- <add name="SysDb" connectionString="server=127.0.0.1;database=WGQ_WB19011_CORE;uid=sa;pwd=123abc.com;pooling=false;" providerName="System.Data.SqlClient" />
- </connectionStrings>
- <appSettings>
- <!-- ================== 1锛歵oken ================== -->
- <add key="reqToken" value="596369538459835834578" />
- <add key="LogDir" value="D:\LOG_WMS" />
- </appSettings>
+ <connectionStrings>
+ <add name="SysDb" connectionString="server=127.0.0.1;database=WGQ_WB19011_CORE;uid=sa;pwd=123abc.com;pooling=false;" providerName="System.Data.SqlClient"/>
+ </connectionStrings>
+ <appSettings>
+ <!-- ================== 1锛歵oken ================== -->
+ <add key="reqToken" value="596369538459835834578"/>
+ <add key="LogDir" value="D:\LOG_WMS"/>
+ </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" />
+ <compilation debug="true" targetFramework="4.8"/>
+ <httpRuntime targetFramework="4.5"/>
</system.web>
- <system.webServer>
- <directoryBrowse enabled="true" />
- </system.webServer>
+ <system.webServer>
+ <directoryBrowse enabled="true"/>
+ </system.webServer>
<system.codedom>
<compilers>
- <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
- <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+" />
+ <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
+ <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
</compilers>
</system.codedom>
</configuration>
\ No newline at end of file
diff --git a/DEmon/iWareWebservice/iWareWebservice.csproj b/DEmon/iWareWebservice/iWareWebservice.csproj
index 472d718..92db9b7 100644
--- a/DEmon/iWareWebservice/iWareWebservice.csproj
+++ b/DEmon/iWareWebservice/iWareWebservice.csproj
@@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareWebservice</RootNamespace>
<AssemblyName>iWareWebservice</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort>44324</IISExpressSSLPort>
@@ -23,6 +23,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
--
Gitblit v1.9.3