Index: APPS/VisiDot/impl/Tech.cls.xml
===================================================================
diff -u -r29059 -r57604
--- APPS/VisiDot/impl/Tech.cls.xml	(.../Tech.cls.xml)	(revision 29059)
+++ APPS/VisiDot/impl/Tech.cls.xml	(.../Tech.cls.xml)	(revision 57604)
@@ -79,7 +79,7 @@
 
 <Method name="Justify">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Val,Len</FormalSpec>
+<FormalSpec>Val:%String,Len:%Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set Val= $TR($J(Val,Len)," ",0)
@@ -92,7 +92,21 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Batch:%Integer,VHossSeqNr:%List,VHossZijkant:APPS.VisiDot.enu.Zijkant,Product:%Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..Justify(Batch,5)_..Justify(VHossSeqNr,2)_..Justify(VHossZijkant,1)_..Justify(Product,8)
+<Implementation><![CDATA[
+	If Batch > 999999 {
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("BatchId '"_Batch_"' mag niet groter zijn dan 999999 (i.e. max 6 cijfers).")
+	}
+	If Product > 9999999 {
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("ProductId '"_Product_"' mag niet groter zijn dan 9999999 (i.e. max 7 cijfers).")
+	}
+
+	#dim BatchVanMax5cijfers As %Integer = Batch
+	#dim BatchHonderdduizendtal As %Integer = 0
+	If Batch > 99999 {
+		Set BatchHonderdduizendtal = (Batch \ 100000)
+		Set BatchVanMax5cijfers = (Batch # 100000)
+	}
+	Quit ..Justify(BatchVanMax5cijfers,5)_..Justify(VHossSeqNr,2)_..Justify(VHossZijkant,1)_..Justify(BatchHonderdduizendtal,1)_..Justify(Product,7)
 ]]></Implementation>
 </Method>
 
@@ -118,15 +132,24 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>LadeID:%String</FormalSpec>
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit +$E(LadeID,1,5)
+<Implementation><![CDATA[	Quit +$E(LadeID,1,5) + (..GeefBatchHonderdduizendtalVanLadeID(LadeID) * 100000)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBatchHonderdduizendtalVanLadeID">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LadeID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit +$E(LadeID,9)
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductVanLadeID">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>LadeID:%String</FormalSpec>
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit +$E(LadeID,9,16)
+<Implementation><![CDATA[	Quit +$E(LadeID,10,16)
 ]]></Implementation>
 </Method>