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

Renaiming Enums

Browse Source
This commit is contained in:
Roland Drabesch
2022-09-22 16:12:58 +02:00
parent 581f40ea03
commit 3a6bd5d508
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelAssemblyLine/Model/MarriageViewModel.cs
+2 -2
View File
@@ -516,11 +516,11 @@ namespace CordonelAssemblyLine.Model
sbMSG.AppendLine($"Technisches Problem beim abfragen der Verfügbarkeit. Code ({msgRetCode})"); sbMSG.AppendLine($"Technisches Problem beim abfragen der Verfügbarkeit. Code ({msgRetCode})");
} }
if (msgRetInt.HasFlag(MarriagePossibleEnum.NotPossibleDueAlredayMatch)) if (msgRetInt.HasFlag(MarriagePossibleEnum.NotPossibleDueToAlreadyMarried))
{ {
sbMSG.AppendLine($"Pcb ist schon mit der Seriennummer {retSerial} verbunden"); sbMSG.AppendLine($"Pcb ist schon mit der Seriennummer {retSerial} verbunden");
} }
if (msgRetInt.HasFlag(MarriagePossibleEnum.NotPossibleDuePcblocked)) if (msgRetInt.HasFlag(MarriagePossibleEnum.NotPossibleDuePcbLocked))
{ {
sbMSG.AppendLine("Pcb ist schon mit einer anderen Seriennummer verbunden."); sbMSG.AppendLine("Pcb ist schon mit einer anderen Seriennummer verbunden.");
} }
Common/Service/MeterProcessState/Controllers/MarriageController.cs
+4 -4
View File
@@ -381,7 +381,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
if (dr["AlreadyMarried"].ToString() == "1") if (dr["AlreadyMarried"].ToString() == "1")
{ {
ret = ret | MarriagePossibleEnum.NotPossibleDueAlredayMatch; ret = ret | MarriagePossibleEnum.NotPossibleDueToAlreadyMarried;
} }
if (dr["SerialNumberBlocked"].ToString() == "1") if (dr["SerialNumberBlocked"].ToString() == "1")
@@ -390,12 +390,12 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
} }
if (dr["PcbBlocked"].ToString() == "1") if (dr["PcbBlocked"].ToString() == "1")
{ {
ret = ret | MarriagePossibleEnum.NotPossibleDuePcblocked; ret = ret | MarriagePossibleEnum.NotPossibleDuePcbLocked;
} }
if (dr["PcbBlocked"].ToString() == "1") if (dr["PcbBlocked"].ToString() == "1")
{ {
ret = ret | MarriagePossibleEnum.NotPossibleDuePcblocked; ret = ret | MarriagePossibleEnum.NotPossibleDuePcbLocked;
} }
if (dr["LastHeTest"] == DBNull.Value) if (dr["LastHeTest"] == DBNull.Value)
@@ -545,7 +545,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
if (dr["PcbBlocked"].ToString() == "1") if (dr["PcbBlocked"].ToString() == "1")
{ {
ret = ret | MarriagePossibleEnum.NotPossibleDuePcblocked; ret = ret | MarriagePossibleEnum.NotPossibleDuePcbLocked;
} }
if (dr["LastHeTest"] == DBNull.Value) if (dr["LastHeTest"] == DBNull.Value)
Common/Ui/LegacyGenesisControl/ctlCRdy.cs
+1 -1
View File
@@ -76,7 +76,7 @@ namespace XylemCommonUiLegacyGenCtl
public bool DetectIsDone { get; set; } public bool DetectIsDone { get; set; }
public MeterSize Metersize { get; set; } = MeterSize.NAN; public MeterSize Metersize { get; set; } = MeterSize.NA;
private System.Windows.Forms.ToolTip ToolTip1 = new System.Windows.Forms.ToolTip(); private System.Windows.Forms.ToolTip ToolTip1 = new System.Windows.Forms.ToolTip();