This commit is contained in:
parent
9ca49944e3
commit
8a86124826
@ -1800,7 +1800,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (ActiveParent is DocVersionInfo)
|
if (ActiveParent is DocVersionInfo)
|
||||||
_MyDocVersion = ActiveParent as DocVersionInfo;
|
_MyDocVersion = ActiveParent as DocVersionInfo;
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (ActiveParent == null) return null;
|
||||||
_MyDocVersion = (ActiveParent as ItemInfo).MyDocVersion;
|
_MyDocVersion = (ActiveParent as ItemInfo).MyDocVersion;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return _MyDocVersion;
|
return _MyDocVersion;
|
||||||
}
|
}
|
||||||
|
@ -483,8 +483,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
string retstr = tb._ToItem.MyProcedure.MyContent.Number;
|
string retstr = tb._ToItem.MyProcedure.MyContent.Number;
|
||||||
// start with UnitSpecific procedure number.
|
// start with UnitSpecific procedure number.
|
||||||
string unitnum = tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ProcedureNumber;
|
string unitnum = null;
|
||||||
if (unitnum.Length > 0)
|
if (tb._ToItem.MyDocVersion != null && tb._ToItem.MyDocVersion.DocVersionConfig != null)
|
||||||
|
unitnum = tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ProcedureNumber;
|
||||||
|
if (unitnum != null && unitnum.Length > 0)
|
||||||
{
|
{
|
||||||
unitnum = unitnum.Replace("-", @"\u8209?");
|
unitnum = unitnum.Replace("-", @"\u8209?");
|
||||||
retstr = unitnum.Replace("#", retstr);
|
retstr = unitnum.Replace("#", retstr);
|
||||||
|
@ -286,8 +286,7 @@ namespace Volian.Print.Library
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (_MaxRNO == 0) _MaxRNO = _MySection.ColumnMode;
|
return _MySection.ColumnMode;
|
||||||
return _MaxRNO;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private int _CurrentPageOf = 0;
|
private int _CurrentPageOf = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user