diff --git a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj index bbc5da95..7fa2256b 100644 --- a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj +++ b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj @@ -30,7 +30,7 @@ Xylem Sensus Laatzen Cordonel Assembly Line publish.htm - 27 + 28 1.0.0.%2a false true diff --git a/Common/CordonelAssemblyLine/Model/PickingModel.cs b/Common/CordonelAssemblyLine/Model/PickingModel.cs index 0c953767..64e9bca3 100644 --- a/Common/CordonelAssemblyLine/Model/PickingModel.cs +++ b/Common/CordonelAssemblyLine/Model/PickingModel.cs @@ -625,11 +625,11 @@ namespace CordonelAssemblyLine.Model - if (genesisStatus.AlternativeRequiredBatteryLoadPercent != null && - genesisStatus.AlternativeRequiredBatteryLoadPercent > requirements.MaxDrainedBatteryLoadPercentAssembly * 0.5) + if (genesisStatus.AlternativeRequiredBatteryLoadPercent != null + && genesisStatus.AlternativeRequiredBatteryLoadPercent > genesisStatus.DrainedBatteryLoadPercent - 0.5) { sbMSG.AppendLine($"{nameof(genesisStatus.AlternativeRequiredBatteryLoadPercent)}: " + - $"{genesisStatus.AlternativeRequiredBatteryLoadPercent} > " + $"{requirements.MaxDrainedBatteryLoadPercentAssembly}"); + $"{genesisStatus.AlternativeRequiredBatteryLoadPercent} > " + $"{genesisStatus.DrainedBatteryLoadPercent}"); ret = false; } @@ -1055,7 +1055,7 @@ namespace CordonelAssemblyLine.Model SetState($"Warte auf Scannereingabe({_scannerPort})"); } - // _barScanner.Input = "3243258"; + _barScanner.Input = "3251943"; if (_barScanner != null && !string.IsNullOrEmpty(_barScanner.Input)) {