Fix reprinting by page range and serial number.

BulkPrinting/BulkPrinting/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.6")]
+[assembly: AssemblyFileVersion("1.7")]

BulkPrinting/BulkPrinting/ReprintForm.cs

@@ -82,6 +82,7 @@ namespace BulkPrinting
         {
             int SelectedRangeStart = 0;
             int SelectedRangeEnd = 0;
+            int SelectedBatchID = -1;
 
             decimal VoucherCount;
 
@@ -103,6 +104,7 @@ namespace BulkPrinting
                     MessageBox.Show("You have a final sequence number higher than the available vouchers to print. Please reduce the last sequence number to equal to or below the total number of vouchers.", "Cannot print that many vouchers", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                     return;
                 }
+                SelectedBatchID = BatchID;
                 SelectedRangeStart = (int)numFirstSeqNum.Value;
                 SelectedRangeEnd = (int)numLastSeqNum.Value;
             }
@@ -120,6 +122,7 @@ namespace BulkPrinting
                     return;
                 }
 
+                SelectedBatchID = BatchID;
                 SelectedRangeStart = ((int)numFirstPageNum.Value - 1) * 20 + MinSeqNo;
                 SelectedRangeEnd = (int)numLastPageNum.Value * 20 + MinSeqNo - 1;
                 if (SelectedRangeEnd > MaxSeqNo)
@@ -128,11 +131,20 @@ namespace BulkPrinting
                 }
             }
             else if (rdoSerial.Checked) {
-                int PrintCount = int.Parse(Globals.DB.ExecuteScalar(
-                    "SELECT Count(*) FROM Logs l left join Voucher v on l.VoucherId=v.id WHERE v.Serial=@serialnum and l.EventType=@eventtype and Retry=0",
-                    new SQLiteParameter("@serialnum", txtSerialNum.Text),
-                    new SQLiteParameter("@eventtype", VendorEvent.VendorEventType.PrintVoucher)).ToString());
-                if (PrintCount == 0) {
+                using (var command = Globals.DB.CreateCommand("SELECT * FROM Voucher WHERE Serial=@Serial AND PrintCount>0",
+                    new SQLiteParameter("@Serial", txtSerialNum.Text)))
+                {
+                    using (var reader = command.ExecuteReader())
+                    {
+                        if (reader.Read())
+                        {
+                            SelectedBatchID = (int)reader["BatchID"];
+                            SelectedRangeStart = (int)reader["SequenceNumber"];
+                            SelectedRangeEnd = SelectedRangeStart;
+                        }
+                    }
+                }
+                if (SelectedBatchID < 0) {
                     MessageBox.Show("No voucher with that serial number was found to have been printed. Please provide a previously printed voucher number or use the 'Print' function to print new vouchers.", "Cannot find printed voucher", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                     return;
                 }
@@ -184,14 +196,14 @@ namespace BulkPrinting
             {
                 PrintAlignmentDialog printdialog = new PrintAlignmentDialog();
                 printdialog.PrintDescription = PrintDescription;
-                printdialog.BatchID = BatchID;
+                printdialog.BatchID = SelectedBatchID;
                 printdialog.BatchOrderDate = BatchOrderDate;
                 printdialog.FaceValue = FaceValue;
                 printdialog.VoucherTypeName = VoucherTypeName;
                 printdialog.NetworkName = NetworkName;
                 printdialog.NumVouchers = null;
-                printdialog.FirstSeqNo = (int)numFirstSeqNum.Value;
-                printdialog.LastSeqNo = (int)numLastSeqNum.Value;
+                printdialog.FirstSeqNo = SelectedRangeStart;
+                printdialog.LastSeqNo = SelectedRangeEnd;
                 printdialog.Show();
                 this.Close();
             }