diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index 6520e565..fce1e02f 100644 Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 69bd5bb0..49470b74 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index d4de652b..915569fe 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 0f186836..7c0a3dab 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -12937,3 +12937,38 @@ done 2025-06-18 14:33:01.3897|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. 2025-06-18 14:33:01.3897|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524785 2025-06-18 14:33:01.3897|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-20 10:42:57.8849|DEBUG|OnDoc|Start ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002525045 +2025-06-20 10:42:57.9205|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-20 10:42:57.9205|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Slow +2025-06-20 10:43:00.3405|DEBUG|OnDoc|Ende Transfer to OnBase +2025-06-20 10:43:06.6093|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_182_4 +2025-06-20 10:43:06.6270|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_182_4 +2025-06-20 10:43:07.0917|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002525045 +2025-06-20 10:44:29.6826|DEBUG|OnDoc|Start ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002525037 +2025-06-20 10:44:29.7181|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-20 10:44:29.7181|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Slow +2025-06-20 10:44:33.5030|DEBUG|OnDoc|Ende Transfer to OnBase +2025-06-20 10:44:33.5140|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_182_3 +2025-06-20 10:44:33.5140|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_182_3 +2025-06-20 10:44:33.5220|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002525037 +2025-06-20 10:44:56.6595|DEBUG|OnDoc|Start ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002525029 +2025-06-20 10:44:56.6686|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-20 10:44:56.6686|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Slow +2025-06-20 10:44:59.0109|DEBUG|OnDoc|Ende Transfer to OnBase +2025-06-20 10:44:59.0109|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_182_2 +2025-06-20 10:44:59.0266|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_182_2 +2025-06-20 10:44:59.0266|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002525029 +2025-06-20 10:45:00.0261|DEBUG|OnDoc|Start ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002524961 +2025-06-20 10:45:00.0261|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-20 10:45:00.0261|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Slow +2025-06-20 10:45:00.8063|DEBUG|OnDoc|Ende Transfer to OnBase +2025-06-20 10:45:00.8063|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_182_0 +2025-06-20 10:45:00.8249|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_182_0 +2025-06-20 10:45:00.8249|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002524961 +2025-06-20 10:45:01.5791|DEBUG|OnDoc|Start ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002524992 +2025-06-20 10:45:01.5791|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-20 10:45:01.5791|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Slow +2025-06-20 10:45:02.2745|DEBUG|OnDoc|Ende Transfer to OnBase +2025-06-20 10:45:02.2745|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_182_1 +2025-06-20 10:45:02.2915|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_182_1 +2025-06-20 10:45:02.2915|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002524992 diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index e54f622d..16160ced 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index 69bd5bb0..49470b74 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index d4de652b..915569fe 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index 6520e565..fce1e02f 100644 Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 5292ce7d..f45cced6 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index bdfb07c0..3735d3b2 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -40,10 +40,9 @@ this.pictureBox1.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.ErrorImage"))); this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); this.pictureBox1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.InitialImage"))); - this.pictureBox1.Location = new System.Drawing.Point(139, 31); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox1.Location = new System.Drawing.Point(104, 25); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(348, 318); + this.pictureBox1.Size = new System.Drawing.Size(261, 258); this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // @@ -51,10 +50,9 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(219, 374); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(164, 304); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(151, 31); + this.label1.Size = new System.Drawing.Size(122, 26); this.label1.TabIndex = 1; this.label1.Text = "Version 1.6"; // @@ -62,25 +60,23 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(207, 406); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(150, 330); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(176, 31); + this.label2.Size = new System.Drawing.Size(142, 26); this.label2.TabIndex = 2; - this.label2.Text = "17. Juni 2025"; + this.label2.Text = "20. Juni 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(625, 487); + this.ClientSize = new System.Drawing.Size(469, 396); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.pictureBox1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "SplashScreen"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "SplashScreen"; diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs index 6bf632cc..a564f13d 100644 --- a/Client/UIControls/Serienbrief.cs +++ b/Client/UIControls/Serienbrief.cs @@ -252,7 +252,7 @@ namespace OnDoc.UIControls partnerLöschenToolStripMenuItem.Visible = false; vorschauToolStripMenuItem.Visible = false; sfDataGridEmpfaenger.AllowEditing = false; - erneutGenerierenToolStripMenuItem.Visible = true; + erneutGenerierenToolStripMenuItem.Visible = false; docPreview1.clear_viewer(); docPreview1.Visible = true; } @@ -1318,6 +1318,7 @@ namespace OnDoc.UIControls private void partnerLöschenToolStripMenuItem_Click(object sender, EventArgs e) { + sfDataGridEmpfaenger.AllowDeleting = true; sfDataGridEmpfaenger.DeleteSelectedRecords(); sfDataGridEmpfaenger.AllowDeleting = false; @@ -2394,7 +2395,7 @@ namespace OnDoc.UIControls OnBaseDocUpload.attribute p = new OnBaseDocUpload.attribute(rw["fieldname"].ToString(), rw["fieldvalue"].ToString()); onbasedoc.attributes.Add(p); } - db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + " and inteintragnr=" + dr["IntEintragNr"].ToString(), false, true); + db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + " and inteintragnr=" + dr["IntEintragNr"].ToString()+ " and dokumentid='"+dr["dokumentid"].ToString()+"'", false, true); onbasedoc.dokumentDatei = db.dsdaten.Tables[0].Rows[0][0].ToString(); string URL = ""; string response = ""; @@ -2480,7 +2481,9 @@ namespace OnDoc.UIControls dr["status"] = "0"; //changes the Product_name } } - + DB db = new DB(AppParams.connectionstring); + db.Exec_SQL("Delete from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString()); + db = null; refresh_empfaenger(sb.dsempfaenger.Tables[0]); ribbonButtonToApproval.Enabled = false; } @@ -2951,6 +2954,17 @@ namespace OnDoc.UIControls private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e) { + int hasbl = 0; + foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows) + { + if (dr["blkunde"].ToString() == "1") { hasbl = 1; } + } + if (hasbl > 0) + { + MessageBox.Show("Der Serienbrief enthält Banklagernd-Kunden. Ein Versand über die Versandstrasse ist nicht möglich.", "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + return; + } + Listversandpakete = new List(); Versandpaket vp = new Versandpaket(); vp.Dokument = new List(); diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index e4fd981c..c05f0ff4 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -144,11 +144,13 @@ namespace OnDoc.Versandstrasse if (!serienbrief) { lblpostausgang.Visible = true; + lblserienbrief.Visible = false; this.lblpostausgang.Left = this.Width - lblpostausgang.Width; } else { - lblserienbrief.Visible = true; + lblserienbrief.Visible = false; + lblpostausgang.Visible = false; this.lblserienbrief.Left = this.Width - lblserienbrief.Width; } } diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index 6520e565..fce1e02f 100644 Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index d1694183..3f43cc46 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index f01aa285..b3a31e76 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 343d1ec0..30999565 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/Versandstrasse.dll b/Client/bin/Debug/Versandstrasse.dll index b5901a4f..76053275 100644 Binary files a/Client/bin/Debug/Versandstrasse.dll and b/Client/bin/Debug/Versandstrasse.dll differ diff --git a/Client/bin/Debug/Versandstrasse.pdb b/Client/bin/Debug/Versandstrasse.pdb index d77b1594..19098d29 100644 Binary files a/Client/bin/Debug/Versandstrasse.pdb and b/Client/bin/Debug/Versandstrasse.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 3ea018da..6bfde744 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 81f51e7c..5a227b99 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index dfdb2dba..5d47de64 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index d1694183..3f43cc46 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index f01aa285..b3a31e76 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 3ea018da..6bfde744 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index 6520e565..fce1e02f 100644 Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index f8569368..17efc931 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index 6520e565..fce1e02f 100644 Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/db.cs b/Database/db.cs index 445614d1..384c6501 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -1602,7 +1602,7 @@ namespace Database public string save_serienbrief_datei(int serienbriefnr, int eintragnr, string filename, string dokumentid) { SqlConnection Connection = new SqlConnection(); - SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where dokumentid='" + dokumentid + "'", Connection); + SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where dokumentid='" + dokumentid + "' and inteintragnr="+eintragnr.ToString(), Connection); //SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where inteintragnr = " + eintragnr.ToString() + " and serienbriefnr = " + serienbriefnr.ToString(), Connection); SqlCommandBuilder cb = new SqlCommandBuilder(DA); DataSet ds = new DataSet(); diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index 6520e565..fce1e02f 100644 Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index 6520e565..fce1e02f 100644 Binary files a/OnDocOffice/bin/Debug/Database.dll and b/OnDocOffice/bin/Debug/Database.dll differ diff --git a/OnDocOffice/bin/Debug/Database.pdb b/OnDocOffice/bin/Debug/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index ca1c6564..555e8c60 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDoc_Paketversand/Program.cs b/OnDoc_Paketversand/Program.cs index fa0acbb0..8191e984 100644 --- a/OnDoc_Paketversand/Program.cs +++ b/OnDoc_Paketversand/Program.cs @@ -95,8 +95,16 @@ namespace OnDoc_Paketversand } else { - string message = "Das Versand-Couvert Nr. " + paketid + " / Partner-Nr " + vp.partnernr + " konnte nicht versendet werden."; - sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); + // string message = "Das Versand-Couvert Nr. " + paketid + " / Partner-Nr " + vp.partnernr + " konnte nicht versendet werden."; + string message = "Guten Tag

