FishEye: Tag 37908 refers to a dead (removed) revision in file `vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestKennisAnker.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestKennisAnker.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestKennisAnker.cls.xml	(revision 37908)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket.TestKennisAnker">
+<Super>vhUnitTest.TestCase,APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler</Super>
+
+<Property name="ToeleveringID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductIDIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BatchServiceDummy">
+<Type>vhTest.Dummy.APPS.Halux.common.BatchService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringServiceStub">
+<Type>vhTest.Mock.DOM.AKP.ToeleveringService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KennisAnkerRepositoryMock">
+<Type>vhTest.Mock.DOM.common.Kennis.KennisAnkerRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..ToeleveringID = 222222
+	Set ..KlantID = "K||1111"
+	Set ..ProductIDIterator = ##class(TECH.ListbuildIterator).%New($listbuild(123456,654321))
+	Set ..BatchServiceDummy = ##class(vhTest.Dummy.APPS.Halux.common.BatchService).%New()
+	Set ..ToeleveringServiceStub = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ..ToeleveringServiceStub.IndienMethodCall("GeefColliDragerType", $$$ElkeWaarde).DanDoeNiks()
+	Do ..ToeleveringServiceStub.IndienMethodCall("GeefProductIDIterator",..ToeleveringID).DanReturn(..ProductIDIterator)
+	Do ..ToeleveringServiceStub.IndienMethodCall("GeefKlant",..ToeleveringID).DanReturn(##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New(..KlantID))
+	Set ..KennisAnkerRepositoryMock = ##class(vhTest.Mock.DOM.common.Kennis.KennisAnkerRepository).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kennisankertekst indien 0 kennisankers">
+<Implementation><![CDATA[
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New()
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+	
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertTrue($length(TussenEtiket.KennisAnkersTekst)=0)
+	
+	Do ..KennisAnkerRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kennisankertekst indien 1 kennisanker">
+<Implementation><![CDATA[
+	#dim KennisAnker As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(654321)
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New(KennisAnker)
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+	
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertTrue($length(TussenEtiket.KennisAnkersTekst)>0)
+	
+	Do ..KennisAnkerRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kennisankertekst indien 2 kennisankers">
+<Implementation><![CDATA[
+	#dim KennisAnker As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(654321)
+	#dim KennisAnker2 As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(123456)
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New(KennisAnker, KennisAnker2)
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+	
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertTrue($find(TussenEtiket.KennisAnkersTekst,";")'=0)
+	
+	Do ..KennisAnkerRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kennisankertekst met 1 crlf">
+<Implementation><![CDATA[
+	#dim KennisAnker As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(654321)
+	Set KennisAnker.Msg = KennisAnker.Msg _ $C(13,10)
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New(KennisAnker)
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+	
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertTrue($find(TussenEtiket.KennisAnkersTekst,$C(13,10))=0)
+	
+	Do ..KennisAnkerRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kennisankertekst met 2 crlf">
+<Implementation><![CDATA[
+	#dim KennisAnker As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(654321)
+	Set KennisAnker.Msg = KennisAnker.Msg _ $C(13,10) _"testtekst" _ $C(13,10)
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New(KennisAnker)
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+	
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertTrue($find(TussenEtiket.KennisAnkersTekst,$C(13,10))=0)
+	
+	Do ..KennisAnkerRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/AKP/ToeleveringService.cls.xml
===================================================================
diff -u -r33372 -r37908
--- DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 33372)
+++ DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37908)
@@ -22,6 +22,12 @@
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 </Method>
+
+<Method name="GeefColliDragerType">
+<Abstract>1</Abstract>
+<FormalSpec>ToeleveringID:%String</FormalSpec>
+<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml
===================================================================
diff -u -r33372 -r37908
--- vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 33372)
+++ vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37908)
@@ -8,6 +8,13 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.AKP.ToeleveringService,Tools.Mock.MockClassBase</Super>
 
+<Method name="GeefColliDragerType">
+<FormalSpec>ToeleveringID:%String</FormalSpec>
+<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefColliDragerType",ToeleveringID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlant">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
Index: APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml
===================================================================
diff -u -r33683 -r37908
--- APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml	(.../TussenEtiketVoorToeleveringBepaler.cls.xml)	(revision 33683)
+++ APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml	(.../TussenEtiketVoorToeleveringBepaler.cls.xml)	(revision 37908)
@@ -46,11 +46,20 @@
 	Set TussenEtiket = ##class(BL.Etiket.LadeKlantEtiket).%New("")
 	Set TussenEtiket.Info1 = ToeleveringID	
 	Set TussenEtiket.Info3 = "Batch:"_Batch.GeefID()_", "_..DueOutFormatter.GeefGeformatteerdeDueOut(Batch)
+	Set TussenEtiket.Info4 = ..GeefColliDragerType(ToeleveringID)
 	Set TussenEtiket.KennisAnkersTekst = ..GeefKennisAnkersTekst(ToeleveringID)
 	Quit TussenEtiket
 ]]></Implementation>
 </Method>
 
+<Method name="GeefColliDragerType">
+<FormalSpec>ToeleveringID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).ToUpper(..ToeleveringService.GeefColliDragerType(ToeleveringID))
+]]></Implementation>
+</Method>
+
 <Method name="GeefKennisAnkersTekst">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestColliDragerType.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestColliDragerType.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestColliDragerType.cls.xml	(revision 37908)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket.TestColliDragerType">
+<Super>vhUnitTest.TestCase,APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler</Super>
+
+<Property name="ToeleveringID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductIDIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BatchServiceDummy">
+<Type>vhTest.Dummy.APPS.Halux.common.BatchService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringServiceMock">
+<Type>vhTest.Mock.DOM.AKP.ToeleveringService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KennisAnkerRepositoryStub">
+<Type>vhTest.Mock.DOM.common.Kennis.KennisAnkerRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..ToeleveringID = 222222
+	Set ..KlantID = "K||1111"
+	Set ..ProductIDIterator = ##class(TECH.ListbuildIterator).%New($listbuild(123456,654321))
+	Set ..BatchServiceDummy = ##class(vhTest.Dummy.APPS.Halux.common.BatchService).%New()
+
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New()
+	Set ..KennisAnkerRepositoryStub = ##class(vhTest.Mock.DOM.common.Kennis.KennisAnkerRepository).%New()
+	Do ..KennisAnkerRepositoryStub.IndienMethodCall("GeefKennisAnkerIterator", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+
+	Set ..ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ..ToeleveringServiceMock.IndienMethodCall("GeefProductIDIterator",..ToeleveringID).DanReturn(..ProductIDIterator)
+	Do ..ToeleveringServiceMock.IndienMethodCall("GeefKlant",..ToeleveringID).DanReturn(##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New(..KlantID))
+]]></Implementation>
+</Method>
+
+<Method name="Test: WEGWERPPALLET wordt op tussenetiket geplaatst indien ColliDragerType wegwerpallet is">
+<Implementation><![CDATA[
+	Do ..ToeleveringServiceMock.VerwachtMethodCall("GeefColliDragerType", ..ToeleveringID).DanReturn(##class(DOM.VKP.enu.ColliDragerType).WegwerpPallet())
+
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceMock, ..KennisAnkerRepositoryStub)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertEquals(TussenEtiket.Info4,"WEGWERPPALLET")
+	
+	Do ..ToeleveringServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: WEGWERPPALLET wordt niet op tussenetiket geplaatst indien ColliDragerType niet ingevuld is">
+<Implementation><![CDATA[
+	Do ..ToeleveringServiceMock.VerwachtMethodCall("GeefColliDragerType", ..ToeleveringID).DanReturn("")
+
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceMock, ..KennisAnkerRepositoryStub)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertEquals(TussenEtiket.Info4,"")
+	
+	Do ..ToeleveringServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/AKP/impl/ToeleveringService.cls.xml
===================================================================
diff -u -r33473 -r37908
--- DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 33473)
+++ DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37908)
@@ -66,6 +66,18 @@
 	Quit ##class(TECH.DynamicIterator).%New(Toelevering.GeefProductLijnIterator(),"Item.GeefProductID()","Item.%Extends(""DOM.AKP.ProductToeleveringLijn"")=1")
 ]]></Implementation>
 </Method>
+
+<Method name="GeefColliDragerType">
+<FormalSpec>ToeleveringID:%String</FormalSpec>
+<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<Implementation><![CDATA[
+	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringID)
+	#dim OrderID As %String = Toelevering.GeefOrderID()
+	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
+	
+	Quit Order.GeefColliDragerType()
+]]></Implementation>
+</Method>
 </Class>