update 20241225

This commit is contained in:
Stefan Hutter
2024-12-25 11:42:23 +01:00
parent 4093f8764d
commit 4455cca85a
284 changed files with 100326 additions and 61 deletions

View File

@@ -207,10 +207,10 @@ namespace OnDoc
EDK_Data.Load_EDK_File(filename);
dB.save_edk(filename, AppParams.CurrentMitarbieter);
System.IO.File.Delete(filename);
//System.IO.File.Delete(filename);
if (EDK_Data.toexecute == true)
{
exec_edk();
exec_edk(filename);
}
}
private void URI_Call(string filename)
@@ -265,7 +265,24 @@ namespace OnDoc
}
private void exec_edk()
private bool edkb12_check(string filename)
{
DB dB = new DB(AppParams.connectionstring);
string dokumenttypnr = EDK_Data.GetAVQ_Parameter("dokumenttypnr");
int doktyp = Convert.ToInt32(dokumenttypnr);
doktyp = doktyp - 900000000;
dB.Get_Tabledata("Select count(*) from edk_data_doktype where dokumenttypnr=" + doktyp.ToString(),false,true);
if (Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][0]) > 0)
{
dB.save_edkdata(filename,AppParams.currenttgnummer);
dB = null;
return true;
}
dB = null;
return false;
}
private void exec_edk(string filename)
{
EDK_Data.toexecute = false;
if (EDK_Data.action == EDK_ActionType.DokumentErstellung)
@@ -273,7 +290,20 @@ namespace OnDoc
string partnernr = EDK_Data.GetAVQ_Parameter("Partnernr");
string dokumenttypnr = EDK_Data.GetAVQ_Parameter("dokumenttypnr");
string isdokumentpaket = EDK_Data.GetAVQ_Parameter("dokumentpaket");
string erstellungsart = EDK_Data.GetAVQ_Parameter("DirekteErstellung");
string interaktion = "Yes";
if (erstellungsart == "1") { interaktion = "No"; } else { interaktion = "Yes"; }
if (erstellungsart == "2")
{
if (edkb12_check(filename))
{
System.IO.File.Delete(filename);
MessageBox.Show("Das gewählte Dokument wird im Hintergrund erstellt.", "Dokumenterstellung", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
}
System.IO.File.Delete(filename);
int doktyp = Convert.ToInt32(dokumenttypnr);
doktyp = doktyp - 900000000;
EDK_Data.toexecute = true;
@@ -282,9 +312,10 @@ namespace OnDoc
dokList1.createdocumentpaket(Convert.ToInt32(partnernr), doktyp);
return;
}
//dokList1.createnewdoc(Convert.ToInt32(partnernr), doktyp, false, "Yes", "Yes");
dokList1.createnewdoc(Convert.ToInt32(partnernr), doktyp, false, interaktion, "Yes");
EDK_Data.toexecute = false;
}
}