This commit is contained in:
2023-11-02 09:32:01 +01:00
8 changed files with 1149 additions and 1036 deletions

View File

@@ -12,6 +12,8 @@ Public Class cZOLL_IMPORT
Dim strManNr As String = "VERA" Dim strManNr As String = "VERA"
Dim strManNl As String = "SUB" Dim strManNl As String = "SUB"
Dim EZOLL_SQL As String = "EZOLL"
Dim packstueckeAVISO_TMP As String = "" Dim packstueckeAVISO_TMP As String = ""
Dim RohmasseAviso As String = "" Dim RohmasseAviso As String = ""
Dim packstueckeZOLL_TMP As String = "" Dim packstueckeZOLL_TMP As String = ""
@@ -322,11 +324,11 @@ Public Class cZOLL_IMPORT
Public Shared Function EZOLLImport(LRN, art, Optional ByRef SPEDBUCH_TMP = Nothing) As Boolean Public Shared Function EZOLLImport(LRN, art, Optional ByRef SPEDBUCH_TMP = Nothing) As Boolean
Dim firmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" 'Wichtig für Spedbucheintrag VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" 'Wichtig für Spedbucheintrag
Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
' Dim cZOLL_IMPORT As New cZOLL_IMPORT ' Dim cZOLL_IMPORT As New cZOLL_IMPORT
Dim firmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
If True Then If True Then
'Filiale erkennen: 'Filiale erkennen:
@@ -336,6 +338,7 @@ Public Class cZOLL_IMPORT
Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX"
Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung
Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE"
Case "5601" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
End Select End Select
Dim abfertigungsnummer = getAbfertigungsnummer(LRN) Dim abfertigungsnummer = getAbfertigungsnummer(LRN)
@@ -386,9 +389,13 @@ Public Class cZOLL_IMPORT
End If End If
End If End If
End If End If
Else Else
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp
Return False 'Ohne Sendungsverweis kein eintrag... Return False 'Ohne Sendungsverweis kein eintrag...
End If End If
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp
Return False Return False
End Function End Function
@@ -534,6 +541,12 @@ Public Class cZOLL_IMPORT
End If End If
notFound = Me.notFound notFound = Me.notFound
Case 1 'ezoll Case 1 'ezoll
EZOLL_SQL = "EZOLL"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED" : EZOLL_SQL = "EZOLL_UNISPED"
End Select
SPEDITIONSBUCH.Zollsystem = "E" SPEDITIONSBUCH.Zollsystem = "E"
If EZA_Nr <> "" Then If EZA_Nr <> "" Then
' SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr ' SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
@@ -730,15 +743,15 @@ Public Class cZOLL_IMPORT
End If End If
If SPEDITIONSBUCH.EmpfängerKundenNr Is Nothing OrElse SPEDITIONSBUCH.EmpfängerKundenNr <= 0 Then If SPEDITIONSBUCH.EmpfängerKundenNr Is Nothing OrElse SPEDITIONSBUCH.EmpfängerKundenNr <= 0 Then
If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr
If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger
End If End If
If SPEDITIONSBUCH.VermittlerKundenNr Is Nothing OrElse SPEDITIONSBUCH.VermittlerKundenNr <= 0 Then If SPEDITIONSBUCH.VermittlerKundenNr Is Nothing OrElse SPEDITIONSBUCH.VermittlerKundenNr <= 0 Then
If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr) If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr)
If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber
End If End If
End If End If
SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
@@ -1198,13 +1211,13 @@ Public Class cZOLL_IMPORT
Return KDSQL.getValueTxtBySql("SELECT TOP 1 veoant_mrn FROM veoant WHERE basman_nr='" & strManNr & "' And basman_nl='" & strManNl & "' And veoant_beznr='" & NCTS_Nr & "' AND veoant_stat BETWEEN 50 AND 60 ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr DESC", ATLAS_SERVER_VERBINDUNG) Return KDSQL.getValueTxtBySql("SELECT TOP 1 veoant_mrn FROM veoant WHERE basman_nr='" & strManNr & "' And basman_nl='" & strManNl & "' And veoant_beznr='" & NCTS_Nr & "' AND veoant_stat BETWEEN 50 AND 60 ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr DESC", ATLAS_SERVER_VERBINDUNG)
End Function End Function
Public Function getMRNFROM_EZollNCTSDatenbereitstellung(NCTS_Nr) As String Public Function getMRNFROM_EZollNCTSDatenbereitstellung(NCTS_Nr) As String
'Return KDSQL.getValueTxtBySql("SELECT top 1 CRN FROM zsAnmRefs WHERE (VorgangID = 'AV') AND (LRN = '" & NCTS_Nr & "') ORDER BY GeaendertAm DESC", "EZOLL") 'Return KDSQL.getValueTxtBySql("SELECT top 1 CRN FROM zsAnmRefs WHERE (VorgangID = 'AV') AND (LRN = '" & NCTS_Nr & "') ORDER BY GeaendertAm DESC", EZOLL_SQL)
Return KDSQL.getValueTxtBySql("SELECT top 1 CRN from zsAnmRefs left JOIN [zsAnmDHFRefs] on [zsAnmDHFRefs].AnmID=zsAnmRefs.AnmID AND [zsAnmDHFRefs].OperatorID=zsAnmRefs.OperatorID AND [zsAnmDHFRefs].LizenzNr=zsAnmRefs.LizenzNr where (zsAnmDHFRefs.VorgangID = 'AV') AND (LRN LIKE '" & NCTS_Nr & "') and ErledigungsTypID IN ('F','FB') ORDER BY zsAnmDHFRefs.GeaendertAm DESC", "EZOLL") Return KDSQL.getValueTxtBySql("SELECT top 1 CRN from zsAnmRefs left JOIN [zsAnmDHFRefs] on [zsAnmDHFRefs].AnmID=zsAnmRefs.AnmID AND [zsAnmDHFRefs].OperatorID=zsAnmRefs.OperatorID AND [zsAnmDHFRefs].LizenzNr=zsAnmRefs.LizenzNr where (zsAnmDHFRefs.VorgangID = 'AV') AND (LRN LIKE '" & NCTS_Nr & "') and ErledigungsTypID IN ('F','FB') ORDER BY zsAnmDHFRefs.GeaendertAm DESC", EZOLL_SQL)
End Function End Function
Public Function getMRNFROM_EZollNCTSDatenbereitstellungDT(NCTS_Nr) As DataTable Public Function getMRNFROM_EZollNCTSDatenbereitstellungDT(NCTS_Nr) As DataTable
'Return KDSQL.getValueTxtBySql("SELECT top 1 CRN FROM zsAnmRefs WHERE (VorgangID = 'AV') AND (LRN = '" & NCTS_Nr & "') ORDER BY GeaendertAm DESC", "EZOLL") 'Return KDSQL.getValueTxtBySql("SELECT top 1 CRN FROM zsAnmRefs WHERE (VorgangID = 'AV') AND (LRN = '" & NCTS_Nr & "') ORDER BY GeaendertAm DESC", EZOLL_SQL)
Return KDSQL.loadDgvBySql("SELECT CRN from zsAnmRefs left JOIN [zsAnmDHFRefs] on [zsAnmDHFRefs].AnmID=zsAnmRefs.AnmID AND [zsAnmDHFRefs].OperatorID=zsAnmRefs.OperatorID AND [zsAnmDHFRefs].LizenzNr=zsAnmRefs.LizenzNr where (zsAnmDHFRefs.VorgangID = 'AV') AND (LRN LIKE '" & NCTS_Nr & "') and ErledigungsTypID IN ('F','FB') ORDER BY zsAnmDHFRefs.GeaendertAm DESC", "EZOLL") Return KDSQL.loadDgvBySql("SELECT CRN from zsAnmRefs left JOIN [zsAnmDHFRefs] on [zsAnmDHFRefs].AnmID=zsAnmRefs.AnmID AND [zsAnmDHFRefs].OperatorID=zsAnmRefs.OperatorID AND [zsAnmDHFRefs].LizenzNr=zsAnmRefs.LizenzNr where (zsAnmDHFRefs.VorgangID = 'AV') AND (LRN LIKE '" & NCTS_Nr & "') and ErledigungsTypID IN ('F','FB') ORDER BY zsAnmDHFRefs.GeaendertAm DESC", EZOLL_SQL)
End Function End Function
@@ -1292,12 +1305,12 @@ Public Class cZOLL_IMPORT
Dim Sicherheitsbetrag As Double = 0 '??????????? Dim Sicherheitsbetrag As Double = 0 '???????????
dATLAS = Nothing dATLAS = Nothing
dATLAS = KDSQL.loadDgvBySql("SELECT veoant_beznr, veoant_lfdnr, veopos_posnr, veoerz_typ, veoerz_lfdnr, veoerz_sicbsc, veoerz_basbtg, veoerz_baswrg, veoerz_sicbtg, veoerz_sicwrg, veoant_korant" & _ dATLAS = KDSQL.loadDgvBySql("SELECT veoant_beznr, veoant_lfdnr, veopos_posnr, veoerz_typ, veoerz_lfdnr, veoerz_sicbsc, veoerz_basbtg, veoerz_baswrg, veoerz_sicbtg, veoerz_sicwrg, veoant_korant" &
" FROM veoerz t1 WHERE (veoant_beznr = '" & NCTS_Nr & "') AND (basman_nr = '" & strManNr & "') AND (basman_nl = '" & strManNl & "') AND (veoerz_typ = 2)" & _ " FROM veoerz t1 WHERE (veoant_beznr = '" & NCTS_Nr & "') AND (basman_nr = '" & strManNr & "') AND (basman_nl = '" & strManNl & "') AND (veoerz_typ = 2)" &
" AND (veoant_korant = (SELECT MAX(t2.veoant_korant) FROM veoerz t2" & _ " AND (veoant_korant = (SELECT MAX(t2.veoant_korant) FROM veoerz t2" &
" WHERE t2.veoant_beznr = t1.veoant_beznr AND t2.veoant_lfdnr = t1.veoant_lfdnr AND t2.veopos_posnr = t1.veopos_posnr AND" & _ " WHERE t2.veoant_beznr = t1.veoant_beznr AND t2.veoant_lfdnr = t1.veoant_lfdnr AND t2.veopos_posnr = t1.veopos_posnr AND" &
" t2.veoerz_typ = t1.veoerz_typ AND t2.veoerz_lfdnr = t1.veoerz_lfdnr AND t2.basman_nr = t1.basman_nr AND" & _ " t2.veoerz_typ = t1.veoerz_typ AND t2.veoerz_lfdnr = t1.veoerz_lfdnr AND t2.basman_nr = t1.basman_nr AND" &
" t2.basman_nl = t1.basman_nl)) " & _ " t2.basman_nl = t1.basman_nl)) " &
" ORDER BY veoant_lfdnr, veopos_posnr, veoerz_typ, veoerz_lfdnr", ATLAS_SERVER_VERBINDUNG) " ORDER BY veoant_lfdnr, veopos_posnr, veoerz_typ, veoerz_lfdnr", ATLAS_SERVER_VERBINDUNG)
If dATLAS.Rows.Count > 0 Then If dATLAS.Rows.Count > 0 Then
notFound = False notFound = False
@@ -1345,13 +1358,13 @@ Public Class cZOLL_IMPORT
Else Else
' In Euro umrechnen. ' In Euro umrechnen.
If SPEDITIONSBUCH.Abfertigungsdatum IsNot Nothing Then If SPEDITIONSBUCH.Abfertigungsdatum IsNot Nothing Then
Dim dATLAS2 As DataTable = KDSQL.loadDgvBySql("SELECT baskur_kurs" & _ Dim dATLAS2 As DataTable = KDSQL.loadDgvBySql("SELECT baskur_kurs" &
" FROM baskur" & _ " FROM baskur" &
" WHERE (baskur_code = '" & r.Item("veoerz_sicwrg") & "')" & _ " WHERE (baskur_code = '" & r.Item("veoerz_sicwrg") & "')" &
" AND (baskur_typ = 1 OR baskur_typ = 2)" & _ " AND (baskur_typ = 1 OR baskur_typ = 2)" &
" AND (baskur_gvdat <= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" & _ " AND (baskur_gvdat <= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" &
" AND (baskur_gbdat >= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" & _ " AND (baskur_gbdat >= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" &
" AND (baskur_wkz = 'EUR')" & _ " AND (baskur_wkz = 'EUR')" &
" ORDER BY baskur_gvdat DESC, baskur_gbdat DESC", ATLAS_SERVER_VERBINDUNG) " ORDER BY baskur_gvdat DESC, baskur_gbdat DESC", ATLAS_SERVER_VERBINDUNG)
If dATLAS2.Rows.Count > 0 Then If dATLAS2.Rows.Count > 0 Then
Dim curEurobetrag = r.Item("veoerz_sicbtg") / dATLAS2.Rows(0).Item("baskur_kurs") Dim curEurobetrag = r.Item("veoerz_sicbtg") / dATLAS2.Rows(0).Item("baskur_kurs")
@@ -1406,10 +1419,10 @@ Public Class cZOLL_IMPORT
Dim Bestimmungszollstelle = "" Dim Bestimmungszollstelle = ""
Dim Bürgschaft = "" Dim Bürgschaft = ""
Dim Sicherheitsbetrag As Double Dim Sicherheitsbetrag As Double
Dim dEZOLL As DataTable = KDSQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & _ Dim dEZOLL As DataTable = KDSQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" &
" FROM zsAnmRefs" & _ " FROM zsAnmRefs" &
" WHERE (VorgangID = 'AV') AND (LRN = '" & NCTS_Nr & "')" & _ " WHERE (VorgangID = 'AV') AND (LRN = '" & NCTS_Nr & "')" &
" ORDER BY GeaendertAm DESC", "EZOLL") " ORDER BY GeaendertAm DESC", EZOLL_SQL)
If dEZOLL Is Nothing Then notFound = True : Exit Sub If dEZOLL Is Nothing Then notFound = True : Exit Sub
If dEZOLL.Rows.Count = 0 Then If dEZOLL.Rows.Count = 0 Then
@@ -1431,9 +1444,9 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Absender = "" Then If SPEDITIONSBUCH.Absender = "" Then
' Tabelle zsAnmConorTra lesen. ' Tabelle zsAnmConorTra lesen.
Dim DTzsAnmConorTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" & _ Dim DTzsAnmConorTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" &
" FROM zsAnmConorTra" & _ " FROM zsAnmConorTra" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmConorTra.Rows().Count > 0 Then If DTzsAnmConorTra.Rows().Count > 0 Then
If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Absender = Strings.Left(DTzsAnmConorTra.Rows(0).Item("Na"), 50) If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Absender = Strings.Left(DTzsAnmConorTra.Rows(0).Item("Na"), 50)
If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Ctry")) Then SPEDITIONSBUCH.Absender = Strings.Left(SPEDITIONSBUCH.Absender & ", " & DTzsAnmConorTra.Rows(0).Item("Ctry"), 50) If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Ctry")) Then SPEDITIONSBUCH.Absender = Strings.Left(SPEDITIONSBUCH.Absender & ", " & DTzsAnmConorTra.Rows(0).Item("Ctry"), 50)
@@ -1445,9 +1458,9 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Empfänger = "" Then If SPEDITIONSBUCH.Empfänger = "" Then
' Tabelle zsAnmConeeTra lesen. ' Tabelle zsAnmConeeTra lesen.
Dim DTzsAnmConeeTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" & _ Dim DTzsAnmConeeTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" &
" FROM zsAnmConeeTra" & _ " FROM zsAnmConeeTra" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmConeeTra.Rows().Count > 0 Then If DTzsAnmConeeTra.Rows().Count > 0 Then
If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Na"), 50) If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Na"), 50)
@@ -1459,9 +1472,9 @@ Public Class cZOLL_IMPORT
End If End If
' Tabelle zsAnmTransp lesen. ' Tabelle zsAnmTransp lesen.
Dim DTzsAnmTransp As DataTable = KDSQL.loadDgvBySql("SELECT DepIdnt" & _ Dim DTzsAnmTransp As DataTable = KDSQL.loadDgvBySql("SELECT DepIdnt" &
" FROM zsAnmTransp" & _ " FROM zsAnmTransp" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmTransp.Rows().Count > 0 Then If DTzsAnmTransp.Rows().Count > 0 Then
If Not IsNull(DTzsAnmTransp.Rows(0).Item("DepIdnt")) Then If Not IsNull(DTzsAnmTransp.Rows(0).Item("DepIdnt")) Then
SPEDITIONSBUCH.LKW_Kennzeichen = Strings.Left(DTzsAnmTransp.Rows(0).Item("DepIdnt"), 25) SPEDITIONSBUCH.LKW_Kennzeichen = Strings.Left(DTzsAnmTransp.Rows(0).Item("DepIdnt"), 25)
@@ -1470,9 +1483,9 @@ Public Class cZOLL_IMPORT
End If End If
' Tabelle zsAnmValData lesen. ' Tabelle zsAnmValData lesen.
Dim DTzsAnmValData As DataTable = KDSQL.loadDgvBySql("SELECT InvCurr, InvVal" & _ Dim DTzsAnmValData As DataTable = KDSQL.loadDgvBySql("SELECT InvCurr, InvVal" &
" FROM zsAnmValData" & _ " FROM zsAnmValData" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmValData.Rows().Count > 0 Then If DTzsAnmValData.Rows().Count > 0 Then
If Not IsNull(DTzsAnmValData.Rows(0).Item("InvCurr")) Then If Not IsNull(DTzsAnmValData.Rows(0).Item("InvCurr")) Then
@@ -1487,9 +1500,9 @@ Public Class cZOLL_IMPORT
End If End If
' Tabelle zsAnmHea lesen. ' Tabelle zsAnmHea lesen.
Dim DTzsAnmHea As DataTable = KDSQL.loadDgvBySql("SELECT TotPack, TotGross" & _ Dim DTzsAnmHea As DataTable = KDSQL.loadDgvBySql("SELECT TotPack, TotGross" &
" FROM zsAnmHea" & _ " FROM zsAnmHea" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", EZOLL_SQL)
If packstueckeZOLL_TMP = "" Then If packstueckeZOLL_TMP = "" Then
If DTzsAnmHea.Rows().Count > 0 Then If DTzsAnmHea.Rows().Count > 0 Then
@@ -1498,10 +1511,10 @@ Public Class cZOLL_IMPORT
End If End If
' Tabelle zsAnmGdsitem lesen. ' Tabelle zsAnmGdsitem lesen.
Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT GdsDes" & _ Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT GdsDes" &
" FROM zsAnmGdsitem" & _ " FROM zsAnmGdsitem" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")" & _ " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")" &
" ORDER BY GdsItemID", "EZOLL") " ORDER BY GdsItemID", EZOLL_SQL)
If DTzsAnmGdsitem.Rows().Count > 0 Then If DTzsAnmGdsitem.Rows().Count > 0 Then
If Not IsNull(DTzsAnmGdsitem.Rows(0).Item("GdsDes")) Then If Not IsNull(DTzsAnmGdsitem.Rows(0).Item("GdsDes")) Then
@@ -1514,19 +1527,19 @@ Public Class cZOLL_IMPORT
End If End If
End If End If
' Tabelle zsAnmDestCo lesen. ' Tabelle zsAnmDestCo lesen.
Dim DTzsAnmDestCo As DataTable = KDSQL.loadDgvBySql("SELECT Ref" & _ Dim DTzsAnmDestCo As DataTable = KDSQL.loadDgvBySql("SELECT Ref" &
" FROM zsAnmDestCo" & _ " FROM zsAnmDestCo" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmDestCo.Rows().Count > 0 Then If DTzsAnmDestCo.Rows().Count > 0 Then
If Not IsNull(DTzsAnmDestCo.Rows(0).Item("ref")) Then [Bestimmungszollstelle] = DTzsAnmDestCo.Rows(0).Item("ref") If Not IsNull(DTzsAnmDestCo.Rows(0).Item("ref")) Then [Bestimmungszollstelle] = DTzsAnmDestCo.Rows(0).Item("ref")
End If End If
' Tabelle zsAnmGrteeGrteeRef lesen. ' Tabelle zsAnmGrteeGrteeRef lesen.
Dim DTzsAnmGrteeGrteeRef As DataTable = KDSQL.loadDgvBySql("SELECT GRN, GVal" & _ Dim DTzsAnmGrteeGrteeRef As DataTable = KDSQL.loadDgvBySql("SELECT GRN, GVal" &
" FROM zsAnmGrteeGrteeRef" & _ " FROM zsAnmGrteeGrteeRef" &
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")" & _ " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & r.Item("AnmID") & ")" &
" ORDER BY GrteeID, GrteeRefID", "EZOLL") " ORDER BY GrteeID, GrteeRefID", EZOLL_SQL)
If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then
[Sicherheitsbetrag] = 0 [Sicherheitsbetrag] = 0
@@ -1563,10 +1576,10 @@ Public Class cZOLL_IMPORT
' Dim fNEF = DirectCast(Me.Owner, frmNacherfassungNEU) ' Dim fNEF = DirectCast(Me.Owner, frmNacherfassungNEU)
Dim dEZOLL As DataTable = KDSQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & _ Dim dEZOLL As DataTable = KDSQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" &
" FROM zsAnmRefs" & _ " FROM zsAnmRefs" &
" WHERE (VorgangID = 'EF') AND (LRN = '" & EZA_Nr & "')" & _ " WHERE (VorgangID = 'EF') AND (LRN = '" & EZA_Nr & "')" &
" ORDER BY GeaendertAm DESC", "EZOLL") " ORDER BY GeaendertAm DESC", EZOLL_SQL)
If dEZOLL Is Nothing Then notFound = True : Exit Sub If dEZOLL Is Nothing Then notFound = True : Exit Sub
If dEZOLL.Rows.Count = 0 Then If dEZOLL.Rows.Count = 0 Then
@@ -1588,9 +1601,9 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Absender = "" Then If SPEDITIONSBUCH.Absender = "" Then
' Tabelle zsAnmConorTra lesen. ' Tabelle zsAnmConorTra lesen.
Dim DTzsAnmConorTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" & _ Dim DTzsAnmConorTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" &
" FROM zsAnmConorTra" & _ " FROM zsAnmConorTra" &
" WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmConorTra.Rows().Count > 0 Then If DTzsAnmConorTra.Rows().Count > 0 Then
If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Absender = Strings.Left(DTzsAnmConorTra.Rows(0).Item("Na"), 50) If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Absender = Strings.Left(DTzsAnmConorTra.Rows(0).Item("Na"), 50)
@@ -1603,9 +1616,9 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Empfänger = "" Then If SPEDITIONSBUCH.Empfänger = "" Then
' Tabelle zsAnmConeeTra lesen. ' Tabelle zsAnmConeeTra lesen.
Dim DTzsAnmConeeTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" & _ Dim DTzsAnmConeeTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty, Ctry" &
" FROM zsAnmConeeTra" & _ " FROM zsAnmConeeTra" &
" WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmConeeTra.Rows().Count > 0 Then If DTzsAnmConeeTra.Rows().Count > 0 Then
If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Na"), 50) If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Na"), 50)
@@ -1617,18 +1630,18 @@ Public Class cZOLL_IMPORT
End If End If
' Tabelle zsAnmTransp lesen. ' Tabelle zsAnmTransp lesen.
Dim DTzsAnmTransp As DataTable = KDSQL.loadDgvBySql("SELECT DepIdnt" & _ Dim DTzsAnmTransp As DataTable = KDSQL.loadDgvBySql("SELECT DepIdnt" &
" FROM zsAnmTransp" & _ " FROM zsAnmTransp" &
" WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmTransp.Rows().Count > 0 Then If DTzsAnmTransp.Rows().Count > 0 Then
If Not IsNull(DTzsAnmTransp.Rows(0).Item("DepIdnt")) Then SPEDITIONSBUCH.LKW_Kennzeichen = Strings.Left(DTzsAnmTransp.Rows(0).Item("DepIdnt"), 25) If Not IsNull(DTzsAnmTransp.Rows(0).Item("DepIdnt")) Then SPEDITIONSBUCH.LKW_Kennzeichen = Strings.Left(DTzsAnmTransp.Rows(0).Item("DepIdnt"), 25)
End If End If
' Tabelle zsAnmValData lesen. ' Tabelle zsAnmValData lesen.
Dim DTzsAnmValData As DataTable = KDSQL.loadDgvBySql("SELECT InvCurr, InvVal" & _ Dim DTzsAnmValData As DataTable = KDSQL.loadDgvBySql("SELECT InvCurr, InvVal" &
" FROM zsAnmValData" & _ " FROM zsAnmValData" &
" WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL)
If DTzsAnmValData.Rows().Count > 0 Then If DTzsAnmValData.Rows().Count > 0 Then
If Not IsNull(DTzsAnmValData.Rows(0).Item("InvCurr")) Then If Not IsNull(DTzsAnmValData.Rows(0).Item("InvCurr")) Then
@@ -1643,9 +1656,9 @@ Public Class cZOLL_IMPORT
End If End If
' Tabelle zsAnmHea lesen. ' Tabelle zsAnmHea lesen.
Dim DTzsAnmHea As DataTable = KDSQL.loadDgvBySql("SELECT TotPack, TotGross" & _ Dim DTzsAnmHea As DataTable = KDSQL.loadDgvBySql("SELECT TotPack, TotGross" &
" FROM zsAnmHea" & _ " FROM zsAnmHea" &
" WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", "EZOLL") " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL)
If packstueckeZOLL_TMP = "" Then If packstueckeZOLL_TMP = "" Then
If DTzsAnmHea.Rows().Count > 0 Then If DTzsAnmHea.Rows().Count > 0 Then
@@ -1653,11 +1666,14 @@ Public Class cZOLL_IMPORT
If Not IsNull(DTzsAnmHea.Rows(0).Item("TotGross")) Then SPEDITIONSBUCH.Rohmasse = DTzsAnmHea.Rows(0).Item("TotGross") If Not IsNull(DTzsAnmHea.Rows(0).Item("TotGross")) Then SPEDITIONSBUCH.Rohmasse = DTzsAnmHea.Rows(0).Item("TotGross")
End If End If
'Dim pkAnz = SQL.DLookup("sum(cast(Nr as float))", "[zsAnmGdsItemPack]", "(LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL, "")
' Tabelle zsAnmGdsitem lesen. ' Tabelle zsAnmGdsitem lesen.
Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT GdsDes" & _ Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT GdsDes" &
" FROM zsAnmGdsitem" & _ " FROM zsAnmGdsitem" &
" WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")" & _ " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")" &
" ORDER BY GdsItemID", "EZOLL") " ORDER BY GdsItemID", EZOLL_SQL)
If DTzsAnmGdsitem.Rows().Count > 0 Then If DTzsAnmGdsitem.Rows().Count > 0 Then
If Not IsNull(DTzsAnmGdsitem.Rows(0).Item("GdsDes")) Then If Not IsNull(DTzsAnmGdsitem.Rows(0).Item("GdsDes")) Then
@@ -1671,7 +1687,7 @@ Public Class cZOLL_IMPORT
End If End If
' Qualitäts-CRN --> Tabelle zsAnmGdsItemDocCerts lesen. ' Qualitäts-CRN --> Tabelle zsAnmGdsItemDocCerts lesen.
Dim DTzsAnmGdsQ As DataTable = KDSQL.loadDgvBySql("Select distinct(DRef) DRef FROM [zsAnmGdsItemDocCerts] WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & " AND DocCd IN ('N002' ,'7246') )", "EZOLL") Dim DTzsAnmGdsQ As DataTable = KDSQL.loadDgvBySql("Select distinct(DRef) DRef FROM [zsAnmGdsItemDocCerts] WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & " AND DocCd IN ('N002' ,'7246') )", EZOLL_SQL)
If DTzsAnmGdsQ IsNot Nothing AndAlso DTzsAnmGdsQ.Rows().Count > 0 Then If DTzsAnmGdsQ IsNot Nothing AndAlso DTzsAnmGdsQ.Rows().Count > 0 Then
If Not IsNull(DTzsAnmGdsQ.Rows(0).Item("DRef")) Then SPEDITIONSBUCH.QKN = DTzsAnmGdsQ.Rows(0).Item("DRef") If Not IsNull(DTzsAnmGdsQ.Rows(0).Item("DRef")) Then SPEDITIONSBUCH.QKN = DTzsAnmGdsQ.Rows(0).Item("DRef")
End If End If

View File

@@ -205,6 +205,8 @@ Partial Class frmMitarbDetails
Me.Label7 = New System.Windows.Forms.Label() Me.Label7 = New System.Windows.Forms.Label()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.btnDelete = New System.Windows.Forms.Button() Me.btnDelete = New System.Windows.Forms.Button()
Me.cboEZOLL_SB_UNISPED = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label62 = New System.Windows.Forms.Label()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout() Me.TabControl2.SuspendLayout()
@@ -554,6 +556,8 @@ Partial Class frmMitarbDetails
' '
'TabPage4 'TabPage4
' '
Me.TabPage4.Controls.Add(Me.Label62)
Me.TabPage4.Controls.Add(Me.cboEZOLL_SB_UNISPED)
Me.TabPage4.Controls.Add(Me.Label61) Me.TabPage4.Controls.Add(Me.Label61)
Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT51FP7) Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT51FP7)
Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT52VA6) Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT52VA6)
@@ -699,7 +703,7 @@ Partial Class frmMitarbDetails
Me.cboEZOLL_SB.FormattingEnabled = True Me.cboEZOLL_SB.FormattingEnabled = True
Me.cboEZOLL_SB.Location = New System.Drawing.Point(217, 29) Me.cboEZOLL_SB.Location = New System.Drawing.Point(217, 29)
Me.cboEZOLL_SB.Name = "cboEZOLL_SB" Me.cboEZOLL_SB.Name = "cboEZOLL_SB"
Me.cboEZOLL_SB.Size = New System.Drawing.Size(214, 21) Me.cboEZOLL_SB.Size = New System.Drawing.Size(116, 21)
Me.cboEZOLL_SB.TabIndex = 109 Me.cboEZOLL_SB.TabIndex = 109
' '
'cboATLAS_SB 'cboATLAS_SB
@@ -2258,6 +2262,30 @@ Partial Class frmMitarbDetails
Me.btnDelete.UseVisualStyleBackColor = False Me.btnDelete.UseVisualStyleBackColor = False
Me.btnDelete.Visible = False Me.btnDelete.Visible = False
' '
'cboEZOLL_SB_UNISPED
'
Me.cboEZOLL_SB_UNISPED._allowedValuesFreiText = Nothing
Me.cboEZOLL_SB_UNISPED._allowFreiText = False
Me.cboEZOLL_SB_UNISPED._value = ""
Me.cboEZOLL_SB_UNISPED.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
Me.cboEZOLL_SB_UNISPED.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
Me.cboEZOLL_SB_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboEZOLL_SB_UNISPED.FormattingEnabled = True
Me.cboEZOLL_SB_UNISPED.Location = New System.Drawing.Point(332, 29)
Me.cboEZOLL_SB_UNISPED.Name = "cboEZOLL_SB_UNISPED"
Me.cboEZOLL_SB_UNISPED.Size = New System.Drawing.Size(104, 21)
Me.cboEZOLL_SB_UNISPED.TabIndex = 121
'
'Label62
'
Me.Label62.AutoSize = True
Me.Label62.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label62.Location = New System.Drawing.Point(375, 13)
Me.Label62.Name = "Label62"
Me.Label62.Size = New System.Drawing.Size(61, 13)
Me.Label62.TabIndex = 122
Me.Label62.Text = "(UNISPED)"
'
'frmMitarbDetails 'frmMitarbDetails
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2487,4 +2515,6 @@ Partial Class frmMitarbDetails
Friend WithEvents TabPage7 As TabPage Friend WithEvents TabPage7 As TabPage
Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox
Friend WithEvents btnDelete As Button Friend WithEvents btnDelete As Button
Friend WithEvents Label62 As Label
Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox
End Class End Class

