C2025-024 #590

Merged
jjenko merged 18 commits from C2025-024 into Development 2025-08-08 10:19:00 -04:00
52 changed files with 2135 additions and 4099 deletions
Showing only changes of commit b9fc9748c7 - Show all commits

View File

@@ -1829,14 +1829,15 @@ namespace VEPROMS
//use overridden method to set the location for ROs //use overridden method to set the location for ROs
protected void SetROLocation(ref XmlElement xindivid, string roid, int rodbid) protected void SetROLocation(ref XmlElement xindivid, string roid, int rodbid)
{ {
if (MyDocVersion != null) if (MyProcedure?.MyDocVersion != null)
{ {
ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion); ROFSTLookup lookup = MyProcedure.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyProcedure.MyDocVersion);
using (RODbInfo myRODB = RODbInfoList.Get().FirstOrDefault(x => x.RODbID == rodbid)) using (RODbInfo myRODB = RODbInfoList.Get().FirstOrDefault(x => x.RODbID == rodbid))
{ {
roid = ROFSTLookup.FormatRoidKey(roid, true); roid = ROFSTLookup.FormatRoidKey(roid, true);
ROFSTLookup.rochild roc = lookup.GetRoChild(roid); ROFSTLookup.rochild roc = lookup.GetRoChild(roid);
if (Enumerable.Range(8, 15).Contains(roc.type))
SetROLocation(ref xindivid, roc, myRODB, roc.type != 8); SetROLocation(ref xindivid, roc, myRODB, roc.type != 8);
} }
} }