Index: EWPAL.mac.rou
===================================================================
diff -u -r67309 -r67493
--- EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 67309)
+++ EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 67493)
@@ -191,7 +191,7 @@
  ; Voor alle producten die niet in EWPAL zitten is de stock=0
  Set PRNr=0,Reden="Corr WMS"
  For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
- .If ..blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
+ .If blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
  .Quit:$D(^EWPAL("D",PRNr))>1  Quit:$D(^PRLINK("D",PRNr))
  .Quit:$$OPSLMAN^PRODUKT2(PRNr)
  .Set R=^KPR(PRNr,0),FysStock=$P(R,D,14)
@@ -205,7 +205,7 @@
  ; Gewijzigde produkten met moeders verwerken
  Set PRNr=""
  For  Set PRNr=$O(^EWPAL("M",PRNr)) Quit:PRNr=""  Do
- .If ..blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
+ .If blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
  .Set Qty=^EWPAL("M",PRNr)
  .Do MOEDER(PRNr,Qty,Reden,.Mail,"N")
  Kill ^EWPAL("M")
@@ -259,7 +259,7 @@
  New FysStock,blOBJT
  Quit:$$OPSLMAN^PRODUKT2(PRNr)
  Set blOBJT=##class(OBJTimpl.CheckObjectiveFase).%New() ; OBJT
- If ..blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
+ If blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
  Set Date=$G(Date,+$H),BronPal=$G(BronPal),User=$G(User),FysStock=$P(^KPR(PRNr,0),D,14)
  Do
  .If ModTyp#2,FysStock+AddQty'<0 Quit
@@ -269,7 +269,11 @@
  Quit
  ;
 MAILSTCK(PRNr,AddQty,Perc,From,PalId,Reden,User,MMail) ; Mail versturen als de stock aanpassing meer dan x% is
- New Tekst,MailId,Lnk
+ New Tekst,MailId,Lnk,blOBJT
+
+ Set blOBJT=##class(OBJTimpl.CheckObjectiveFase).%New() ; OBJT
+ If blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
+
  Set Perc=$G(Perc,-9999999) ; Default 5%
  If $S($P(^KPR(PRNr,0),D,14):$S(AddQty<0:-AddQty,1:AddQty)/$P(^KPR(PRNr,0),D,14)*100,1:100)'<Perc Do 
  .Set Tekst(1)="Stockupdate voor product "_$P(^KPR(PRNr,0),D)_" ("_PRNr_")"
@@ -473,7 +477,10 @@
  Quit
  ;
 RPLDAT(PRNr)
- New Y,Z,X,Key
+ New Y,Z,X,Key,blOBJT
+ Set blOBJT=##class(OBJTimpl.CheckObjectiveFase).%New() ; OBJT
+ If blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
+
  Set:'$G(PRNr) PRNr="*"
  Set Y=2,Y(1)="1`Actueel  : ",Z(1)="Actueel",X=1
  Set Y(2)="2`Huidig   : "_+$P($G(^EWPAL("D",PRNr)),";"),Z(2)=$NA(^EWPAL("D")) Set:Z(2)=GlobRef X=2
@@ -516,7 +523,8 @@
 	Quit
 
 RPLPROD(PalId,Actueel) 
- New PRNr,Y,Result,Query,Status
+ New PRNr,Y,Result,Query,Status,blOBJT
+ Set blOBJT=##class(OBJTimpl.CheckObjectiveFase).%New() ; OBJT
  Quit:'$L(PalId)
  Set Y=0
  If Actueel Do  ; Actueel
@@ -526,14 +534,16 @@
  .If $$$ISERR(Status) Do WARN^vhTXTPOP("Query werkt niet, verwittig ICT ~"_$$ParseStatus^vhLIB(Status)) Quit
  .For  Quit:'Result.Next()  Do
  .. Set PRNr=$$TRIMN^vhRtn1($G(Result.Data("ProductNr")))
+ .. Quit:blOBJT.VoorraadSync(PRNr,"VHBE") ; OBJT : Voorraad wordt beheerd door OBJT
  .. Set Y=Y+1,Y(Y)=$J($S(PRNr:$P($G(^KPR(PRNr,0)),D),1:""),25)_" | "_$$EXTNUM^vhLib.DataTypes(+Result.Data("QtyPcs"),7,".",0)
  Else  Do  ; Huidig en volgende
  .Set PRNr=""
  .For  Set PRNr=$O(@GlobRef@(PRNr)) Quit:PRNr=""  Do:$D(@GlobRef@(PRNr,PalId))
- ..Set Y=Y+1,Y(Y)=$P($G(^KPR(PRNr,0)),D)_" | "_$$EXTNUM^vhLib.DataTypes($P(@GlobRef@(PRNr,PalId),D),7,".",0)
+ .. Quit:blOBJT.VoorraadSync(PRNr,"VHBE") ; OBJT : Voorraad wordt beheerd door OBJT
+ .. Set Y=Y+1,Y(Y)=$P($G(^KPR(PRNr,0)),D)_" | "_$$EXTNUM^vhLib.DataTypes($P(@GlobRef@(PRNr,PalId),D),7,".",0)
  Set:Y Y=$$WILD^vhTXTPOP("C;C","Palet : "_PalId,"Y")
  Quit
- 
+  
 FETCH(PRNr,%J)
  New R,Rec,PalId,PalQty,OpslagPl,KreaDat,KLNr,ORDNr,OLUNr,OLNr,OLNr,OrdQty,Count
  Set PalId="",Count=0
@@ -565,14 +575,16 @@
  Quit
  ;
 FETCHACT(PRNr,%J)
- New R,Rec,Result,Query,Status,Count
+ New R,Rec,Result,Query,Status,Count, blOBJT
  Kill ^HULP(%J)
  Set Query="EWMS.Inventory:GetInvAndLocViaProd"
  Set Result=##class(%ResultSet).%New(Query)
  Set Status=Result.Execute(PRNr)
  If $$$ISERR(Status) Do WARN^vhTXTPOP("Query werkt niet, verwittig ICT ~"_$$ParseStatus^vhLib(Status)) Quit
  Set Count=0
- For  Quit:'Result.Next()  Do
+ Set blOBJT=##class(OBJTimpl.CheckObjectiveFase).%New() ; OBJT
+ 
+ For  Quit:'Result.Next()  Do:'blOBJT.VoorraadSync(PRNr,"VHBE")
  . Set Rec=Result.Data("LocID")
  . Set $P(Rec,D,2)=+Result.Data("QtyPcs")
  . Set $P(Rec,D,3)=+Result.Data("QtyRes")
@@ -646,6 +658,9 @@
  Quit
  
 DIFFQTY(PRNr,PalSum,FysSt) 
+ New blOBJT
+ Set blOBJT=##class(OBJTimpl.CheckObjectiveFase).%New() ; OBJT
+ If blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
  Do ERROR^EWLOG($T(DIFFQTY2))
  New Tekst,MailId,Lnk
  Set Tekst(1)="Stockcontrole voor product "_$P(^KPR(PRNr,0),D)_" ("_PRNr_")"
@@ -659,6 +674,9 @@
  Quit
  
 OPSLAGPL(PRNr,PalId,OpslagPl) 
