[feat:] include pallet- and bundle-nr to pdf (int)

This commit is contained in:
2026-06-23 16:14:09 +02:00
parent fd30f4effc
commit 6d8034a3de
+38 -7
View File
@@ -951,6 +951,13 @@ public class PdfBuilder
int firstIndex = pageIndex * 2; int firstIndex = pageIndex * 2;
int palletNumber =
Settings._instance.pdfExport.rsPalNr +
(firstIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet =
(firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
DrawInternationalRunningSheet( DrawInternationalRunningSheet(
gfx, gfx,
marginX, marginX,
@@ -962,11 +969,23 @@ public class PdfBuilder
grouped_nums, grouped_nums,
fontLabel, fontLabel,
fontText, fontText,
fontBig fontBig,
palletNumber,
bundleOnPallet,
firstIndex + 1
); );
if (firstIndex + 1 < grouped_nums.Count) 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( DrawInternationalRunningSheet(
gfx, gfx,
marginX, marginX,
@@ -974,11 +993,14 @@ public class PdfBuilder
usableW, usableW,
tableH, tableH,
list, list,
grouped_nums[firstIndex + 1], grouped_nums[secondIndex],
grouped_nums, grouped_nums,
fontLabel, fontLabel,
fontText, fontText,
fontBig fontBig,
palletNumber2,
bundleOnPallet2,
secondIndex + 1
); );
} }
} }
@@ -996,7 +1018,10 @@ public class PdfBuilder
List<(int,string,string,string,int)> grouped_nums, List<(int,string,string,string,int)> grouped_nums,
XFont fontLabel, XFont fontLabel,
XFont fontText, XFont fontText,
XFont fontBig) XFont fontBig,
int pal_nr,
int bundleOnPallet,
int totalBundleNumber)
{ {
double line = 1.0; double line = 1.0;
@@ -1149,15 +1174,21 @@ public class PdfBuilder
new XRect(valueX, blY2 + 4, valueW, 14), new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight); 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), new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight); 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), new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight); 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), new XRect(valueX, blY5 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);