Index: AAPClient/WS/Agent.pas
===================================================================
diff -u -r197 -r199
--- AAPClient/WS/Agent.pas (.../Agent.pas) (revision 197)
+++ AAPClient/WS/Agent.pas (.../Agent.pas) (revision 199)
@@ -176,7 +176,7 @@
Request.Header := Header;
Request.Pallet := Pallet;
Request.Status := Status;
- Request.IsGlsDirect := IsDirecteLevering;
+ Request.IsDirecteLevering := IsDirecteLevering;
result := Service.PalletBijwerken(Request);
finally
@@ -201,7 +201,7 @@
Request.Header := Header;
Request.Toelevering := Toelevering;
Request.Status := Status;
- Request.IsGlsDirect := IsDirecteLevering;
+ Request.IsDirecteLevering := IsDirecteLevering;
result := Service.ToeleveringBijwerken(Request);
finally
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r197 -r199
--- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 197)
+++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 199)
@@ -269,11 +269,11 @@
procedure TfmDnaCodeScherm.VerwerkMogelijkePopups(EersteDnaCode: DnaCode);
begin
- if EersteDnaCode.IsGlsDirect then begin
+ if EersteDnaCode.IsDirecteLevering then begin
if not imgGls.Visible then
ToonPopupScherm('GLS Direct', 'OK','',15,-1,-1,clBlue);
fImagesScherm.ilAlgemeen32.GetIcon(3, imgGls.Picture.Icon);
- imgGls.Visible := EersteDnaCode.IsGlsDirect;
+ imgGls.Visible := EersteDnaCode.IsDirecteLevering;
end else begin
imgGls.Visible := false;
end;
Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r191 -r199
--- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 191)
+++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 199)
@@ -17,8 +17,8 @@
LoginScherm2 in 'UI\LoginScherm2.pas' {fmLoginScherm2},
DimmerForm in 'UI\DimmerForm.pas' {fmDimmerForm},
DnaCodeReedsGescandScherm in 'UI\DnaCodeReedsGescandScherm.pas' {fmDnaCodeReedsGescandScherm},
- DnaCodeService in 'WS\DnaCodeService.pas',
- Agent in 'WS\Agent.pas';
+ Agent in 'WS\Agent.pas',
+ DnaCodeService in 'WS\DnaCodeService.pas';
{$R *.res}
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r191 -r199
--- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 191)
+++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 199)
@@ -128,8 +128,8 @@
dfm
-
+
Cfg_2
Base
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r195 -r199
--- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 195)
+++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 199)
@@ -2,8 +2,8 @@
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:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas
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:28:35.000.977,=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
@@ -14,8 +14,8 @@
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.pas=E:\svn\Delphi\AAPClient\Unit1.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/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
@@ -26,8 +26,8 @@
2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.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\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
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\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
@@ -37,24 +37,24 @@
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\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas
2019/03/08 10:27:08.000.419,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\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas
2019/03/08 10:27:45.000.805,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\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas
2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.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\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas
2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas
2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas
2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm
+ 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas
2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas
2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas
@@ -64,17 +64,17 @@
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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm
2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas
+ 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm2.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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DimmerForm.pas
2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm
@@ -102,6 +102,12 @@
2019/10/03 11:18:12.000.484,=E:\svn\Delphi\AAPClient\WS.pas
2019/10/03 15:21:13.000.953,=E:\svn\Delphi\AAPClient\Unit1.pas
2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\WS\Agent.pas
+ 2019/10/07 09:39:36.456,=E:\svn\Delphi\AAPClient\WS.pas
+ 2019/10/07 09:39:44.760,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
+ 2019/10/07 09:40:00.589,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
+ 2019/10/07 09:43:00.939,=E:\svn\Delphi\AAPClient\WS.pas
+ 2019/10/07 09:43:11.201,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
+ 2019/10/07 09:43:28.012,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
@@ -132,8 +138,8 @@
-
+
Index: AAPClient/WS/DnaCodeService.pas
===================================================================
diff -u -r188 -r199
--- AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 188)
+++ AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 199)
@@ -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 15:42:14 - - $Rev: 45757 $)
+// (7/10/2019 9:43:00 - - $Rev: 45757 $)
// ************************************************************************ //
unit DnaCodeService;
@@ -336,14 +336,14 @@
FHeader: RequestHeader;
FToelevering: string;
FStatus: DnaCodeStatus;
- FIsGlsDirect: Boolean;
+ FIsDirecteLevering: Boolean;
public
destructor Destroy; override;
published
- property Header: RequestHeader read FHeader write FHeader;
- property Toelevering: string read FToelevering write FToelevering;
- property Status: DnaCodeStatus read FStatus write FStatus;
- property IsGlsDirect: Boolean read FIsGlsDirect write FIsGlsDirect;
+ property Header: RequestHeader read FHeader write FHeader;
+ property Toelevering: string read FToelevering write FToelevering;
+ property Status: DnaCodeStatus read FStatus write FStatus;
+ property IsDirecteLevering: Boolean read FIsDirecteLevering write FIsDirecteLevering;
end;
@@ -370,14 +370,14 @@
FHeader: RequestHeader;
FPallet: string;
FStatus: DnaCodeStatus;
- FIsGlsDirect: Boolean;
+ FIsDirecteLevering: Boolean;
public
destructor Destroy; override;
published
- property Header: RequestHeader read FHeader write FHeader;
- property Pallet: string read FPallet write FPallet;
- property Status: DnaCodeStatus read FStatus write FStatus;
- property IsGlsDirect: Boolean read FIsGlsDirect write FIsGlsDirect;
+ property Header: RequestHeader read FHeader write FHeader;
+ property Pallet: string read FPallet write FPallet;
+ property Status: DnaCodeStatus read FStatus write FStatus;
+ property IsDirecteLevering: Boolean read FIsDirecteLevering write FIsDirecteLevering;
end;
@@ -412,8 +412,8 @@
FLadeCode_Specified: boolean;
FStatus: DnaCodeStatus;
FStatus_Specified: boolean;
- FIsGlsDirect: Boolean;
- FIsGlsDirect_Specified: boolean;
+ FIsDirecteLevering: Boolean;
+ FIsDirecteLevering_Specified: boolean;
FParentDnaCode: string;
FParentDnaCode_Specified: boolean;
FSequentieNummer: string;
@@ -444,8 +444,8 @@
function LadeCode_Specified(Index: Integer): boolean;
procedure SetStatus(Index: Integer; const ADnaCodeStatus: DnaCodeStatus);
function Status_Specified(Index: Integer): boolean;
- procedure SetIsGlsDirect(Index: Integer; const ABoolean: Boolean);
- function IsGlsDirect_Specified(Index: Integer): boolean;
+ procedure SetIsDirecteLevering(Index: Integer; const ABoolean: Boolean);
+ function IsDirecteLevering_Specified(Index: Integer): boolean;
procedure SetParentDnaCode(Index: Integer; const Astring: string);
function ParentDnaCode_Specified(Index: Integer): boolean;
procedure SetSequentieNummer(Index: Integer; const Astring: string);
@@ -465,7 +465,7 @@
property ScanTijdstip: Horolog Index (IS_OPTN) read FScanTijdstip write SetScanTijdstip stored ScanTijdstip_Specified;
property LadeCode: string Index (IS_OPTN) read FLadeCode write SetLadeCode stored LadeCode_Specified;
property Status: DnaCodeStatus Index (IS_OPTN) read FStatus write SetStatus stored Status_Specified;
- property IsGlsDirect: Boolean Index (IS_OPTN) read FIsGlsDirect write SetIsGlsDirect stored IsGlsDirect_Specified;
+ property IsDirecteLevering: Boolean Index (IS_OPTN) read FIsDirecteLevering write SetIsDirecteLevering stored IsDirecteLevering_Specified;
property ParentDnaCode: string Index (IS_OPTN) read FParentDnaCode write SetParentDnaCode stored ParentDnaCode_Specified;
property SequentieNummer: string Index (IS_OPTN) read FSequentieNummer write SetSequentieNummer stored SequentieNummer_Specified;
property IsWegwerpPallet: Boolean Index (IS_OPTN) read FIsWegwerpPallet write SetIsWegwerpPallet stored IsWegwerpPallet_Specified;
@@ -889,15 +889,15 @@
Result := FStatus_Specified;
end;
-procedure DnaCode.SetIsGlsDirect(Index: Integer; const ABoolean: Boolean);
+procedure DnaCode.SetIsDirecteLevering(Index: Integer; const ABoolean: Boolean);
begin
- FIsGlsDirect := ABoolean;
- FIsGlsDirect_Specified := True;
+ FIsDirecteLevering := ABoolean;
+ FIsDirecteLevering_Specified := True;
end;
-function DnaCode.IsGlsDirect_Specified(Index: Integer): boolean;
+function DnaCode.IsDirecteLevering_Specified(Index: Integer): boolean;
begin
- Result := FIsGlsDirect_Specified;
+ Result := FIsDirecteLevering_Specified;
end;
procedure DnaCode.SetParentDnaCode(Index: Integer; const Astring: string);