Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/dto/BatchNaarObjectiveVlagVelden.cls.xml =================================================================== diff -u -r74411 -r74458 --- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/dto/BatchNaarObjectiveVlagVelden.cls.xml (.../BatchNaarObjectiveVlagVelden.cls.xml) (revision 74411) +++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/dto/BatchNaarObjectiveVlagVelden.cls.xml (.../BatchNaarObjectiveVlagVelden.cls.xml) (revision 74458) @@ -23,13 +23,16 @@ + +%String + + + %Library.CacheSerialState BatchNaarObjectiveVlagVeldenState ^APPS.HaluxF90F.BatchNaarOb940CS -listnode - IsExport @@ -39,6 +42,9 @@ Crossdocking + +IsProductionLineFixed + Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective.cls.xml =================================================================== diff -u -r74429 -r74458 --- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective.cls.xml (.../BatchNaarObjective.cls.xml) (revision 74429) +++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective.cls.xml (.../BatchNaarObjective.cls.xml) (revision 74458) @@ -161,7 +161,8 @@ #dim ToeleveringId As %String = ToeleveringenIterator.Next() #dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringId) #dim BatchData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = ..BatchNaarObjectiveDataGenerator.GenereerDataVoorBatch(Batch, Toelevering, UitvoeringLijstNummer, AantalLades, SuffixId) - + Set BatchData.GebruikersVelden.Vlag.IsProductionLineFixed = $$$False + Do ##class(TECH.ListUtils).AppendList(BatchData.Opties, ..BatchNaarObjectiveDataGenerator.GenereerAlgemeneInfoOptiesVoorBatch(Batch)) Do ##class(TECH.ListUtils).AppendList(BatchData.Opties, ..GeefOptiesVoorToelevering(Toelevering, UitvoeringInfoLijstIterator)) @@ -170,6 +171,7 @@ Set Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringId) Do ##class(TECH.ListUtils).AppendList(BatchData.Opties, ..GeefOptiesVoorToelevering(Toelevering, UitvoeringInfoLijstIterator)) + Set BatchData.GebruikersVelden.Vlag.IsProductionLineFixed = BatchData.GebruikersVelden.Vlag.IsProductionLineFixed || ..GeefIsMinstensEenStalenRugFastMover(BatchData.Opties) } Do BatchDataLijst.Insert(BatchData) @@ -224,6 +226,7 @@ #dim BatchData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = ..BatchNaarObjectiveDataGenerator.GenereerDataVoorToelevering(Batch, Toelevering, ..IndexBestanden, AantalLadesInToelevering, SuffixId) Do ##class(TECH.ListUtils).AppendList(BatchData.Opties, ..BatchNaarObjectiveDataGenerator.GenereerAlgemeneInfoOptiesVoorToelevering(Toelevering, Batch.GeefCategorie())) Do ##class(TECH.ListUtils).AppendList(BatchData.Opties, ..GeefOptiesVoorToelevering(Toelevering, UitvoeringInfoLijstIterator)) + Set BatchData.GebruikersVelden.Vlag.IsProductionLineFixed = ..GeefIsMinstensEenStalenRugFastMover(BatchData.Opties) Do BatchDataLijst.Insert(BatchData) } @@ -377,6 +380,25 @@ Do ..MailApi.VerstuurMail(Mail) ]]> + + +Opties:%ListOfObjects +%Boolean + + Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGenerator.cls.xml =================================================================== diff -u -r74382 -r74458 --- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGenerator.cls.xml (.../RollenEnStuklijstOptiesGenerator.cls.xml) (revision 74382) +++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGenerator.cls.xml (.../RollenEnStuklijstOptiesGenerator.cls.xml) (revision 74458) @@ -13,15 +13,21 @@ 1 + +APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService +1 + + -ProductApi:DOM.PM.ProductAPI="" +ProductApi:DOM.PM.ProductAPI="",BatchPitchExportedService:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService="" 1 1 %Status 1 @@ -41,6 +47,8 @@ #dim HalffabItemsBoom As DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom = Product.GeefHalffabItemsBoom() #dim HalffabItemsIterator As TECH.Iterator = HalffabItemsBoom.GeefAlleHalffabItemsIterator() #dim Index As %Integer = 0 + #dim StalenRugPRNr As %String = "" + #dim ProductieLijn As %String = ..GeefProductieLijn(UitvoeringInfo.BatchID) While (HalffabItemsIterator.HasNext()) { #dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.IHalffabItem = HalffabItemsIterator.Next() @@ -53,10 +61,14 @@ Do Opties.Insert(..GeefOptieVoorLadeVoorStuklijst(HalffabItem, IngegevenKenmerken, SequentieNummerLade, $Increment(Index))) } } + + Set:((..GeefRolNaam(HalffabItem, IngegevenKenmerken) = "Rugstaal")) StalenRugPRNr = HalffabItem.GeefHalffab().GeefProductID() } } - Do ..VoegToeExtraBouwstenen(.Opties, ProductID, SequentieNummerLade, Index) + Do ..VoegToeExtraBouwstenen(.Opties, ProductID, SequentieNummerLade, Index) + Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade),"-BackSteelIsFastMover", ..GeefBackSteelIsFastMover(UitvoeringInfo.BatchID, StalenRugPRNr))) + Quit Opties ]]> @@ -123,6 +135,48 @@ Quit ..GeefOptieVoorLade(SequentieNummerLade, Naam, Waarde) ]]> + + +BatchId:%String +1 +%Integer + + + + +BatchId:%String +1 +APPS.Halux.Planning.Pitching.BatchPitchExported + + + + +ProductieLijn:%String,StalenugPRNr:%String +1 +%Boolean + + Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGeneratorLbx/GenereerOptiesVoorLade/Test.cls.xml =================================================================== diff -u -r71845 -r74458 --- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGeneratorLbx/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 71845) +++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGeneratorLbx/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 74458) @@ -38,6 +38,11 @@ 2.222.222.2 + +%String +111111 + + @@ -91,6 +106,13 @@ Set HalffabItemBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New() Do HalffabItemBoomMock.VerwachtMethodCall("GeefAlleHalffabItemsIterator").DanReturn(HalffabItemsIterator) + #dim BatchPitchExportedVolgnummer As %String = 100 + Set BatchPitchExported = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New() + Set BatchPitchExported.Volgnummer = BatchPitchExportedVolgnummer + Set BatchPitchExported.LijnNummer = 1 + #dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchExported) + #dim BatchPitchExportedServiceMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService = ..GeefBatchPitchExportedServiceMock(..#BatchId, BatchPitchExportedLijst) + Set ProductMock = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New() Do ProductMock.VerwachtMethodCall("GeefIngegevenKenmerken").DanReturn(LbxKenmerken) Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom").DanReturn(HalffabItemBoomMock) @@ -99,16 +121,19 @@ Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock) Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", ..#HFProductId2).DanReturn(..#HFIdentnummer2) - Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock) + Set ..UitvoeringInfo.BatchID = ..#BatchId + Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchPitchExportedServiceMock) #dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(, ..UitvoeringInfo) - Do $$$AssertEquals(Resultaat.Size, 2) + Do $$$AssertEquals(Resultaat.Size, 3) Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-ROL-"_ "Dummyparentitem" _ "." _ "dummyhfitem2", HFItemAantal2) Do ..AssertOptie(Resultaat.GetAt(2), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-INPUT[01]|QTY|ROL", ..#HFIdentnummer2 _ "|" _ HFItemAantal2 _ "|" _ "Dummyparentitem" _ "." _ "dummyhfitem2") + Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-BackSteelIsFastMover", "false") Do HalffabItemBoomMock.Verifieer() Do ProductMock.Verifieer() Do ProductApiMock.Verifieer() + Do BatchPitchExportedServiceMock.Verifieer() ]]> @@ -123,6 +148,13 @@ Set HalffabItemBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New() Do HalffabItemBoomMock.VerwachtMethodCall("GeefAlleHalffabItemsIterator").DanReturn(HalffabItemsIterator) + #dim BatchPitchExportedVolgnummer As %String = 100 + Set BatchPitchExported = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New() + Set BatchPitchExported.Volgnummer = BatchPitchExportedVolgnummer + Set BatchPitchExported.LijnNummer = 1 + #dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchExported) + #dim BatchPitchExportedServiceMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService = ..GeefBatchPitchExportedServiceMock(..#BatchId, BatchPitchExportedLijst) + Set ProductMock = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New() Do ProductMock.VerwachtMethodCall("GeefIngegevenKenmerken").DanReturn(..LbxKenmerken) Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom").DanReturn(HalffabItemBoomMock) @@ -131,14 +163,17 @@ Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock) Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", ..#HFProductId1).ExactAantalKeer(0) - Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock) + Set ..UitvoeringInfo.BatchID = ..#BatchId + Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchPitchExportedServiceMock) #dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(, ..UitvoeringInfo) - Do $$$AssertEquals(Resultaat.Size, 0) + Do $$$AssertEquals(Resultaat.Size, 1) + Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-BackSteelIsFastMover", "false") Do HalffabItemBoomMock.Verifieer() Do ProductMock.Verifieer() Do ProductApiMock.Verifieer() + Do BatchPitchExportedServiceMock.Verifieer() ]]> @@ -185,6 +220,17 @@ Quit HalffabItemMock ]]> + + +BatchId:%String,BatchPitchExportedLijst:%ListOfObjects +vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService + +