B2022-110: PC/PC Multi return values are correct in editor but not correct in Step Properties/RO when RO selected in editor or in Print

This commit is contained in:
Kathy Ruffing 2022-09-07 14:52:38 +00:00
parent 9c6a4c93dc
commit 31d913adb1

View File

@ -1633,8 +1633,8 @@ namespace VEPROMS.CSLA.Library
// Load all extension specific return values (1 to many) // Load all extension specific return values (1 to many)
for (int i = 0; i < lstValues.Count; i++) for (int i = 0; i < lstValues.Count; i++)
{ {
var roExt = Extensions.Where(x => x.Offset.Equals(i + 1)).SingleOrDefault(); // B2022-110: PC/PC Multi return values are correct in editor but not correct in Step Properties/ROs when selected, or when printed
var roExt = lstValues.Count==1?null:Extensions.Where(x => x.AccPageExt.Equals(_multiRoValues[i])).SingleOrDefault();
string roValue = GetParentChildROValue(lstValues[i], this.SelectedSlave); string roValue = GetParentChildROValue(lstValues[i], this.SelectedSlave);
child.children[i].ParentID = child.ID; child.children[i].ParentID = child.ID;
@ -1643,7 +1643,7 @@ namespace VEPROMS.CSLA.Library
child.children[i].value = roValue; child.children[i].value = roValue;
child.children[i].appid = (roExt != null) ? string.Format("{0}.{1}", child.appid, roExt.AccPageExt) : child.appid; child.children[i].appid = (roExt != null) ? string.Format("{0}.{1}", child.appid, roExt.AccPageExt) : child.appid;
child.children[i].roid = string.Format("{0}{1}{2}", tableID.ToString("X4"), child.ID.ToString("X8"), (roExt.RoidExt != null) ? roExt.RoidExt : string.Empty).ToUpper(); child.children[i].roid = string.Format("{0}{1}{2}", tableID.ToString("X4"), child.ID.ToString("X8"), (roExt != null && roExt.RoidExt != null) ? roExt.RoidExt : string.Empty).ToUpper();
child.children[i].children = new List<ROFSTLookup.rochild>().ToArray(); child.children[i].children = new List<ROFSTLookup.rochild>().ToArray();
} }