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-12 13:46:44 +01:00
commit bd2daa9f31
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj
View File

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

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

@ -632,6 +632,10 @@ namespace CordonelAssemblyLine.Model
$"{genesisStatus.AlternativeRequiredBatteryLoadPercent} > " + $"{requirements.MaxDrainedBatteryLoadPercentAssembly}");
ret = false;
}
else sbMSG.AppendLine($"Alternative Batterieverbrauch Montage i.O.");
// max bat verbrauch - MaxDrainedBatteryLoadPercentAssembly
@ -655,6 +659,7 @@ namespace CordonelAssemblyLine.Model
$"{requirements.MaxStorageMonths}";
lblS08Color = _progressError;
ret = false;
sbMSG.AppendLine($"{nameof(genesisStatus.StorageMonths)}: " +
$"{genesisStatus.StorageMonths} > " +
$"{requirements.MaxStorageMonths}");
@ -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))