Index: vhUnitTest/APPS/Halux/Planning/impl/BatchStarter/StartBatch/Test.cls.xml =================================================================== diff -u -r70542 -r72803 --- vhUnitTest/APPS/Halux/Planning/impl/BatchStarter/StartBatch/Test.cls.xml (.../Test.cls.xml) (revision 70542) +++ vhUnitTest/APPS/Halux/Planning/impl/BatchStarter/StartBatch/Test.cls.xml (.../Test.cls.xml) (revision 72803) @@ -72,6 +72,7 @@ Do BatchStub.IndienMethodCall("GeefStatus").DanReturn(##class(APPS.Halux.common.enu.BatchStatus).Gecontroleerd()) Do BatchStub.IndienMethodCall("ZetStatus", ##class(APPS.Halux.common.enu.BatchStatus).BezigMetStarten()).DanDoeNiks() Do BatchStub.IndienMethodCall("ZetStatus", ##class(APPS.Halux.common.enu.BatchStatus).Gestart()).DanDoeNiks() + Do BatchStub.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New())) #dim EventRaiserSpy As vhTest.Spy.TECH.PubSub.EventRaiser = ##class(vhTest.Spy.TECH.PubSub.EventRaiser).PushedInstance() @@ -127,6 +128,7 @@ Do BatchStub.IndienMethodCall("ZetStatus",##class(APPS.Halux.common.enu.BatchStatus).Gestart()).DanDoeNiks() Do BatchStub.IndienMethodCall("GeefID").DanReturn($$$DummyString) Do BatchStub.IndienMethodCall("ZetStatus",##class(APPS.Halux.common.enu.BatchStatus).StartenGefaald()).DanDoeNiks() + Do BatchStub.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New())) Set SequentieServiceStub = ##class(vhUnitTest.APPS.Halux.Planning.impl.BatchStarter.StartBatch.SequentieServiceMock).%New() Do SequentieServiceStub.IndienMethodCall("GenereerSequentie", BatchStub).DanException($$$DummyMajorException) Index: APPS/Halux/common/impl/BatchService.cls.xml =================================================================== diff -u -r57115 -r72803 --- APPS/Halux/common/impl/BatchService.cls.xml (.../BatchService.cls.xml) (revision 57115) +++ APPS/Halux/common/impl/BatchService.cls.xml (.../BatchService.cls.xml) (revision 72803) @@ -135,6 +135,24 @@ ]]> + +ToeleveringID:%String +%Integer + + + TeVerwijderenToeleveringenInBatch:%ArrayOfDataTypes 1 + +APPS.Halux.common.impl.BatchService +1 + + -BatchBewaarder:APPS.Halux.Planning.BatchBewaarder,BatchSequentieService:APPS.Halux.common.impl.SequentieService,BatchSequentieVerwijderaar:APPS.Halux.Planning.impl.BatchSequentieVerwijderaar,Logger:vhLib.Logger,DnaCodeService:APPS.Halux.AAP.DnaCodeService,MatService:APPS.Halux.PPS.MatService,DocumentGeneratorService:APPS.Halux.PPS.DocumentGeneratorService +BatchBewaarder:APPS.Halux.Planning.BatchBewaarder,BatchSequentieService:APPS.Halux.common.impl.SequentieService,BatchSequentieVerwijderaar:APPS.Halux.Planning.impl.BatchSequentieVerwijderaar,Logger:vhLib.Logger,DnaCodeService:APPS.Halux.AAP.DnaCodeService,MatService:APPS.Halux.PPS.MatService,DocumentGeneratorService:APPS.Halux.PPS.DocumentGeneratorService,BatchService:APPS.Halux.common.impl.BatchService="" 1 1 %Status @@ -52,6 +57,7 @@ Set ..DnaCodeService = $$$Inject(DnaCodeService,##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Resolve("DnaCodeService")) Set ..MatService = $$$Inject(MatService, ##class(APPS.Halux.PPS.MatService).%New()) Set ..DocumentGeneratorService = $$$Inject(DocumentGeneratorService, ##class(APPS.Halux.PPS.DocumentGeneratorService).%New()) + Set ..BatchService = $$$Inject(BatchService, ##class(APPS.Halux.common.impl.BatchService).%New()) Quit $$$OK ]]> @@ -72,6 +78,7 @@ Batch:APPS.Halux.common.Batch + +Batch:APPS.Halux.common.Batch +1 +%Boolean + 1) { + Do ..Logger.ErrorMail("StartBatch","Batch "_Batch.GeefID()_" kan niet starten want toelevering " _ Toelevering.GeefID() _ "zit in meerdere batchen, dit zorgt voor fouten. Zie query SELECT ID as BatchID FROM APPS_Halux_common_impl.BatchImpl WHERE FOR SOME %ELEMENT(Toeleveringen) (%VALUE = )") + Set Result = $$$False + } + } + Quit Result +]]> + + MaatWerkBatch:APPS.Halux.Planning.dto.MaatwerkBatch APPS.Halux.Planning.dto.BatchOverzicht