edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2019-11-26 14:42:17 +01:00
parent d4dfcd1744
commit de1d935624
13 changed files with 450 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb
View File

@@ -1561,6 +1561,7 @@ End Class
Public Class cDakosy_EZA_Warenposition
Implements ICloneable
'Property ezaWP_Id As Integer
Property ezaWP_Id As Integer
Property ezaWP_EzaId As Integer
@@ -1700,6 +1701,10 @@ Public Class cDakosy_EZA_Warenposition
' End Sub
Public Function Clone() As Object Implements ICloneable.Clone 'Muss noch probiert werden!
Return DirectCast(MemberwiseClone(), cDakosy_EZA_Warenposition)
End Function
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("ezaWP_Id", ezaWP_Id, , True, True))

4
DAKOSY_Worker/cDakosy_Statusmeldungen.vb
View File

@@ -9,7 +9,7 @@ Public Class cDakosy_Statusmeldungen
Property dySt_BezugsNr As String = ""
Property dySt_status As Integer = -1
Property dySt_artMitteilung As String
Property dySt_ergCode As String
Property dySt_ergCode As String = ""
Property dySt_ergMitteilung As String = ""
Property dySt_ergZeitpunkt As Object = Nothing
Property dySt_DakosyTransaktionsDatum As Object = Nothing
@@ -209,7 +209,7 @@ Public Class cDakosy_Statusmeldungen
STATUS.dySt_dyId = dySt_dyId
STATUS.dySt_status = dySt_status
STATUS.dySt_ergCode = dySt_ergCode
STATUS.dySt_ergCode = If(dySt_ergCode, "")
STATUS.dySt_ergMitteilung = If(dySt_ergMitteilung <> "", dySt_ergMitteilung, cDY_Statusliste.getTxtByCode2(dySt_status, dy_ART))
STATUS.dySt_ergZeitpunkt = dySt_ergZeitpunkt
'EINTRAG IN tblDakosy_Zollanmeldungen

19
DAKOSY_Worker/cZOLL_IMPORT.vb
View File

@@ -323,6 +323,7 @@ Public Class cZOLL_IMPORT
If avisoLinkId = 0 Or SendungId = 0 Then
Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = DAKOSY_Worker.cDakosy_Zollanmeldungen.LOADByBezugsNr(If(EZA_Nr <> "", EZA_Nr, NCTS_Nr))
If DY IsNot Nothing Then
@@ -340,6 +341,8 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Abfertigungsdatum Is Nothing Then SPEDITIONSBUCH.Abfertigungsdatum = Now.ToShortDateString
If SendungId > 0 Then SPEDITIONSBUCH.SendungID = SendungId
' Dim fNEF = DirectCast(Me.Owner, frmNacherfassungNEU)
If SendungId = 0 And SPEDITIONSBUCH.SendungID > 0 Then SendungId = SPEDITIONSBUCH.SendungID 'Falls falsch übergeben
If SendungId > 0 Then SENDUNG = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungId)
@@ -385,6 +388,7 @@ Public Class cZOLL_IMPORT
BenutzerTmp = getBenutzerShort(BenutzerTmp)
If BelegNrTmp.EndsWith(",") Then BelegNrTmp = BelegNrTmp.Substring(0, BelegNrTmp.Length - 1)
SPEDITIONSBUCH.Bar = True
If SPEDITIONSBUCH.ErfassungsNr = "" Then SPEDITIONSBUCH.ErfassungsNr = "VERA/" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "/" & BenutzerTmp & "/" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "/" & BelegNrTmp & "/" & BetragTmp
If SPEDITIONSBUCH.Barzahlungsbetrag = 0 Then SPEDITIONSBUCH.Barzahlungsbetrag = BetragTmp
@@ -427,7 +431,7 @@ Public Class cZOLL_IMPORT
End If
If avisoLinkId > 0 Then
SPEDITIONSBUCH.AvisoID = avisoLinkId
Dim sgut = CInt((New SQL).getValueTxtBySql("SELECT count(*) FROM tblSendungen WHERE tblSnd_AvisoID='" & avisoLinkId & "' ", "AVISO"))
If sgut = 1 Then
SPEDITIONSBUCH.SgutKompl = "K"
@@ -512,6 +516,15 @@ Public Class cZOLL_IMPORT
' If autoImport And Not notFound Then
If SENDUNG IsNot Nothing AndAlso SENDUNG.tblSnd_Abfertigungsart_ID > 0 Then
If SENDUNG.tblSnd_Abfertigungsart_ID = 23 Then
If SENDUNG.tblSnd_anzahlHandling IsNot Nothing AndAlso IsNumeric(SENDUNG.tblSnd_anzahlHandling) Then
SPEDITIONSBUCH.Abfertigungsanzahl = SENDUNG.tblSnd_anzahlHandling
Else
SPEDITIONSBUCH.Abfertigungsanzahl = 0
End If
End If
If (SENDUNG.tblSnd_Abfertigungsart_ID = 26 Or SENDUNG.tblSnd_Abfertigungsart_ID = 28) And NCTS_Nr <> "" Then
'Überstellungs-T
SPEDITIONSBUCH.Abfertigungsart = 5
@@ -532,6 +545,8 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Währungsschlüssel Is Nothing OrElse (IsNumeric(SPEDITIONSBUCH.Währungsschlüssel) AndAlso SPEDITIONSBUCH.Währungsschlüssel <= 0) Then SPEDITIONSBUCH.Währungsschlüssel = 900
If Personalnummer > 0 Then SPEDITIONSBUCH.Personalnummer = Personalnummer
'notFound = Me.notFound
If autoImport AndAlso Not checkIfAutoOK() Then
@@ -612,7 +627,7 @@ Public Class cZOLL_IMPORT
Public Function checkIfAutoOK() As Boolean
Try
If If(SPEDITIONSBUCH.Personalnummer, "") = "" Then Return False
If SPEDITIONSBUCH.Personalnummer Is Nothing Then Return False
If If(SPEDITIONSBUCH.Vermittler, "") = "" Then Return False
If Not IsNumeric(If(SPEDITIONSBUCH.Abfertigungsart, "")) Then Return False
If SPEDITIONSBUCH.Abfertigungsanzahl = 0 Then Return False

