Index: vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/dto/COASO.cls.xml
===================================================================
diff -u -r36800 -r36805
--- vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/dto/COASO.cls.xml	(.../COASO.cls.xml)	(revision 36800)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/dto/COASO.cls.xml	(.../COASO.cls.xml)	(revision 36805)
@@ -7,36 +7,13 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
 <Implementation><![CDATA[
-	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).%New()
+	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ..GeefCOASOMetHeader()
 	
-	Set COASO.COASOHeader.MIIDEF = "BAU16558"
-	Set COASO.COASOHeader.LEVNUR = "5005"
-	Set COASO.COASOHeader.MIINTY = "COA"
-	Set COASO.COASOHeader.MIINTS = "SO"
-	Set COASO.COASOHeader.MINETC = "C"
-	Set COASO.COASOHeader.MIOTCR = "17-06-16"
-	Set COASO.COASOHeader.MITICR = "2200"
-	Set COASO.COASOHeader.MICOUN ="1922"
-	Set COASO.COASOHeader.MINNCR = "BRANDL A."
-	Set COASO.COASOHeader.MINNRE = "ROOS"
-	Set COASO.COASOHeader.MIACRQ = "1"
-	Set COASO.COASOHeader.MESPRO = "1"
-	
-	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering).%New()
-	
-	Set Toelevering.ToeleveringHeader.InternalOrderNumberBLUM = "745532"
-	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = "151221"
-	Set Toelevering.ToeleveringHeader.CustomerNumberForShipment = "212250"
-	Set Toelevering.ToeleveringHeader.CustomerOrderReference = "277788"
-	Set Toelevering.ToeleveringHeader.CustomerNumberForInvoice = "212250"
-	Set Toelevering.ToeleveringHeader.ReasonCode = "G "
-	Set Toelevering.ToeleveringHeader.TransportationMode = "L "
-	Set Toelevering.ToeleveringHeader.CurrencyInCOScode = "W30"
-	Set Toelevering.ToeleveringHeader.AverageTransportTime = "000"
+	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ..GeefToeleveringMetHeader()
 
 	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
 	Set ToeleveringDetail.OrderQuantity = "500"
-	Set ToeleveringDetail.DeliveryDateAxBUA = "160106"
+	Set ToeleveringDetail.DeliveryDateAxBUA = "200106"
 	Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
 	Set ToeleveringDetail.GrossPrice = "0000000.00"
 	Set ToeleveringDetail.ReasonCode = "V"
@@ -49,7 +26,7 @@
 
 	Set ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
 	Set ToeleveringDetail.OrderQuantity = "1000"
-	Set ToeleveringDetail.DeliveryDateAxBUA = "160108"
+	Set ToeleveringDetail.DeliveryDateAxBUA = "200108"
 	Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
 	Set ToeleveringDetail.GrossPrice = "0000236.01"
 	Set ToeleveringDetail.ReasonCode = "V"
@@ -70,36 +47,13 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
 <Implementation><![CDATA[
-	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).%New()
+	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ..GeefCOASOMetHeader()
 	
-	Set COASO.COASOHeader.MIIDEF = "BAU16558"
-	Set COASO.COASOHeader.LEVNUR = "5005"
-	Set COASO.COASOHeader.MIINTY = "COA"
-	Set COASO.COASOHeader.MIINTS = "SO"
-	Set COASO.COASOHeader.MINETC = "C"
-	Set COASO.COASOHeader.MIOTCR = "17-06-16"
-	Set COASO.COASOHeader.MITICR = "2200"
-	Set COASO.COASOHeader.MICOUN ="1922"
-	Set COASO.COASOHeader.MINNCR = "BRANDL A."
-	Set COASO.COASOHeader.MINNRE = "ROOS"
-	Set COASO.COASOHeader.MIACRQ = "1"
-	Set COASO.COASOHeader.MESPRO = "1"
-	
-	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering).%New()
-	
-	Set Toelevering.ToeleveringHeader.InternalOrderNumberBLUM = "745532"
-	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = "151221"
-	Set Toelevering.ToeleveringHeader.CustomerNumberForShipment = "212250"
-	Set Toelevering.ToeleveringHeader.CustomerOrderReference = "277788"
-	Set Toelevering.ToeleveringHeader.CustomerNumberForInvoice = "212250"
-	Set Toelevering.ToeleveringHeader.ReasonCode = "G "
-	Set Toelevering.ToeleveringHeader.TransportationMode = "L "
-	Set Toelevering.ToeleveringHeader.CurrencyInCOScode = "W30"
-	Set Toelevering.ToeleveringHeader.AverageTransportTime = "000"
+	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ..GeefToeleveringMetHeader()
 
 	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
 	Set ToeleveringDetail.OrderQuantity = "300"
