代码提交

CarMeterSystem/frmMain.cs

@@ -94,7 +94,7 @@ namespace CarMeterSystem
         private List<ucBusinessType> lu = new List<ucBusinessType>();
 
         private bool isVoiceDownCar = false;//车上人员请下车播放一次
-        private bool isShowFrmWelcome = false; //是否显示欢迎界面
+        private bool isShowFrmWelcome = true; //是否显示欢迎界面
 
         private bool isOpened = false;//是否已经打开了扫码计量界面
 
@@ -439,6 +439,8 @@ namespace CarMeterSystem
             //num++;
 
             //e.carno = "湘G88888";
+            //e.weight = 23580;
+            //e.weightStatus = 0;
 
             //if (num < 20)
             //{
@@ -656,7 +658,9 @@ namespace CarMeterSystem
                     PbCache.collect.parkStatus = e.parkStatus;
                     PbCache.collect.datetime = e.datetime;
                     PbCache.collect.licType = e.licType;
-                    PbCache.collect.carno = e.carno;
+                    if (!bEditCar && !codeFlag && String.IsNullOrEmpty(RFIDCarNo)) {
+                        PbCache.collect.carno = e.carno;
+                    }
                     PbCache.collect.videoCarNo1 = e.videoCarNo1;
                     PbCache.collect.videoCarNo2 = e.videoCarNo2;
                     PbCache.collect.rfidCarNo = e.RfidNos;

CarMeterSystem/frmOneYardToEnd.cs

@@ -43,7 +43,6 @@ namespace CarMeterSystem
         private MeterWorkCarNoIdentifyService meterWorkCarNoIdentifyService = new MeterWorkCarNoIdentifyService();
         private MeterWorkCompareSpotScaleService meterWorkCompareSpotScaleService = new MeterWorkCompareSpotScaleService();
         private MeterBaseSpecialUnitService meterBaseSpecialUnitService = new MeterBaseSpecialUnitService();
-        private MeterWorkCarMeterTimeService meterWorkCarMeterTimeService = new MeterWorkCarMeterTimeService();
         private ComBaseInfoService comBaseInfoService = new ComBaseInfoService();
         private MyTest myTest = new MyTest();
         // 重量类型预处理表
@@ -81,11 +80,6 @@ namespace CarMeterSystem
 
         private ImageCurlControl imageCurlControl = new ImageCurlControl();
 
-        private DateTime weighTime; //上秤时间
-        private DateTime showButtonTime; //出现按钮时间
-        private DateTime successTime; //保存完成时间
-        private DateTime noWeightTime; //下称时间
-
         // 抓图用的界面 20220808 by BourneCao
         private frmVoice frmVoice = new frmVoice();
 
@@ -145,7 +139,6 @@ namespace CarMeterSystem
 
         public void init()
         {
-            weighTime = DateTime.Now;
             isMeasureSuccess = false;
 
             PbCache.mwPreFirst = meterWorkCarActualFirst;
@@ -850,7 +843,6 @@ namespace CarMeterSystem
                     }
                     #endregion
                     isStop = false;
-                    successTime = DateTime.Now;
                     #region 期限皮显示及保存
 
                     ////留期限皮提醒
@@ -1911,7 +1903,6 @@ namespace CarMeterSystem
 
                             if (!PbCache.isSelFrmMat)
                             {
-                                showButtonTime = DateTime.Now;
                                 //lg.WriteLog(25, PbCache.lockCarNo + "Sleep前点击保存按钮");
                                 Thread.Sleep(3000);
                                 //lg.WriteLog(25, PbCache.lockCarNo + "Sleep后点击保存按钮");
@@ -2736,7 +2727,6 @@ namespace CarMeterSystem
         {
             try
             {
-                noWeightTime = DateTime.Now;
                 // 20220930 By BourneCao
                 // 清楚本地判稳参数
                 localWeightStatus = false;
@@ -2767,35 +2757,8 @@ namespace CarMeterSystem
                 //关闭一些线程及定时任务
                 // timer1.Stop();//rxh delete
                 //timer1.Enabled = false;//rxh delete
-
-                //timer1.Dispose();
-                if (isMeasureSuccess)
-                {
-                    MeterWorkCarMeterTime meterWorkCarMeterTime = new MeterWorkCarMeterTime();
-                    //总计量时间
-                    TimeSpan timeSpanTotal = noWeightTime - weighTime;
-                    meterWorkCarMeterTime.totalNum = timeSpanTotal.TotalSeconds;
-                    //上秤到判稳计量时间
-                    TimeSpan timeSpanUp = weighTime - showButtonTime;
-                    meterWorkCarMeterTime.upNum = timeSpanUp.TotalSeconds;
-                    //判稳后程序计量时间
-                    TimeSpan timeSpanMeter = successTime - showButtonTime;
-                    meterWorkCarMeterTime.meterNum = timeSpanMeter.TotalSeconds;
-                    //判稳计量到下秤计量时间
-                    TimeSpan timeSpanDown = noWeightTime - successTime;
-                    meterWorkCarMeterTime.downNum = timeSpanDown.TotalSeconds;
-
-                    meterWorkCarMeterTime.actualFirstNo = PbCache.actualFirstNo;
-                    meterWorkCarMeterTime.startTime = weighTime;
-                    meterWorkCarMeterTime.endTime = noWeightTime;
-                    meterWorkCarMeterTime.MeterStartTime = showButtonTime;
-                    meterWorkCarMeterTime.MeterEndTime = successTime;
-                    meterWorkCarMeterTime.valueFlag = "1";
-                    meterWorkCarMeterTime.createManNo = "admin";
-                    meterWorkCarMeterTime.createManName = "admin";
-
-                    meterWorkCarMeterTimeService.doAdd(meterWorkCarMeterTime);
-                }
+               
+                                  //timer1.Dispose();
 
                 // 销毁对象
                 CleanObjectData();

Common/database/MemoryTableDataSocket.cs

@@ -173,8 +173,8 @@ namespace Common
                     JArray jArray = new JArray(
                         arr[0].Pointid, //0
                         arr[0].Status,  //1
-                                        //arr[0].CarNo, //2
-                        "甘B32619",
+                        arr[0].CarNo, //2
+                        //"甘B32619",
                         arr[0].Weight, //3
                         arr[0].WeightStatus, //4
                         arr[0].StopStatus, //5
@@ -183,17 +183,17 @@ namespace Common
                         // 20221011 By BourneCao 
                         // 增加双摄像头支持
                         //PlateNoList.Count == 0 ? "" : PlateNoList[PlateNoList.Count - 1].CarNo, //8
-                        //PlateNoList.Count == 0 ? "" : PlateNoList[0].CarNo, //8
-                        "甘B32619",
+                        PlateNoList.Count == 0 ? "" : PlateNoList[0].CarNo, //8
+                        //"甘B32619",
                         RfidList.Count == 0 ? "" : RfidList[RfidList.Count - 1].CarNo, //9
                         arr[0].WeightSave, //10
                         arr[0].FinishTime, //11
                         arr[0].Entry, //12
                         arr[0].Exit,  //13
-                                      // 20221011 By BourneCao 
-                                      // 增加双摄像头支持
-                                      //PlateNoList.Count <= 1 ? "" : PlateNoList[1].CarNo //14
-                        "甘B32639"
+                        // 20221011 By BourneCao 
+                        // 增加双摄像头支持
+                        PlateNoList.Count <= 1 ? "" : PlateNoList[1].CarNo //14
+                        //"甘B32639"
                     ); 
 
                     double mainWgt = 0;