From 8b780bca7fed10d101af02326efd18ba195d6554 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 10 Aug 2023 11:48:25 +0200 Subject: [PATCH] DYWorker--> Teleotec RgNr, AccessCode in MA --- .../cZollsysteme_Aktenbeschriftung.vb | 31 +++-- TELOTEK_Worker_lib/cTelokec.vb | 130 +++++++++++++++++- UID/Mitarbeiter/frmMitarbDetails.Designer.vb | 54 +++++++- UID/Mitarbeiter/frmMitarbDetails.vb | 5 +- UID/My Project/AssemblyInfo.vb | 4 +- UID/cSqlDb.vb | 10 +- .../frmTCNachrichtenVerarbeitung.vb | 21 +++ 7 files changed, 238 insertions(+), 17 deletions(-) diff --git a/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb b/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb index ac6b269..4057182 100644 --- a/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb +++ b/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb @@ -1,4 +1,6 @@ -Public Class cZollsysteme_Aktenbeschriftung +Imports VERAG_PROG_ALLGEMEIN + +Public Class cZollsysteme_Aktenbeschriftung Property Praeferenznachweis As String Property Handelsrechnung As String @@ -74,7 +76,7 @@ End Function - Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String, DY_Ref As String) As Boolean + Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String, DY_Ref As String, Grenzstelle As Object) As Boolean If If(DY_Ref, "") <> "" Then BezugsNr = DY_Ref Else @@ -82,6 +84,13 @@ BezugsNr = BezugsNr & "%" End If + Dim PosNrAngeben = False + If Grenzstelle IsNot Nothing Then + Select Case Grenzstelle.ToString + Case "DTB" : PosNrAngeben = True + Case Else : PosNrAngeben = False + End Select + End If getDataByBezugsnummer = False Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -91,7 +100,7 @@ Select Case Abfertigungsart Case 38, 26 'AT ' getADFrom_EZOLL - getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True) 'Ü-T1 + getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True, PosNrAngeben) 'Ü-T1 isUeT1 = (getDataByBezugsnummer) Sachbearbeiter = "" ' Bei Ü-T1 soll der SB leer sein, sonst wird dieser evtl. beim Austragen herangezogen... Case 1, 2, 3, 28, 39 @@ -99,7 +108,7 @@ '... and Systeme Case Else - getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True) + getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True, PosNrAngeben) If Not getDataByBezugsnummer Then 'Falls doch nicht getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True) End If @@ -260,13 +269,13 @@ Return SQL.getValueTxtBySql("SELECT TOP 1 Ordnungsbegriff FROM [tblKundenAufschubkonten] inner join adressen on adressennr = [kdAkto_KundenNr] where kdAkto_hauptzollamt + kdAkto_kontonummer ='" & kto & "'", "FMZOLL") End Function - Function load_NCTS_FromDAKOSY(BezugsNr As String, Optional checkValidStatus As Boolean = False) As Boolean + Function load_NCTS_FromDAKOSY(BezugsNr As String, Optional checkValidStatus As Boolean = False, Optional PosNrAngeben As Boolean = False) As Boolean Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True, checkValidStatus) If NCTS Is Nothing Then Return False - Return load_NCTS_FromDAKOSY(NCTS) + Return load_NCTS_FromDAKOSY(NCTS, PosNrAngeben) End Function - Function load_NCTS_FromDAKOSY(NCTS As DAKOSY_Worker.cDakosyNCTSOut) As Boolean + Function load_NCTS_FromDAKOSY(NCTS As DAKOSY_Worker.cDakosyNCTSOut, PosNrAngeben As Boolean) As Boolean Try If NCTS Is Nothing Then Return Nothing NCTS.LOAD_Warenposition() @@ -294,7 +303,13 @@ For Each UL In POS.nctsWP_UNTERLAGEN If UL.nctsWpUl_Typ IsNot Nothing Then Select Case UL.nctsWpUl_Typ - Case "380", "325" : addIfNotExists(RG_List, If(UL.nctsWpUl_Referenz, "")) + Case "380", "325" + If PosNrAngeben Then + addIfNotExists(RG_List, If(UL.nctsWpUl_Referenz, "") & " (" & POS.nctsWP_PositionsNummer & ")") + Else + addIfNotExists(RG_List, If(UL.nctsWpUl_Referenz, "")) + End If + End Select End If Next diff --git a/TELOTEK_Worker_lib/cTelokec.vb b/TELOTEK_Worker_lib/cTelokec.vb index 19d859d..2802f15 100644 --- a/TELOTEK_Worker_lib/cTelokec.vb +++ b/TELOTEK_Worker_lib/cTelokec.vb @@ -365,6 +365,7 @@ Public Class cTelotec_Anmeldung SAVE_Positionsdaten() SAVE_Sicherheit() SAVE_Abgaben() + End If Return telanm_id > 0 @@ -1145,6 +1146,10 @@ Public Class cTelotec_Anmeldung Dim sqlstr = " DELETE FROM [tblTelotec_PositionsdatenAbgaben] WHERE telposAbg_telanmId =" & Me.telanm_id & " " Return SQL.doSQL(sqlstr, "FMZOLL") End Function + Function DELETE_PositionsdatenDokumente() As Boolean 'obj As Object, tablename As String, where As String) As Boolean + Dim sqlstr = " DELETE FROM [tblTelotec_PositionsdatenDokumente] WHERE telposAbg_telanmId =" & Me.telanm_id & " " + Return SQL.doSQL(sqlstr, "FMZOLL") + End Function Function DELETE_Positionsdaten() As Boolean 'obj As Object, tablename As String, where As String) As Boolean Dim sqlstr = " DELETE FROM [tblTelotec_Positionsdaten] WHERE telpos_telanmId =" & Me.telanm_id & " " @@ -1195,15 +1200,17 @@ Public Class cTelotec_Anmeldung Return True End Function + Public Function SAVE_Positionsdaten() As Boolean 'Zuserst alle OffertenPos von dem Offert löschen - If DELETE_Positionsdaten() And DELETE_Packstücke() And DELETE_PositionsdatenAbgaben() Then 'And DELETE_PositionsdatenUnterlagen() And DELETE_PositionsdatenVerbrauchssteuer() Then + If DELETE_Positionsdaten() And DELETE_Packstücke() And DELETE_PositionsdatenAbgaben() And DELETE_PositionsdatenDokumente() Then 'And DELETE_PositionsdatenUnterlagen() And DELETE_PositionsdatenVerbrauchssteuer() Then 'jetzt die Standartofferten einfügen For Each p In POSITIONSDATEN p.telpos_telanmId = telanm_id If p.INSERT() Then p.INSERT_Packstücke(p.telpos_id, Me.telanm_id) p.INSERT_Abgaben(p.telpos_id, Me.telanm_id) + p.INSERT_Dokumente(p.telpos_id, Me.telanm_id) 'p.INSERT_PositionsdatenUnterlagen(p.ezaWP_Id, Me.eza_Id) 'p.INSERT_PositionsdatenVerbrauchssteuer(p.ezaWP_Id, Me.eza_Id) Else @@ -1252,6 +1259,7 @@ Public Class cTelotec_Positionsdaten Property PACKSTUECKE As New List(Of cTelotec_Packstuecke) Property ABGABEN As New List(Of cTelotec_PositionsdatenAbgaben) + Property DOC_CERTS As New List(Of cTelotec_PositionsdatenDokumente) Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -1343,6 +1351,14 @@ Public Class cTelotec_Positionsdaten Next Return True End Function + Public Function INSERT_Dokumente(telpos_id, telanm_id) As Boolean + For Each p In DOC_CERTS + p.telposAbg_telanmId = telanm_id + p.telposAbg_telposId = telpos_id + If Not p.INSERT() Then Return False + Next + Return True + End Function Public Sub LOAD_Abgaben() Try @@ -1370,6 +1386,32 @@ Public Class cTelotec_Positionsdaten MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) End Try End Sub + Public Sub LOAD_Dokumente() + Try + DOC_CERTS.Clear() + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblTelotec_PositionsdatenDokumente WHERE telposabg_telposId=@telpos_id ", conn) + cmd.Parameters.AddWithValue("@telpos_id", Me.telpos_id) + Dim dr = cmd.ExecuteReader() + While dr.Read + Dim l As New cTelotec_PositionsdatenDokumente + For Each i In l.getParameterList() + Dim propInfo As PropertyInfo = l.GetType.GetProperty(i.Scalarvariable) + If dr.Item(i.Text) Is DBNull.Value Then + propInfo.SetValue(l, Nothing) + Else + propInfo.SetValue(l, dr.Item(i.Text)) + End If + Next + DOC_CERTS.Add(l) + End While + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub Public Function getInsertCmd() As String Try @@ -1717,3 +1759,89 @@ Public Class cTelotec_PositionsdatenAbgaben End Class + +Public Class cTelotec_PositionsdatenDokumente + + + Property telposAbg_id As Integer + Property telposAbg_telposId As Integer + Property telposAbg_telanmId As Integer + Property Mandant_ID As Object = Nothing + Property Bereich_ID As Object = Nothing + Property Referenz_ID As Object = Nothing + Property ComIndicator As Boolean + Property Pos_ID As Integer + + Property DocCerts_ID As Object = Nothing + Property DocCerts_DocCd As Object = Nothing + Property DocCerts_DTy As Object = Nothing + Property DocCerts_DRef As Object = Nothing + Property DocCerts_IssD As Object = Nothing + Property DocCerts_IssCtry As Object = Nothing + Property DocCerts_DTIN As Object = Nothing + Property DocCerts_UidVid As Object = Nothing + Property DocCerts_ValD As Object = Nothing + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Sub New() + End Sub + + + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_id", telposAbg_id, , True, True)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_telposId", telposAbg_telposId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_telanmId", telposAbg_telanmId)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Mandant_ID", Mandant_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bereich_ID", Bereich_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Referenz_ID", Referenz_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ComIndicator", ComIndicator)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Pos_ID", Pos_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_ID", DocCerts_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_DocCd", DocCerts_DocCd)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_DTy", DocCerts_DTy)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_DRef", DocCerts_DRef)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_IssD", DocCerts_IssD)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_IssCtry", DocCerts_IssD)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_DTIN", DocCerts_IssD)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_UidVid", DocCerts_IssD)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocCerts_ValD", DocCerts_IssD)) + Return list + End Function + + + Public Function INSERT() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + 'Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", , list) + telposAbg_id = SQL.doSQLVarListID(telposAbg_id, getInsertCmd, "FMZOLL", , list) + Return telposAbg_id > 0 + End Function + + + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblTelotec_PositionsdatenDokumente (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + +End Class + diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index 263bb75..1e11805 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -52,6 +52,10 @@ Partial Class frmMitarbDetails Me.cboSpedbuch = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.Label61 = New System.Windows.Forms.Label() + Me.txtATGRNAccessCode_AT51FP7 = New System.Windows.Forms.TextBox() + Me.txtATGRNAccessCode_AT52VA6 = New System.Windows.Forms.TextBox() + Me.Label60 = New System.Windows.Forms.Label() Me.txtTelotecSB = New System.Windows.Forms.TextBox() Me.Label51 = New System.Windows.Forms.Label() Me.txtDyFullName = New System.Windows.Forms.TextBox() @@ -547,6 +551,10 @@ Partial Class frmMitarbDetails ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.Label61) + Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT51FP7) + Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT52VA6) + Me.TabPage4.Controls.Add(Me.Label60) Me.TabPage4.Controls.Add(Me.txtTelotecSB) Me.TabPage4.Controls.Add(Me.Label51) Me.TabPage4.Controls.Add(Me.txtDyFullName) @@ -565,6 +573,44 @@ Partial Class frmMitarbDetails Me.TabPage4.Text = "Zollprogramme" Me.TabPage4.UseVisualStyleBackColor = True ' + 'Label61 + ' + Me.Label61.AutoSize = True + Me.Label61.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label61.Location = New System.Drawing.Point(216, 136) + Me.Label61.Name = "Label61" + Me.Label61.Size = New System.Drawing.Size(164, 13) + Me.Label61.TabIndex = 120 + Me.Label61.Text = "VERAG AccessCode (AT51FP7):" + ' + 'txtATGRNAccessCode_AT51FP7 + ' + Me.txtATGRNAccessCode_AT51FP7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtATGRNAccessCode_AT51FP7.Location = New System.Drawing.Point(386, 133) + Me.txtATGRNAccessCode_AT51FP7.MaxLength = 4 + Me.txtATGRNAccessCode_AT51FP7.Name = "txtATGRNAccessCode_AT51FP7" + Me.txtATGRNAccessCode_AT51FP7.Size = New System.Drawing.Size(47, 20) + Me.txtATGRNAccessCode_AT51FP7.TabIndex = 119 + ' + 'txtATGRNAccessCode_AT52VA6 + ' + Me.txtATGRNAccessCode_AT52VA6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtATGRNAccessCode_AT52VA6.Location = New System.Drawing.Point(386, 114) + Me.txtATGRNAccessCode_AT52VA6.MaxLength = 4 + Me.txtATGRNAccessCode_AT52VA6.Name = "txtATGRNAccessCode_AT52VA6" + Me.txtATGRNAccessCode_AT52VA6.Size = New System.Drawing.Size(47, 20) + Me.txtATGRNAccessCode_AT52VA6.TabIndex = 118 + ' + 'Label60 + ' + Me.Label60.AutoSize = True + Me.Label60.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label60.Location = New System.Drawing.Point(216, 117) + Me.Label60.Name = "Label60" + Me.Label60.Size = New System.Drawing.Size(154, 13) + Me.Label60.TabIndex = 117 + Me.Label60.Text = "IMEX AccessCode (AT52VA6):" + ' 'txtTelotecSB ' Me.txtTelotecSB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -588,7 +634,7 @@ Partial Class frmMitarbDetails Me.txtDyFullName.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtDyFullName.Location = New System.Drawing.Point(217, 81) Me.txtDyFullName.Name = "txtDyFullName" - Me.txtDyFullName.Size = New System.Drawing.Size(200, 20) + Me.txtDyFullName.Size = New System.Drawing.Size(216, 20) Me.txtDyFullName.TabIndex = 114 ' 'Label49 @@ -650,7 +696,7 @@ Partial Class frmMitarbDetails Me.cboEZOLL_SB.FormattingEnabled = True Me.cboEZOLL_SB.Location = New System.Drawing.Point(217, 29) Me.cboEZOLL_SB.Name = "cboEZOLL_SB" - Me.cboEZOLL_SB.Size = New System.Drawing.Size(198, 21) + Me.cboEZOLL_SB.Size = New System.Drawing.Size(214, 21) Me.cboEZOLL_SB.TabIndex = 109 ' 'cboATLAS_SB @@ -2406,4 +2452,8 @@ Partial Class frmMitarbDetails Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents PictureBox9 As PictureBox Friend WithEvents TabControl1 As TabControl + Friend WithEvents txtATGRNAccessCode_AT52VA6 As TextBox + Friend WithEvents Label60 As Label + Friend WithEvents Label61 As Label + Friend WithEvents txtATGRNAccessCode_AT51FP7 As TextBox End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 01761e9..6927ee9 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -281,6 +281,8 @@ Public Class frmMitarbDetails txtMobiltel.Text = mitarbeiter.mit_mobiltel cbxAnrufen.Checked = mitarbeiter.mit_allowAnruf txtInfo.Text = mitarbeiter.mit_info + txtATGRNAccessCode_AT51FP7.Text = mitarbeiter.mit_ATGRNAccessCode_AT51FP7 + txtATGRNAccessCode_AT52VA6.Text = mitarbeiter.mit_ATGRNAccessCode_AT52VA6 txtDakosySB.Text = mitarbeiter.mit_DAKOSY_SB txtDyFullName.Text = If(mitarbeiter.mit_DAKOSY_SBFull, "") txtTelotecSB.Text = mitarbeiter.mit_TELOTEC_SB @@ -557,6 +559,8 @@ Public Class frmMitarbDetails mitarbeiter.mit_mobiltel = txtMobiltel.Text mitarbeiter.mit_allowAnruf = cbxAnrufen.Checked mitarbeiter.mit_info = txtInfo.Text + mitarbeiter.mit_ATGRNAccessCode_AT51FP7 = txtATGRNAccessCode_AT51FP7.Text + mitarbeiter.mit_ATGRNAccessCode_AT52VA6 = txtATGRNAccessCode_AT52VA6.Text mitarbeiter.mit_DAKOSY_SB = txtDakosySB.Text mitarbeiter.mit_DAKOSY_SBFull = txtDyFullName.Text mitarbeiter.mit_TELOTEC_SB = txtTelotecSB.Text @@ -571,7 +575,6 @@ Public Class frmMitarbDetails mitarbeiter.mit_telefonnr = txtTelNr.Text - If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then mitarbeiter.mit_FMZollPersID = cboPersonal._value Else diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 8780a20..33ce4e7 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index cec9357..443f032 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -1550,8 +1550,8 @@ Public Class cMitarbeiter 'Änderung Dim sql = "INSERT INTO tblMitarbeiter " & - "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr ) OUTPUT INSERTED.mit_id VALUES " & - "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr)" + "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 ) OUTPUT INSERTED.mit_id VALUES " & + "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr,@mit_ATGRNAccessCode_AT51FP7 ,@mit_ATGRNAccessCode_AT52VA6)" @@ -1626,6 +1626,8 @@ Public Class cMitarbeiter cmd.Parameters.AddWithValue("@mit_id", DBNull.Value) cmd.Parameters.AddWithValue("@mit_PersonalNr", If(m.mit_PersonalNr, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_telefonnr", If(m.mit_telefonnr, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT51FP7 ", If(m.mit_ATGRNAccessCode_AT51FP7, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT52VA6 ", If(m.mit_ATGRNAccessCode_AT52VA6, DBNull.Value)) Try mid = cmd.ExecuteScalar() @@ -1644,7 +1646,7 @@ Public Class cMitarbeiter Dim sql = "UPDATE tblMitarbeiter " & "SET mit_username=@mit_username, mit_abweichenderAnzeigename=@mit_abweichenderAnzeigename,mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " & - " ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_telefonnr = @mit_telefonnr " & + " ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6 " & " WHERE mit_id=@mit_id " @@ -1720,6 +1722,8 @@ Public Class cMitarbeiter cmd.Parameters.AddWithValue("@mit_CSpwd", If(m.mit_CSpwd, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_PersonalNr", If(m.mit_PersonalNr, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_telefonnr", If(m.mit_telefonnr, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT51FP7 ", If(m.mit_ATGRNAccessCode_AT51FP7, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT52VA6 ", If(m.mit_ATGRNAccessCode_AT52VA6, DBNull.Value)) diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index 8debe68..f105ac2 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -973,6 +973,27 @@ Public Class frmTCNachrichtenVerarbeitung POS.ABGABEN.Add(ABG) Next End If + + POS.DOC_CERTS.Clear() 'Falls DS schon Mal eingearbeitet wurde + If vidDescITEM.vifDecDocCerts IsNot Nothing AndAlso vidDescITEM.vifDecDocCerts.Count > 0 Then + For Each vifDecDocCerts In vidDescITEM.vifDecDocCerts + Dim DOCS As New TELOTEC_Worker.cTelotec_PositionsdatenDokumente + + DOCS.Mandant_ID = vifDecDocCerts.Mandant_ID + DOCS.Bereich_ID = vifDecDocCerts.Bereich_ID + DOCS.Referenz_ID = vifDecDocCerts.Referenz_ID + DOCS.ComIndicator = vifDecDocCerts.ComIndicator + DOCS.Pos_ID = vifDecDocCerts.Pos_ID + DOCS.DocCerts_ID = vifDecDocCerts.DocCerts_ID + DOCS.DocCerts_DocCd = vifDecDocCerts.DocCerts_DocCd + DOCS.DocCerts_DTy = vifDecDocCerts.DocCerts_DTy + DOCS.DocCerts_DRef = vifDecDocCerts.DocCerts_DRef + DOCS.DocCerts_IssD = vifDecDocCerts.DocCerts_IssD + + + POS.DOC_CERTS.Add(DOCS) + Next + End If TC.POSITIONSDATEN.Add(POS) Next End If