63
DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb
View File

@@ -28,25 +28,56 @@
' getDataByBezugsnummer(BezugsNr, Abfertigungsart)
'End Sub
Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String) As Boolean
Function getATAMRNBezugsnummer(BezugsNr As String, Abfertigungsart As String) As String
getATAMRNBezugsnummer = ""
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX"
Case "UNISPED"
' Case "IMEX"
' Case "UNISPED"
Case ""
Case Else
Select Case Abfertigungsart
Case 38, 26 'AT
' getADFrom_EZOLL
Case 1, 2, 3, 28
If load_EZA_FromDAKOSY(BezugsNr) Then Return True
' getADFrom_EZOLL
getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr) 'Ü-T1
Case 1, 2, 3, 28, 39
getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr)
'... and Systeme
Case 5, 6
If load_NCTS_FromDAKOSY(BezugsNr) Then Return True
Case Else
getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr)
If getATAMRNBezugsnummer = "" Then 'Falls doch nicht
getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr)
End If
End Select
End Select
End Function
Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String) As Boolean
getDataByBezugsnummer = False
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
' Case "UNISPED"
Case ""
Case Else
Select Case Abfertigungsart
Case 38, 26 'AT
' getADFrom_EZOLL
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr)'Ü-T1
Case 1, 2, 3, 28, 39
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr)
'... and Systeme
Case Else
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr)
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr)
End If
End Select
End Select
Return False
End Function
Function addIfNotExists(ByRef LIST As List(Of String), addstring As String) As List(Of String)
If addstring = "" Then Return LIST
For Each s In LIST
@@ -64,12 +95,28 @@
If listToString <> "" Then listToString = listToString.Substring(2)
End Function
Function load_EZA_ATA_FromDAKOSY(BezugsNr) As String
Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True)
If EZA Is Nothing Then Return ""
Return If(EZA.eza_ANR, If(EZA.eza_MRN, ""))
End Function
Function load_NCTS_MRN_FromDAKOSY(BezugsNr) As String
Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True)
If NCTS Is Nothing Then Return ""
Return If(NCTS.ncts_MRN, If(NCTS.ncts_ANR, ""))
End Function
Function load_EZA_FromDAKOSY(BezugsNr) As Boolean
Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True)
If EZA Is Nothing Then Return False
Return load_EZA_FromDAKOSY(EZA)
End Function
Function load_EZA_FromDAKOSY(EZA As DAKOSY_Worker.cDakosyEZA) As Boolean
Try
If EZA Is Nothing Then Return Nothing

34
UID/Mitarbeiter/frmMitarbDetails.Designer.vb generated
View File

