Index: APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml
===================================================================
diff -u -r56379 -r57640
--- APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 56379)
+++ APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 57640)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TbxMatCodeConverter">
+<Type>APPS.EDI.common.impl.LegacyConverter.TbxMatCodeConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="LadeType">
 <Type>%String</Type>
 <Private>1</Private>
@@ -35,6 +40,8 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ObjectConverter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
+	Set ..TbxMatCodeConverter = ##class(APPS.EDI.common.impl.LegacyConverter.TbxMatCodeConverter).%New()
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -55,7 +62,7 @@
 	Do ..ConvertInschuifElement(Product,TBXProduct)
 	Do ..ConvertCorpusWandDikte(Product,TBXProduct)
 	Do ..ConvertLadeType(Product,TBXProduct)
-	Do ..ConvertMat(Product,TBXProduct)
+	Do ..TbxMatCodeConverter.ConverteerLegacyMatCodeNaarEdi(Product,TBXProduct)
 	Do ..ConvertGreepEnMeenemer(Product,TBXProduct)
 	Do ..ConvertVerlaagdeRug(Product,TBXProduct)
 	Do ..ConvertUitsparingen(Product,TBXProduct)
@@ -213,38 +220,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ConvertMat">
-<FormalSpec><![CDATA[Product:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy,&TBXProduct:APPS.EDI.common.dto.v001.LadeTBX]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.ItemASM = "Z" {
-		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).ZwartAntislip() 
-		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).Antislip()
-		Set TBXProduct.HeeftMat = $$$True	
-	} ElseIf Product.ItemASM = "ZW.AF" {
-		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberZwart() 
-		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
-		Set TBXProduct.HeeftMat = $$$True	
-	} ElseIf Product.ItemASM = "WI.AF" {
-		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit() 
-		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
-		Set TBXProduct.HeeftMat = $$$True	
-	} ElseIf Product.ItemASM = "AN.AF" {
-		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet() 
-		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
-		Set TBXProduct.HeeftMat = $$$True	
-	} ElseIf Product.ItemASM = "G" {
-		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).Antraciet() 
-		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).Antislip()
-		Set TBXProduct.HeeftMat = $$$True	
-	} ElseIf Product.ItemASM = "" {
-		Set TBXProduct.MatKleur = ""
-		Set TBXProduct.MatMateriaal = ""
-		Set TBXProduct.HeeftMat = $$$False	
-	}
-]]></Implementation>
-</Method>
-
 <Method name="ConvertGreepEnMeenemer">
 <FormalSpec><![CDATA[Product:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy,&TBXProduct:APPS.EDI.common.dto.v001.LadeTBX]]></FormalSpec>
 <Private>1</Private>
