marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production

Browse Source
This commit is contained in:
Thomas Wiedebusch 2026-02-25 16:55:08 +01:00
commit 582de5408d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj
View File

@ -30,7 +30,7 @@
<PublisherName>Xylem Sensus Laatzen</PublisherName>
<SuiteName>Cordonel Assembly Line</SuiteName>
<WebPage>publish.htm</WebPage>
<ApplicationRevision>27</ApplicationRevision>
<ApplicationRevision>31</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@ -316,4 +316,7 @@
<PropertyGroup>
<PostBuildEvent>del /Q /S *.xml *.pdb</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>copy /Y $(SolutionDir)Hardware\WaterMeter\Genesis\GenesisCore\bin\debug\configuration.json $(TargetDir)</PreBuildEvent>
</PropertyGroup>
</Project>

8
Common/CordonelAssemblyLine/Model/PickingModel.cs
View File

@ -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))
{