葛店对应配置文件

.gitignore

@@ -6,7 +6,6 @@
 *.user
 *.sln.docstates
 *.mbs
-*.csv
 
 # Build results
 

parkMonitor/App.config

@@ -16,10 +16,10 @@
   </Equipments>
   <appSettings>
     <!--数据库连接配置文件-->
-    <add key="SqlConnectionLocation" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;pwd=jingwang1995;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
+    <add key="SqlConnectionLocation" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;pwd=yct;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
     <!--<add key="SqlConnectionStr" value="Data Source=52.77.33.102;port=3306;uid=Ubuntu1;pooling=true;pwd=12345678;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />-->
-<add key="SqlConnectionStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" /> 
-<!--日志写入地址配置文件-->
+    <add key="SqlConnectionStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" /> 
+    <!--日志写入地址配置文件-->
     <add key="LogPath" value="E:\\c#workspace\\LogDemo\\LoggerTest" />
     <!--测量数据误差-->
     <add key="length" value="50" />
@@ -29,7 +29,7 @@
     <add key="ClientSettingsProvider.ServiceUri" value="" />
     <!--PLC基本配置-->
     <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
-    <add key="PLC_ip_address" value="127.0.0.1" />
+    <add key="PLC_ip_address" value="192.168.0.1" />
     <add key="PLC_port" value="30000" />
     <add key="PLC_station" value="1" />
     <add key="PLC_start_address" value="0" />
@@ -50,9 +50,9 @@
     <add key="parkingSpaceX_address" value="17" />
     <add key="parkingSpaceY_address" value="18" />
     <add key="parkingSpaceZ_address" value="19" />
-<add key="parkingLaserCenterX_address" value="13" />
+    <add key="parkingLaserCenterX_address" value="13" />
     <add key="frontWheelbase_address" value="79" />
-<add key="rearWheelbase_address" value="80" />
+    <add key="rearWheelbase_address" value="80" />
     <!--激光设备配置-->
     <add key="park_command_address" value="10" />
     <add key="laser1_status_address" value="83" />
@@ -64,7 +64,7 @@
     <add key="licenseTime" value="30" />
     <add key="userTime" value="30" />
     <!--上位机（Web线程）IP地址及配置serverScoket的端口-->
-    <add key="WebConfig" value="192.168.111.84:9000" />
+    <add key="WebConfig" value="192.168.0.164:9000" />
     <!--<add key ="WebConfig" value="127.0.0.1:9000"/>-->
 
     <!--车库入口-->
@@ -77,7 +77,7 @@
 
     <!--ip位置映射表-->
     <!--位置编号；基点横坐标；车位宽度；宽度补偿-->
-    <add key="192.168.0.20" value="1" />
+    <add key="192.168.0.51" value="1" />
     <add key="parkingEntZ" value="0" />
     <add key="parkingEntZ" value="0" />
     <add key="parkingEntZ" value="0" />

parkMonitor/manualParking/ManualParking.cs

@@ -39,7 +39,7 @@ namespace parkMonitor.manualParking
             {
                 MessageBox.Show("该号码未被注册，请先注册");
             }
-            if (storeCmd.garageID != 0)
+            else if (storeCmd.garageID != 0)
             {
                 garageFreeSpace = locationOper.getGarageFreeSpace(storeCmd.garageID);
                 if (garageFreeSpace > 0)