diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROUsagesExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROUsagesExt.cs index fb89e608..4b00e63d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ROUsagesExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROUsagesExt.cs @@ -165,4 +165,22 @@ namespace VEPROMS.CSLA.Library this.RaiseListChangedEvents = true; } } + public partial class RoUsageInfo + { + private string _ShortROID; + public string ShortROID + { + get + { + if (_ShortROID == null) + { + if (ROID.Length == 16 && ROID.EndsWith("0000")) + _ShortROID = ROID.ToUpper().Substring(0, 12); + else + _ShortROID = ROID.ToUpper(); + } + return _ShortROID; + } + } + } } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs index 87f8c42a..025d4dca 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs @@ -664,8 +664,8 @@ namespace VEPROMS.CSLA.Library //_MyTimer.ActiveProcess = "Build Distinct RO Usage List"; using (RoUsageInfoList myList = RoUsageInfoList.GetAllForProcedure(proc)) foreach (RoUsageInfo myRO in myList) - if (!myROIDs.Contains(myRO.ROID.ToUpper())) - myROIDs.Add(myRO.ROID.ToUpper()); + if (!myROIDs.Contains(myRO.ShortROID)) + myROIDs.Add(myRO.ShortROID); using (DROUsageInfoList myList = DROUsageInfoList.GetAllForProcedure(proc)) foreach (DROUsageInfo myRO in myList) if (!myROIDs.Contains(myRO.ROID.ToUpper()))