Index: APPS/Halux/AAP/DnaCodeGenerator.cls.xml =================================================================== diff -u -r56538 -r57066 --- APPS/Halux/AAP/DnaCodeGenerator.cls.xml (.../DnaCodeGenerator.cls.xml) (revision 56538) +++ APPS/Halux/AAP/DnaCodeGenerator.cls.xml (.../DnaCodeGenerator.cls.xml) (revision 57066) @@ -14,24 +14,40 @@ Lock +^APPS.Halux.AAP.DnaCodeGenerator(Prefix) - If $$$HasLength($Get(^APPS.Halux.AAP.DnaCodeGenerator(Prefix))) { - Set DnaNummer = $Piece(^APPS.Halux.AAP.DnaCodeGenerator(Prefix),"\",1) + 1 - Set AlfanumeriekDeel = $$ALFAKEY^vhRtn1(DnaNummer,"AN") - While AlfanumeriekDeel [ "0" { - Set DnaNummer = DnaNummer + 1 - Set AlfanumeriekDeel = $$ALFAKEY^vhRtn1(DnaNummer,"AN") + Try { + If $$$HasLength($Get(^APPS.Halux.AAP.DnaCodeGenerator(Prefix))) { + Set DnaNummer = $Piece(^APPS.Halux.AAP.DnaCodeGenerator(Prefix),"\",1) + 1 + Set AlfanumeriekDeel = ..GeefAlfanumeriekDeel(DnaNummer) } + + #dim CheckDigit As %String = $$CHKDIGIT^HAD(Prefix_AlfanumeriekDeel) + Set DnaCode = Prefix_AlfanumeriekDeel_CheckDigit + Set ^APPS.Halux.AAP.DnaCodeGenerator(Prefix) = DnaNummer_"\"_DnaCode + + } Catch { + #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() + Do ##class(vhLib.Logger).LogEnMailExceptie(Exception,"Er kon geen DnaCode gegenereerd worden voor prefix '"_Prefix_"'") } - #dim CheckDigit As %String = $$CHKDIGIT^HAD(Prefix_AlfanumeriekDeel) - Set DnaCode = Prefix_AlfanumeriekDeel_CheckDigit - Set ^APPS.Halux.AAP.DnaCodeGenerator(Prefix) = DnaNummer_"\"_DnaCode - Lock -^APPS.Halux.AAP.DnaCodeGenerator(Prefix) Quit DnaCode ]]> + + +DnaNummer:%String +1 +%String + + Index: vhTest/Fake/APPS/Halux/AAP/DnaCodeGenerator.cls.xml =================================================================== diff -u -r56538 -r57066 --- vhTest/Fake/APPS/Halux/AAP/DnaCodeGenerator.cls.xml (.../DnaCodeGenerator.cls.xml) (revision 56538) +++ vhTest/Fake/APPS/Halux/AAP/DnaCodeGenerator.cls.xml (.../DnaCodeGenerator.cls.xml) (revision 57066) @@ -7,6 +7,12 @@ 1 APPS.Halux.AAP.DnaCodeGenerator + +%String + + + Prefix:%String %String