Fixed logic so that Point Beach AOP-9C will print.
This commit is contained in:
parent
067f004170
commit
aa652f5b73
@ -1179,20 +1179,25 @@ namespace Volian.Print.Library
|
|||||||
string procnum = section.MyProcedure.MyContent.Number;
|
string procnum = section.MyProcedure.MyContent.Number;
|
||||||
foreach (ProcDescr pd in pdl)
|
foreach (ProcDescr pd in pdl)
|
||||||
{
|
{
|
||||||
string matchStr = (pd.MatchProcNumber.StartsWith("*}"))?pd.MatchProcNumber.Substring(2):pd.MatchProcNumber;
|
if (pd.MatchProcNumber != null)
|
||||||
if (procnum.Contains(matchStr))
|
|
||||||
{
|
{
|
||||||
plstr = pd.ProcDescr1;
|
string matchStr = (pd.MatchProcNumber.StartsWith("*}")) ? pd.MatchProcNumber.Substring(2) : pd.MatchProcNumber;
|
||||||
break;
|
if (procnum.Contains(matchStr))
|
||||||
}
|
{
|
||||||
if (pd.MatchProcNumber == "@")
|
|
||||||
{
|
|
||||||
if (Regex.IsMatch(procnum, "^[A-Za-z]+$"))
|
|
||||||
plstr = pd.ProcDescr1;
|
plstr = pd.ProcDescr1;
|
||||||
else
|
break;
|
||||||
plstr = "";
|
}
|
||||||
break;
|
if (pd.MatchProcNumber == "@")
|
||||||
|
{
|
||||||
|
if (Regex.IsMatch(procnum, "^[A-Za-z]+$"))
|
||||||
|
plstr = pd.ProcDescr1;
|
||||||
|
else
|
||||||
|
plstr = "";
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
plstr = "UNKNOWN";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user