From b88fb31cf141bcb9a7a0d93b7e927b785246f933 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 10 Aug 2026 09:12:56 +0200 Subject: [PATCH] =?UTF-8?q?div.=20=C3=84nderungen,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DAKOSY_Worker/cZOLL_IMPORT.vb | 10 +- MailSender/MAILSender.vb | 35 ++++--- UID/frmAPI.vb | 4 +- UID/usrCntlAPI.Designer.vb | 94 ++++++++++++------- UID/usrCntlAPI.vb | 8 ++ initATLASAufschubkonten/cWorker_Verwahrung.vb | 32 ++++--- initATLASAufschubkonten/frmStartOptions.vb | 2 - 7 files changed, 124 insertions(+), 61 deletions(-) diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index 57dfae8..fde7ffc 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -745,8 +745,14 @@ Public Class cZOLL_IMPORT SPEDITIONSBUCH.AbfertigungsanzahlPos = SENDUNG.tblSnd_anzahlPOS ' (NOCH) Keine Funktion! SPEDITIONSBUCH.Vermerk = "Pos-Anzahl: " & SPEDITIONSBUCH.AbfertigungsanzahlPos End If - If SPEDITIONSBUCH.PersonalnummerQS <= 0 Then SPEDITIONSBUCH.PersonalnummerQS = SENDUNG.tblSnd_QS_MA - If SPEDITIONSBUCH.PersonalnummerAbklTR <= 0 Then SPEDITIONSBUCH.PersonalnummerAbklTR = SENDUNG.tblSnd_AbklaerungTR_MA + + If SPEDITIONSBUCH.PersonalnummerQS Is Nothing OrElse IsDBNull(SPEDITIONSBUCH.PersonalnummerQS) OrElse CInt(SPEDITIONSBUCH.PersonalnummerQS) <= 0 Then + SPEDITIONSBUCH.PersonalnummerQS = SENDUNG.tblSnd_QS_MA + End If + + If SPEDITIONSBUCH.PersonalnummerAbklTR Is Nothing OrElse IsDBNull(SPEDITIONSBUCH.PersonalnummerAbklTR) OrElse CInt(SPEDITIONSBUCH.PersonalnummerAbklTR) <= 0 Then + SPEDITIONSBUCH.PersonalnummerAbklTR = SENDUNG.tblSnd_AbklaerungTR_MA + End If If SENDUNG.tblSnd_FilialeAbklaerung IsNot Nothing AndAlso IsNumeric(SENDUNG.tblSnd_FilialeAbklaerung) AndAlso SENDUNG.tblSnd_FilialeAbklaerung > 0 Then SPEDITIONSBUCH.FilialenNrAbklaerung = SENDUNG.tblSnd_FilialeAbklaerung diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index bd6f5d9..f28e695 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -653,7 +653,7 @@ Module Mail Case "UNISPED" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;arda.bicakli@tobbund.com.tr;mert.koseoglu@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) End Select Else - bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Subject & addbetreff, Body,,, False, cc, bcc, _list) + bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Subject & addbetreff, Body, getAbsenderEmail(),, False, cc, bcc, _list) End If @@ -914,7 +914,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False,, "d.breimaier@verag.ag;schulung@verag.ag", anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False,, "d.breimaier@verag.ag;schulung@verag.ag", anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -958,7 +958,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -1000,7 +1000,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -1057,7 +1057,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -1108,7 +1108,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -1993,7 +1993,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -2037,7 +2037,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -2072,7 +2072,7 @@ Module Mail Dim anhenge As New List(Of String) anhenge.Add(excel) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -2186,7 +2186,7 @@ Module Mail End If - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, anhenge) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -2312,7 +2312,7 @@ Module Mail End If - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False, cc, bcc, Pathlist) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, Pathlist) Then System.Console.WriteLine("E-Mail gesendet.") System.Console.WriteLine("Erfolgreich!") Else @@ -3969,6 +3969,16 @@ Module Mail Return Nothing End Function + Public Function getAbsenderEmail(Optional FirmaTmp = "") As String + Select Case If(FirmaTmp = "", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, FirmaTmp) + Case "IMEX" : Return "noreply@imex-group.at" + Case "ATILLA" : Return "noreply@verag.ag" + Case "UNISPED" : Return "No-Reply@unisped.at" + Case "FRONTOFFICE" : Return "noreply@front-office.eu" + Case Else : Return "noreply@verag.ag" + End Select + End Function + Public Function loadDgvBySqlAVISO(ByVal sql As String) As DataTable Try Dim myTable = New DataTable() @@ -4004,4 +4014,7 @@ Module Mail Return txt End Function + + + End Module diff --git a/UID/frmAPI.vb b/UID/frmAPI.vb index 533d433..1256079 100644 --- a/UID/frmAPI.vb +++ b/UID/frmAPI.vb @@ -1,6 +1,6 @@ Public Class frmAPI - Public id, progId, progName, maid, datetime, testsystem, type, mail, userName, firma, errorCode, errStack, errMessage, errMethodName, progVersion, mailcc, mailbcc, subject, mailtext, mailAnh + Public id, progId, progName, maid, datetime, testsystem, type, mail, userName, firma, errorCode, errStack, errMessage, errMethodName, progVersion, mailcc, mailbcc, subject, mailtext, mailAnh, apiId @@ -51,8 +51,6 @@ lblErrMsg.Text &= " (Error Code: " & errorCode & " - zu viele Fehler, kein Versuch mehr)" End Select - - If testsystem IsNot Nothing Then cbxTestsysten.Checked = testsystem End If diff --git a/UID/usrCntlAPI.Designer.vb b/UID/usrCntlAPI.Designer.vb index 4f906bc..5303a79 100644 --- a/UID/usrCntlAPI.Designer.vb +++ b/UID/usrCntlAPI.Designer.vb @@ -26,6 +26,10 @@ Partial Class usrCntlAPI Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.pnlSearch = New System.Windows.Forms.Panel() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.cbxStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label16 = New System.Windows.Forms.Label() + Me.cbxOhneAnhang = New System.Windows.Forms.CheckBox() + Me.btnExcel = New System.Windows.Forms.Button() Me.txtSuche = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label15 = New System.Windows.Forms.Label() Me.cboProgram = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -86,8 +90,6 @@ Partial Class usrCntlAPI Me.Panel3 = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button() - Me.btnExcel = New System.Windows.Forms.Button() - Me.cbxOhneAnhang = New System.Windows.Forms.CheckBox() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -143,6 +145,8 @@ Partial Class usrCntlAPI ' 'SplitContainer1.Panel1 ' + Me.SplitContainer1.Panel1.Controls.Add(Me.cbxStatus) + Me.SplitContainer1.Panel1.Controls.Add(Me.Label16) Me.SplitContainer1.Panel1.Controls.Add(Me.cbxOhneAnhang) Me.SplitContainer1.Panel1.Controls.Add(Me.btnExcel) Me.SplitContainer1.Panel1.Controls.Add(Me.txtSuche) @@ -200,6 +204,54 @@ Partial Class usrCntlAPI Me.SplitContainer1.SplitterDistance = 125 Me.SplitContainer1.TabIndex = 0 ' + 'cbxStatus + ' + Me.cbxStatus._allowedValuesFreiText = Nothing + Me.cbxStatus._allowFreiText = False + Me.cbxStatus._value = "" + Me.cbxStatus.Cursor = System.Windows.Forms.Cursors.Default + Me.cbxStatus.DropDownWidth = 250 + Me.cbxStatus.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxStatus.FormattingEnabled = True + Me.cbxStatus.Location = New System.Drawing.Point(770, 34) + Me.cbxStatus.Name = "cbxStatus" + Me.cbxStatus.Size = New System.Drawing.Size(62, 22) + Me.cbxStatus.TabIndex = 62 + ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label16.Location = New System.Drawing.Point(769, 16) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(43, 13) + Me.Label16.TabIndex = 61 + Me.Label16.Text = "Status" + ' + 'cbxOhneAnhang + ' + Me.cbxOhneAnhang.AutoSize = True + Me.cbxOhneAnhang.Location = New System.Drawing.Point(742, 123) + Me.cbxOhneAnhang.Name = "cbxOhneAnhang" + Me.cbxOhneAnhang.Size = New System.Drawing.Size(90, 17) + Me.cbxOhneAnhang.TabIndex = 60 + Me.cbxOhneAnhang.Text = "ohne Anhang" + Me.cbxOhneAnhang.UseVisualStyleBackColor = True + ' + 'btnExcel + ' + Me.btnExcel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnExcel.BackgroundImage = Global.ADMIN.My.Resources.Resources.Excel_2013_logo_155x110 + Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnExcel.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnExcel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnExcel.Location = New System.Drawing.Point(943, 64) + Me.btnExcel.Name = "btnExcel" + Me.btnExcel.Size = New System.Drawing.Size(69, 52) + Me.btnExcel.TabIndex = 59 + Me.btnExcel.UseVisualStyleBackColor = True + ' 'txtSuche ' Me.txtSuche._DateTimeOnly = False @@ -403,7 +455,7 @@ Partial Class usrCntlAPI Me.cboAPIArt.DropDownWidth = 250 Me.cboAPIArt.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboAPIArt.FormattingEnabled = True - Me.cboAPIArt.Location = New System.Drawing.Point(714, 34) + Me.cboAPIArt.Location = New System.Drawing.Point(686, 34) Me.cboAPIArt.Name = "cboAPIArt" Me.cboAPIArt.Size = New System.Drawing.Size(78, 22) Me.cboAPIArt.TabIndex = 44 @@ -412,7 +464,7 @@ Partial Class usrCntlAPI ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(711, 16) + Me.Label7.Location = New System.Drawing.Point(683, 16) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(47, 13) Me.Label7.TabIndex = 43 @@ -426,7 +478,7 @@ Partial Class usrCntlAPI Me.cboType.DropDownWidth = 250 Me.cboType.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboType.FormattingEnabled = True - Me.cboType.Location = New System.Drawing.Point(639, 34) + Me.cboType.Location = New System.Drawing.Point(611, 34) Me.cboType.Name = "cboType" Me.cboType.Size = New System.Drawing.Size(69, 22) Me.cboType.TabIndex = 42 @@ -435,7 +487,7 @@ Partial Class usrCntlAPI ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(636, 16) + Me.Label6.Location = New System.Drawing.Point(608, 16) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(35, 13) Me.Label6.TabIndex = 41 @@ -449,7 +501,7 @@ Partial Class usrCntlAPI Me.cboInOut.DropDownWidth = 250 Me.cboInOut.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboInOut.FormattingEnabled = True - Me.cboInOut.Location = New System.Drawing.Point(557, 34) + Me.cboInOut.Location = New System.Drawing.Point(529, 34) Me.cboInOut.Name = "cboInOut" Me.cboInOut.Size = New System.Drawing.Size(74, 22) Me.cboInOut.TabIndex = 40 @@ -458,7 +510,7 @@ Partial Class usrCntlAPI ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(554, 16) + Me.Label5.Location = New System.Drawing.Point(526, 16) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(52, 13) Me.Label5.TabIndex = 39 @@ -1044,30 +1096,6 @@ Partial Class usrCntlAPI Me.Button11.TabIndex = 4 Me.Button11.UseVisualStyleBackColor = True ' - 'btnExcel - ' - Me.btnExcel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnExcel.BackgroundImage = Global.ADMIN.My.Resources.Resources.Excel_2013_logo_155x110 - Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnExcel.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnExcel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnExcel.Location = New System.Drawing.Point(943, 64) - Me.btnExcel.Name = "btnExcel" - Me.btnExcel.Size = New System.Drawing.Size(69, 52) - Me.btnExcel.TabIndex = 59 - Me.btnExcel.UseVisualStyleBackColor = True - ' - 'cbxOhneAnhang - ' - Me.cbxOhneAnhang.AutoSize = True - Me.cbxOhneAnhang.Location = New System.Drawing.Point(742, 123) - Me.cbxOhneAnhang.Name = "cbxOhneAnhang" - Me.cbxOhneAnhang.Size = New System.Drawing.Size(90, 17) - Me.cbxOhneAnhang.TabIndex = 60 - Me.cbxOhneAnhang.Text = "ohne Anhang" - Me.cbxOhneAnhang.UseVisualStyleBackColor = True - ' 'usrCntlAPI ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1158,4 +1186,6 @@ Partial Class usrCntlAPI Friend WithEvents Label15 As Label Friend WithEvents btnExcel As Button Friend WithEvents cbxOhneAnhang As CheckBox + Friend WithEvents cbxStatus As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label16 As Label End Class diff --git a/UID/usrCntlAPI.vb b/UID/usrCntlAPI.vb index 9f071bd..b1fd4d0 100644 --- a/UID/usrCntlAPI.vb +++ b/UID/usrCntlAPI.vb @@ -41,6 +41,12 @@ Public Class usrCntlAPI cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL", "MAIL")) cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("REST", "REST")) + cbxStatus.Items.Clear() + 'cboType.fillWithSQL("SELECT distinct(api_Type) FROM [tblAPI] ", False, "ADMIN", True) + cbxStatus.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WARTEN", 0)) + cbxStatus.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("OK", 1)) + cbxStatus.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FEHLER", 90)) + cboAPIArt.Items.Clear() cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AVISO_OUT_STATUSMAIL", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_STATUSMAIL)) @@ -236,6 +242,7 @@ Public Class usrCntlAPI If cboAPIArt._value <> "" Then sqlstr &= " AND [api_apiArt] = @APIArt " If cboType._value <> "" Then sqlstr &= " AND [api_Type] = @APIType " + If cbxStatus._value <> "" Then sqlstr &= " AND [api_Status] = @APIStatus " If cboProgram._value <> "" Then sqlstr &= " AND [api_progName] = @Program " If cboInOut._value <> "" Then sqlstr &= " AND [api_InOut] = @APIInOut " @@ -271,6 +278,7 @@ Public Class usrCntlAPI list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma", cboFirma._value)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("APIArt", cboAPIArt._value)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("APIType", cboType._value)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("APIStatus", cbxStatus._value)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("APIInOut", cboInOut._value)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AvisoId", txtAvisoId.Text)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SendungsId", txtSendungsId.Text)) diff --git a/initATLASAufschubkonten/cWorker_Verwahrung.vb b/initATLASAufschubkonten/cWorker_Verwahrung.vb index 5f16f31..367deff 100644 --- a/initATLASAufschubkonten/cWorker_Verwahrung.vb +++ b/initATLASAufschubkonten/cWorker_Verwahrung.vb @@ -871,7 +871,7 @@ Anzeige: MRN_SUMA = POS.Item("IDRegNrSumA") Dim sqlString = "" If isNCTS Then - sqlString = "Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsId = gs.gs_gsId where [gs_MRNNr] = '" & MRN_SUMA & "' and [gs_dakoyimport] = 1 order by gsp_gspPosId" 'dieser wird bei NCTS explizit angegeben! + sqlString = "Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsId = gs.gs_gsId where ([gs_MRNNr] = '" & MRN_SUMA & "' or [gs_VeralteteWeitereRegistriernummer] = '" & MRN_SUMA & "') and [gs_dakoyimport] = 1 order by gsp_gspPosId" 'dieser wird bei NCTS explizit angegeben! Else Dim StringSub As String = "" @@ -944,9 +944,11 @@ Anzeige: 'Prüfung einbauen, ob es in dieser Gestellung bereits zu dieser ATB-Nr dieser Sicherheitsbetrag eingefügt wurde, dann einfach 0 einfügen- If True Then - If dtGesamtsicherheit.AsEnumerable().Any(Function(r) r.Field(Of String)("gs_MRNNr") = MRN_SUMA AndAlso r.Field(Of Double)("gsp_Warenwert") = WarenwertEUR) Then + If dtGesamtsicherheit IsNot Nothing AndAlso dtGesamtsicherheit.AsEnumerable().Any(Function(r) Not IsDBNull(r("gs_MRNNr")) AndAlso Not IsDBNull(r("gsp_Warenwert")) AndAlso Convert.ToString(r("gs_MRNNr")) = MRN_SUMA AndAlso Convert.ToDecimal(r("gsp_Warenwert")) = Convert.ToDecimal(WarenwertEUR)) Then + Sicherheitsbetrag = 0 WarenwertEUR = 0 + End If End If @@ -1041,15 +1043,22 @@ Anzeige: SicherheitsPos.SAVE() GesSichRef.CalcSaldo() - Dim differenz As Double = cSicherheiten.getDifferenz(gsrightRow("gs_gsnr")) + Dim differenz As Double = cSicherheiten.getDifferenz_alleAusgetragen(gsrightRow("gs_gsnr")) + + Dim InfoDifferenz As String = "Austragung Sicherheitsbertrag." + + If differenz <> 0 Then + + If Math.Abs(differenz) <= 0.02 AndAlso Math.Abs(differenz) > 0 Then + InfoDifferenz = "Korrekt. Rundungsdiff. " + End If - If Math.Abs(differenz) <= 0.02 AndAlso Math.Abs(differenz) > 0 Then Dim OPEN_RUNDIF As New cSicherheiten() With OPEN_RUNDIF .gs_gsNr = gsrightRow("gs_gsnr") - .gs_ATBNr = "Korrekt. Rundungsdiff. " & gsrightRow("gs_gsnr") + .gs_ATBNr = InfoDifferenz & gsrightRow("gs_gsnr") .gs_MRNNr = "" .gs_posNr = OPEN_RUNDIF.getLatestPosNr(OPEN_RUNDIF.gs_gsNr, OPEN_RUNDIF.gs_ATBNr) + 1 .gs_posSubNr = Nothing @@ -1083,7 +1092,7 @@ Anzeige: .gsp_abfertigungsNr = gsrightRow("gs_abfertigungsNr") .gsp_datum = DateTime.Now .gsp_erstellungsdatum = DateTime.Now - .gsp_MRNNr = "Korrekt. Rundungsdiff. " & gsrightRow("gs_gsnr") + .gsp_MRNNr = InfoDifferenz & gsrightRow("gs_gsnr") .gsp_isPosRundungsdiff = True .gsp_avisoId = gsrightRow("gs_avisoID") .gsp_systemuser = DAKOSY_STATUS.USER @@ -1094,16 +1103,17 @@ Anzeige: End If + If sendInfoMail Then - Dim InfoText2 As String = createInfoMail(gsrightRow.Item("gs_MRNNr"), Nothing, "VW-AUSGANG",, SicherheitsPos, isNCTS, sonstigeMRNNr, gsrightRow) - Dim empfaenger = cMitarbeiter.GetEMailRecipientForEmailNotification("DAKOSY-VWA", GesSichRef.brgakto_firmaID) - If empfaenger <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaenger, GesSichRef.brgakto_gs_standort & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " TEST-", " ") & "Verwahrungsausgang aus DAKOSY " & zusätzlicheInfo & " - " & Now().ToShortDateString, InfoText2, "NoReply@verag.ag") + Dim InfoText2 As String = createInfoMail(gsrightRow.Item("gs_MRNNr"), Nothing, "VW-AUSGANG",, SicherheitsPos, isNCTS, sonstigeMRNNr, gsrightRow) + Dim empfaenger = cMitarbeiter.GetEMailRecipientForEmailNotification("DAKOSY-VWA", GesSichRef.brgakto_firmaID) + If empfaenger <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaenger, GesSichRef.brgakto_gs_standort & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " TEST-", " ") & "Verwahrungsausgang aus DAKOSY " & zusätzlicheInfo & " - " & Now().ToShortDateString, InfoText2, "NoReply@verag.ag") + End If + End If End If - End If - End If Next diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 2a85812..776ef42 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -6,8 +6,6 @@ Imports System.Security.Cryptography.X509Certificates Imports System.Text Imports System.Threading Imports System.Xml -Imports com.sun.org.apache.xpath.internal.operations -Imports Confluent.Kafka Imports iTextSharp.text Imports javax Imports MDM_Worker