Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r178 -r188 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 178) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 188) @@ -9,8 +9,8 @@ 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm 2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= @@ -23,26 +23,26 @@ 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PopupScherm.pas 2019/03/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\Images.dfm + 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas 2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm 2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm 2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas 2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm @@ -64,35 +64,41 @@ 2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas + 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm 2019/04/10 07:45:17.000.841,=E:\svn\Delphi\AAPClient\WS.pas 2019/04/10 07:45:55.000.611,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/05/02 15:08:14.000.961,=E:\svn\Delphi\AAPClient\WS.pas 2019/05/02 15:08:28.000.270,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/09/03 15:55:43.000.155,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 13:14:25.000.076,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/04 14:42:49.000.071,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/06 07:39:37.000.990,=E:\svn\Delphi\AAPClient\WS.pas 2019/09/06 07:39:48.000.040,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas 2019/09/06 07:44:11.000.442,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/09/06 07:45:06.000.602,=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/09/09 10:12:07.000.120,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= 2019/09/25 09:00:58.000.441,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas 2019/10/01 13:49:36.449,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/01 13:49:56.314,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/01 13:50:07.220,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 13:33:49.729,=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 13:33:55.547,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2019/10/02 13:34:08.237,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 15:42:02.588,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2019/10/02 15:42:14.814,=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 15:42:25.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/WS/DnaCodeService.pas =================================================================== diff -u -r187 -r188 --- AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 187) +++ AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 188) @@ -5,7 +5,7 @@ // >Import : http://tve-w10:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.CLS?WSDL=1>0 // Encoding : UTF-8 // Version : 1.0 -// (2/10/2019 13:33:49 - - $Rev: 45757 $) +// (2/10/2019 15:42:14 - - $Rev: 45757 $) // ************************************************************************ // unit DnaCodeService; @@ -37,22 +37,24 @@ DataTransferObject = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } GeneriekeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ValideerPalletCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekViaPalletCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaToeleveringRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ValideerPalletCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaPalletCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } RequestHeader = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ResponseHeader = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DnaCodeAfmeldenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - PalletBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ToeleveringBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - HernoemPalletResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DnaCodeAfmeldenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaPalletCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaToeleveringResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - HernoemPalletRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + PalletBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ToeleveringBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + DirecteLeveringRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ToeleveringBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + DirecteLeveringResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } PalletBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DnaCode = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + HernoemPalletResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + HernoemPalletRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } {$SCOPEDENUMS ON} { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblSmpl] } @@ -97,9 +99,28 @@ published end; + ArrayOfDnaCodeDnaCode = array of DnaCode; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } // ************************************************************************ // + // XML : ZoekViaPalletCodeResponse, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + ZoekViaPalletCodeResponse = class(GeneriekeResponse) + private + FDnaCodes: ArrayOfDnaCodeDnaCode; + FDnaCodes_Specified: boolean; + procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); + function DnaCodes_Specified(Index: Integer): boolean; + public + destructor Destroy; override; + published + property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; + end; + + + + // ************************************************************************ // // XML : ZoekViaToeleveringRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -211,52 +232,38 @@ // ************************************************************************ // - // XML : PalletBijwerkenResponse, global, + // XML : DnaCodeAfmeldenResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - PalletBijwerkenResponse = class(GeneriekeResponse) + DnaCodeAfmeldenResponse = class(GeneriekeResponse) private - published - end; - - - - // ************************************************************************ // - // XML : ToeleveringBijwerkenResponse, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - ToeleveringBijwerkenResponse = class(GeneriekeResponse) - private - published - end; - - Horolog = type string; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblSmpl] } - ArrayOfDnaCodeDnaCode = array of DnaCode; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - - - // ************************************************************************ // - // XML : HernoemPalletResponse, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - HernoemPalletResponse = class(GeneriekeResponse) - private + FAantalInToelevering: Int64; + FAantalInToelevering_Specified: boolean; + FAantalReedsGescand: Int64; + FAantalReedsGescand_Specified: boolean; FDnaCodes: ArrayOfDnaCodeDnaCode; FDnaCodes_Specified: boolean; + procedure SetAantalInToelevering(Index: Integer; const AInt64: Int64); + function AantalInToelevering_Specified(Index: Integer): boolean; + procedure SetAantalReedsGescand(Index: Integer; const AInt64: Int64); + function AantalReedsGescand_Specified(Index: Integer): boolean; procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); function DnaCodes_Specified(Index: Integer): boolean; public destructor Destroy; override; published - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; + property AantalInToelevering: Int64 Index (IS_OPTN) read FAantalInToelevering write SetAantalInToelevering stored AantalInToelevering_Specified; + property AantalReedsGescand: Int64 Index (IS_OPTN) read FAantalReedsGescand write SetAantalReedsGescand stored AantalReedsGescand_Specified; + property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; // ************************************************************************ // - // XML : DnaCodeAfmeldenResponse, global, + // XML : ZoekViaToeleveringResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - DnaCodeAfmeldenResponse = class(GeneriekeResponse) + ZoekViaToeleveringResponse = class(GeneriekeResponse) private FAantalInToelevering: Int64; FAantalInToelevering_Specified: boolean; @@ -281,73 +288,43 @@ // ************************************************************************ // - // XML : ZoekViaPalletCodeResponse, global, + // XML : PalletBijwerkenResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaPalletCodeResponse = class(GeneriekeResponse) + PalletBijwerkenResponse = class(GeneriekeResponse) private - FDnaCodes: ArrayOfDnaCodeDnaCode; - FDnaCodes_Specified: boolean; - procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); - function DnaCodes_Specified(Index: Integer): boolean; - public - destructor Destroy; override; published - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; // ************************************************************************ // - // XML : ZoekViaToeleveringResponse, global, + // XML : ToeleveringBijwerkenResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaToeleveringResponse = class(GeneriekeResponse) + ToeleveringBijwerkenResponse = class(GeneriekeResponse) private - FAantalInToelevering: Int64; - FAantalInToelevering_Specified: boolean; - FAantalReedsGescand: Int64; - FAantalReedsGescand_Specified: boolean; - FDnaCodes: ArrayOfDnaCodeDnaCode; - FDnaCodes_Specified: boolean; - procedure SetAantalInToelevering(Index: Integer; const AInt64: Int64); - function AantalInToelevering_Specified(Index: Integer): boolean; - procedure SetAantalReedsGescand(Index: Integer; const AInt64: Int64); - function AantalReedsGescand_Specified(Index: Integer): boolean; - procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); - function DnaCodes_Specified(Index: Integer): boolean; - public - destructor Destroy; override; published - property AantalInToelevering: Int64 Index (IS_OPTN) read FAantalInToelevering write SetAantalInToelevering stored AantalInToelevering_Specified; - property AantalReedsGescand: Int64 Index (IS_OPTN) read FAantalReedsGescand write SetAantalReedsGescand stored AantalReedsGescand_Specified; - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; // ************************************************************************ // - // XML : HernoemPalletRequest, global, + // XML : DirecteLeveringRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - HernoemPalletRequest = class(TRemotable) + DirecteLeveringRequest = class(TRemotable) private FHeader: RequestHeader; - FOudeCode: string; - FNieuweCode: string; - FEnkelDezeDnaCode: string; - FEnkelDezeDnaCode_Specified: boolean; - procedure SetEnkelDezeDnaCode(Index: Integer; const Astring: string); - function EnkelDezeDnaCode_Specified(Index: Integer): boolean; + FToelevering: string; public destructor Destroy; override; published - property Header: RequestHeader read FHeader write FHeader; - property OudeCode: string read FOudeCode write FOudeCode; - property NieuweCode: string read FNieuweCode write FNieuweCode; - property EnkelDezeDnaCode: string Index (IS_OPTN) read FEnkelDezeDnaCode write SetEnkelDezeDnaCode stored EnkelDezeDnaCode_Specified; + property Header: RequestHeader read FHeader write FHeader; + property Toelevering: string read FToelevering write FToelevering; end; + Horolog = type string; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblSmpl] } // ************************************************************************ // @@ -372,6 +349,19 @@ // ************************************************************************ // + // XML : DirecteLeveringResponse, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + DirecteLeveringResponse = class(GeneriekeResponse) + private + FIsDirecteLevering: Boolean; + published + property IsDirecteLevering: Boolean read FIsDirecteLevering write FIsDirecteLevering; + end; + + + + // ************************************************************************ // // XML : PalletBijwerkenRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -482,8 +472,50 @@ end; + // ************************************************************************ // + // XML : HernoemPalletResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + HernoemPalletResponse = class(GeneriekeResponse) + private + FDnaCodes: ArrayOfDnaCodeDnaCode; + FDnaCodes_Specified: boolean; + procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); + function DnaCodes_Specified(Index: Integer): boolean; + public + destructor Destroy; override; + published + property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; + end; + + + + // ************************************************************************ // + // XML : HernoemPalletRequest, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + HernoemPalletRequest = class(TRemotable) + private + FHeader: RequestHeader; + FOudeCode: string; + FNieuweCode: string; + FEnkelDezeDnaCode: string; + FEnkelDezeDnaCode_Specified: boolean; + procedure SetEnkelDezeDnaCode(Index: Integer; const Astring: string); + function EnkelDezeDnaCode_Specified(Index: Integer): boolean; + public + destructor Destroy; override; + published + property Header: RequestHeader read FHeader write FHeader; + property OudeCode: string read FOudeCode write FOudeCode; + property NieuweCode: string read FNieuweCode write FNieuweCode; + property EnkelDezeDnaCode: string Index (IS_OPTN) read FEnkelDezeDnaCode write SetEnkelDezeDnaCode stored EnkelDezeDnaCode_Specified; + end; + + + // ************************************************************************ // + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // soapAction: http://www.vanhoecke.be/Halux/AAP/DnaCode/WS.Halux.AAP.DnaCodeService.%operationName% // transport : http://schemas.xmlsoap.org/soap/http // style : document @@ -497,6 +529,7 @@ ['{514675BC-4331-0084-2F76-0934B2799FAE}'] function DnaCodeAfmelden(const DnaCodeAfmeldenRequest: DnaCodeAfmeldenRequest): DnaCodeAfmeldenResponse; stdcall; function HernoemPallet(const HernoemPalletRequest: HernoemPalletRequest): HernoemPalletResponse; stdcall; + function IsDirecteLevering(const DirecteLeveringRequest: DirecteLeveringRequest): DirecteLeveringResponse; stdcall; function PalletBijwerken(const PalletBijwerkenRequest: PalletBijwerkenRequest): PalletBijwerkenResponse; stdcall; function ToeleveringBijwerken(const ToeleveringBijwerkenRequest: ToeleveringBijwerkenRequest): ToeleveringBijwerkenResponse; stdcall; function ValideerPalletCode(const ValideerPalletCodeRequest: ValideerPalletCodeRequest): ValideerPalletCodeResponse; stdcall; @@ -553,6 +586,27 @@ inherited Destroy; end; +destructor ZoekViaPalletCodeResponse.Destroy; +var + I: Integer; +begin + for I := 0 to System.Length(FDnaCodes)-1 do + SysUtils.FreeAndNil(FDnaCodes[I]); + System.SetLength(FDnaCodes, 0); + inherited Destroy; +end; + +procedure ZoekViaPalletCodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +begin + FDnaCodes := AArrayOfDnaCodeDnaCode; + FDnaCodes_Specified := True; +end; + +function ZoekViaPalletCodeResponse.DnaCodes_Specified(Index: Integer): boolean; +begin + Result := FDnaCodes_Specified; +end; + destructor ZoekViaToeleveringRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -599,27 +653,6 @@ Result := FToelevering_Specified; end; -destructor HernoemPalletResponse.Destroy; -var - I: Integer; -begin - for I := 0 to System.Length(FDnaCodes)-1 do - SysUtils.FreeAndNil(FDnaCodes[I]); - System.SetLength(FDnaCodes, 0); - inherited Destroy; -end; - -procedure HernoemPalletResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); -begin - FDnaCodes := AArrayOfDnaCodeDnaCode; - FDnaCodes_Specified := True; -end; - -function HernoemPalletResponse.DnaCodes_Specified(Index: Integer): boolean; -begin - Result := FDnaCodes_Specified; -end; - destructor DnaCodeAfmeldenResponse.Destroy; var I: Integer; @@ -663,27 +696,6 @@ Result := FDnaCodes_Specified; end; -destructor ZoekViaPalletCodeResponse.Destroy; -var - I: Integer; -begin - for I := 0 to System.Length(FDnaCodes)-1 do - SysUtils.FreeAndNil(FDnaCodes[I]); - System.SetLength(FDnaCodes, 0); - inherited Destroy; -end; - -procedure ZoekViaPalletCodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); -begin - FDnaCodes := AArrayOfDnaCodeDnaCode; - FDnaCodes_Specified := True; -end; - -function ZoekViaPalletCodeResponse.DnaCodes_Specified(Index: Integer): boolean; -begin - Result := FDnaCodes_Specified; -end; - destructor ZoekViaToeleveringResponse.Destroy; var I: Integer; @@ -727,23 +739,12 @@ Result := FDnaCodes_Specified; end; -destructor HernoemPalletRequest.Destroy; +destructor DirecteLeveringRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; end; -procedure HernoemPalletRequest.SetEnkelDezeDnaCode(Index: Integer; const Astring: string); -begin - FEnkelDezeDnaCode := Astring; - FEnkelDezeDnaCode_Specified := True; -end; - -function HernoemPalletRequest.EnkelDezeDnaCode_Specified(Index: Integer): boolean; -begin - Result := FEnkelDezeDnaCode_Specified; -end; - destructor ToeleveringBijwerkenRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -932,6 +933,44 @@ Result := FIsWegwerpPallet_Specified; end; +destructor HernoemPalletResponse.Destroy; +var + I: Integer; +begin + for I := 0 to System.Length(FDnaCodes)-1 do + SysUtils.FreeAndNil(FDnaCodes[I]); + System.SetLength(FDnaCodes, 0); + inherited Destroy; +end; + +procedure HernoemPalletResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +begin + FDnaCodes := AArrayOfDnaCodeDnaCode; + FDnaCodes_Specified := True; +end; + +function HernoemPalletResponse.DnaCodes_Specified(Index: Integer): boolean; +begin + Result := FDnaCodes_Specified; +end; + +destructor HernoemPalletRequest.Destroy; +begin + SysUtils.FreeAndNil(FHeader); + inherited Destroy; +end; + +procedure HernoemPalletRequest.SetEnkelDezeDnaCode(Index: Integer; const Astring: string); +begin + FEnkelDezeDnaCode := Astring; + FEnkelDezeDnaCode_Specified := True; +end; + +function HernoemPalletRequest.EnkelDezeDnaCode_Specified(Index: Integer): boolean; +begin + Result := FEnkelDezeDnaCode_Specified; +end; + initialization { DnaCodeServiceSoap } InvRegistry.RegisterInterface(TypeInfo(DnaCodeServiceSoap), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'UTF-8'); @@ -943,6 +982,9 @@ { DnaCodeServiceSoap.HernoemPallet } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'HernoemPallet', '', '[ReturnName="HernoemPalletResult"]'); + { DnaCodeServiceSoap.IsDirecteLevering } + InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'IsDirecteLevering', '', + '[ReturnName="IsDirecteLeveringResult"]'); { DnaCodeServiceSoap.PalletBijwerken } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'PalletBijwerken', '', '[ReturnName="PalletBijwerkenResult"]'); @@ -961,29 +1003,31 @@ RemClassRegistry.RegisterXSClass(DataTransferObject, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DataTransferObject'); RemClassRegistry.RegisterXSClass(GeneriekeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeneriekeResponse'); RemClassRegistry.RegisterXSClass(ValideerPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeResponse'); + RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfDnaCodeDnaCode), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfDnaCodeDnaCode'); + RemClassRegistry.RegisterXSClass(ZoekViaPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaPalletCodeResponse'); + RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaPalletCodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(ZoekViaToeleveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringRequest'); RemClassRegistry.RegisterXSClass(ValideerPalletCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeRequest'); RemClassRegistry.RegisterXSClass(ZoekViaPalletCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaPalletCodeRequest'); RemClassRegistry.RegisterXSInfo(TypeInfo(String_), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'String_', 'String'); RemClassRegistry.RegisterXSClass(RequestHeader, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'RequestHeader'); RemClassRegistry.RegisterXSClass(ResponseHeader, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ResponseHeader'); RemClassRegistry.RegisterXSClass(DnaCodeAfmeldenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeAfmeldenRequest'); - RemClassRegistry.RegisterXSClass(PalletBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'PalletBijwerkenResponse'); - RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenResponse'); - RemClassRegistry.RegisterXSInfo(TypeInfo(Horolog), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'Horolog'); - RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfDnaCodeDnaCode), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfDnaCodeDnaCode'); - RemClassRegistry.RegisterXSClass(HernoemPalletResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'HernoemPalletResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(HernoemPalletResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(DnaCodeAfmeldenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeAfmeldenResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(DnaCodeAfmeldenResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(ZoekViaPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaPalletCodeResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaPalletCodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(ZoekViaToeleveringResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaToeleveringResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(PalletBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'PalletBijwerkenResponse'); + RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenResponse'); + RemClassRegistry.RegisterXSClass(DirecteLeveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DirecteLeveringRequest'); RemClassRegistry.RegisterXSInfo(TypeInfo(DnaCodeStatus), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeStatus'); - RemClassRegistry.RegisterXSClass(HernoemPalletRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'HernoemPalletRequest'); + RemClassRegistry.RegisterXSInfo(TypeInfo(Horolog), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'Horolog'); RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenRequest'); + RemClassRegistry.RegisterXSClass(DirecteLeveringResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DirecteLeveringResponse'); RemClassRegistry.RegisterXSClass(PalletBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'PalletBijwerkenRequest'); RemClassRegistry.RegisterXSClass(DnaCode, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCode'); + RemClassRegistry.RegisterXSClass(HernoemPalletResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'HernoemPalletResponse'); + RemClassRegistry.RegisterExternalPropName(TypeInfo(HernoemPalletResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(HernoemPalletRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'HernoemPalletRequest'); end. \ No newline at end of file Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r186 -r188 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 186) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 188) @@ -37,6 +37,8 @@ procedure ZetToeleveringStatus(Status: DnaCodeStatus); procedure ToeleveringDataOphalen(); procedure VerwerkMogelijkePopups(EersteDnaCode: DnaCode); + function BepaalAantalLadesOpHuidigePallet: integer; + function BepaalDirecteLevering: boolean; public end; @@ -57,11 +59,94 @@ end; procedure TfmDnaCodeScherm.actPalletExecute(Sender: TObject); +var + fWaarschuwingModalResult: TModalResult; + fAantalLadesOpHuidigePallet: integer; begin inherited; + fAantalLadesOpHuidigePallet := BepaalAantalLadesOpHuidigePallet; + if fAantalLadesOpHuidigePallet > 0 then begin + fWaarschuwingModalResult := ToonPopupScherm(lblHuidigePalletData.Caption+' volledig?'+#13#10+inttostr(fAantalLadesOpHuidigePallet)+' lades','Ja','Rework',14,-1,-1); + if fWaarschuwingModalResult = mrYes then begin + if BepaalDirecteLevering then begin + ToonPopupScherm('GLS Direct', 'OK','',15,-1,-1,clBlue); + fImagesScherm.ilAlgemeen32.GetIcon(3, imgGls.Picture.Icon); + imgGls.Visible := true; + end; + //pallet updaten met status InBuffer en directelevering info + end; + //pallet updaten met status rework en directelevering info + end; + Self.ModalResult := mrPallet; end; +function TfmDnaCodeScherm.BepaalAantalLadesOpHuidigePallet: integer; +var + Service: DnaCodeServiceSoap; + Header: RequestHeader; + fZoekViaPalletCodeRequest: ZoekViaPalletCodeRequest; + fZoekViaPalletCodeResponse: ZoekViaPalletCodeResponse; +begin + result := 0; + Service := DnaCodeService.GetDnaCodeServiceSoap(); + fZoekViaPalletCodeRequest := ZoekViaPalletCodeRequest.Create; + Header := RequestHeader.Create; + try + Header.Initialen := UiContext.Initialen; + Header.ComputerNaam := FullName(); + fZoekViaPalletCodeRequest.Header := Header; + fZoekViaPalletCodeRequest.PalletCode := UiContext.Pallet; + + fZoekViaPalletCodeResponse := Service.ZoekViaPalletCode(fZoekViaPalletCodeRequest); + try + if fZoekViaPalletCodeResponse.Header.Status = '200' then begin + result := length(fZoekViaPalletCodeResponse.DnaCodes); + end else begin + ToonPopupScherm(fZoekViaPalletCodeResponse.Header.Omschrijving, 'Probeer opnieuw'); + result := 0 + end; + finally + fZoekViaPalletCodeResponse.Free; + end; + finally + fZoekViaPalletCodeRequest.Free; + end; +end; + +function TfmDnaCodeScherm.BepaalDirecteLevering: boolean; +var + Service: DnaCodeServiceSoap; + Header: RequestHeader; + fDirecteLeveringRequest: DirecteLeveringRequest; + fDirecteLeveringResponse: DirecteLeveringResponse; +begin + result := false; + Service := DnaCodeService.GetDnaCodeServiceSoap(); + fDirecteLeveringRequest := DirecteLeveringRequest.Create; + Header := RequestHeader.Create; + try + Header.Initialen := UiContext.Initialen; + Header.ComputerNaam := FullName(); + fDirecteLeveringRequest.Header := Header; + fDirecteLeveringRequest.Toelevering := UiContext.Toelevering; + + fDirecteLeveringResponse := Service.IsDirecteLevering(fDirecteLeveringRequest); + try + if fDirecteLeveringResponse.Header.Status = '200' then begin + result := fDirecteLeveringResponse.IsDirecteLevering; + end else begin + ToonPopupScherm(fDirecteLeveringResponse.Header.Omschrijving, 'Probeer opnieuw'); + result := false + end; + finally + fDirecteLeveringResponse.Free; + end; + finally + fDirecteLeveringRequest.Free; + end; +end; + procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject); var fWaarschuwingModalResult: TModalResult; @@ -114,6 +199,8 @@ lblAantalGescand.Caption := ''; lblTotaalAantal.Caption := ''; imgInfo.Visible := false; + imgGls.Visible := false; + imgWegwerpPallet.Visible := false; fImagesScherm.ilAlgemeen64.GetIcon(1, imgInfo.Picture.Icon); if not (UiContext.Toelevering = '') then ToeleveringDataOphalen();