From fa95a5e5c5ed5cee38189307643d574c2d786486 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 21 11月 2024 21:37:08 +0800
Subject: [PATCH] 2
---
CC/iWareModel/Entity/MES/Mes_BtjReceiveModel.cs | 2 +-
CC/iWareCC_ASRS/App.config | 11 ++---------
CC/iWareCC_ASRS/App - 正式.config | 9 +--------
CC/iWareCC_ASRS/App - 本机.config | 9 +--------
CC/iWareUnitTest/App.config | 2 +-
CC/iWareTestForm/App.config | 6 +++---
CC/iWareCC_ASRS/iWareCC.csproj | 2 +-
7 files changed, 10 insertions(+), 31 deletions(-)
diff --git "a/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config" "b/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
index 08f9a60..4ca15c7 100644
--- "a/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
+++ "b/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.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" />
diff --git "a/CC/iWareCC_ASRS/App - \347\216\260\345\234\272.config" "b/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
similarity index 78%
rename from "CC/iWareCC_ASRS/App - \347\216\260\345\234\272.config"
rename to "CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
index e996063..e611a0f 100644
--- "a/CC/iWareCC_ASRS/App - \347\216\260\345\234\272.config"
+++ "b/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.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" />
diff --git a/CC/iWareCC_ASRS/App.config b/CC/iWareCC_ASRS/App.config
index 3d9ad1c..385d342 100644
--- a/CC/iWareCC_ASRS/App.config
+++ b/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>
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index 02ba9f5..6f96d19 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/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">
diff --git a/CC/iWareModel/Entity/MES/Mes_BtjReceiveModel.cs b/CC/iWareModel/Entity/MES/Mes_BtjReceiveModel.cs
index e4c8377..711763d 100644
--- a/CC/iWareModel/Entity/MES/Mes_BtjReceiveModel.cs
+++ b/CC/iWareModel/Entity/MES/Mes_BtjReceiveModel.cs
@@ -10,7 +10,7 @@
{
public Mes_BtjReceiveModel()
{
- this.userName = "XiGangWarehouse";
+ this.userName = "LA24030_LuLiPackageLine";
}
/// <summary>
diff --git a/CC/iWareTestForm/App.config b/CC/iWareTestForm/App.config
index 0cc7331..b0ead63 100644
--- a/CC/iWareTestForm/App.config
+++ b/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">
diff --git a/CC/iWareUnitTest/App.config b/CC/iWareUnitTest/App.config
index 8f9dc5f..92abca4 100644
--- a/CC/iWareUnitTest/App.config
+++ b/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 -->
--
Gitblit v1.9.3