智云外网版WMS\MES\SCM(作废)
yxj
2022-05-30 bfc6b3908f276dcbb95a1e1f668ff2af124952fc
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-SCM
11个文件已修改
38 ■■■■■ 已修改文件
BaseSet/BaseSet.csproj 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/app.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/DAL.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/app.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/app.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
NETSCM/NETSCM.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
NETSCM/app.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/SCM.csproj 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/app.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/公用类/ClsPub1.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/BaseSet.csproj
@@ -31,18 +31,19 @@
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
    <OutputPath>bin\x86\Debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <PlatformTarget>x86</PlatformTarget>
    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
BaseSet/app.config
@@ -12,4 +12,4 @@
            </setting>
        </BaseSet.Properties.Settings>
    </applicationSettings>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
DAL/DAL.csproj
@@ -14,7 +14,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
DAL/app.config
@@ -12,4 +12,4 @@
            </setting>
        </DAL.Properties.Settings>
    </applicationSettings>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Model/Model.csproj
@@ -16,7 +16,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
@@ -38,7 +38,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
    <OutputPath>bin\x86\Debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
Model/app.config
@@ -12,4 +12,4 @@
            </setting>
        </Model.Properties.Settings>
    </applicationSettings>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
NETSCM/NETSCM.csproj
@@ -16,7 +16,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
NETSCM/app.config
@@ -12,4 +12,4 @@
            </setting>
        </NETSCM.Properties.Settings>
    </applicationSettings>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
SCM/SCM.csproj
@@ -15,7 +15,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
@@ -67,8 +67,7 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
    <Reference Include="BLL">
      <HintPath>..\DLL\BLL.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
@@ -795,14 +794,6 @@
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>primary</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
  </ItemGroup>
SCM/app.config
@@ -12,4 +12,4 @@
            </setting>
        </SCM.Properties.Settings>
    </applicationSettings>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
SCM/¹«ÓÃÀà/ClsPub1.cs
@@ -17,7 +17,7 @@
        //public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx";       //四维尔   å¤–网
        //public static string WEBSURL = "http://192.168.0.66/WEBS-WMS/WebService1.asmx";               //四维尔   å†…网
        //public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS-TEST/WebService1.asmx";  //四维尔测试
        //public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx";   //四维尔    æ–°ä¸­é—´å±‚    å¤–网
        public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx";   //四维尔    æ–°ä¸­é—´å±‚    å¤–网
        //public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx";          //四维尔    æ–°ä¸­é—´å±‚    å†…网
        //public static string WEBSURL = "http://122.227.199.62:5050/LMESWEBS/WebService1.asmx";        //韩电    å¤–网JIT(不用)
        //public static string WEBSURL = "http://122.227.199.62:5050/WMSWEBS/WebService1.asmx";         //韩电    å¤–网