From b7bb4bf8ee6d007e0e7c3cacfc4fab77049beb58 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 20 8月 2025 17:08:43 +0800
Subject: [PATCH] 同步代码
---
DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
DEmon/iWareCommon/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll | 0
DEmon/iWareLog/App.config | 6
DEmon/iWareCc/App.config | 34 +
DEmon/WebWIPAPI/Web.config | 74 ++--
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource | 2
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/VirtualConveyor/Properties/Settings.Designer.cs | 2
DEmon/VirtualConveyor/App.config | 12
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource | 2
DEmon/iWareCommon/obj/Debug/iWareCommon.pdb | 0
DEmon/iWarePod/modules/task/conveyor-monitor/conveyor-monitor-detail1.htm | 4
DEmon/iWareDataCore/App.config | 10
DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.CoreCompileInputs.cache | 2
DEmon/iWareCommon/obj/Debug/iWareCommon.dll | 0
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource | 2
DEmon/iWarePod/Web.config | 116 +++---
DEmon/iWareCc/DecomposeTask/Chain/按策略获取一个待分解任务.cs | 20 +
DEmon/iWareCommon/iWareCommon.csproj | 6
DEmon/iWareLog/Properties/Resources.Designer.cs | 8
DEmon/iWareCommon/App.config | 10
DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
DEmon/VirtualSrm/App.config | 12
DEmon/iWareDataCore/Properties/Resources.Designer.cs | 8
DEmon/iWareWebservice/iWareWebservice.csproj | 3
DEmon/VirtualConveyor/Properties/Resources.Designer.cs | 6
DEmon/iWareCommon/Properties/Resources.Designer.cs | 6
DEmon/iWareCommon/bin/Debug/iWareCommon.pdb | 0
DEmon/VirtualSrm/Properties/Settings.Designer.cs | 2
DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs | 30 +
DEmon/iWareCc/Properties/Resources.Designer.cs | 8
DEmon/iWareDataCore/TASK/Service/MainTaskService.cs | 53 +-
DEmon/iWareWms/iWareWms.csproj | 9
DEmon/iWareCommon/bin/Debug/iWareCommon.dll.config | 10
DEmon/iWareCommon/bin/Debug/iWareCommon.dll | 0
DEmon/iWareCc/iWareCc.csproj | 50 ++
DEmon/iWareCc/DecomposeTask/Strategy/出库任务/Chain/判断堆垛机是否空闲.cs | 12
DEmon/VirtualSrm/Properties/Resources.Designer.cs | 6
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/OpcAccess/Properties/Resources.Designer.cs | 6
DEmon/WebWIPAPI/Properties/Resources.Designer.cs | 6
DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs | 2
DEmon/VirtualConveyor/VirtualConveyor.csproj | 3
DEmon/iWarePod/iWarePod.csproj | 4
DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.GenerateResource.cache | 0
DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.FileListAbsolute.txt | 315 ++++++++++++++++++
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/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource | 2
DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.AssemblyReference.cache | 0
DEmon/iWareCc/DoStackerTaskAuto/Chain/选择一个未执行的堆垛机的任务.cs | 33 +
DEmon/iWareDataCore/BASE/EnumType/EMaterialType.cs | 1
DEmon/iWareLog/iWareLog.csproj | 3
61 files changed, 691 insertions(+), 280 deletions(-)
diff --git a/DEmon/OpcAccess/OpcAccess.csproj b/DEmon/OpcAccess/OpcAccess.csproj
index 1f615d5..8d7e27f 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.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
diff --git a/DEmon/OpcAccess/Properties/Resources.Designer.cs b/DEmon/OpcAccess/Properties/Resources.Designer.cs
index 432b12a..b6fbff7 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", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 cc64fdf..750945b 100644
--- a/DEmon/VirtualConveyor/App.config
+++ b/DEmon/VirtualConveyor/App.config
@@ -1,20 +1,22 @@
-<?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.8"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</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>
+</configuration>
\ No newline at end of file
diff --git a/DEmon/VirtualConveyor/Properties/Resources.Designer.cs b/DEmon/VirtualConveyor/Properties/Resources.Designer.cs
index b60c51c..4505907 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", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 30c64c6..7db9c18 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", "17.6.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.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 eec0bbf..794238a 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.42000
+// 杩愯鏃剁増鏈�:4.0.30319.18444
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
diff --git a/DEmon/VirtualConveyor/VirtualConveyor.csproj b/DEmon/VirtualConveyor/VirtualConveyor.csproj
index 1b2ac42..86a6828 100644
--- a/DEmon/VirtualConveyor/VirtualConveyor.csproj
+++ b/DEmon/VirtualConveyor/VirtualConveyor.csproj
@@ -9,9 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualConveyor</RootNamespace>
<AssemblyName>VirtualConveyor</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</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 43cb29b..089f606 100644
--- a/DEmon/VirtualSrm/App.config
+++ b/DEmon/VirtualSrm/App.config
@@ -1,20 +1,22 @@
-<?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.8"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</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>
+</configuration>
\ No newline at end of file
diff --git a/DEmon/VirtualSrm/Properties/Resources.Designer.cs b/DEmon/VirtualSrm/Properties/Resources.Designer.cs
index 366ac78..6a18ff2 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", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 15951ba..ab25a20 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", "17.6.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.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 d8752f2..1f3fe22 100644
--- a/DEmon/VirtualSrm/VirtualSrm.csproj
+++ b/DEmon/VirtualSrm/VirtualSrm.csproj
@@ -9,9 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualSrm</RootNamespace>
<AssemblyName>VirtualSrm</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</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 0ae5583..004f45f 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", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 6bdc355..fe0834f 100644
--- a/DEmon/WebWIPAPI/Web.config
+++ b/DEmon/WebWIPAPI/Web.config
@@ -1,41 +1,35 @@
-锘�<?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>
- <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銆�
+锘�<?xml version="1.0" encoding="utf-8"?>
- 鍙湪 <httpRuntime> 鏍囪涓婅缃互涓嬬壒鎬с��
- <system.Web>
- <httpRuntime targetFramework="4.8" />
- </system.Web>
- -->
- <system.web>
- <compilation targetFramework="4.8"/>
- </system.web>
-</configuration>
\ No newline at end of file
+
+<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>
+
+ <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>
diff --git a/DEmon/WebWIPAPI/WebWIPAPI.csproj b/DEmon/WebWIPAPI/WebWIPAPI.csproj
index 4f79c80..0cf0e74 100644
--- a/DEmon/WebWIPAPI/WebWIPAPI.csproj
+++ b/DEmon/WebWIPAPI/WebWIPAPI.csproj
@@ -13,16 +13,13 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebWIPAPI</RootNamespace>
<AssemblyName>WebWIPAPI</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</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 a97ea7c..dd014a3 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.8"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</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,28 +43,30 @@
<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>
+</configuration>
\ No newline at end of file
diff --git a/DEmon/iWareCc/Conveyor/Service/GateService.cs b/DEmon/iWareCc/Conveyor/Service/GateService.cs
index 967a7d3..0c289d8 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.Replace("\r", "").Replace("\0", "").Trim();
+ GateEntity.RCheckMaterialCode = prop.MaterialCode.Replace("\r","").Replace("\0","").Trim();
}
}
catch (Exception ex)
diff --git "a/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs"
index 95c644c..c79be7d 100644
--- "a/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs"
@@ -51,12 +51,30 @@
{
try
{
- var mTask = dbModel.TASKMainTasks.OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙�);
+ TASKMainTask mTask = null;
+ var taskPart = dbModel.TASKPartTasks.FirstOrDefault(x => x.maintasktype == (int)EMainTaskType.鍑哄簱浠诲姟 && x.isfinished == 0);
+ if (taskPart != null)
+ {
+ mTask = dbModel.TASKMainTasks.OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙� && x.tasktype == (int)EMainTaskType.鍏ュ簱浠诲姟);
+ }
+ else
+ {
+ mTask = dbModel.TASKMainTasks.OrderBy(x => x.tasktype == (int)EMainTaskType.鍑哄簱浠诲姟).OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙�);
+ if (mTask == null)
+ {
+ mTask = dbModel.TASKMainTasks.OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙�);
+ }
+ }
if (mTask == null)
{
LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "鑾峰彇绗竴涓垎瑙ｄ换鍔�:鏆傛棤寰呭垎瑙ｇ殑浠诲姟");
return;
}
+ if (taskPart != null && mTask.tasktype == (int)EMainTaskType.鍑哄簱浠诲姟)
+ {
+ LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "褰撳墠瀛樺湪鏈畬鎴愮殑鍑哄簱浠诲姟");
+ return;
+ }
mTask.decompositiontimes += 1;
if (mTask.decompositiontimes >= 100)
{
diff --git "a/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs" "b/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs"
index 22d4b52..20e6b5b 100644
--- "a/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs"
+++ "b/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs"
@@ -51,12 +51,12 @@
string msg;
- if (!stacker.CanDecomposeTask(out msg))
- {
- ResultContainer.Msg = msg;
- LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "鍒ゆ柇涓庝换鍔″尮閰嶇殑鍫嗗灈鏈烘槸鍚︾┖闂�:{0}", msg);
- return;
- }
+ //if (!stacker.CanDecomposeTask(out msg))
+ //{
+ // ResultContainer.Msg = msg;
+ // LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "鍒ゆ柇涓庝换鍔″尮閰嶇殑鍫嗗灈鏈烘槸鍚︾┖闂�:{0}", msg);
+ // return;
+ //}
var conveyor = CacheEntity.Conveyors.FirstOrDefault(x => x.Equipment.EquipName == "conveyor2");
var gate = conveyor.Gates.FirstOrDefault(x => x.Place.PlaceTypeName == "gate21");
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 f18f42e..567fbb5 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"
@@ -60,8 +60,38 @@
LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鎵ц鍫嗗灈鏈轰换鍔℃祦绋�/" + Stacker.Equipment.EquipName, "閫夋嫨涓�涓湭鎵ц鐨勫爢鍨涙満鐨勪换鍔�:鍫嗗灈鏈簕0}涓嶈兘鎵ц浠诲姟--{1}", Stacker.Equipment.EquipName, msg);
return;
}
+ TASKPartTask task = null;
- 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);
+ var currentGate = CacheEntity.Conveyors.Find(x => x.Equipment.EquipName == "conveyor2").Gates.FirstOrDefault(x => x.Place.PlaceTypeName == "gate21");
+ var currentGate22 = CacheEntity.Conveyors.Find(x => x.Equipment.EquipName == "conveyor2").Gates.FirstOrDefault(x => x.Place.PlaceTypeName == "gate22");
+ var isGate = !currentGate.RIsEmpty || !currentGate22.RIsEmpty;
+
+ var currentCovTask = dbModel.TASKPartTasks.FirstOrDefault(x => x.isfinished == 0 && x.sourceplace == "100201" && x.toplace == "100202");
+
+ // 閫夋嫨鎵ц鍏ュ簱杩樻槸鍑哄簱鐨勪换鍔�(浼樺厛鍑哄簱鍐嶅叆搴�)
+ if (isGate || currentCovTask != null)
+ {
+ 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);
+
+ }
+ else
+ {
+ task = dbModel.TASKPartTasks
+ .OrderBy(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)
+ {
+ task = dbModel.TASKPartTasks
+ .OrderBy(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,7 +116,6 @@
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 c9240fa..1213056 100644
--- a/DEmon/iWareCc/Properties/Resources.Designer.cs
+++ b/DEmon/iWareCc/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
锘�//------------------------------------------------------------------------------
// <auto-generated>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.42000
+// 杩愯鏃剁増鏈�:4.0.30319.18444
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
@@ -19,7 +19,7 @@
// 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆�
// 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
// (浠� /str 浣滀负鍛戒护閫夐」)锛屾垨閲嶆柊鐢熸垚 VS 椤圭洰銆�
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 31c81e2..863e321 100644
--- a/DEmon/iWareCc/iWareCc.csproj
+++ b/DEmon/iWareCc/iWareCc.csproj
@@ -9,10 +9,25 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareCc</RootNamespace>
<AssemblyName>iWareCc</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>bb4a7afd</NuGetPackageImportStamp>
- <TargetFrameworkProfile />
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <PublishUrl>C:\Users\Administrator\Desktop\cc\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>1</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <PublishWizardCompleted>true</PublishWizardCompleted>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +48,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>true</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestCertificateThumbprint>2AA58B38C4B9A0329AA56966E32AA2D70E3A3BEB</ManifestCertificateThumbprint>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestKeyFile>iWareCc_TemporaryKey.pfx</ManifestKeyFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <GenerateManifests>true</GenerateManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autofac">
@@ -190,6 +217,7 @@
<None Include="App.config">
<SubType>Designer</SubType>
</None>
+ <None Include="iWareCc_TemporaryKey.pfx" />
<None Include="Note\WindowsServiceInstall.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>WindowsServiceInstall.txt</LastGenOutput>
@@ -253,7 +281,23 @@
<ItemGroup>
<WCFMetadataStorage Include="Service References\OpcWcfService\" />
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+ <Visible>False</Visible>
+ <ProductName>Microsoft .NET Framework 4.5 %28x86 鍜� x64%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/DEmon/iWareCommon/App.config b/DEmon/iWareCommon/App.config
index c0d0303..ba20005 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>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+</configuration>
\ No newline at end of file
diff --git a/DEmon/iWareCommon/Properties/Resources.Designer.cs b/DEmon/iWareCommon/Properties/Resources.Designer.cs
index 533031a..7f3345f 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", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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/bin/Debug/iWareCommon.dll b/DEmon/iWareCommon/bin/Debug/iWareCommon.dll
index 879efd9..9a86085 100644
--- a/DEmon/iWareCommon/bin/Debug/iWareCommon.dll
+++ b/DEmon/iWareCommon/bin/Debug/iWareCommon.dll
Binary files differ
diff --git a/DEmon/iWareCommon/bin/Debug/iWareCommon.dll.config b/DEmon/iWareCommon/bin/Debug/iWareCommon.dll.config
index c0d0303..ba20005 100644
--- a/DEmon/iWareCommon/bin/Debug/iWareCommon.dll.config
+++ b/DEmon/iWareCommon/bin/Debug/iWareCommon.dll.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>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+</configuration>
\ No newline at end of file
diff --git a/DEmon/iWareCommon/bin/Debug/iWareCommon.pdb b/DEmon/iWareCommon/bin/Debug/iWareCommon.pdb
index 04b1ae8..ccfb5a5 100644
--- a/DEmon/iWareCommon/bin/Debug/iWareCommon.pdb
+++ b/DEmon/iWareCommon/bin/Debug/iWareCommon.pdb
Binary files differ
diff --git a/DEmon/iWareCommon/iWareCommon.csproj b/DEmon/iWareCommon/iWareCommon.csproj
index 8116a65..ac80c0d 100644
--- a/DEmon/iWareCommon/iWareCommon.csproj
+++ b/DEmon/iWareCommon/iWareCommon.csproj
@@ -9,9 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareCommon</RootNamespace>
<AssemblyName>iWareCommon</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -163,9 +162,6 @@
<Content Include="notes\LZW鍘嬬缉绠楁硶.jpg" />
<Content Include="notes\LZW瑙ｅ帇绠楁硶.jpg" />
<Content Include="notes\note.txt" />
- </ItemGroup>
- <ItemGroup>
- <WCFMetadata Include="Connected Services\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 29f019d..c1463fd 100644
--- a/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 9f61593..6e45eee 100644
--- a/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/DEmon/iWareCommon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/DEmon/iWareCommon/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/DEmon/iWareCommon/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
index 0dec9e1..502b5a3 100644
--- a/DEmon/iWareCommon/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
+++ b/DEmon/iWareCommon/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
Binary files differ
diff --git a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.AssemblyReference.cache b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.AssemblyReference.cache
index 07522f0..7c24bef 100644
--- a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.AssemblyReference.cache
+++ b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.CoreCompileInputs.cache b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.CoreCompileInputs.cache
index 8645a64..6c0c7c9 100644
--- a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.CoreCompileInputs.cache
+++ b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-360c5282198aca000930935455be6668ea6cf0d0
+e8174e41c6498a690c795ea566311195bfc1edd4
diff --git a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.FileListAbsolute.txt b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.FileListAbsolute.txt
index aeb0fff..278a189 100644
--- a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.FileListAbsolute.txt
+++ b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.FileListAbsolute.txt
@@ -1,7 +1,314 @@
-D:\WB\WGQ_WB19011\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.AssemblyReference.cache
-D:\WB\WGQ_WB19011\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
-D:\WB\WGQ_WB19011\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.cache
-D:\WB\WGQ_WB19011\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CoreCompileInputs.cache
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\iWareCommon.dll.config
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Autofac.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Castle.Core.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\EntityFramework.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Autofac.xml
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Castle.Core.xml
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\EntityFramework.xml
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\obj\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\obj\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.wmsf4makino\iWareCommon\obj\Debug\iWareCommon.csprojResolveAssemblyReference.cache
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\iWareCommon.dll.config
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Autofac.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Castle.Core.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\EntityFramework.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Autofac.xml
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Castle.Core.xml
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\EntityFramework.xml
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\obj\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\WGQWB19011\iWareCommon\obj\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\iWareCommon.dll.config
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Autofac.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Castle.Core.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\EntityFramework.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Autofac.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Castle.Core.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\EntityFramework.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\obj\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\obj\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiaowms\iWareCommon\obj\Debug\iWareCommon.csprojResolveAssemblyReference.cache
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\iWareCommon.dll.config
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Castle.Core.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Castle.Core.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.dll
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.pdb
+C:\Users\Administrator\Desktop\sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.csprojResolveAssemblyReference.cache
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\iWareCommon.dll.config
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\iWareCommon.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\iWareCommon.pdb
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Castle.Core.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.xml
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Castle.Core.xml
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.xml
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.dll
+E:\澶栭珮妗sjwangzheng.19011waigaoqiao\iWareCommon\obj\Debug\iWareCommon.pdb
+C:\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+C:\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+C:\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+C:\DEmon\iWareCommon\bin\Debug\Autofac.dll
+C:\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+C:\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+C:\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+C:\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+C:\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+C:\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+C:\DEmon\iWareCommon\bin\Debug\Autofac.xml
+C:\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+C:\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+C:\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+C:\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+C:\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+C:\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+C:\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+C:\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+C:\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+C:\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+C:\DEmon\iWareCommon\obj\Debug\iWareCommon.csprojResolveAssemblyReference.cache
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.xml
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.csprojResolveAssemblyReference.cache
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+E:\椤圭洰淇℃伅\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.xml
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.cache
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CoreCompileInputs.cache
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CopyComplete
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+E:\澶栭珮妗ラ」鐩弬鑰冩枃浠朵俊鎭痋澶栭珮妗�(浠ｇ爜鍙婂叾閮ㄧ讲淇℃伅)\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.AssemblyReference.cache
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Autofac.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Autofac.xml
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.cache
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CoreCompileInputs.cache
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CopyComplete
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+D:\ProjectWork\澶栭珮妗code\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+D:\杞欢\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+D:\杞欢\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Autofac.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Autofac.xml
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+D:\杞欢\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+D:\杞欢\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+D:\杞欢\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+D:\杞欢\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+D:\杞欢\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+D:\杞欢\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+D:\杞欢\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+D:\DEmon\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+D:\DEmon\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Autofac.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Autofac.xml
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+D:\DEmon\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+D:\DEmon\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+D:\DEmon\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+D:\DEmon\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+D:\DEmon\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+D:\DEmon\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+D:\DEmon\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Autofac.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Autofac.xml
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.AssemblyReference.cache
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.cache
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CoreCompileInputs.cache
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CopyComplete
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+D:\ProjectWork\澶栭珮妗code\DEmon-0316\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Autofac.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Autofac.xml
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+D:\ProjectFile\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+D:\ProjectFile\DEmon\iWareCommon\obj\Debug\iWareCommon.csprojResolveAssemblyReference.cache
+D:\ProjectFile\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+D:\ProjectFile\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.Cache
+D:\ProjectFile\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+D:\ProjectFile\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Autofac.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\AxInterop.AcroPDFLib.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Castle.Core.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\EntityFramework.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Autofac.xml
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.pdb
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Autofac.Extras.DynamicProxy.xml
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Castle.Core.xml
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\EntityFramework.xml
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\EntityFramework.SqlServer.xml
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\bin\Debug\Newtonsoft.Json.xml
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.AssemblyReference.cache
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\obj\Debug\iWareCommon.Properties.Resources.resources
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.GenerateResource.cache
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CoreCompileInputs.cache
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\obj\Debug\iWareCommon.csproj.CopyComplete
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\obj\Debug\iWareCommon.dll
+F:\浼熸湰椤圭洰\WB19011-澶栭珮妗002-Source\DEmon2025-08-20\DEmon\iWareCommon\obj\Debug\iWareCommon.pdb
D:\code\WGQ_WB19011\DEmon\iWareCommon\bin\Debug\iWareCommon.dll.config
D:\code\WGQ_WB19011\DEmon\iWareCommon\bin\Debug\iWareCommon.dll
D:\code\WGQ_WB19011\DEmon\iWareCommon\bin\Debug\iWareCommon.pdb
diff --git a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.GenerateResource.cache b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.GenerateResource.cache
index ce52adc..b14393b 100644
--- a/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.GenerateResource.cache
+++ b/DEmon/iWareCommon/obj/Debug/iWareCommon.csproj.GenerateResource.cache
Binary files differ
diff --git a/DEmon/iWareCommon/obj/Debug/iWareCommon.dll b/DEmon/iWareCommon/obj/Debug/iWareCommon.dll
index 879efd9..9a86085 100644
--- a/DEmon/iWareCommon/obj/Debug/iWareCommon.dll
+++ b/DEmon/iWareCommon/obj/Debug/iWareCommon.dll
Binary files differ
diff --git a/DEmon/iWareCommon/obj/Debug/iWareCommon.pdb b/DEmon/iWareCommon/obj/Debug/iWareCommon.pdb
index 04b1ae8..ccfb5a5 100644
--- a/DEmon/iWareCommon/obj/Debug/iWareCommon.pdb
+++ b/DEmon/iWareCommon/obj/Debug/iWareCommon.pdb
Binary files differ
diff --git a/DEmon/iWareDataCore/App.config b/DEmon/iWareDataCore/App.config
index b3eb19e..24b3652 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>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+<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
diff --git a/DEmon/iWareDataCore/BASE/EnumType/EMaterialType.cs b/DEmon/iWareDataCore/BASE/EnumType/EMaterialType.cs
index 5fff2a7..296f0b3 100644
--- a/DEmon/iWareDataCore/BASE/EnumType/EMaterialType.cs
+++ b/DEmon/iWareDataCore/BASE/EnumType/EMaterialType.cs
@@ -11,6 +11,7 @@
闆朵欢 = 0,
閽㈡潗 = 1,
AH36 = 2,
+ A = 3,
鍏朵粬 = 99
}
}
diff --git a/DEmon/iWareDataCore/Properties/Resources.Designer.cs b/DEmon/iWareDataCore/Properties/Resources.Designer.cs
index 12f27d1..632cfce 100644
--- a/DEmon/iWareDataCore/Properties/Resources.Designer.cs
+++ b/DEmon/iWareDataCore/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
锘�//------------------------------------------------------------------------------
// <auto-generated>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.42000
+// 杩愯鏃剁増鏈�:4.0.30319.18444
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
@@ -19,7 +19,7 @@
// 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆�
// 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
// (浠� /str 浣滀负鍛戒护閫夐」)锛屾垨閲嶆柊鐢熸垚 VS 椤圭洰銆�
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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/Entity/MainTaskEntity.cs b/DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs
index 9154a77..db7ef74 100644
--- a/DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs
+++ b/DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs
@@ -138,6 +138,36 @@
return task;
}
+ public TASKMainTask ToOrmAddOut()
+ {
+ var task = new TASKMainTask();
+ EntityPropHelper<MainTaskEntity, TASKMainTask>.CopyProp(this, task, GetOutColumnMap());
+ return task;
+ }
+ public static Dictionary<string, string> GetOutColumnMap()
+ {
+ return new Dictionary<string, string>()
+ {
+ //{"Id", "id"},
+ {"SysCode", "syscode"},
+ {"TaskNo", "taskno"},
+ {"SendTime", "sendtime"},
+ {"SourcePlace","sourceplace"},
+ {"ToPlace","toplace"},
+ {"ProcessCardNumber","processcardnumber"},
+ {"MaterialCode", "materialcode"},
+ {"Quantity","quantity"},
+ {"TaskType","tasktype"},
+ {"Status","status"},
+ {"DecompositionTime","decompositiontime"},
+ {"WipStatus","wipstatus"},
+ {"DecompositionTimes","decompositiontimes"},
+ {"IsLots","islots"},
+ {"Priority","priority"},
+ {"PackageNo","packageno"}
+ };
+ }
+
/// <summary>
/// 鏍规嵁MainTaskEntity鐨勫瓧娈佃浆TASKMainTask鐨勫瓧娈�
diff --git a/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs b/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs
index bcb210a..b6065ee 100644
--- a/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs
+++ b/DEmon/iWareDataCore/TASK/Service/MainTaskService.cs
@@ -8,7 +8,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.Serialization;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
namespace iWareDataCore.TASK.Service
@@ -232,46 +234,51 @@
public int SaveOutMainTask(List<int> ida, out string msg)
{
msg = "";
+ var count = 0;
+ List<TASKMainTask> mainTasks = new List<TASKMainTask>();
try
{
using (var dbModel = new DbModelCore())
{
var placematerial = dbModel.BASEPlaceMaterialViews.Where(y => ida.Contains(y.id)).ToList();
- placematerial.ForEach(x =>
+ foreach (var x in placematerial)
{
string matercode = x.materialcode;
var task = dbModel.TASKMainTasks.FirstOrDefault(y => y.materialcode == matercode && y.tasktype == 1);
if (task == null)
{
- MainTaskEntity newtask = new MainTaskEntity()
+ Thread.Sleep(20);
+ TASKMainTask newtask = new TASKMainTask()
{
- TaskNo = DateTime.Now.ToFileTime().ToString(),
- TaskType = 1,
- MaterialCode = matercode,
- SysCode = "1",
- SendTime = DateTime.Now,
- SourcePlace = x.placecode,
- ToPlace = "100202",
- ProcessCardNumber = "",
- Quantity = 1,
- Status = 0,
- DecompositionTime = DateTime.Now,
- WipStatus = 0,
- DecompositionTimes = 0,
- PackageNo = "",
- IsLots = 0,
- Priority = 0,
+ taskno = DateTime.Now.ToFileTime().ToString(),
+ tasktype = 1,
+ materialcode = matercode,
+ syscode = "1",
+ sendtime = DateTime.Now,
+ sourceplace = x.placecode,
+ toplace = "100202",
+ processcardnumber = "0",
+ quantity = 1,
+ status = 0,
+ decompositiontime = DateTime.Now,
+ wipstatus = 0,
+ decompositiontimes = 0,
+ packageno = "",
+ islots = 0,
+ priority = 0,
};
- dbModel.TASKMainTasks.Add(newtask.ToOrm());
+ dbModel.TASKMainTasks.Add(newtask);
+ count += dbModel.SaveChanges();
}
-
- });
- return dbModel.SaveChanges();
+ }
+
+ return count;
}
}
catch (Exception ex)
{
- LogTextHelper.WriteLine(Resources.LogDir+"@/MainTask/", ex.Message + "浼犲叆鍙傛暟" + ida.ToString());
+
+ LogTextHelper.WriteLine(Resources.LogDir + "@/MainTask/", ex.Message + "浼犲叆鍙傛暟" + string.Join(";",ida));
msg = ex.Message;
return -1;
}
diff --git a/DEmon/iWareDataCore/iWareDataCore.csproj b/DEmon/iWareDataCore/iWareDataCore.csproj
index 3c0274e..2a73e32 100644
--- a/DEmon/iWareDataCore/iWareDataCore.csproj
+++ b/DEmon/iWareDataCore/iWareDataCore.csproj
@@ -9,9 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareDataCore</RootNamespace>
<AssemblyName>iWareDataCore</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</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 01a9739..a391dc5 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>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+ <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
diff --git a/DEmon/iWareLog/Properties/Resources.Designer.cs b/DEmon/iWareLog/Properties/Resources.Designer.cs
index e131ce0..cf1cbac 100644
--- a/DEmon/iWareLog/Properties/Resources.Designer.cs
+++ b/DEmon/iWareLog/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
锘�//------------------------------------------------------------------------------
// <auto-generated>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.42000
+// 杩愯鏃剁増鏈�:4.0.30319.18444
//
// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
@@ -19,7 +19,7 @@
// 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆�
// 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
// (浠� /str 浣滀负鍛戒护閫夐」)锛屾垨閲嶆柊鐢熸垚 VS 椤圭洰銆�
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 36dbd8e..583399c 100644
--- a/DEmon/iWareLog/iWareLog.csproj
+++ b/DEmon/iWareLog/iWareLog.csproj
@@ -9,9 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>iWareLog</RootNamespace>
<AssemblyName>iWareLog</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</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 ab9c690..3e776e5 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", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 4fd001b..6645b22 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.ConveyorInfoEntity, Service References.ControlCenterWcfService.Reference.cs, 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 19c104d..448d1ea 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GateInfoEntity, Service References.ControlCenterWcfService.Reference.cs, 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 67d64e3..ef56679 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfoResponse, Service References.ControlCenterWcfService.Reference.cs, 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 17dc5ca..6d9e887 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfosResponse, Service References.ControlCenterWcfService.Reference.cs, 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 cdb6331..8b965f1 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetGateInfoResponse, Service References.ControlCenterWcfService.Reference.cs, 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 b252165..3a52cbc 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfoResponse, Service References.ControlCenterWcfService.Reference.cs, 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 d84dbe4..15d3de4 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfosResponse, Service References.ControlCenterWcfService.Reference.cs, 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 39c971e..6e7a468 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse, Service References.ControlCenterWcfService.Reference.cs, 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 806c48b..980aa1b 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.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>iWarePod.ControlCenterWcfService.StackerInfoEntity, Service References.ControlCenterWcfService.Reference.cs, 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 141431e..36b749c 100644
--- a/DEmon/iWarePod/Web.config
+++ b/DEmon/iWarePod/Web.config
@@ -1,67 +1,63 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<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>
- <!--
- 鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
+ <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>
- 鍙湪 <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>
+ <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>
+
<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>
\ No newline at end of file
+ <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>
diff --git a/DEmon/iWarePod/iWarePod.csproj b/DEmon/iWarePod/iWarePod.csproj
index bc26dd6..16772f5 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.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
@@ -24,7 +24,6 @@
<TypeScriptToolsVersion>1.0</TypeScriptToolsVersion>
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -2386,6 +2385,7 @@
<Content Include="modules\task\stacker-monitor\stacker-monitor.htm" />
<Content Include="modules\task\task-controller.js" />
<Content Include="modules\task\task.htm" />
+ <None Include="Properties\PublishProfiles\iwarePod.pubxml" />
<None Include="Service References\ControlCenterWcfService\configuration91.svcinfo" />
<None Include="Service References\ControlCenterWcfService\configuration.svcinfo" />
<Content Include="Service References\ControlCenterWcfService\iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource">
diff --git a/DEmon/iWarePod/modules/task/conveyor-monitor/conveyor-monitor-detail1.htm b/DEmon/iWarePod/modules/task/conveyor-monitor/conveyor-monitor-detail1.htm
index 63a6649..7cef04f 100644
--- a/DEmon/iWarePod/modules/task/conveyor-monitor/conveyor-monitor-detail1.htm
+++ b/DEmon/iWarePod/modules/task/conveyor-monitor/conveyor-monitor-detail1.htm
@@ -6,7 +6,9 @@
<div ng-style="info_div" class="gate-info" style="margin-left:20px;">
<div style="height:45px;border-bottom:solid 1px black;">
<div style="width:100%;height:99%;">
- <div style="background:url(../../core/images/table-title1.png) no-repeat;height:100%;width:20%;background-size:cover;"><span class="gradient-text-two sm-margin">gate11</span></div>
+ <div style="background:url(../../core/images/table-title1.png) no-repeat;height:100%;width:20%;background-size:cover;">
+ <span class="gradient-text-two sm-margin">gate11</span>
+ </div>
</div>
</div>
<div style="margin-left:0px;">
diff --git a/DEmon/iWareWebservice/Web.config b/DEmon/iWareWebservice/Web.config
index b5f222d..6c6a5ef 100644
--- a/DEmon/iWareWebservice/Web.config
+++ b/DEmon/iWareWebservice/Web.config
@@ -1,36 +1,28 @@
-锘�<?xml version="1.0"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<!--
鏈夊叧濡備綍閰嶇疆 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>
- <!--
- 鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
-
- 鍙湪 <httpRuntime> 鏍囪涓婅缃互涓嬬壒鎬с��
- <system.Web>
- <httpRuntime targetFramework="4.8" />
- </system.Web>
- -->
+ <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>
<system.web>
- <compilation debug="true" targetFramework="4.8"/>
- <httpRuntime targetFramework="4.5"/>
+ <compilation debug="true" targetFramework="4.5" />
+ <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 92db9b7..472d718 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.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort>44324</IISExpressSSLPort>
@@ -23,7 +23,6 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/DEmon/iWareWms/iWareWms.csproj b/DEmon/iWareWms/iWareWms.csproj
index c94a4fd..7910201 100644
--- a/DEmon/iWareWms/iWareWms.csproj
+++ b/DEmon/iWareWms/iWareWms.csproj
@@ -960,6 +960,9 @@
<Content Include="Code\Common\Entity\_system~.ini" />
<Content Include="Code\Common\Service\_system~.ini" />
<Content Include="Code\Common\_system~.ini" />
+ <Content Include="Metadata\deploymentTemplates\apiappconfig.azureresource.json" />
+ <Content Include="apiapp.json" />
+ <None Include="Properties\PublishProfiles\iWareWms.pubxml" />
<None Include="Service References\PrintWcfService\Arrays.xsd">
<SubType>Designer</SubType>
</None>
@@ -3593,13 +3596,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Content Include="res\icon\Thumbs.db" />
- <Content Include="res\images\logo\Thumbs.db" />
<Content Include="res\images\main\_system~.ini" />
- <Content Include="res\images\themes\border\Thumbs.db" />
- <Content Include="res\images\themes\small\Thumbs.db" />
- <Content Include="res\images\themes\Thumbs.db" />
- <Content Include="res\images\Thumbs.db" />
</ItemGroup>
<ItemGroup>
<Content Include="View\RBAC\Content\_system~.ini" />
--
Gitblit v1.9.3