Index: AAPClient/WS/DnaCodeService.pas =================================================================== diff -u -r209 -r218 --- AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 209) +++ AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 218) @@ -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 -// (15/10/2019 10:29:07 - - $Rev: 45757 $) +// (21/10/2019 13:21:55 - - $Rev: 45757 $) // ************************************************************************ // unit DnaCodeService; @@ -36,27 +36,29 @@ 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] } + ZoekViaDnaCodeResponse = 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] } + ZoekViaDnaCodeRequest = 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] } DnaCodeAfmeldenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DnaCodeAfmeldenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaToeleveringResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - DirecteLeveringRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ToeleveringBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } PalletBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ValideerPalletCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ValideerPalletCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ToeleveringBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + GeefVolgendeTbpCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } GeefVolgendeTbpCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DirecteLeveringResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ToeleveringBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } PalletBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ToeleveringBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DnaCode = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + DirecteLeveringRequest = 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] } - GeefVolgendeTbpCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } {$SCOPEDENUMS ON} { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblSmpl] } @@ -75,6 +77,7 @@ published end; + ArrayOfDnaCodeDnaCode = array of DnaCode; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } // ************************************************************************ // @@ -93,31 +96,37 @@ // ************************************************************************ // - // XML : ValideerPalletCodeResponse, global, + // XML : ZoekViaPalletCodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ValideerPalletCodeResponse = class(GeneriekeResponse) + 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; - ArrayOfDnaCodeDnaCode = array of DnaCode; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } // ************************************************************************ // - // XML : ZoekViaPalletCodeResponse, global, + // XML : ZoekViaDnaCodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaPalletCodeResponse = class(GeneriekeResponse) + ZoekViaDnaCodeResponse = class(GeneriekeResponse) private - FDnaCodes: ArrayOfDnaCodeDnaCode; + FDnaCodes: DnaCode; FDnaCodes_Specified: boolean; - procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); + procedure SetDnaCodes(Index: Integer; const ADnaCode: DnaCode); 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 DnaCodes: DnaCode Index (IS_OPTN) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; Horolog = type string; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblSmpl] } @@ -141,18 +150,18 @@ // ************************************************************************ // - // XML : ValideerPalletCodeRequest, global, + // XML : ZoekViaDnaCodeRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ValideerPalletCodeRequest = class(TRemotable) + ZoekViaDnaCodeRequest = class(TRemotable) private FHeader: RequestHeader; - FPalletCode: string; + FDnaCode: string; public destructor Destroy; override; published - property Header: RequestHeader read FHeader write FHeader; - property PalletCode: string read FPalletCode write FPalletCode; + property Header: RequestHeader read FHeader write FHeader; + property DnaCode: string read FDnaCode write FDnaCode; end; @@ -291,18 +300,40 @@ // ************************************************************************ // - // XML : DirecteLeveringRequest, global, + // XML : PalletBijwerkenResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - DirecteLeveringRequest = class(TRemotable) + PalletBijwerkenResponse = class(GeneriekeResponse) private + published + end; + + + + // ************************************************************************ // + // XML : ValideerPalletCodeResponse, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + ValideerPalletCodeResponse = class(GeneriekeResponse) + private + published + end; + + + + // ************************************************************************ // + // XML : ValideerPalletCodeRequest, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + ValideerPalletCodeRequest = class(TRemotable) + private FHeader: RequestHeader; - FToelevering: string; + FPalletCode: string; public destructor Destroy; override; published - property Header: RequestHeader read FHeader write FHeader; - property Toelevering: string read FToelevering write FToelevering; + property Header: RequestHeader read FHeader write FHeader; + property PalletCode: string read FPalletCode write FPalletCode; end; @@ -319,12 +350,14 @@ // ************************************************************************ // - // XML : PalletBijwerkenResponse, global, + // XML : GeefVolgendeTbpCodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - PalletBijwerkenResponse = class(GeneriekeResponse) + GeefVolgendeTbpCodeResponse = class(GeneriekeResponse) private + FVolgendeTbpCode: string; published + property VolgendeTbpCode: string read FVolgendeTbpCode write FVolgendeTbpCode; end; @@ -358,41 +391,41 @@ // ************************************************************************ // - // XML : ToeleveringBijwerkenRequest, global, + // XML : PalletBijwerkenRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ToeleveringBijwerkenRequest = class(TRemotable) + PalletBijwerkenRequest = class(TRemotable) private FHeader: RequestHeader; - FToelevering: string; + FPallet: string; FStatus: DnaCodeStatus; FIsDirecteLevering: Boolean; public destructor Destroy; override; published property Header: RequestHeader read FHeader write FHeader; - property Toelevering: string read FToelevering write FToelevering; + property Pallet: string read FPallet write FPallet; property Status: DnaCodeStatus read FStatus write FStatus; property IsDirecteLevering: Boolean read FIsDirecteLevering write FIsDirecteLevering; end; // ************************************************************************ // - // XML : PalletBijwerkenRequest, global, + // XML : ToeleveringBijwerkenRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - PalletBijwerkenRequest = class(TRemotable) + ToeleveringBijwerkenRequest = class(TRemotable) private FHeader: RequestHeader; - FPallet: string; + FToelevering: string; FStatus: DnaCodeStatus; FIsDirecteLevering: Boolean; public destructor Destroy; override; published property Header: RequestHeader read FHeader write FHeader; - property Pallet: string read FPallet write FPallet; + property Toelevering: string read FToelevering write FToelevering; property Status: DnaCodeStatus read FStatus write FStatus; property IsDirecteLevering: Boolean read FIsDirecteLevering write FIsDirecteLevering; end; @@ -491,6 +524,23 @@ // ************************************************************************ // + // XML : DirecteLeveringRequest, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + DirecteLeveringRequest = class(TRemotable) + private + FHeader: RequestHeader; + FToelevering: string; + public + destructor Destroy; override; + published + property Header: RequestHeader read FHeader write FHeader; + property Toelevering: string read FToelevering write FToelevering; + end; + + + + // ************************************************************************ // // XML : HernoemPalletResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -531,21 +581,8 @@ end; - // ************************************************************************ // - // XML : GeefVolgendeTbpCodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - GeefVolgendeTbpCodeResponse = class(GeneriekeResponse) - private - FVolgendeTbpCode: string; - published - property VolgendeTbpCode: string read FVolgendeTbpCode write FVolgendeTbpCode; - 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 @@ -564,6 +601,7 @@ function PalletBijwerken(const PalletBijwerkenRequest: PalletBijwerkenRequest): PalletBijwerkenResponse; stdcall; function ToeleveringBijwerken(const ToeleveringBijwerkenRequest: ToeleveringBijwerkenRequest): ToeleveringBijwerkenResponse; stdcall; function ValideerPalletCode(const ValideerPalletCodeRequest: ValideerPalletCodeRequest): ValideerPalletCodeResponse; stdcall; + function ZoekViaDnaCode(const ZoekViaDnaCodeRequest: ZoekViaDnaCodeRequest): ZoekViaDnaCodeResponse; stdcall; function ZoekViaPalletCode(const ZoakViaPalletCodeRequest: ZoekViaPalletCodeRequest): ZoekViaPalletCodeResponse; stdcall; function ZoekViaToelevering(const ZoekViaToeleveringRequest: ZoekViaToeleveringRequest): ZoekViaToeleveringResponse; stdcall; end; @@ -638,13 +676,30 @@ Result := FDnaCodes_Specified; end; +destructor ZoekViaDnaCodeResponse.Destroy; +begin + SysUtils.FreeAndNil(FDnaCodes); + inherited Destroy; +end; + +procedure ZoekViaDnaCodeResponse.SetDnaCodes(Index: Integer; const ADnaCode: DnaCode); +begin + FDnaCodes := ADnaCode; + FDnaCodes_Specified := True; +end; + +function ZoekViaDnaCodeResponse.DnaCodes_Specified(Index: Integer): boolean; +begin + Result := FDnaCodes_Specified; +end; + destructor ZoekViaToeleveringRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; end; -destructor ValideerPalletCodeRequest.Destroy; +destructor ZoekViaDnaCodeRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; @@ -770,7 +825,7 @@ Result := FDnaCodes_Specified; end; -destructor DirecteLeveringRequest.Destroy; +destructor ValideerPalletCodeRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; @@ -782,13 +837,13 @@ inherited Destroy; end; -destructor ToeleveringBijwerkenRequest.Destroy; +destructor PalletBijwerkenRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; end; -destructor PalletBijwerkenRequest.Destroy; +destructor ToeleveringBijwerkenRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; @@ -970,6 +1025,12 @@ Result := FIsWegwerpPallet_Specified; end; +destructor DirecteLeveringRequest.Destroy; +begin + SysUtils.FreeAndNil(FHeader); + inherited Destroy; +end; + destructor HernoemPalletResponse.Destroy; var I: Integer; @@ -1034,21 +1095,25 @@ { DnaCodeServiceSoap.ValideerPalletCode } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ValideerPalletCode', '', '[ReturnName="ValideerPalletCodeResult"]'); + { DnaCodeServiceSoap.ZoekViaDnaCode } + InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ZoekViaDnaCode', '', + '[ReturnName="ZoekViaDnaCodeResult"]'); { DnaCodeServiceSoap.ZoekViaPalletCode } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ZoekViaPalletCode', '', '[ReturnName="ZoekViaPalletCodeResult"]'); { DnaCodeServiceSoap.ZoekViaToelevering } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ZoekViaToelevering', '', '[ReturnName="ZoekViaToeleveringResult"]'); 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(DnaCodeStatus), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeStatus'); RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfDnaCodeDnaCode), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfDnaCodeDnaCode'); + RemClassRegistry.RegisterXSClass(GeneriekeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeneriekeResponse'); RemClassRegistry.RegisterXSClass(ZoekViaPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaPalletCodeResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaPalletCodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(ZoekViaDnaCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaDnaCodeResponse'); RemClassRegistry.RegisterXSInfo(TypeInfo(Horolog), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'Horolog'); RemClassRegistry.RegisterXSClass(ZoekViaToeleveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringRequest'); - RemClassRegistry.RegisterXSClass(ValideerPalletCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeRequest'); + RemClassRegistry.RegisterXSClass(ZoekViaDnaCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaDnaCodeRequest'); 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'); @@ -1058,18 +1123,19 @@ RemClassRegistry.RegisterXSClass(DnaCodeAfmeldenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeAfmeldenRequest'); RemClassRegistry.RegisterXSClass(ZoekViaToeleveringResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaToeleveringResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(DirecteLeveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DirecteLeveringRequest'); - RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenResponse'); RemClassRegistry.RegisterXSClass(PalletBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'PalletBijwerkenResponse'); + RemClassRegistry.RegisterXSClass(ValideerPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeResponse'); + RemClassRegistry.RegisterXSClass(ValideerPalletCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeRequest'); + RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenResponse'); + RemClassRegistry.RegisterXSClass(GeefVolgendeTbpCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeTbpCodeResponse'); RemClassRegistry.RegisterXSClass(GeefVolgendeTbpCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeTbpCodeRequest'); RemClassRegistry.RegisterXSClass(DirecteLeveringResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DirecteLeveringResponse'); - RemClassRegistry.RegisterXSInfo(TypeInfo(DnaCodeStatus), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeStatus'); - RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenRequest'); RemClassRegistry.RegisterXSClass(PalletBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'PalletBijwerkenRequest'); + RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenRequest'); RemClassRegistry.RegisterXSClass(DnaCode, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCode'); + RemClassRegistry.RegisterXSClass(DirecteLeveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DirecteLeveringRequest'); 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'); - RemClassRegistry.RegisterXSClass(GeefVolgendeTbpCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeTbpCodeResponse'); end. \ No newline at end of file Index: AAPClient/UI/HernoemPalletScherm.dfm =================================================================== diff -u -r201 -r218 --- AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 201) +++ AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 218) @@ -34,17 +34,13 @@ Top = 57 Width = 480 Height = 451 - ActivePage = tsResultaat + ActivePage = tsOudeCode Align = alClient Style = tsFlatButtons TabOrder = 2 object tsOudeCode: TTabSheet Caption = 'tsOudeCode' TabVisible = False - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 140 object lblOudeCode: TLabel Left = 13 Top = 158 Index: AAPClient/WS/Agent.pas =================================================================== diff -u -r210 -r218 --- AAPClient/WS/Agent.pas (.../Agent.pas) (revision 210) +++ AAPClient/WS/Agent.pas (.../Agent.pas) (revision 218) @@ -25,6 +25,7 @@ function PalletBijwerken(Pallet: string; Status: DnaCodeStatus; IsDirecteLevering: boolean): PalletBijwerkenResponse; function ToeleveringBijwerken(Toelevering: string; Status: DnaCodeStatus; IsDirecteLevering: boolean): ToeleveringBijwerkenResponse; function GeefVolgendeTbpCode(): GeefVolgendeTbpCodeResponse; + function ZoekViaDnaCode(DnaCode: string): ZoekViaDnaCodeResponse; end; implementation @@ -253,6 +254,28 @@ end; end; +function TAgent.ZoekViaDnaCode(DnaCode: string): ZoekViaDnaCodeResponse; +var + Service: DnaCodeServiceSoap; + Header: DnaCodeService.RequestHeader; + fZoekViaDnaCodeRequest: ZoekViaDnaCodeRequest; +begin + Service := DnaCodeService.GetDnaCodeServiceSoap(); + + fZoekViaDnaCodeRequest := ZoekViaDnaCodeRequest.Create; + Header := DnaCodeService.RequestHeader.Create; + try + Header.Initialen := fUiContext.Initialen; + Header.ComputerNaam := FullName(); + fZoekViaDnaCodeRequest.Header := Header; + fZoekViaDnaCodeRequest.DnaCode := DnaCode; + + result := Service.ZoekViaDnaCode(fZoekViaDnaCodeRequest); + finally + fZoekViaDnaCodeRequest.Free; + end; +end; + function TAgent.ZoekViaPalletCode( PalletCode: string): ZoekViaPalletCodeResponse; var Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r211 -r218 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 211) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 218) @@ -6,11 +6,11 @@ 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\AAPClient\ProScanMain.dfm 2019/03/01 14:26:05.000.981,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\AAPClient\ProScan.dproj 2019/03/01 14:28:35.000.977,=E:\svn\Delphi\AAPClient\Unit1.pas - 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 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas 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,8 +23,8 @@ 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.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/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\Images.dfm 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.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 @@ -37,12 +37,12 @@ 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:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.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.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 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm 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,8 +64,8 @@ 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 @@ -76,8 +76,8 @@ 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 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 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= @@ -88,8 +88,8 @@ 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.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/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm 2019/10/01 13:49:36.000.449,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/01 13:49:56.000.314,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas @@ -113,6 +113,9 @@ 2019/10/15 10:29:07.266,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/15 10:29:23.010,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/15 10:29:44.142,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/21 13:21:40.148,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2019/10/21 13:21:55.323,=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/21 13:22:13.787,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/UI/HernoemPalletScherm.pas =================================================================== diff -u -r201 -r218 --- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 201) +++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 218) @@ -28,7 +28,6 @@ procedure FormShow(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); - procedure FormCreate(Sender: TObject); procedure btnEerstClick(Sender: TObject); procedure btnVorigeClick(Sender: TObject); procedure btnVolgendeClick(Sender: TObject); @@ -38,9 +37,11 @@ procedure edtNieuweCodeKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); private + fEnkelDezeDnaCode: string; procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode); procedure GridLeegmaken; function HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse; + function CheckBestaandeDnaCode(Code: string): boolean; public { Public declarations } end; @@ -65,7 +66,14 @@ begin inherited; if pcHernoemPallet.ActivePageIndex = 0 then begin - HernoemPallet(edtOudeCode.Text,''); + fEnkelDezeDnaCode := ''; + if ((length(edtOudeCode.Text)=7) and CheckBestaandeDnaCode(edtOudeCode.Text)) then begin + if ToonPopupScherm('Enkel code ''' + edtOudeCode.Text + ''' verwerken?','Ja','Nee') = mrYes then begin + fEnkelDezeDnaCode := edtOudeCode.Text + end; + end; + + HernoemPallet(edtOudeCode.Text,fEnkelDezeDnaCode); end else if pcHernoemPallet.ActivePageIndex = 1 then begin pcHernoemPallet.ActivePageIndex := 2; end else if pcHernoemPallet.ActivePageIndex = 2 then begin @@ -99,6 +107,26 @@ sgToeleveringData.Row := sgToeleveringData.Row - 1; end; +function TfmHernoemPalletScherm.CheckBestaandeDnaCode(Code: string): boolean; +var + Response: ZoekViaDnaCodeResponse; +begin + Response := TAgent.Create(UiContext).ZoekViaDnaCode(Code); + try + if Response.Header.Status <> '200' then begin + result := false + end else begin + if Assigned(Response.DnaCodes) then begin + result := true + end else begin + result := false + end; + end; + finally + Response.Free; + end; +end; + procedure TfmHernoemPalletScherm.edtNieuweCodeKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); begin @@ -123,7 +151,7 @@ var Response: HernoemPalletResponse; begin - Response := TAgent.Create(UiContext).HernoemPallet(OudeCode, NieuweCode, ''); + Response := TAgent.Create(UiContext).HernoemPallet(OudeCode, NieuweCode, fEnkelDezeDnaCode); try if Response.Header.Status <> '200' then begin ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','') @@ -144,19 +172,14 @@ CloseModal; end; -procedure TfmHernoemPalletScherm.FormCreate(Sender: TObject); -begin - inherited; - pcHernoemPallet.ActivePageIndex := 0; -end; - procedure TfmHernoemPalletScherm.FormShow(Sender: TObject); begin btnCentraalOnder.Action := actHome; btnRechtsOnder.Action := actVolgende; pcHernoemPallet.ActivePageIndex := 0; edtOudeCode.Text := ''; edtNieuweCode.Text := ''; + edtOudeCode.SetFocus; GridLeegmaken; inherited; end;