Merge branch 'master' of https://git.steerinfo.com/caol/jisco_winform_wzjl.git

CarMeterSystem/App.config

@@ -4,18 +4,18 @@
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
 	</startup>
 	<appSettings>
-    <!--<add key="ServiceUrl" value="http://127.0.0.1:9004/v1" />-->
-  <!--<add key="ServiceUrl" value="http://10.104.4.105:9004/v1" />-->
-  <!--<add key="ServiceUrl" value="http://192.168.216.143:9004/v1" />-->
-  <!--<add key="ServiceUrl" value="http://192.168.137.136:9004/v1" />-->
-  <!--<add key="ServiceUrl" value="http://10.104.0.1:9004/v1" />-->
-  <!--<add key="ServiceUrl" value="http://192.168.107.60:8888/icore.icp.winform/pass/jlcar"/>-->
-  <!--<add key="ServiceUrl" value="http://192.168.185.29/icore.icp.winform/pass/jlcar"/>-->
-  <add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>
+		<!--<add key="ServiceUrl" value="http://127.0.0.1:9004/v1" />-->
+    <!--<add key="ServiceUrl" value="http://10.104.4.105:9004/v1" />-->
+    <!--<add key="ServiceUrl" value="http://192.168.216.143:9004/v1" />-->
+    <!--<add key="ServiceUrl" value="http://192.168.137.136:9004/v1" />-->
+    <!--<add key="ServiceUrl" value="http://10.104.0.1:9004/v1" />-->
+    <!--<add key="ServiceUrl" value="http://192.168.107.60:8888/icore.icp.winform/pass/jlcar"/>-->
+    <!--<add key="ServiceUrl" value="http://192.168.185.29/icore.icp.winform/pass/jlcar"/>-->
+    <add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>
     <!--<add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>-->
     <!--<add key="ServiceUrl" value="http://10.130.1.2/icore.icp.web/pass/systemBase/v1"/>-->
     <!--实时库地址-->
-    <add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
+    <add key="icoredbTcp" value="tarantool://guest@10.99.200.86:21019" />
     <add key="icoredbTcp2" value="tarantool://guest@10.130.1.3:2101" />
     <!--<add key="icoredbTcp" value="tarantool://guest@10.130.1.3:2101" />-->
     <!--SFTP或者vsftp服务端连接及地址-->

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -172,7 +172,7 @@ namespace MeterSceneLibrary
 
 
                     // 查已选择的委托
-                    RESTfulResult<List<PreTrackScale>> rmScale = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo, lineDesc = "1" });
+                    RESTfulResult<List<PreTrackScale>> rmScale = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo, lineDesc = "1"});
 
                     if (rmScale.Succeed && rmScale.Data.Count == 1 && list[0].weightTypeNo == "001033001")
                     {

MeterSceneLibrary/JISCO/InnerDoubleJISCO.cs

@@ -141,7 +141,7 @@ namespace MeterSceneLibrary
                     }
 
                     // 查已选择的委托
-                    RESTfulResult<List<PreTrackScale>> rmScale = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo, lineDesc = "1" });
+                    RESTfulResult<List<PreTrackScale>> rmScale = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo, lineDesc = "1"});
 
                     // 查询一次计量数据表
                     RESTfulResult<List<MeterWorkCarActualFirst>> rmFirst = mwcfs.doQueryByFlag(new MeterWorkCarActualFirst { carNo = PbCache.lockCarNo });