Update 20250505

This commit is contained in:
Stefan Hutter
2025-05-05 17:50:51 +02:00
parent 5aa75038e7
commit 3e7d72e379
26 changed files with 78 additions and 24 deletions

View File

@@ -233,11 +233,12 @@ namespace OnDoc
EDK_Data.Load_EDK_File(filename);
dB.save_edk(filename, AppParams.CurrentMitarbeiter);
System.IO.File.Delete(filename);
if (EDK_Data.toexecute == true)
{
exec_edk(filename);
}
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
}
private void URI_Call(string filename)
{
@@ -428,13 +429,13 @@ namespace OnDoc
{
if (edkb12_check(filename))
{
System.IO.File.Delete(filename);
if (System.IO.File.Exists(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);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
int doktyp = Convert.ToInt32(dokumenttypnr);
doktyp = doktyp - 900000000;
EDK_Data.toexecute = true;
@@ -452,8 +453,8 @@ namespace OnDoc
{
string partnernr = EDK_Data.AnzeigePartnernr;
dokList1.refresh_edk_partner(Convert.ToInt32(partnernr));
System.IO.File.Delete(filename);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
}
}
@@ -508,6 +509,18 @@ namespace OnDoc
e.Cancel = true;
}
}
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select count(*) from OnDoc_Versandstrasse_Reserved_Documents where mitarbeiter=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)
{
if (MessageBox.Show("Vor dem Schliessen müssen im Fesnter 'Versandstrasse' die offenen Versand-Couvertes bereinigt werden."+Environment.NewLine+"Trotzdem schliessen?", "OnDoc schliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question)==DialogResult.No)
{
e.Cancel = true;
}
}
db = null;
}
}
}