Index: vhUnitTest/APPS/MAG/Helper.cls.xml
===================================================================
diff -u -r5644 -r5651
--- vhUnitTest/APPS/MAG/Helper.cls.xml	(.../Helper.cls.xml)	(revision 5644)
+++ vhUnitTest/APPS/MAG/Helper.cls.xml	(.../Helper.cls.xml)	(revision 5651)
@@ -96,7 +96,7 @@
 	
 	do ..MaakEWMSProduct(1000,"EWMS0001",$$$Sectie1,5)
 	do ..MaakEWMSProduct(1000,"EWMS0002",$$$Sectie1,15,$$$IsVol)
-	do ..MaakEWMSProduct(1000,"EWMS0003",$$$Sectie1,5,,"1984-31-12 00:00:00")
+	do ..MaakEWMSProduct(1000,"EWMS0003",$$$Sectie1,5,,"1984-12-31 00:00:00")
 	do ..MaakEWMSProduct(1000,"EWMS0004",$$$Sectie1,5)
 	
 	do ..MaakEWMSProduct(1001,"EWMS0001",$$$Sectie2,5)
Index: vhUnitTest/BL/MB/UGLYPicking/OrderReservatie.cls.xml
===================================================================
diff -u -r5644 -r5651
--- vhUnitTest/BL/MB/UGLYPicking/OrderReservatie.cls.xml	(.../OrderReservatie.cls.xml)	(revision 5644)
+++ vhUnitTest/BL/MB/UGLYPicking/OrderReservatie.cls.xml	(.../OrderReservatie.cls.xml)	(revision 5651)
@@ -6,6 +6,8 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="magHelper">
+<Description>
+do ##class(vhUnitTest.Manager).RunTest("/display=all","BL.MB.UGLYPicking.OrderReser")</Description>
 <Type>vhUnitTest.APPS.MAG.Helper</Type>
 <Private>1</Private>
 </Property>
@@ -31,5 +33,33 @@
 	quit ##super()
 ]]></Implementation>
 </Method>
+
+<Method name="Test">
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	New Pallet,Status
+	set Status = ##class(BL.MB.UGLYPicking.OrderReservatie).FPalletsPerProdNr(1000)
+	
+	if $$$AssertEquals(Status,$$$OK,"Verwerking is goed verlopen") {
+		new Aantal
+		new idxPallet set idxPallet = ""
+		for { set idxPallet = $order(Pallet(idxPallet)) Quit:idxPallet=""
+			set Aantal = $increment(Aantal)
+		}
+		
+		set Sectie=##class(TECH.StringUtils).AddTrailingSpace("1",8)
+		
+		do $$$AssertEquals(Aantal,4,"Aantal gevonden palletten is correct")
+		do $$$AssertEquals($listget(Pallet(1),15),"EWMS0003","Eerste de oudste,niet volle pallet op pickbare locatie")
+		do $$$AssertEquals($listget(Pallet(1),1),Sectie,"De juiste sectie is gevonden")
+		do $$$AssertEquals($listget(Pallet(2),15),"EWMS0001","volgende niet volle pallet op pickbare locatie")
+		do $$$AssertEquals($listget(Pallet(2),1),Sectie,"De juiste sectie is gevonden")
+		do $$$AssertEquals($listget(Pallet(3),15),"EWMS0002","Volle pallet op pickbare locatie")
+		do $$$AssertEquals($listget(Pallet(3),1),Sectie,"De juiste sectie is gevonden")
+		do $$$AssertEquals($listget(Pallet(4),15),"EWMS0004","Pallet op niet pickbare locatie")
+		do $$$AssertEquals($listget(Pallet(4),1),Sectie,"De juiste sectie is gevonden")
+	}
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: EWMS/TransLoc.cls.xml
===================================================================
diff -u -r2331 -r5651
--- EWMS/TransLoc.cls.xml	(.../TransLoc.cls.xml)	(revision 2331)
+++ EWMS/TransLoc.cls.xml	(.../TransLoc.cls.xml)	(revision 5651)
@@ -186,14 +186,15 @@
 
 <Method name="Create">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>LocM,LocG,LocX,LocY,LocTrans</FormalSpec>
