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

CarMeterSystem/frmMain.cs

@@ -842,7 +842,8 @@ namespace CarMeterSystem
 
                         #region RFID识别车号信息
                         mwUpdate.rfidCar = "";
-                        mwUpdate.photoCar = e.vdioCarNos;
+                        mwUpdate.photoCar = e.videoCarNo1;
+                        mwUpdate.photoCar2 = e.videoCarNo2;
                         mwUpdate.scanCar = "";
                         if (codeFlag)
                         {

CarMeterSystem/frmOneYardToEnd.cs

@@ -244,7 +244,7 @@ namespace CarMeterSystem
 
                 #region 红外对射及量程验证以及光栅
                 valid.ValidMethod();
-                if (PbCache.range != null && PbCache.range.upperRange < PbCache.collect.weight)
+                if ((PbCache.range != null && PbCache.range.upperRange < PbCache.collect.weight) || PbCache.collect.weight.ToString().Substring(PbCache.collect.weight.ToString().Length - 1, 1) != "0")
                 {
                     //超量程
                     vicPlayClass.GetVoicePlay("已超量程", PbCache.collect.carno);
@@ -1477,7 +1477,7 @@ namespace CarMeterSystem
                     #region 红外对射及量程验证及停留超时验证
 
                     valid.ValidMethod();
-
+                    // 重量最后一位不为0，也是超量程 20220816 By BourneCao
                     if (PbCache.range != null && PbCache.range.upperRange < PbCache.collect.weight)
                     {
                         //超量程
@@ -2831,6 +2831,7 @@ namespace CarMeterSystem
                     setCar = "",
                     rfidCar = "",
                     photoCar = "",
+                    photoCar2 = "",
                     scanCar = "",
                     editCar = "",
                     zeroState = "0",

Common/vo/work/MeterWorkMonitor.cs

@@ -145,6 +145,11 @@ namespace Common
         /// </summary>
         public string photoCar { get; set; }
 
+        /// <summary>
+        /// 抓拍车号2
+        /// </summary>
+        public string photoCar2 { get; set; }
+
         /// <summary>
         /// 扫描车号
         /// </summary>

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

@@ -96,20 +96,19 @@ namespace MeterPlugInLibrary
                             WriteThreadLog("jArray:"+jArray.ToString());
                         }
 
+                        // 20221011 By BourneCao 
+                        // 增加双摄像头支持
+                        // 1. 获取双摄像头车号
+                        string carNo1 = jArray[8].ToString();
+                        string carNo2 = jArray[14].ToString();
+
+                        arg.videoCarNo1 = carNo1;
+                        arg.videoCarNo2 = carNo2;
+
                         if (arg.licType == 0) //摄像头的数据
                         {
                             //arg.carno = jArray[2].ToString();
 
-                            
-                            // 20221011 By BourneCao 
-                            // 增加双摄像头支持
-                            // 1. 获取双摄像头车号
-                            string carNo1 = jArray[8].ToString();
-                            string carNo2 = jArray[14].ToString();
-
-                            arg.videoCarNo1 = carNo1;
-                            arg.videoCarNo2 = carNo2;
-
                             // 2. 判断逻辑：
                             //  a.A车号识别，B车号不识别；B车号识别，A车号不识别，正常计量，标记只有1个车号识别
                             if (carNo1 != "" && carNo2 == "")