Index: APPS/Halux/Planning/PlanningService.cls.xml
===================================================================
diff -u -r3292 -r3463
--- APPS/Halux/Planning/PlanningService.cls.xml (.../PlanningService.cls.xml) (revision 3292)
+++ APPS/Halux/Planning/PlanningService.cls.xml (.../PlanningService.cls.xml) (revision 3463)
@@ -323,6 +323,7 @@
}
Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+ Set DataService = ##class(APPS.common.DataService).%New()
Set ResultSet = ##class(%ResultSet).%New("APPS.Halux.Planning.impl.Queries:qGeefStockProblemen")
Do ResultSet.Execute(ToeleveringNummer)
@@ -345,10 +346,12 @@
{
Set StockProbleemInfo = ##class(APPS.Halux.Planning.dto.StockProbleemInfo).%New()
Set StockProbleemInfo.ProductCode = ResultSet.Data("ProductCode")
+ Set StockProbleemInfo.ProductData = DataService.GeefProductData(ResultSet.Data("ProductID"))
Set HalffabrikaatPRNr = $P(^HADPR("F",FabKey,"AR",BSKey),"\",1)
Set HalffabrikaatProduct = ProductAPI.GeefProduct(HalffabrikaatPRNr)
Set StockProbleemInfo.HalffabrikaatCode = HalffabrikaatProduct.GeefKorttekst()
+ Set StockProbleemInfo.HalffabrikaatData = DataService.GeefProductData(HalffabrikaatPRNr)
Set StockProbleemInfo.Aantal = $P(^HADPR("F",FabKey,"AR",BSKey),"\",3)
Set StockProbleemInfo.Status = "F"
Index: APPS/Halux/Planning/dto/StockProbleemInfo.cls.xml
===================================================================
diff -u -r1398 -r3463
--- APPS/Halux/Planning/dto/StockProbleemInfo.cls.xml (.../StockProbleemInfo.cls.xml) (revision 1398)
+++ APPS/Halux/Planning/dto/StockProbleemInfo.cls.xml (.../StockProbleemInfo.cls.xml) (revision 3463)
@@ -17,6 +17,10 @@
%String
+
+DOM.common.dto.ProductData
+
+
%Boolean
@@ -25,6 +29,10 @@
%String
+
+DOM.common.dto.ProductData
+
+
%Integer
Index: APPS/Halux/Planning/impl/Queries.cls.xml
===================================================================
diff -u -r2645 -r3463
--- APPS/Halux/Planning/impl/Queries.cls.xml (.../Queries.cls.xml) (revision 2645)
+++ APPS/Halux/Planning/impl/Queries.cls.xml (.../Queries.cls.xml) (revision 3463)
@@ -8,7 +8,7 @@
%SQLQuery
ToeleveringNummer:%Integer
- SELECT ProductCode, ProductNummer, ToeleveringLijnNr, Aantal FROM APPS_Halux_Planning_impl.ProductInfo WHERE ToeleveringInfoID = :ToeleveringNummer AND StockProbleem is not null
+ SELECT ProductNummer As ProductID, ProductCode, ProductNummer, ToeleveringLijnNr, Aantal FROM APPS_Halux_Planning_impl.ProductInfo WHERE ToeleveringInfoID = :ToeleveringNummer AND StockProbleem is not null
@@ -45,7 +45,7 @@
%SQLQuery
Datum:%Date,Categorie:APPS.Halux.Planning.enu.Categorie
-
%SQLQuery
Datum:%Date,Categorie:APPS.Halux.Planning.enu.Categorie
- 'Impliciet' THEN 1 ELSE 0 END) As IsInfoBeschikbaar, TI.Klant, TI.LeverImpact, TI.ProductieStatus, TI.ToeleveringNummer, APPS_Halux_Planning_impl.Queries_AantalProductenIn(TI.ToeleveringNummer,PI.ToeleveringLijnNr) As Aantal, PI.ProductCode, max(PI.StockProbleem) As StockProbleem, PI.VerpakkingType,
+ 'Impliciet' THEN 1 ELSE 0 END) As IsInfoBeschikbaar, TI.Klant, TI.LeverImpact, TI.ProductieStatus, TI.ToeleveringNummer, APPS_Halux_Planning_impl.Queries_AantalProductenIn(TI.ToeleveringNummer,PI.ToeleveringLijnNr) As Aantal, PI.ProductCode, max(PI.StockProbleem) As StockProbleem, PI.VerpakkingType,
COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUFrees_VM,
COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal),0) As ALUFrees,
COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUTeam_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUTeam_VM,