Index: vhDeploy/JBL/Deploy20110909x1339.cls.xml
===================================================================
diff -u
--- vhDeploy/JBL/Deploy20110909x1339.cls.xml	(revision 0)
+++ vhDeploy/JBL/Deploy20110909x1339.cls.xml	(revision 2025)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.JBL.Deploy20110909x1339">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>VHoss2D instellen voor Labelprinter</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set ^RES("LABELPRINTER","PI","LAYOUT","D","VHoss2D 8x11")="1`VHoss2D 8x11`8x11`VHOSS"
+	Set ^RES("LABELPRINTER","PI","VHOSS","D","DEFAULT")="1`ICT"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: BL/Etiket/VHoss2D.cls.xml
===================================================================
diff -u
--- BL/Etiket/VHoss2D.cls.xml	(revision 0)
+++ BL/Etiket/VHoss2D.cls.xml	(revision 2025)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="BL.Etiket.VHoss2D">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>BL.Sys.pxLabel</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Label">
+<Type>%String</Type>
+<InitialExpression>"VHossID :"</InitialExpression>
+</Property>
+
+<Property name="VHossNr">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="VHossZijkant">
+<Type>APPS.VisiDot.enu.Zijkant</Type>
+</Property>
+
+<Method name="WriteRow">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+		/// VHossID opbouwen
+		Set VHossProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+		Set VHossID = VHossProductionHelper.BuildVHossID(..VHossNr, ..VHossZijkant)
+		
+		/// VHossID uitschrijven
+		Write VHossID,$C(9)
+		Write ..Label,$C(9)
+		Write $C(13,10)
+		
+		Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: BL/Etiket/TBXLadeInVHoss2D.cls.xml
===================================================================
diff -u
--- BL/Etiket/TBXLadeInVHoss2D.cls.xml	(revision 0)
+++ BL/Etiket/TBXLadeInVHoss2D.cls.xml	(revision 2025)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="BL.Etiket.TBXLadeInVHoss2D">
+<Super>BL.Sys.pxLabel</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Helper">
+<Type>APPS.VisiDot.impl.VHossProductionHelper</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantNaam">
+<Type>%String</Type>
+</Property>
+
+<Property name="OrderID">
+<Type>%String</Type>
+</Property>
+
+<Property name="ToeleveringNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductieWeek">
+<Type>%String</Type>
+</Property>
+
+<Property name="VerzendWijze">
+<Type>DOM.OV.enu.VerzendWijze</Type>
+</Property>
+
+<Property name="WandDikte">
+<Type>%String</Type>
+</Property>
+
+<Property name="Diepte">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Breedte">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="VHossInfo">
+<Type>%String</Type>
+</Property>
+
+<Property name="DossierCode">
+<Type>%String</Type>
+</Property>
+
+<Property name="LogoImg">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductImg">
+<Type>%String</Type>
+</Property>
+
+<Property name="Referentie">
+<Description>
+OrderReferentie of ProjectReferentie (projectref belangrijker dan orderref)</Description>
+<Type>%String</Type>
+</Property>
+
+<Property name="VHossSeqNr">
+<Description>
+VHoss ID</Description>
+<Type>%Integer</Type>
+</Property>
+
+<Property name="VHossZijkant">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="ProductID">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="BatchID">
+<Type>%Integer</Type>
+</Property>
+
+<Method name="WriteRow">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	
+	Set LadeID = ..Helper.BuildLadeID(..BatchID,..VHossSeqNr,..VHossZijkant,..ProductID)	
+	
+	Write ..KlantNaam,$C(9)
+	Write ..OrderID,$C(9)
+	Write ..ToeleveringNr,$C(9)
+	Write ..ProductieWeek,$C(9)
+	Write ..VerzendWijze,$C(9)
+	Write ..WandDikte,$C(9)
+	Write ..Diepte,$C(9)
+	Write ..Breedte,$C(9)
+	Write ..VHossInfo,$C(9)
+	Write ..DossierCode,$C(9)
+	Write ..LogoImg,$C(9)
+	Write ..ProductImg,$C(9)
+	Write LadeID,$C(9)
+	Write ..Referentie,$C(9)
+	Write $C(13,10)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set ..Helper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+</Export>
FishEye: Tag 2025 refers to a dead (removed) revision in file `APPS/VisiDot/dto/VHoss2DLabel.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: BL/PPS/TBX/sub/pxLabelProPlus.cls.xml
===================================================================
diff -u -r1074 -r2025
--- BL/PPS/TBX/sub/pxLabelProPlus.cls.xml	(.../pxLabelProPlus.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/sub/pxLabelProPlus.cls.xml	(.../pxLabelProPlus.cls.xml)	(revision 2025)
@@ -79,10 +79,30 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="VHossSeqNr">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="VHossZijkant">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="ProductID">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="BatchID">
+<Type>%Integer</Type>
+</Property>
+
 <Method name="WriteRow">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Write ..Referentie,*9,..Bodem,*9,..Rug,*9,..Zijkant,*9,..Afdekkap,*9,..Opm1,*9,..Opm2,*9,..KlantOrdRef,*9,..KlantProdRef,*9,..VHoss,*9,..SlotNr,*9,..VorigSlotNr,*9,..VolgendSlotNr,*9,..Breedte
+	Set VHossProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+	Set LadeID = VHossProductionHelper.BuildLadeID(..BatchID,..VHossSeqNr,..VHossZijkant,..ProductID)
+	
+	
+	Write ..Referentie,*9,..Bodem,*9,..Rug,*9,..Zijkant,*9,..Afdekkap,*9,..Opm1,*9,..Opm2,*9,..KlantOrdRef,*9,..KlantProdRef,*9,..VHoss,*9,..SlotNr,*9,..VorigSlotNr,*9,..VolgendSlotNr,*9,..Breedte,*9,LadeID
 	Write $C(13,10)
 	Quit $$$OK
 ]]></Implementation>
Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r2024 -r2025
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 2024)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 2025)
@@ -34,7 +34,7 @@
 </Parameter>
 
 <Parameter name="LabelKlantTemplate5x10">
-<Default>KlantTBX5x10v3</Default>
+<Default>TBXLadeInVHoss2D 5x10</Default>
 </Parameter>
 
 <Parameter name="LabelExtraCommissie">
@@ -1233,15 +1233,10 @@
 	Set ODSP=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"ODSP")) ; Interne breedte
 	Set IsSR=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"IsSR")) ; Stalenrug
 	Set KLAS=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"KLAS")) ; Klasse (Spoelbak, Lade, ...)
-	;Set SPZK=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"SPZK")) ; Spoelbak zijkant
 	
 	Set MatOpties = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TB",KPRNr,"Opties")) ; Mat opties
 	Set Type=$S(MatOpties["AGO":"AGO",1:"")
-	/*		
-	Set KPRNr=$P($G(^PRBS("BS",PRNr,"PRTUSASMROL.001")),"\",1)
-	Set TusDim=$P($G(^PRBS("BS",PRNr,"PRTUSASMROL.001","D")),"\")
-	Set:KLAS["SP" Opmerking=Opmerking_", "_$CASE(KLAS,"SP":"SP 1","SP2":"SP 2",:"")_" "_$CASE(SPZK,"S":"Smal",:"Breed")
-	*/
+
 	Set:IsSR Opmerking=Opmerking_", "_"Staalrug"
 	
 	Set:ODSP'="" Opmerking=Opmerking_", "_"**SPECIAL:"_ODSP_"**"
@@ -1319,12 +1314,11 @@
 <Method name="KlantEtiketOne">
 <FormalSpec>oQ</FormalSpec>
 <Implementation><![CDATA[
- 	Set pxLabel=##class(BL.PPS.TBX.sub.pxLabelKlant).%New()
+ 	Set pxLabel=##class(BL.Etiket.TBXLadeInVHoss2D).%New()
 	Set pxLabel.Layout=..LabelKlantLayout
  	
  	Do ..KlantEtiketOneAlgemeen(oQ.KlantGetObjectId(),oQ.TOENr,oQ.TLUNr,oQ.BatchID,pxLabel)	
- 	If oQ.Status="PB" Set pxLabel.Opmerking="|"  ; er wordt een streep toegevoegd aan de rechterkant van het etiket
- 	Do ..KlantEtiketOneProduct(oQ.ProductGetObjectId(),$S($isObject(oQ.WPVerpak):oQ.WPVerpak.VHossID(),1:""),pxLabel)
+ 	Do ..KlantEtiketOneProduct(oQ.ProductGetObjectId(),$S($isObject(oQ.WPVerpak):oQ.WPVerpak.VHossID(),1:""),pxLabel,oQ.WPVerpak)
  	
  	Set pxLabel.Device=..LabelKlantDevice
 	
@@ -1339,30 +1333,27 @@
 	Set TLNr=$G(^TO("IU",TOENr,TLUNr),"*")
 	Set ORDNr=$P($G(^KTO($$$LevHalux,TOENr,TLNr)),"\",27) ; KOMLink
 	Set OLNr=$P($G(^KTO($$$LevHalux,TOENr,TLNr)),"\",28) ; KOMLink
-	Set pxLabel.OrderRef=..KlantEtiketOneOrderRef(KLNr,ORDNr,OLNr)
+	Set pxLabel.Referentie=..KlantEtiketOneOrderRef(KLNr,ORDNr,OLNr)
  	Set ProjectRef=$S('OLNr:"",1:$P($G(^KOD(KLNr,"F",ORDNr,OLNr)),"\",5))
- 	Set:$L(ProjectRef) pxLabel.OrderRef=ProjectRef ; Projectreferentie is belangrijker dan de orderreferentie
+ 	Set:$L(ProjectRef) pxLabel.Referentie=ProjectRef ; Projectreferentie is belangrijker dan de orderreferentie
  	Do ..KlantEtiketOneAdresOrder(ORDNr,KLNr,pxLabel)
  	If (KLNr=7833)||(KLNr=6279) Set pxLabel.KlantNaamBig=$$UPTRIMAN^vhRtn1(pxLabel.OrderRef) ; Voor Hein en Optima
  	
 	 ; Indien contract dan leverweek van toelevering
  	If TOENr,TLNr,$D(^KTO(6332,TOENr,TLNr)) Do
- 	. Set pxLabel.ProdWk=$TR($P(^KTO($$$LevHalux,TOENr,TLNr),"\",25),"/","")
+ 	. Set pxLabel.ProductieWeek=$TR($P(^KTO($$$LevHalux,TOENr,TLNr),"\",25),"/","")
  	Else  Do
- 	. Set pxLabel.ProdWk=$TR($S('OLNr:"",1:$P($G(^KOD(KLNr,"F",ORDNr,OLNr)),"\",25)),"/","")
+ 	. Set pxLabel.ProductieWeek=$TR($S('OLNr:"",1:$P($G(^KOD(KLNr,"F",ORDNr,OLNr)),"\",25)),"/","")
 
-	Set Taal=$S(KLNr:$P(^KKL(^KK1(KLNr),0),"\",9),1:"")
- 	Set:(Taal'="F")&&(Taal'="D") Taal="N"
- 	Set pxLabel.Taal=Taal
-
- 	If KLNr=4855 Set pxLabel.KlantBarcode=pxLabel.OrderRef,pxLabel.KlantBarcodeTxt=pxLabel.OrderRef   ; Neves
-
+	/// Logo: standaard van Hoecke, tenzij specifiek voor de klant een logo gedefinieerd is.
  	Set:$G(KLNr)&&($D(^IPCom("CS","LOGO"_KLNr,0))) pxLabel.LogoImg="LOGO\"_^IPCom("CS","LOGO"_KLNr,0)
  	Set:pxLabel.LogoImg="" pxLabel.LogoImg="LOGO\"_^IPCom("CS","LOGO"_4682,0) ; default Van Hoecke
-
-	Set pxLabel.ORDNr=ORDNr
-	Set pxLabel.TOENr=TOENr
+	
+	Set pxLabel.OrderID=ORDNr
+	Set pxLabel.ToeleveringNr = TOENr
 	Set pxLabel.BatchID=BatchID
+	Set Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(ORDNr)
+	Set pxLabel.VerzendWijze = Order.GeefVerzendingWijze()
 	Quit
 ]]></Implementation>
 </Method>
@@ -1377,15 +1368,8 @@
 	Set:($L($TR(Adres,"\",""))<5)&&KLNr Adres=^KKL(^KK1(KLNr),0) ; Geen of onvoldoende adres
 
 	Set pxLabel.KlantNaam=$P(Adres,"\",2)
-	Set pxLabel.KlantNr=KLNr
-	Set pxLabel.KlantNaamBig=$$TRIMNAAM^vhRtn1(pxLabel.KlantNaam,1)
-	Set:(KLNr=8545) pxLabel.KlantNaamBig="I.SCHREURS" ; Speciaal toegevoegd om verwarring te vermijden met 3760 - PV - 13-09-05
-	Set:(KLNr=4451) pxLabel.KlantNaam="@4451",pxLabel.KlantNaamBig="4451" ; Assenti
-	Set:(KLNr=1300) pxLabel.KlantNaamBig="OSTE K" ; Speciaal toegevoegd op vraag van klant - PV - 21-04-08
-	Set pxLabel.Toenaam=$P(Adres,"\",3)
-	Set pxLabel.Straat=$P(Adres,"\",5)
-	Set pxLabel.PostCode=$S($E($P(Adres,"\",6),1,2)="NL":"NL",$P(Adres,"\",6)?4N:"",1:$P(Adres,"\",6))
-	Set pxLabel.Gemeente=$E($P(Adres,"\",7),1,18)
+	/// Op vraag van Assenti mag de klantnaam niet vermeld worden op het etiket. Daarom vervangen door kriptische omschrijving.
+	Set:(KLNr=4451) pxLabel.KlantNaam="@4451"
 	Quit
 ]]></Implementation>
 </Method>
@@ -1413,23 +1397,21 @@
 </Method>
 
 <Method name="KlantEtiketOneProduct">
-<FormalSpec>PRNr,VHossID,pxLabel</FormalSpec>
+<FormalSpec>PRNr,VHossID,pxLabel,WPVerpak:DS.PPS.TBX.sub.emWPVerpak</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
- 	Set pxLabel.BreedteCorpus=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"CB")) ; Corpus breedte
+	Set pxLabel.ProductID = PRNr
+ 	Set pxLabel.Breedte=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"CB")) ; Corpus breedte
 	Set pxLabel.Diepte=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"LD")) ; Ladediepte
 	Set pxLabel.WandDikte=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"WD")) ; Wanddikte
-	Set pxLabel.Kleur=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"KL")) ; Kleur
-	Set pxLabel.Verpak=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"VERPAK")) ; Verpakking
-	Set pxLabel.LadeCode=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"LC")) ; LadeCode
+	Set pxLabel.DossierCode=$$BARCODE^HAD(PRNr,"F")
+	Set pxLabel.VHossInfo=$G(VHossID)
+	Set pxLabel.ProductImg=##class(BL.Prod.ImageLink).%New().GetProductImageURL(PRNr, "LABEL")
 	
-	Set pxLabel.KortTekst=$P(^KPR(PRNr,0),"\")
-	Set pxLabel.IdentNr=$P(^KPR(PRNr,2),"\",25)
-	Set pxLabel.Kleur=$E(pxLabel.KortTekst,22,23)_"/"_$E(pxLabel.KortTekst,24,25)
-	Set pxLabel.DossierBarcodeTxt=$$BARCODE^HAD(PRNr,"F")
-	Set pxLabel.DossierBarcode=$TR(pxLabel.DossierBarcodeTxt,".")
-	Set pxLabel.VHossID=$G(VHossID)
-	Set pxLabel.ProdImg=##class(BL.Prod.ImageLink).%New().GetProductImageURL(PRNr, "LABEL")
+	/// LadeID, VHoss 2D data matrix
+	Set pxLabel.VHossSeqNr = WPVerpak.UnitNr
+	Set pxLabel.VHossZijkant = WPVerpak.SubNr
+		
 	Quit
 ]]></Implementation>
 </Method>
Index: APPS/VisiDot/impl/VHossEtiketPrinter.cls.xml
===================================================================
diff -u -r2019 -r2025
--- APPS/VisiDot/impl/VHossEtiketPrinter.cls.xml	(.../VHossEtiketPrinter.cls.xml)	(revision 2019)
+++ APPS/VisiDot/impl/VHossEtiketPrinter.cls.xml	(.../VHossEtiketPrinter.cls.xml)	(revision 2025)
@@ -30,7 +30,7 @@
 <FormalSpec>Nr:%Integer,Zijkant:APPS.VisiDot.enu.Zijkant,PrintDevice:%String="",DoPrint:%Boolean=1</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set pxLabel = ##class(APPS.VisiDot.dto.VHoss2DLabel).%New()
+	Set pxLabel = ##class(BL.Etiket.VHoss2D).%New()
 	Set pxLabel.VHossNr = Nr
 	Set pxLabel.VHossZijkant = Zijkant
 	Do ##class(BL.Sys.LabelPrinter).Layouts(.Result,"VHOSS")
Index: BL/Sys/pxLabel.cls.xml
===================================================================
diff -u -r2019 -r2025
--- BL/Sys/pxLabel.cls.xml	(.../pxLabel.cls.xml)	(revision 2019)
+++ BL/Sys/pxLabel.cls.xml	(.../pxLabel.cls.xml)	(revision 2025)
@@ -64,12 +64,5 @@
    Quit "logo\"_Picture
 ]]></Implementation>
 </Method>
-
-<Method name="WriteRow">
-<Abstract>1</Abstract>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	
-]]></Implementation>
-</Method>
 </Class>
 </Export>
Index: BL/PPS/TBX/DocsProPlus.cls.xml
===================================================================
diff -u -r1867 -r2025
--- BL/PPS/TBX/DocsProPlus.cls.xml	(.../DocsProPlus.cls.xml)	(revision 1867)
+++ BL/PPS/TBX/DocsProPlus.cls.xml	(.../DocsProPlus.cls.xml)	(revision 2025)
@@ -848,6 +848,12 @@
 	Set pxLabel.Device=..LabelDevice
 	Set pxLabel.Layout=..LabelLayout
 	
+	/// LadeID, VHoss 2D data matrix
+	Set pxLabel.VHossSeqNr = oQ.WPVerpak.UnitNr
+	Set pxLabel.VHossZijkant = oQ.WPVerpak.SubNr
+	Set pxLabel.ProductID = PRNr
+	Set pxLabel.BatchID = oQ.BatchID
+	
 	Quit pxLabel
 ]]></Implementation>
 </Method>
Index: vhDeploy/JBL/Deploy20110830x1447.cls.xml
===================================================================
diff -u -r1940 -r2025
--- vhDeploy/JBL/Deploy20110830x1447.cls.xml	(.../Deploy20110830x1447.cls.xml)	(revision 1940)
+++ vhDeploy/JBL/Deploy20110830x1447.cls.xml	(.../Deploy20110830x1447.cls.xml)	(revision 2025)
@@ -23,7 +23,7 @@
 	Set Status = Factor.%Save()
 	If ($$$ISERR(Status)) w $$ParseStatus^vhLib(Status)		
 	
-	If ($zu(5) = "ADMIN1"){
+	//If ($zu(5) = "ADMIN1"){
 					
 		Write !,"Afhaling kosten berekening van laatste paar jaar wordt uitgevoerd.",!
 		Set KlantKostService = ##class(APPS.common.KlantKost.impl.KlantKostService).%New()
@@ -34,7 +34,7 @@
 				}
 			}
 		}	
-	}
+	//}
 ]]></Implementation>
 </Method>
 </Class>