Index: vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml =================================================================== diff -u -r72373 -r73780 --- vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 72373) +++ vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 73780) @@ -23,9 +23,9 @@ -Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date +Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date,TransportNr:%String="" WS.Transsmart.tns.doManifest - Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml =================================================================== diff -u -r73215 -r73780 --- vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 73215) +++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 73780) @@ -21,13 +21,6 @@ ]]> - -Carrier:%String,DateFrom:%TimeStamp,DateTo:%TimeStamp -WS.Transsmart.tns.getStatusHistoryByQuery - - - LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit WS.Transsmart.tns.doBooking @@ -43,7 +36,7 @@ -Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date +Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date,TransportNr:%String="" WS.Transsmart.tns.doManifest @@ -55,6 +48,13 @@ + + +Carrier:%String,DateFrom:%TimeStamp,DateTo:%TimeStamp +WS.Transsmart.tns.getStatusHistoryByQuery + + Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/ManifesteerTransporteur.cls.xml =================================================================== diff -u -r68311 -r73780 --- APPS/TRANSP/Transsmart/impl/CommunicatieService/ManifesteerTransporteur.cls.xml (.../ManifesteerTransporteur.cls.xml) (revision 68311) +++ APPS/TRANSP/Transsmart/impl/CommunicatieService/ManifesteerTransporteur.cls.xml (.../ManifesteerTransporteur.cls.xml) (revision 73780) @@ -4,10 +4,10 @@ APPS.TRANSP.Transsmart.impl.BerichtVerzenderTemplate -Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date +Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date,TransportNr:%String="" Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoManifestvoorDachsermettransportnr/doManifestRequest.xml =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoManifestvoorDachsermettransportnr/doManifestRequest.xml (revision 0) +++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoManifestvoorDachsermettransportnr/doManifestRequest.xml (revision 73780) @@ -0,0 +1,13 @@ + + + + DELIVERYID + 12345 + DAC + 1234 + doManifest + 2.0 + 2011-06-30 + 2011-07-04 + + \ No newline at end of file Index: APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml =================================================================== diff -u -r73779 -r73780 --- APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml (.../CommunicatieService.cls.xml) (revision 73779) +++ APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml (.../CommunicatieService.cls.xml) (revision 73780) @@ -71,20 +71,23 @@ // Do ..UitgesteldeZendingLijst.Rapport(RitID) Do ..ControleerRitVoorBevestiging(RitID) If (Rit.GeefTransporteur() = Transporteur.Schenker) { - Do ..ManifesteerTransporteur("SNB","",##class(TECH.DateTime).BerekenWerkdag($h,-2),##class(TECH.DateTime).BerekenWerkdag($h,3)) + Do ..ManifesteerTransporteur("SNB","",##class(TECH.DateTime).BerekenWerkdag($h,-2),##class(TECH.DateTime).BerekenWerkdag($h,3),Rit.GeefID()) } + If (Rit.GeefTransporteur() = Transporteur.Dachser) { + Do ..ManifesteerTransporteur("DAC","",##class(TECH.DateTime).BerekenWerkdag($h,-2),##class(TECH.DateTime).BerekenWerkdag($h,3),Rit.GeefID()) + } ]]> -Transporteur:%String,CostCenter:%String,PickupDatumVan:%Date,PickupDatumTot:%Date +Transporteur:%String,CostCenter:%String,PickupDatumVan:%Date,PickupDatumTot:%Date,TransportNr:%String="" Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml =================================================================== diff -u -r73465 -r73780 --- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml (.../Test.cls.xml) (revision 73465) +++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml (.../Test.cls.xml) (revision 73780) @@ -453,6 +453,14 @@ ]]> + + + + -Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date +Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date,TransportNr:%String="" WS.Transsmart.tns.doManifest - Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml =================================================================== diff -u -r73710 -r73780 --- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 73710) +++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 73780) @@ -65,7 +65,7 @@ -Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date +Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date,TransportNr:%String="" WS.Transsmart.tns.doManifest Index: APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml =================================================================== diff -u -r72373 -r73780 --- APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 72373) +++ APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 73780) @@ -24,7 +24,7 @@ 1 -Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date +Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date,TransportNr:%String="" WS.Transsmart.tns.doManifest