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

CarMeterSystem/frmOneYardToEnd.cs

@@ -2777,7 +2777,7 @@ namespace CarMeterSystem
                     TimeSpan timeSpanTotal = noWeightTime - weighTime;
                     meterWorkCarMeterTime.totalNum = timeSpanTotal.TotalSeconds;
                     //上秤到判稳计量时间
-                    TimeSpan timeSpanUp = weighTime - showButtonTime;
+                    TimeSpan timeSpanUp = showButtonTime - weighTime;
                     meterWorkCarMeterTime.upNum = timeSpanUp.TotalSeconds;
                     //判稳后程序计量时间
                     TimeSpan timeSpanMeter = successTime - showButtonTime;
@@ -2794,6 +2794,7 @@ namespace CarMeterSystem
                     meterWorkCarMeterTime.valueFlag = "1";
                     meterWorkCarMeterTime.createManNo = "admin";
                     meterWorkCarMeterTime.createManName = "admin";
+                    meterWorkCarMeterTime.createTime  = DateTime.Now;
 
                     meterWorkCarMeterTimeService.doAdd(meterWorkCarMeterTime);
                 }

CarMeterSystem/fromContect.cs

@@ -847,7 +847,8 @@ namespace CarMeterSystem
                 {
                     switch (lv.Tagname.Replace(PbCache.collect_no, ""))
                     {
-                        case "StaticStatus"://车辆检测	"0、东西方向激光均无报警；否则报警
+                        case "StaticStatus"://
+                                            //	"0、东西方向激光均无报警；否则报警
 
                             break;
                         case "SwitchLight"://PLC红绿灯控制模式状态	"PLC有三种控制模式：1、自动、2、远控；3、检修

Common/vo/work/MeterWorkMonitor.cs

@@ -282,7 +282,7 @@ namespace Common
         public string frontInfraredRayState { get; set; }
 
         /// <summary>
-        /// 后红外光栅状态（0正常 1异常）
+        /// 前红外光栅状态（0正常 1异常）
         /// </summary>
         public string rearInfraredRayState { get; set; }