This commit is contained in:
Stefan Hutter
2025-01-12 16:18:11 +01:00
parent 11b4f840f0
commit 1e3c169d49
79 changed files with 449 additions and 199 deletions

View File

@@ -12,12 +12,7 @@ namespace DOCGEN.Klassen
{
SyncFExcel se = new SyncFExcel();
se.get_values(ref dt, excel);
foreach (System.Data.DataRow dr in dt.Rows)
{
DOCGEN.Klassen.Excel_Reader er = new DOCGEN.Klassen.Excel_Reader();
}
}
}

View File

@@ -116,7 +116,7 @@ namespace DOCGEN.Klassen
row = Convert.ToInt32(dr["rowindex"]);
col = Convert.ToInt32(dr["columnindex"]);
string value = workBook.Worksheets[Convert.ToInt32(dr["sheets"])].Range[row, col].Value.ToString();
string value = workBook.Worksheets[Convert.ToInt32(dr["sheet"])-1].Range[row, col].DisplayText.ToString();
dr["value"] = value;
}
workBook.Close();

View File

@@ -273,10 +273,10 @@ namespace DOCGEN.Klassen
}
}
}
if (img_faktura != "")
{
insert_ppfaktura(document, img_faktura);
}
//if (img_faktura != "")
//{
// insert_ppfaktura(document, img_faktura);
//}
if (docdata.Form_ohne_Unterschrift=="True" || docdata.As_Faksimile == "True")
{
DB db = new DB();
@@ -379,9 +379,32 @@ namespace DOCGEN.Klassen
}
else
{
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.InsertText(dv.Value.ToString());
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
if (dv.TMBeginn.ToString() == "TGEDKAdresseZustellungB99")
{
if (img_faktura != "")
{
insert_ppfaktura(document, img_faktura);
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.InsertText(dv.Value.ToString());
//bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
}
else
{
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.InsertText(dv.Value.ToString());
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
}
}
else
{
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.InsertText(dv.Value.ToString());
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
}
}
}
@@ -700,6 +723,7 @@ namespace DOCGEN.Klassen
IWParagraph paragraph = new WParagraph(document);
paragraph.AppendPicture(image);
bookmarkNavigator.InsertParagraph(paragraph);
}
@@ -789,9 +813,10 @@ namespace DOCGEN.Klassen
//int rotation = 0;
//if (docData.barcode_horizontal == 0) { rotation = 270; }
barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16)+docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize),0);
//barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height,false);
//barcodeimage = ScaleImage(barcodeimage, docData.barcode_width, docData.barcode_height);
//barcodeimage = resizeImage(barcodeimage, new Size(docData.barcode_width,docData.barcode_height));
break;
case "1":
//BarcodeLibVBDatamatrix.MW6Datamatrix dm = new BarcodeLibVBDatamatrix.MW6Datamatrix();
@@ -853,6 +878,12 @@ namespace DOCGEN.Klassen
// picture.Height = barcodeimage.Height;
}
if (docData.barcode_type == "0")
{
picture.Width = docData.barcode_width;
picture.Height = docData.barcode_height;
}
WPicture picture2 = new WPicture(document);
picture2 = picture;