代码提交

CarMeterSystem/App.config

@@ -4,8 +4,8 @@
 		<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://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" />-->
@@ -15,7 +15,7 @@
     <!--<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服务端连接及地址-->
@@ -33,7 +33,7 @@
 		<!--毛皮差值验证(单位kg)-->
 		<add key="differenceWgt" value="400" />
 		<!--进入测试界面还是正式界面 0测试，1正式,2一码到底测试,3判稳测试工具-->
-		<add key="productType" value="0" />
+		<add key="productType" value="1" />
 		<!--联达比较重量-->
 		<add key="lianDaWgt" value="200" />
 		<!--联达计量点编号-->

CarMeterSystem/CarMeterSystem.csproj

@@ -42,7 +42,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\output\CoreFS.CA06Lite.dll</HintPath>
     </Reference>
-    <Reference Include="iCore.Rtdb, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="iCore.Rtdb, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\output\iCore.Rtdb.dll</HintPath>
     </Reference>

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;//是否已经打开了扫码计量界面
 

CarMeterSystem/frmOneYardToEnd.cs

@@ -202,7 +202,7 @@ namespace CarMeterSystem
                 else
                 {
                     // 2.1 如果双摄像头识别类型为 0：都识别且一致   1：只有一个识别，则正常赋值
-                    if (PbCache.collect.carnoAlert == "0" || PbCache.collect.carnoAlert == "1")
+                    if (PbCache.collect.carnoAlert == "0" || PbCache.collect.carnoAlert == "1" || PbCache.collect.carnoAlert == null)
                     {
                         PbCache.lockCarNo = PbCache.collect.carno;
                     }
@@ -1353,7 +1353,7 @@ namespace CarMeterSystem
                         //2021年5月10日界面显示单位，调整为T
                         ucWeightCarTJXJG1.setWgt(Math.Round((double)PbCache.collect.weight / 1000, 2));
                         // 修改界面过磅状态红/绿图标
-                        ucWeightCarTJXJG1.setStable((PbCache.collect.weightStatus != 1 && localWeightStatus != false) ? true : false);
+                        ucWeightCarTJXJG1.setStable((PbCache.collect.weightStatus == 0 || localWeightStatus == true) ? true : false);
 
                         #region 远程计量交互代码
                         //lg.WriteLog(99, "PbCache.monitor:" + PbCache.monitor.ToString());
@@ -1848,6 +1848,7 @@ namespace CarMeterSystem
                                 //btnSave.Visible = true;//rxh delete
                                 //setMsgInfo(btnSave, "true", "2");//rxh add
 
+                                
                                 // 20221011 By BourneCao 
                                 // 增加双摄像头支持
                                 // 1. 如果不为视觉识别，则正常赋值
@@ -1859,7 +1860,7 @@ namespace CarMeterSystem
                                 else
                                 {
                                     // 2.1 如果双摄像头识别类型为 0：都识别且一致   1：只有一个识别，则正常赋值
-                                    if (PbCache.collect.carnoAlert == "0" || PbCache.collect.carnoAlert == "1")
+                                    if (PbCache.collect.carnoAlert == "0" || PbCache.collect.carnoAlert == "1" || PbCache.collect.carnoAlert == null)
                                     {
                                         setMsgInfo(btnSave, "true", "2");
                                     }
@@ -1874,7 +1875,6 @@ namespace CarMeterSystem
                                         led_controler.setStaticLineMsg(PbCache.sportInfo.ledIp, "车号未识别，请扫码计量");
                                         return;
                                     }
-
                                 }
                             }
                             if (!isVoiceDownCar)

Common/DbOption/work/MeterWorkCarNoIdentifyService.cs

@@ -18,7 +18,7 @@ namespace Common.DbOption.work
         {
             DbHelper db = new DbHelper();
 
-            RESTfulResult<string> rm = db.doOption<string>("meterworkcarnoidentify", "/add", new object[] { info }, 1);
+            RESTfulResult<string> rm = db.doOption<string>("meterworkcarnoidentifys", "/", new object[] { info }, 1);
             RESTfulResult<string> result = new RESTfulResult<string>();
             result.Succeed = rm.Succeed;
             result.Status = rm.Status;

MeterPlugInLibrary/实时库数据采集/DataCollectionControl.cs

@@ -91,10 +91,16 @@ namespace MeterPlugInLibrary
                         arg.datetime = Convert.ToDateTime(jArray[6].ToString().Replace("T", " ").Replace("Z", ""));
                         arg.licType = Convert.ToInt32(jArray[7].ToString());
 
+                        if (jArray[2].ToString() != "")
+                        {
+                            WriteThreadLog("jArray:"+jArray.ToString());
+                        }
+
                         if (arg.licType == 0) //摄像头的数据
                         {
-                            // arg.carno = jArray[2].ToString();
+                            //arg.carno = jArray[2].ToString();
 
+                            
                             // 20221011 By BourneCao 
                             // 增加双摄像头支持
                             // 1. 获取双摄像头车号
@@ -134,7 +140,7 @@ namespace MeterPlugInLibrary
                                 arg.carno = "";
                                 arg.carnoAlert = "3";
                             }
-
+                            
                         }
                         else
                         {