@@ -161,6 +161,8 @@ Partial Class frmMitarbDetails
Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.cboAdminBer = New System.Windows.Forms.ComboBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label53 = New System.Windows.Forms.Label()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -605,6 +607,8 @@ Partial Class frmMitarbDetails
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.cboTeam)
Me.GroupBox2.Controls.Add(Me.Label53)
Me.GroupBox2.Controls.Add(Me.cboALIASDomain)
Me.GroupBox2.Controls.Add(Me.txtALIASUser)
Me.GroupBox2.Controls.Add(Me.Label52)
@@ -785,7 +789,7 @@ Partial Class frmMitarbDetails
Me.cboPosition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboPosition.FormattingEnabled = True
Me.cboPosition.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
Me.cboPosition.Location = New System.Drawing.Point(409, 116)
Me.cboPosition.Location = New System.Drawing.Point(406, 76)
Me.cboPosition.Name = "cboPosition"
Me.cboPosition.Size = New System.Drawing.Size(136, 21)
Me.cboPosition.TabIndex = 5
@@ -794,7 +798,7 @@ Partial Class frmMitarbDetails
'
Me.Label29.AutoSize = True
Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label29.Location = New System.Drawing.Point(406, 100)
Me.Label29.Location = New System.Drawing.Point(403, 60)
Me.Label29.Name = "Label29"
Me.Label29.Size = New System.Drawing.Size(47, 13)
Me.Label29.TabIndex = 87
@@ -1724,6 +1728,30 @@ Partial Class frmMitarbDetails
Me.Label7.TabIndex = 78
Me.Label7.Text = "Berechtigung:"
'
'cboTeam
'
Me.cboTeam._allowedValuesFreiText = Nothing
Me.cboTeam._allowFreiText = False
Me.cboTeam._value = ""
Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboTeam.FormattingEnabled = True
Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboTeam.Location = New System.Drawing.Point(406, 116)
Me.cboTeam.Name = "cboTeam"
Me.cboTeam.Size = New System.Drawing.Size(136, 21)
Me.cboTeam.TabIndex = 101
'
'Label53
'
Me.Label53.AutoSize = True
Me.Label53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label53.Location = New System.Drawing.Point(403, 100)
Me.Label53.Name = "Label53"
Me.Label53.Size = New System.Drawing.Size(37, 13)
Me.Label53.TabIndex = 102
Me.Label53.Text = "Team:"
'
'frmMitarbDetails
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1904,4 +1932,6 @@ Partial Class frmMitarbDetails
Friend WithEvents cboALIASDomain As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents txtALIASUser As TextBox
Friend WithEvents Label52 As Label
Friend WithEvents cboTeam As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Label53 As Label
End Class

13
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -44,6 +44,7 @@
cboDP.fillWithSQL("SELECT [dpset_niederlassung] FROM [tblDienstSettings] ORDER BY dpset_niederlassung", False, "ADMIN", True)
MyListBox1.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [VERAG].[dbo].[tblFirma]", False, "FMZOLL")
MyListBox1.Items.Insert(0, New VERAG_PROG_ALLGEMEIN.MyListItem("Alle", "A"))
@@ -210,7 +211,6 @@
txtALIASUser.Text = mitarbeiter.mit_AliasAD_Username
If mitarbeiter.mit_firma = "ALL" Then
cboFirma.Text = "ALLE"
Else
@@ -219,6 +219,9 @@
cboFirmaFMZOLL.changeItem(If(mitarbeiter.mit_firmaFMZoll, ""))
cboTeam.changeItem(If(mitarbeiter.mit_teamId, ""))
cboKasse.changeItem("")
If mitarbeiter.mit_FMZollPersID IsNot Nothing Then
cboKasse.changeItem(SQL.getValueTxtBySql("SELECT [Standard_RKSV_KasseId] FROM [Personal] WHERE ID='" & mitarbeiter.mit_FMZollPersID & "'", "FMZOLL"))
@@ -443,6 +446,7 @@
mitarbeiter.mit_TELOTEC_SB = txtTelotecSB.Text
mitarbeiter.mit_AliasAD_Domain = cboALIASDomain._value
mitarbeiter.mit_AliasAD_Username = txtALIASUser.Text
mitarbeiter.mit_teamId = If(cboTeam._value = "", Nothing, cboTeam._value)
If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then
@@ -697,4 +701,11 @@
End If
End Sub
Private Sub cboFirma_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
cboTeam.Items.Clear()
If cboFirma.Text <> "" Then
cboTeam.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & cboFirma.Text & "'", False, "ADMIN", True)
End If
End Sub
End Class

8
UID/cSqlDb.vb
View File

@@ -1512,8 +1512,8 @@ Public Class cMitarbeiter
'Änderung
Dim sql = "INSERT INTO tblMitarbeiter " &
"(mit_username, 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_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username) VALUES " &
"(@mit_username,@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_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username)"
"(mit_username, 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_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_teamId) VALUES " &
"(@mit_username,@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_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_teamId)"
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn)
@@ -1560,6 +1560,7 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_TELOTEC_SB", If(m.mit_TELOTEC_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Domain", If(m.mit_AliasAD_Domain, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Username", If(m.mit_AliasAD_Username, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_teamId", If(m.mit_teamId, DBNull.Value))
Try
cmd.ExecuteNonQuery()
@@ -1577,7 +1578,7 @@ Public Class cMitarbeiter
Dim hAuswahl As String = ""
Dim sql = "UPDATE tblMitarbeiter " &
"SET mit_username=@mit_username, 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_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 " &
"SET mit_username=@mit_username, 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_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_teamId=@mit_teamId " &
" WHERE mit_id=@mit_id "
@@ -1630,6 +1631,7 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_TELOTEC_SB", If(m.mit_TELOTEC_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Domain", If(m.mit_AliasAD_Domain, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Username", If(m.mit_AliasAD_Username, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_teamId", If(m.mit_teamId, DBNull.Value))
Try
cmd.ExecuteNonQuery()

