Index: OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml
===================================================================
diff -u -r67493 -r67712
--- OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml	(.../OphalenOrderInOBJT.cls.xml)	(revision 67493)
+++ OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml	(.../OphalenOrderInOBJT.cls.xml)	(revision 67712)
@@ -49,8 +49,11 @@
 	Quit:Status=2 "Vrijgegeven"
 	Quit:Status=3 "Picking"
 	Quit:Status=12 "Geannuleerd"
-	Quit:Status=14 "Afgewerkt"
-	Quit:Status=19 "Picked"
+	Quit:Status=14 "Afgewerkt/Beëindigd"
+	Quit:Status=18 "Bezig met picken"
+	Quit:Status=19 "Klaar met picken"
+	Quit:Status=20 "Bezig met klaarzetten"
+	Quit:Status=13 "Bezig met beëindigen"
 	Quit "??? " _ Status
 ]]></Implementation>
 </Method>
Index: OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml
===================================================================
diff -u -r67493 -r67712
--- OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 67493)
+++ OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 67712)
@@ -227,7 +227,7 @@
 <Description>
 d ##class(OBJTimpl.WMSOrder.ImporteerVoorraadNiveau).%New().MailDiff()</Description>
 <Implementation><![CDATA[
- 	Set From="Cache01@vanhoecke.be"
+ 	Set From="pv@vanhoecke.be"
 	Set To=$LB("vdr@vanhoecke.be","pv@vanhoecke.be")
 	;Set To=$LB("pv@vanhoecke.be")
 	Set Subject="Voorraadverschillen OBJT <-> Admin"
Index: OBJTimpl/WMSOrder/ControlePickstatus.cls.xml
===================================================================
diff -u
--- OBJTimpl/WMSOrder/ControlePickstatus.cls.xml	(revision 0)
+++ OBJTimpl/WMSOrder/ControlePickstatus.cls.xml	(revision 67712)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.WMSOrder.ControlePickstatus">
+<Description>
+Vergelijken van pickstatus in ORDW met dat van OBJT</Description>
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Export">
+<Description>
+d ##class(OBJTimpl.WMSOrder.ControlePickstatus).%New().Export()</Description>
+<Implementation><![CDATA[
+	Set Dev=$$OPEN^vhDEV(,"Vergelijk orderstatus OBJT versus ORDW.txt","W","T")
+	Use Dev
+	Write "ORDNr	Datum	ORDWStatus	OBJTSTatus",!
+	Set CONSNr=$O(^ORDW("D",""))
+	Set (Cnt,ObjtCnt)=0
+	While CONSNr 
+	{
+		Set Cnt=Cnt+1
+		If $D(^ORDW("D",CONSNr,"S","V")) ; Doorgestuurd naar OBJT
+		{
+			Set ObjtCnt=ObjtCnt+1
+			Set OBJTStatus=##class(OBJTimpl.WMSOrder.OphalenOrderInOBJT).%New().GeefStatusVertaald(CONSNr)
+			Set ORDWStatus=$P(^ORDW("D",CONSNr),"\",20)
+			;w "."
+	 		If '(((OBJTStatus="Geannuleerd") || (OBJTStatus="Afgewerkt") || (OBJTStatus="Niet in OBJT"))  && (ORDWStatus="B"))
+	 		{
+		 		Write CONSNr, *9,$$$ExcelDat($P(^ORDW("D",CONSNr),"\",3)),*9,ORDWStatus,*9,OBJTStatus,!
+		 	}
+		}
+		If Cnt#100=0 
+		{
+			Use 0
+			Set FP=2301
+			Write @F,@F2,ObjtCnt, " / ",Cnt
+			Use Dev
+		}
+		Set CONSNr=$O(^ORDW("D",CONSNr))
+	}
+	Do CLOSE^vhDEV(Dev)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml
===================================================================
diff -u -r67590 -r67712
--- OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 67590)
+++ OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 67712)
@@ -77,10 +77,10 @@
 <ReturnType>%ResultSet</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    Set OBJTConnect=..GeefSQLConnectie()
-	Set Status=""
-    
-	Set SqlStatement = "select orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.NAME IDENTNR, fromloc.FULLNAME FROMLOC,isnull(fromcont.LPN,fromloc.FULLNAME) BRONPALLET ,toloc.FULLNAME TOLOC,tocont.LPN DOELPALLET"
+    #dim OBJTConnect as %SQLGatewayConnection = ..GeefSQLConnectie()
+	#dim Status as %String = ""
+	#Dim SqlStatement as %String = ""
+   	Set SqlStatement = "select top 1 orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.NAME IDENTNR, fromloc.FULLNAME FROMLOC,isnull(fromcont.LPN,fromloc.FULLNAME) BRONPALLET ,toloc.FULLNAME TOLOC,tocont.LPN DOELPALLET"
 	_ " ,iif(pa.STATUS is null,null,isnull(emp.ID,'Kardexoperator')) USERID ,pa.DTSSTART PICKINGTIJDSTIP"
 	_ " ,orders.status,olines.Status orderlstatus,po.STATUS pickostatus,pl.STATUS picklstatus,pa.STATUS pickactstatus, pa.DTSSTOP"
 	_ " from DCEREPORT_OUTBOUNDORDERS orders"
@@ -98,11 +98,39 @@
 	_ " orders.Status= 14 and"
 	_ " orders.ID= ? "
 	_ " order by olines.name"
-        
+	
+	Set SqlStatement = "select distinct orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.id IDENTNR "
+	_" ,isnull((select top 1 fl.FULLNAME from DCEREPORT_PICK_ACTUALS p1 "
+	_"         left join DCEREPORT_LOCATIONS         fl on fl.OID= p1.FROM_LOCATION_OID "
+	_"         where p1.PICKORDER_OID = pa.PICKORDER_OID and p1.PICKLINE_OID = pa.PICKLINE_OID and p1.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p1.DTSSTART asc),'KardexOPLSAG') FROMLOC "
+	_" ,isnull(fromcont.LPN,fromloc.FULLNAME) BRONPALLET "
+	_" ,isnull((select top 1 toloc.FULLNAME from DCEREPORT_PICK_ACTUALS p2 "
+	_"         left join DCEREPORT_LOCATIONS         toloc on toloc.OID= p2.to_LOCATION_OID "
+	_"         where p2.PICKORDER_OID = pa.PICKORDER_OID and p2.PICKLINE_OID = pa.PICKLINE_OID and p2.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p2.DTSSTART desc),'KardexOUT') TOLOC "
+	_" ,tocont.LPN DOELPALLET "
+	_" ,isnull((select top 1 emp.ID from DCEREPORT_PICK_ACTUALS p3 "
+	_"         left join DCEREPORT_EMPLOYEES         emp on emp.OID= p3.EMPLOYEE_OID "
+	_"         where p3.PICKORDER_OID = pa.PICKORDER_OID and p3.PICKLINE_OID = pa.PICKLINE_OID and p3.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p3.DTSSTART asc),'KardexOperator') USERID "
+	_" ,isnull((select top 1 p4.DTSSTART from DCEREPORT_PICK_ACTUALS p4 "
+	_"         where p4.PICKORDER_OID = pa.PICKORDER_OID and p4.PICKLINE_OID = pa.PICKLINE_OID and p4.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p4.DTSSTART asc) ,pa.DTSSTART) PICKINGTIJDSTIP "
+	_" from DCEREPORT_OUTBOUNDORDERS orders "
+	_" inner join DCEREPORT_OUTBOUNDLINES    olines on olines.OUTBOUNDORDER_OID = orders.oid "
+	_" inner join DCEREPORT_PICKORDERS       po on po.ORDER_OID = orders.OID "
+	_" inner join DCEREPORT_PICKLINES        pl on pl.ORDER_OID = olines.OUTBOUNDORDER_OID and pl.ORDERLINE_OID = olines.oid and pl.PICKORDER_OID = po.oid "
+	_" inner join DCEREPORT_PICK_ACTUALS      pa on pa.PICKORDER_OID = pl.PICKORDER_OID and pa.PICKLINE_OID = pl.OID "
+	_" left join DCEREPORT_CONTAINERS        fromcont on fromcont.OID = pa.FROM_CONTAINER_OID "
+	_" left join DCEREPORT_CONTAINERS        tocont on tocont.OID = pa.TO_CONTAINER_OID "
+	_" left join DCEREPORT_LOCATIONS         fromloc on fromloc.OID= pa.FROM_LOCATION_OID "
+	_" left join DCEREPORT_LOCATIONS         toloc on toloc.OID= pa.TO_LOCATION_OID "
+	_" left join DCEREPORT_ITEMS             item on item.OID = pa.ITEM_OID "
+	_" where orders.ID = '"_ ConsolidatieNr _"' " ; we vullen zelf de parameter in omdat er iets fout loopt in de prepare van de SQL :-((
+	_" and orders.STATUS = 14 "	
+	_" order by olines.name "
+		
     try
     {
     	Do rs.Prepare(SqlStatement,,OBJTConnect)
-	    Do rs.Execute(ConsolidatieNr)    
+	    Do rs.Execute()    
     } catch {
 	    do OBJTConnect.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
@@ -113,6 +141,7 @@
 
 <Method name="GeefSQLConnectie">
 <Private>1</Private>
+<ReturnType>%SQLGatewayConnection</ReturnType>
 <Implementation><![CDATA[
 	Set SqlConnection =##class(%SQLGatewayConnection).%New()
     #dim OBJTSqlServer As %String = ..ConfigMgr.GeefString("OBJTimpl.DatasourceName")
Index: OBJTimpl/WMSOrder/ImporteerPicking.cls.xml
===================================================================
diff -u -r67590 -r67712
--- OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 67590)
+++ OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 67712)
@@ -183,7 +183,12 @@
     ; Defaults
     Set C("PALKLID")=..rsPicking.GetDataByName("DOELPALLET")
  	Set C("DATUM")=$S(..rsPicking.GetDataByName("PICKINGTIJDSTIP")="":$H,1:$zdth(..rsPicking.GetDataByName("PICKINGTIJDSTIP"),8))
- 	Set C("SOURCEPALID")=..rsPicking.GetDataByName("FROMLOC") _"/"_ ..rsPicking.GetDataByName("BRONPALLET")
+ 	If $Piece(..rsPicking.GetDataByName("TOLOC"),"-",1) = "KLZ.DI1" {
+	 	#Dim CodeKegeltje as %String = $Piece(..rsPicking.GetDataByName("TOLOC"),"-",2)
+	 	Set C("SOURCEPALID")=..rsPicking.GetDataByName("FROMLOC") _"/"_ CodeKegeltje
+ 	} Else {
+	 	Set C("SOURCEPALID")=..rsPicking.GetDataByName("FROMLOC") 
+ 	}
  	Set C("USER")=..rsPicking.GetDataByName("USERID")
  	Set C("LOCMSTR")=""
 
Index: EWORDSW.mac.rou
===================================================================
diff -u -r67493 -r67712
--- EWORDSW.mac.rou	(.../EWORDSW.mac.rou)	(revision 67493)
+++ EWORDSW.mac.rou	(.../EWORDSW.mac.rou)	(revision 67712)
@@ -355,7 +355,7 @@
  .Set BlockId=$P(R,D,18)
  .Quit:$P(BlockId,";",2)="P"  Quit:$P(BlockId,";",4)'["W"
  .Set Txt=Txt+1,Txt(Txt)=$P(R,D,5)_"~"
- Do:KenAnk KennisAnker(KLNr,,.Txt,1)
+ ;Do:KenAnk KennisAnker(KLNr,,.Txt,1) ; OBJT PV 27/04 doorsturen crashes voor sommige producten en OBJT heeft dit niet nodig
  Merge C=ORDCache
  Set C="O01"
  Set C("ORDNR")=ORDNr
@@ -532,11 +532,12 @@
  ..Set BlockId=$P(R,D,18)
  ..Quit:$P(BlockId,";",2)'="P"  Quit:$P(BlockId,";",4)'["W"
  ..Set Cnt=Cnt+1,C("OLTEKST",Cnt)=$P(R,D,5)_"~"
- .Do KennisAnker(KLNr,PRNr,.Txt,1)
+ .;Do KennisAnker(KLNr,PRNr,.Txt,1) ; OBJT PV 27/04 doorsturen crashes voor sommige producten en OBJT heeft dit niet nodig
  .If $G(Txt) For Txt=1:1:Txt Set Cnt=Cnt+1,C("OLTEKST",Cnt)=Txt(Txt)_"~"
  Quit
  
 KennisAnker(KLNr,PRNr,Local,InclGeneral) 
+ Quit ; OBJT PV 27/04 doorsturen crashes voor sommige producten en OBJT heeft dit niet nodig
  Set lbKenAnk=##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(KLNr,.varErrStr,$LB($$$adMagazijnPicking),$S($G(PRNr):$LB(PRNr),1:""),$G(CUserId,$G(QU(1))),,,$G(InclGeneral))
  If $LL(lbKenAnk) For  Kill KenAnk Set KenAnk=$LI(lbKenAnk) Quit:KenAnk=""  Do  Quit:'$LL(lbKenAnk)
  . Set lbKenAnk=$LI(lbKenAnk,2,99)
Index: OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml
===================================================================
diff -u -r67357 -r67712
--- OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml	(.../PrintKlantEtiket.cls.xml)	(revision 67357)
+++ OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml	(.../PrintKlantEtiket.cls.xml)	(revision 67712)
@@ -44,7 +44,7 @@
 <Implementation><![CDATA[
 	#dim PickerUserId = ..PickerUserIdOphaler.GeefUserIdPickerVanLPN(KlantEtiketRequest.ConsNr,KlantEtiketRequest.LPN)
 	Do ..StoreLPN(KlantEtiketRequest, PickerUserId)
-	Do EXTERN^FLOWBON4($e(KlantEtiketRequest.ConsNr,5,10), ..ConverteerVertrekplaats(KlantEtiketRequest.Vertrekplaats),KlantEtiketRequest.LPN,PickerUserId)
+	Do EXTERN^FLOWBON4($e($TR(KlantEtiketRequest.ConsNr,"b"),5,10), ..ConverteerVertrekplaats(KlantEtiketRequest.Vertrekplaats),KlantEtiketRequest.LPN,PickerUserId)
 	Quit "OK"
 ]]></Implementation>
 </Method>
@@ -59,7 +59,7 @@
 <Method name="StoreLPN">
 <FormalSpec>KlantEtiketRequest:OBJTimpl.WMSOrder.dtoKlantEtiketRequest,PickerUserId:%String=""</FormalSpec>
 <Implementation><![CDATA[
-	Set CONSNr=$E(KlantEtiketRequest.ConsNr,5,10)
+	Set CONSNr=$e($TR(KlantEtiketRequest.ConsNr,"b"),5,10)
 	If (CONSNr?1"3"5N) && $D(^ORDW("D",CONSNr))
 	{
 		Set ^ORDW("D",CONSNr,"OBJT",$O(^ORDW("D",CONSNr,"OBJT",""),-1)+1)=KlantEtiketRequest.Vertrekplaats_"\"_KlantEtiketRequest.LPN_"\"_$H_"\"_PickerUserId
Index: EWORDST2.mac.rou
===================================================================
diff -u -r67289 -r67712
--- EWORDST2.mac.rou	(.../EWORDST2.mac.rou)	(revision 67289)
+++ EWORDST2.mac.rou	(.../EWORDST2.mac.rou)	(revision 67712)
@@ -144,13 +144,28 @@
  New Klant,Bon,Verz,SoftV,SoftVRec,First,Txt,Cnt,VolgNr,OBJTRec
  Quit:'CONSNr
  Quit:'$D(^ORDW("D",CONSNr))
+ Set OBJTStatus=##class(OBJTimpl.WMSOrder.OphalenOrderInOBJT).%New().GeefStatusVertaald(CONSNr)
  Set Txt=0
  Set VolgNr=""
  ; Aantal LPN
  For  Set VolgNr=$O(^ORDW("D",CONSNr,"OBJT",VolgNr)) Quit:VolgNr=""  Do
  . Set OBJTRec=^ORDW("D",CONSNr,"OBJT",VolgNr)
  . Set Txt=Txt+1,Txt(Txt)= $E($P(OBJTRec,"\",1)_"            ",1,14)_"| "_$E($P(OBJTRec,"\",2)_"               ",1,15)_"| "_$zdt($P(OBJTRec,"\",3),4,2)
  If Txt Do
- . Set R=$$WILD^vhTXTPOP("C;C","OBJT LPN "_CONSNr,"Txt")
+ . Set R=$$WILD^vhTXTPOP("C;C","OBJT "_CONSNr_" : "_OBJTStatus ,"Txt")
  Quit
  
+ZoekObjtLPN() 
+ New LPN,CONSNr
+ Set LPN=$$ASK^vhINP("Geef LPN nr : ",12,"")
+ Set LPN=$ZCVT(LPN,"U")
+ Quit:$L(LPN)<4 
+ Set CONSNr=""
+ Set Found=0
+ For  Set CONSNr=$O(^ORDW("D",CONSNr)) Quit:CONSNr=""  Do  Quit:Found
+ . Set VolgNr="" 
+ . For  Set VolgNr=$O(^ORDW("D",CONSNr,"OBJT",VolgNr)) Quit:VolgNr=""  Do
+ . . Set OBJTRec=^ORDW("D",CONSNr,"OBJT",VolgNr)
+ . . Set:LPN=$REVERSE($E($REVERSE($P(OBJTRec,"\",2)),1,$L(LPN))) Found=1 
+ Do:Found ShowObjtLPN(CONSNr)
+ Quit