+ New blOBJT
+ Set blOBJT=##class(OBJTimpl.CheckObjectiveFase).%New() ; OBJT
+ If blOBJT.VoorraadSync(PRNr, "VHBE") Quit ; OBJT : Voorraad wordt beheerd door OBJT
  Do ERROR^EWLOG($T(OPSLAGP2))
  If PalId["9999999" Quit  ;tijdelijk PV
  New Tekst,MailId,Lnk
Index: OBJTimpl/Convert/StockIntake.cls.xml
===================================================================
diff -u -r67303 -r67493
--- OBJTimpl/Convert/StockIntake.cls.xml	(.../StockIntake.cls.xml)	(revision 67303)
+++ OBJTimpl/Convert/StockIntake.cls.xml	(.../StockIntake.cls.xml)	(revision 67493)
@@ -22,7 +22,7 @@
 
 <Method name="LeesTekstBestand">
 <Implementation><![CDATA[
-	Set reader=##class(TECH.FileReader).%New("\\notes01\shared\p v\Stock intake - data.txt")
+	Set reader=##class(TECH.FileReader).%New("\\notes01\shared\p v\Stock intake - data LIVEGANG deel 2.txt")
 	Do reader.SetDelimiter($C(9)) ; optioneel, default is TAB
 	Do reader.SetHeaderRow(1) ; optioneel, default = 1
 	Do reader.SetFirstDataRow(2) ; optioneel, default = 2
@@ -37,9 +37,10 @@
  		Set containertype=reader.Data("containertype")
  		Set qty=reader.Data("qty")
  		Set itemname=reader.Data("itemname")
+ 		Set contentstatus=reader.Data("contentstatus")
  		Set qualitycontrolstatusid=reader.Data("qualitycontrolstatusid")
  		Set ^||OBJTConvert(fullname)=$LB(fullname)
-	 	Set ^||OBJTConvert(fullname,name)=$LB(name,packaging,containertype)
+	 	Set ^||OBJTConvert(fullname,name)=$LB(name,packaging,containertype,contentstatus)
  		Set lbQty=$G(^||OBJTConvert(fullname,name,itemname))
  		If $L(lbQty)=0 
  		{
@@ -100,7 +101,10 @@
 			Set sc=writer.Element("containertype")
 			Set sc=writer.Write($li(lbPal,3))
 			Set sc=writer.EndElement()
-	
+			Set sc=writer.Element("contentstatus")
+			Set sc=writer.Write($li(lbPal,4))
+			Set sc=writer.EndElement()
+		
 			Set itemname=$o(^||OBJTConvert(fullname,name,""))
 			while $L(itemname)
 			{	set cnt=cnt+1
@@ -148,16 +152,20 @@
 	Set Device=$$OPEN^vhDEV(,"AX nr OBJT.txt","W","T")
 	Use Device
 	Set ObjtValid=##class(OBJTimpl.CheckObjectiveFase).%New()
-	Write "PRNr",*9,"AXItemID",*9,"OBJTItemID",*9,"Korttekst",!
+	Write "PRNr",*9,"AXItemID",*9,"OBJTItemID",*9,"Korttekst",*9,"Fase2",*9,"Fase1",*9,"Stock",*9,"Link",*9,"Lev",!
 	While it.HasNext() {
 		Set rs=it.Next()
 		Set PRNr=rs.Data("Product")
 		Set OBJTItemID=rs.Data("OBJTItemID")
 		Set AXItemID=rs.Data("ItemID")
 		; Producten voor fase 2 maar NIET voor fase 1
-		If PRNr&&$D(^KPR(PRNr,0))&&(($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1))&& 'ObjtValid.VoorraadSync(PRNr,"VHBE")
+		
+		If PRNr&&$D(^KPR(PRNr,0)) ;&&(($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1))&& 'ObjtValid.VoorraadSync(PRNr,"VHBE")
 		{
-			Write PRNr,*9,AXItemID,*9,OBJTItemID,*9,$$$PRGet($$$KortTekst),!
+			Set LastUsed=$S($D(^PRHIST(PRNr)):$$$ExcelDat($P(^PRHIST(PRNr,$O(^PRHIST(PRNr,""),-1)),"\",1)),1:"NU")
+			Write PRNr,*9,AXItemID,*9,OBJTItemID,*9,$$$PRGet($$$KortTekst)
+			Write *9,(($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1))
+			Write *9,($$$PRGet($$$OpslagZone)=3),*9,$$$PRGet($$$StockType),*9,$$$PRGet($$$LinkType),*9,$$$PRGet($$$LeveranciersNr),*9,LastUsed,!
 		}
 		
 	}
Index: zTryout/JWI/OpkuisToelevering.cls.xml
===================================================================
diff -u
--- zTryout/JWI/OpkuisToelevering.cls.xml	(revision 0)
+++ zTryout/JWI/OpkuisToelevering.cls.xml	(revision 67493)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="zTryout.JWI.OpkuisToelevering">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="KuisOp">
+<FormalSpec>Levrnr:%String,Toelevering:%String</FormalSpec>
+<Implementation><![CDATA[
+	
+	if $$$Not(..Bestaat(Toelevering)){
+		Do ..KuisIndexenOp(Levrnr,Toelevering)
+		w !, Toelevering," opgekuist"
+	} else {
+		w !,"niet op te kuisen"
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Bestaat">
+<FormalSpec>Toelevering:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim Bestaat as %Boolean = $$$False
+	Set L = ""
+	For  Set L=$O(^KTO(L)) Quit:(L=""||Bestaat)  Do
+	. Set Bestaat = $Data(^KTO(L,Toelevering))
+	Quit Bestaat
+]]></Implementation>
+</Method>
+
+<Method name="KuisIndexenOp">
+<FormalSpec>Levrnr:%String,Toelevering:%String</FormalSpec>
+<Implementation><![CDATA[
+	k ^TO("IU",Toelevering)
+	k ^KTO3(Toelevering)
+
+
+	;k ^TO("IP",878221,260553,110)	
+	#dim ProductID As %String = ""
+	Set ProductID = $O(^TO("IP",""))
+	While ProductID '= "" {
+		#dim Toe As %String = $O(^TO("IP",ProductID,""))
+		while Toe '= "" {
+			If Toe = Toelevering {
+				Kill ^TO("IP",ProductID,Toelevering)
+			}
+			set Toe = $O(^TO("IP",ProductID,Toe))
+		}
+		Set ProductID = $O(^TO("IP",ProductID))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: zbcheck.mac.rou
===================================================================
diff -u -r58930 -r67493
--- zbcheck.mac.rou	(.../zbcheck.mac.rou)	(revision 58930)
+++ zbcheck.mac.rou	(.../zbcheck.mac.rou)	(revision 67493)
@@ -15,7 +15,7 @@
  Set CheckBon=$$CHECK^FLOWBON3("B")      ; *** WMS ord ***  (deel 2) ???
  Set CheckToe=$$CHECK^FLOWTOE3()         ; *** WMS toe ***
  Set CheckKup=$$CHECK^FLOWBON3("P")      ; *** ^KUP ***
- Set CheckRcp=$$CHECK^ZBCHKRCP()         ; *** WMS rcp ***
+ ;Set CheckRcp=$$CHECK^ZBCHKRCP()         ; *** WMS rcp *** Niet meer van toepassing OBJT
  Set CheckDUO=$$CHECK^ZBCHKFLO("O")      ; *** Dubbels orders ***
  Set CheckDUB=$$CHECK^ZBCHKFLO("B")      ; *** Dubbels leveringsbons ***
  Set CheckFAKT=1 ;$$CHECK^ZBCHKFLO("F")     ; *** Facturen ***
Index: OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml
===================================================================
diff -u -r67289 -r67493
--- OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml	(.../OphalenOrderInOBJT.cls.xml)	(revision 67289)
+++ OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml	(.../OphalenOrderInOBJT.cls.xml)	(revision 67493)
@@ -50,6 +50,7 @@
 	Quit:Status=3 "Picking"
 	Quit:Status=12 "Geannuleerd"
 	Quit:Status=14 "Afgewerkt"
+	Quit:Status=19 "Picked"
 	Quit "??? " _ Status
 ]]></Implementation>
 </Method>
@@ -83,6 +84,35 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPickStatus">
+<FormalSpec>CONSNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim PickID as %String =..GeefOBJTPickID(CONSNr)
+	Quit:PickID="" ""
+	
+    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
+    #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
+	#dim Status as %String = ""
+    #dim SqlStatement as %String = "Select PICKSTATUS FROM [OBJT_OUTBOUNDORDER] WHERE ID=?"
+    
+    try
+    {
+    	Do res.Prepare(SqlStatement,,OBJTConnection)
+	    Do res.Execute(PickID)    
+    } catch {
+	    do OBJTConnection.Disconnect()
+	    do ##class(TECH.ExceptionHandler).Rethrow()
+    }
+    If res.Next()
+    {
+	    Set Status=$G(res.Data("PICKSTATUS"))
+    }
+    do OBJTConnection.Disconnect()
+
+    Quit Status
+]]></Implementation>
+</Method>
+
 <Method name="GeefOBJTPickID">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>CONSNr:%String</FormalSpec>
Index: APPS/MAG/enu/Magazijn/AutoComplete.cls.xml
===================================================================
diff -u -r59370 -r67493
--- APPS/MAG/enu/Magazijn/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 59370)
+++ APPS/MAG/enu/Magazijn/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 67493)
@@ -30,6 +30,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="Objective">
+<Type>%String</Type>
+<InitialExpression>"V"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="Orgalux">
 <Type>%String</Type>
 <InitialExpression>"O"</InitialExpression>
Index: OBJTimpl/PM/OBJTIdentNrMappingRepository.cls.xml
===================================================================
diff -u -r67289 -r67493
--- OBJTimpl/PM/OBJTIdentNrMappingRepository.cls.xml	(.../OBJTIdentNrMappingRepository.cls.xml)	(revision 67289)
+++ OBJTimpl/PM/OBJTIdentNrMappingRepository.cls.xml	(.../OBJTIdentNrMappingRepository.cls.xml)	(revision 67493)
@@ -101,7 +101,7 @@
 <Implementation><![CDATA[
 	#dim ResultSet as %ResultSet
 	Set ResultSet=##class(%ResultSet).%New("%DynamicQuery:SQL")
-	Set sc=ResultSet.Prepare("select Product,ItemID from OBJTimpl_PM.OBJTIdentNrMapping where OBJTItemID=? ")
+	Set sc=ResultSet.Prepare("select Product,ItemID,Product->KortTekst from OBJTimpl_PM.OBJTIdentNrMapping where OBJTItemID=? order by ItemID desc")
 	Set sc=ResultSet.Execute(OBJTItemID)
 	Quit ResultSet
 ]]></Implementation>
Index: FLOWCHK.mac.rou
===================================================================
diff -u -r66176 -r67493
--- FLOWCHK.mac.rou	(.../FLOWCHK.mac.rou)	(revision 66176)
+++ FLOWCHK.mac.rou	(.../FLOWCHK.mac.rou)	(revision 67493)
@@ -376,7 +376,8 @@
  ;
 COMMORD(ORDNr) 
  New R,KLNr,IsComm,VerpTyp,CommRef
- Set IsComm=0,KLNr=$P(^KO1(ORDNr,"F"),"\")
+ Set IsComm=0,KLNr=$P($G(^KO1(ORDNr,"F")),"\")
+ Quit:'KLNr 0
  Set R=^KOD(KLNr,"F",ORDNr,1)
  Set IsComm=";"_$P(R,"\",30)_";"[";CO;" Set:IsComm IsComm=''$L($P(R,"\",19))
  Quit IsComm
Index: APPS/MAG/enu/Magazijn/Verwerker.cls.xml
===================================================================
diff -u -r59370 -r67493
--- APPS/MAG/enu/Magazijn/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 59370)
+++ APPS/MAG/enu/Magazijn/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 67493)
@@ -18,6 +18,8 @@
 		Do ..VerwerkHalux()
 	} ElseIf Magazijn = "L" {
 		Do ..VerwerkLangGoed()
+	} ElseIf Magazijn = "V" {
+		Do ..VerwerkObjective()
 	} ElseIf Magazijn = "O" {
 		Do ..VerwerkOrgalux()
 	} ElseIf Magazijn = "I" {
@@ -51,6 +53,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkObjective">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkOrgalux">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: OBJTimpl/WMSOrder/OphalenUserIdPickerVanLPN.cls.xml
===================================================================
diff -u -r67356 -r67493
--- OBJTimpl/WMSOrder/OphalenUserIdPickerVanLPN.cls.xml	(.../OphalenUserIdPickerVanLPN.cls.xml)	(revision 67356)
+++ OBJTimpl/WMSOrder/OphalenUserIdPickerVanLPN.cls.xml	(.../OphalenUserIdPickerVanLPN.cls.xml)	(revision 67493)
@@ -60,6 +60,19 @@
 	_ " and outboundOrder.id = ?"
 	_ " and csitq.name = ?"
 		
+	Set SqlStatement = "select task.oid, outboundOrder.id, csitq.name, sitq.oid, sitq.VALUE, item.NAME,  employee.userid UserId, location.FULLNAME "
+	_ " from OBJT_TASK task"
+	_ " left join OBJT_OUTBOUNDORDER outboundOrder on outboundOrder.oid = task.REFOID"
+	_ " left join OBJT_CONTAINERSTORAGEITEMQTY csitq on csitq.oid = task.CONTAINERSTORAGEITEMQTYOID"
+	_ " left join OBJT_STORAGEITEMQTY sitq on sitq.CONTAINERSTORAGEITEMQTYOID = csitq.oid"
+	_ " left join OBJT_ITEM item on item.oid = sitq.ITEMOID"
+	_ " left join OBJT_EMPLOYEE employee on employee.oid = task.EMPLOYEEOID"
+	_ " left join OBJT_WAREHOUSELOCATION location on location.oid = task.TARGETLOCATIONOID"
+	_ " where task.CATEGORY = 'OUTBOUND'"
+	_ " and task.ORDERCLASSNAME='objt.wms.bo.outboundmgt.OutboundOrder'"
+	_ " and outboundOrder.id = ?"
+	_ " and csitq.NAME = ?"
+		
     try
     {
     	Do res.Prepare(SqlStatement,,OBJTConnection)
Index: EWSTAT.mac.rou
===================================================================
diff -u -r60084 -r67493
--- EWSTAT.mac.rou	(.../EWSTAT.mac.rou)	(revision 60084)
+++ EWSTAT.mac.rou	(.../EWSTAT.mac.rou)	(revision 67493)
@@ -32,7 +32,10 @@
  Quit
  
 DISP ; Lichtkrant magazijn
-	New CONSNr,ORDNr,OLUNr,SOLNr,Rec,Cnt,Dev,MagNr,PRNr,Kleur,BonErr,Ident,TeDoen,Opslag,PalId
+
+ ;Quit:'##class(TECH.Config.ConfigMgr).Instance().GetBoolean("EWSTAT_LichtkrantInMagazijnAansturen")	
+
+ New CONSNr,ORDNr,OLUNr,SOLNr,Rec,Cnt,Dev,MagNr,PRNr,Kleur,BonErr,Ident,TeDoen,Opslag,PalId
  
  Set D="\"
  Kill Cnt
@@ -101,13 +104,13 @@
  Set Txt=Txt+1,Txt(Txt)="              "
  Set Txt=Txt+1,Txt(Txt)="Orders      : "
  Set Txt=Txt+1,Txt(Txt)="Orderlijnen : "
- For Mag="E","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)="   "_$P("Auto   ;Ugly   ;Transf.;Lang   ;Halux  ;Orgalux",";",$F("EUALHO",Mag)-1)_"  : "
+ For Mag="V","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)="   "_$P("Objt   ;Ugly   ;Transf.;Lang   ;Halux  ;Orgalux",";",$F("VUALHO",Mag)-1)_"  : "
  For Mode="W","V","K" Do
  .Set Txt=0
  .Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$S(Mode="W":" WMS",Mode="V":"VOLG",1:"KODE")_" : "
  .Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode)),D,1),4)_" : "
  .Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode)),D,2),4)_" : "