14
UID/usrctlProcedures.Designer.vb generated
View File

@@ -103,6 +103,7 @@ Partial Class usrctlProcedures
Me.Label14 = New System.Windows.Forms.Label()
Me.CheckBox4 = New System.Windows.Forms.CheckBox()
Me.Button27 = New System.Windows.Forms.Button()
Me.Button26 = New System.Windows.Forms.Button()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -831,7 +832,7 @@ Partial Class usrctlProcedures
'
'Label14
'
Me.Label14.Location = New System.Drawing.Point(752, 102)
Me.Label14.Location = New System.Drawing.Point(756, 156)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(145, 13)
Me.Label14.TabIndex = 53
@@ -859,6 +860,15 @@ Partial Class usrctlProcedures
Me.Button27.Text = "UNISPED MDB Importieren"
Me.Button27.UseVisualStyleBackColor = True
'
'Button26
'
Me.Button26.Location = New System.Drawing.Point(755, 104)
Me.Button26.Name = "Button26"
Me.Button26.Size = New System.Drawing.Size(145, 49)
Me.Button26.TabIndex = 54
Me.Button26.Text = "UNISPED EXCEL Importieren"
Me.Button26.UseVisualStyleBackColor = True
'
'usrctlProcedures
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -904,6 +914,7 @@ Partial Class usrctlProcedures
Me.Controls.Add(Me.TextBox1)
Me.Controls.Add(Me.Button18)
Me.Controls.Add(Me.TabControl1)
Me.Controls.Add(Me.Button26)
Me.Name = "usrctlProcedures"
Me.Size = New System.Drawing.Size(931, 546)
Me.TabControl1.ResumeLayout(False)
@@ -1000,4 +1011,5 @@ Partial Class usrctlProcedures
Friend WithEvents Label14 As Label
Friend WithEvents CheckBox4 As CheckBox
Friend WithEvents Button27 As Button
Friend WithEvents Button26 As Button
End Class

6
UID/usrctlProcedures.resx
View File

@@ -123,4 +123,10 @@
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

235
UID/usrctlProcedures.vb
View File

