Index: vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml =================================================================== diff -u -r61376 -r61387 --- vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml (.../DnaCodeRepository.cls.xml) (revision 61376) +++ vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml (.../DnaCodeRepository.cls.xml) (revision 61387) @@ -19,6 +19,13 @@ + +PalletCode:%String +TECH.Iterator + + + Horolog:TECH.Horolog TECH.Iterator Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r61377 -r61387 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 61377) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 61387) @@ -110,11 +110,9 @@ Set Response = ##class(WS.Halux.AAP.ZoekViaPalletCodeResponse).%New() Try { - #dim PalletCode = ##class(TECH.StringUtils).ToUpper(ZoekViaPalletCodeRequest.PalletCode) - //todo: indien parameter 'voorproboxetiket' true: //#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekVoorProboxEtiket(PalletCode) + #dim PalletCode = ##class(TECH.StringUtils).ToUpper(ZoekViaPalletCodeRequest.PalletCode) + #dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode) - #dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaPalletCodeEnRecent(PalletCode) - If DnaCodeIterator.HasNext() { Set Response.Header.Status = "200" While DnaCodeIterator.HasNext() { @@ -181,7 +179,7 @@ Try { If ..IsGeldigeVhossCode(ZoekAlleDnaCodesDieOpVhossMoetenRequest.FrameId) { - #dim TempDnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaPalletCodeEnRecent(ZoekAlleDnaCodesDieOpVhossMoetenRequest.FrameId) + #dim TempDnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(ZoekAlleDnaCodesDieOpVhossMoetenRequest.FrameId) #dim AfmeldenResponse As WS.Halux.AAP.DnaCodeAfmeldenResponse If TempDnaCodeIterator.HasNext() { Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml =================================================================== diff -u -r61376 -r61387 --- DOM/Halux/AAP/DnaCodeRepository.cls.xml (.../DnaCodeRepository.cls.xml) (revision 61376) +++ DOM/Halux/AAP/DnaCodeRepository.cls.xml (.../DnaCodeRepository.cls.xml) (revision 61387) @@ -36,6 +36,13 @@ ]]> + +PalletCode:%String +TECH.Iterator + current_date - 30)", $LB(PalletCode)) +]]> + + PalletCode:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus TECH.Iterator Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml =================================================================== diff -u -r60099 -r61387 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml (.../Test.cls.xml) (revision 60099) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml (.../Test.cls.xml) (revision 61387) @@ -12,7 +12,7 @@ Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New() #dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2) Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New() - Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCodeEnRecent",Request.PalletCode).DanReturn(DnaCodeIterator) + Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekAlleRecenteViaPalletCode",Request.PalletCode).DanReturn(DnaCodeIterator) Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock) @@ -30,7 +30,7 @@ Set Request.PalletCode = "TBX12345" Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New() - Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCodeEnRecent",Request.PalletCode).DanReturn(..EmptyIterator()) + Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekAlleRecenteViaPalletCode",Request.PalletCode).DanReturn(..EmptyIterator()) Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock) Index: vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml =================================================================== diff -u -r61376 -r61387 --- vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml (.../DnaCodeRepository.cls.xml) (revision 61376) +++ vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml (.../DnaCodeRepository.cls.xml) (revision 61387) @@ -92,6 +92,13 @@ ]]> + +PalletCode:%String +TECH.Iterator + + + BatchId:%String,Sequentienummer:%String TECH.Iterator