- .For Mag="E","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode,Mag)),D,2),4)_" : "
+ .For Mag="V","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode,Mag)),D,2),4)_" : "
  Set Txt=Txt+1,Txt(Txt)=""
  Set Tijd=$P($G(Cnt("W","E")),D,5)
  Set Qty=$P($G(Cnt("W")),D,2)
Index: EWORDW.mac.rou
===================================================================
diff -u -r29059 -r67493
--- EWORDW.mac.rou	(.../EWORDW.mac.rou)	(revision 29059)
+++ EWORDW.mac.rou	(.../EWORDW.mac.rou)	(revision 67493)
@@ -10,6 +10,7 @@
  Set PStat=$G(PStat)
  For  Do  Quit:Inp'=""&($L(Inp)<2)  Quit:CONSNr
  .Set Inp=$$ASKL^vhINP("EWORDW","SELECT")
+ .Set:Inp?10N Inp=$E(Inp,5,10) 
  .If Inp=""!zb Set Inp=$$LIST(ObjRef,WStat,PStat,KLNr) Quit:'Inp
  .If Inp="K" Set Inp=$$SELECT^KLANT6(1,"","Uitleveringen van klant : ") Set:Inp KLNr=Inp Set Inp="" Quit
  .If Inp="P" Set Inp=$$PROD(ObjRef,WStat,PStat,KLNr) If 'Inp Set Inp="" Quit