-	Set ToeleveringDetail.DeliveryDateAxBUA = "160106"
+	Set ToeleveringDetail.DeliveryDateAxBUA = "200106"
 	Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
 	Set ToeleveringDetail.GrossPrice = "0000000.00"
 	Set ToeleveringDetail.ReasonCode = "V"
@@ -112,7 +66,7 @@
 
 	Set ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
 	Set ToeleveringDetail.OrderQuantity = "700"
-	Set ToeleveringDetail.DeliveryDateAxBUA = "160108"
+	Set ToeleveringDetail.DeliveryDateAxBUA = "200108"
 	Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
 	Set ToeleveringDetail.GrossPrice = "0000236.01"
 	Set ToeleveringDetail.ReasonCode = "V"
@@ -133,21 +87,84 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
 <Implementation><![CDATA[
+	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ..GeefCOASOMetHeader()
+	
+	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ..GeefToeleveringMetHeader()
+
+	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
+	Set ToeleveringDetail.OrderQuantity = "500"
+	Set ToeleveringDetail.DeliveryDateAxBUA = "200106"
+	Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
+	Set ToeleveringDetail.GrossPrice = "0000000.00"
+	Set ToeleveringDetail.ReasonCode = "V"
+	Set ToeleveringDetail.PriceDimension = "2"
+	Set ToeleveringDetail.NetPrice = "0000016.01"
+	Set ToeleveringDetail.OrderLineIdentificationCustomer = "277788.01  "
+	Set ToeleveringDetail.IdentNumberSupplierBAU = "09002253"
+	Set ToeleveringDetail.DelDateCode = "2"
+	Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
+	
+	Do COASO.ToeleveringList.Insert(Toelevering)
+	
+	Quit COASO
+]]></Implementation>
+</Method>
+
+<Method name="GeefCOASOMetVervallenDatum">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
+<Implementation><![CDATA[
+	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ..GeefCOASOMetHeader()
+	
+	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ..GeefToeleveringMetHeader()
+
+	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
+	Set ToeleveringDetail.OrderQuantity = "500"
+	Set ToeleveringDetail.DeliveryDateAxBUA = "150106"
+	Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
+	Set ToeleveringDetail.GrossPrice = "0000000.00"
+	Set ToeleveringDetail.ReasonCode = "V"
+	Set ToeleveringDetail.PriceDimension = "2"
+	Set ToeleveringDetail.NetPrice = "0000016.01"
+	Set ToeleveringDetail.OrderLineIdentificationCustomer = "277788.01  "
+	Set ToeleveringDetail.IdentNumberSupplierBAU = "09002253"
+	Set ToeleveringDetail.DelDateCode = "2"
+	Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
+	
+	Do COASO.ToeleveringList.Insert(Toelevering)
+	
+	Quit COASO
+]]></Implementation>
+</Method>
+
+<Method name="GeefCOASOMetHeader">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
+<Implementation><![CDATA[
 	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).%New()
 	
 	Set COASO.COASOHeader.MIIDEF = "BAU16558"
 	Set COASO.COASOHeader.LEVNUR = "5005"
 	Set COASO.COASOHeader.MIINTY = "COA"
 	Set COASO.COASOHeader.MIINTS = "SO"
 	Set COASO.COASOHeader.MINETC = "C"
-	Set COASO.COASOHeader.MIOTCR = "17-06-16"
+	Set COASO.COASOHeader.MIOTCR = "17-06-20"
 	Set COASO.COASOHeader.MITICR = "2200"
 	Set COASO.COASOHeader.MICOUN ="1922"
 	Set COASO.COASOHeader.MINNCR = "BRANDL A."
 	Set COASO.COASOHeader.MINNRE = "ROOS"
 	Set COASO.COASOHeader.MIACRQ = "1"
 	Set COASO.COASOHeader.MESPRO = "1"
-	
+	Quit COASO
+]]></Implementation>
+</Method>
+
+<Method name="GeefToeleveringMetHeader">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering</ReturnType>
+<Implementation><![CDATA[
 	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering).%New()
 	
 	Set Toelevering.ToeleveringHeader.InternalOrderNumberBLUM = "745532"
@@ -159,23 +176,7 @@
 	Set Toelevering.ToeleveringHeader.TransportationMode = "L "
 	Set Toelevering.ToeleveringHeader.CurrencyInCOScode = "W30"
 	Set Toelevering.ToeleveringHeader.AverageTransportTime = "000"
-
-	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
-	Set ToeleveringDetail.OrderQuantity = "500"
-	Set ToeleveringDetail.DeliveryDateAxBUA = "160106"
-	Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
-	Set ToeleveringDetail.GrossPrice = "0000000.00"
-	Set ToeleveringDetail.ReasonCode = "V"
-	Set ToeleveringDetail.PriceDimension = "2"
-	Set ToeleveringDetail.NetPrice = "0000016.01"
-	Set ToeleveringDetail.OrderLineIdentificationCustomer = "277788.01  "
-	Set ToeleveringDetail.IdentNumberSupplierBAU = "09002253"
-	Set ToeleveringDetail.DelDateCode = "2"
-	Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
-	
-	Do COASO.ToeleveringList.Insert(Toelevering)
-	
-	Quit COASO
+	Quit Toelevering
 ]]></Implementation>
 </Method>
 </Class>
