BourneCao пре 3 година
родитељ
комит
cddcf94f52

+ 4 - 4
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"/>-->
     <!--实时库地址-->
@@ -54,8 +54,8 @@
     <add key="carAdd" value="1" />
 
     <!--智能料场显示:1(显示),0(不显示)-->
-    <add key="isSendZNLC" value="1" />
-    <add key="isWriteRFID" value="1" />
+    <add key="isSendZNLC" value="0" />
+    <add key="isWriteRFID" value="0" />
 
     <!--语音播放次数-->
     <add key="voiceNum" value="5" />

+ 4 - 4
CarMeterSystem/Form1.cs

@@ -222,7 +222,7 @@ namespace CarMeterSystem
                 }
                 else
                 {
-                    l.WriteLog(0, "按IP地址找不到计量点信息,系统登录失败");
+                    l.WriteLog(0, "按IP地址找不到计量点信息,系统登录失败,ip:" + IpAddress.getIp);
                 }
             }
             catch (Exception ex)
@@ -578,7 +578,7 @@ namespace CarMeterSystem
                 if (testFlag)
                 {
                     sCarNo = testCarNo;
-                    //PbCache.collect.carno = testCarNo;
+                    PbCache.collect.carno = testCarNo;
                     PbCache.collect.weight = testWgt;
                     PbCache.collect.weightStatus = 0;
                     PbCache.monitorResult.valid_park_status = true;
@@ -1078,9 +1078,9 @@ namespace CarMeterSystem
 
         private delegate void ShowBtnTare(bool flag);//定义委托  期限皮重按钮
 
-        private int testWgt = 1000;
+        private int testWgt = 0;
         private string testCarNo = "", testPlanNo = "";
-        private bool testFlag = false;
+        private bool testFlag = true;
 
         /// <summary>
         /// 截图测试

+ 2 - 1
CarMeterSystem/frmMain.cs

@@ -94,7 +94,7 @@ namespace CarMeterSystem
         private List<ucBusinessType> lu = new List<ucBusinessType>();
 
         private bool isVoiceDownCar = false;//车上人员请下车播放一次
-        private bool isShowFrmWelcome = true; //是否显示欢迎界面
+        private bool isShowFrmWelcome = false; //是否显示欢迎界面
 
         private bool isOpened = false;//是否已经打开了扫码计量界面
 
@@ -660,6 +660,7 @@ namespace CarMeterSystem
                     PbCache.collect.videoCarNo1 = e.videoCarNo1;
                     PbCache.collect.videoCarNo2 = e.videoCarNo2;
                     PbCache.collect.rfidCarNo = e.RfidNos;
+                    PbCache.collect.carnoAlert = e.carnoAlert;
                 }
 
                 if (PbCache.collect != null && PbCache.collect.weightStatus == 0)

+ 1 - 1
Common/database/MemoryTableDataSocket.cs

@@ -190,7 +190,7 @@ namespace Common
                         arr[0].Exit,  //13
                         // 20221011 By BourneCao 
                         // 增加双摄像头支持
-                        PlateNoList.Count == 1 ? "" : PlateNoList[1].CarNo //14
+                        PlateNoList.Count <= 1 ? "" : PlateNoList[1].CarNo //14
                     ); 
 
                     double mainWgt = 0;

+ 1 - 1
MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -818,7 +818,7 @@ namespace MeterSceneLibrary
                                         RESTfulResult<List<PreTrackScale>> scales = preTrackScaleService.findCarScale(new PreTrackScale { predictionNo = firstList[0].predictionNo });
                                         if (PbCache.monitorResult.valid_wgt == true || listMonitor.Data[0].validWgt == "0")
                                         {
-                                            if (scales.Data == null || scales.Data.Count == 0)
+                                            if (scales.Data != null && scales.Data.Count > 0)
                                             {
                                                 //判断称点是否允许期限皮重
                                                 if (PbCache.sportInfo.allowedTareWeight == "1")