Index: CHUI/Prod/ProductLabel.cls.xml
===================================================================
diff -u -r60522 -r62320
--- CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 60522)
+++ CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 62320)
@@ -5,7 +5,7 @@
 d ##class(CHUI.Derde.Fax.InkomendeFaxen).RaadpleegLijst()</Description>
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject,TECH.Mockable</Super>
 
 <Property name="KorttekstParser">
 <Type>DOM.PM.KorttekstParser</Type>
@@ -100,16 +100,31 @@
 ]]></Implementation>
 </Method>
 
+<Method name="PrintMaatwerkMetDnaCodes">
+<FormalSpec>DnaCodeObject:DOM.Halux.AAP.DnaCode</FormalSpec>
+<Implementation><![CDATA[	Do ..PrintVHMaatwerkMetDnaCodes(DnaCodeObject)
+]]></Implementation>
+</Method>
+
 <Method name="PrintVHMaatwerkMetDnaCodes">
 <Description>
 d ##class(CHUI.Prod.ProductLabel).PrintVHMaatwerk(483079,"XSDS",1)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>PRNr,KlantNaam,TOENr,ORDNr,Aantal,Device,DnaCode</FormalSpec>
+<FormalSpec>DnaCodeObject:DOM.Halux.AAP.DnaCode</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set bl=..Instantiate()
+	#dim KlantNaam As %String = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(DnaCodeObject.KlantNummer).GeefNaam()
+	#dim PRNr As %String = DnaCodeObject.ProductNummer
+	#dim TOENr As %String = DnaCodeObject.Toelevering
+	#dim ORDNr As %String = DnaCodeObject.OrderId
+	#dim Aantal As TECH.Integer = 1
+	#dim DnaCode As %String = DnaCodeObject.DnaCode
+	#dim Device As %String = ""
+	
+	#dim bl As CHUI.Prod.ProductLabel =..Instantiate()
 	Do bl.Init(PRNr)
 	Set bl.DefaultLayout="Product verpak maatwerk VH 5x10"
-
+	
 	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(ORDNr)
 	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(Order.GeefPersonalityID())
 	#Dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefKlantInstellingenService(Personality)
@@ -125,9 +140,6 @@
 		Set bl.pxLabel.StockCode=$G(TOENr)
 		Set bl.pxLabel.OrderNr=$G(ORDNr)
 		Set bl.pxLabel.KlantNaam=$G(KlantNaam)
-		Set LocId="X"_$TR($J(..GetUniqueLocID(),5)," ","0")
-		Set bl.pxLabel.Barcode=LocId
-		Set bl.pxLabel.BarcodeTekst="Loc: "_LocId
 		Set bl.pxLabel.Device=$G(Device)
 		Set:bl.pxLabel.Device="" bl.pxLabel.Device="Halux_Productie_Keller"
 		If $$$Not(KlantInstellingenService.MagLogoOpEtiket(Order.GeefKlantID())) {
@@ -137,10 +149,11 @@
 		if $$$HasLength(DnaCode) {
 			Set bl.pxLabel.DnaCode = DnaCode
 		} Else {
-			Set bl.pxLabel.DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(TOENr,PRNr,"")
+			Set bl.pxLabel.DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(TOENr,PRNr)
 		}
 		Do LabelPrinter.Add(bl.pxLabel)
 	}
+	
 	Do LabelPrinter.Print2Bartender()
 ]]></Implementation>
 </Method>
@@ -242,7 +255,7 @@
 <Method name="AskLabel">
 <Description>
 editscherm waarmee de parameters van pxLabel kunnen gewijzigd worden</Description>
-<FormalSpec>EditScherm</FormalSpec>
+<FormalSpec>EditScherm:%String</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Set:..pxLabel="" ..pxLabel=##class(CHUI.Prod.sub.pxProductLabel).%New()
@@ -392,7 +405,7 @@
 <Method name="HistpakPalletInfo">
 <Description>
 Blum recupak retour uit ^HISTPAK("P")</Description>
-<FormalSpec>Lijn</FormalSpec>
+<FormalSpec>Lijn:%Integer</FormalSpec>
 <Implementation><![CDATA[
 	Set lbHistpak=^HISTPAK("P",..Product.%Id())
 	If Lijn=1 Set HistpakPalletInfo=$LI(lbHistpak,2) Set:$LI(lbHistpak,3) HistpakPalletInfo=$LI(lbHistpak,3)_" x "_HistpakPalletInfo