Index: BLIMP.mac.rou
===================================================================
diff -u -r36674 -r36805
--- BLIMP.mac.rou	(.../BLIMP.mac.rou)	(revision 36674)
+++ BLIMP.mac.rou	(.../BLIMP.mac.rou)	(revision 36805)
@@ -21,7 +21,7 @@
 SCANONLINE ; verwerken van alle EDI bestanden opgeroepen van BLVWIMP
  Set XMLBestandenList = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New().Ontvang()
  Set DespXMLBestandenList = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New().Ontvang()
- Do ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder).%New().Kopieer()
+ Do ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Bewaarder).%New().KopieerNaarBLimp()
  Set MSMGATEWAY=##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
  Set Dir=##class(TECH.Files).AppendSubPath(MSMGATEWAY,"\EDI_IN\")
  Set File=$$DISPDIR^vhDEV(Dir,"*.*",,,(XMLBestandenList.Count() + DespXMLBestandenList.Count()))
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder/UpdateVerwerkVlag/Test.cls.xml
===================================================================
diff -u -r36800 -r36805
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 36800)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 36805)
@@ -26,7 +26,7 @@
 
 	Do $$$AssertEquals($Piece(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"\","2"),"")
 
-	Do Bewaarder.UpdateVerwerkVlag(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,"0000300","160106")
+	Do Bewaarder.UpdateVerwerkVlag(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,"0000300","200106")
 
 	Do $$$AssertEquals($Piece(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"\","2"),"1")
 
@@ -43,7 +43,7 @@
 
 	Do $$$AssertEquals($Piece(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,2),"\","2"),"")
 
-	Do Bewaarder.UpdateVerwerkVlag(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,"0000700","160108")
+	Do Bewaarder.UpdateVerwerkVlag(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,"0000700","200108")
 
 	Do $$$AssertEquals($Piece(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,2),"\","2"),"1")
 
Index: BLVWIMP.mac.rou
===================================================================
diff -u -r36674 -r36805
--- BLVWIMP.mac.rou	(.../BLVWIMP.mac.rou)	(revision 36674)
+++ BLVWIMP.mac.rou	(.../BLVWIMP.mac.rou)	(revision 36805)
@@ -157,7 +157,7 @@
 BEGIN
  N NewProd,ModProd
  Do ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New().Ontvang()
- Do ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder).%New().Kopieer()
+ Do ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Bewaarder).%New().KopieerNaarBLimp()
  D IN,SA1,REN
  ;
 DISPL S DL(1)="Lijst" Do REFRESH I '$D(^HULP($J)) D O1,IK^PROC1 G END
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder/Kopieer/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder/Kopieer/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder/Kopieer/Test.cls.xml	(revision 36805)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder.Kopieer.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Lock +^BLOrdRsp
+	Lock +^BLImp
+	Kill ^BLOrdRsp
+	Kill ^BLImp
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Kill ^BLOrdRsp
+	Kill ^BLImp
+	Lock -^BLImp
+	Lock -^BLOrdRsp
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kopieer 2 toeleveringen in BLOrdRsp naar 1 Message in BLImp ">
+<Implementation><![CDATA[
+	Set ^BLOrdRsp(0)="BAU804998\5005\COA\SO\C\20-09-16\1200\0\\\1\"
+	Set ^BLOrdRsp(222482)="""112712500127125001222482      000804998      W30G L 160920                     """
+	Set ^BLOrdRsp(222482,"01",1)="""22222482.01       0378220500001440000290.63216102623V      0000000.00          """
+	Set ^BLOrdRsp(222482,"02",2)="""22222482.02       0417985200000920000331.46216092923V      0000000.00          """
+	Set ^BLOrdRsp(222482,"02",3)="""22222482.02       0417985200001000000331.46216102823V      0000000.00          """
+	Set ^BLOrdRsp(222482,"03",4)="""22222482.03       0424438400000000000331.462      00V      0000000.00          """
+	Set ^BLOrdRsp(222482,"04",5)="""22222482.04       0251181000000000000295.842      00V      0000000.00          """
+	Set ^BLOrdRsp(222482,"05",6)="""22222482.05       0253367100000000000295.842      00V      0000000.00          """
+	Set ^BLOrdRsp(222483)="""112712500127125001222483      000804998      W30G L 160920                     """
+	Set ^BLOrdRsp(222483,"01",1)="""22222483.01       0378220500001500000290.63216102623V      0000000.00          """
+	Set ^BLOrdRsp(222483,"02",2)="""22222483.02       0417985200000920000331.46216092923V      0000000.00          """
+	Set ^BLOrdRsp(222483,"02",3)="""22222483.02       0417985200001000000331.46216092823V      0000000.00          """
+	Set ^BLOrdRsp(222483,"03",4)="""22222483.03       0424438400000000000331.462      00V      0000000.00          """
+	Set ^BLOrdRsp(222483,"04",5)="""22222483.04       0251181000000000000295.842      00V      0000000.00          """
+	Set ^BLOrdRsp(222483,"05",6)="""22222483.05       0253367100000000000295.842      00V      0000000.00          """
+	
+	#Dim Kopieerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder  = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder).%New()
+	
+	Do Kopieerder.Kopieer()
+	
+	Do $$$AssertEquals(^BLImp(1),"BAU804998\5005\COA\SO\C\20-09-16\1200\14\\\1\")
+	Do $$$AssertEquals(^BLImp(1,1),"""112712500127125001222482      000804998      W30G L 160920                     """)
+	Do $$$AssertEquals(^BLImp(1,2),"""22222482.01       0378220500001440000290.63216102623V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,3),"""22222482.02       0417985200000920000331.46216092923V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,4),"""22222482.02       0417985200001000000331.46216102823V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,5),"""22222482.03       0424438400000000000331.462      00V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,6),"""22222482.04       0251181000000000000295.842      00V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,7),"""22222482.05       0253367100000000000295.842      00V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,8),"""112712500127125001222483      000804998      W30G L 160920                     """)
+	Do $$$AssertEquals(^BLImp(1,9),"""22222483.01       0378220500001500000290.63216102623V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,10),"""22222483.02       0417985200000920000331.46216092923V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,11),"""22222483.02       0417985200001000000331.46216092823V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,12),"""22222483.03       0424438400000000000331.462      00V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,13),"""22222483.04       0251181000000000000295.842      00V      0000000.00          """)
+	Do $$$AssertEquals(^BLImp(1,14),"""22222483.05       0253367100000000000295.842      00V      0000000.00          """)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder.cls.xml
===================================================================
diff -u -r36800 -r36805
--- APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 36800)
+++ APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 36805)
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Kopieerder">
+<Type>APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ToeleveringNummer">
 <Type>%Integer</Type>
 <InitialExpression>99999999</InitialExpression>
