shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 20250331

Browse Source
This commit is contained in:
Stefan Hutter
2025-03-31 21:01:07 +02:00
parent c0bf4774b5
commit 632b97c292
23 changed files with 135 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Client/UIControls/Serienbrief.cs
View File

@@ -45,6 +45,8 @@ using OnDoc.Diverses;
using Syncfusion.Windows.Shared;
using System.Web.UI.WebControls;
using Syncfusion.Windows.Forms.CellGrid.ScrollAxis;
using Newtonsoft.Json;
using Syncfusion.XlsIO;
namespace OnDoc.UIControls
@@ -325,6 +327,19 @@ namespace OnDoc.UIControls
//this.Close();
}
private void Import_sf_Excel(string filename, string sheetname, ref System.Data.DataTable importdata)
{
ExcelEngine excelEngine = new ExcelEngine();
IApplication application = excelEngine.Excel;
IWorkbook workbook = application.Workbooks.Open(filename);
IWorksheet sheet = workbook.Worksheets[0];
importdata = sheet.ExportDataTable(sheet.UsedRange, ExcelExportDataTableOptions.ColumnNames);
sheet = null;
workbook.Close();
workbook = null;
excelEngine = null;
}
private void RibbonButtonExcelImport_Click(object sender, EventArgs e)
{
@@ -357,7 +372,9 @@ namespace OnDoc.UIControls
}
else { selected_sheetname = sheets[0]; }
reader.Excel_To_Datatabable(openFileDialog1.FileName, selected_sheetname, true, ref importdata);
Import_sf_Excel(openFileDialog1.FileName, selected_sheetname, ref importdata);
//reader.Excel_To_Datatabable(openFileDialog1.FileName, selected_sheetname, true, ref importdata);
init_progressbar("Daten importieren", importdata.Rows.Count);
if (importdata.Rows.Count > 2500)
{
@@ -2464,6 +2481,7 @@ namespace OnDoc.UIControls
//if (input.Result == InputBoxResult.OK) {
// string bez = input.Items["Bezeichnung"].ToString();
update_serienbriefdaten(false);
string json = JsonConvert.SerializeObject(sb.dsempfaenger.Tables["UsedFelder"], Formatting.Indented);
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dbo.binarytobase64(vorlage),DocType from edex_sb_vorlage where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true);
string file = db.dsdaten.Tables[0].Rows[0][0].ToString();
@@ -2478,9 +2496,13 @@ namespace OnDoc.UIControls
dr[6] = true;
dr[7] = dokytype;
dr[8] = bez;
dr[9] = json;
db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
db = null;
}
}
@@ -2489,13 +2511,22 @@ namespace OnDoc.UIControls
{
SerienbriefTemplateLoad sbt = new SerienbriefTemplateLoad(AppParams.CurrentMitarbeiter.ToString());
sbt.ShowDialog();
if (
sbt.DialogResult == DialogResult.OK) {
if (sbt.DialogResult == DialogResult.OK)
{
sb.VorlageBase64 = sbt.file;
FileHelper fh = new FileHelper();
fh.SaveBase64ToFile(sbt.file, sb.filename);
fh = null;
sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
string json = sbt.usedfelder;
System.Data.DataTable dt = (System.Data.DataTable)JsonConvert.DeserializeObject(json, (typeof(System.Data.DataTable)));
sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
foreach (System.Data.DataRow dr in dt.Rows)
{
sb.dsempfaenger.Tables["Usedfelder"].ImportRow(dr);
};
update_serienbriefdaten(false);
}