@@ -2750,6 +2750,241 @@ Public Class usrctlProcedures
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = test
End Sub
Private Sub Button26_Click(sender As Object, e As EventArgs) Handles Button26.Click
Dim StartZeit As Date = DateTime.Now
Dim StopZeit As Date = DateTime.Now
Dim test = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox4.Checked
Dim cnt = 1
'dim listAVISO = New List(Of cAviso)
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim kdnr_tmp = ""
Try
Dim fd As New OpenFileDialog
fd.InitialDirectory = "\\10.4.3.17\VERAG gemeinsam\Excel Kundendaten\"
If fd.ShowDialog = DialogResult.OK Then
If fd.FileName.ToUpper.EndsWith(".XLSX") Then
Dim exclApp As Object 'as Application
Dim Datei As Object 'as WorkBook
Dim Blatt As Object 'as WorkSheet
exclApp = CreateObject("Excel.Application")
' Dim nWeek As Integer
' nWeek = DatePart(DateInterval.WeekOfYear, New Date(2004, 3, 22), _
' FirstDayOfWeek.Monday, FirstWeekOfYear.FirstFourDays)
' exclApp.Caption = GuiId
exclApp.CutCopyMode = False
Datei = exclApp.Workbooks.Open(fd.FileName)
Blatt = Datei.Worksheets(1)
Datei.Activate()
For index = 2 To Blatt.UsedRange.Rows.Count
' MsgBox(Blatt.Range("C" & index).Value)
'Dim valueX As String = ""
Try
'valueX = Blatt.Range("C" & index).Value.ToString
'MsgBox(valueX)
Dim kdnr As Integer = VERAG_PROG_ALLGEMEIN.cAdressen.getHoechsteKdNr(2400000, 2499999) '+ 1
Dim KD As New VERAG_PROG_ALLGEMEIN.cKunde(kdnr)
If True Then 'Not KD.hasEntry Then
' MsgBox((Blatt.Range("C" & index).Value.ToString))
Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(kdnr)
'Dim KDE As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr)
AD.Auswahl = "A"
If Blatt.Range("E" & index).Value Is Nothing Then
AD.Ordnungsbegriff = getTrimedString(Blatt.Range("C" & index).Value.ToString, 40)
Else
AD.Ordnungsbegriff = getTrimedString((Blatt.Range("C" & index).Value.ToString) & "; " & (Blatt.Range("E" & index).Value.ToString), 40)
End If
AD.Name_1 = getTrimedString(Blatt.Range("C" & index).Value.ToString, 40)
AD.Name_2 = Nothing
AD.Straße = Nothing
AD.Ort = getTrimedString(Blatt.Range("E" & index).Value.ToString, 40)
If AD.Ort = "" Then AD.Ort = "-"
Dim LandKz = ""
Dim PLZ = ""
Dim LandPlz = Blatt.Range("D" & index).Value.ToString
If LandPlz.Contains("-") Then
Dim sp = LandPlz.Split("-")
LandKz = sp(0)
PLZ = sp(1)
'MsgBox(LandKz)
If sp.Length > 2 Then PLZ &= sp(2)
End If
AD.PLZ = sql.isleernothing(getTrimedString(PLZ.Trim, 7))
AD.LandKz = sql.isleernothing(getTrimedString(LandKz.Trim, 3))
AD.Telefon = Nothing
AD.Mobiltelefon = Nothing
AD.Telefax = Nothing
AD.E_Mail = Nothing
AD.E_Mail2 = Nothing
' AD. = row("Internet1")
AD.Ansprechpartner = Nothing
KD.Währungscode = "EUR" 'getTrimedStringACCES(row("Standard FakturenWährung"), 3)
KD.Zahlungsziel = Nothing
' Offerte ??
Dim Allg = ""
If Blatt.Range("A" & index).value IsNot Nothing Then Allg &= "FREMDKUNDE: " & Blatt.Range("A" & index).Value.ToString & vbNewLine
If Blatt.Range("B" & index).value IsNot Nothing Then Allg &= "ABFERTIGUNGSART: " & Blatt.Range("B" & index).Value.ToString & vbNewLine & vbNewLine
'MsgBox((Blatt.Range("H" & index) Is Nothing))
'MsgBox((Blatt.Range("H" & index).value Is Nothing))
If Blatt.Range("G" & index).value IsNot Nothing Then Allg &= "F-Beleg: " & Blatt.Range("G" & index).Value.ToString & vbNewLine
If Blatt.Range("H" & index).value IsNot Nothing Then Allg &= "EUST-Konto: " & Blatt.Range("H" & index).Value.ToString & vbNewLine
If Blatt.Range("I" & index).value IsNot Nothing Then Allg &= "ZOLL-Konto: " & Blatt.Range("I" & index).Value.ToString & vbNewLine
If Blatt.Range("J" & index).value IsNot Nothing Then Allg &= "Zollamt: " & Blatt.Range("J" & index).Value.ToString & vbNewLine
If Blatt.Range("K" & index).value IsNot Nothing Then
If Allg <> "" Then Allg &= vbNewLine & "____________________________________________________________" & vbNewLine
Allg &= Blatt.Range("K" & index).Value.ToString & vbNewLine
End If
If Blatt.Range("L" & index).value IsNot Nothing Then Allg &= Blatt.Range("L" & index).Value.ToString & vbNewLine
If Blatt.Range("M" & index).value IsNot Nothing Then Allg &= Blatt.Range("M" & index).Value.ToString & vbNewLine
If Blatt.Range("N" & index).value IsNot Nothing Then Allg &= Blatt.Range("N" & index).Value.ToString & vbNewLine
If Blatt.Range("O" & index).value IsNot Nothing Then Allg &= Blatt.Range("O" & index).Value.ToString & vbNewLine
If Blatt.Range("P" & index).value IsNot Nothing Then Allg &= Blatt.Range("P" & index).Value.ToString & vbNewLine
KD.Besonderheiten = isleernothing(Allg.Trim)
Dim obtmp = getTrimedStringACCES(AD.Ordnungsbegriff, 43)
If AD.doesOrdnungsbegriffExist Then
AD.Ordnungsbegriff = obtmp & " (UNISPED)"
End If
If AD.doesOrdnungsbegriffExist Then
AD.Ordnungsbegriff = obtmp & " (UNISPED2)"
End If
If AD.doesOrdnungsbegriffExist Then
AD.Ordnungsbegriff = obtmp & " (UNISPED3)"
End If
If AD.doesOrdnungsbegriffExist Then
AD.Ordnungsbegriff = obtmp & " (UNISPED4)"
End If
If Blatt.Range("F" & index).value IsNot Nothing Then
If Blatt.Range("F" & index).value.ToString.Length > 17 Then
If Blatt.Range("F" & index).value IsNot Nothing Then Allg &= "Zoll-Nr.: " & Blatt.Range("F" & index).Value.ToString & vbNewLine
Else
KD.EORITIN = Blatt.Range("F" & index).Value.ToString.Replace(" ", "").Replace("/", "").Replace("-", "")
End If
End If
KD.KundenNrZentrale = KD.KundenNr
KD.FilialenNr = 5601
If KD.Sachbearbeiter = "" Then KD.Sachbearbeiter = "AUTO"
KD.Währungscode = "EUR"
KD.Eingegeben_am = Now.ToShortDateString
' AD.Ordnungsbegriff = getTrimedString(AD.Name_1 & "; " & AD.Ort, 50)
If AD.Sachbearbeiter = "" Then AD.Sachbearbeiter = "AUTO"
AD.Eingegeben_am = Now.ToShortDateString
AD.LandKz = If(isleernothing(cProgramFunctions.getISO1Land(AD.LandKz)), AD.LandKz)
AD.Rechnungsdruck = True
If KD.EORITIN = "" Then KD.EORITIN = Nothing
KD.Vorlageprovision = 0.01
KD.Kreditaufwendungen = 0.02
KD.Bankspesen = 0
KD.SVS = True
KD.Bankspesen_Mindestbetrag = 0
KD.Sammelrechnung = 0
KD.Steuerschlüssel = 10
KD.Kreditlimit = 2600
KD.Überwachungskunde = 0
KD.Abfertigungsverbot = 0
KD.Rechtsanwalt = 0
KD.Euroeinführung = CDate("01.01.2002")
KD.UStV_Summe3470BetragEUR = 0
KD.UStV_SummeErstattungsbetragEUR = 0
KD.UStV_SummeVorschaubetragEUR = 0
KD.UStV_SummeVorschaubetragEUR_IDS = 0
KD.UStV_SummeVorschaubetragEUR_VERAG = 0
KD.UStV_SummeUmsatzsteuerbetragEUR = 0
KD.UStV_SummeVZBetragEUR = 0
KD.Fiskal_Aktiv = 0
If AD.SAVE() AndAlso KD.SAVE() Then ' AndAlso KDE.SAVE() Then
TextBox10.Text &= AD.AdressenNr & " " & AD.Ordnungsbegriff & vbNewLine
Else
MsgBox("FEHLER: " & index)
End If
End If
'Item(0) = row(0)
'Item(1) = row(1)
'Dim NextListItem As New ListViewItem(Item)
'ListView1.Items.Add(NextListItem)
Label14.Text = cnt & "/" & Blatt.UsedRange.Rows.Count
cnt += 1
Me.Refresh()
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
Next
End If
End If
Catch ex As Exception
MessageBox.Show(ex.Message & ex.StackTrace)
Finally
End Try
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = test
End Sub
'Private Sub Button26_Click(sender As Object, e As EventArgs)

