Index: BL/MB/UGLYPicking/Locations.cls.xml
===================================================================
diff -u -r29059 -r31855
--- BL/MB/UGLYPicking/Locations.cls.xml	(.../Locations.cls.xml)	(revision 29059)
+++ BL/MB/UGLYPicking/Locations.cls.xml	(.../Locations.cls.xml)	(revision 31855)
@@ -175,36 +175,98 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AddHal6">
+<Description>
+D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddHal6()</Description>
+<Implementation><![CDATA[
+	; HAL 1 : ORGALUX
+	Do ..InitMag(2,0,6) ;WMSMag=2, TransBuilding=0, TransHal=1
+	
+	Do ..InitGang(12,"G")
+	Do ..CreateLocs(41,1,9,3,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..InitGang(13,"H")
+	Do ..CreateLocs(41,1,9,3,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	
+	Do ..PrintLabels()
+]]></Implementation>
+</Method>
+
+<Method name="AddHal2">
+<Description>
+D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddHal2()</Description>
+<Implementation><![CDATA[
+	; HAL 1 : ORGALUX
+	Do ..InitMag(2,0,3) ;WMSMag=2, TransBuilding=0, TransHal=1
+	
+	Do ..InitGang(10,"E") ; EWMSGang, TransGang
+	Do ..CreateLocs(1,42,46,3,1,3,3) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..InitGang(9,"D") ; EWMSGang, TransGang
+	Do ..CreateLocs(1,42,46,3,1,3,3) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..CreateLocs(16,47,47,3,1,1,3) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..InitGang(8,"C") ; EWMSGang, TransGang
+	Do ..CreateLocs(16,47,47,3,1,1,3) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..PrintLabels()
+]]></Implementation>
+</Method>
+
 <Method name="AddHal1">
 <Description>
 D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddHal1()</Description>
 <Implementation><![CDATA[
 	; HAL 1 : ORGALUX
 	Do ..InitMag(2,0,1) ;WMSMag=2, TransBuilding=0, TransHal=1
 	
-	Do ..InitGang(3,"F")
-	Do ..CreateLocs(1,1,2,6,1,1,7) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
-	Do ..DisableLocs(1,1,4,6,5,7) ; TransXVan, TransXTot, VakVan, VakTot, TransYVan, TransYTot
-	Do ..DisableLocs(2,2,4,6,5,7) ; TransXVan, TransXTot, VakVan, VakTot, TransYVan, TransYTot
+	Do ..InitGang(2,"E")
+	Do ..CreateLocs(66,25,25,5,1,5,5,"D") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..CreateLocs(66,25,25,5,1,1,5,"E") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(56,23,24,5,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(61,24,24,5,1,1,5,"A") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(61,24,24,5,1,1,5,"B") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(61,24,24,5,1,1,5,"C") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(26,23,23,6,1,6,8) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,12,1,1,5,"G") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,12,1,1,5,"H") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,12,1,1,5,"I") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,12,1,1,5,"J") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,12,1,1,5,"K") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,12,1,6,7) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,5,1,8,8) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(54,30,30,3,1,9,9) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..DisableLocs(20,4,5,1,1) ;TransXVan, TransXTot, VakVan, VakTot, TransYVan, TransYTot
+	;Do ..DisableLocs(26,26,4,5,1,1) ;TransXVan, TransXTot, VakVan, VakTot, TransYVan, TransYTot
 
-	Do ..CreateLocs(,3,7,3,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
-	Do ..DisableLocs(4,7,1,3,4,4) ; TransXVan, TransXTot, VakVan, VakTot, TransYVan, TransYTot
+	;Do ..CreateLocs(39,27,27,5,1,1,4,"D") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	;Do ..CreateLocs(39,27,27,5,1,1,4,"E") ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
 
 	Do ..PrintLabels()
 ]]></Implementation>
 </Method>
 
