Index: PRODUKT4.mac.rou =================================================================== diff -u -r1654 -r1656 --- PRODUKT4.mac.rou (.../PRODUKT4.mac.rou) (revision 1654) +++ PRODUKT4.mac.rou (.../PRODUKT4.mac.rou) (revision 1656) @@ -76,14 +76,16 @@ set WMSIncl = $get(WMSIncl,1) set:$length(Week) Datum = $$INTDATE^vhDTyp(Week,"DW") set Type = $get(Type) - new StockService set StockService = ##class(APPS.common.StockNiveauService).GeefServiceViaPRNr(PRNr,Datum,,WMSIncl) + new StockService set StockService = ##class(APPS.common.StockNiveauService).GeefServiceViaPRNr(PRNr,Datum) new resGetStock + if Type="" { new dto set dto = StockService.GeefAlleStockTypeNiveaus() - set resGetStock = dto.Fysisch_"\"_dto.Praktisch_"\"_dto.Theoretisch_"\\"_dto.InReceptie_"\"_dto.InReceptieGestockeerd + set resGetStock = $select(WMSIncl:dto.FysischMinReservaties,1:dto.Fysisch)_"\"_ + dto.Praktisch_"\"_dto.Theoretisch_"\\"_dto.InReceptie_"\"_dto.InReceptieGestockeerd } elseif Type = "F" { - set resGetStock = StockService.GeefFysischeStock() + set resGetStock = $select(WMSIncl:StockService.GeefFysischeStockMinReservaties(),1:StockService.GeefFysischeStock()) } elseif Type = "P" { set resGetStock = StockService.GeefPraktischeStock() } elseif Type = "T" {