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

This commit is contained in:
2026-06-23 16:08:23 +02:00
parent 363dc17f2d
commit e20a59a524
+51 -26
View File
@@ -582,6 +582,13 @@ public class PdfBuilder
var fontBig = new XFont("Arial", 30, XFontStyleEx.Bold); var fontBig = new XFont("Arial", 30, XFontStyleEx.Bold);
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;
DrawGermanyRunningSheet( DrawGermanyRunningSheet(
gfx, gfx,
marginX, marginX,
@@ -593,25 +600,37 @@ public class PdfBuilder
grouped_nums, grouped_nums,
fontLabel, fontLabel,
fontText, fontText,
fontBig fontBig,
palletNumber,
bundleOnPallet,
firstIndex + 1
); );
if (firstIndex + 1 < grouped_nums.Count) int secondIndex = firstIndex + 1;
{
DrawGermanyRunningSheet( int palletNumber2 =
gfx, Settings._instance.pdfExport.rsPalNr +
marginX, (secondIndex / Settings._instance.pdfExport.rsBundNrPal);
top2,
usableW, int bundleOnPallet2 =
tableH, (secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
list,
grouped_nums[firstIndex + 1], DrawGermanyRunningSheet(
grouped_nums, gfx,
fontLabel, marginX,
fontText, top2,
fontBig usableW,
); tableH,
} list,
grouped_nums[secondIndex],
grouped_nums,
fontLabel,
fontText,
fontBig,
palletNumber2,
bundleOnPallet2,
secondIndex + 1
);
} }
document.Save(path); document.Save(path);
@@ -628,8 +647,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;
string sender = Customer.GetCustomerByID(list.owner_id)?.sender_address ?? "[Absender]"; string sender = Customer.GetCustomerByID(list.owner_id)?.sender_address ?? "[Absender]";
@@ -777,19 +798,23 @@ public class PdfBuilder
new XRect(valueX, blY1 + 4, valueW, 14), new XRect(valueX, blY1 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
gfx.DrawString(options.rsBundGew, fontText, XBrushes.Black, gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black,
new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString(options.rsPalNr.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);