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> <PublisherName>Xylem Sensus Laatzen</PublisherName>
<SuiteName>Cordonel Assembly Line</SuiteName> <SuiteName>Cordonel Assembly Line</SuiteName>
<WebPage>publish.htm</WebPage> <WebPage>publish.htm</WebPage>
<ApplicationRevision>14</ApplicationRevision> <ApplicationRevision>15</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>

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

@ -632,38 +632,43 @@ namespace CordonelAssemblyLine.Model
$"{genesisStatus.AlternativeRequiredBatteryLoadPercent} > " + $"{requirements.MaxDrainedBatteryLoadPercentAssembly}"); $"{genesisStatus.AlternativeRequiredBatteryLoadPercent} > " + $"{requirements.MaxDrainedBatteryLoadPercentAssembly}");
ret = false; 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) if (genesisStatus.DrainedBatteryLoadPercent > requirements.MaxDrainedBatteryLoadPercentAssembly)
{ {
lblS08Text = $"{nameof(genesisStatus.DrainedBatteryLoadPercent)}: " + lblS08Text = $"{nameof(genesisStatus.DrainedBatteryLoadPercent)}: " +
$"{genesisStatus.DrainedBatteryLoadPercent} > " + $"{genesisStatus.DrainedBatteryLoadPercent} > " +
$"{requirements.MaxDrainedBatteryLoadPercentAssembly}"; $"{requirements.MaxDrainedBatteryLoadPercentAssembly}";
lblS08Color = _progressError; lblS08Color = _progressError;
ret = false; ret = false;
sbMSG.AppendLine($"{nameof(genesisStatus.DrainedBatteryLoadPercent)}: " + sbMSG.AppendLine($"{nameof(genesisStatus.DrainedBatteryLoadPercent)}: " +
$"{genesisStatus.DrainedBatteryLoadPercent} > " + $"{genesisStatus.DrainedBatteryLoadPercent} > " +
$"{requirements.MaxDrainedBatteryLoadPercentAssembly}"); $"{requirements.MaxDrainedBatteryLoadPercentAssembly}");
} }
else sbMSG.AppendLine($"Maximaler Batterieverbrauch Montage i.O."); else sbMSG.AppendLine($"Maximaler Batterieverbrauch Montage i.O.");
// lagerzeit - MaxStorageMonths // lagerzeit - MaxStorageMonths
if (genesisStatus.StorageMonths > requirements.MaxStorageMonths) if (genesisStatus.StorageMonths > requirements.MaxStorageMonths)
{ {
lblS08Text = $"{nameof(genesisStatus.StorageMonths)}: " + lblS08Text = $"{nameof(genesisStatus.StorageMonths)}: " +
$"{genesisStatus.StorageMonths} > " + $"{genesisStatus.StorageMonths} > " +
$"{requirements.MaxStorageMonths}"; $"{requirements.MaxStorageMonths}";
lblS08Color = _progressError; lblS08Color = _progressError;
ret = false; ret = false;
sbMSG.AppendLine($"{nameof(genesisStatus.StorageMonths)}: " +
$"{genesisStatus.StorageMonths} > " +
$"{requirements.MaxStorageMonths}");
}
else sbMSG.AppendLine($"Maximallagerzeit i.O."); sbMSG.AppendLine($"{nameof(genesisStatus.StorageMonths)}: " +
meter.WriteLog(sbMSG.ToString()); $"{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()}" + var str = LocalWebRequest.GetRequestWithError($"{ServiceUrls.GenesisFinalCheckServiceUrl()}" +
$"GetOrderOverview?ProductionOrderNumber={_order}" + // 3238370 $"GetOrderOverview?ProductionOrderNumber={_order}" + // 3238370
$"&CheckPcbId={_pcbId}", out var retCode, 50000); // 251019003 $"&CheckPcbId={_pcbId}", out var retCode, 50000); // 251019003
Log($"GetOrderOverview {retCode}"); Log($"GetOrderOverview {retCode}");
if (str.Contains("The request is invalid")) 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}"); // SetState($"Produktionsdatum wird nicht überprüft Sonderfreigabe Nr.:{_skipProcessSteps.Id} von {_skipProcessSteps.Name}");
//} //}
lblS09Color = _progressDone; lblS09Color = _progressDone;
if (Compare(_orderDetails.CheckAppsIdVersion, _orderDetails.FrequencyIndicator, _orderDetails.MeterSize, _orderDetails.PressurePresent)) if (Compare(_orderDetails.CheckAppsIdVersion, _orderDetails.FrequencyIndicator, _orderDetails.MeterSize, _orderDetails.PressurePresent))