Index: AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml
===================================================================
diff -u -r53245 -r70683
--- AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml	(.../BewegingOutbound.cls.xml)	(revision 53245)
+++ AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml	(.../BewegingOutbound.cls.xml)	(revision 70683)
@@ -46,6 +46,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="PicklijstNummer">
+<Type>%String</Type>
+</Property>
+
 <Property name="PickDatum">
 <Type>%String</Type>
 </Property>
@@ -142,6 +146,31 @@
 <Transient>1</Transient>
 </Property>
 
+<Property name="OBJTFase">
+<Type>OBJTimpl.CheckObjectiveFase</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Collie">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="EuroPallet">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="HalvePallet">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="BigPallet">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Langgoed">
+<Type>%Integer</Type>
+</Property>
+
 <Method name="CreatePicking">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>BasisData:AX.Uitgaand.MAG.impl.ExportOutbound,ComponentNVT:%String</FormalSpec>
@@ -168,6 +197,8 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do ..DefineLabels()
+	Set ..OBJTFase=##class(OBJTimpl.CheckObjectiveFase).%New()
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -192,7 +223,7 @@
 <Method name="IsOrgal">
 <Implementation><![CDATA[
 		Set MPRNr=$P(..BasisData.OLRec,"\",1)
-		Quit ($$AantalKinderen^PRBS(MPRNr)>0)&&($$ISORGAL^PRODUKT2(MPRNr)||$$IsOrgaluxOpMaat^PRODUKT2(MPRNr)||$$IsTaorCubicover^PRODUKT2(MPRNr))
+		Quit ($$AantalKinderen^PRBS(MPRNr)>0)&&($$ISORGAL^PRODUKT2(MPRNr)||$$IsOrgaluxOpMaat^PRODUKT2(MPRNr)||($$PRODGRP^PRODUKT(MPRNr)="TA.C"))
 ]]></Implementation>
 </Method>
 
@@ -214,7 +245,9 @@
 <Method name="VulinConsolidatie">
 <Implementation><![CDATA[
 	Set ..Klant=$P(..BasisData.CONSRec,"\")
-	Set ..LaadlijstNummer=..BasisData.CONSNr
+	Set JaarMaand = $$EXTDATE^vhLib.DataTypes(+$P(^ORDW("D",..BasisData.CONSNr),"\",18),"DM")
+	Set ..PicklijstNummer = $E($TR(JaarMaand,"-")_"9999",1,4)_..BasisData.CONSNr
+	Set ..LaadlijstNummer = ..PicklijstNummer
 	Set ..PickDatum=+$P(..BasisData.CONSRec,"\",19)
 	Set ..OrdernummerKlant=..BasisData.ORDNr
 ]]></Implementation>
@@ -223,9 +256,8 @@
 <Method name="VulinProduct">
 <Implementation><![CDATA[
 	Set ..Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New(..PRNr)
-	Set SOPRPRNr=..BasisData.SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr,1)
-	Set:SOPRPRNr="" SOPRPRNr=..PRNr
-	Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
+	Set OBJTLookupService=##class(OBJTimpl.PM.OBJTIdentLookupService).%New()
+	Set ..ItemId=OBJTLookupService.GeefOBJTIdentNr($$$ProductGet(..PRNr,$$$IdentNummer))
 	Set ..Omschrijving=..Product.Basis.KortTekst
 	Set ..UM="STK"
 	Set Dimensie=##class(AX.Uitgaand.MAG.dto.Dimensie).%New(..Product)
@@ -271,37 +303,40 @@
 	_"WHERE (product = ?) AND (i.loc_m<5)")
 
 	*/
+	
+	If $D(^KPR(..PRNr,0)) && '..OBJTFase.VoorraadSync(..PRNr, "VHBE")
+	{
+		If $D(^||LocatieCache(..PRNr)) { 
+			Set ResultLoc=^||LocatieCache(..PRNr) 
+		} Else {
+			Set PickLoc="",PalletInLoc="",PalletInAuto="",ResultLoc=""
 
-	If $D(^||LocatieCache(..PRNr)) { 
-		Set ResultLoc=^||LocatieCache(..PRNr) 
-	} Else {
-		Set PickLoc="",PalletInLoc="",PalletInAuto="",ResultLoc=""
+			Set result=##class(%ResultSet).%New("%DynamicQuery:SQL")
+			Set sc=result.Prepare("SELECT i.loc_id as LocId,t.loc_ispickbaar as IsPickbaar,loc_trans as LocTrans,l.loc_m as LocM"
+			_" FROM EWMS.Inventory i"
+			_" LEFT OUTER JOIN EWMS.Locations l on I.Loc_Id=L.Loc_ID"
+			_" LEFT OUTER JOIN EWMS.TransLoc t on t.loc_m=l.loc_M and t.loc_g=l.loc_g and t.loc_x=l.loc_x and t.loc_y=l.loc_y"
+			_" WHERE (product = ?) AND (i.loc_m<5)")
+			If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+			Set sc=result.Execute(..PRNr)
+			If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+			If result.Next(.sc) {
+				Set:result.Data("IsPickbaar") PickLoc=result.Data("LocTrans")
+				Set:result.Data("LocM")=1 PalletInAuto=1
+				Set:$LF(lbPallet,+result.Data("LocId"))&&(PalletInLoc="") PalletInLoc=result.Data("LocTrans")
+			}
+			If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
 
-		Set result=##class(%ResultSet).%New("%DynamicQuery:SQL")
-		Set sc=result.Prepare("SELECT i.loc_id as LocId,t.loc_ispickbaar as IsPickbaar,loc_trans as LocTrans,l.loc_m as LocM"
-		_" FROM EWMS.Inventory i"
-		_" LEFT OUTER JOIN EWMS.Locations l on I.Loc_Id=L.Loc_ID"
-		_" LEFT OUTER JOIN EWMS.TransLoc t on t.loc_m=l.loc_M and t.loc_g=l.loc_g and t.loc_x=l.loc_x and t.loc_y=l.loc_y"
-		_" WHERE (product = ?) AND (i.loc_m<5)")
-		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
-		Set sc=result.Execute(..PRNr)
-		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
-		If result.Next(.sc) {
-			Set:result.Data("IsPickbaar") PickLoc=result.Data("LocTrans")
-			Set:result.Data("LocM")=1 PalletInAuto=1
-			Set:$LF(lbPallet,+result.Data("LocId"))&&(PalletInLoc="") PalletInLoc=result.Data("LocTrans")
-		}
-		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
-
-		If PickLoc'="" { Set ResultLoc=PickLoc }
-		ElseIf PalletInAuto { Set ResultLoc="APM" }
-		Else { Set ResultLoc=PalletInLoc }
+			If PickLoc'="" { Set ResultLoc=PickLoc }
+			ElseIf PalletInAuto { Set ResultLoc="APM" }
+			Else { Set ResultLoc=PalletInLoc }
 		
-		If ResultLoc="",..Product.Basis.OpslagZone=1 Set ResultLoc="APM"
+			If ResultLoc="",..Product.Basis.OpslagZone=1 Set ResultLoc="APM"
 
-		Set ^||LocatieCache(..PRNr)=ResultLoc
+			Set ^||LocatieCache(..PRNr)=ResultLoc
+		}
 	}
-	Quit ResultLoc ;_" : "_$$ListToPieces^vhLib(lbPallet,";")
+	Quit $G(ResultLoc) ;_" : "_$$ListToPieces^vhLib(lbPallet,";")
 ]]></Implementation>
 </Method>
 
@@ -333,6 +368,7 @@
  Do ..SetLabel("LaadlijstNummer","K405","TXT")
  Do ..SetLabel("PickDatum","K407","DATE")
  Do ..SetLabel("Picklocatie","K408","TXT")
+ Do ..SetLabel("PicklijstNummer","K408b","TXT")
  Do ..SetLabel("OrdernummerKlant","K409","TXT")
  Do ..SetLabel("KitComponentNvt","K410","TXT")
  Do ..SetLabel("ItemId","K411","TXT")
@@ -346,6 +382,11 @@
  Do ..SetLabel("TotaalVerstuurdUM","K419")
  Do ..SetLabel("PalletSscc","K424","TXT")
  Do ..SetLabel("TypeDrager","K425","TXT")
+ Do ..SetLabel("Collie","K425a")
+ Do ..SetLabel("EuroPallet","K425b")
+ Do ..SetLabel("HalvePallet","K425c")
+ Do ..SetLabel("BigPallet","K425d")
+ Do ..SetLabel("Langgoed","K425e")
  Do ..SetLabel("Stroom","K428","TXT")
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml
===================================================================
diff -u -r65695 -r70683
--- AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml	(.../ExportProductMaster.cls.xml)	(revision 65695)
+++ AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml	(.../ExportProductMaster.cls.xml)	(revision 70683)
@@ -28,26 +28,26 @@
 <Type>%Date</Type>
 </Property>
 
-<Property name="SOPRConvertor">
-<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Property name="OBJTLookupService">
+<Type>OBJTimpl.PM.OBJTIdentLookupService</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="SOPRIterator">
+<Property name="OBJTIterator">
 <Type>TECH.ListbuildIterator</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>AantalMaanden=2,RefDatum:%Date</FormalSpec>
+<FormalSpec>AantalMaanden=3,RefDatum:%Date</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..RefDatum=$G(RefDatum,$$CALCDATE^vhLib.DataTypes($H,"M","FD"))
 
-	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..OBJTLookupService=##class(OBJTimpl.PM.OBJTIdentLookupService).%New()
 	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
 	Do ..BepaalMaanden()
 	Kill ^||LogFlowVerwerkteProducten
@@ -61,7 +61,7 @@
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Write @F11,@F1
-	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductBasis "_$TR($ZDT($H),"/:")_".txt","W","T")
+	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","VH Product masterdata "_$TR($ZDT($H),"/:")_".txt","W","T")
 	Use Dev
 	Do ..WriteHeader() Write !
 	Use 0
@@ -73,7 +73,7 @@
 	{
 		Set Count=Count+1
 		Set ..Product=..ProductIterator.Next()
-		Set ..SOPRIterator=..GeefSOPRIterator()
+		Set ..OBJTIterator=..GeefOBJTIterator()
 		Do ..MarkVerwerk()
 		Set px=..MaakProxy()
 		If px.OpnemenInExport ;&&(..Product.Basis.GenerischeRoutine?4.9N)
@@ -97,26 +97,26 @@
 
 <Method name="MarkVerwerk">
 <Implementation><![CDATA[
-	Do ..SOPRIterator.Reset()
-	While ..SOPRIterator.HasNext()
+	Do ..OBJTIterator.Reset()
+	While ..OBJTIterator.HasNext()
 	{
-		Set PRNr=..SOPRIterator.Next()
+		Set PRNr=..OBJTIterator.Next()
 		Set ^||LogFlowVerwerkteProducten(PRNr)=$$$PRGet($$$KortTekst)
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="GeefSOPRIterator">
+<Method name="GeefOBJTIterator">
 <Implementation><![CDATA[
-	Set PRNr=..Product.Basis.%Id()
-	Set it=..SOPRConvertor.GeefSOPRIterator(PRNr)
+	Set WMSITemId=..OBJTLookupService.GeefOBJTIdentNr(..Product.Basis.IdentNummer)
+	Set it=..OBJTLookupService.GeefAdminIdentNrs(WMSITemId)
 	Set lb=""
 	While it.HasNext()
 	{
-		Set PRNr=it.Next()
-		Set lb=lb_$LB(PRNr)
+		Set rs=it.Next() 
+		Set lb=lb_$LB(rs.Data("Product"))
 	}
-	If $LL(lb)=0 Set lb=$lb(PRNr)
+	If $LL(lb)=0 Set lb=$lb(..Product.Basis.%Id())
 	Quit ##class(TECH.ListbuildIterator).%New(lb)
 ]]></Implementation>
 </Method>
@@ -132,7 +132,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Merge Maanden=..VoorraadMaanden
-	Set px=##class(AX.Uitgaand.MAG.dto.Artikel).Create(..Product,..SOPRIterator)
+	Set px=##class(AX.Uitgaand.MAG.dto.Artikel).Create(..Product,..OBJTIterator)
 	;Do px.AanvullenMetVoorraad(.Maanden)
 	Do px.AanvullenMetTransacties(.Maanden,..RefDatum)
 	Quit px
Index: AX/Uitgaand/MAG/dto/BewegingProductie.cls.xml
===================================================================
diff -u -r53245 -r70683
--- AX/Uitgaand/MAG/dto/BewegingProductie.cls.xml	(.../BewegingProductie.cls.xml)	(revision 53245)
+++ AX/Uitgaand/MAG/dto/BewegingProductie.cls.xml	(.../BewegingProductie.cls.xml)	(revision 70683)
@@ -186,17 +186,17 @@
  Do ..SetLabel("Uur","K501","TIME")
  Do ..SetLabel("ProductieOrder","K502","TXT")
  Do ..SetLabel("BatchNrAanlevering","K503","TXT")
- Do ..SetLabel("VanPickLocatie","K504","TXT")
+ //Do ..SetLabel("VanPickLocatie","K504","TXT")
  Do ..SetLabel("NaarDropzone","K505.1","TXT")
- Do ..SetLabel("ProductieZone","K505.2","TXT")
- Do ..SetLabel("VerpakkingsType","K506","TXT")
- Do ..SetLabel("EindProducten","K507.1","TXT")
- Do ..SetLabel("AantalEindProducten","K507.2","TXT")
- Do ..SetLabel("AantalVerschillendeEindProducten","K507.3","TXT")
- Do ..SetLabel("ItemId","K508","TXT")
- Do ..SetLabel("Omschrijving","K509.1","TXT")
- Do ..SetLabel("LangTekst","K509.2","TXT")
- Do ..SetLabel("UM","K510","TXT")
+ Do ..SetLabel("ProductieZone","K515.2","TXT")
+ Do ..SetLabel("VerpakkingsType","K515","TXT")
+ Do ..SetLabel("EindProducten","K517.1","TXT")
+ Do ..SetLabel("AantalEindProducten","K517.2","TXT")
+ Do ..SetLabel("AantalVerschillendeEindProducten","K517.3","TXT")
+ Do ..SetLabel("ItemId","K506","TXT")
+ Do ..SetLabel("Omschrijving","K506.1","TXT")
+ Do ..SetLabel("LangTekst","K506.2","TXT")
+ Do ..SetLabel("UM","K509","TXT")
  Do ..SetLabel("AantalUM","K510","")
  Do ..SetLabel("Stroom","K511","")
 ]]></Implementation>
Index: AX/Uitgaand/MAG/impl/ExportProductieLPN.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportProductieLPN.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportProductieLPN.cls.xml	(revision 70683)
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportProductieLPN">
+<IncludeCode>BL.Derde.KlantSpecifiek,BL.Derde.LevSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="RefDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="ProductIterator">
+<Type>TECH.Iterator</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+</Property>
+
+<Property name="ORDNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="OLRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="lbSOL">
+<Type>%List</Type>
+</Property>
+
+<Property name="SubMagRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalKinderen">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Dimensie">
+<Type>AX.Uitgaand.MAG.dto.Dimensie</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="SubMagTabel">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AantalMaanden=12,RefDatum:%Date</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..RefDatum=$G(RefDatum,$$CALCDATE^vhLib.DataTypes($H,"M","FD"))
+	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportProductieLPN).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+   Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","VH Productie LPN"_$TR($ZDT($H),"/:")_".txt","W","T")
+   Use Dev
+   Write "Inventtransid	Korttekst	LPN	Qty",!
+   Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(..StartDatum)
+   Set ..ProductIterator=##class(ProductIterator).%New(Filter)
+   Set Count=0
+   Set Verwerkt=0
+   While ..ProductIterator.HasNext() ;&&(Verwerkt<100)
+   {
+      Set Count=Count+1
+      Set ..Product=..ProductIterator.Next()
+      If ..IsGeldigProduct()
+	  {
+      	Do ..WriteLPN()
+      	Set Verwerkt=Verwerkt+1
+	  }
+      If Count#100=0
+      {
+	    use 0
+        Set FP=2301 Write @F,@F1
+        Write " ",Verwerkt," / ",Count
+        use Dev
+      }
+
+   }
+
+   Do CLOSE^vhDEV(Dev)
+   Set FP=2301 Write @F,@F1
+   Write Verwerkt," / ",Count
+]]></Implementation>
+</Method>
+
+<Method name="WriteLPN">
+<Implementation><![CDATA[
+   Set PRNr=..Product.Basis.%Id()
+   Set HistIndex=$O(^PRHIST(PRNr,""))
+   While HistIndex'=""
+   {
+      Set HistRec=^PRHIST(PRNr,HistIndex)
+      Set Inventtransid=$P(HistRec,"\",19)
+      If ..IsGeldig(HistRec)
+      {
+          Set LPNIndex=$O(^PRHIST(PRNr,HistIndex,""))
+          While LPNIndex'=""
+   			{
+      			Set LPNRec=^PRHIST(PRNr,HistIndex,LPNIndex)
+      			Set LPN=$P(LPNRec,"\",1)
+      			Set QTY=$P(LPNRec,"\",2)
+      			
+			    Set LPNIndex=$O(^PRHIST(PRNr,HistIndex,LPNIndex))
+			    
+			    Write Inventtransid,*9,$$$PRGet($$$KortTekst),*9,LPN,*9,QTY,!
+   			}
+
+      }
+      Set HistIndex=$O(^PRHIST(PRNr,HistIndex))
+   }
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigBS">
+<FormalSpec>BSRec:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+   Quit:$P(BSRec,"\")'?4.9N 0
+   Quit:$P(BSRec,"\",2)'>0 0
+   Quit:$P(BSRec,"\",3)'="H" 0
+   Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+   Quit:(..Product.Prijs.Leverancier.%Id()'=$$$LevHalux) 0
+   Set PRNr=..Product.Basis.%Id()
+   ;Quit:$P($$GENTYP^HAD(PRNr),"\")'="LBX" 0
+   Set Key=$O(^PRHIST(PRNr,""),-1)
+   Quit:Key="" 0
+   Quit:+$P(^PRHIST(PRNr,Key),"\")<..StartDatum 0
+   Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldig">
+<FormalSpec>HistRec:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+   Set Magazijn=$P(HistRec,"\",5)
+   Set Actie=$P(HistRec,"\",4)
+   Set Datum=+$P(HistRec,"\",1)
+   Quit:(Actie'="I") 0
+   Quit:Datum'<..RefDatum 0
+   Quit:Datum<..StartDatum 0
+   Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefSOPRIterator">
+<Implementation><![CDATA[
+   Set PRNr=..Product.Basis.%Id()
+   Set it=..SOPRConvertor.GeefSOPRIterator(PRNr)
+   Set lb=""
+   While it.HasNext()
+   {
+                  Set PRNr=it.Next()
+                  Set lb=lb_$LB(PRNr)
+   }
+   If $LL(lb)=0 Set lb=$lb(PRNr)
+   Quit ##class(TECH.ListbuildIterator).%New(lb)
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<Implementation><![CDATA[	Do ##class(AX.Uitgaand.MAG.dto.BewegingProductie).%New().WriteHeader()
+]]></Implementation>
+</Method>
+
+<Method name="MaakProxy">
+<FormalSpec>Key1,Key2,Key3</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set px=##class(AX.Uitgaand.MAG.dto.BewegingProductie).Create(..SOPRConvertor,Key1,Key2,Key3)
+    Quit px
+]]></Implementation>
+</Method>
+
+<Method name="BuildSubMagTabel">
+<Implementation><![CDATA[
+               S ..SubMagTabel("ALHD") ="Div```8`ALU Hardoor``"
+               S ..SubMagTabel("BAN") ="Div```8`Banco``"
+               S ..SubMagTabel("CCYST")="Div```8`Slotstang op maat``S"
+               S ..SubMagTabel("CP") ="LosOnd`TBX`1`10`TBX onderdeel`O`1"
+               S ..SubMagTabel("EASYS")="Div```9`EasyScreen``"
+               S ..SubMagTabel("EL") ="Div```9`Verlichting``7"
+               S ..SubMagTabel("GLAS") ="LosOnd`TBX`1`12`Glas TBX`O`1"
+               S ..SubMagTabel("HOEHY")="Hoekkast```8`Hoekkast Hygena``2"
+               S ..SubMagTabel("HOEST")="Hoekkast```8`Hoekkast standaard``"
+               S ..SubMagTabel("LBCP") ="LosOnd`LBX`1`10`LBX Los onderdeel`L`1"
+               S ..SubMagTabel("LBFRE")="Zijkant`LBX``10`LBX Free`L`R"
+               S ..SubMagTabel("LBGLA")="Zijkant`LBX``10`LBX Glas`L`E"
+               S ..SubMagTabel("LBOND")="LosOnd`LBX`1`10`LBX Onderdelen`L`3"
+               S ..SubMagTabel("LBPM") ="Plaatmat.`LBX``12`LBX Plaatmateriaal`L`4"
+               S ..SubMagTabel("LBRWH")="RugWH`LBX``10`LBX Rugwandhouder`L`F"
+               S ..SubMagTabel("LBSR") ="RugS`LBX``10`LBX Stalen rug`L`5"
+               S ..SubMagTabel("LBVST")="Voormontage`LBX``8`LBX Voorstukken`L`9"
+               S ..SubMagTabel("LBZIJ")="Zijkant`LBX``10`LBX Zijkanten GVP`L`C"
+               S ..SubMagTabel("LBZIN")="Zijkant`LBX``10`LBX Zijkanten GVP IN`L`C"
+               S ..SubMagTabel("LBZKV")="Zijkant`LBX``10`LBX Zijkanten KVP`L`8"
+               S ..SubMagTabel("LBZOG")="Zijkant`LBX``10`LBX Zijkanten GVP OG`L`C"
+               S ..SubMagTabel("LBZPS")="Zijkant`LBX``10`LBX Zijkanten GVP PS-M`L`C"
+               S ..SubMagTabel("LBZSW")="Zijkant`LBX``10`LBX Zijkanten GVP SW`L`C"
+               S ..SubMagTabel("LBZTS")="Zijkant`LBX``10`LBX Zijkanten GVP TS`L`C"
+               S ..SubMagTabel("M") ="Div```8`Montage`M"
+               S ..SubMagTabel("MAT") ="Voormontage matten`Matten``9`Matten`O`G"
+               S ..SubMagTabel("MONDO")="Div```9`Mondo``2"
+               S ..SubMagTabel("O") ="Div```8`Onderdeel-Verpak`O"
+               S ..SubMagTabel("OI") ="LosOnd`TBX`1`10`TBX Onderdelen INTIVO`O`3"
+               S ..SubMagTabel("OIB") ="LosOnd`TBX`1`10`TBX Onderdelen BOXCAP`O`3"
+               S ..SubMagTabel("OP") ="LosOnd`TBX`1`10`TBX Onderdelen Plus`O`3"
+               S ..SubMagTabel("ORELA")="LosOnd`TBX`1`10`TBX Reling Antaro`O`3"
+               S ..SubMagTabel("P") ="Div```8`Pro`P"
+               S ..SubMagTabel("PDE") ="Plaatmat.`TBX``12`TBX Plaatmat. Unilin``4"
+               S ..SubMagTabel("PHULP")="Div````Productie hulpmiddelen``"
+               S ..SubMagTabel("PHY") ="Div```9`Hoekkast Plaatmat. Hygena``2"
+               S ..SubMagTabel("PM") ="Plaatmat.```12`Plaatmateriaal``4"
+               S ..SubMagTabel("PRF") ="ALU```9`Profielen``4"
+               S ..SubMagTabel("PSA") ="Plaatmat.`TBX``12`TBX Plaatmat. Stylin'Art``4"
+               S ..SubMagTabel("RWH") ="RugWH`TBX``10`TBX Rugwandhouder`Z`5"
+               S ..SubMagTabel("SCR") ="Montage```10`Schroeven`O`5"
+               S ..SubMagTabel("SPSY") ="Spoelbak```10`TBX Onderdelen spoelbak`Z`6"
+               S ..SubMagTabel("SRUG") ="RugS`TBX``10`TBX Stalen rug`Z`5"
+               S ..SubMagTabel("TAFIM")="Plaatmat.`TAX``12`TA'OR Plaatmat. Decospan``"
+               S ..SubMagTabel("TAOND")="LosOnd`TAX`1`10`TA'OR Onderdelen``"
+               S ..SubMagTabel("TAPEG")="Plaatmat.`TAX``12`TA'OR Plaatmat. Egger``"
+               S ..SubMagTabel("TAZEI")="Plaatmat.`TAX``12`TA'OR Zijkanten Eik``"
+               S ..SubMagTabel("TAZNO")="Plaatmat.`TAX``12`TA'OR Zijkanten Noten``"
+               S ..SubMagTabel("TAZZE")="Plaatmat.`TAX``12`TA'OR Zijkanten Zwart eik``"
+               S ..SubMagTabel("TIPON")="LosOnd`TBX``10`TBX Tip-on`Z`6"
+               S ..SubMagTabel("VPK") ="Verpakking```12`Verpakking``Z"
+               S ..SubMagTabel("VRSTK")="Voormontage`TBX``8`TBX Voorstukken`O`9"
+               S ..SubMagTabel("X") ="Div```12`Algemeen``9"
+               S ..SubMagTabel("Z") ="Plaatmat```12`Zaag`Z"
+               S ..SubMagTabel("ZK") ="Zijkant`TBX``10`TBX Zijkanten`M`C"
+               S ..SubMagTabel("ZKGVM")="Zijkant`TBX``10`TBX Zijkanten GVP M`M`C"
+               S ..SubMagTabel("ZKGVP")="Zijkant`TBX``10`TBX Zijkanten GVP andere`M`C"
+               S ..SubMagTabel("ZKKVP")="Zijkant`TBX``10`TBX Zijkanten KVP`M`8"
+               S ..SubMagTabel("MVRWH")="RugWH`MVX``10`MVX Rugwandhouders GVP M`M`C"
+               S ..SubMagTabel("MVZOG")="Zijkant`MVX``10`MVX Zijkanten GVP OG`M`C"
+               S ..SubMagTabel("MVSR")="RugS`MVX``10`MVX Stalenrug KVP`M`8"
+               S ..SubMagTabel("MVVST")="Voormontage`MVX``8`MBX Zijkanten KVP`M`8"
+               S ..SubMagTabel("MVZIG")="Zijkant`MVX``10`MBX Zijkanten GVP IG`M`8"
+               S ..SubMagTabel("MVOND")="LosOnd`MVX``10`MBX Zijkanten KVP`M`8"
+               S ..SubMagTabel("MVCP")="LosOnd`MVX``10`MBX Corpusprofielen KVP`M`8"
+               S ..SubMagTabel("MVGLA")="LosOnd`MVX``10`MBX Glas`M`8"
+               S ..SubMagTabel("MVPM")="Plaatmat.`MVX``12`MVX Plaatmat. Stylin'Art``4"
+               S ..SubMagTabel("MVZIJ")="Zijkant`MVX``10`MVX Corpusprofielen GVP andere`M`8"
+               S ..SubMagTabel("MVZKV")="Zijkant`MVX``10`MVX Corpusprofielen KVP`M`8"
+               S ..SubMagTabel("MVZSW")="Zijkant`MVX``10`MVX Zijkanten GVP SW`M`8"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ExportProductie.cls.xml
===================================================================
diff -u -r69291 -r70683
--- AX/Uitgaand/MAG/impl/ExportProductie.cls.xml	(.../ExportProductie.cls.xml)	(revision 69291)
+++ AX/Uitgaand/MAG/impl/ExportProductie.cls.xml	(.../ExportProductie.cls.xml)	(revision 70683)
@@ -55,14 +55,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>AantalMaanden=2</FormalSpec>
+<FormalSpec>AantalMaanden=2,RefDatum:%Date</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..RefDatum=$G(RefDatum,$$CALCDATE^vhLib.DataTypes($H,"M","FD"))
 	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
-	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
 	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
 	Kill ^||Cache
 	Do ..BuildSubMagTabel()
@@ -196,8 +196,8 @@
 <Implementation><![CDATA[
 	Set GenTyp=$P($$GENTYP^HAD(..Product.Basis.%Id()),"\")
 	If ";KAD;GLA;PRF;"[(";"_GenTyp_";") Set GenTyp="KAD"
-	If ";TBX;LBX;"[(";"_GenTyp_";") Set GenTyp="TBX/LBX"
-	If ";KAD;TBX/LBX;TAO;TAX;"'[(";"_GenTyp_";") Set GenTyp="DIV"
+	If ";TBX;LBX;MVX;"[(";"_GenTyp_";") Set GenTyp="TBX/LBX/MVX-"_GenTyp
+	If ";KAD;TBX/LBX/MVX;TAO;TAX;"'[(";"_$P(GenTyp,"-")_";") Set GenTyp="DIV"
 	Quit GenTyp
 ]]></Implementation>
 </Method>
@@ -216,7 +216,10 @@
 	Quit:$$$PRGet($$$IdentNummer)="9.061.808.9" "RugWH`TBX``10"
 	Set SubMag=$$$PRGet($$$WerkvloerSubMag)
 	Quit:SubMag="" "Div```8"
-	Set SubMagRec=$G(..SubMagTabel(SubMag))
+	Quit:(SubMag="TAOND")&&($E($$$PRGet($$$KortTekst),1,2)="76") "Corpusprofiel`TAX`1`10`TAX Corpusprofielen`L`1"
+	Quit:((SubMag="CP")||(SubMag="LBCP"))&&(($E($$$PRGet($$$KortTekst),1,2)="57")) "Corpusprofiel`TBX`1`10`TBX Corpusprofielen`L`1"
+	Quit:((SubMag="CP")||(SubMag="LBCP"))&&(($E($$$PRGet($$$KortTekst),1,2)="76")||($E($$$PRGet($$$KortTekst),1,2)="75")) "Corpusprofiel`LBX`1`10`LBX Corpusprofielen`L`1"
+	Set SubMagRec=$G(..SubMagTabel(SubMag),"?"_SubMag_"`?`?`8")
 	Quit:SubMagRec="" "Div```8"
 	Quit SubMagRec
 ]]></Implementation>
@@ -299,19 +302,19 @@
                S ..SubMagTabel("ALHD") ="Div```8`ALU Hardoor``"
                S ..SubMagTabel("BAN") ="Div```8`Banco``"
                S ..SubMagTabel("CCYST")="Div```8`Slotstang op maat``S"
-               S ..SubMagTabel("CP") ="LosOnd`TBX`1`10`TBX Corpusprofielen`O`1"
+               S ..SubMagTabel("CP") ="LosOnd`TBX`1`10`TBX onderdeel`O`1"
                S ..SubMagTabel("EASYS")="Div```9`EasyScreen``"
                S ..SubMagTabel("EL") ="Div```9`Verlichting``7"
                S ..SubMagTabel("GLAS") ="LosOnd`TBX`1`12`Glas TBX`O`1"
                S ..SubMagTabel("HOEHY")="Hoekkast```8`Hoekkast Hygena``2"
                S ..SubMagTabel("HOEST")="Hoekkast```8`Hoekkast standaard``"
-               S ..SubMagTabel("LBCP") ="LosOnd`LBX`1`10`LBX Corpusprofielen`L`1"
+               S ..SubMagTabel("LBCP") ="LosOnd`LBX`1`10`LBX Los onderdeel`L`1"
                S ..SubMagTabel("LBFRE")="Zijkant`LBX``10`LBX Free`L`R"
                S ..SubMagTabel("LBGLA")="Zijkant`LBX``10`LBX Glas`L`E"
                S ..SubMagTabel("LBOND")="LosOnd`LBX`1`10`LBX Onderdelen`L`3"
                S ..SubMagTabel("LBPM") ="Plaatmat.`LBX``12`LBX Plaatmateriaal`L`4"
                S ..SubMagTabel("LBRWH")="RugWH`LBX``10`LBX Rugwandhouder`L`F"
-               S ..SubMagTabel("LBSR") ="RugWH`LBX``10`LBX Stalen rug`L`5"
+               S ..SubMagTabel("LBSR") ="RugS`LBX``10`LBX Stalen rug`L`5"
                S ..SubMagTabel("LBVST")="Voormontage`LBX``8`LBX Voorstukken`L`9"
                S ..SubMagTabel("LBZIJ")="Zijkant`LBX``10`LBX Zijkanten GVP`L`C"
                S ..SubMagTabel("LBZIN")="Zijkant`LBX``10`LBX Zijkanten GVP IN`L`C"
@@ -338,7 +341,7 @@
                S ..SubMagTabel("RWH") ="RugWH`TBX``10`TBX Rugwandhouder`Z`5"
                S ..SubMagTabel("SCR") ="Montage```10`Schroeven`O`5"
                S ..SubMagTabel("SPSY") ="Spoelbak```10`TBX Onderdelen spoelbak`Z`6"
-               S ..SubMagTabel("SRUG") ="RugWH`TBX``10`TBX Stalen rug`Z`5"
+               S ..SubMagTabel("SRUG") ="RugS`TBX``10`TBX Stalen rug`Z`5"
                S ..SubMagTabel("TAFIM")="Plaatmat.`TAX``12`TA'OR Plaatmat. Decospan``"
                S ..SubMagTabel("TAOND")="LosOnd`TAX`1`10`TA'OR Onderdelen``"
                S ..SubMagTabel("TAPEG")="Plaatmat.`TAX``12`TA'OR Plaatmat. Egger``"
@@ -354,12 +357,18 @@
                S ..SubMagTabel("ZKGVM")="Zijkant`TBX``10`TBX Zijkanten GVP M`M`C"
                S ..SubMagTabel("ZKGVP")="Zijkant`TBX``10`TBX Zijkanten GVP andere`M`C"
                S ..SubMagTabel("ZKKVP")="Zijkant`TBX``10`TBX Zijkanten KVP`M`8"
-               S ..SubMagTabel("MVRWH")="RugWH`MVX``10`MVX Zijkanten GVP M`M`C"
-               S ..SubMagTabel("MVZOG")="Zijkant`MVX``10`MVX Zijkanten GVP andere`M`C"
-               S ..SubMagTabel("MVSR")="RugS`MVX``10`MVX Zijkanten KVP`M`8"
-               S ..SubMagTabel("MVVST")="Vpprmontage`MVX``10`MBX Zijkanten KVP`M`8"
-               S ..SubMagTabel("MVZIG")="Zijkant`MVX``10`MBX Zijkanten KVP`M`8"
+               S ..SubMagTabel("MVRWH")="RugWH`MVX``10`MVX Rugwandhouders GVP M`M`C"
+               S ..SubMagTabel("MVZOG")="Zijkant`MVX``10`MVX Zijkanten GVP OG`M`C"
+               S ..SubMagTabel("MVSR")="RugS`MVX``10`MVX Stalenrug KVP`M`8"
+               S ..SubMagTabel("MVVST")="Voormontage`MVX``8`MBX Zijkanten KVP`M`8"
+               S ..SubMagTabel("MVZIG")="Zijkant`MVX``10`MBX Zijkanten GVP IG`M`8"
                S ..SubMagTabel("MVOND")="LosOnd`MVX``10`MBX Zijkanten KVP`M`8"
+               S ..SubMagTabel("MVCP")="LosOnd`MVX``10`MBX Corpusprofielen KVP`M`8"
+               S ..SubMagTabel("MVGLA")="LosOnd`MVX``10`MBX Glas`M`8"
+               S ..SubMagTabel("MVPM")="Plaatmat.`MVX``12`MVX Plaatmat. Stylin'Art``4"
+               S ..SubMagTabel("MVZIJ")="Zijkant`MVX``10`MVX Corpusprofielen GVP andere`M`8"
+               S ..SubMagTabel("MVZKV")="Zijkant`MVX``10`MVX Corpusprofielen KVP`M`8"
+               S ..SubMagTabel("MVZSW")="Zijkant`MVX``10`MVX Zijkanten GVP SW`M`8"
 ]]></Implementation>
 </Method>
 </Class>
Index: AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml
===================================================================
diff -u -r63276 -r70683
--- AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml	(.../ExportOutbound.cls.xml)	(revision 63276)
+++ AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml	(.../ExportOutbound.cls.xml)	(revision 70683)
@@ -41,14 +41,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>AantalMaanden=2</FormalSpec>
+<FormalSpec>AantalMaanden=3,RefDatum:%Date</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..RefDatum=$G(RefDatum,$$CALCDATE^vhLib.DataTypes($H,"M","FD"))
 	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
-	Set ..RefDatum=+$H ;$$INTDATE^vhLib.DataTypes("01/10/2018")
 	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
 	Kill ^||LocatieCache
 	Quit $$$OK
@@ -113,7 +113,7 @@
 					Do ..VerwerkPicking()
 				}
 				
-				If ..AantalKinderen>1 Do ..VerwerkMoeder()
+				If (..AantalKinderen>1) || ($$ISORGAL^PRODUKT2($P(..OLRec,"\"))||$$IsOrgaluxOpMaat^PRODUKT2($P(..OLRec,"\"))||($$PRODGRP^PRODUKT($P(..OLRec,"\"))="TA.C")) Do ..VerwerkMoeder()
 			}
 			Set OLUNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr))
 		}
@@ -124,13 +124,14 @@
 
 <Method name="VerwerkPicking">
 <Implementation><![CDATA[
-	If ..AantalKinderen > 1
+	If (..AantalKinderen > 1) || ($$ISORGAL^PRODUKT2($P(..OLRec,"\"))||$$IsOrgaluxOpMaat^PRODUKT2($P(..OLRec,"\"))||($$PRODGRP^PRODUKT($P(..OLRec,"\"))="TA.C"))
 	{
 			Set ComponentNVT="Component"
 	}
 	Else 
 	{
 		Set ComponentNVT="NVT"
+		Set:($$$ProductGet($P(..OLRec,"\"),$$$LeveranciersNr)=$$$LevHalux)&&($$$ProductGet($P(..OLRec,"\"),$$$StockType)'=1) ComponentNVT="Maatwerk"
 	}
 	Set px=##class(AX.Uitgaand.MAG.dto.BewegingOutbound).CreatePicking(%this,ComponentNVT)
 	Do ..VulinTransport(px)
@@ -187,6 +188,7 @@
 		
 	Set px.ShipmentType=..VertaalShipment(Transporteur,VerzendWijze) ;_"("_VerzendWijze_")"
 	Set px.Transporteur=..VertaalTransporteur(Transporteur,VerzendWijze)
+	Set px.LaadlijstNummer=px.PickDatum_":"_VerzendWijze_":"_KLNr
 	
 	If TranspNr=""
 	{
@@ -197,7 +199,20 @@
 	{
 		Set px.ShippingDatum=$P(^TRANSP("D",TranspNr),"\",11)
 		Set px.ShipmentNumber=TranspNr
-		Set:$P(TranspIndex,";",2) px.LaadlijstNummer=$P(TranspIndex,";",2)
+
+		Set TranspGroepBon=$P(TranspIndex,";",2)
+		IF (TranspGroepBon?1"3"5N) && $D(^ORDW("D",TranspGroepBon))
+		{
+			Set JaarMaand = $$EXTDATE^vhLib.DataTypes(+$P(^ORDW("D",TranspGroepBon),"\",18),"DM")
+			Set px.LaadlijstNummer = $E($TR(JaarMaand,"-")_"9999",1,4)_TranspGroepBon
+		}
+		Set px.Collie=$G(^TRANSP("D",TranspNr,"D",TranspGroepBon,"Q","C"))
+		Set px.EuroPallet=$G(^TRANSP("D",TranspNr,"D",TranspGroepBon,"Q","E"))+$G(^TRANSP("D",TranspNr,"D",TranspGroepBon,"Q","W"))
+		Set:px.EuroPallet=0 px.EuroPallet=""
+		Set px.HalvePallet=$G(^TRANSP("D",TranspNr,"D",TranspGroepBon,"Q","P"))
+		Set px.BigPallet=$G(^TRANSP("D",TranspNr,"D",TranspGroepBon,"Q","B"))
+		Set px.Langgoed=$G(^TRANSP("D",TranspNr,"D",TranspGroepBon,"Q","L"))
+
 	}
 ]]></Implementation>
 </Method>
@@ -277,7 +292,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set CONSRec=^ORDW("D",..CONSNr)
-	;Quit:$P(^ORDW("D",..CONSNr),"\")=$$$KlantHalux 
+	;Quit:$P(CONSRec,"\")=$$$KlantHalux 0
 	Set PickDatum=+$P(^ORDW("D",..CONSNr),"\",19)
 	Quit:..RefDatum<PickDatum 0
 	Quit:..StartDatum>PickDatum 0
Index: AX/Uitgaand/MAG/impl/ExportIC.cls.xml
===================================================================
diff -u -r53245 -r70683
--- AX/Uitgaand/MAG/impl/ExportIC.cls.xml	(.../ExportIC.cls.xml)	(revision 53245)
+++ AX/Uitgaand/MAG/impl/ExportIC.cls.xml	(.../ExportIC.cls.xml)	(revision 70683)
@@ -71,15 +71,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>AantalMaand=2</FormalSpec>
+<FormalSpec>AantalMaanden=12,RefDatum:%Date</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..RefDatum=$G(RefDatum,$$CALCDATE^vhLib.DataTypes($H,"M","FD"))
 	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
-	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
-	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaand,"FD")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
 	Kill ^||LogFlowVerwerkteProducten
 	Kill ^||LocatieCache
 	Quit $$$OK
@@ -98,8 +98,8 @@
 	Use 0
 	Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(..StartDatum)
 	Set ..ProductIterator=##class(ProductIterator).%New(Filter)
-	Do ..VerwerkHist()
-	Do ..VerwerkCons()
+	Do ..VerwerkHist() ; Van HLX -> VH maatwerk
+	;Do ..VerwerkCons() ; Van VH -> HLX beslag
 	Do CLOSE^vhDEV(..Dev)
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/MAG/impl/ExportVoorraad.cls.xml
===================================================================
diff -u -r65695 -r70683
--- AX/Uitgaand/MAG/impl/ExportVoorraad.cls.xml	(.../ExportVoorraad.cls.xml)	(revision 65695)
+++ AX/Uitgaand/MAG/impl/ExportVoorraad.cls.xml	(.../ExportVoorraad.cls.xml)	(revision 70683)
@@ -16,6 +16,10 @@
 <Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
 </Property>
 
+<Property name="OBJTFase">
+<Type>OBJTimpl.CheckObjectiveFase</Type>
+</Property>
+
 <Property name="CONSNr">
 <Type>%String</Type>
 </Property>
@@ -50,8 +54,9 @@
 <Implementation><![CDATA[
 	Set ..RefDatum=$G(RefDatum,$$CALCDATE^vhLib.DataTypes($H,"M","FD"))
 	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..OBJTFase=##class(OBJTimpl.CheckObjectiveFase).%New()
 	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
-	Kill ^||Voorraad
+	Kill ^||Voorraad Set ^||Voorraad=0
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -73,11 +78,15 @@
 	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
 	While ResultSet.Next(.sc) 
 	{
-		Set Count=Count+1
-		Merge ^||Voorraad($I(^||Voorraad))=ResultSet.Data	
+		Set PRNr=$tr(ResultSet.Data("PRNr")," ")
+		If $D(^KPR(PRNr,0)) && '..OBJTFase.VoorraadSync(PRNr, "VHBE")
+		{
+			Set Count=Count+1
+			Merge ^||Voorraad($I(^||Voorraad))=ResultSet.Data	
+		}
 	}
 	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
-	
+	w "Count",Count,!
 	Write @F11,@F1
 	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductVoorraad "_$TR($ZDT($H),"/:")_".txt","W","T")
 	Use Dev
Index: AX/Uitgaand/MAG/impl/ExportAll.cls.xml
===================================================================
diff -u -r65695 -r70683
--- AX/Uitgaand/MAG/impl/ExportAll.cls.xml	(.../ExportAll.cls.xml)	(revision 65695)
+++ AX/Uitgaand/MAG/impl/ExportAll.cls.xml	(.../ExportAll.cls.xml)	(revision 70683)
@@ -21,21 +21,24 @@
 d ##class(AX.Uitgaand.MAG.impl.ExportAll).%New().VerwerkAlle()</Description>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-	Set Periode =3
+	Set Periode=8
 	Set EindDatum =$$CALCDATE^vhLib.DataTypes($H,"M","FD")
 	
 	Write !,"Export MasterData"
-	;d ##class(AX.Uitgaand.MAG.impl.ExportProductMaster).%New(Periode,EindDatum).VerwerkAlle()
+	d ##class(AX.Uitgaand.MAG.impl.ExportProductMaster).%New(Periode,EindDatum).VerwerkAlle()
 	Write !,"Export Voorraad"
-	;d ##class(AX.Uitgaand.MAG.impl.ExportVoorraad).%New(Periode,EindDatum).VerwerkAlle()
+	d ##class(AX.Uitgaand.MAG.impl.ExportVoorraad).%New(Periode,EindDatum).VerwerkAlle()
+	
+	
+	
 	Write !,"Export TransportOut"
 	d ##class(AX.Uitgaand.MAG.impl.ExportTransportOut).%New(Periode,EindDatum).VerwerkAlle()
 	Write !,"Export Bijladen"
 	d ##class(AX.Uitgaand.MAG.impl.ExportBijladen).%New(Periode,EindDatum).VerwerkAlle()
 	Write !,"Export Outbound"
 	d ##class(AX.Uitgaand.MAG.impl.ExportOutbound).%New(Periode,EindDatum).VerwerkAlle()
-	Write !,"Export Inbound"
-	d ##class(AX.Uitgaand.MAG.impl.ExportInbound).%New(Periode,EindDatum).VerwerkAlle()
+	;Write !,"Export Inbound"
+	;d ##class(AX.Uitgaand.MAG.impl.ExportInbound).%New(Periode,EindDatum).VerwerkAlle()
 	Write !,"Export Productie"
 	d ##class(AX.Uitgaand.MAG.impl.ExportProductie).%New(Periode,EindDatum).VerwerkAlle()
 	Write !,"Export IC"
Index: AX/Uitgaand/MAG/dto/Artikel.cls.xml
===================================================================
diff -u -r54968 -r70683
--- AX/Uitgaand/MAG/dto/Artikel.cls.xml	(.../Artikel.cls.xml)	(revision 54968)
+++ AX/Uitgaand/MAG/dto/Artikel.cls.xml	(.../Artikel.cls.xml)	(revision 70683)
@@ -16,6 +16,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="WMSItemId">
+<Type>%String</Type>
+</Property>
+
 <Property name="Omschrijving">
 <Type>%String</Type>
 </Property>
@@ -24,7 +28,7 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="ProductStatus">
+<Property name="MaatwerkSetCompBeslag">
 <Type>%String</Type>
 </Property>
 
@@ -168,6 +172,14 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="Producteigenaar">
+<Type>%String</Type>
+</Property>
+
+<Property name="Merk">
+<Type>%String</Type>
+</Property>
+
 <Property name="AssortimentEC">
 <Type>%String</Type>
 </Property>
@@ -201,21 +213,25 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="AantalProducten">
+<Property name="AantalProductenAX">
 <Type>%String</Type>
 </Property>
 
+<Property name="Productielijn">
+<Type>%String</Type>
+</Property>
+
 <Property name="arTrans">
 <Type>ArtikelTransactiesPerMaand</Type>
 <Collection>array</Collection>
 </Property>
 
-<Property name="SOPRConvertor">
-<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Property name="OBJTLookupService">
+<Type>OBJTimpl.PM.OBJTIdentLookupService</Type>
 <Transient>1</Transient>
 </Property>
 
-<Property name="SOPRIterator">
+<Property name="OBJTIterator">
 <Type>TECH.Iterator</Type>
 <Transient>1</Transient>
 </Property>
@@ -234,14 +250,16 @@
 
 <Method name="Create">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,SOPRIterator:TECH.Iterator</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,OBJTIterator:TECH.Iterator</FormalSpec>
 <Implementation><![CDATA[
 	Set px=..%New()
 	Set px.Product=Product
 	Set px.PRNr=Product.Basis.ProductNr
-	Set px.SOPRIterator=SOPRIterator
-	Set px.SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set px.OBJTIterator=OBJTIterator
+	Set px.OBJTLookupService=##class(OBJTimpl.PM.OBJTIdentLookupService).%New()
 
+	;Set px.SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+
 	Do px.Vulin()
 	Quit px
 ]]></Implementation>
@@ -257,25 +275,25 @@
 
 <Method name="Vulin">
 <Implementation><![CDATA[
-		Set SOPRPRNr=..SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
-		Set:SOPRPRNr="" SOPRPRNr=..PRNr
-		Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
-
+		;Set SOPRPRNr=..SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+		;Set:SOPRPRNr="" SOPRPRNr=..PRNr
+		Set ..ItemId=..Product.Basis.IdentNummer
+		Set ..WMSItemId=..OBJTLookupService.GeefOBJTIdentNr(..Product.Basis.IdentNummer)
 		Set ..Omschrijving=$$$ProductGet(..PRNr, $$$KortTekst)
 		Set ..LangTekst=..Product.Tekst.GetOmschrijving("N",";")
 		Set ..ArtikelGroep=$E(..Product.Klassificatie.HoofdGroep,3,4)_"-"_$E(..Product.Klassificatie.Groep,7,9)
 		Set ..ArtikelHoofdGroepOms=$P(^KPHG1(..Product.Klassificatie.HoofdGroep),"\",1)
 		Set ..ArtikelGroepOms=$P(^KPGR1(..Product.Klassificatie.Groep),"\",1)
 		
-		Set ..ProductStatus="" ; achteraf via transactie
+		Set ..MaatwerkSetCompBeslag="" ; achteraf via transactie
 		Set ..Unit="STK" ; achteraf via transactie
 
 		Do ..Verpakking()
 		Set ..Tracking="FIFO"
 		Set ..ABCPicking=..Product.Basis.ABCTransport
 		Set ..Leverancier=..Product.Prijs.Leverancier.Nummer_" "_$E(..Product.Prijs.Leverancier.Naam,1 ,10)
 		Set ..CifPPL=..Product.Prijs.CifPPL
-		Do ..FirstDayOfStock()
+		;Do ..FirstDayOfStock()
 		Do ..ECAssortiment()
 		Do ..Sourcing()
 		;Do ..Locatie()
@@ -298,10 +316,10 @@
 		Set Datum=$O(Maanden(Datum))		
 	}
 	
-	Do ..SOPRIterator.Reset()
-	While ..SOPRIterator.HasNext()
+	Do ..OBJTIterator.Reset()
+	While ..OBJTIterator.HasNext()
 	{
-		Set PRNr=..SOPRIterator.Next()
+		Set PRNr=..OBJTIterator.Next()
 		Set VolgNr=$O(^PRHIST(PRNr,""))
 		While VolgNr'=""
 		{
@@ -312,13 +330,14 @@
 				If '$D(Trans(Datum)) Set Datum=$O(Trans(Datum),-1)
 				If (Datum'="")
 				{
-					Do Trans(Datum).VoegToe(HistRec)
-					If Trans(Datum).OpnemenInExport Set ..OpnemenInExport=1 
+					;Do Trans(Datum).VoegToe(HistRec)
+					;If Trans(Datum).OpnemenInExport Set ..OpnemenInExport=1 
+					Set ..OpnemenInExport=1 
 				}
 			}
 			Set VolgNr=$O(^PRHIST(PRNr,VolgNr))
 		}
-		Set ..AantalProducten=..AantalProducten+1
+		Set ..AantalProductenAX=..AantalProductenAX+1
 	}
 ]]></Implementation>
 </Method>
@@ -332,10 +351,10 @@
 		Set Datum=$P(Maanden(Maand),"\",2)
 		If Datum
 		{ 	Set (StockVH,StockHLX)=0
-			Do ..SOPRIterator.Reset()
-			While ..SOPRIterator.HasNext()
+			Do ..OBJTIterator.Reset()
+			While ..OBJTIterator.HasNext()
 			{
-				Set PRNr=..SOPRIterator.Next()
+				Set PRNr=..OBJTIterator.Next()
 				
 				Set StockWaardeVH=##class(DW.StockWaarde).%OpenId("VH||"_Datum_"||"_PRNr)
 				If $IsObject(StockWaardeVH)
@@ -367,10 +386,10 @@
 <Method name="FirstDayOfStock">
 <Implementation><![CDATA[
 		Set Datum=""
-		Do ..SOPRIterator.Reset()
-		While ..SOPRIterator.HasNext()
+		Do ..OBJTIterator.Reset()
+		While ..OBJTIterator.HasNext()
 		{
-			Set PRNr=..SOPRIterator.Next()
+			Set PRNr=..OBJTIterator.Next()
 			Set VolgNr=$O(^PRHIST(PRNr,""))
 			If VolgNr
 			{
@@ -388,10 +407,10 @@
 <Method name="ECAssortiment">
 <Implementation><![CDATA[
 	Set ..AssortimentEC="Neen"
- 	Do ..SOPRIterator.Reset()
-	While ..SOPRIterator.HasNext()
+ 	Do ..OBJTIterator.Reset()
+	While ..OBJTIterator.HasNext()
 	{
-		Set PRNr=..SOPRIterator.Next()
+		Set PRNr=..OBJTIterator.Next()
 		Set GenerationID=$O(^AX.Uitgaan6850.BasisAssort150AD(""),-1)
 		Set:$D(^AX.Uitgaan6850.BasisAssort150AD(GenerationID,..PRNr,"0000000005")) ..AssortimentEC="Ja"
 	}
@@ -401,7 +420,7 @@
 <Method name="Locatie">
 <Implementation><![CDATA[
 	Set PRNr=..PRNr
-	Set KindPRNr=..SOPRConvertor.GeefSOPRKindInCache(PRNr)
+	;Set KindPRNr=..SOPRConvertor.GeefSOPRKindInCache(PRNr)
 	If KindPRNr Set PRNr=KindPRNr
 	
 	Set (LocM, Pickbaar, LocTrans)=""
@@ -439,26 +458,28 @@
 <Implementation><![CDATA[
 	Set (VHBE,HLX)=""
 	Set OwnerHLX=$E(..Product.Basis.LinkType,1,2)="HH"
+	Set ..Producteigenaar="VHBE"
 	Set StockVH=(..Product.Basis.StockNietStock=1)||(..Product.Basis.StockNietStock=2)
 	If OwnerHLX
 	{
 		Set HLX="BTS"
 		Set VHBE=""
-		Set ProductStatus="COMP"
+		Set MaatwerkSetCompBeslag="COMP"
+		Set ..Producteigenaar="HLX"
 	}
 	Else
 	{
 		If ..Product.Basis.LinkType="S"
 		{
 			Set VHBE="MTO"
 			Set HLX=""
-			Set ProductStatus="SET"
+			Set MaatwerkSetCompBeslag="SET"
 		}
 		ElseIf ..Product.Prijs.Leverancier.Nummer=$$$LevHalux
 		{
 			Set VHBE=$S(StockVH:"BTS-IC",1:"BTO-IC")
 			Set HLX="MTO-IC"
-			Set ProductStatus="MW"
+			Set MaatwerkSetCompBeslag="MW"
 		}
 		Else
 		{
@@ -469,11 +490,26 @@
 			{
 				Set HLX=$S($L(y):"BTS-IC",1:"BTO-IC")
 			}
-			Set ProductStatus="BSL"
+			Set MaatwerkSetCompBeslag="BSL"
 		}
 		
 	}
-	Set ..ProductStatus=ProductStatus
+	Set ..Productielijn=$P($$GENTYP^HAD(..PRNr),"\",1,2)
+	
+	Set ..Merk=$P(..Productielijn,"\")
+	
+	If ..Productielijn?1(1"TBX\SRD",1"TBX\SRD") { Set ..Productielijn="TLM L1"}
+	ElseIf ..Merk?1(1"LBX") { Set ..Productielijn="TLM L2of3"}
+	ElseIf ..Merk?1(1"TBX",1"MVX") { Set ..Productielijn="TLM L2of3"}
+	ElseIf ..Merk?1(1"TBX") { Set ..Productielijn="TLM L4"}
+	ElseIf ..Merk?1(1"TAO") { Set ..Productielijn="TAO"}
+	ElseIf ..Merk?1(1"KAD",1"PRF",1"GLA") { Set ..Productielijn="KAD",..Merk="KAD"} 
+	ElseIf ..Merk?1(1"RVG") { Set ..Productielijn="RVG"} 
+	Else {Set ..Productielijn="DIV"}
+	
+	
+	
+	Set ..MaatwerkSetCompBeslag=MaatwerkSetCompBeslag
 	Set ..SourcingVH=VHBE
 	Set ..SourcingHLX=HLX
 ]]></Implementation>
@@ -538,9 +574,10 @@
 <Method name="DefineLabels">
 <Implementation><![CDATA[
  Do ..SetLabel("ItemId", 100,"TXT")
+ Do ..SetLabel("WMSItemId", 101.0,"TXT")
  Do ..SetLabel("Omschrijving", 101.1,"TXT")
  Do ..SetLabel("LangTekst", 101.2,"TXT")
- Do ..SetLabel("ProductStatus", 102,"TXT")
+ Do ..SetLabel("MaatwerkSetCompBeslag", 134,"TXT")
  Do ..SetLabel("ArtikelGroep", 103.1,"TXT")
  Do ..SetLabel("ArtikelHoofdGroepOms", 103.2,"TXT")
  Do ..SetLabel("ArtikelGroepOms", 103.3,"TXT")
@@ -568,22 +605,25 @@
  Do ..SetLabel("BreedtePallet", 125)
  Do ..SetLabel("HoogtePallet", 126)
  Do ..SetLabel("GewichtPallet", 127)
- Do ..SetLabel("DieptePalletOverhang", 128)
- Do ..SetLabel("BreedtePalletOverhang", 129)
+ ;Do ..SetLabel("DieptePalletOverhang", 128)
+ ;Do ..SetLabel("BreedtePalletOverhang", 129)
  Do ..SetLabel("Tracking", 132)
  Do ..SetLabel("Leverancier", 138,"TXT")
  Do ..SetLabel("CifPPL", 139)
  Do ..SetLabel("SourcingVH", 140)
  Do ..SetLabel("SourcingHLX", 141)
- Do ..SetLabel("AssortimentEC", 160,"TXT")
+ Do ..SetLabel("Producteigenaar", 161)
+ Do ..SetLabel("Productielijn",151)
+ Do ..SetLabel("Merk",171)
+ ;Do ..SetLabel("AssortimentEC", 160,"TXT")
  ;Do ..SetLabel("FirstDateOfStock", 169,"DATE")
  ;Do ..SetLabel("ABCPicking", 170)
- ; Do ..SetLabel("BeginStock", 200, "DataType",13)
+ ;Do ..SetLabel("BeginStock", 200, "DataType",13)
  ;Do ..SetLabel("StockVH", 201.1)
  ;Do ..SetLabel("StockHLX", 201.2)
  ;Do ..SetLabel("DefaultMagazijn", 202,"TXT")
  ;Do ..SetLabel("TransLoc", 224,"TXT")
- ;Do ..SetLabel("AantalProducten", 998)
+ Do ..SetLabel("AantalProductenAX", 998)
  ;Do ..SetLabel("arTrans", 999, "AX.Uitgaand.MAG.dto.ArtikelTransactiesPerMaand",12)
 ]]></Implementation>
 </Method>
@@ -633,13 +673,13 @@
 	Set ArrayType=$LG(..ExportLabels(Key1,Key2))
 	If "TXT,DATE"[ArrayType
 	{
-		Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+		Write "K"_Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
 	}
 	Elseif "DataType"=ArrayType
 	{
 		For I=1:1:$LG(..ExportLabels(Key1,Key2),2)
 		{
-			Write Key1,".",I,":",Key2,*9
+			Write "K"_Key1,".",I,":",Key2,*9
 		}
 	}
 	Else  ; Object