Index: OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml
===================================================================
diff -u -r67289 -r67493
--- OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 67289)
+++ OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 67493)
@@ -21,24 +21,31 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Vandaag">
+<Type>%Integer</Type>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Do ##class(dtoCorrelateVoorraadNiveau).%KillExtent()
-	Kill ^||OBJTVoorraad
 	Set ..CheckOBJTFase=##class(OBJTimpl.CheckObjectiveFase).%New()
 	Set ..Logger = ##class(vhLib.Logger).%New("OBJT_WMS")
-
+	Set ..Vandaag=+$H
+	Kill ^OBJTVoorraad("D",..Vandaag)
+	Kill ^OBJTVoorraad("IP")
+	Kill ^OBJTVoorraad("CORR",..Vandaag)
+	Kill ^OBJTVoorraad("SQL",..Vandaag)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="test">
-<Description>
-d ##class(OBJTimpl.WMSOrder.ImporteerVoorraadNiveau).%New().test()</Description>
+<Description><![CDATA[
+d ##class(OBJTimpl.WMSOrder.ImporteerVoorraadNiveau).%New().BepaalGepickteMaarNietAfgemeldeAantallen()</Description>]]></Description>
 <Implementation><![CDATA[
 	set ..pxVoorraad=##class(dtoCorrelateVoorraadNiveau).%New()
 	set ..pxVoorraad.Aantal=415
@@ -51,11 +58,45 @@
 <Method name="Verwerk">
 <FormalSpec>XMLreader:%XML.Reader</FormalSpec>
 <Implementation><![CDATA[
+	Do ..BepaalGepickteMaarNietAfgemeldeAantallen()
 	Do ..VerwerkBestand(XMLreader)
 	Do ..VerwerkOntbrekendeVoorraden()
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalGepickteMaarNietAfgemeldeAantallen">
+<Implementation><![CDATA[
+	Set it=##class(OBJTimpl.WMSOrder.OphalenGeraapteVoorraadNiveau).%New().GeefIterator()
+	Kill ^OBJTVoorraad("CORR",..Vandaag)
+	Kill ^OBJTVoorraad("SQL",..Vandaag)
+
+	Set Entiteit="VHBE"
+	Set Tellere=0
+	While it.HasNext() 
+	{ 
+		Set rs=it.Next()
+		#Dim CONSNr as %String =$E(rs.Data("CONSNr"),5,10)
+		;w rs.Data("CONSNr")," ",CONSNr,$P($G(^ORDW("D",CONSNr)),"\",20),!
+		#Dim Aantal as %Decimal = rs.Data("Aantal")
+		#Dim ItemID as £String =rs.Data("ItemID")
+		#dim ORDNr as %String =$P(rs.Data("LijnID"),"\")
+	 	#dim OLNr as %String =$P(rs.Data("LijnID"),"\",2)\100
+	 	#dim SOLNr as %String =$P(rs.Data("LijnID"),"\",2)#100*100
+ 		
+	 	Set StatusBON=$P($G(^ORDW("D",CONSNr)),"\",20)
+	 	Set StatusOBJT=$P($G(^ORDW("D",CONSNr,"S","V")),"\")
+
+		Set ^OBJTVoorraad("SQL",..Vandaag,ItemID,Entiteit,$I(Teller))=$LB(CONSNr,ORDNr,OLNr,SOLNr,Aantal,StatusBON,StatusOBJT)
+
+	 	If $D(^ORDW("D",CONSNr)) && (StatusBON'="B") ;nog niet op bon maar wel al geraapt -> voorraad correctie
+	 	{
+		 	Set ^OBJTVoorraad("CORR",..Vandaag,ItemID,Entiteit)=$G(^OBJTVoorraad("CORR",..Vandaag,ItemID,Entiteit))+Aantal
+		}
+ 	
+	}
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBestand">
 <FormalSpec>XMLreader:%XML.Reader</FormalSpec>
 <Implementation><![CDATA[
@@ -83,6 +124,7 @@
 	#dim rs as %ResultSet
 	Set itVerdeler=##class(OBJTimpl.WMSOrder.VerdeelSOPRVoorraad).%New(..pxVoorraad.Entiteit,..pxVoorraad.ItemId)
 	;w !,..pxVoorraad.Entiteit,"  ",..pxVoorraad.ItemId
+	#dim VoorraadCorrectie as %Decimal=$G(^OBJTVoorraad("CORR",..Vandaag,..pxVoorraad.ItemId,..pxVoorraad.Entiteit))
 	Set ..pxVoorraad.AantalAdmin=itVerdeler.GeefOudeVoorraad()
 	If ..pxVoorraad.Aantal'=..pxVoorraad.AantalAdmin
 	{
@@ -95,6 +137,7 @@
 
 <Method name="MarkeerVerwerkteProducten">
 <Implementation><![CDATA[
+	#dim VoorraadCorrectie as %Decimal=$G(^OBJTVoorraad("CORR",..Vandaag,..pxVoorraad.ItemId,..pxVoorraad.Entiteit))
 	#dim rs as %ResultSet=##class(OBJTimpl.PM.OBJTIdentNrMappingRepository).%New().GeefAdminItemIDs(..pxVoorraad.ItemId)
 	#dim it as TECH.ResultSetIterator = ##class(TECH.ResultSetIterator).%New(rs)
 
@@ -104,22 +147,22 @@
 		Set PRNr=rs.Data("Product")
 		If PRNr
 		{
-			Set ^||OBJTVoorraad(PRNr,..pxVoorraad.Entiteit)=""
+			Set ^OBJTVoorraad("VERWERKT",PRNr,..pxVoorraad.Entiteit)=..pxVoorraad.ItemId
 		}
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkOntbrekendeVoorraden">
 <Implementation><![CDATA[
-
+	;TODO : nakijken
 	Set PRNr=$O(^PRSTOCK("D",0))
 	While PRNr'=""
 	{
 		; HLX Werkvloer
 		Set AdminVoorraad=$P(^PRSTOCK("D",PRNr),"\",5)
 		Set Entiteit="HLX"
-		If $D(^KPR(PRNr)) && (+AdminVoorraad'=0) && ..CheckOBJTFase.VoorraadSync(PRNr,Entiteit) && '$D(^||OBJTVoorraad(PRNr,Entiteit)) && ($$$PRGet($$$LinkType)'="S")
+		If $D(^KPR(PRNr)) && (+AdminVoorraad'=0) && ..CheckOBJTFase.VoorraadSync(PRNr,Entiteit) && '$D(^OBJTVoorraad("VERWERKT",PRNr,Entiteit)) && ($$$PRGet($$$LinkType)'="S")
 		{
  			Do ##class(vhLib.Logger).%New("OBJT_WMS").Warning("Voorraadniveau op nul gezet","PRNr:"_PRNr_" Entiteit:"_Entiteit_" Oud:"_AdminVoorraad) 
 			Do ..ZetVoorraadOpNul(Entiteit,PRNr,-AdminVoorraad)
@@ -128,7 +171,7 @@
 		; VHBE Fysieke voorraad
 		Set AdminVoorraad=$P(^PRSTOCK("D",PRNr),"\",1)
 		Set Entiteit="VHBE"
-		If $D(^KPR(PRNr)) && (+AdminVoorraad'=0) && ..CheckOBJTFase.VoorraadSync(PRNr,Entiteit) && '$D(^||OBJTVoorraad(PRNr,Entiteit)) && ($$$PRGet($$$LinkType)'="S")
+		If $D(^KPR(PRNr)) && (+AdminVoorraad'=0) && ..CheckOBJTFase.VoorraadSync(PRNr,Entiteit) && '$D(^OBJTVoorraad("VERWERKT",PRNr,Entiteit)) && ($$$PRGet($$$LinkType)'="S")
 		{
  			Do ##class(vhLib.Logger).%New("OBJT_WMS").Warning("Voorraadniveau op nul gezet","PRNr:"_PRNr_" "_$$$PRGet($$$KortTekst)_" Entiteit:"_Entiteit_" Oud:"_AdminVoorraad) 
 			Do ..ZetVoorraadOpNul(Entiteit,PRNr,-AdminVoorraad)
@@ -151,6 +194,100 @@
 	;Do STORE^PRSTOCK($S(Entiteit="HLX":"W",1:"F"),"N",PRNr,Voorraadwijziging,Omschrijving)
 ]]></Implementation>
 </Method>
+
+<Method name="Export">
+<Description>
+d ##class(OBJTimpl.WMSOrder.ImporteerVoorraadNiveau).Export()</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Datum:%Integer</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set Datum=$G(Datum, $O(^OBJTVoorraad("D",""),-1))
+	
+	Set Device=$$OPEN^vhDEV("\\NOTES01\SHARED\P V","Voorraad "_$zd(Datum,8)_".txt","W","T")
+	Use Device
+	Write "ItemID	Entiteit	OBJTAantal	AdminAantal	VoorraadCorr",!
+	
+	Set ItemID=$O(^OBJTVoorraad("D",Datum,""))
+	Set Entiteit="VHBE"
+	While ItemID'=""
+	{
+
+		Write ItemID,*9,Entiteit,*9,$LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),2),*9,$LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),3),*9,$G(^OBJTVoorraad("CORR",Datum,ItemID,Entiteit)),!
+		;Write ItemID,*9,$G(^OBJTVoorraad("D",Datum,ItemID,Entiteit)),!
+		
+		Set ItemID=$O(^OBJTVoorraad("D",Datum,ItemID))
+	}
+	
+	Do CLOSE^vhDEV(Device)
+]]></Implementation>
+</Method>
+
+<Method name="MailDiff">
+<Description>
+d ##class(OBJTimpl.WMSOrder.ImporteerVoorraadNiveau).%New().MailDiff()</Description>
+<Implementation><![CDATA[
+ 	Set From="Cache01@vanhoecke.be"
+	Set To=$LB("vdr@vanhoecke.be","pv@vanhoecke.be")
+	;Set To=$LB("pv@vanhoecke.be")
+	Set Subject="Voorraadverschillen OBJT <-> Admin"
+	Set strmBody=..GetDiffInHTML()
+	Set Status=$$SendMiniMail^vhLib(From,To,Subject,strmBody,1,1)
+	If 'Status Set Warning="Mail niet verzonden!"
+	If Status Set Warning="Mail verzonden."
+]]></Implementation>
+</Method>
+
+<Method name="GetDiffInHTML">
+<Implementation><![CDATA[
+	Set Datum=$O(^OBJTVoorraad("D",""),-1)
+	Set OBJTService=##class(OBJTimpl.PM.OBJTIdentLookupService).%New()
+	
+ 	#define fmtBeginHtml "<html><body style=""font-family:arial,helvetica;"">"
+ 	#define fmtBeginTable "<table width=""1060px"" bordercolor=""#777777"" border=""1"" cellspacing=""0"" cellpadding=""2"" style=""border-collapse:collapse;"">"
+ 	#define fmtEndTable "</table>"
+ 	#define fmtEndHtml "</body></html>"
+ 	Set strmBody=##class(%GlobalCharacterStream).%New()
+ 	Do strmBody.Write($$$fmtBeginHtml)
+ 	Do strmBody.Write($$$fmtBeginTable)
+	Do strmBody.Write("<tr>")
+	Do strmBody.Write("<th>OBJTItemID</th>")
+	Do strmBody.Write("<th>Korttekst(en)</th>")
+	Do strmBody.Write("<th>OBJT</th>")
+	Do strmBody.Write("<th>Admin</th>")
+	Do strmBody.Write("<th>Diff</th>")
+	Do strmBody.Write("</tr>")
+	
+	Set ItemID=$O(^OBJTVoorraad("D",Datum,""))
+	Set Entiteit="VHBE"
+	While ItemID'=""
+	{
+		If $LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),2)'=$LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),3)
+		{
+			Set it=OBJTService.GeefAdminIdentNrs(ItemID)
+			Set Txt=""
+			While it.HasNext()
+			{
+				Set rs=it.Next()
+				Set Txt=Txt_"; "_rs.Data("KortTekst")
+			}
+			
+			Do strmBody.Write("<tr>")
+			Do strmBody.Write("<td>"_ItemID_"</td>")
+			Do strmBody.Write("<td>"_$E(Txt,2,99)_"</td>")
+			Do strmBody.Write("<td>"_$LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),2)_"</td>")
+			Do strmBody.Write("<td>"_$LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),3)_"</td>")
+			Do strmBody.Write("<td>"_($LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),2)-$LI(^OBJTVoorraad("D",Datum,ItemID,Entiteit),3))_"</td>")
+			Do strmBody.Write("</tr>")
+		}
+		Set ItemID=$O(^OBJTVoorraad("D",Datum,ItemID))
+ 	}
+ 	Do strmBody.Write($$$fmtEndTable)
+ 	Do strmBody.Write($$$fmtEndHtml)
+ 	
+ 	Quit strmBody
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: EWORDSW.mac.rou
===================================================================
diff -u -r67343 -r67493
--- EWORDSW.mac.rou	(.../EWORDSW.mac.rou)	(revision 67343)
+++ EWORDSW.mac.rou	(.../EWORDSW.mac.rou)	(revision 67493)
@@ -31,8 +31,15 @@
 	Kill ^ORDW("D",CONSNr,"S") 
 	Do SEND(CONSNr)
 	Quit
+	Quit
+
+SENDOBJT ; Orders voor vandaag klaar zetten voor OBJT
+	Set Q="K" D ^cA604
+	Quit:$G(^EWREC("P","NOSEND"))
+	Set DOutDate=+$H
+	Do ProcessAll(DOutDate,0)
+	Quit
  
- 
 SENDALL 
  New R,DOutDate,CONSNr,KLNr
  Set DOutDate=+$H
@@ -137,6 +144,7 @@
 	;If Verzendwijze="OD2" Set $P(DOut,",",2)=25200 ; 7 uur
 	;If Verzendwijze="OD3" Set $P(DOut,",",2)=28800 ; 8 uur
 	;If Verzendwijze="OD4" Set $P(DOut,",",2)=32400 ; 9 uur
+	;If Verzendwijze="OD5" Set $P(DOut,",",2)=36000 ; 10 uur
 }
 
  If ##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()
Index: FLOW.mac.rou
===================================================================
diff -u -r67110 -r67493
--- FLOW.mac.rou	(.../FLOW.mac.rou)	(revision 67110)
+++ FLOW.mac.rou	(.../FLOW.mac.rou)	(revision 67493)
@@ -48,7 +48,8 @@
 SASK Kill GoSask
  If '$D(DERDENr)!$G(DERDENr("N")) Do  Goto SASK:$G(GoSask)
  .Set FP=1901 Write @F,@F1
- .Set R=$$UPCASE^vhRtn1($$ASK^vhINP(Prompt,$S(Global="KTO":12,1:6),"",Komm1,Komm2))
+ .Set R=$$UPCASE^vhRtn1($$ASK^vhINP(Prompt,$S(Global="KTO":12,1:7),"",Komm1,Komm2))
+ .Set:R?3N1"."3N R=$TR(R,".")
  .Do:Global="KTO"
  ..If R?6N4.5A Set R=+R Quit
  ..If R?1A2.5A Set R=$$ToeleveringViaDossierNummer(R)
Index: zTryout/JWI/ControleBons.cls.xml
===================================================================
diff -u
--- zTryout/JWI/ControleBons.cls.xml	(revision 0)
+++ zTryout/JWI/ControleBons.cls.xml	(revision 67493)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="zTryout.JWI.ControleBons">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Controle">
+<FormalSpec>BONNr:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	Set r = ##class(Flow.OrderWMS.HoofdingRepository).%New()
+	Set O = ##class(OBJTimpl.WMSOrder.OphalenOrderInOBJT).%New()
+	if BONNr="" {
+		set it = r.ZoekAlle()
+		while it.HasNext() {
+			#dim Hoofding as Flow.OrderWMS.Hoofding = it.Next()
+			if Hoofding.StatusWMS '= "B" {
+				set StatusOBJT = O.GeefStatusVertaald(Hoofding.ConsolidatieNr)
+				Set PickStatus = O.GeefPickStatus(Hoofding.ConsolidatieNr)
+				w:((StatusOBJT="Afgewerkt")|| ((StatusOBJT = "Vrijgegeven")& (PickStatus=14 ))) !,Hoofding.ConsolidatieNr _ " " _ Hoofding.StatusWMS _ " " _ O.GeefStatusVertaald(Hoofding.ConsolidatieNr) _ " " _PickStatus
+			}		
+		}
+	} else {
+		if r.BestaatViaID(BONNr) {
+			Set Hoofding = r.GeefViaID(BONNr)
+			set StatusOBJT = O.GeefStatusVertaald(Hoofding.ConsolidatieNr)
+			Set PickStatus = O.GeefPickStatus(Hoofding.ConsolidatieNr)
+			w !,Hoofding.ConsolidatieNr _ " " _ Hoofding.StatusWMS _ " " _ O.GeefStatusVertaald(Hoofding.ConsolidatieNr)_ " " _PickStatus
+		} else {
+			w !,"niet gevonden"
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: OBJTimpl/WMSOrder/ImporteerVoorraadWijziging.cls.xml
===================================================================
diff -u -r67315 -r67493
--- OBJTimpl/WMSOrder/ImporteerVoorraadWijziging.cls.xml	(.../ImporteerVoorraadWijziging.cls.xml)	(revision 67315)
+++ OBJTimpl/WMSOrder/ImporteerVoorraadWijziging.cls.xml	(.../ImporteerVoorraadWijziging.cls.xml)	(revision 67493)
@@ -201,11 +201,11 @@
 <Implementation><![CDATA[
 	If ..pxVoorraad.Entiteit="HLX"
 	{
-		Set ..pxVoorraad.AantalAdmin=$P(^PRSTOCK("D",..pxVoorraad.PRNr),"\",5)
+		Set ..pxVoorraad.AantalAdmin=$P($G(^PRSTOCK("D",..pxVoorraad.PRNr)),"\",5)
 	}
 	Else
 	{
-		Set ..pxVoorraad.AantalAdmin=$P(^PRSTOCK("D",..pxVoorraad.PRNr),"\",1)
+		Set ..pxVoorraad.AantalAdmin=$P($G(^PRSTOCK("D",..pxVoorraad.PRNr)),"\",1)
 	}
 ]]></Implementation>
 </Method>
Index: OBJTimpl/WMSOrder/OphalenGeraapteVoorraadNiveau.cls.xml
===================================================================
diff -u
--- OBJTimpl/WMSOrder/OphalenGeraapteVoorraadNiveau.cls.xml	(revision 0)
+++ OBJTimpl/WMSOrder/OphalenGeraapteVoorraadNiveau.cls.xml	(revision 67493)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.WMSOrder.OphalenGeraapteVoorraadNiveau">
+<IncludeCode>Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="Converter">
+<Type>AXimpl.Controle.Order.Ax.AxOrderLijnConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SqlQueryConnection">
+<Type>AXimpl.SqlQueryConnection</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ConfigMgr">
+<Type>TECH.Config.ConfigMgr</Type>
+<Private>1</Private>
+</Property>
+
+<UDLText name="T">
+<Content><![CDATA[
+// d ##class(OBJTimpl.WMSOrder.OphalenGeraapteVoorraadNiveau).%New().Test()
+
+]]></Content>
+</UDLText>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	Set it=..GeefIterator()
+	
+	While it.HasNext()
+	{	
+		set rs=it.Next()
+		write rs.Data("CONSNr")," ",rs.Data("Aantal")," ",rs.Data("ItemID"),!
+	}
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	
+	//d ##class(TECH.Config.ConfigMgr).Instance().SetString("OBJTimpl.DatasourceName","OBJT_ACP")
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefIterator">
+<Implementation><![CDATA[
+	#Dim ResultSet as %ResultSet = ..GeefResultSet()
+	Set Iterator=##class(TECH.ResultSetIterator).%New(ResultSet)
+	Quit Iterator
+]]></Implementation>
+</Method>
+
+<Method name="GeefResultSet">
+<Private>1</Private>
+<ReturnType>%ResultSet</ReturnType>
+<Implementation><![CDATA[
+    Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
+    Set OBJTConnect=..GeefSQLConnectie()
+	Set Status=""
+    Set SqlStatement=" select "
+	_" outboundOrder.id CONSNr, "
+	_" op.name LijnID, "
+	_" sum(task.QTY) Aantal, "
+	_" it.Name ItemID "
+	_" from OBJT_TASK task "
+	_" left join OBJT_PICKORDER pickorder "
+	_"  on task.ORDEROID = pickorder.OID "
+	_" left join OBJT_ORDERLINK link "
+	_" 	on link.PARENTCLASSNAME = 'objt.wms.bo.outboundmgt.OutboundOrder' "
+	_" 	and link.CHILDOID = pickorder.oid "
+	_" left join OBJT_OUTBOUNDORDER outboundOrder "
+	_" 	on outboundOrder.oid = link.PARENTOID "
+	_" left join OBJT_OPERATIONLINK opLink "
+	_" 	on opLink.CHILDOID = task.REFOID "
+	_" 	and opLink.PARENTCLASSNAME = 'objt.wms.bo.outboundmgt.OutboundOperation' "
+	_" left join OBJT_OUTBOUNDOPERATION op "
+	_" 	on op.oid = opLink.PARENTOID "
+	_" left join OBJT_OUTBOUNDITEMQTY itemqty "
+	_" 	on itemqty.OUTBOUNDOPERATIONOID = op.oid "
+	_" left join OBJT_ITEM it "
+	_" 	on task.ITEMOID=it.OID "
+	_" left join OBJT_WAREHOUSELOCATION slocation "
+	_"  on slocation.oid = task.SourceLOCATIONOID "
+	_" left join objt_warehouse wh "
+	_"  on slocation.WAREHOUSEOID = wh.OID "
+	_" where task.CATEGORY = 'PICK' "
+	_"  and task.substatus is null"
+	_"  and task.dtsstop>dateadd(day,-7,GetDate()) "
+	_"  and wh.NAME not in ('ST','KZ','KLZ') "
+	_" group by outboundOrder.id, op.name,it.Name "
+	try
+    {
+    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+	    Do rs.Execute()    
+    } catch {
+	    do OBJTConnect.Disconnect()
+	    do ##class(TECH.ExceptionHandler).Rethrow()
+    }
+    Quit rs
+]]></Implementation>
+</Method>
+
+<Method name="GeefSQLConnectie">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set SqlConnection =##class(%SQLGatewayConnection).%New()
+    #dim OBJTSqlServer As %String = ..ConfigMgr.GeefString("OBJTimpl.DatasourceName")
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(SqlConnection.Connect(OBJTSqlServer,"",""))
+    Quit SqlConnection
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: EWORDS6.mac.rou
===================================================================
diff -u -r66095 -r67493
--- EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 66095)
+++ EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 67493)
@@ -218,44 +218,48 @@
  New
  Set Q="K",D="\",U=";",QU(1)=0
  If $$AutoSendIsActief() {
-	 Lock +^ORDW("AUTO"):30
-	 Quit:'$T
-	 ; Sorteren volgens tijstip en klant
-	 Set ORDNr=""
-	 For {
-		 Set ORDNr=$O(^ORDW("AUTO",ORDNr))
-		 Quit:ORDNr=""
-		 Set KLNr=$P($G(^KO1(ORDNr,"F")),"\")
-		 If 'KLNr Kill ^ORDW("AUTO",ORDNr) Continue
-		 Set KlKey=^KK1(KLNr)
-		 If '$D(^KOD(KLNr,"F",ORDNr)) Kill ^ORDW("AUTO",ORDNr)
-		 If '##class(BL.Legacy.EWORDS6).CheckAutoSend(ORDNr) Kill ^ORDW("AUTO",ORDNr)
-		 Continue:'$D(^ORDW("AUTO",ORDNr))  ; Het order is ondertussen reeds doorgestuurd
-		 Set Aangemaakt=^ORDW("AUTO",ORDNr),AanmaakDatum=$P(Aangemaakt,","),AanmaakTijdstip=$P(Aangemaakt,",",2)
-		 Set:$$DIFFTIME^vhLib.DataTypes(Aangemaakt,$H)>0 ORDNrs(AanmaakDatum,AanmaakTijdstip,KlKey,ORDNr)=""
-	 }
-	 Set AanmaakDatum=""
-	 For {
-		 Set AanmaakDatum=$O(ORDNrs(AanmaakDatum))
-		 Quit:AanmaakDatum=""
-		 Set AanmaakTijdstip=""
-		 For {
-			 Set AanmaakTijdstip=$O(ORDNrs(AanmaakDatum,AanmaakTijdstip))
-			 Quit:AanmaakTijdstip=""
-			 Set KlKey=""
-			 For  {
-				 Set KlKey=$O(ORDNrs(AanmaakDatum,AanmaakTijdstip,KlKey))
-				 Quit:KlKey=""
-				 Set ORDNr=""
-				 For {
-					 Set ORDNr=$O(ORDNrs(AanmaakDatum,AanmaakTijdstip,KlKey,ORDNr))
-					 Quit:ORDNr=""
-					 Continue:'$D(^ORDW("AUTO",ORDNr)) ; Het order is samen met andere orders gecumuleerd verwerkt
-					 Do SendWMS(ORDNr)
-				 }
-			 }
-		 }
-	 }
+	Lock +^ORDW("AUTO"):30
+	Quit:'$T
+	; Sorteren volgens tijstip en klant
+	Set ORDNr=""
+	For {
+		Set ORDNr=$O(^ORDW("AUTO",ORDNr))
+		Quit:ORDNr=""
+		Set KLNr=$P($G(^KO1(ORDNr,"F")),"\")
+		If 'KLNr Kill ^ORDW("AUTO",ORDNr) Continue
+		Set KlKey=^KK1(KLNr)
+		If '$D(^KOD(KLNr,"F",ORDNr)) Kill ^ORDW("AUTO",ORDNr)
+		If '##class(BL.Legacy.EWORDS6).CheckAutoSend(ORDNr) Kill ^ORDW("AUTO",ORDNr)
+		Continue:'$D(^ORDW("AUTO",ORDNr))  ; Het order is ondertussen reeds doorgestuurd
+		Set Aangemaakt=^ORDW("AUTO",ORDNr),AanmaakDatum=$P(Aangemaakt,","),AanmaakTijdstip=$P(Aangemaakt,",",2)
+		Set:$$DIFFTIME^vhLib.DataTypes(Aangemaakt,$H)>0 ORDNrs(AanmaakDatum,AanmaakTijdstip,KlKey,ORDNr)=""
+	}
+	Set AanmaakDatum=""
+	For {
+		Set AanmaakDatum=$O(ORDNrs(AanmaakDatum))
+		Quit:AanmaakDatum=""
+		Set AanmaakTijdstip=""
+		For {
+			Set AanmaakTijdstip=$O(ORDNrs(AanmaakDatum,AanmaakTijdstip))
+			Quit:AanmaakTijdstip=""
+			Set KlKey=""
+			For {
+				Set KlKey=$O(ORDNrs(AanmaakDatum,AanmaakTijdstip,KlKey))
+				Quit:KlKey=""
+				Set ORDNr=""
+				For {
+					Set ORDNr=$O(ORDNrs(AanmaakDatum,AanmaakTijdstip,KlKey,ORDNr))
+					Quit:ORDNr=""
+					Continue:'$D(^ORDW("AUTO",ORDNr)) ; Het order is samen met andere orders gecumuleerd verwerkt
+					If ( ##class(BL.Legacy.EWORDS6).CheckAutoSend(ORDNr)) { ; Een vorig order kan met de stock gaan lopen zijn.
+						Do SendWMS(ORDNr)
+					} Else {
+						K ^ORDW("AUTO",ORDNr)
+					}
+				}
+			}
+		}
+	}
  }
  Quit
  
Index: OBJTimpl/ConverteerNaarOBJT.cls.xml
===================================================================
diff -u -r67315 -r67493
--- OBJTimpl/ConverteerNaarOBJT.cls.xml	(.../ConverteerNaarOBJT.cls.xml)	(revision 67315)
+++ OBJTimpl/ConverteerNaarOBJT.cls.xml	(.../ConverteerNaarOBJT.cls.xml)	(revision 67493)
@@ -21,6 +21,38 @@
 ]]></Implementation>
 </Method>
 
+<Method name="SetDueOut">
+<Description>
+Do ##class(OBJTimpl.ConverteerNaarOBJT).%New().SetDueOut()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set Q="K",D="\",U=";"
+	Set CONSNr=$O(^ORDW("D",""))
+	While CONSNr'="" 
+	{ 
+		If $P(^ORDW("D",CONSNr),"\",20)="" 
+		{
+			;w ^ORDW("D",CONSNr),!
+			Set KLNr=$P(^ORDW("D",CONSNr),"\",1)
+			Set RefDate=+$P(^ORDW("D",CONSNr),"\",3)
+			Set ORDNr=$O(^ORDW("D",CONSNr,"D",""))
+			Do INITDOMVKP^FLOWORD2(KLNr,ORDNr,RefDate)
+			;w blLeveringsTermijn
+  			Set DueOutTime = blLeveringsTermijn.GetDueOutPickingTime()
+  			If DueOutTime'=$P($P(^ORDW("D",CONSNr),"\",3),",",2)
+  			{
+				w CONSNr," ",$P(^ORDW("D",CONSNr),"\",2)," : ",$zt(DueOutTime)," - ",$zt($P($P(^ORDW("D",CONSNr),"\",3),",",2))," OL:",$$ISORGAL^FLOW("O", ORDNr),!
+				r k
+				Quit:DueOutTime[","
+				Set $P(^ORDW("D",CONSNr),"\",3)=$P(RefDate,",")_","_DueOutTime
+				w ^ORDW("D",CONSNr),!
+  			}
+		}
+		Set CONSNr=$O(^ORDW("D",CONSNr))
+ }
+]]></Implementation>
+</Method>
+
 <Method name="DeleteORDW">
 <Description>
 Do ##class(OBJTimpl.ConverteerNaarOBJT).%New().DeleteORDW()</Description>
@@ -31,9 +63,9 @@
 	{ 
 		If $P(^ORDW("D",CONSNr),"\",20)'="" && ($P(^ORDW("D",CONSNr),"\",20)'="B") ; verstuurd
 		{
-			w ^ORDW("D",CONSNr),!
+			w ^ORDW("D",CONSNr),! 
 			r k
-			Do DELOBJ^EWORDST(CONSNr)
+			;Do DELOBJ^EWORDST(CONSNr)
 		}
 		Set CONSNr=$O(^ORDW("D",CONSNr))
  }
Index: APPS/MAG/enu/Magazijn.cls.xml
===================================================================
diff -u -r29059 -r67493
--- APPS/MAG/enu/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 29059)
+++ APPS/MAG/enu/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 67493)
@@ -8,11 +8,11 @@
 <Parameter name="VALUELIST">
 <Description>
 OPGELET : Value en Display list moeten in sync gehouden worden met APPS.MAG.UGLYPicking.enu.Magazijn</Description>
-<Default>;H;O;U;L;A;I;E</Default>
+<Default>;H;O;U;L;A;I;E;V</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;HALUX;ORGALUX;UGLY;LANG;TANDEM/AVENT;TAOR indeling;EWMS</Default>
+<Default>;HALUX;ORGALUX;UGLY;LANG;TANDEM/AVENT;TAOR indeling;EWMS;OBJT</Default>
 </Parameter>
 
 <Method name="EWMS">
@@ -65,6 +65,13 @@
 <Implementation><![CDATA[	Quit "I"
 ]]></Implementation>
 </Method>
+
+<Method name="Objective">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.enu.Magazijn</ReturnType>
+<Implementation><![CDATA[	Quit "V"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: OBJTimpl/PM/OBJTIdentLookupService.cls.xml
===================================================================
diff -u -r66896 -r67493
--- OBJTimpl/PM/OBJTIdentLookupService.cls.xml	(.../OBJTIdentLookupService.cls.xml)	(revision 66896)
+++ OBJTimpl/PM/OBJTIdentLookupService.cls.xml	(.../OBJTIdentLookupService.cls.xml)	(revision 67493)
@@ -98,7 +98,7 @@
 <FormalSpec>OBJTItemID:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	#dim ResultSet as TECH.ResultSet = ..OBJTIdentNrMappingRepository.GeefResultSet(OBJTItemID)
+	#dim ResultSet as TECH.ResultSet = ..OBJTIdentNrMappingRepository.GeefAdminItemIDs(OBJTItemID)
 	#dim ResultSetIterator as TECH.ResultSetIterator = ##class(TECH.ResultSetIterator).%New(ResultSet)
 	Quit ResultSetIterator
 ]]></Implementation>