+<FormalSpec>LocM:%String,LocG:%String,LocX:%String,LocY:%String,LocTrans:%String,IsPickbaar:%Boolean</FormalSpec>
 <Implementation><![CDATA[
 	Set oLoc=..%New()
-	Set oLoc.locm=LocM	
-	Set oLoc.locg=LocG
-	Set oLoc.locx=LocX	
-	Set oLoc.locy=LocY	
-	Set oLoc.loctrans=LocTrans
+	Set oLoc.locm = LocM
+	Set oLoc.locg = LocG
+	Set oLoc.locx = LocX	
+	Set oLoc.locy = LocY
+	Set oLoc.IsPickbaar = $G(IsPickbaar,0)
+	Set oLoc.loctrans = LocTrans
 	
 	Set sc=oLoc.%Save()
 	Quit sc
Index: BL/MB/UGLYPicking/OrderReservatie.cls.xml
===================================================================
diff -u -r1074 -r5651
--- BL/MB/UGLYPicking/OrderReservatie.cls.xml	(.../OrderReservatie.cls.xml)	(revision 1074)
+++ BL/MB/UGLYPicking/OrderReservatie.cls.xml	(.../OrderReservatie.cls.xml)	(revision 5651)
@@ -400,20 +400,22 @@
  Kill %msg
 
  &sql(DECLARE crPPP CURSOR FOR
- SELECT Inv.insert_time,is_full,Inv.loc_id,Inv.loc_m,qty_pcs,qty_res,sectie,Loc.loc_m,Loc.loc_g,loc_x,loc_y,loc_z,state,batch,quality,owner
- INTO :InsertTime,IsFull,LocID,LocM,QtyPcs,QtyRes,Sectie,LLocM,LocG,LocX,LocY,LocZ,State,Batch,Quality,Owner
- FROM EWMS.Inventory AS Inv,EWMS.Locations AS Loc
- WHERE (Inv.product=:ProdNr) AND (Inv.loc_id=Loc.loc_id) AND (Loc.loc_m>=2) and (Loc.loc_m<=4)
- ORDER BY loc.loc_m asc,is_full DESC,qty_pcs,Inv.insert_time)
-  ; AND (Loc.loc_m>=2) and (Loc.loc_m<=4) bijgevoegd door PV 14-5
-  ; ORDER BY loc.loc_m asc  bijgevoegd door PV 25-08-08
+ 
+ SELECT Inv.insert_time,is_full,Inv.loc_id,Inv.loc_m,qty_pcs,qty_res,sectie,Loc.loc_m,Loc.loc_g,loc.loc_x,loc.loc_y,loc.loc_z,state,inv.batch,quality,owner
+ INTO InsertTime,IsFull,LocID,LocM,QtyPcs,QtyRes,Sectie,LLocM,LocG,LocX,LocY,LocZ,State,Batch,Quality,Owner
+ FROM EWMS.Inventory Inv
+ JOIN EWMS.Locations Loc ON Inv.loc_m = Loc.loc_m and Inv.loc_id = Loc.loc_id
+ LEFT JOIN EWMS.TransLoc Trans ON Trans.loc_m  = Loc.loc_m AND Trans.loc_g = Loc.loc_g AND Trans.loc_x = Loc.loc_x AND Trans.loc_y = Loc.loc_y
+ WHERE product = :ProdNr AND Inv.loc_m < 5
+ ORDER BY Trans.loc_ispickbaar DESC , Inv.Is_Full ASC ,Inv.Insert_Time ASC )
  &sql(OPEN crPPP)
  Quit:((SQLCODE<0) || ($L($G(%msg)))) $$$ERROR($$$GeneralError,%msg)   //ERROR? -> Quit+return status
 
  New FatalErr,IDList   //IDList wordt gebruikt als check om dubbele palletIds te verhinderen
  Kill PalletList,Pallet,PalletGroup,PalletGroupCnt
  Set FatalErr=0
- New locMagazijn,PLNode,InsertDate
+ New locMagazijn,PLNode,InsertDate,PalletIndex
+ 
  Kill PalletGroup,PalletGroupCnt
  For  &sql(FETCH crPPP) Quit:(SQLCODE || FatalErr)  Do
  . Quit:(+QtyRes'<+QtyPcs)  //Alles is gereserveerd?->Quit pallet!, Reservatie>AantalAanwezig->Quit
@@ -425,16 +427,12 @@
  . Set locMagazijn=##class(Prod.Product).GetMagViaOpslagzone(LLocM)
  . Set InsertDate=$ZDATEH($E(InsertTime,1,10),3)
  . Set PLNode=$LB(Sectie,QtyPcs,QtyRes,LLocM,LocG,LocX,LocY,LocZ,State,InsertDate,IsFull,Batch,Quality,Owner,LocID,ProdNr,0)  //0: QtyBooked, wo later ingevuld
- . ;If locMagazijn="AUTO" Do
- ..  ;Set PalletList(IsFull,..#magAuto,InsertTime,LocID)=PLNode
- . ;Else  Do
- ..  ;Set PalletList(IsFull,..#magManual,InsertTime,LocID)=PLNode
- . Set Pallet(LocID_"."_Sectie)=PLNode     //Volgende arrays worden gebruikt bij picking algorithms (exact, approx, ...)
+ . Set PalletIndex=$increment(PalletIndex)
+ . ;Set Pallet(LocID_"."_Sectie)=PLNode     //Volgende arrays worden gebruikt bij picking algorithms (exact, approx, ...)
+ . Set Pallet(PalletIndex)=PLNode
  . If IsFull Do   //Grouping wordt enkel gebruikt bij FULL PALLET algo
  ..  Set PalletGroup(+QtyPcs-QtyRes)=$G(PalletGroup(+QtyPcs-QtyRes))_$LB(LocID_"."_Sectie)
- . ;Do WL^vhDBG("- "_##class(Prod.Product).GetMagViaOpslagzone(LocM)_", "_InsertTime_", "_LocID_". Sectie: "_Sectie_". "_QtyPcs_"/"_QtyRes)
- . ;Do WL^vhDBG("  M["_LLocM_", "_##class(Prod.Product).GetMagViaOpslagzone(LLocM)_"] G["_LocG_"] X["_LocX_"] Y["_LocY_"] Z["_LocZ_"] State: "_State_$S(IsFull:", Is full",1:""))
-
+ 
  New PalQty,Som
  Kill PalletGroupCnt,PalletGroupSom
  Set PalQty="",Som=0
FishEye: Tag 5644 refers to a dead (removed) revision in file `vhUnitTest/DOM/PM/TestData.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: EWMS/Locations.cls.xml
===================================================================
diff -u -r5127 -r5651
--- EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5127)
+++ EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5651)
@@ -6,7 +6,6 @@
 <SqlTableName>Locations</SqlTableName>
 <StorageStrategy>GSQLStorage</StorageStrategy>
 <Super>%Library.Persistent</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="CONNECTION">
 <Default>EWMS SQL,NOCREATE</Default>
@@ -97,17 +96,21 @@
 
 <Method name="CreateEmpty">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>LocM,LocG,LocX,LocY</FormalSpec>
+<FormalSpec>LocM:%Integer,LocG:%Integer,LocX:%Integer,LocY:%Integer,LocZ:%Integer=1,LocID:%String="00000000",IsNietBezet:%Boolean=1,InsertTime:%TimeStamp=""</FormalSpec>
 <Implementation><![CDATA[
+	if '$length(InsertTime) set InsertTime = $$GetEWMSInsertTime^vhLib()
+	
 	Set oLoc=..%New()
+	
 	Set oLoc.locm=LocM	
 	Set oLoc.locg=LocG
 	Set oLoc.locx=LocX	
 	Set oLoc.locy=LocY	
-	Set oLoc.locz=1
-	Set oLoc.state=1 ; niet bezet
-	Set oLoc.locid="00000000"
-	Set oLoc.inserttime=$$GetEWMSInsertTime^vhLib()
+	Set oLoc.locz=LocZ
+	Set oLoc.state=IsNietBezet
+	Set oLoc.locid=LocID 
+	Set oLoc.inserttime=InsertTime
+	
 	Set sc=oLoc.%Save()
 	Quit sc
 ]]></Implementation>