Das Versand-Couvert Nr." + paketid + " / Kunde-Nr: " + vp.partnernr + " konnte nicht versendet werden."; + message = message + "

Das Couvert liegt weiterhin im Postausgang und es stehen folgende Optionen zur Verfügung:
"; + message = message + "- Prüfen, ob das Dokument im OnBase gesperrt ist und ggf. entsperren
"; + message = message + "- Löschen des Versand-Couverts und die Dokumente manuell versenden
"; + message = message + "- Nächsten Versand abwarten"; + message = message + "

"; + message = message + "Bei Fragen kannst du das Dokumentenmanagement kontaktieren: per Email an dm@tkb.ch oder telefonisch +41 71 626 64 44"; + message = message +"

--------------------------------------------
OnDoc"; + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Versandstrasse Fehler", message); sendmail(ersteller, "OnDoc-Versandstrasse: Versandcouvert nicht versendet", message); @@ -110,17 +118,27 @@ namespace OnDoc_Paketversand } catch (Exception ex) { - string message = "Das Versand-Couvert Nr. " + paketid + " / Partner-Nr " + vp.partnernr + " konnte nicht versendet werden."+Environment.NewLine+"("+ex.Message+")"; - sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); + //string message = "Das Versand-Couvert Nr. " + paketid + " / Partner-Nr " + vp.partnernr + " konnte nicht versendet werden."+Environment.NewLine+"("+ex.Message+")" + + + string message = "Guten Tag

