schangxiang@126.com
2025-06-04 3e837690e8a1d3b6e86f3db72d2d84eab1bc7114
修复提交
已修改43个文件
202 ■■■■■ 文件已修改
DEmon/OpcAccess/OpcAccess.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/OpcAccess/Properties/Resources.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualConveyor/App.config 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualConveyor/Properties/Resources.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualConveyor/Properties/Settings.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualConveyor/VirtualConveyor.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualSrm/App.config 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualSrm/Properties/Resources.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualSrm/Properties/Settings.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/VirtualSrm/VirtualSrm.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/WebWIPAPI/Properties/Resources.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/WebWIPAPI/Web.config 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/WebWIPAPI/WebWIPAPI.csproj 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCc/App.config 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCc/Conveyor/Service/GateService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCc/DoStackerTaskAuto/Chain/选择一个未执行的堆垛机的任务.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCc/Properties/Resources.Designer.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCc/iWareCc.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCommon/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCommon/Properties/Resources.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareCommon/iWareCommon.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareDataCore/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareDataCore/Properties/Resources.Designer.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareDataCore/TASK/Service/MainTaskService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareDataCore/iWareDataCore.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareLog/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareLog/Properties/Resources.Designer.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareLog/iWareLog.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Properties/Resources.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfoResponse.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetGateInfoResponse.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfoResponse.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfosResponse.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/Web.config 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWarePod/iWarePod.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareWebservice/Web.config 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/iWareWebservice/iWareWebservice.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DEmon/OpcAccess/OpcAccess.csproj
@@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>OpcAccess</RootNamespace>
    <AssemblyName>OpcAccess</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
DEmon/OpcAccess/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/VirtualConveyor/App.config
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
    <configSections>
    </configSections>
    <startup>
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
    </startup>
    <system.serviceModel>
@@ -14,9 +14,7 @@
  </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>
DEmon/VirtualConveyor/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/VirtualConveyor/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
DEmon/VirtualConveyor/Service References/OpcWcfService/Reference.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.18444
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
DEmon/VirtualConveyor/VirtualConveyor.csproj
@@ -9,8 +9,9 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>VirtualConveyor</RootNamespace>
    <AssemblyName>VirtualConveyor</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
DEmon/VirtualSrm/App.config
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
    <configSections>
    </configSections>
    <startup>
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
    </startup>
    <system.serviceModel>
@@ -14,9 +14,7 @@
  </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>
DEmon/VirtualSrm/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/VirtualSrm/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
DEmon/VirtualSrm/VirtualSrm.csproj
@@ -9,8 +9,9 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>VirtualSrm</RootNamespace>
    <AssemblyName>VirtualSrm</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
DEmon/WebWIPAPI/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/WebWIPAPI/Web.config
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<configuration>
    <appSettings>
        <add key="webpages:Version" value="2.0.0.0" />
@@ -10,12 +8,10 @@
        <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" />
@@ -28,8 +24,18 @@
            </pages>
        </system.web>
    </location>
    <system.webServer>
        <validation validateIntegratedModeConfiguration="false" />
    </system.webServer>
  <!--
    æœ‰å…³ web.config æ›´æ”¹çš„说明,请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
    å¯åœ¨ <httpRuntime> æ ‡è®°ä¸Šè®¾ç½®ä»¥ä¸‹ç‰¹æ€§ã€‚
      <system.Web>
        <httpRuntime targetFramework="4.8" />
      </system.Web>
  -->
  <system.web>
    <compilation targetFramework="4.8"/>
  </system.web>
</configuration>
DEmon/WebWIPAPI/WebWIPAPI.csproj
@@ -13,13 +13,16 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>WebWIPAPI</RootNamespace>
    <AssemblyName>WebWIPAPI</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <MvcBuildViews>false</MvcBuildViews>
    <UseIISExpress>false</UseIISExpress>
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication />
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <TargetFrameworkProfile />
    <Use64BitIISExpress />
    <UseGlobalApplicationHostFile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
DEmon/iWareCc/App.config
@@ -1,11 +1,11 @@
<?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" />
    </configSections>
    <startup> 
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
    </startup>
    <entityFramework>
        <providers>
@@ -47,9 +47,7 @@
            </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>
  