72
initATLASAufschubkonten/cVERAG_Interface.vb
View File

@@ -48,7 +48,7 @@
If NCTS_TMP Is Nothing Then Return False
If NCTS_TMP.ncts_ObjectName Is Nothing Then Return False
If NCTS_TMP.ncts_ObjectName.ToString.StartsWith("DU") Then Return False
If NCTS_TMP.ncts_firma.ToString = "DURMAZ" Then Return False
If If(NCTS_TMP.ncts_firma, "").ToString = "DURMAZ" Then Return False
' Dim filePath = SQL.getValueTxtBySql("select [dySt_pfad] from [tblDakosy_Statusmeldungen] where dySt_BezugsNr='" & NCTS_TMP.ncts_ObjectName & "' and [dySt_status]=5 and [dySt_pfad] is not null ", "FMZOLL")
@@ -269,7 +269,9 @@
If Not IO.Directory.Exists(dir) Then IO.Directory.CreateDirectory(dir)
XMLFilePath = dir & "VERAG_NCTS_OUT_" & Now.ToString("ddMMyyyHHmmss") & "_" & Code & "_" & UniqueId & ".xml"
End If
VERAG_NCTS.SaveToFile(XMLFilePath)
If VERAG_NCTS IsNot Nothing Then
VERAG_NCTS.SaveToFile(XMLFilePath)
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
@@ -310,7 +312,7 @@
VERAG_NCTS.ProcessData.ReferenzNumber = If(NCTS_TMP.ncts_ObjectName, "")
VERAG_NCTS.ProcessData.ProcedureCode = If(NCTS_TMP.ncts_ArtAnmeldung, "")
VERAG_NCTS.NCTS_Data.DatDeterminationLimit = If(NCTS_TMP.ncts_Wiedergestellungsdatum, "")
If IsDate(If(NCTS_TMP.ncts_Wiedergestellungsdatum, "")) Then VERAG_NCTS.NCTS_Data.DatDeterminationLimit = CDate(If(NCTS_TMP.ncts_Wiedergestellungsdatum, ""))
VERAG_NCTS.NCTS_Data.LicensePlate = If(NCTS_TMP.ncts_Befoerderungsmittel_KennzeichenAbgang, "")
VERAG_NCTS.NCTS_Data.DepartureCustomsOffice = If(NCTS_TMP.ncts_AbgangsDienststellennummer, "")
VERAG_NCTS.NCTS_Data.DestinationCustomsOffice = If(NCTS_TMP.ncts_BestimmungsstelleDienststellennummer, "")
@@ -585,45 +587,45 @@
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")" &
" ORDER BY GrteeID, GrteeRefID", "EZOLL")
If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then
VERAG_NCTS.NCTS_Data.Guarantee.Amount = 0
For Each DTzsAnmGrteeGrteeRef_row In DTzsAnmGrteeGrteeRef.Rows()
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GRN")) Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = DTzsAnmGrteeGrteeRef_row.item("GRN")
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GVal")) Then VERAG_NCTS.NCTS_Data.Guarantee.Amount += DTzsAnmGrteeGrteeRef_row.item("GVal")
Next
End If
If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then
VERAG_NCTS.NCTS_Data.Guarantee.Amount = 0
For Each DTzsAnmGrteeGrteeRef_row In DTzsAnmGrteeGrteeRef.Rows()
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GRN")) Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = DTzsAnmGrteeGrteeRef_row.item("GRN")
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GVal")) Then VERAG_NCTS.NCTS_Data.Guarantee.Amount += DTzsAnmGrteeGrteeRef_row.item("GVal")
Next
End If
'POSITIONEN
Dim cntPos = 1
Dim DTzsAnmGdsitem As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmGdsitem WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitem.Rows().Count > 0 Then
For Each DTzsAnmGdsitem_row In DTzsAnmGdsitem.Rows()
Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition
V_POS.PosNr = cntPos
Dim pkGes = 0
Dim pkArt = ""
'POSITIONEN
Dim cntPos = 1
Dim DTzsAnmGdsitem As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmGdsitem WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitem.Rows().Count > 0 Then
For Each DTzsAnmGdsitem_row In DTzsAnmGdsitem.Rows()
Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition
V_POS.PosNr = cntPos
Dim pkGes = 0
Dim pkArt = ""
Dim DTzsAnmGdsitemPk As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmGdsItemPack] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") AND GdsItemID='" & DTzsAnmGdsitem_row.Item("GdsItemID") & "' ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitemPk.Rows().Count > 0 Then
For Each DTzsAnmGdsitemPk_row In DTzsAnmGdsitemPk.Rows()
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Kind")) Then pkArt = DTzsAnmGdsitemPk_row.item("Kind")
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Nr")) Then pkGes += DTzsAnmGdsitemPk_row.item("Nr")
Next
End If
Dim DTzsAnmGdsitemPk As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmGdsItemPack] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") AND GdsItemID='" & DTzsAnmGdsitem_row.Item("GdsItemID") & "' ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitemPk.Rows().Count > 0 Then
For Each DTzsAnmGdsitemPk_row In DTzsAnmGdsitemPk.Rows()
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Kind")) Then pkArt = DTzsAnmGdsitemPk_row.item("Kind")
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Nr")) Then pkGes += DTzsAnmGdsitemPk_row.item("Nr")
Next
End If
V_POS.Quantity = pkGes
V_POS.Packaging = pkArt
If Not SQL.IsNull(DTzsAnmGdsitem_row.item("Gross")) Then V_POS.GrossWeight = DTzsAnmGdsitem_row.item("Gross")
V_POS.Quantity = pkGes
V_POS.Packaging = pkArt
If Not SQL.IsNull(DTzsAnmGdsitem_row.item("Gross")) Then V_POS.GrossWeight = DTzsAnmGdsitem_row.item("Gross")
V_POS.GoodsDescription = DTzsAnmGdsitem_row.item("GdsDes")
V_POS.GoodsDescription = DTzsAnmGdsitem_row.item("GdsDes")
VERAG_NCTS.NCTS_Data.Position.Add(V_POS)
cntPos += 1
Next
End If
VERAG_NCTS.NCTS_Data.Position.Add(V_POS)
cntPos += 1
Next
End If
UniqueId = AnmID
UniqueId = AnmID
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & LRN, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return Nothing

