Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestFlatpackV1/StartBatch/External_SQL.DB_BodemSlicingData.xml =================================================================== diff -u -r31811 -r33739 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestFlatpackV1/StartBatch/External_SQL.DB_BodemSlicingData.xml (.../External_SQL.DB_BodemSlicingData.xml) (revision 31811) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestFlatpackV1/StartBatch/External_SQL.DB_BodemSlicingData.xml (.../External_SQL.DB_BodemSlicingData.xml) (revision 33739) @@ -24,7 +24,7 @@ ProgLeft4 = "" ProgLeft5 = "" ProgRight1 = F_ST_FIN_2 -ProgRight2 = F_CL_FIN_2 +ProgRight2 = F_CL_FIN ProgRight3 = "" ProgRight4 = "" ProgRight5 = "" @@ -62,7 +62,7 @@ ProgLeft4 = "" ProgLeft5 = "" ProgRight1 = F_ST_MEL_2 -ProgRight2 = F_CL_MEL_2 +ProgRight2 = F_CL_MEL ProgRight3 = "" ProgRight4 = "" ProgRight5 = "" Index: APPS/Halux/PPS/Activiteit/impl/TAOR/Bodem/SlicingDataAanvuller.cls.xml =================================================================== diff -u -r31669 -r33739 --- APPS/Halux/PPS/Activiteit/impl/TAOR/Bodem/SlicingDataAanvuller.cls.xml (.../SlicingDataAanvuller.cls.xml) (revision 31669) +++ APPS/Halux/PPS/Activiteit/impl/TAOR/Bodem/SlicingDataAanvuller.cls.xml (.../SlicingDataAanvuller.cls.xml) (revision 33739) @@ -55,7 +55,8 @@ #dim ProfielRugZijde As APPS.Halux.Machine.BodemSlicing.enu.SliceProfiel = $select(Counter=UitvoeringInfo.BodemSlicingData.NbrOfSlices:##class(APPS.Halux.Machine.BodemSlicing.enu.SliceProfiel).Recht(),1:##class(APPS.Halux.Machine.BodemSlicing.enu.SliceProfiel).Click()) set $property(UitvoeringInfo.BodemSlicingData,"ProgLeft"_Counter) = ..ProgrammaBepaler.BepaalProgramma(..BodemPlaat,##class(APPS.Halux.Machine.BodemSlicing.enu.SliceZijde).Rug(),ProfielRugZijde) - set $property(UitvoeringInfo.BodemSlicingData,"ProgRight"_Counter) = ..ProgrammaBepaler.BepaalProgramma(..BodemPlaat,##class(APPS.Halux.Machine.BodemSlicing.enu.SliceZijde).Front(),ProfielFrontZijde) + #dim ProgRight As %String = ..ProgrammaBepaler.BepaalProgramma(..BodemPlaat,##class(APPS.Halux.Machine.BodemSlicing.enu.SliceZijde).Front(),ProfielFrontZijde) + set $property(UitvoeringInfo.BodemSlicingData,"ProgRight"_Counter) = $$$If(Counter=1,ProgRight,$piece(ProgRight,"_",1,$length(ProgRight,"_")-1)) set $property(UitvoeringInfo.BodemSlicingData,"SliceWidth"_Counter) = UitvoeringInfo.BodemSlicingData.SliceWidth set $property(UitvoeringInfo.BodemSlicingData,"PrintBegin"_Counter) = "PrintBegin"_Counter set $property(UitvoeringInfo.BodemSlicingData,"PrintEnd"_Counter) = "PrintEnd"_Counter