DEmon/iWareCc/Conveyor/Service/GateService.cs
@@ -327,7 +327,7 @@
                GateDatagramProp prop = new GateDatagramAnalyze().SCAnalyze(ASCIIEncoding.ASCII.GetBytes(msg));
                if (!string.IsNullOrEmpty(prop.MaterialCode))
                {
                    GateEntity.RCheckMaterialCode = prop.MaterialCode.Trim();
                    GateEntity.RCheckMaterialCode = prop.MaterialCode.Replace("\r", "").Replace("\0", "").Trim();
                }
            }
            catch (Exception ex)
DEmon/iWareCc/DoStackerTaskAuto/Chain/Ñ¡ÔñÒ»¸öδִÐеĶѶâ»úµÄÈÎÎñ.cs
@@ -61,7 +61,7 @@
                        return;
                    }
                    var task = dbModel.TASKPartTasks.OrderByDescending(x => x.priority).ThenBy(x => x.createtime).FirstOrDefault(x => x.type == (int)EPartTaskType.堆垛机任务 && x.isreleased == (int)EYesOrNo.否 && x.isfinished == (int)EYesOrNo.否 && x.equipid == Stacker.Equipment.Id);
                    var task = dbModel.TASKPartTasks.OrderByDescending(x=>x.maintasktype == (int)EMainTaskType.出库任务).OrderByDescending(x => x.priority).ThenBy(x => x.createtime).FirstOrDefault(x => x.type == (int)EPartTaskType.堆垛机任务 && x.isreleased == (int)EYesOrNo.否 && x.isfinished == (int)EYesOrNo.否 && x.equipid == Stacker.Equipment.Id);
                    if (task == null)
                    {
@@ -86,6 +86,7 @@
                            return;
                        }
                    }
                    // è¿™æ®µä»£ç æˆ‘希望在出库口有料和当前有未完成的出库输送线任务时task时task不取出库任务怎么修改代码
                    DecompositionTaskContainer.PartTask = new PartTaskEntity(task);
                    LogTextHelper.WriteLine(Resources.LogDir + @"/自动执行堆垛机任务流程/" + Stacker.Equipment.EquipName, "选择一个未执行的堆垛机的任务:{0}", DecompositionTaskContainer.PartTask.Id);
DEmon/iWareCc/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.18444
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/iWareCc/iWareCc.csproj
@@ -9,9 +9,10 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>iWareCc</RootNamespace>
    <AssemblyName>iWareCc</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <NuGetPackageImportStamp>bb4a7afd</NuGetPackageImportStamp>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
DEmon/iWareCommon/App.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
  <configSections>
    
@@ -10,4 +10,4 @@
      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
    </providers>
  </entityFramework>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
DEmon/iWareCommon/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/iWareCommon/iWareCommon.csproj
@@ -9,8 +9,9 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>iWareCommon</RootNamespace>
    <AssemblyName>iWareCommon</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
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 -->
@@ -13,4 +13,4 @@
  </runtime>
  <connectionStrings>
<add name="DbModelCore" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_CORE;user id=sa;password=123abc.com;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /></connectionStrings>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
DEmon/iWareDataCore/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.18444
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/iWareDataCore/TASK/Service/MainTaskService.cs
@@ -271,7 +271,7 @@
            }
            catch (Exception ex)
            {
                LogTextHelper.WriteLine(Resources.LogDir+"@/MainTask/", ex.Message + "传入参数" + ida.ToString());
                msg = ex.Message;
                return -1;
            }
DEmon/iWareDataCore/iWareDataCore.csproj
@@ -9,8 +9,9 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>iWareDataCore</RootNamespace>
    <AssemblyName>iWareDataCore</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
DEmon/iWareLog/App.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
  <configSections>
    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
  </configSections>
  <connectionStrings>
  <add name="DbModelLog" connectionString="data source=192.168.1.200;initial catalog=WGQ_WB19011_LOG;user id=sa;password=123abc.com;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /></connectionStrings>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
DEmon/iWareLog/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.18444
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/iWareLog/iWareLog.csproj
@@ -9,8 +9,9 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>iWareLog</RootNamespace>
    <AssemblyName>iWareLog</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