@@ -35,13 +40,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>DateTimeAPI:TECH.DateTime.impl.DateTimeAPI</FormalSpec>
+<FormalSpec>DateTimeAPI:TECH.DateTime.impl.DateTimeAPI,Kopieerder:APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..DateTimeAPI = $$$Inject(DateTimeAPI,##class(TECH.DateTime.impl.DateTimeAPI).%New())
+	Set ..Kopieerder = $$$Inject(Kopieerder,##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -74,7 +80,6 @@
 <FormalSpec>ToeleveringsNummer:%String,ToeleveringsLijnNummer:%String,Aantal:%String,LeverDatum:%String</FormalSpec>
 <Implementation><![CDATA[
 	Set Toelevering=$Q(^BLOrdRsp(ToeleveringsNummer,ToeleveringsLijnNummer))
-	
 	If ($Q(@Toelevering) = "") {
 		Do ..ZetRecordAlsVerwerkt(Toelevering)
 	} Else {
@@ -88,35 +93,32 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwijderToelevering">
+<FormalSpec>ToeleveringsNummer:%String</FormalSpec>
+<Implementation><![CDATA[	Kill ^BLOrdRsp(ToeleveringsNummer)
+]]></Implementation>
+</Method>
+
+<Method name="KopieerNaarBLimp">
+<Implementation><![CDATA[
+	Do ..ZetVervallenLijnenAlsVerwerkt()
+	Do ..Kopieerder.Kopieer()
+]]></Implementation>
+</Method>
+
 <Method name="ZetVervallenLijnenAlsVerwerkt">
+<Private>1</Private>
 <Implementation><![CDATA[
-	#Dim Toelevering As %String = ..#HeaderKey
-	Set Toelevering=$O(^BLOrdRsp(Toelevering))
+	Set Toelevering=$Q(^BLOrdRsp(..#HeaderKey))
 	While Toelevering'=""{
-		
-		#Dim ToeleveringLijn As %String = ""
-		Set ToeleveringLijn=$O(^BLOrdRsp(Toelevering,ToeleveringLijn))
-		While ToeleveringLijn'=""{
-			#Dim Lijn As %String = ^BLOrdRsp(Toelevering,ToeleveringLijn)
-			If ..IsDetailLijn(Lijn)
-			{
-				if ..IsLijnVervallen(Lijn) {
-					Do ..ZetRecordAlsVerwerkt(Toelevering)	
-				}
-			}
-			Set ToeleveringLijn=$O(^BLOrdRsp(Toelevering,ToeleveringLijn))
+		If (..IsDetailLijn(@Toelevering)) && (..IsLijnVervallen(@Toelevering)){
+			Do ..ZetRecordAlsVerwerkt(Toelevering)
 		}
-		Set Toelevering=$O(^BLOrdRsp(Toelevering))
+		Set Toelevering=$Q(@Toelevering)
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="VerwijderToelevering">
-<FormalSpec>ToeleveringsNummer:%String</FormalSpec>
-<Implementation><![CDATA[	Kill ^BLOrdRsp(ToeleveringsNummer)
-]]></Implementation>
-</Method>
-
 <Method name="IsDetailLijn">
 <FormalSpec>Lijn:%String</FormalSpec>
 <Private>1</Private>
@@ -136,9 +138,11 @@
 </Method>
 
 <Method name="ZetRecordAlsVerwerkt">
-<FormalSpec>Toelevering:%String</FormalSpec>
+<FormalSpec>Toelevering:%CacheString</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Set $Piece(@Toelevering,"\",2) = ..#IsReedsVerwerkt
+<Implementation><![CDATA[
+	Do ##class(Tools.Wlip).%New(26).String(@Toelevering)
+	Set $Piece(@Toelevering,"\",2) = ..#IsReedsVerwerkt
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder/Bewaar/Test.cls.xml
===================================================================
diff -u -r36800 -r36805
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 36800)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Bewaarder/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 36805)
@@ -25,7 +25,7 @@
 	Do Bewaarder.Bewaar(COASODouble)
 	
 	Do $$$AssertTrue($DATA(^BLOrdRsp(0)))
-	Do $$$AssertEquals(^BLOrdRsp(0),"BAU16558\5005\COA\SO\C\17-06-16\2200\0\BRANDL A.\ROOS\1\1")
+	Do $$$AssertEquals(^BLOrdRsp(0),"BAU16558\5005\COA\SO\C\17-06-20\2200\0\BRANDL A.\ROOS\1\1")
 
 	Kill ^BLOrdRsp(0)
 ]]></Implementation>
@@ -53,7 +53,7 @@
 	Do Bewaarder.Bewaar(COASODouble)
 	
 	Do $$$AssertTrue($DATA(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1)))
-	Do $$$AssertEquals(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"""22277788.01       0900225300005000000016.0121601062 V      0000000.00          """)
+	Do $$$AssertEquals(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"""22277788.01       0900225300005000000016.0122001062 V      0000000.00          """)
 
 	Kill ^BLOrdRsp(Bewaarder.ToeleveringNummer)
 ]]></Implementation>
@@ -67,14 +67,30 @@
 	Do Bewaarder.Bewaar(COASODouble)
 	
 	Do $$$AssertTrue($DATA(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1)))
-	Do $$$AssertEquals(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"""22277788.01       0900225300005000000016.0121601062 V      0000000.00          """)
+	Do $$$AssertEquals(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"""22277788.01       0900225300005000000016.0122001062 V      0000000.00          """)
 
 	Do $$$AssertTrue($DATA(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,2)))
-	Do $$$AssertEquals(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,2),"""22277799.01       0900225300010000000216.0121601082 V      0000236.01          """)
+	Do $$$AssertEquals(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,2),"""22277799.01       0900225300010000000216.0122001082 V      0000236.01          """)
 
 	Kill ^BLOrdRsp(Bewaarder.ToeleveringNummer)
 ]]></Implementation>
 </Method>
