2
schangxiang@126.com
2024-11-21 fa95a5e5c5ed5cee38189307643d574c2d786486
2
已重命名1个文件
已修改6个文件
41 ■■■■ 文件已修改
CC/iWareCC_ASRS/App - 本机.config 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/App - 正式.config 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/App.config 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/iWareCC.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareModel/Entity/MES/Mes_BtjReceiveModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareTestForm/App.config 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareUnitTest/App.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/App - ±¾»ú.config
@@ -35,14 +35,7 @@
    <add key="IsEnableNewInStorePlace" value="false"/>
  </appSettings>
  <connectionStrings>
    <!--本地服务器-->
    <!--<add name="DbModel" connectionString="data source=localhost;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abccba;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--云服务器-->
    <!--<add name="DbModel" connectionString="data source=120.53.244.200;initial catalog=XiGangWarehouse;persist security info=True;user id=xigang;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--shaocx本地2017-->
  <add name="DbModel" connectionString="data source=localhost;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
    <!--现场-->
    <!--<add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
  <add name="DbModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
  </connectionStrings>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
CC/iWareCC_ASRS/App - Õýʽ.config
ÎļþÃû´Ó CC/iWareCC_ASRS/App - ÏÖ³¡.config ÐÞ¸Ä
@@ -35,14 +35,7 @@
    <add key="IsEnableNewInStorePlace" value="false"/>
  </appSettings>
  <connectionStrings>
    <!--本地服务器-->
    <!--<add name="DbModel" connectionString="data source=localhost;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abccba;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--云服务器-->
    <!--<add name="DbModel" connectionString="data source=120.53.244.200;initial catalog=XiGangWarehouse;persist security info=True;user id=xigang;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--shaocx本地2017-->
    <add name="DbModel" connectionString="data source=LAPTOP-9337IBI9\MSSQLSERVER2017;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
    <!--现场-->
    <!--<add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <add name="DbModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
  </connectionStrings>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
CC/iWareCC_ASRS/App.config
@@ -35,15 +35,8 @@
    <add key="IsEnableNewInStorePlace" value="false"/>
  </appSettings>
  <connectionStrings>
    <!--本地服务器-->
    <!--<add name="DbModel" connectionString="data source=localhost;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abccba;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--云服务器-->
    <!--<add name="DbModel" connectionString="data source=120.53.244.200;initial catalog=XiGangWarehouse;persist security info=True;user id=xigang;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--shaocx本地2017-->
    <add name="DbModel" connectionString="data source=localhost;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
    <!--现场-->
    <!--<add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
  </connectionStrings>
    <add name="DbModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
 </connectionStrings>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
  </startup>
CC/iWareCC_ASRS/iWareCC.csproj
@@ -194,7 +194,7 @@
    <None Include="App - æœ¬æœº.config">
      <SubType>Designer</SubType>
    </None>
    <None Include="App - çŽ°åœº.config">
    <None Include="App - æ­£å¼.config">
      <SubType>Designer</SubType>
    </None>
    <None Include="Connected Services\RgvService\iWareCC.RgvService.RgvView.datasource">
CC/iWareModel/Entity/MES/Mes_BtjReceiveModel.cs
@@ -10,7 +10,7 @@
    {
        public Mes_BtjReceiveModel()
        {
            this.userName = "XiGangWarehouse";
            this.userName = "LA24030_LuLiPackageLine";
        }
        /// <summary>
CC/iWareTestForm/App.config
@@ -79,11 +79,11 @@
    </client>
  </system.serviceModel>
  <connectionStrings>
    <!--<add name="DbModel" connectionString="data source=120.53.244.200;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abccba;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--<add name="DbModel" connectionString="data source=120.53.244.200;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abccba;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--shaocx本地2017-->
    <!--<add name="DbModel" connectionString="data source=LAPTOP-9337IBI9\MSSQLSERVER2017;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--<add name="DbModel" connectionString="data source=LAPTOP-9337IBI9\MSSQLSERVER2017;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
    <!--现场-->
    <add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
    <add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
  </connectionStrings>
  <entityFramework>
    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
CC/iWareUnitTest/App.config
@@ -6,7 +6,7 @@
  </configSections>
  <connectionStrings>
    <!--本机-->
    <add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=XiGangWarehouse;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
    <add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
  </connectionStrings>
  <appSettings>
    <!-- æ˜¯å¦æ¨¡æ‹ŸPLC,发布一定是 FALSE -->