fierke/logofclient
2
2
Fork 0
Code Issues 17 Pull Requests Releases 4 Wiki Activity

Compare commits

base: fierke/logofclient:v0.9.0
Branches Tags
fierke/logofclient:main fierke/logofclient:running-sheets fierke/logofclient:windows-paths fierke/logofclient:export-margin-options
fierke/logofclient:v0.9.0 fierke/logofclient:v0.8.1 fierke/logofclient:v0.8.0 fierke/logofclient:v0.7.0
..
compare: fierke/logofclient:6d8034a3de84b9dc51bd114a8450d3b13332ec9d
Branches Tags
fierke/logofclient:main fierke/logofclient:running-sheets fierke/logofclient:windows-paths fierke/logofclient:export-margin-options
fierke/logofclient:v0.9.0 fierke/logofclient:v0.8.1 fierke/logofclient:v0.8.0 fierke/logofclient:v0.7.0

5 Commits
v0.9.0 .. 6d8034a3de

Author SHA1 Message Date
fierke 6d8034a3de [feat:] include pallet- and bundle-nr to pdf (int) 2026-06-23 16:14:09 +02:00
fierke fd30f4effc [fix:] replaced the condition 2026-06-23 16:13:34 +02:00
fierke e20a59a524 [feat:] include pallet- and bundle-nr to pdf (de) 2026-06-23 16:08:23 +02:00
fierke 363dc17f2d [feat:] frontend for running sheet details (ZKZ, KNr, AMANr, ...) 2026-06-14 16:13:06 +02:00
fierke 413004d161 [feat:] split into german and international addresses 2026-06-10 14:55:17 +02:00
4 changed files with 295 additions and 121 deletions
Expand all files Collapse all files
DataStore/Settings.cs
+12
View File
@@ -70,6 +70,18 @@ public class PdfExportSettings
public bool exportRunningSheets { get; set; } = true; public bool exportRunningSheets { get; set; } = true;
public int rsNumGrouped { get; set; } = 25; public int rsNumGrouped { get; set; } = 25;
public int rsPlzStartpoint { get; set; } = 2; public int rsPlzStartpoint { get; set; } = 2;
public string rsKNrAbs { get; set; } = "";
public string rsKNrEmp { get; set; } = "";
public string rsZKZ { get; set; } = "";
public string rsIntVer { get; set; } = "";
public string rsLaufz { get; set; } = "";
public string rsEinldat { get; set; } = "";
public string rsAMANr { get; set; } = "";
public string rsBundGew { get; set; } = "";
public int rsPalNr { get; set; } = 1;
public int rsBundNrPal { get; set; } = 20;
} }
public class Global public class Global
MainWindow.axaml
+116 -68
View File
@@ -251,78 +251,126 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions"> <Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="20"> <ScrollViewer Grid.Column="1">
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20"> <StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" >
<StackPanel Orientation="Vertical" Spacing="10"> <Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0">
<Grid ColumnDefinitions="*,*"> <StackPanel Orientation="Vertical" Spacing="10">
<Label Grid.Column="0" Content="Zellenrand oben (mm)"></Label> <Grid ColumnDefinitions="*,*">
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingTop" Minimum="0" Maximum="20" Value="5"></NumericUpDown> <Label Grid.Column="0" Content="Zellenrand oben (mm)"></Label>
</Grid> <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingTop" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
<Grid ColumnDefinitions="*,*"> </Grid>
<Label Grid.Column="0" Content="Zellenrand unten (mm)"></Label> <Grid ColumnDefinitions="*,*">
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingBot" Minimum="0" Maximum="20" Value="5"></NumericUpDown> <Label Grid.Column="0" Content="Zellenrand unten (mm)"></Label>
</Grid> <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingBot" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
<Grid ColumnDefinitions="*,*"> </Grid>
<Label Grid.Column="0" Content="Zellenrand links (mm)"></Label> <Grid ColumnDefinitions="*,*">
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingLeft" Minimum="0" Maximum="20" Value="5"></NumericUpDown> <Label Grid.Column="0" Content="Zellenrand links (mm)"></Label>
</Grid> <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingLeft" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
<Grid ColumnDefinitions="*,*"> </Grid>
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label> <Grid ColumnDefinitions="*,*">
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown> <Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
</Grid> <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
<CheckBox Content="Laufzettel erstellen" x:Name="CbExpRnsEnable"></CheckBox> </Grid>
</StackPanel> <CheckBox Content="Laufzettel erstellen" x:Name="CbExpRnsEnable"></CheckBox>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10"> <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand oben"></Label> <Label Content="Zellenabstand oben"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginTop" Minimum="0" Maximum="20" Value="0"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginTop" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand unten"></Label> <Label Content="Zellenabstand unten"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginBottom" Minimum="0" Maximum="20" Value="0"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginBottom" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand rechts"></Label> <Label Content="Zellenabstand rechts"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginRight" Minimum="0" Maximum="20" Value="0"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginRight" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand links"></Label> <Label Content="Zellenabstand links"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Anzahl gruppierter Sendungen"></Label> <Label Grid.Column="0" Content="Anzahl gruppierter Sendungen"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzcount" Minimum="1" Maximum="10000" Value="25"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzcount" Minimum="1" Maximum="10000" Value="25"></NumericUpDown>
</Grid> </Grid>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10"> <StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Content="Zeilen pro Seite"></Label> <Label Content="Zeilen pro Seite"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargRowsPerPage" Minimum="1" Maximum="10" Value="7"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="TbExpMargRowsPerPage" Minimum="1" Maximum="10" Value="7"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Spalten pro Seite"></Label> <Label Grid.Column="0" Content="Spalten pro Seite"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargColumnsPerPage" Minimum="1" Maximum="8" Value="3"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="NudExpMargColumnsPerPage" Minimum="1" Maximum="8" Value="3"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Schriftgröße (groß)"></Label> <Label Grid.Column="0" Content="Schriftgröße (groß)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargFontSize" Minimum="5" Maximum="30" Value="9"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="NudExpMargFontSize" Minimum="5" Maximum="30" Value="9"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label> <Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
</Grid> </Grid>
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Gruppierpunkt"></Label> <Label Grid.Column="0" Content="Gruppierpunkt"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzStartpoint" Minimum="1" Maximum="10" Value="2"></NumericUpDown> <NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzStartpoint" Minimum="1" Maximum="10" Value="2"></NumericUpDown>
</Grid> </Grid>
</StackPanel>
</Grid>
<Grid ColumnDefinitions="*,*" ColumnSpacing="20" Margin="10,10,10,0">
<StackPanel Grid.Column="0" Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Kunden-Nr. Absender" />
<TextBox Grid.Column="1" x:Name="TbExpRnsKNrAbs" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Kunden-Nr. Empfänger" />
<TextBox Grid.Column="1" x:Name="TbExpRnsKNrEmp" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="ZKZ/Titel" />
<TextBox Grid.Column="1" x:Name="TbExpRnsZKZ" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Interner Vermerk" />
<TextBox Grid.Column="1" x:Name="TbExpRnsIntVer" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Laufzeit" />
<TextBox Grid.Column="1" x:Name="TbExpRnsLaufz" />
</Grid>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Einlieferungsdatum" />
<TextBox Grid.Column="1" x:Name="TbExpRnsEinldat" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="AM-Auftragsnummer" />
<TextBox Grid.Column="1" x:Name="TbExpRnsAMANr" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Bundgewicht" />
<TextBox Grid.Column="1" x:Name="TbExpRnsBundGew" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Paletten-Nr. (Start)" />
<NumericUpDown Grid.Column="1" Minimum="0" Value="1" x:Name="NudExpRnsPalNr" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Anzahl Bunde auf Palette" />
<NumericUpDown Grid.Column="1" Minimum="0" Value="20" x:Name="NudExpRnsBundNrPal" />
</Grid>
</StackPanel>
</Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10,10,10,10">
<Button Content="Start" Click="BtnStartGenerateLabels_OnClick"></Button>
</StackPanel> </StackPanel>
</Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Button Content="Start" Click="BtnStartGenerateLabels_OnClick"></Button>
</StackPanel> </StackPanel>
</StackPanel> </ScrollViewer>
</Grid> </Grid>
</Grid> </Grid>
</TabItem> </TabItem>
MainWindow.axaml.cs
+23 -1
View File
@@ -936,6 +936,17 @@ public partial class MainWindow : Window
NudExpMargColumnsPerPage.Value = options.columnsPerPage; NudExpMargColumnsPerPage.Value = options.columnsPerPage;
NudExpMargFontSize.Value = (decimal)options.fontSize; NudExpMargFontSize.Value = (decimal)options.fontSize;
NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize; NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
TbExpRnsKNrAbs.Text = options.rsKNrAbs;
TbExpRnsKNrEmp.Text = options.rsKNrEmp;
TbExpRnsZKZ.Text = options.rsZKZ;
TbExpRnsIntVer.Text = options.rsIntVer;
TbExpRnsLaufz.Text = options.rsLaufz;
TbExpRnsEinldat.Text = options.rsEinldat;
TbExpRnsAMANr.Text = options.rsAMANr;
TbExpRnsBundGew.Text = options.rsBundGew;
NudExpRnsPalNr.Value = options.rsPalNr;
NudExpRnsBundNrPal.Value = options.rsBundNrPal;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -959,7 +970,18 @@ public partial class MainWindow : Window
rowsPerPage = ReadInt(TbExpMargRowsPerPage, 7), rowsPerPage = ReadInt(TbExpMargRowsPerPage, 7),
columnsPerPage = ReadInt(NudExpMargColumnsPerPage, 3), columnsPerPage = ReadInt(NudExpMargColumnsPerPage, 3),
fontSize = ReadDouble(NudExpMargFontSize), fontSize = ReadDouble(NudExpMargFontSize),
smallFontSize = ReadDouble(NudExpMargSmallFontSize) smallFontSize = ReadDouble(NudExpMargSmallFontSize),
rsKNrAbs = TbExpRnsKNrAbs.Text,
rsKNrEmp = TbExpRnsKNrEmp.Text,
rsZKZ = TbExpRnsZKZ.Text,
rsIntVer = TbExpRnsIntVer.Text,
rsLaufz = TbExpRnsLaufz.Text,
rsEinldat = TbExpRnsEinldat.Text,
rsAMANr = TbExpRnsAMANr.Text,
rsBundGew = TbExpRnsBundGew.Text,
rsPalNr = ReadInt(NudExpRnsPalNr, 1),
rsBundNrPal = ReadInt(NudExpRnsBundNrPal, 20)
}; };
Settings.Save(); Settings.Save();
Tasks/PdfBuilder.cs
+142 -50
View File
@@ -101,6 +101,12 @@ public class PdfBuilder
{ {
// Find the AddressSet by ID // Find the AddressSet by ID
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId); var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
// foreach (var pers in addressSet.KasPersons)
// {
// AddressCreator.CreateFinalMarkdownString(pers.id);
// }
// addressSet.KasPersons = addressSet.KasPersons.OrderBy(x => x.IsGermany()).ThenBy(y => y.used_plz).ToList();
if (addressSet == null) if (addressSet == null)
throw new ArgumentException($"AddressSet with ID {addressSetId} not found"); throw new ArgumentException($"AddressSet with ID {addressSetId} not found");
@@ -109,7 +115,8 @@ public class PdfBuilder
// Generate markdown addresses from all KasPersons in the set // Generate markdown addresses from all KasPersons in the set
//var addresses = new string?[addressSet.KasPersons.Count]; //var addresses = new string?[addressSet.KasPersons.Count];
var addresses = new List<string>(); var addresses_german = new List<string>();
var addresses_inter = new List<string>();
// find customer (owner) to include sender_address // find customer (owner) to include sender_address
string senderLine = null; string senderLine = null;
@@ -124,28 +131,50 @@ public class PdfBuilder
senderLine = null; senderLine = null;
} }
for (var i = 0; i < addressSet.KasPersons.Count; i++) for (var i = 0; i < addressSet.KasPersons.Count; i++)
{ {
if (!addressSet.KasPersons[i].IsGermany()) continue;
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id); var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
if (string.IsNullOrWhiteSpace(addr)) continue; if (string.IsNullOrWhiteSpace(addr)) continue;
if (!string.IsNullOrEmpty(senderLine)) if (!string.IsNullOrEmpty(senderLine))
addresses.Add(senderLine + (addr ?? "")); addresses_german.Add(senderLine + (addr ?? ""));
else else
addresses.Add(addr); addresses_german.Add(addr);
} }
if (addresses.Count == 0) for (var i = 0; i < addressSet.KasPersons.Count; i++)
{ {
MessageBox.Show(MainWindow._instance, "Keine validen Adressen konnten generiert werden. Abbruch.", "Fehler"); if (addressSet.KasPersons[i].IsGermany()) continue;
return; var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
} if (string.IsNullOrWhiteSpace(addr)) continue;
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath); if (!string.IsNullOrEmpty(senderLine))
addresses_inter.Add(senderLine + (addr ?? ""));
else
addresses_inter.Add(addr);
}
if (addresses_german.Count == 0 && addresses_inter.Count == 0)
{
MessageBox.Show(MainWindow._instance, "Keine validen Adressen konnten generiert werden. Abbruch.", "Fehler");
return;
}
string output_inter = outputPath.Replace(".pdf", "-internation.pdf");
if(addresses_german.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath);
if(addresses_inter.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, outputPath);
if (_settings.exportRunningSheets)
{
ExportRunningSheets(addressSetId, outputPath);
}
//CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath);
//CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter);
if (_settings.exportRunningSheets)
{
ExportRunningSheets(addressSetId, outputPath);
}
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -553,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,
@@ -564,9 +600,21 @@ public class PdfBuilder
grouped_nums, grouped_nums,
fontLabel, fontLabel,
fontText, fontText,
fontBig fontBig,
palletNumber,
bundleOnPallet,
firstIndex + 1
); );
int secondIndex = firstIndex + 1;
int palletNumber2 =
Settings._instance.pdfExport.rsPalNr +
(secondIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet2 =
(secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
if (firstIndex + 1 < grouped_nums.Count) if (firstIndex + 1 < grouped_nums.Count)
{ {
DrawGermanyRunningSheet( DrawGermanyRunningSheet(
@@ -576,11 +624,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
); );
} }
} }
@@ -599,8 +650,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]";
@@ -611,6 +664,8 @@ public class PdfBuilder
string groupNo = result.Item2?.ToString() ?? "[PLZ]"; string groupNo = result.Item2?.ToString() ?? "[PLZ]";
string fraction = result.Item1?.ToString() ?? "[Fraktion]"; string fraction = result.Item1?.ToString() ?? "[Fraktion]";
var options = Settings._instance.pdfExport;
int total_frac = 0; int total_frac = 0;
foreach (var item in grouped_nums) foreach (var item in grouped_nums)
{ {
@@ -675,8 +730,8 @@ public class PdfBuilder
// Values top row // Values top row
gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Absender]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsKNrAbs, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[ZKZ/Titel]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsZKZ, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft);
// Second row labels // Second row labels
@@ -687,9 +742,9 @@ public class PdfBuilder
// Second row values // Second row values
gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Einlieferer]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsKNrEmp, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Interne Vermerke]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsIntVer, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Laufzeit]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsLaufz, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
// Middle area // Middle area
gfx.DrawString(groupNo, fontBig, XBrushes.Black, gfx.DrawString(groupNo, fontBig, XBrushes.Black,
@@ -738,27 +793,31 @@ public class PdfBuilder
double valueX = x + leftBottomW * 0.55; double valueX = x + leftBottomW * 0.55;
double valueW = leftBottomW - (valueX - x) - 5; double valueW = leftBottomW - (valueX - x) - 5;
gfx.DrawString("[Einlieferungsdatum]", fontText, XBrushes.Black, gfx.DrawString(options.rsEinldat, fontText, XBrushes.Black,
new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14), new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
gfx.DrawString("[AM-Auftragsnummer]", fontText, XBrushes.Black, gfx.DrawString(options.rsAMANr, fontText, XBrushes.Black,
new XRect(valueX, blY1 + 4, valueW, 14), new XRect(valueX, blY1 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
gfx.DrawString("[Bundgewicht]", fontText, XBrushes.Black, gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black,
new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Paletten-Nr.]", fontText, XBrushes.Black,
new XRect(valueX, blY3 + 4, valueW, 14), new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
gfx.DrawString("[Bund-Nr./Bunde auf Palette]", 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);
@@ -892,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,
@@ -903,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,
@@ -915,18 +993,21 @@ 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
); );
} }
} }
document.Save(path); document.Save(path);
} }
private void DrawInternationalRunningSheet( private void DrawInternationalRunningSheet(
XGraphics gfx, XGraphics gfx,
double x, double x,
double y, double y,
@@ -937,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;
@@ -949,6 +1033,8 @@ public class PdfBuilder
string groupNo = result.Item2?.ToString() ?? "[PLZ]"; string groupNo = result.Item2?.ToString() ?? "[PLZ]";
string fraction = result.Item1?.ToString() ?? "[Fraktion]"; string fraction = result.Item1?.ToString() ?? "[Fraktion]";
var options = Settings._instance.pdfExport;
int total_frac = 0; int total_frac = 0;
foreach (var item in grouped_nums) foreach (var item in grouped_nums)
{ {
@@ -1013,8 +1099,8 @@ public class PdfBuilder
// Values top row // Values top row
gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Absender]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsKNrAbs, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[ZKZ/Titel]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsZKZ, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft); gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft);
// Second row labels // Second row labels
@@ -1025,9 +1111,9 @@ public class PdfBuilder
// Second row values // Second row values
gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Einlieferer]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsKNrEmp, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Interne Vermerke]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsIntVer, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Laufzeit]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft); gfx.DrawString(options.rsLaufz, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
// Middle area // Middle area
gfx.DrawString(groupNo, fontBig, XBrushes.Black, gfx.DrawString(groupNo, fontBig, XBrushes.Black,
@@ -1076,27 +1162,33 @@ public class PdfBuilder
double valueX = x + leftBottomW * 0.55; double valueX = x + leftBottomW * 0.55;
double valueW = leftBottomW - (valueX - x) - 5; double valueW = leftBottomW - (valueX - x) - 5;
gfx.DrawString("[Einlieferungsdatum]", fontText, XBrushes.Black, gfx.DrawString(options.rsEinldat, fontText, XBrushes.Black,
new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14), new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
gfx.DrawString("[AM-Auftragsnummer]", fontText, XBrushes.Black, gfx.DrawString(options.rsAMANr, fontText, XBrushes.Black,
new XRect(valueX, blY1 + 4, valueW, 14), new XRect(valueX, blY1 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
gfx.DrawString("[Bundgewicht]", fontText, XBrushes.Black, gfx.DrawString(options.rsBundGew, fontText, XBrushes.Black,
new XRect(valueX, blY2 + 4, valueW, 14), new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
gfx.DrawString("[Paletten-Nr.]", 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("[Bund-Nr./Bunde auf Palette]", 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);