1

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/>

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)
             {

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)
             {

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">
+    <Reference Include="Stone.Common">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Stone.Common.Dlls\Stone.Common.dll</HintPath>
     </Reference>
     <Reference Include="Stone.Entity, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

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 = "状态";
+
         }
 
     }

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>