FishEye: Tag 47 refers to a dead (removed) revision in file `AAPClient/WS/DnaCodeService.dfm'. FishEye: No comparison available. Pass `N' to diff? Index: AAPClient/UI/DnaCodeScherm.dfm =================================================================== diff -u -r44 -r47 --- AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 44) +++ AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 47) @@ -1,5 +1,7 @@ inherited fmDnaCodeScherm: TfmDnaCodeScherm Caption = 'fmDnaCodeScherm' + ExplicitWidth = 232 + ExplicitHeight = 246 PixelsPerInch = 96 TextHeight = 19 object lblToelevering: TLabel [1] @@ -47,7 +49,7 @@ AutoSize = False end object lblTotaalAantal: TLabel [7] - Left = 56 + Left = 47 Top = 68 Width = 33 Height = 19 @@ -61,7 +63,7 @@ AutoSize = False Caption = '/' end - object Image1: TImage [9] + object imgGls: TImage [9] Left = 113 Top = 8 Width = 25 Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r44 -r47 Binary files differ Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r43 -r47 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 43) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 47) @@ -18,7 +18,7 @@ lblAantalGescand: TLabel; lblTotaalAantal: TLabel; lblSlash: TLabel; - Image1: TImage; + imgGls: TImage; procedure FormShow(Sender: TObject); procedure actPalletExecute(Sender: TObject); procedure actHomeExecute(Sender: TObject); @@ -34,6 +34,9 @@ implementation +uses + DnaCodeService; + {$R *.dfm} procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject); @@ -49,9 +52,44 @@ end; procedure TfmDnaCodeScherm.actVolgendeExecute(Sender: TObject); +var + Service: DnaCodeServiceSoap; + Request: DnaCodeAfmeldenRequest; + Response: DnaCodeAfmeldenResponse; + Header: RequestHeader; begin - inherited; - // + Service := DnaCodeService.GetDnaCodeServiceSoap(); + // request opbouwen + Request := DnaCodeAfmeldenRequest.Create; + Header := RequestHeader.Create; + try + Header.Initialen := lblGebruiker.Caption; + Header.ComputerNaam := ComputerName(); + Request.Header := Header; + Request.DnaCode := edtDnaCode.Text; + Request.Aantal := 1; + Request.Toelevering := lblToelevering.Caption; + Request.PalletCode := lblPalletCode.Caption; + + Response := Service.DnaCodeAfmelden(Request); + try + if Response.Header.Status <> '200' then begin + Self.ModalResult := mrRetry; + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') + end else begin + lblToelevering.Caption := Response.DnaCodes[0].Toelevering; + lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); + lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); + imgGls.Visible := Response.DnaCodes[0].IsGlsDirect; + lblLaatstGescandData.Caption := Request.DnaCode; + Self.ModalResult := mrIgnore; + end; + finally + Response.Free; + end; + finally + Request.Free; + end; end; procedure TfmDnaCodeScherm.FormShow(Sender: TObject); Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r43 -r47 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 43) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 47) @@ -2,53 +2,56 @@ 2019/03/01 14:25:16.000.954,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm - 2019/03/01 14:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj + 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas + 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\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas - 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm + 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= - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm 2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas - 2019/03/05 11:54:27.053,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/06 07:41:24.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:12.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 11:22:02.536,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 15:18:54.922,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/07 15:19:13.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/08 10:21:18.208,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/08 10:26:55.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 10:27:08.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm - 2019/03/08 10:27:08.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas - 2019/03/08 10:27:45.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm - 2019/03/08 10:27:45.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2019/03/08 10:28:02.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/08 11:14:25.860,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/08 13:41:42.692,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 13:43:18.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 13:43:18.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/08 16:42:04.691,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/08 16:42:12.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 16:42:32.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS\GebruikerService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas + 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/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 + 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.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 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.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 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 + 2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/12 11:42:34.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2019/03/12 11:42:41.845,=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/12 11:42:52.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r43 -r47 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 43) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 47) @@ -112,6 +112,7 @@ fHuidigScherm := fBestaandePalletScherm; end else if fHuidigScherm.ModalResult = mrOk then begin + fHuidigePallet := (fHuidigScherm as TfmPalletScherm).edtPallet.Text; fHuidigScherm := fDnaCodeScherm; end else if fHuidigScherm.ModalResult = mrAbort then begin Index: AAPClient/WS/DnaCodeService.pas =================================================================== diff -u -r46 -r47 --- AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 46) +++ AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 47) @@ -5,7 +5,7 @@ // >Import : http://tve-w7:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.CLS?WSDL=1>0 // Encoding : UTF-8 // Version : 1.0 -// (12/03/2019 10:20:52 - - $Rev: 45757 $) +// (12/03/2019 11:42:41 - - $Rev: 45757 $) // ************************************************************************ // unit DnaCodeService; @@ -287,15 +287,25 @@ DnaCodeAfmeldenResponse = class(DataTransferObject) private FHeader: ResponseHeader; + 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 Header: ResponseHeader read FHeader write FHeader; - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; + property Header: ResponseHeader read FHeader write FHeader; + 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; @@ -629,6 +639,28 @@ inherited Destroy; end; +procedure DnaCodeAfmeldenResponse.SetAantalInToelevering(Index: Integer; const AInt64: Int64); +begin + FAantalInToelevering := AInt64; + FAantalInToelevering_Specified := True; +end; + +function DnaCodeAfmeldenResponse.AantalInToelevering_Specified(Index: Integer): boolean; +begin + Result := FAantalInToelevering_Specified; +end; + +procedure DnaCodeAfmeldenResponse.SetAantalReedsGescand(Index: Integer; const AInt64: Int64); +begin + FAantalReedsGescand := AInt64; + FAantalReedsGescand_Specified := True; +end; + +function DnaCodeAfmeldenResponse.AantalReedsGescand_Specified(Index: Integer): boolean; +begin + Result := FAantalReedsGescand_Specified; +end; + procedure DnaCodeAfmeldenResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin FDnaCodes := AArrayOfDnaCodeDnaCode; Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r44 -r47 Binary files differ Index: AAPClient/ProScan.identcache =================================================================== diff -u -r4 -r47 Binary files differ