+
+<Method name="Test : Bewaar COASO en zet Toeleveringslijn met vervallen datum als Verwerkt">
+<Implementation><![CDATA[
+	#Dim KopieerderFake As vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder).%New()
+	#Dim COASOMetVervallenDatumDouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOMetVervallenDatum()
+	#Dim Bewaarder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Bewaarder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Bewaarder).%New(,KopieerderFake)
+	
+	Do Bewaarder.Bewaar(COASOMetVervallenDatumDouble)
+
+	Do $$$AssertEquals($Piece(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"\","2"),"")
+	Do Bewaarder.KopieerNaarBLimp()
+	Do $$$AssertEquals($Piece(^BLOrdRsp(Bewaarder.ToeleveringNummer,Bewaarder.ToeleveringLijnNummer,1),"\","2"),"1")
+
+	Kill ^BLOrdRsp(Bewaarder.ToeleveringNummer)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml
===================================================================
diff -u -r36770 -r36805
--- APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml	(.../Kopieerder.cls.xml)	(revision 36770)
+++ APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml	(.../Kopieerder.cls.xml)	(revision 36805)
@@ -13,6 +13,11 @@
 <Default>1</Default>
 </Parameter>
 
+<Parameter name="IsReedsVerwerkt">
+<Type>%String</Type>
+<Default>1</Default>
+</Parameter>
+
 <Property name="MsgNr">
 <Type>%Integer</Type>
 <InitialExpression>99999999</InitialExpression>
@@ -46,8 +51,10 @@
 		#Dim Toelevering As %String = ..#HeaderKey
 		Set Toelevering=$Q(^BLOrdRsp(Toelevering))
 		While Toelevering'=""{
-			Do ..SchrijfRecord(@Toelevering)
-			Set RecordCount = RecordCount + 1
+			If (..IsTeVerwerken(@Toelevering)){
+				Do ..SchrijfRecord(@Toelevering)
+				Set RecordCount = RecordCount + 1
+			}
 			Set Toelevering=$Q(@Toelevering)
 		}
 		Do ..SchrijfBLImpHeader(RecordCount)
@@ -65,12 +72,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsTeVerwerken">
+<FormalSpec>Record:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ($Piece(Record,"\",2) '= ..#IsReedsVerwerkt)
+]]></Implementation>
+</Method>
+
 <Method name="SchrijfRecord">
 <FormalSpec>Record:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	set ..RecNr = ..RecNr + 1
- 	Set ^BLImp(..MsgNr,..RecNr)=Record
+ 	Set ^BLImp(..MsgNr,..RecNr)=$Piece(Record,"\",1)
 ]]></Implementation>
 </Method>