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

CarMeterSystem/App.config

@@ -4,14 +4,14 @@
 		<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://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://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"/>-->
     <!--实时库地址-->

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -798,6 +798,7 @@ namespace MeterSceneLibrary
                                             mwaf.valueFlag = "0";
                                             PbCache.voiceType = 1;
                                             rt = saveMethod.doAddFirst(null, mwaf);
+                                            PbCache.monitorResultMessage = string.Format("车号{0}，连续保存皮重", PbCache.lockCarNo);
                                             PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         }
                                         else
@@ -979,8 +980,8 @@ namespace MeterSceneLibrary
                                             }
                                             else if (countTerm == firstList.Count)
                                             {
-                                                RESTfulResult<List<PreTrackScale>> scales = preTrackScaleService.findCarScale(new PreTrackScale { predictionNo = firstList[0].predictionNo });
-                                                if (scales.Data == null || scales.Data.Count == 0)
+                                                RESTfulResult<List<PreTrackScale>> scaleFirst = preTrackScaleService.findCarScale(new PreTrackScale { predictionNo = firstList[0].predictionNo });
+                                                if (scaleFirst.Data == null || scaleFirst.Data.Count == 0)
                                                 {
                                                     mwaf.weightType = "0";
                                                     PbCache.voiceType = 1;
@@ -992,11 +993,11 @@ namespace MeterSceneLibrary
                                                 {
                                                     //匹配结净
                                                     EntityBase<PreTrackScale> entityBase2 = new EntityBase<PreTrackScale>();
-                                                    mwaf = entityBase2.format<MeterWorkCarActualFirst>(scales.Data[0], mwaf);
+                                                    mwaf = entityBase2.format<MeterWorkCarActualFirst>(scaleFirst.Data[0], mwaf);
                                                     mwaf.isPreScale = "1";
                                                     mwaf.weightType = "0";
                                                     PbCache.voiceType = 1;
-                                                    rt = saveMethod.doNet(scales.Data[0], firstList[0], mwaf);
+                                                    rt = saveMethod.doNet(scaleFirst.Data[0], firstList[0], mwaf);
                                                     PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，净重{2}吨，存在未结净毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                                     PbCache.monitorResultMessage = string.Format("车号{0}有{1}条未结净的毛重；", PbCache.lockCarNo, firstList.Count - 1);
                                                 }