duyong пре 3 година
родитељ
комит
b3ee491a88
2 измењених фајлова са 7 додато и 2 уклоњено
  1. 2 0
      CarMeterSystem/Form1.cs
  2. 5 2
      CarMeterSystem/frmOneYardToEnd.cs

+ 2 - 0
CarMeterSystem/Form1.cs

@@ -111,6 +111,7 @@ namespace CarMeterSystem
             //*
             try
             {
+                
 
                 //CollectModel temp = new CollectModel();
 
@@ -349,6 +350,7 @@ namespace CarMeterSystem
         MeterWorkCarActualFirstService mwcfs = new MeterWorkCarActualFirstService();
         RESTfulResult<string> rmsSweepCodeClass = new RESTfulResult<string>();
         frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
+        private int num = 0;
 
         /// <summary>
         /// 数据采集

+ 5 - 2
CarMeterSystem/frmOneYardToEnd.cs

@@ -48,7 +48,7 @@ namespace CarMeterSystem
         private MyTest myTest = new MyTest();
         // 重量类型预处理表
         private MeterWorkPreWgttypeService wgttypeService = new MeterWorkPreWgttypeService();
-
+        private string actualFirstNoRe = "";
 
         private validTermTareCar termTareCar = new validTermTareCar();//验证是否可留期限皮
         private validRecoverInfo recoverInfo = new validRecoverInfo();//验证是否需要复磅以及是否满足复磅条件
@@ -1021,6 +1021,8 @@ namespace CarMeterSystem
                     meterWorkCarNoIdentify.actualFirstNo = PbCache.actualFirstNo;
                     meterWorkCarNoIdentify.carNo = PbCache.lockCarNo;
 
+                    actualFirstNoRe = PbCache.actualFirstNo;
+
                     // 调用邓义晶的新接口,存入
                     meterWorkCarNoIdentifyService.doAdd(meterWorkCarNoIdentify);
                     #endregion
@@ -2786,7 +2788,7 @@ namespace CarMeterSystem
                     TimeSpan timeSpanDown = noWeightTime - successTime;
                     meterWorkCarMeterTime.downNum = timeSpanDown.TotalSeconds;
 
-                    meterWorkCarMeterTime.actualFirstNo = PbCache.actualFirstNo;
+                    meterWorkCarMeterTime.actualFirstNo = actualFirstNoRe;
                     meterWorkCarMeterTime.startTime = weighTime;
                     meterWorkCarMeterTime.endTime = noWeightTime;
                     meterWorkCarMeterTime.MeterStartTime = showButtonTime;
@@ -2799,6 +2801,7 @@ namespace CarMeterSystem
                     meterWorkCarMeterTimeService.doAdd(meterWorkCarMeterTime);
                 }
 
+                actualFirstNoRe = "";
                 // 销毁对象
                 CleanObjectData();