Index: AAPClient/UI/DnaCodeScherm.dfm
===================================================================
diff -u -r332 -r386
--- AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 332)
+++ AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 386)
@@ -26,9 +26,9 @@
Caption = 'Scan DNA code'
end
object lblHuidigePalletData: TLabel [2]
- Left = 162
+ Left = 153
Top = 135
- Width = 147
+ Width = 165
Height = 39
Alignment = taCenter
AutoSize = False
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r382 -r386
--- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 382)
+++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 386)
@@ -37,6 +37,7 @@
procedure MeldDnaCodeAf();
procedure ZetToeleveringStatus(Status: DnaCodeStatus; isDirecteLevering: boolean = false);
procedure ToeleveringDataOphalen();
+ procedure VhossDataOphalen();
procedure VerwerkMogelijkePopups(EersteDnaCode: DnaCode);
function BepaalAantalLadesOpHuidigePallet: integer;
function BepaalDirecteLevering: boolean;
@@ -85,11 +86,16 @@
fImagesScherm.ilAlgemeen64.GetIcon(10, imgLaatstGescand.Picture.Icon);
fImagesScherm.ilAlgemeen32.GetIcon(4, imgWegwerpPallet.Picture.Icon);
fImagesScherm.ilAlgemeen32.GetIcon(3, imgDirecteLevering.Picture.Icon);
- if not (UiContext.Toelevering = '') then
- ToeleveringDataOphalen()
- else begin
- imgDirecteLevering.Visible := false;
- imgWegwerpPallet.Visible := false;
+
+ if UiContext.Modus = modusVHOSS then begin
+ VhossDataOphalen();
+ end else begin
+ if (not (UiContext.Toelevering = '')) then
+ ToeleveringDataOphalen()
+ else begin
+ imgDirecteLevering.Visible := false;
+ imgWegwerpPallet.Visible := false;
+ end;
end;
ZetIcoontjesBovenaan;
edtDnaCode.SetFocus;
@@ -177,19 +183,33 @@
function TfmDnaCodeScherm.BepaalAantalLadesOpHuidigePallet: integer;
var
fZoekViaPalletCodeResponse: ZoekViaPalletCodeResponse;
+ fZoekAlleVhossLadesBijDnaCodeResponse: ZoekAlleVhossLadesBijDnaCodeResponse;
begin
result := 0;
-
- fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet); //todo: enkel recente dingen
- try
- if fZoekViaPalletCodeResponse.Header.Status = '200' then begin
- result := length(fZoekViaPalletCodeResponse.DnaCodes);
- end else begin
- ToonPopupScherm(fZoekViaPalletCodeResponse.Header.Omschrijving, 'Probeer opnieuw');
- result := 0
+ if StartsText('O1',UiContext.Pallet) then begin
+ fZoekAlleVhossLadesBijDnaCodeResponse := TAgent.Create(UiContext).ZoekAlleVhossLadesBijDnaCode(UiContext.Pallet);
+ try
+ if fZoekAlleVhossLadesBijDnaCodeResponse.Header.Status = '200' then begin
+ result := length(fZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes);
+ end else begin
+ ToonPopupScherm(fZoekAlleVhossLadesBijDnaCodeResponse.Header.Omschrijving, 'Probeer opnieuw');
+ result := 0
+ end;
+ finally
+ fZoekAlleVhossLadesBijDnaCodeResponse.Free;
end;
- finally
- fZoekViaPalletCodeResponse.Free;
+ end else begin
+ fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet);
+ 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;
end;
end;
@@ -327,6 +347,43 @@
end;
end;
+procedure TfmDnaCodeScherm.VhossDataOphalen;
+var
+ fZoekAlleVhossLadesBijDnaCodeResponse: ZoekAlleVhossLadesBijDnaCodeResponse;
+ fDnaCodeTeller: integer;
+ fAantalGescand: integer;
+begin
+ if UiContext.LaatsteDnaCode = '' then
+ exit;
+
+ fZoekAlleVhossLadesBijDnaCodeResponse := TAgent.Create(UiContext).ZoekAlleVhossLadesBijDnaCode(UiContext.LaatsteDnaCode);
+ try
+ if fZoekAlleVhossLadesBijDnaCodeResponse.Header.Status <> '200' then begin
+ ToonPopupScherm(fZoekAlleVhossLadesBijDnaCodeResponse.Header.Omschrijving, 'Probeer opnieuw')
+ end else begin
+ fDnaCodeTeller := 0;
+ fAantalGescand := 0;
+ while fDnaCodeTeller < length(fZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes) do begin
+ if not (fZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes[fDnaCodeTeller].ScanTijdstip = nil) then
+ fAantalGescand := fAantalGescand + 1;
+
+ if fZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes[fDnaCodeTeller].DnaCode = UiContext.LaatsteDnaCode then
+ UiContext.Toelevering := fZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes[fDnaCodeTeller].Toelevering;
+
+ fDnaCodeTeller := fDnaCodeTeller + 1;
+ end;
+
+ lblAantalGescand.Caption := IntToStr(fAantalGescand);
+ lblTotaalAantal.Caption := IntToStr(length(fZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes));
+ btnInfo.Visible := true;
+ ZetIcoontjesBovenaan;
+ Self.ModalResult := mrDnaCode;
+ end;
+ finally
+ fZoekAlleVhossLadesBijDnaCodeResponse.Free;
+ end;
+end;
+
procedure TfmDnaCodeScherm.VerwerkMogelijkePopups(EersteDnaCode: DnaCode);
begin
if UiContext.Modus = modusDefault then begin
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r380 -r386
--- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 380)
+++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 386)
@@ -6,8 +6,8 @@
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.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 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
@@ -20,32 +20,32 @@
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\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.pas=E:\svn\Delphi\AAPClient\UI\PopupScherm.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.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.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.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.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.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.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 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.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 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
@@ -73,11 +73,11 @@
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.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 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=
@@ -137,6 +137,9 @@
2020/05/29 11:41:39.278,=E:\svn\Delphi\AAPClient\WS.pas
2020/05/29 11:42:20.248,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
2020/05/29 11:42:47.154,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
+ 2020/06/02 10:32:11.124,=E:\svn\Delphi\AAPClient\WS.pas
+ 2020/06/02 10:34:06.051,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
+ 2020/06/02 10:34:24.522,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas