diff --git a/PROMS/DataLoader/RefObjs.cs b/PROMS/DataLoader/RefObjs.cs index b64ce1e9..0aea15a7 100644 --- a/PROMS/DataLoader/RefObjs.cs +++ b/PROMS/DataLoader/RefObjs.cs @@ -83,7 +83,12 @@ namespace DataLoader // add an annotation stating "Invalid Unit RO 'ROID'. Need an Item for this, so just add // it to a list of 'invalid ros' so that calling method can add annotations to the Item. if (roval == "?") - InvalidROs.Add(string.Format("Invalid RO '{0}'", ROID.Substring(0, 12))); + { + if (ROID.StartsWith("FFFF")) + InvalidROs.Add(string.Format("Invalid Unit RO '{0}'", ROID.Substring(0, 12))); + else + InvalidROs.Add(string.Format("Invalid RO '{0}'", ROID.Substring(0, 12))); + } //if (roval.Contains("\r") || roval.Contains("\n")) // Console.WriteLine("RO has new Lines"); //string results = string.Format(@"\v \v0 ", diff --git a/PROMS/DataLoader/Transitions.cs b/PROMS/DataLoader/Transitions.cs index 55b20a20..dd4b21db 100644 --- a/PROMS/DataLoader/Transitions.cs +++ b/PROMS/DataLoader/Transitions.cs @@ -40,6 +40,8 @@ namespace DataLoader { List migrationErrors = new List(); string thekey = dr["TONUMBER"].ToString() + "|" + dr["TOSEQUENCE"].ToString(); + if (thekey.EndsWith("0S")) + thekey = thekey.Substring(0, thekey.Length - 1); string dti = dr["DTI"].ToString().PadRight(18, ' '); string userid = dti.Substring(13, 5).Trim(); int itype = 0;