View File

@@ -661,6 +661,7 @@ Public Class frmMitarbDetails
If ZOLLDATENBEARB Then If ZOLLDATENBEARB Then
mitarbeiter.mit_EZOLL_SB = If(cboEZOLL_SB._value = "", Nothing, cboEZOLL_SB._value) mitarbeiter.mit_EZOLL_SB = If(cboEZOLL_SB._value = "", Nothing, cboEZOLL_SB._value)
mitarbeiter.mit_ATLAS_SB = If(cboATLAS_SB._value = "", Nothing, cboATLAS_SB._value) mitarbeiter.mit_ATLAS_SB = If(cboATLAS_SB._value = "", Nothing, cboATLAS_SB._value)
mitarbeiter.mit_EZOLL_SB_UNISPED = If(cboEZOLL_SB_UNISPED._value = "", Nothing, cboEZOLL_SB_UNISPED._value)
End If End If
If mitarbeiter.mit_FMZollPersID IsNot Nothing And cboKasse._value <> "" Then If mitarbeiter.mit_FMZollPersID IsNot Nothing And cboKasse._value <> "" Then
@@ -880,7 +881,17 @@ Public Class frmMitarbDetails
tbcntr.SelectedIndex = 0 tbcntr.SelectedIndex = 0
Exit Sub Exit Sub
End Try End Try
Try
cboEZOLL_SB_UNISPED.fillWithSQL("SELECT [PersonalID],[UserID] FROM [zzPersonal] where lizenznr='S01133' ORDER BY UserID ", False, "EZOLL_UNISPED", True)
Catch ex As Exception
MsgBox("EZOLL UNISPED Problem")
tbcntr.SelectedIndex = 0
Exit Sub
End Try
If If(mitarbeiter.mit_EZOLL_SB_UNISPED, -1) > 0 Then
cboEZOLL_SB_UNISPED._value = mitarbeiter.mit_EZOLL_SB_UNISPED
End If
If If(mitarbeiter.mit_EZOLL_SB, -1) > 0 Then If If(mitarbeiter.mit_EZOLL_SB, -1) > 0 Then
cboEZOLL_SB._value = mitarbeiter.mit_EZOLL_SB cboEZOLL_SB._value = mitarbeiter.mit_EZOLL_SB
End If End If

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.2.2.4")> <Assembly: AssemblyVersion("1.2.2.5")>
<Assembly: AssemblyFileVersion("1.2.2.4")> <Assembly: AssemblyFileVersion("1.2.2.5")>