Index: APPS/EDI/common/impl/LegacyConverter/TbxMatCodeConverter.cls.xml
===================================================================
diff -u
--- APPS/EDI/common/impl/LegacyConverter/TbxMatCodeConverter.cls.xml	(revision 0)
+++ APPS/EDI/common/impl/LegacyConverter/TbxMatCodeConverter.cls.xml	(revision 57640)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.common.impl.LegacyConverter.TbxMatCodeConverter">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="ConverteerLegacyMatCodeNaarEdi">
+<FormalSpec>Product:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy,TBXProduct:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
+<Implementation><![CDATA[
+	#dim LegacyMatCode As %String = Product.ItemASM
+	If LegacyMatCode = "Z" {
+		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).ZwartAntislip() 
+		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).Antislip()
+		Set TBXProduct.HeeftMat = $$$True	
+	} ElseIf LegacyMatCode = "ZW.AF" {
+		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberZwart() 
+		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
+		Set TBXProduct.HeeftMat = $$$True	
+	} ElseIf LegacyMatCode = "WI.AF" {
+		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit() 
+		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
+		Set TBXProduct.HeeftMat = $$$True	
+	} ElseIf LegacyMatCode = "AN.AF" {
+		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet() 
+		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
+		Set TBXProduct.HeeftMat = $$$True	
+	} ElseIf LegacyMatCode = "G" {
+		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).Antraciet() 
+		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).Antislip()
+		Set TBXProduct.HeeftMat = $$$True	
+	} ElseIf LegacyMatCode = "" {
+		Set TBXProduct.MatKleur = ""
+		Set TBXProduct.MatMateriaal = ""
+		Set TBXProduct.HeeftMat = $$$False	
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerEdiNaarLegacyMatCode">
+<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX,TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy</FormalSpec>
+<Implementation><![CDATA[	Set TBXProduct.ItemASM = ..GeefLegacyMatCode(Product)
+]]></Implementation>
+</Method>
+
+<Method name="GeefLegacyMatCode">
+<FormalSpec>Product:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LegacyMatCode As %String = ""
+	If Product.HeeftMat {
+		If Product.MatKleur = ##class(DOM.PM.enu.MATKleur).ZwartAntislip() {		
+			Set LegacyMatCode = "Z"
+		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberZwart() {
+			Set LegacyMatCode = "ZW.AF"
+		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit() {
+			Set LegacyMatCode = "WI.AF"
+		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet() {
+			Set LegacyMatCode = "AN.AF"	
+		} Else {
+			Set LegacyMatCode = "G"
+		}
+	}
+	Quit LegacyMatCode
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/common/impl/LegacyConverter/EdiNaarLegacy.cls.xml
===================================================================
diff -u -r54422 -r57640
--- APPS/EDI/common/impl/LegacyConverter/EdiNaarLegacy.cls.xml	(.../EdiNaarLegacy.cls.xml)	(revision 54422)
+++ APPS/EDI/common/impl/LegacyConverter/EdiNaarLegacy.cls.xml	(.../EdiNaarLegacy.cls.xml)	(revision 57640)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TbxMatCodeConverter">
+<Type>APPS.EDI.common.impl.LegacyConverter.TbxMatCodeConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>TBXLadeCodeBepaler:APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler</FormalSpec>
 <Private>1</Private>
@@ -22,6 +27,8 @@
 <Implementation><![CDATA[
 	Set ..TBXLadeCodeBepaler  = $$$Inject(TBXLadeCodeBepaler,##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New())
 	Set ..ObjectConverter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
+	Set ..TbxMatCodeConverter = ##class(APPS.EDI.common.impl.LegacyConverter.TbxMatCodeConverter).%New()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -41,7 +48,7 @@
 	Do ..ConvertFrontOndersteuningAantal(Product,TBXProduct)
 	Do ..ConvertGreepEnMeenemer(Product,TBXProduct)
 	Do ..ConvertInschuifElement(Product,TBXProduct)
-	Do ..ConvertMat(Product,TBXProduct)
+	Do ..TbxMatCodeConverter.ConverteerEdiNaarLegacyMatCode(Product,TBXProduct)
 	Do ..ConvertLadeCodeKenmerken(Product,TBXProduct)
 	Do ..ConvertDwarsverdelingen(Product,TBXProduct)
 	Do ..ConvertFrontBevestiging(Product,TBXProduct)
@@ -151,28 +158,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ConvertMat">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.HeeftMat {
-		If Product.MatKleur = ##class(DOM.PM.enu.MATKleur).ZwartAntislip() {		
-			Set TBXProduct.ItemASM = "Z"
-		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberZwart() {
-			Set TBXProduct.ItemASM = "ZW.AF"
-		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit() {
-			Set TBXProduct.ItemASM = "WI.AF"
-		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet() {
-			Set TBXProduct.ItemASM = "AN.AF"	
-		} Else {
-			Set TBXProduct.ItemASM = "G"
-		}
-	} Else {
-		Set TBXProduct.ItemASM = ""
-	}
-]]></Implementation>
-</Method>
-
 <Method name="ConvertLadeCodeKenmerken">
 <FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
 <Private>1</Private>