Index: vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml =================================================================== diff -u -r2572 -r2783 --- vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml (.../TestVHossCases.cls.xml) (revision 2572) +++ vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml (.../TestVHossCases.cls.xml) (revision 2783) @@ -2,7 +2,7 @@ -do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot") +do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot.TestVHossCases") 1 vhUnitTest.APPS.VisiDot.VHossTestCase 0 @@ -11,6 +11,20 @@ vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture + +%Integer + + + +%String +9999999 + + + +%String +1239 + + Opzetten van de VHossBuilder @@ -19,23 +33,41 @@ aTestName:%String %Status - -%Status - - - + + +1 +APPS.VisiDot.IVHossService,%RegisteredObject +0 + + +%String +709565 + + + +KlantID:%Integer,VHossID:%String +%Boolean + + + + + +Leen Vhoss Uit, indien faalt wordt error gethrowed. +KlantID:%Integer,VHossID:%String + + + + +VHossID:%String + + + + + Orders -> Recupereerbare Verpakking +Afdalen tot VHoss, dan op 'H' duwen voor Historiek]]> +KlantID:%Integer,FrameID:%String,AantalVHossen:%Integer +1 + + + + FishEye: Tag 2783 refers to a dead (removed) revision in file `vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: APPS/VisiDot/enu/HistPakBeweging.cls.xml =================================================================== diff -u --- APPS/VisiDot/enu/HistPakBeweging.cls.xml (revision 0) +++ APPS/VisiDot/enu/HistPakBeweging.cls.xml (revision 2783) @@ -0,0 +1,31 @@ + + + +datatype +1 +%String +0 + + +,I,U + + + +;Inkomend;Uitgaand + + + +1 +expression + + + + +1 +expression + + + + Index: vhUnitTest/APPS/common/Toelevering.cls.xml =================================================================== diff -u -r2686 -r2783 --- vhUnitTest/APPS/common/Toelevering.cls.xml (.../Toelevering.cls.xml) (revision 2686) +++ vhUnitTest/APPS/common/Toelevering.cls.xml (.../Toelevering.cls.xml) (revision 2783) @@ -17,7 +17,7 @@ Return : ToeleveringID 1 -LeverancierID:%Integer,ProductLijst:%String +LeverancierID:%Integer,ProductLijst:%String,OrderID:%String="" %Integer Index: APPS/VisiDot/IVHossService.cls.xml =================================================================== diff -u --- APPS/VisiDot/IVHossService.cls.xml (revision 0) +++ APPS/VisiDot/IVHossService.cls.xml (revision 2783) @@ -0,0 +1,24 @@ + + + +1 +1 +0 + + +1 +KlantID:%Integer,VHossID:%String +%Boolean + + + +1 +KlantID:%Integer,VHossID:%String + + + +1 +VHossID:%String + + + Index: APPS/VisiDot/impl/VHossControleurZijkant.cls.xml =================================================================== diff -u -r2571 -r2783 --- APPS/VisiDot/impl/VHossControleurZijkant.cls.xml (.../VHossControleurZijkant.cls.xml) (revision 2571) +++ APPS/VisiDot/impl/VHossControleurZijkant.cls.xml (.../VHossControleurZijkant.cls.xml) (revision 2783) @@ -117,7 +117,7 @@ Set ProcessedData=..CaptureHelper.GeefData() Set Afhandelaar = ##class(APPS.VisiDot.impl.ZijkantAfhandelaar).%New() - Do Afhandelaar.Verwerk(ProcessedData) + Do Afhandelaar.Verwerk(.ProcessedData) ]]> Index: vhUnitTest/APPS/VisiDot/TestCaptureHelper.cls.xml =================================================================== diff -u -r1866 -r2783 --- vhUnitTest/APPS/VisiDot/TestCaptureHelper.cls.xml (.../TestCaptureHelper.cls.xml) (revision 1866) +++ vhUnitTest/APPS/VisiDot/TestCaptureHelper.cls.xml (.../TestCaptureHelper.cls.xml) (revision 2783) @@ -11,6 +11,10 @@ APPS.VisiDot.impl.VHossCaptureHelper + +%Integer + + Opzetten van de VHossBuilder @@ -27,7 +31,12 @@ Set QueueList = "418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\" Set QueueList = QueueList _"427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2" - Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList) + /// Toelevering opzetten + Set ToeleveringAPI = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI() + Set LeverancierID = ToeleveringAPI.GeefLeverancierHalux().GeefNummer() + Set ..ToeleveringID = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierID,QueueList) + + Do QueueBuilder.Initialize(BatchID,SlotLabel,..ToeleveringID,KLNr,SequenceNr,QueueList) Set BatchID=QueueBuilder.BuildBatch() Set VHossBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture).%New(BatchID) Set Capture=VHossBuilder.CorrectVHoss(1,1) @@ -37,6 +46,16 @@ ]]> + +aTestName:%String +%Status + + + vhUnitTest.APPS.VisiDot.VHossTestCase 0 + +%Integer + + + +%String +9999999 + + + +%String +1239 + + aTestName:%String %Status @@ -22,6 +36,23 @@ Set QueueList = QueueList_"418703;1;1.1\418589;2;1.1\418703;1;1.1\418582;1;1.1\418581;2;1.1\418582;1;1.1\418715;1;1.1\418588;1;1.1\" Set QueueList = QueueList_"418589;3;1.1\418703;2;1.1\418582;1;1.1\418703;1;1.1\418704;1;1.1\418715;1;1.1\418704;1;1.1" + /// Order opzetten + Set ^KOD(..#KLNr,"F",..#OrderID,0)="313" + Set ^KOD(..#KLNr,"F",..#OrderID,1)="\03.11.11\EDI 305452/TBX\\\1239\OD5;1`OD5;2`OD5;3`OD5;4`OD5;5\1055#1100#62398,31366\\\\\\1\\\\EUR\\\00\2\\1055#62398,31378#116943\\\\\\\\\vh1 45 /d 4\\305452\\\\\\\\\\62398,31378" + Set ^KOD(..#KLNr,"F",..#OrderID,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" + Set ^KOD(..#KLNr,"F",..#OrderID,3)="1\KELLER\KEUKENFABRIEK\B.V.\ETTENSEWEG 74\NL-4706-PB\ROOSENDAAL\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" + Set ^KOD(..#KLNr,"F",..#OrderID,4)="213" + Set ^KOD(..#KLNr,"F",..#OrderID,101)="703100 \418689\2\\\19.51\40#1\0\39.02\39.02\703100 \L\\\100\39.02\KF0\\\\E1\EUR\\\62402\\235601\101\\\\\\\1.0.0\1\SBMKWU120\62398,31454\\62402\\\\\45 48901 4 UKEL 120 L\0\\RCLD;11316" + Set ^KOD(..#KLNr,"F",..#OrderID,102)="703100 \418754\1\\\25.04\40#1\0\25.04\25.04\703100 \L\\\110\25.04\KF0\\\\E1\EUR\\\62402\\235601\102\\\\\\\2.0.0\1\SBMLBW120\62398,31454\\62402\\\\\45 48901 4 UKEL 120 L\0\\RCLD;5658" + + Set ^KO1(..#OrderID,"F") = "1239\Leveringsnummer" + Set ^KO1(..#OrderID,"F","Leveringsnummer") = "" + + /// Toelevering opzetten + Set ToeleveringAPI = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI() + Set LeverancierID = ToeleveringAPI.GeefLeverancierHalux().GeefNummer() + Set ..ToeleveringID = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierID,QueueList, ..#OrderID) + Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList) Set BatchID=QueueBuilder.BuildBatch() @@ -141,6 +172,19 @@ ]]> + +aTestName:%String +%Status + + + APPS.VisiDot.Afhandelaar 0 + +APPS.VisiDot.impl.VHossCaptureHelper + + APPS.VisiDot.dto.CaptureInfo -ProcessedData:APPS.VisiDot.dto.CaptureInfo + @@ -31,9 +37,9 @@ ProcessedData:APPS.VisiDot.dto.CaptureInfo %String - + + + +VHoss toekennen aan klant. + %Status Index: vhUnitTest/APPS/VisiDot/TestVHossCaptureHelper.cls.xml =================================================================== diff -u -r2079 -r2783 --- vhUnitTest/APPS/VisiDot/TestVHossCaptureHelper.cls.xml (.../TestVHossCaptureHelper.cls.xml) (revision 2079) +++ vhUnitTest/APPS/VisiDot/TestVHossCaptureHelper.cls.xml (.../TestVHossCaptureHelper.cls.xml) (revision 2783) @@ -19,6 +19,10 @@ APPS.VisiDot.impl.VHossFrameDetectionHelper + +%Integer + + Opzetten van de VHossBuilder @@ -28,13 +32,17 @@ Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New() Set BatchID=99999 Set SlotLabel=0 - Set TOENr=234567 Set KLNr=1239 Set SequenceNr=0 Set QueueList = "418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\" Set QueueList = QueueList _"427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2" - Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList) + /// Toelevering opzetten + Set ToeleveringAPI = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI() + Set LeverancierID = ToeleveringAPI.GeefLeverancierHalux().GeefNummer() + Set ..ToeleveringID = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierID,QueueList) + + Do QueueBuilder.Initialize(BatchID,SlotLabel,..ToeleveringID,KLNr,SequenceNr,QueueList) Set BatchID=QueueBuilder.BuildBatch() Set VHossBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture).%New(BatchID) Set Capture=VHossBuilder.CorrectVHoss(1,1) @@ -44,6 +52,16 @@ ]]> + +aTestName:%String +%Status + + + DetectieNr:%Integer,CameraNr:%Integer=1 1 Index: vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml (revision 0) +++ vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml (revision 2783) @@ -0,0 +1,30 @@ + + + + +Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot.impl.TestVHossService") +1 +vhUnitTest.TestCase +0 + + + + + + Index: vhUnitTest/APPS/VisiDot/TestDetectionHelper.cls.xml =================================================================== diff -u -r1861 -r2783 --- vhUnitTest/APPS/VisiDot/TestDetectionHelper.cls.xml (.../TestDetectionHelper.cls.xml) (revision 1861) +++ vhUnitTest/APPS/VisiDot/TestDetectionHelper.cls.xml (.../TestDetectionHelper.cls.xml) (revision 2783) @@ -11,6 +11,10 @@ APPS.VisiDot.impl.VHossCaptureHelper + +%Integer + + Opzetten van de VHossBuilder @@ -20,13 +24,18 @@ Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New() Set BatchID=99999 Set SlotLabel=0 - Set TOENr=234567 Set KLNr=1239 Set SequenceNr=0 Set QueueList = "418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\" Set QueueList = QueueList _"427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2" - Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList) + + /// Toelevering opzetten + Set ToeleveringAPI = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI() + Set LeverancierID = ToeleveringAPI.GeefLeverancierHalux().GeefNummer() + Set ..ToeleveringID = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierID,QueueList) + + Do QueueBuilder.Initialize(BatchID,SlotLabel,..ToeleveringID,KLNr,SequenceNr,QueueList) Set BatchID=QueueBuilder.BuildBatch() Set VHossBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture).%New(BatchID) Set Capture=VHossBuilder.CorrectVHoss(1,1) @@ -36,6 +45,16 @@ ]]> + +aTestName:%String +%Status + + + DetectieNr:%Integer,CameraNr:%Integer=1 1 Index: vhUnitTest/APPS/VisiDot/impl/BuildQueue.cls.xml =================================================================== diff -u -r1812 -r2783 --- vhUnitTest/APPS/VisiDot/impl/BuildQueue.cls.xml (.../BuildQueue.cls.xml) (revision 1812) +++ vhUnitTest/APPS/VisiDot/impl/BuildQueue.cls.xml (.../BuildQueue.cls.xml) (revision 2783) @@ -46,15 +46,15 @@ -BatchID:%Integer,SlotLabel:%Integer,TOENr:%Integer,KLNr:%Integer,SequenceNr:%Integer,QueueList:%String +BatchID:%Integer=99999,SlotLabel:%Integer=0,TOENr:%Integer=234567,KLNr:%Integer=1239,SequenceNr:%Integer=0,QueueList:%String Index: APPS/VisiDot/data/VHossUitlening.cls.xml =================================================================== diff -u --- APPS/VisiDot/data/VHossUitlening.cls.xml (revision 0) +++ APPS/VisiDot/data/VHossUitlening.cls.xml (revision 2783) @@ -0,0 +1,60 @@ + + + +persistent +1 +TECH.Persistent +0 + + +%Integer + + + +%String + + + +%TimeStamp + + + +KlantID:%Integer,VHossID:%String +1 +1 +%Status + + + + +%Library.CacheStorage +^APPS.VisiDot5EC.VHossUitleningD +VHossUitleningDefaultData +^APPS.VisiDot5EC.VHossUitleningD +^APPS.VisiDot5EC.VHossUitleningI +^APPS.VisiDot5EC.VHossUitleningS + +listnode + + +%%CLASSNAME + + +KlantID + + +VHossID + + +Tijdstip + + + + + Index: APPS/VisiDot/impl/EndAfhandelaar.cls.xml =================================================================== diff -u -r2047 -r2783 --- APPS/VisiDot/impl/EndAfhandelaar.cls.xml (.../EndAfhandelaar.cls.xml) (revision 2047) +++ APPS/VisiDot/impl/EndAfhandelaar.cls.xml (.../EndAfhandelaar.cls.xml) (revision 2783) @@ -5,9 +5,23 @@ APPS.VisiDot.Afhandelaar 0 + +APPS.VisiDot.impl.VHossCaptureHelper + + + +%String + + ProcessedData:APPS.VisiDot.dto.CaptureInfo @@ -26,5 +40,82 @@ Quit DoelLocatie ]]> + + + +Als alle producten gerecepteerd zijn, status $$$OK. + +Indien minstens één product niet gerecepteerd kon worden wordt de status $$$ERROR meegegeven. +Van de niet gerecepteerde producten wordt een errormail verstuurd met duidelijke omschrijving in. + +%Status + + + + + +