--- dao/DelphiScanner/Main.pas 2015/09/03 14:53:37 2700 +++ dao/DelphiScanner/Main.pas 2015/09/03 15:22:09 2701 @@ -1600,6 +1600,7 @@ if not PakkeshopLevering1.Checked and not Pakkernormal1.Checked or (PakkeshopLevering1.Checked and (PakkeshopStregkode <> '') and (PakkeshopTjekkode <> '')) or (Pakkernormal1.Checked and (Scanogstjekkoden1.Checked and (BoghandlerStregkode <> '') and (BoghandlerTjekkode <> '') or not Scanogstjekkoden1.Checked)) then begin + if PakkeshopLevering1.Checked and (PakkeshopStregkode <> '') and (PakkeshopTjekkode <> '') then StregKode := PakkeshopStregkode; if Pakkernormal1.Checked and ((BoghandlerStregkode <> '') and (BoghandlerTjekkode <> '') or not Scanogstjekkoden1.Checked) then @@ -1674,6 +1675,7 @@ begin VisAlarmSkaerm(''); end; + if not btnNulstil.Visible then begin @@ -1766,7 +1768,7 @@ begin - if Budlevering1.Checked or Pakkeshoplevering1.Checked or Returpakkerfrapakkeshop1.Checked or Pakkernormal1.Checked then + if Budlevering1.Checked or Pakkeshoplevering1.Checked or Returpakkerfrapakkeshop1.Checked or Pakkernormal1.Checked or menuIndlevering.Checked then begin for i := ListBox2.items.count-1 downto 0 do if pos(StregKode,ListBox2.items[i]) <> 0 then @@ -2150,6 +2152,7 @@ PrintNyLabel := True; //Indleveringskode vil ALTID udskrive label PakkeshopLabel := TPakkeshopLabel.Create( XMLDocument1 ); //Opret struct og parse xml doc RuteNummer := PakkeshopLabel.Koreliste; + Stregkode := PakkeshopLabel.Stregkode; PrintPakkeshopLabel( PakkeshopLabel ); @@ -2283,6 +2286,12 @@ List1msg := List1msg + '; ' + Stregkode + ' (' + BoghandlerTjekkode + ')' + '; ' + Kommentar; end; end; + if menuIndlevering.Checked then + begin + List1Msg := Stregkode; + end; + + ListBox1.Items.Insert(0,List1Msg); logTekst := RightStr(List1Msg, Length(List1Msg)-10); SkrivScanningLogFil(logTekst);