46
initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
View File

@@ -175,7 +175,14 @@ Public Class frmDYNachrichtenVerarbeitung
Return (character = 9 OrElse character = 10 OrElse character = 13 OrElse (character >= 32 AndAlso character <= 55295) OrElse (character >= 57344 AndAlso character <= 65533) OrElse (character >= 65536 AndAlso character <= 1114111))
End Function
Private Function getFilesInOrder() As String()
Dim myDirectory As New IO.DirectoryInfo(VERARBEITUNGS_PFAD)
'Dim myfiles() As String = myDirectory.GetFiles.OrderBy(Function(x) x.LastWriteTime).Select(Function(x) x.FullName).Take(40).ToArray
Dim myfiles() As String = myDirectory.GetFiles.OrderBy(Function(x) x.CreationTime).Select(Function(x) x.FullName).ToArray
' Dim myfiles As FileInfo() = myDirectory.GetFiles().OrderBy(Function(p) p.CreationTime).Select(Function(x) x.FullName).ToArray
Return myfiles
End Function
Sub DatenEinlesen()
@@ -187,7 +194,7 @@ Public Class frmDYNachrichtenVerarbeitung
Exit Sub
End If
For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD)
For Each d In getFilesInOrder() 'System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD,,)
Try
Dateiname = d
cWorker_NCTS.Dateiname = d
@@ -692,7 +699,7 @@ Public Class frmDYNachrichtenVerarbeitung
' End If
' End If
saveDY_ZA = DY_TMP
Return DY_TMP
End Function
Shared Function saveDY_ZA(dySt_BezugsNr As String, art As String) As DAKOSY_Worker.cDakosy_Zollanmeldungen
Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = Nothing
@@ -756,7 +763,7 @@ Public Class frmDYNachrichtenVerarbeitung
If DY_TMP2 IsNot Nothing Then STATUS2.dySt_dyId = DY_TMP2.dy_Id
cWorker_NCTS.SaveNCTS_FirmaNL(NCTS_TMP2, DY_TMP2, division)
STATUS2.dySt_dyArt = "NCTS"
Case "EZA"
Case "EZA", ""
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "EZA")
Dim EZA_TMP As DAKOSY_Worker.cDakosyEZA = saveDY_EZA(STATUS2, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit)
If DY_TMP2 IsNot Nothing Then STATUS2.dySt_dyId = DY_TMP2.dy_Id
@@ -766,16 +773,13 @@ Public Class frmDYNachrichtenVerarbeitung
STATUS2.SAVE()
'Nur wenn BezugsNr vorhanden:
If ge.KopfDaten IsNot Nothing Then
For Each kopf In ge.KopfDaten
If kopf.Ereignis IsNot Nothing Then
If kopf.RegistrierNrATLAS IsNot Nothing Then
'MsgBox(kopf.RegistrierNrATLAS)
If kopf.RegistrierNrATLAS.StartsWith("ATA") Then
If kopf.RegistrierNrATLAS.StartsWith("ATA") Or kopf.RegistrierNrATLAS.StartsWith("ATC") Then 'EZA!
Dim STATUS As DAKOSY_Worker.cDakosy_Statusmeldungen = getStatusCheckTransID(NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit)
STATUS.dySt_artMitteilung = "GE"
STATUS.dySt_dyArt = "" '"NCTS" 'T1/T2
@@ -787,20 +791,20 @@ Public Class frmDYNachrichtenVerarbeitung
STATUS.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_41
readNCTS_GenerellesEreignis = True
Select Case getVerahrensartFromBezugsNr(ge.ObjektIdentifizierung.ObjektName)
Case "NCTS"
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "NCTS")
Dim NCTS_TMP2 As DAKOSY_Worker.cDakosyNCTSOut = cWorker_NCTS.saveDY_NCTS(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
cWorker_NCTS.SaveNCTS_FirmaNL(NCTS_TMP2, DY_TMP2, division)
STATUS.dySt_dyArt = "NCTS"
Case "EZA"
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "EZA")
Dim EZA_TMP As DAKOSY_Worker.cDakosyEZA = saveDY_EZA(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
SaveEZA_FirmaNL(EZA_TMP, DY_TMP2, division)
STATUS.dySt_dyArt = "EZA"
End Select
'Select Case getVerahrensartFromBezugsNr(ge.ObjektIdentifizierung.ObjektName)
' Case "NCTS"
' Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "NCTS")
' Dim NCTS_TMP2 As DAKOSY_Worker.cDakosyNCTSOut = cWorker_NCTS.saveDY_NCTS(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
' If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
' cWorker_NCTS.SaveNCTS_FirmaNL(NCTS_TMP2, DY_TMP2, division)
' STATUS.dySt_dyArt = "NCTS"
' Case "EZA"
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "EZA")
Dim EZA_TMP As DAKOSY_Worker.cDakosyEZA = saveDY_EZA(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
SaveEZA_FirmaNL(EZA_TMP, DY_TMP2, division)
STATUS.dySt_dyArt = "EZA"
'End Select
STATUS.SAVE()

9
initATLASAufschubkonten/frmRoutineManager.vb
View File

@@ -397,10 +397,13 @@ Public Class frmRoutineManager
Function removeThreadFromList(n) As Boolean
Try
For Each t As System.Threading.Thread In threads
If t.Name = n Then
threads.Remove(t)
Return False
If t IsNot Nothing Then
If t.Name = n Then
threads.Remove(t)
Return False
End If
End If
Next
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name)