From 6d8034a3de84b9dc51bd114a8450d3b13332ec9d Mon Sep 17 00:00:00 2001 From: Elias Fierke Date: Tue, 23 Jun 2026 16:14:09 +0200 Subject: [PATCH] [feat:] include pallet- and bundle-nr to pdf (int) --- Tasks/PdfBuilder.cs | 47 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/Tasks/PdfBuilder.cs b/Tasks/PdfBuilder.cs index 659d66b..67ac693 100644 --- a/Tasks/PdfBuilder.cs +++ b/Tasks/PdfBuilder.cs @@ -951,6 +951,13 @@ public class PdfBuilder int firstIndex = pageIndex * 2; + int palletNumber = + Settings._instance.pdfExport.rsPalNr + + (firstIndex / Settings._instance.pdfExport.rsBundNrPal); + + int bundleOnPallet = + (firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1; + DrawInternationalRunningSheet( gfx, marginX, @@ -962,11 +969,23 @@ public class PdfBuilder grouped_nums, fontLabel, fontText, - fontBig + fontBig, + palletNumber, + bundleOnPallet, + firstIndex + 1 ); if (firstIndex + 1 < grouped_nums.Count) { + int secondIndex = firstIndex + 1; + + int palletNumber2 = + Settings._instance.pdfExport.rsPalNr + + (secondIndex / Settings._instance.pdfExport.rsBundNrPal); + + int bundleOnPallet2 = + (secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1; + DrawInternationalRunningSheet( gfx, marginX, @@ -974,18 +993,21 @@ public class PdfBuilder usableW, tableH, list, - grouped_nums[firstIndex + 1], + grouped_nums[secondIndex], grouped_nums, fontLabel, fontText, - fontBig + fontBig, + palletNumber2, + bundleOnPallet2, + secondIndex + 1 ); } } document.Save(path); } - private void DrawInternationalRunningSheet( + private void DrawInternationalRunningSheet( XGraphics gfx, double x, double y, @@ -996,7 +1018,10 @@ public class PdfBuilder List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, - XFont fontBig) + XFont fontBig, + int pal_nr, + int bundleOnPallet, + int totalBundleNumber) { double line = 1.0; @@ -1149,15 +1174,21 @@ public class PdfBuilder new XRect(valueX, blY2 + 4, valueW, 14), XStringFormats.TopRight); - gfx.DrawString(options.rsPalNr.ToString(), fontText, XBrushes.Black, + gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black, new XRect(valueX, blY3 + 4, valueW, 14), XStringFormats.TopRight); - gfx.DrawString("[Paletten-Nr.]", fontText, XBrushes.Black, + gfx.DrawString( + $"{bundleOnPallet}/{Settings._instance.pdfExport.rsBundNrPal}", + fontText, + XBrushes.Black, new XRect(valueX, blY4 + 4, valueW, 14), XStringFormats.TopRight); - gfx.DrawString("[Bund-Nr. von Gesamtanzahl]", fontText, XBrushes.Black, + gfx.DrawString( + $"{totalBundleNumber}/{grouped_nums.Count}", + fontText, + XBrushes.Black, new XRect(valueX, blY5 + 4, valueW, 14), XStringFormats.TopRight);