From 2192409d65144adb8ee233d9f7fd00e3828bc3e9 Mon Sep 17 00:00:00 2001
From: "liang.cui" <liang.cui@ccwin-in.com>
Date: Thu, 17 Mar 2022 16:30:52 +0800
Subject: [PATCH] 1

---
 Stone.WinForm/Stone.DataService/PDAService/Web.Config          | 2 +-
 .../Stone.DataService/Stone.DataService.Biz/Bill/F_BillShip.cs | 2 +-
 .../Stone.DataService.Biz/Bill/F_STD_Check.cs                  | 2 +-
 .../Stone.DataService.Biz/Stone.DataService.Biz.csproj         | 3 +--
 Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs             | 2 ++
 Stone.WinForm/Stone.WinService/Stone.WinForm.xml               | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Stone.WinForm/Stone.DataService/PDAService/Web.Config b/Stone.WinForm/Stone.DataService/PDAService/Web.Config
index 198d299..676ef84 100644
--- a/Stone.WinForm/Stone.DataService/PDAService/Web.Config
+++ b/Stone.WinForm/Stone.DataService/PDAService/Web.Config
@@ -9,7 +9,7 @@
 -->
 <configuration>
 	<appSettings>
-		<add key="LocalDB" value="DATA SOURCE = (local);USER ID = sa;PASSWORD = jk123;INITIAL CATALOG = STD"/>
+		<add key="LocalDB" value="DATA SOURCE = 127.0.0.1,12017;USER ID = sa;PASSWORD = sa;INITIAL CATALOG = STD"/>
     <add key="BarCodeDB" value=""/>
   </appSettings>
 	<connectionStrings/>
diff --git a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillShip.cs b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillShip.cs
index 42c2da4..502d02a 100644
--- a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillShip.cs
+++ b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillShip.cs
@@ -55,7 +55,7 @@ namespace Stone.DataService.Biz.Bill
 
                 db.Commit();
 
-                return MyDataSet.GetDataByString(BillNo);
+                return Stone.DataService.Biz.BizPublic.MyDataSet.GetDataByString(BillNo);
             }
             catch (Exception ex)
             {
diff --git a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs
index e495351..2a7f085 100644
--- a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs
+++ b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs
@@ -67,7 +67,7 @@ namespace Stone.DataService.Biz.Bill
 
                 db.Commit();
 
-                return MyDataSet.GetDataByString("OK");
+                return Stone.DataService.Biz.BizPublic.MyDataSet.GetDataByString("OK");
             }
             catch (Exception ex)
             {
diff --git a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Stone.DataService.Biz.csproj b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Stone.DataService.Biz.csproj
index 1b78529..b62972d 100644
--- a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Stone.DataService.Biz.csproj
+++ b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Stone.DataService.Biz.csproj
@@ -58,8 +58,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Stone.Common.Dlls\Gm_WMS.DataAccess.DataService.dll</HintPath>
     </Reference>
-    <Reference Include="Stone.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Stone.Common">
       <HintPath>..\..\Stone.Common.Dlls\Stone.Common.dll</HintPath>
     </Reference>
     <Reference Include="Stone.Entity, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs b/Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs
index 7556f2f..3dd8278 100644
--- a/Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs
+++ b/Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs
@@ -26,6 +26,8 @@ namespace Stone.WinBiz.BasicData
             dgv.Columns["Address1"].HeaderText = "地址1";
             dgv.Columns["Address2"].HeaderText = "地址2";
             dgv.Columns["Address3"].HeaderText = "地址3";
+            dgv.Columns["State"].HeaderText = "状态";
+
         }
 
     }
diff --git a/Stone.WinForm/Stone.WinService/Stone.WinForm.xml b/Stone.WinForm/Stone.WinService/Stone.WinForm.xml
index d5ca6f2..019b241 100644
--- a/Stone.WinForm/Stone.WinService/Stone.WinForm.xml
+++ b/Stone.WinForm/Stone.WinService/Stone.WinForm.xml
@@ -2,7 +2,7 @@
 <NewDataSet>
   <AppConfig>
     <Name>LocalDB</Name>
-    <Value>DATA SOURCE=(local);USER ID = sa;PASSWORD = jk123;INITIAL CATALOG = STD</Value>
+    <Value>DATA SOURCE=127.0.0.1:12017;USER ID = sa;PASSWORD = sa;INITIAL CATALOG = STD</Value>
   </AppConfig>
   <AppConfig>
     <Name>解析刷新时间(秒)</Name>