Das Versand-Couvert Nr." + paketid + " / Kunde-Nr: " + vp.partnernr + " konnte nicht versendet werden."; + message = message + "

Das Couvert liegt weiterhin im Postausgang und es stehen folgende Optionen zur Verfügung:
"; + message = message + "- Prüfen, ob das Dokument im OnBase gesperrt ist und ggf. entsperren
"; + message = message + "- Löschen des Versand-Couverts und die Dokumente manuell versenden
"; + message = message + "- Nächsten Versand abwarten"; + message = message + "

"; + message = message + "Bei Fragen kannst du das Dokumentenmanagement kontaktieren: per Email an dm@tkb.ch oder telefonisch +41 71 626 64 44"; + message = message + "

--------------------------------------------
OnDoc"; + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Versandstrasse Fehler", message); sendmail(ersteller, "OnDoc-Versandstrasse: Versandcouvert nicht versendet", message); - sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); + //sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); error = error + 1; } } Logging.VersandstrasseLog.Info("Ende OnDocPaketversand", "OnDoc-Paketversand", "", "", ""); - string msg = "OnDok Paketversand durchgeführt" + Environment.NewLine + "Total Pakete:" + total.ToString() + Environment.NewLine + "OK: " + ok.ToString() + Environment.NewLine + "Fehler: " + error.ToString(); - sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand abgeschlossen", msg); + string msg = "OnDoc Paketversand durchgeführt
Total Pakete:" + total.ToString() + "
OK: " + ok.ToString() +"
Fehler: " + error.ToString(); + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Versandstrasse: Versand abgeschlossen", msg); } private static DataTable Get_Tabledata(string Tablename, bool StoredProc = false, bool is_SQL_String = false, DataTable sp_params = null) { diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe index 1ac68bf6..107438cb 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb index e7899de8..5980b086 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip index 567aae42..ad24599a 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe index 1ac68bf6..107438cb 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb index e7899de8..5980b086 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb differ diff --git a/Versandstrasse/Class1.cs b/Versandstrasse/Class1.cs index 1422c2b6..35ebe1a2 100644 --- a/Versandstrasse/Class1.cs +++ b/Versandstrasse/Class1.cs @@ -277,7 +277,7 @@ namespace Versandstrasse private void split_doc(ref versandscript vscript, string document) { - SaveBase64ToFile(document, @"x:\f0.pdf"); + //SaveBase64ToFile(document, @"x:\f0.pdf"); vscript.dokuments[0].sourcedokument = document; vsdokument vsd = vscript.dokuments[0]; var stream = new MemoryStream(Convert.FromBase64String(vscript.dokuments[0].sourcedokument)); diff --git a/Versandstrasse/bin/Debug/Versandstrasse.dll b/Versandstrasse/bin/Debug/Versandstrasse.dll index b5901a4f..76053275 100644 Binary files a/Versandstrasse/bin/Debug/Versandstrasse.dll and b/Versandstrasse/bin/Debug/Versandstrasse.dll differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.pdb b/Versandstrasse/bin/Debug/Versandstrasse.pdb index d77b1594..19098d29 100644 Binary files a/Versandstrasse/bin/Debug/Versandstrasse.pdb and b/Versandstrasse/bin/Debug/Versandstrasse.pdb differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache index 3324392f..b8d808cc 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache and b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.dll b/Versandstrasse/obj/Debug/Versandstrasse.dll index b5901a4f..76053275 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.dll and b/Versandstrasse/obj/Debug/Versandstrasse.dll differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.pdb b/Versandstrasse/obj/Debug/Versandstrasse.pdb index d77b1594..19098d29 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.pdb and b/Versandstrasse/obj/Debug/Versandstrasse.pdb differ