Index: WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml =================================================================== diff -u -r61507 -r61510 --- WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 61507) +++ WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 61510) @@ -3,10 +3,80 @@ TECH.Mockable + +APPS.Halux.common.SequentieService +1 + + + +SequentieService:APPS.Halux.common.SequentieService +1 +1 +%Status +1 + + + -DnaCodeAfmeldenRequest:WS.Halux.AAP.DnaCodeAfmeldenRequest +DnaCode:DOM.Halux.AAP.DnaCode,Pallet:%String,GuiVhossVolgnummer:%String %Boolean + + + +DnaCode:DOM.Halux.AAP.DnaCode,SequentieNummer:%String,VHOSSID:%String +1 +%Boolean + + + + +BatchId:%String +1 +TECH.Iterator + + Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml =================================================================== diff -u -r61508 -r61510 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 61508) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 61510) @@ -145,6 +145,7 @@ Set Request.DnaCode = "DnaCode" Set Request.Toelevering = "356789" Set Request.PalletCode = "O100000042" + Set Request.GuiVhossVolgnummer = "1" Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New() Set DnaCode1.Toelevering = "222222" @@ -154,7 +155,7 @@ Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).DanDoeNiks() Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New() - Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast",Request).DanReturn($$$True) + Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast",DnaCode1,Request.PalletCode,Request.GuiVhossVolgnummer).DanReturn($$$True) Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,DnaCodeInVhossKastBepalerStub) Index: vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml =================================================================== diff -u -r61507 -r61510 --- vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 61507) +++ vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 61510) @@ -8,7 +8,7 @@ WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler -DnaCodeAfmeldenRequest:WS.Halux.AAP.DnaCodeAfmeldenRequest +DnaCode:DOM.Halux.AAP.DnaCode,Pallet:%String,GuiVhossVolgnummer:%String %Boolean Index: vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml =================================================================== diff -u -r61507 -r61510 --- vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 61507) +++ vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 61510) @@ -8,10 +8,17 @@ WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler,Tools.Mock.MockClassBase right + +SequentieService:APPS.Halux.common.SequentieService +%Status + + + -DnaCodeAfmeldenRequest:WS.Halux.AAP.DnaCodeAfmeldenRequest +DnaCode:DOM.Halux.AAP.DnaCode,Pallet:%String,GuiVhossVolgnummer:%String %Boolean - Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r61508 -r61510 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 61508) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 61510) @@ -338,7 +338,7 @@ Do ..DnaCodeRepository.Bewaar(DnaCode) If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) { - If ..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCodeAfmeldenRequest) { + If ..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCode, DnaCodeAfmeldenRequest.PalletCode, DnaCodeAfmeldenRequest.GuiVhossVolgnummer) { Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,) Do ##class(Tools.Wlip).%New(127).ObjToXML(Response) Set Response.Header.Status = "200"