Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r42796 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 42796) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 47596) @@ -78,9 +78,9 @@ BeginTime = "" DossierCode = FWG EndTime = "" -ID = RFB08360VS00001D2 +ID = RFB08410VS00001D2 InsertTime = 2014-11-14 09:15:00 -Length = 836 +Length = 841 Pass1Edgeband = W1D08B18 Pass1Exit = "" Pass1PrinterText = "" @@ -89,8 +89,8 @@ Pass1Turning180 = 1 Pass2Edgeband = W1D08B18 Pass2Exit = E -Pass2PrinterText = [1B][01][20][01][CC]TA'OR RFB08360VS00001D2 -Pass2Program = AFKANTEN MELAMINE +Pass2PrinterText = [1B][01][20][01][CC]TA'OR RFB08410VS00001D2 +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -189,21 +189,21 @@ BeginTime = "" DossierCode = CVI EndTime = "" -ID = RMB03660AS00002D1 +ID = RMB03710AS00002D1 InsertTime = 2014-11-14 09:15:00 -Length = 366 +Length = 371 Pass1Edgeband = NED08B17 Pass1Exit = "" -Pass1PrinterText = [1B][01][20][01][CC]TA'OR RMB03660AS00002D1 +Pass1PrinterText = [1B][01][20][01][CC]TA'OR RMB03710AS00002D1 Pass1Program = AFKANTEN FINEER Pass1Tilting180 = 0 Pass1Turning180 = 1 Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 -Pass2Turning180 = 1 +Pass2Turning180 = 0 Pass3Edgeband = "" Pass3Exit = "" Pass3PrinterText = "" @@ -214,8 +214,8 @@ Pass4Exit = E Pass4PrinterText = "" Pass4Program = SCHIELE ZONDER GROEF -Pass4Tilting180 = 0 -Pass4Turning180 = 0 +Pass4Tilting180 = 1 +Pass4Turning180 = 1 PassNumber = 0 Thickness = 13 Toelevering = 222222 Index: vhTest/Mock/APPS/Halux/Machine/OpdeelZaag/impl/DimensieBepaler.cls.xml =================================================================== diff -u -r30624 -r47596 --- vhTest/Mock/APPS/Halux/Machine/OpdeelZaag/impl/DimensieBepaler.cls.xml (.../DimensieBepaler.cls.xml) (revision 30624) +++ vhTest/Mock/APPS/Halux/Machine/OpdeelZaag/impl/DimensieBepaler.cls.xml (.../DimensieBepaler.cls.xml) (revision 47596) @@ -3,8 +3,7 @@ Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig. -Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt -Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur. +Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt 1 APPS.Halux.Machine.OpdeelZaag.impl.DimensieBepaler,Tools.Mock.MockClassBase right Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_BodemSlicingData.xml =================================================================== diff -u -r40265 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_BodemSlicingData.xml (.../External_SQL.DB_BodemSlicingData.xml) (revision 40265) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_BodemSlicingData.xml (.../External_SQL.DB_BodemSlicingData.xml) (revision 47596) @@ -1,9 +1,9 @@ ************************************************** Key = 1 Alignment = S -Barcode = B40V08460BS00001P1 -BasePanelLenght = 846 -BasePanelWidth = 384 +Barcode = B40V08470BS00001P1 +BasePanelLenght = 847 +BasePanelWidth = 385 BatchID = 15000 Dossiercode = FWG NbrOfSlices = 1 @@ -29,8 +29,8 @@ ProgRight4 = "" ProgRight5 = "" SliceType = E -SliceWidth = 379 -SliceWidth1 = 379 +SliceWidth = 380 +SliceWidth1 = 380 SliceWidth2 = "" SliceWidth3 = "" SliceWidth4 = "" @@ -39,9 +39,9 @@ ************************************************** Key = 2 Alignment = P -Barcode = B50A03760BP00002P1 -BasePanelLenght = 376 -BasePanelWidth = 486 +Barcode = B50A03770BP00002P1 +BasePanelLenght = 377 +BasePanelWidth = 487 BatchID = 15000 Dossiercode = CVI NbrOfSlices = 1 @@ -67,8 +67,8 @@ ProgRight4 = "" ProgRight5 = "" SliceType = E -SliceWidth = 479 -SliceWidth1 = 479 +SliceWidth = 480 +SliceWidth1 = 480 SliceWidth2 = "" SliceWidth3 = "" SliceWidth4 = "" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Ardis/ImportAuto/Productie_010_ImportFile_15000_20141114_091500.txt =================================================================== diff -u -r42796 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Ardis/ImportAuto/Productie_010_ImportFile_15000_20141114_091500.txt (.../Productie_010_ImportFile_15000_20141114_091500.txt) (revision 42796) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Ardis/ImportAuto/Productie_010_ImportFile_15000_20141114_091500.txt (.../Productie_010_ImportFile_15000_20141114_091500.txt) (revision 47596) @@ -3,12 +3,12 @@ ZijkantPlaat 1 MELAMINE.W1.065 ZFV40A00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-L/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40A00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 -Rug 1 MELAMINE.W1.130 RFB08360VS00001D2 1 FWG 841 233.5 13 W Melamine BA-RUG/W1-W1/841x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08360VS00001D2/B:836xH:228.5 NoRework 15000001 2014111400 1001 1 -Bodem 1 MELAMINE.W1.065 B40V08460BS00001P1 1 FWG 846 379 6.5 W Melamine BOD(SCH:BO+MO)/W1/846x379/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08460BS00001P1/B:846xD:379 NoRework 15000001 2014111400 1001 1 +Rug 1 MELAMINE.W1.130 RFB08410VS00001D2 1 FWG 846 233.5 13 W Melamine BA-RUG/W1-W1/846x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08410VS00001D2/B:841xH:228.5 NoRework 15000001 2014111400 1001 1 +Bodem 1 MELAMINE.W1.065 B40V08470BS00001P1 1 FWG 852 385 6.5 W Melamine BOD(SCH:BO+MO)/W1/852x385/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08470BS00001P1/B:847xD:380 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 -Rug 1 FINEER.NE.130 RMB03660AS00002D1 2 CVI 371 81.5 13 NE Fineer BA-RUG/NE-NE/371x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03660AS00002D1/B:366xH:76.5 NoRework 15000001 2014111400 1001 2 -Bodem 1 FINEER.NE.065 B50A03760BP00002P1 2 CVI 376 479 6.5 NE Fineer BOD(SCH:BO+MO)/NE/376x479/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03760BP00002P1/B:376xD:479 NoRework 15000001 2014111400 1001 2 -Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 393 108.5 9 NE Fineer FRO/NE-NE/393x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 +Rug 1 FINEER.NE.130 RMB03710AS00002D1 2 CVI 376 81.5 13 NE Fineer BA-RUG/NE-NE/376x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03710AS00002D1/B:371xH:76.5 NoRework 15000001 2014111400 1001 2 +Bodem 1 FINEER.NE.065 B50A03770BP00002P1 2 CVI 382 487 6.5 NE Fineer BOD(SCH:BO+MO)/NE/382x487/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03770BP00002P1/B:377xD:480 NoRework 15000001 2014111400 1001 2 +Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 398 108.5 9 NE Fineer FRO/NE-NE/398x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Productie_004_TAX_OnderdelenPickingLijst.txt =================================================================== diff -u -r42820 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Productie_004_TAX_OnderdelenPickingLijst.txt (.../Productie_004_TAX_OnderdelenPickingLijst.txt) (revision 42820) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Productie_004_TAX_OnderdelenPickingLijst.txt (.../Productie_004_TAX_OnderdelenPickingLijst.txt) (revision 47596) @@ -6,10 +6,10 @@ -------------------------|--------------------------|----|-------|-------- Product omschrijving | Korttekst | # | Lengt | Control -------------------------|--------------------------|----|-------|-------- - Bodemplaat, Fineer, |HDP.06X2450X1250BO-ZK NE | 1 | 376 | CVI 1 | + Bodemplaat, Fineer, |HDP.06X2450X1250BO-ZK NE | 1 | 377 | CVI 1 | Natuur eikenhout | | | | | | | | | | - Bodemplaat, Melamine, |HDP.06X2800X1030BO-ZK W1 | 1 | 846 | FWG 1 | + Bodemplaat, Melamine, |HDP.06X2800X1030BO-ZK W1 | 1 | 847 | FWG 1 | Wit | | | | | | | | | | Frontbevestiging, |ZF7M7002 FROB V500 ZN | 6 | | FWG 1 | Index: APPS/Halux/Machine/OpdeelZaag/impl/DimensieBepaler.cls.xml =================================================================== diff -u -r34943 -r47596 --- APPS/Halux/Machine/OpdeelZaag/impl/DimensieBepaler.cls.xml (.../DimensieBepaler.cls.xml) (revision 34943) +++ APPS/Halux/Machine/OpdeelZaag/impl/DimensieBepaler.cls.xml (.../DimensieBepaler.cls.xml) (revision 47596) @@ -45,20 +45,18 @@ @@ -68,7 +66,7 @@ #dim Front As DOM.PM.Maatwerk.LadeInfo.Front = FrontPlaat.GeefFront() #dim Overmaat As TECH.Decimal = ..OvermaatBepaler.BepaalOvermaat(Front) Set ..Dimensie.Breedte = ..Dimensie.Breedte + Overmaat - Set ..Dimensie.Lengte = ..Dimensie.Lengte + $select(Front.GeefLade().GeefConcept()=##class(DOM.PM.enu.TAORConcept).Baliko():0,1:Overmaat) + Set ..Dimensie.Lengte = ..Dimensie.Lengte + $select(Front.GeefLade().GeefConcept()=##class(DOM.PM.enu.TAORConcept).Baliko():Overmaat,1:Overmaat) ]]> Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Biesse/ImportAuto/15000/Productie_008_ImportFile_15000_20141114_091500.txt =================================================================== diff -u -r42796 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Biesse/ImportAuto/15000/Productie_008_ImportFile_15000_20141114_091500.txt (.../Productie_008_ImportFile_15000_20141114_091500.txt) (revision 42796) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/Biesse/ImportAuto/15000/Productie_008_ImportFile_15000_20141114_091500.txt (.../Productie_008_ImportFile_15000_20141114_091500.txt) (revision 47596) @@ -3,12 +3,12 @@ ZijkantPlaat 1 MELAMINE.W1.065 ZFV40A00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-L/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40A00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 -Rug 1 MELAMINE.W1.130 RFB08360VS00001D2 1 FWG 841 233.5 13 W Melamine BA-RUG/W1-W1/841x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08360VS00001D2/B:836xH:228.5 NoRework 15000001 2014111400 1001 1 -Bodem 1 MELAMINE.W1.065 B40V08460BS00001P1 1 FWG 846 379 6.5 W Melamine BOD(SCH:BO+MO)/W1/846x379/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08460BS00001P1/B:846xD:379 NoRework 15000001 2014111400 1001 1 +Rug 1 MELAMINE.W1.130 RFB08410VS00001D2 1 FWG 846 233.5 13 W Melamine BA-RUG/W1-W1/846x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08410VS00001D2/B:841xH:228.5 NoRework 15000001 2014111400 1001 1 +Bodem 1 MELAMINE.W1.065 B40V08470BS00001P1 1 FWG 852 385 6.5 W Melamine BOD(SCH:BO+MO)/W1/852x385/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08470BS00001P1/B:847xD:380 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 -Rug 1 FINEER.NE.130 RMB03660AS00002D1 2 CVI 371 81.5 13 NE Fineer BA-RUG/NE-NE/371x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03660AS00002D1/B:366xH:76.5 NoRework 15000001 2014111400 1001 2 -Bodem 1 FINEER.NE.065 B50A03760BP00002P1 2 CVI 376 479 6.5 NE Fineer BOD(SCH:BO+MO)/NE/376x479/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03760BP00002P1/B:376xD:479 NoRework 15000001 2014111400 1001 2 -Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 393 108.5 9 NE Fineer FRO/NE-NE/393x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 +Rug 1 FINEER.NE.130 RMB03710AS00002D1 2 CVI 376 81.5 13 NE Fineer BA-RUG/NE-NE/376x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03710AS00002D1/B:371xH:76.5 NoRework 15000001 2014111400 1001 2 +Bodem 1 FINEER.NE.065 B50A03770BP00002P1 2 CVI 382 487 6.5 NE Fineer BOD(SCH:BO+MO)/NE/382x487/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03770BP00002P1/B:377xD:480 NoRework 15000001 2014111400 1001 2 +Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 398 108.5 9 NE Fineer FRO/NE-NE/398x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Ardis/ImportAuto/Productie_010_ImportFile_15000_20141114_091500.txt =================================================================== diff -u -r42796 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Ardis/ImportAuto/Productie_010_ImportFile_15000_20141114_091500.txt (.../Productie_010_ImportFile_15000_20141114_091500.txt) (revision 42796) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Ardis/ImportAuto/Productie_010_ImportFile_15000_20141114_091500.txt (.../Productie_010_ImportFile_15000_20141114_091500.txt) (revision 47596) @@ -3,12 +3,12 @@ ZijkantPlaat 1 MELAMINE.W1.065 ZFV40A00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-L/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40A00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 -Rug 1 MELAMINE.W1.130 RFB08360VS00001D2 1 FWG 841 233.5 13 W Melamine BA-RUG/W1-W1/841x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08360VS00001D2/B:836xH:228.5 NoRework 15000001 2014111400 1001 1 -Bodem 1 MELAMINE.W1.065 B40V08460BS00001P1 1 FWG 846 379 6.5 W Melamine BOD(SCH:BO+MO)/W1/846x379/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08460BS00001P1/B:846xD:379 NoRework 15000001 2014111400 1001 1 +Rug 1 MELAMINE.W1.130 RFB08410VS00001D2 1 FWG 846 233.5 13 W Melamine BA-RUG/W1-W1/846x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08410VS00001D2/B:841xH:228.5 NoRework 15000001 2014111400 1001 1 +Bodem 1 MELAMINE.W1.065 B40V08470BS00001P1 1 FWG 852 385 6.5 W Melamine BOD(SCH:BO+MO)/W1/852x385/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08470BS00001P1/B:847xD:380 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 -Rug 1 FINEER.NE.130 RMB03660AS00002D1 2 CVI 371 81.5 13 NE Fineer BA-RUG/NE-NE/371x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03660AS00002D1/B:366xH:76.5 NoRework 15000001 2014111400 1001 2 -Bodem 1 FINEER.NE.065 B50A03760BP00002P1 2 CVI 376 479 6.5 NE Fineer BOD(SCH:BO+MO)/NE/376x479/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03760BP00002P1/B:376xD:479 NoRework 15000001 2014111400 1001 2 -Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 393 108.5 9 NE Fineer FRO/NE-NE/393x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 +Rug 1 FINEER.NE.130 RMB03710AS00002D1 2 CVI 376 81.5 13 NE Fineer BA-RUG/NE-NE/376x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03710AS00002D1/B:371xH:76.5 NoRework 15000001 2014111400 1001 2 +Bodem 1 FINEER.NE.065 B50A03770BP00002P1 2 CVI 382 487 6.5 NE Fineer BOD(SCH:BO+MO)/NE/382x487/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03770BP00002P1/B:377xD:480 NoRework 15000001 2014111400 1001 2 +Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 398 108.5 9 NE Fineer FRO/NE-NE/398x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_BodemSlicingData.xml =================================================================== diff -u -r40265 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_BodemSlicingData.xml (.../External_SQL.DB_BodemSlicingData.xml) (revision 40265) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_BodemSlicingData.xml (.../External_SQL.DB_BodemSlicingData.xml) (revision 47596) @@ -1,9 +1,9 @@ ************************************************** Key = 1 Alignment = S -Barcode = B40V08460BS00001P1 -BasePanelLenght = 846 -BasePanelWidth = 384 +Barcode = B40V08470BS00001P1 +BasePanelLenght = 847 +BasePanelWidth = 385 BatchID = 15000 Dossiercode = FWG NbrOfSlices = 1 @@ -29,8 +29,8 @@ ProgRight4 = "" ProgRight5 = "" SliceType = E -SliceWidth = 379 -SliceWidth1 = 379 +SliceWidth = 380 +SliceWidth1 = 380 SliceWidth2 = "" SliceWidth3 = "" SliceWidth4 = "" @@ -39,9 +39,9 @@ ************************************************** Key = 2 Alignment = P -Barcode = B50A03760BP00002P1 -BasePanelLenght = 376 -BasePanelWidth = 486 +Barcode = B50A03770BP00002P1 +BasePanelLenght = 377 +BasePanelWidth = 487 BatchID = 15000 Dossiercode = CVI NbrOfSlices = 1 @@ -67,8 +67,8 @@ ProgRight4 = "" ProgRight5 = "" SliceType = E -SliceWidth = 479 -SliceWidth1 = 479 +SliceWidth = 480 +SliceWidth1 = 480 SliceWidth2 = "" SliceWidth3 = "" SliceWidth4 = "" Index: APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder.cls.xml =================================================================== diff -u -r38326 -r47596 --- APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder.cls.xml (.../PassageDefinitieDefinieerder.cls.xml) (revision 38326) +++ APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder.cls.xml (.../PassageDefinitieDefinieerder.cls.xml) (revision 47596) @@ -31,9 +31,9 @@ do ..VoegToe("Baliko","Fineer","Zijkant").MetWaarde("4","SCHIELE ZONDER GROEF","","","D") do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("1","AFKANTEN FINEER","1","","") - do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("2","AFKANTEN FINEER","1","1","") + do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("2","AFKANTEN FINEER MET GROEF","","1","") do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("3","SCHIELE ZONDER GROEF","1","","") - do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("4","SCHIELE ZONDER GROEF","","","E") + do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("4","SCHIELE ZONDER GROEF","1","1","E") do ..VoegToe("Baliko","Fineer","Front").MetWaarde("1","AFKANTEN FINEER","1","","") do ..VoegToe("Baliko","Fineer","Front").MetWaarde("2","AFKANTEN FINEER","1","1","") @@ -44,7 +44,7 @@ do ..VoegToe("Baliko","Melamine","Zijkant").MetWaarde("2","AFKANTEN MELAMINE","","1","D") do ..VoegToe("Baliko","Melamine","Rug").MetWaarde("1","AFKANTEN MELAMINE","1","","") - do ..VoegToe("Baliko","Melamine","Rug").MetWaarde("2","AFKANTEN MELAMINE","","","E") + do ..VoegToe("Baliko","Melamine","Rug").MetWaarde("2","AFKANTEN MELAMINE MET GROEF","","","E") do ..VoegToe("Baliko","Melamine","Front").MetWaarde("1","AFKANTEN MELAMINE","1","","") do ..VoegToe("Baliko","Melamine","Front").MetWaarde("2","AFKANTEN MELAMINE","","","E") Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Biesse/ImportAuto/15000/Productie_008_ImportFile_15000_20141114_091500.txt =================================================================== diff -u -r42796 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Biesse/ImportAuto/15000/Productie_008_ImportFile_15000_20141114_091500.txt (.../Productie_008_ImportFile_15000_20141114_091500.txt) (revision 42796) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Biesse/ImportAuto/15000/Productie_008_ImportFile_15000_20141114_091500.txt (.../Productie_008_ImportFile_15000_20141114_091500.txt) (revision 47596) @@ -3,12 +3,12 @@ ZijkantPlaat 1 MELAMINE.W1.065 ZFV40A00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-L/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40A00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 MELAMINE.W1.065 ZFV40B00001 1 FWG 392 243.5 6.5 W Melamine ZIJ-R/W1-W1-W1/392x243.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 nolabel ZFV40B00001/D:387xH:238.5 NoRework 15000001 2014111400 1001 1 -Rug 1 MELAMINE.W1.130 RFB08360VS00001D2 1 FWG 841 233.5 13 W Melamine BA-RUG/W1-W1/841x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08360VS00001D2/B:836xH:228.5 NoRework 15000001 2014111400 1001 1 -Bodem 1 MELAMINE.W1.065 B40V08460BS00001P1 1 FWG 846 379 6.5 W Melamine BOD(SCH:BO+MO)/W1/846x379/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08460BS00001P1/B:846xD:379 NoRework 15000001 2014111400 1001 1 +Rug 1 MELAMINE.W1.130 RFB08410VS00001D2 1 FWG 846 233.5 13 W Melamine BA-RUG/W1-W1/846x233.5/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 RFB08410VS00001D2/B:841xH:228.5 NoRework 15000001 2014111400 1001 1 +Bodem 1 MELAMINE.W1.065 B40V08470BS00001P1 1 FWG 852 385 6.5 W Melamine BOD(SCH:BO+MO)/W1/852x385/FWG/AL//MA 14a/000(1)/KAR 1:1/1 T1/V1/UNITTEST KLA/2222-1:2 B40V08470BS00001P1/B:847xD:380 NoRework 15000001 2014111400 1001 1 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50A00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-L/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50A00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 ZijkantPlaat 1 FINEER.NE.065 ZMA50B00002 2 CVI 492 91.5 6.5 NE Fineer ZIJ-R/NE-NE-NE/492x91.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 nolabel ZMA50B00002/D:487xH:86.5 NoRework 15000001 2014111400 1001 2 -Rug 1 FINEER.NE.130 RMB03660AS00002D1 2 CVI 371 81.5 13 NE Fineer BA-RUG/NE-NE/371x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03660AS00002D1/B:366xH:76.5 NoRework 15000001 2014111400 1001 2 -Bodem 1 FINEER.NE.065 B50A03760BP00002P1 2 CVI 376 479 6.5 NE Fineer BOD(SCH:BO+MO)/NE/376x479/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03760BP00002P1/B:376xD:479 NoRework 15000001 2014111400 1001 2 -Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 393 108.5 9 NE Fineer FRO/NE-NE/393x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 +Rug 1 FINEER.NE.130 RMB03710AS00002D1 2 CVI 376 81.5 13 NE Fineer BA-RUG/NE-NE/376x81.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 RMB03710AS00002D1/B:371xH:76.5 NoRework 15000001 2014111400 1001 2 +Bodem 1 FINEER.NE.065 B50A03770BP00002P1 2 CVI 382 487 6.5 NE Fineer BOD(SCH:BO+MO)/NE/382x487/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 B50A03770BP00002P1/B:377xD:480 NoRework 15000001 2014111400 1001 2 +Front 1 FINEER.NE.090 FMB03930AS00002D1 2 CVI 398 108.5 9 NE Fineer FRO/NE-NE/398x108.5/CVI/AL/+FRONT/OP 14a/000(2)/KAR 1:1/2* T1/V1/UNITTEST KLA/2222-2:2 FMB03930AS00002D1/B:393xH:103.5 NoRework 15000001 2014111400 1001 2 Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r42796 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 42796) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 47596) @@ -78,9 +78,9 @@ BeginTime = "" DossierCode = FWG EndTime = "" -ID = RFB08360VS00001D2 +ID = RFB08410VS00001D2 InsertTime = 2014-11-14 09:15:00 -Length = 836 +Length = 841 Pass1Edgeband = W1D08B18 Pass1Exit = "" Pass1PrinterText = "" @@ -89,8 +89,8 @@ Pass1Turning180 = 1 Pass2Edgeband = W1D08B18 Pass2Exit = E -Pass2PrinterText = [1B][01][20][01][CC]TA'OR RFB08360VS00001D2 -Pass2Program = AFKANTEN MELAMINE +Pass2PrinterText = [1B][01][20][01][CC]TA'OR RFB08410VS00001D2 +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -189,21 +189,21 @@ BeginTime = "" DossierCode = CVI EndTime = "" -ID = RMB03660AS00002D1 +ID = RMB03710AS00002D1 InsertTime = 2014-11-14 09:15:00 -Length = 366 +Length = 371 Pass1Edgeband = NED08B17 Pass1Exit = "" -Pass1PrinterText = [1B][01][20][01][CC]TA'OR RMB03660AS00002D1 +Pass1PrinterText = [1B][01][20][01][CC]TA'OR RMB03710AS00002D1 Pass1Program = AFKANTEN FINEER Pass1Tilting180 = 0 Pass1Turning180 = 1 Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 -Pass2Turning180 = 1 +Pass2Turning180 = 0 Pass3Edgeband = "" Pass3Exit = "" Pass3PrinterText = "" @@ -214,8 +214,8 @@ Pass4Exit = E Pass4PrinterText = "" Pass4Program = SCHIELE ZONDER GROEF -Pass4Tilting180 = 0 -Pass4Turning180 = 0 +Pass4Tilting180 = 1 +Pass4Turning180 = 1 PassNumber = 0 Thickness = 13 Toelevering = 222222 Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Productie_004_TAX_OnderdelenPickingLijst.txt =================================================================== diff -u -r42820 -r47596 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Productie_004_TAX_OnderdelenPickingLijst.txt (.../Productie_004_TAX_OnderdelenPickingLijst.txt) (revision 42820) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/Productie_004_TAX_OnderdelenPickingLijst.txt (.../Productie_004_TAX_OnderdelenPickingLijst.txt) (revision 47596) @@ -6,10 +6,10 @@ -------------------------|--------------------------|----|-------|-------- Product omschrijving | Korttekst | # | Lengt | Control -------------------------|--------------------------|----|-------|-------- - Bodemplaat, Fineer, |HDP.06X2450X1250BO-ZK NE | 1 | 376 | CVI 1 | + Bodemplaat, Fineer, |HDP.06X2450X1250BO-ZK NE | 1 | 377 | CVI 1 | Natuur eikenhout | | | | | | | | | | - Bodemplaat, Melamine, |HDP.06X2800X1030BO-ZK W1 | 1 | 846 | FWG 1 | + Bodemplaat, Melamine, |HDP.06X2800X1030BO-ZK W1 | 1 | 847 | FWG 1 | Wit | | | | | | | | | | Frontbevestiging, |ZF7M7002 FROB V500 ZN | 6 | | FWG 1 | Index: DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/HFBodemPlaatv000.cls.xml =================================================================== diff -u -r31848 -r47596 --- DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/HFBodemPlaatv000.cls.xml (.../HFBodemPlaatv000.cls.xml) (revision 31848) +++ DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/HFBodemPlaatv000.cls.xml (.../HFBodemPlaatv000.cls.xml) (revision 47596) @@ -51,15 +51,15 @@ IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken 1 TECH.Integer - IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken 1 %Decimal - Index: vhDeploy/Deploy20171115xUpdateKantenbandPassageDefinities.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20171115xUpdateKantenbandPassageDefinities.cls.xml (revision 0) +++ vhDeploy/Deploy20171115xUpdateKantenbandPassageDefinities.cls.xml (revision 47596) @@ -0,0 +1,21 @@ + + + +vhDeploy.Deploy + + +%String +Update Kantenband Passage Definities + + + +1 + + + + + + Index: DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/HFRugPlaatv000.cls.xml =================================================================== diff -u -r34939 -r47596 --- DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/HFRugPlaatv000.cls.xml (.../HFRugPlaatv000.cls.xml) (revision 34939) +++ DOM/PM/Maatwerk/Calc/HF/impl/TAOR/Builder/HFRugPlaatv000.cls.xml (.../HFRugPlaatv000.cls.xml) (revision 47596) @@ -36,7 +36,7 @@ If (ConceptBepaler.Bepaal(IngegevenKenmerken) = ..Enum.Concept.Valinge) { Set Aftrek = 31 } Else { - Set Aftrek = 42 + Set Aftrek = 37 } Quit IngegevenKenmerken.InterneBreedte - Aftrek