Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r61423 -r61508 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 61423) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 61508) @@ -58,8 +58,13 @@ 1 + +WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler +1 + + -DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",ProboxEtiketAfdrukkenHelper:WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper="",UGLYPickingWrapper:WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="" +DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",ProboxEtiketAfdrukkenHelper:WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper="",UGLYPickingWrapper:WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="" 1 1 %Status @@ -75,6 +80,7 @@ Set ..KlantinstellingenRepository = $$$Inject(KlantinstellingenRepository, ##class(DOM.Halux.AAP.KlantinstellingenRepository).%New()) Set ..VerkoopAPI = $$$Inject(VerkoopAPI, ##class(DOM.VKP.impl.VerkoopAPI).%New()) Set ..AantalGescandeVhossSequentieItemsBepaler = $$$Inject(AantalGescandeVhossSequentieItemsBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New()) + Set ..DnaCodeInVhossKastBepaler = $$$Inject(DnaCodeInVhossKastBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()) Quit $$$OK ]]> @@ -332,8 +338,11 @@ Do ..DnaCodeRepository.Bewaar(DnaCode) If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) { - Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode) - Set Response.Header.Status = "200" + If ..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCodeAfmeldenRequest) { + Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,) + Do ##class(Tools.Wlip).%New(127).ObjToXML(Response) + Set Response.Header.Status = "200" + } } Else { Set ToeleveringId = DnaCode.Toelevering Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId) @@ -362,7 +371,7 @@ #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() Set Response.Header.Status = Exception.GeefExceptionCode() Set Response.Header.Omschrijving = Exception.GeefOmschrijving() - Do ##class(vhLib.Logger).%New().Warning("AAP",Exception.GeefOmschrijving()) + Do ##class(vhLib.Logger).%New().Warning("AAP",Exception.ToString()) } Set Response.AantalInToelevering = +Response.AantalInToelevering Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml =================================================================== diff -u -r61058 -r61508 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 61058) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 61508) @@ -153,8 +153,11 @@ Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk) Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).DanDoeNiks() - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock) + Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New() + Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast",Request).DanReturn($$$True) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,DnaCodeInVhossKastBepalerStub) + #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200")