Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler/BepaalAantalGescandeVhossSequentieItems.cls.xml =================================================================== diff -u -r61024 -r61030 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler/BepaalAantalGescandeVhossSequentieItems.cls.xml (.../BepaalAantalGescandeVhossSequentieItems.cls.xml) (revision 61024) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler/BepaalAantalGescandeVhossSequentieItems.cls.xml (.../BepaalAantalGescandeVhossSequentieItems.cls.xml) (revision 61030) @@ -13,7 +13,7 @@ Do SequentieService.IndienMethodCall("HeeftSequentie",DnaCode.BatchId).DanReturn($$$False) Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New() - #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode) + #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,1) Do $$$AssertEquals(Antwoord.AantalInToelevering,0) ]]> @@ -43,12 +43,44 @@ Do SequentieService.IndienMethodCall("GeefProductieSequentie",DnaCode.BatchId).DanReturn(ProductieSequentie) Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New(SequentieService) - #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode) + #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,1) Do $$$AssertEquals(Antwoord.AantalInToelevering,1) Do $$$AssertEquals(Antwoord.DnaCodes.Count(),1) ]]> + + + + @@ -112,7 +144,7 @@ Do SequentieService.IndienMethodCall("GeefProductieSequentie",DnaCode.BatchId).DanReturn(ProductieSequentie) Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New(SequentieService) - #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode) + #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,1) Do $$$AssertEquals(Antwoord.AantalInToelevering,2) Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2) ]]> @@ -152,7 +184,7 @@ Do SequentieService.IndienMethodCall("GeefProductieSequentie",DnaCode.BatchId).DanReturn(ProductieSequentie) Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New(SequentieService) - #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode) + #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,1) Do $$$AssertEquals(Antwoord.AantalInToelevering,1) Do $$$AssertEquals(Antwoord.DnaCodes.Count(),1) ]]> @@ -164,7 +196,7 @@ Set DnaCode.DnaCode = "TABCDE0" Set DnaCode.BatchId = 12345 Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New() - #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode) + #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = Bepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,1) Do $$$AssertEquals(Antwoord.AantalInToelevering,0) ]]> Index: WS/Halux/AAP/DnaCodeAfmeldenRequest.cls.xml =================================================================== diff -u -r60251 -r61030 --- WS/Halux/AAP/DnaCodeAfmeldenRequest.cls.xml (.../DnaCodeAfmeldenRequest.cls.xml) (revision 60251) +++ WS/Halux/AAP/DnaCodeAfmeldenRequest.cls.xml (.../DnaCodeAfmeldenRequest.cls.xml) (revision 61030) @@ -35,6 +35,10 @@ %String + +%String + + %Library.CacheSerialState DnaCodeAfmeldenRequestState @@ -58,6 +62,12 @@ PalletCode + +InterneVhossVolgnummer + + +GuiVhossVolgnummer + Index: WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml =================================================================== diff -u -r61024 -r61030 --- WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml (.../AantalGescandeVhossSequentieItemsBepaler.cls.xml) (revision 61024) +++ WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml (.../AantalGescandeVhossSequentieItemsBepaler.cls.xml) (revision 61030) @@ -28,19 +28,19 @@ -DnaCode:DOM.Halux.AAP.DnaCode +DnaCode:DOM.Halux.AAP.DnaCode,GuiVhossVolgnummer:%String WS.Halux.AAP.DnaCodeAfmeldenResponse -DnaCode:DOM.Halux.AAP.DnaCode +DnaCode:DOM.Halux.AAP.DnaCode,GuiVhossVolgnummer:%String 1 WS.Halux.AAP.DnaCodeAfmeldenResponse -DnaCode:DOM.Halux.AAP.DnaCode +DnaCode:DOM.Halux.AAP.DnaCode,GuiVhossVolgnummer:%String 1 WS.Halux.AAP.DnaCodeAfmeldenResponse Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt =================================================================== diff -u -r60836 -r61030 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt (.../WS.Halux.AAP.DnaCodeService.txt) (revision 60836) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt (.../WS.Halux.AAP.DnaCodeService.txt) (revision 61030) @@ -91,6 +91,7 @@ + @@ -107,6 +108,7 @@ + Index: vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml =================================================================== diff -u -r61018 -r61030 --- vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml (.../AantalGescandeVhossSequentieItemsBepaler.cls.xml) (revision 61018) +++ vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml (.../AantalGescandeVhossSequentieItemsBepaler.cls.xml) (revision 61030) @@ -16,9 +16,9 @@ -DnaCode:DOM.Halux.AAP.DnaCode +DnaCode:DOM.Halux.AAP.DnaCode,GuiVhossVolgnummer:%String WS.Halux.AAP.DnaCodeAfmeldenResponse - Index: WS/Halux/AAP/DnaCodeAfmeldenResponse.cls.xml =================================================================== diff -u -r56081 -r61030 --- WS/Halux/AAP/DnaCodeAfmeldenResponse.cls.xml (.../DnaCodeAfmeldenResponse.cls.xml) (revision 56081) +++ WS/Halux/AAP/DnaCodeAfmeldenResponse.cls.xml (.../DnaCodeAfmeldenResponse.cls.xml) (revision 61030) @@ -16,6 +16,10 @@ list + + +%String +