+<Method name="AddGangC">
+<Description>
+D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddGangC()</Description>
+<Implementation><![CDATA[
+	Do ..InitMag(2,0,5) ;WMSMag=2, TransBuilding=0, TransHal=1
+	
+	Do ..InitGang(24,"E")
+	Do ..CreateLocs(64,48,48,4,1,5,5) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+
+	Do ..InitGang(25,"F")
+	Do ..CreateLocs(64,48,48,4,1,5,5) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+]]></Implementation>
+</Method>
+
 <Method name="AddGangD">
 <Description>
 D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddGangD()</Description>
 <Implementation><![CDATA[
-	; HAL 1 : ORGALUX
-	Do ..InitMag(2,0,1) ;WMSMag=2, TransBuilding=0, TransHal=1
+	Do ..InitMag(2,0,4) ;WMSMag=2, TransBuilding=0, TransHal=1
 	
-	Do ..InitGang(3,"F")
-	;Do ..CreateLocs(23,20,21,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
-	Do ..CreateLocs(44,30,30,4,1,1,4,"D") 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
-
+	Do ..InitGang(15,"D")
+	
+	;Set ..NoTopDetection=1
+	Do ..CreateLocs(40,40,47,3,1,4,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	;Do ..CreateLocs(71,48,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
 	Do ..PrintLabels()
 ]]></Implementation>
 </Method>
@@ -213,7 +275,6 @@
 <Description>
 D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddGangE()</Description>
 <Implementation><![CDATA[
-	; HAL 1 : ORGALUX
 	Do ..InitMag(2,0,1) ;WMSMag=2, TransBuilding=0, TransHal=1
 	
 	Do ..InitGang(5,"H")
@@ -228,33 +289,67 @@
 
 <Method name="AddGangF">
 <Description>
-D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddGangF()</Description>
+D ##class(BL.MB.UGLYPicking.Locations).Instantiate(1,0).AddGangF()</Description>
 <Implementation><![CDATA[
 	; HAL 1 : ORGALUX
 	Do ..InitMag(2,0,1) ;WMSMag=2, TransBuilding=0, TransHal=1
 	
-	Do ..InitGang(3,"F")
-	Do ..ReprintGang(20,50)
-	
-	;Set ..NoTopDetection=1
-	;Do ..CreateLocs(29,25,25,6,1,1,4,"D") 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
-	;Do ..CreateLocs(36,27,27,6,1,1,4,"D") 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
-	;Do ..CreateLocs(40,28,28,6,1,1,4,"D") 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..InitGang(17,"F")
+	Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
 	Do ..PrintLabels()
 ]]></Implementation>
 </Method>
 
-<Method name="AddGangG">
+<Method name="Hal5">
+<Description>
+D ##class(BL.MB.UGLYPicking.Locations).Instantiate(1,0).Hal5()</Description>
 <Implementation><![CDATA[
-	; HAL 1 : ORGALUX
-	Do ..InitMag(2,0,1) ;WMSMag=2, TransBuilding=0, TransHal=1
+	Do ..InitMag(2,0,5) ;WMSMag=2, TransBuilding=0, TransHal=5
 	
-	Do ..InitGang(4,"G")
-	Do ..CreateLocs(1,1,7,3,1,5,6) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
-	Do ..PrintLabels()
+	Do ..InitGang(20,"A")
+	Do ..CreateLocs(1,5,7,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..InitGang(21,"B")
+	Do ..CreateLocs(1,5,7,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..InitGang(22,"C")
+	Do ..CreateLocs(1,5,7,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..InitGang(23,"D")
+	Do ..CreateLocs(1,5,7,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..InitGang(24,"E")
+	Do ..CreateLocs(1,5,7,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..InitGang(25,"F")
+	Do ..CreateLocs(1,5,7,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
 ]]></Implementation>
 </Method>
 
+<Method name="AddLaatsteVak">
+<Description>
+D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).AddLaatsteVak()</Description>
+<Implementation><![CDATA[
+	Do ..InitMag(2,0,4) ;WMSMag=2, TransBuilding=0, TransHal=1
+	
+	;Do ..InitGang(14,"C")
+	
+	;Set ..NoTopDetection=1
+	;Do ..CreateLocs(28,43,47,3,1,4,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	;Do ..CreateLocs(43,48,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+
+	Do ..InitGang(15,"D")
+	Do ..CreateLocs(71,48,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+
+	Do ..InitGang(16,"E")
+	Do ..CreateLocs(71,48,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+	
+	Do ..InitGang(17,"F")
+	;Do ..CreateLocs(40,40,48,3,1,1,4) 	; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot,LimVakAlfa
+]]></Implementation>
+</Method>
+
 <Method name="CreateHal1">
 <Description>
 D ##class(BL.MB.UGLYPicking.Locations).Instantiate(0,0).CreateHal1()</Description>
@@ -333,13 +428,13 @@
 	Set ..NoTopDetection=1
 
 	Do ..InitGang(1,"A",,1) ; WMSGang=1,TransGang=A
-	;Do ..CreateLocs(1,1,1,7,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..CreateLocs(1,1,1,7,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
 	Do ..InitGang(2,"B",,1) ; WMSGang=1,TransGang=B
-	;Do ..CreateLocs(1,1,1,1,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..CreateLocs(1,1,1,1,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
 	Do ..InitGang(3,"C",,1) ; WMSGang=1,TransGang=C
-	;Do ..CreateLocs(1,1,1,3,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..CreateLocs(1,1,1,3,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
 	Do ..InitGang(4,"D",,1) ; WMSGang=1,TransGang=D
-	;Do ..CreateLocs(1,1,1,2,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
+	Do ..CreateLocs(1,1,1,2,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
 	Do ..InitGang(5,"E",,1) ; WMSGang=1,TransGang=E
 	Do ..CreateLocs(1,1,1,2,1,1,5) ; WMSLocXVan, TransXVan, TransXTot, VakAantal, WMSLocYVan, TransYVan, TransYTot
 
@@ -557,7 +652,7 @@
 	Quit:'..CreateMag $$$OK ; geen creatie van gangen
 
 	// Controleer of de posities niet buiten het geldige bereik vallen
-	Set MaxLocX = 70
+	Set MaxLocX = 100
 	Set MaxLocY = 15
 	If ((LocX > MaxLocX) || (LocY > MaxLocY))
 	{