From 99fb3779bd06287591cec6eebc07a3af781356f6 Mon Sep 17 00:00:00 2001
From: Stoyan Zlatev <Stoyan.Zlatev@xylem.com>
Date: Thu, 12 Feb 2026 09:54:08 +0100
Subject: [PATCH] picking debugged

---
 .../CordonelAssemblyLine.csproj               |  2 +-
 .../Model/PickingModel.cs                     | 41 +++++++++++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj
index c4609387..8b92b610 100644
--- a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj
+++ b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj
@@ -31,7 +31,7 @@
     <PublisherName>Xylem Sensus Laatzen</PublisherName>
     <SuiteName>Cordonel Assembly Line</SuiteName>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>14</ApplicationRevision>
+    <ApplicationRevision>15</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/Common/CordonelAssemblyLine/Model/PickingModel.cs b/Common/CordonelAssemblyLine/Model/PickingModel.cs
index c47d05a0..77ac2b72 100644
--- a/Common/CordonelAssemblyLine/Model/PickingModel.cs
+++ b/Common/CordonelAssemblyLine/Model/PickingModel.cs
@@ -632,38 +632,43 @@ namespace CordonelAssemblyLine.Model
                                             $"{genesisStatus.AlternativeRequiredBatteryLoadPercent} > " + $"{requirements.MaxDrainedBatteryLoadPercentAssembly}");
                                         ret = false;
                                     }
-                                    else sbMSG.AppendLine($"Alternative Batterieverbrauch Montage i.O.");
-                                    // max bat verbrauch - MaxDrainedBatteryLoadPercentAssembly
+
+
+
+
+                                                                                                else sbMSG.AppendLine($"Alternative Batterieverbrauch Montage i.O.");
+                                                                                                // max bat verbrauch - MaxDrainedBatteryLoadPercentAssembly
 
                                     if (genesisStatus.DrainedBatteryLoadPercent > requirements.MaxDrainedBatteryLoadPercentAssembly)
                                     {
                                         lblS08Text = $"{nameof(genesisStatus.DrainedBatteryLoadPercent)}: " +
                                             $"{genesisStatus.DrainedBatteryLoadPercent} > " +
-                                $"{requirements.MaxDrainedBatteryLoadPercentAssembly}";
+                            $"{requirements.MaxDrainedBatteryLoadPercentAssembly}";
                                         lblS08Color = _progressError;
-                                        ret = false;
+                                            ret = false;
                                         sbMSG.AppendLine($"{nameof(genesisStatus.DrainedBatteryLoadPercent)}: " +
                                             $"{genesisStatus.DrainedBatteryLoadPercent} > " +
                                 $"{requirements.MaxDrainedBatteryLoadPercentAssembly}");
                                     }
                                     else sbMSG.AppendLine($"Maximaler Batterieverbrauch Montage i.O.");
                                     // lagerzeit - MaxStorageMonths
-                                    if (genesisStatus.StorageMonths > requirements.MaxStorageMonths)
-                                    {
-                                        lblS08Text = $"{nameof(genesisStatus.StorageMonths)}: " +
-                                            $"{genesisStatus.StorageMonths} > " +
-                                            $"{requirements.MaxStorageMonths}";
-                                        lblS08Color = _progressError;
-                                        ret = false;
-                                        sbMSG.AppendLine($"{nameof(genesisStatus.StorageMonths)}: " +
-                                            $"{genesisStatus.StorageMonths} > " +
-                                            $"{requirements.MaxStorageMonths}");
-                                    }
+                                if (genesisStatus.StorageMonths > requirements.MaxStorageMonths)
+                                {
+                                    lblS08Text = $"{nameof(genesisStatus.StorageMonths)}: " +
+                                    $"{genesisStatus.StorageMonths} > " +
+                                        $"{requirements.MaxStorageMonths}";
+                                    lblS08Color = _progressError;
+                                    ret = false;
 
-                                    else sbMSG.AppendLine($"Maximallagerzeit i.O.");
-                                    meter.WriteLog(sbMSG.ToString());
+                                    sbMSG.AppendLine($"{nameof(genesisStatus.StorageMonths)}: " +
+                                        $"{genesisStatus.StorageMonths} > " +
+                                    $"{requirements.MaxStorageMonths}");
                                 }
 
+                                else sbMSG.AppendLine($"Maximallagerzeit i.O.");
+                                meter.WriteLog(sbMSG.ToString());
+                            }
+
 
 
 
@@ -1216,6 +1221,7 @@ namespace CordonelAssemblyLine.Model
                             var str = LocalWebRequest.GetRequestWithError($"{ServiceUrls.GenesisFinalCheckServiceUrl()}" +
                                                                           $"GetOrderOverview?ProductionOrderNumber={_order}" + // 3238370
                                                                           $"&CheckPcbId={_pcbId}", out var retCode, 50000);    // 251019003
+
                             Log($"GetOrderOverview {retCode}");
                             if (str.Contains("The request is invalid"))
                             {
@@ -1314,6 +1320,7 @@ namespace CordonelAssemblyLine.Model
                             //{
                             //    SetState($"Produktionsdatum wird nicht überprüft Sonderfreigabe Nr.:{_skipProcessSteps.Id} von {_skipProcessSteps.Name}");
                             //}
+
                             lblS09Color = _progressDone;
 
                             if (Compare(_orderDetails.CheckAppsIdVersion, _orderDetails.FrequencyIndicator, _orderDetails.MeterSize, _orderDetails.PressurePresent))