change UI1236 Comamds

Common/Ui/LegacyGenesisControl/ctlBatch.cs

@@ -1,4 +1,5 @@
 using ByteArrayStyle;
+using Newtonsoft.Json;
 using NLog;
 using System;
 using System.Collections.Concurrent;
@@ -14,9 +15,11 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Xylem.Common.CommonCore.Configuration;
 using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
 using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
 using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
+using Xylem.Common.Logic.SoftwareAccessHelper;
 using Xylem.Common.Metrology.Measurements;
 using Xylem.Common.Metrology.Measurements.Consts;
 using Xylem.Common.Utils.Logging;
@@ -700,9 +703,39 @@ namespace XylemCommonUiLegacyGenCtl
             }
         }
 
+        public void MeterDoneWithDetails(int slot, bool Succeed, out string LutCrc, out bool MeterHasPreadjustment)
+        {
+            LutCrc = "";
+            MeterHasPreadjustment = false;
+            MeterDone(slot, Succeed);
+            var meter = batch.ListOfMeters.First(f => f.Slot == slot);
+            if (meter != null && meter is GenesisMeter gen)
+            {
+                LutCrc = gen.LutCrc;
+                try
+                {
+                    var responseJson = LocalWebRequest.GetRequest($"{ServiceUrls.MeterInfoForTestBench()}{gen.PcbId}");
+                    var a = JsonConvert.DeserializeObject<string[]>(responseJson);
+                    var SerialNumber = a[0];
+                    if (!String.IsNullOrEmpty(SerialNumber))
+                    {
+                        int tmp;
+                        MeterHasPreadjustment = int.TryParse(a[4], out tmp);
+                    }
+                }
+                catch (Exception)
+                {
+
+                    throw;
+                }
+
+            }
+        }
 
 
-        public void MeterDone(int slot, bool Succeed)
+
+
+            public void MeterDone(int slot, bool Succeed)
         {
             try
             {
@@ -750,14 +783,19 @@ namespace XylemCommonUiLegacyGenCtl
                         if (!genMeter.IsLoggedOn)
                         {
                             genMeter.Login();
+                            
                         }
                         genMeter.WriteRegister(Register.Genesisflow.SampleRate, 2);
                         genMeter.WriteRegister(Register.Genesisflow.LedMode, 0,true);
-
+                        meter.WriteLog($"MeterIsDone {state} {genMeter.LutCrc }");
+                    }
+                    else
+                    {
+                        meter.WriteLog($"MeterIsDone {state} ");
                     }
 
 
-                    meter.WriteLog($"MeterIsDone {state}");
+                
 
                 }).ContinueWith(delegate
                 {