View File

@@ -1550,8 +1550,8 @@ Public Class cMitarbeiter
'Änderung 'Änderung
Dim sql = "INSERT INTO tblMitarbeiter " & 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,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 , mit_Sprachkentnisse) 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 , mit_Sprachkentnisse,mit_EZOLL_SB_UNISPED) 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, @mit_Sprachkentnisse)" "(@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, @mit_Sprachkentnisse,@mit_EZOLL_SB_UNISPED)"
@@ -1595,6 +1595,7 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_firma", m.mit_firma) cmd.Parameters.AddWithValue("@mit_firma", m.mit_firma)
cmd.Parameters.AddWithValue("@mit_firmaFMZoll", If(m.mit_firmaFMZoll, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_firmaFMZoll", If(m.mit_firmaFMZoll, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_EZOLL_SB", If(m.mit_EZOLL_SB, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_EZOLL_SB", If(m.mit_EZOLL_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_EZOLL_SB_UNISPED", If(m.mit_EZOLL_SB_UNISPED, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ATLAS_SB", If(m.mit_ATLAS_SB, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_ATLAS_SB", If(m.mit_ATLAS_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_DAKOSY_SB", If(m.mit_DAKOSY_SB, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_DAKOSY_SB", If(m.mit_DAKOSY_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_DAKOSY_SBFull", If(m.mit_DAKOSY_SBFull, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_DAKOSY_SBFull", If(m.mit_DAKOSY_SBFull, DBNull.Value))
@@ -1646,8 +1647,8 @@ Public Class cMitarbeiter
Dim hAuswahl As String = "" Dim hAuswahl As String = ""
Dim sql = "UPDATE tblMitarbeiter " & 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 " & "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_EZOLL_SB_UNISPED=@mit_EZOLL_SB_UNISPED " &
" ,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_timasId = @mit_timasId, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6, mit_Sprachkentnisse=@mit_Sprachkentnisse" & " ,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, mit_Sprachkentnisse=@mit_Sprachkentnisse" &
" WHERE mit_id=@mit_id " " WHERE mit_id=@mit_id "
@@ -1693,6 +1694,7 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_id", m.mit_id) cmd.Parameters.AddWithValue("@mit_id", m.mit_id)
cmd.Parameters.AddWithValue("@mit_EZOLL_SB", If(m.mit_EZOLL_SB, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_EZOLL_SB", If(m.mit_EZOLL_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_EZOLL_SB_UNISPED", If(m.mit_EZOLL_SB_UNISPED, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ATLAS_SB", If(m.mit_ATLAS_SB, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_ATLAS_SB", If(m.mit_ATLAS_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_DAKOSY_SB", If(m.mit_DAKOSY_SB, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_DAKOSY_SB", If(m.mit_DAKOSY_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_DAKOSY_SBFull", If(m.mit_DAKOSY_SBFull, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_DAKOSY_SBFull", If(m.mit_DAKOSY_SBFull, DBNull.Value))
@@ -3792,16 +3794,16 @@ Public Class cDienstplan
Public Function getDienstEintragList(datum As Date, niederlassung As String) As List(Of cDienstEintrag) Public Function getDienstEintragList(datum As Date, niederlassung As String) As List(Of cDienstEintrag)
Dim sql As String = " SELECT * FROM tblDienstplanEintraege WHERE dstetr_datum = @dstetr_datum AND dstetr_niederlassung=@dstetr_niederlassung " Dim sql As String = " SELECT * FROM tblDienstplanEintraege WHERE dstetr_datum = @dstetr_datum AND dstetr_niederlassung=@dstetr_niederlassung "
Dim daten As List(Of cDienstEintrag) = Nothing Dim daten As List(Of cDienstEintrag) = Nothing
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn) Using cmd As New SqlCommand(sql, conn)
cmd.Parameters.AddWithValue("@dstetr_datum", datum) cmd.Parameters.AddWithValue("@dstetr_datum", datum)
cmd.Parameters.AddWithValue("@dstetr_niederlassung", niederlassung) cmd.Parameters.AddWithValue("@dstetr_niederlassung", niederlassung)
'MsgBox(daten.dstetr_dstmaId) 'MsgBox(daten.dstetr_dstmaId)
Try Try
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
If dr.HasRows Then If dr.HasRows Then
@@ -3835,7 +3837,7 @@ Public Class cDienstplan
Public Function getDienstEintragListBenSchicht(datum As Date, niederlassung As String) As List(Of cDienstEintrag) Public Function getDienstEintragListBenSchicht(datum As Date, niederlassung As String) As List(Of cDienstEintrag)
Dim sql As String = " SELECT * FROM tblDienstplanEintraege WHERE dstetr_datum = @dstetr_datum AND dstetr_niederlassung=@dstetr_niederlassung AND [dstetr_art] IN (SELECT case WHEN dedet_bezeichnungDP<>'' then dedet_bezeichnungDP ELSE dedet_abt END FROM [tblDienstplanEintraegeDetails] WHERE dedet_niederlassung=@dstetr_niederlassung AND dedet_benutzerdefinierteSchicht=1)" Dim sql As String = " SELECT * FROM tblDienstplanEintraege WHERE dstetr_datum = @dstetr_datum AND dstetr_niederlassung=@dstetr_niederlassung AND [dstetr_art] IN (SELECT case WHEN dedet_bezeichnungDP<>'' then dedet_bezeichnungDP ELSE dedet_abt END FROM [tblDienstplanEintraegeDetails] WHERE dedet_niederlassung=@dstetr_niederlassung AND dedet_benutzerdefinierteSchicht=1)"
Dim daten As New List(Of cDienstEintrag) Dim daten As New List(Of cDienstEintrag)
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn) Using cmd As New SqlCommand(sql, conn)

View File

@@ -195,6 +195,7 @@ Partial Class frmStartOptions
Me.lblRoutineManager = New System.Windows.Forms.Label() Me.lblRoutineManager = New System.Windows.Forms.Label()
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button21 = New System.Windows.Forms.Button() Me.Button21 = New System.Windows.Forms.Button()
Me.LinkLabel48 = New System.Windows.Forms.LinkLabel()
Me.pnl.SuspendLayout() Me.pnl.SuspendLayout()
CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tbcntr.SuspendLayout() Me.tbcntr.SuspendLayout()
@@ -232,6 +233,7 @@ Partial Class frmStartOptions
' '
Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BackColor = System.Drawing.Color.White
Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.pnl.Controls.Add(Me.LinkLabel48)
Me.pnl.Controls.Add(Me.cbxVermerk) Me.pnl.Controls.Add(Me.cbxVermerk)
Me.pnl.Controls.Add(Me.cbxDatevTest) Me.pnl.Controls.Add(Me.cbxDatevTest)
Me.pnl.Controls.Add(Me.cbxDatevOpen) Me.pnl.Controls.Add(Me.cbxDatevOpen)
@@ -2406,6 +2408,17 @@ Partial Class frmStartOptions
Me.Button21.Text = "AAS Sendung 24h" Me.Button21.Text = "AAS Sendung 24h"
Me.Button21.UseVisualStyleBackColor = True Me.Button21.UseVisualStyleBackColor = True
' '
'LinkLabel48
'
Me.LinkLabel48.AutoSize = True
Me.LinkLabel48.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.LinkLabel48.Location = New System.Drawing.Point(405, 135)
Me.LinkLabel48.Name = "LinkLabel48"
Me.LinkLabel48.Size = New System.Drawing.Size(129, 13)
Me.LinkLabel48.TabIndex = 77
Me.LinkLabel48.TabStop = True
Me.LinkLabel48.Text = "ZOLARIS Anh. UNISPED"
'
'frmStartOptions 'frmStartOptions
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2629,4 +2642,5 @@ Partial Class frmStartOptions
Friend WithEvents LinkLabel46 As LinkLabel Friend WithEvents LinkLabel46 As LinkLabel
Friend WithEvents LinkLabel47 As LinkLabel Friend WithEvents LinkLabel47 As LinkLabel
Friend WithEvents PictureBox21 As PictureBox Friend WithEvents PictureBox21 As PictureBox
Friend WithEvents LinkLabel48 As LinkLabel
End Class End Class

View File

@@ -332,7 +332,32 @@ Public Class frmStartOptions
Case "ezoll_anhaenge" Case "ezoll_anhaenge"
Dim f As New frmInfo(PARAM) Dim f As New frmInfo(PARAM)
f.Show() f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
importFileFromEZOLL(Now) 'VERAG
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
importFileFromEZOLL(Now)
closeMe()
Case "ezoll_anhaenge_verag"
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
importFileFromEZOLL(Now)
closeMe()
Case "ezoll_anhaenge_unisped"
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
importFileFromEZOLL(Now) importFileFromEZOLL(Now)
@@ -480,10 +505,13 @@ Public Class frmStartOptions
End Function End Function
Function importFileFromEZOLL(datum As Date) As Boolean Function importFileFromEZOLL(datum As Date) As Boolean
Try Try
Dim db = "EZOLL"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED" : db = "EZOLL_UNISPED"
End Select
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,LRN,CRN ,[zzAktivitaet].VorgangID FROM [zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,LRN,CRN ,[zzAktivitaet].VorgangID FROM [zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID
where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", "EZOLL", 200) where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", db, 200)
If dt IsNot Nothing Then If dt IsNot Nothing Then
For Each row In dt.Rows For Each row In dt.Rows
Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr")) Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))
@@ -526,7 +554,12 @@ Public Class frmStartOptions
If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
destFull = "" destFull = ""
copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\Ezoll\c$\"), ZIEL_PFAD, destFull) Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED" : copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\SRV04.unisu.at\c$\"), ZIEL_PFAD, destFull)
Case Else : copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\Ezoll\c$\"), ZIEL_PFAD, destFull)
End Select
If destFull <> "" Then If destFull <> "" Then
If DS.insertDataToDATENSERVER(destFull) Then If DS.insertDataToDATENSERVER(destFull) Then
@@ -3887,4 +3920,11 @@ Public Class frmStartOptions
Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Sub End Sub
Private Sub LinkLabel48_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel48.LinkClicked
Dim f = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
End Sub
End Class End Class