DEmon/iWarePod/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–ç§»é™¤æˆå‘˜ï¼Œè¯·ç¼–è¾‘ .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹),或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -47,8 +47,8 @@
        }
        
        /// <summary>
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类,为所有资源查找
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ã€‚
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.ConveyorInfoEntity.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ConveyorInfoEntity" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.ConveyorInfoEntity, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.ConveyorInfoEntity, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GateInfoEntity.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GateInfoEntity" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.GateInfoEntity, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.GateInfoEntity, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfoResponse.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetConveyorInfoResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfoResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfoResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetConveyorInfosResponse.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetConveyorInfosResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfosResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.GetConveyorInfosResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetGateInfoResponse.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetGateInfoResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.GetGateInfoResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.GetGateInfoResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfoResponse.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetStackInfoResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfoResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfoResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.GetStackInfosResponse.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GetStackInfosResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfosResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.GetStackInfosResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="SendAndChackMaterialResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.SendAndChackMaterialResponse, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Service References/ControlCenterWcfService/iWarePod.ControlCenterWcfService.StackerInfoEntity.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="StackerInfoEntity" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>iWarePod.ControlCenterWcfService.StackerInfoEntity, Service References.ControlCenterWcfService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>iWarePod.ControlCenterWcfService.StackerInfoEntity, Service References.ControlCenterWcfService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
DEmon/iWarePod/Web.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<configuration>
    <appSettings>
        <add key="webpages:Version" value="2.0.0.0"/>
@@ -7,10 +7,17 @@
        <add key="ClientValidationEnabled" value="true"/>
        <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
    </appSettings>
  <!--
    æœ‰å…³ web.config æ›´æ”¹çš„说明,请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
    å¯åœ¨ <httpRuntime> æ ‡è®°ä¸Šè®¾ç½®ä»¥ä¸‹ç‰¹æ€§ã€‚
      <system.Web>
        <httpRuntime targetFramework="4.8" />
      </system.Web>
  -->
    <system.web>    
        <httpRuntime targetFramework="4.5"/>
        <compilation debug="true" targetFramework="4.5"/>
    <compilation debug="true" targetFramework="4.8"/>
        <pages>
            <namespaces>
                <add namespace="System.Web.Helpers"/>
@@ -22,7 +29,6 @@
            </namespaces>
        </pages>
    </system.web>
    <system.webServer>
        <validation validateIntegratedModeConfiguration="false"/>
        <handlers>
@@ -35,7 +41,6 @@
        </handlers>
        <directoryBrowse enabled="true"/>
    </system.webServer>
    <system.serviceModel>
        <bindings>
   <basicHttpBinding>
@@ -46,7 +51,6 @@
   <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"/>
DEmon/iWarePod/iWarePod.csproj
@@ -14,7 +14,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>iWarePod</RootNamespace>
    <AssemblyName>iWarePod</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <MvcBuildViews>false</MvcBuildViews>
    <UseIISExpress>true</UseIISExpress>
    <IISExpressSSLPort />
@@ -24,6 +24,7 @@
    <TypeScriptToolsVersion>1.0</TypeScriptToolsVersion>
    <Use64BitIISExpress />
    <UseGlobalApplicationHostFile />
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
DEmon/iWareWebservice/Web.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!--
  æœ‰å…³å¦‚何配置 ASP.NET åº”用程序的详细信息,请访问
  https://go.microsoft.com/fwlink/?LinkId=169433
@@ -12,8 +12,16 @@
        <add key="reqToken" value="596369538459835834578" />
        <add key="LogDir" value="D:\LOG_WMS" />
    </appSettings>
  <!--
    æœ‰å…³ web.config æ›´æ”¹çš„说明,请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
    å¯åœ¨ <httpRuntime> æ ‡è®°ä¸Šè®¾ç½®ä»¥ä¸‹ç‰¹æ€§ã€‚
      <system.Web>
        <httpRuntime targetFramework="4.8" />
      </system.Web>
  -->
  <system.web>
    <compilation debug="true" targetFramework="4.5" />
    <compilation debug="true" targetFramework="4.8"/>
    <httpRuntime targetFramework="4.5" />
  </system.web>
    <system.webServer>
DEmon/iWareWebservice/iWareWebservice.csproj
@@ -13,7 +13,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>iWareWebservice</RootNamespace>
    <AssemblyName>iWareWebservice</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort>44324</IISExpressSSLPort>
@@ -23,6 +23,7 @@
    <UseGlobalApplicationHostFile />
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>