diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb
index cd911cc..9662c87 100644
--- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb
+++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb
@@ -484,7 +484,7 @@ Public Class cDakosyEZA
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_Status_KEWILL_Equivalent", status, , True))
eza_Status = status
eza_Status_KEWILL_Equivalent = status
- Return SQL.doSQLVarList(" UPDATE [tblDakosy_eza] SET eza_Status=@eza_Status WHERE eza_Id=@eza_Id ", "FMZOLL", , list)
+ Return SQL.doSQLVarList(" UPDATE [tblDakosy_eza] SET eza_Status_KEWILL_Equivalent=@eza_Status_KEWILL_Equivalent,eza_Status=@eza_Status WHERE eza_Id=@eza_Id ", "FMZOLL", , list)
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb
index 00f3c0e..73bf239 100644
--- a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb
+++ b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb
@@ -549,7 +549,7 @@ Public Class cDakosyNCTSOut
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ncts_Status_KEWILL_Equivalent", status, , True))
ncts_Status = status
ncts_Status_KEWILL_Equivalent = status
- Return SQL.doSQLVarList(" UPDATE [tblDakosy_NCTSOut] SET ncts_Status=@ncts_Status WHERE ncts_Id=@ncts_Id ", "FMZOLL", , list)
+ Return SQL.doSQLVarList(" UPDATE [tblDakosy_NCTSOut] SET ncts_Status_KEWILL_Equivalent=@ncts_Status_KEWILL_Equivalent,ncts_Status=@ncts_Status WHERE ncts_Id=@ncts_Id ", "FMZOLL", , list)
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb
index c042973..d2eb2c0 100644
--- a/DAKOSY_Worker/cZOLL_IMPORT.vb
+++ b/DAKOSY_Worker/cZOLL_IMPORT.vb
@@ -31,74 +31,229 @@ Public Class cZOLL_IMPORT
End Function
Function countSpedbuchEntrysTC_EZA(filiale, BezugsNr) As Integer
- If If(BezugsNr, "") = "" Then Return 0
- Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND [AtlasBezNrEZA]='" & BezugsNr & "'", "FMZOLL")
+ If If(BezugsNr, "") = "" Then Return -1
+ Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND [AtlasBezNrEZA]='" & BezugsNr & "'", "FMZOLL",, 0)
End Function
Function countSpedbuchEntrysTC_NCTS(filiale, BezugsNr) As Integer
- If If(BezugsNr, "") = "" Then Return 0
- Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND [AtlasBezNrNCTS]='" & BezugsNr & "'", "FMZOLL")
+ If If(BezugsNr, "") = "" Then Return -1
+ Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND [AtlasBezNrNCTS]='" & BezugsNr & "'", "FMZOLL",, 0)
End Function
+ Function countSpedbuchEntrys_AbfertigungsNr(filiale, AbfertigungsNr) As Integer
+ If If(AbfertigungsNr, "") = "" Then Return -1
+ Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND [AbfertigungsNr]='" & AbfertigungsNr & "'", "FMZOLL",, 0)
+ End Function
+
Public Function TelotecImport(TC As TELOTEC_Worker.cTelotec_Anmeldung) As Boolean
'Function insertIntoSpedBuch() As Boolean
Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
- If True Then ' If(Me.telanm_firma, "") = "IMEX" Then
- If countSpedbuchEntrysTC(5501, TC.telanm_BezugsNr, TC.telanm_ART) = 0 Then
- SPEDBUCH.FilialenNr = 5501
- SPEDBUCH.AbfertigungsNr = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(SPEDBUCH.FilialenNr, Now.Year)
- SPEDBUCH.NewUNTER_NR()
- SPEDBUCH.Zollsystem = "T"
- SPEDBUCH.Abfertigungsdatum = Now.ToShortDateString
- SPEDBUCH.Sachbearbeiter = "AUTO"
+ Dim AbfertigungsNr = getAbfertigungsnummer(TC.telanm_BezugsNr)
- Dim notfound = False
+ If AbfertigungsNr <> "" AndAlso countSpedbuchEntrysTC(5501, TC.telanm_BezugsNr, TC.telanm_ART) = 0 AndAlso countSpedbuchEntrys_AbfertigungsNr(5501, AbfertigungsNr) = 0 Then
+ SPEDBUCH.FilialenNr = 5501
+ ' SPEDBUCH.AbfertigungsNr = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(SPEDBUCH.FilialenNr, Now.Year)
+ SPEDBUCH.AbfertigungsNr = AbfertigungsNr
+ SPEDBUCH.NewUNTER_NR()
- Dim art = ""
- Select Case TC.telanm_ART
- Case "NCTS", "T1", "T2", "T2L" : TC.telanm_ART = "NCTS" : SPEDBUCH.AtlasBezNrNCTS = TC.telanm_BezugsNr
- Case Else : TC.telanm_ART = "EZA" : SPEDBUCH.AtlasBezNrEZA = TC.telanm_BezugsNr
- End Select
+ SPEDBUCH.Zollsystem = "T"
+ SPEDBUCH.Abfertigungsdatum = Now.ToShortDateString
+ SPEDBUCH.Sachbearbeiter = "AUTO"
- Dim PosAnzahl = 0
- ' TELOTECDatenbereitstellung(SPEDBUCH, Me.telanm_BezugsNr, notfound, art, PosAnzahl)
- SPEDBUCH = IMPORT(SPEDBUCH, TC.telanm_AvisoId, TC.telanm_SendungsId, "VERA", SPEDBUCH.FilialenNr, 2, SPEDBUCH.AtlasBezNrEZA, SPEDBUCH.AtlasBezNrNCTS, notfound, True)
+ Dim notfound = False
+
+ Dim art = ""
+ Select Case TC.telanm_ART
+ Case "NCTS", "T1", "T2", "T2L" : TC.telanm_ART = "NCTS" : SPEDBUCH.AtlasBezNrNCTS = TC.telanm_BezugsNr
+ Case "EUA", "EZA" : TC.telanm_ART = "EZA" : SPEDBUCH.AtlasBezNrEZA = TC.telanm_BezugsNr
+ ' Case Else : TC.telanm_ART = "EZA" : SPEDBUCH.AtlasBezNrEZA = TC.telanm_BezugsNr
+ End Select
+
+ Dim PosAnzahl = 0
+ ' TELOTECDatenbereitstellung(SPEDBUCH, Me.telanm_BezugsNr, notfound, art, PosAnzahl)
+ SPEDBUCH = IMPORT(SPEDBUCH, TC.telanm_AvisoId, TC.telanm_SendungsId, "VERA", SPEDBUCH.FilialenNr, 2, SPEDBUCH.AtlasBezNrEZA, SPEDBUCH.AtlasBezNrNCTS, notfound, True)
- If Not notfound Then
- Return SPEDBUCH.SAVE
- Else
- Return False
- End If
- End If
-
- If TC.telanm_SendungsId IsNot Nothing Then
-
- Else
- Return False 'Ohne Sendungsverweis kein eintrag...
- End If
-
- Return SPEDBUCH.SAVE
- Else
- If False Then 'NOCH NCIHT....
-
- If TC.telanm_SendungsId IsNot Nothing Then
-
- Else
- Return False 'Ohne Sendungsverweis kein eintrag...
- End If
-
+ If Not notfound Then
Return SPEDBUCH.SAVE
+ Else
+ Return False
End If
End If
- Return False
- ' End Function
- '
+ Return False 'Ohne Sendungsverweis kein eintrag...
+ End Function
+
+
+ Public Sub insertAbgabenTELOTEC(TC As TELOTEC_Worker.cTelotec_Anmeldung)
+ ' MsgBox("aso")
+ If TC.ABGABEN IsNot Nothing Then
+ 'MsgBox(TC.ABGABEN.Count)
+ For Each ABG In TC.ABGABEN
+ If ABG IsNot Nothing AndAlso ABG.Amnt > 0 Then
+ ' MsgBox(ABG.Amnt)
+ Dim ABGABEN As New VERAG_PROG_ALLGEMEIN.cAbgaben(TC.telanm_CRN, ABG.Ty, ABG.Amnt)
+ If Not ABGABEN.hasEntry Then
+ Dim LeistungsNr = ""
+ Dim LeistungsBez = ""
+
+ Dim saveAbgaben = True
+ Select Case ABG.Ty
+ Case "2EU", "2IG", "5EU" ' "2PE",
+ LeistungsNr = "20"
+ Case "B00" 'EUST
+ LeistungsNr = "20"
+ ABGABEN.Status = "A" 'AUSGEBUCHT
+ Case "5EV" '"5EV"--> EV-KONTO!!
+ saveAbgaben = False
+ Case "2DU", "5DU", "5ZO", "5ZZ", "A20", "A30", "A35", "A40", "A45", "C00", "C10", "A00"
+ LeistungsNr = "76"
+ Case Else '1BD,0ML, 0PB, 0PG, 0PS, 1LG, 1ZN, 2AS, 2KO, 2RB, 2SB, 2SI, 2VF, 2VS, 5SI, 5VS, 6AK, 6BE, 6MS, 6SS, 6TS, 6ZW, 9EA, D00,D10,E00
+ LeistungsNr = "482"
+ LeistungsBez = getLeistungsBez(ABG.Ty)
+ End Select
+ If saveAbgaben Then
+
+ ABGABEN.Belegart = ABG.Ty
+ ABGABEN.Betrag = CDbl(ABG.Amnt)
+ ABGABEN.Status = Nothing
+ ABGABEN.LeistungsNr = LeistungsNr
+ ABGABEN.Bezugsnummer = TC.telanm_BezugsNr
+ ABGABEN.Registriernummer = TC.telanm_CRN
+ ' ABGABEN.AOFD = A.KennBuchstabenAufschub
+ ABGABEN.AKTO = TC.Hea_DefPayRef '"3027279" 'd1.Abgabenkonto 'IMEX--> FIX!!!
+ 'ABGABEN.Fälligkeitsdatum = A.Faelligkeit
+ ' ABGABEN.Mandant = "VERG"
+ ABGABEN.Niederlassung = TC.Bereich_ID
+ ABGABEN.Abfertigungsdatum = ABG.Erstelldatum
+ ABGABEN.Übernahmedatum = ABG.Erstelldatum
+ ABGABEN.Eingabedatum = Now.ToShortDateString
+ ABGABEN.Sachbearbeiter = "AUTO"
+ ABGABEN.LeistungsBez = LeistungsBez
+ If If(ABGABEN.Bezugsnummer, "").ToString.Length > 35 Then ABGABEN.Bezugsnummer = ABGABEN.Bezugsnummer.ToString.Substring(0, 35)
+ If If(ABGABEN.Registriernummer, "").ToString.Length > 21 Then ABGABEN.Registriernummer = ABGABEN.Registriernummer.ToString.Substring(0, 21)
+
+ Dim errHInweis = "ATC: " & ABGABEN.Registriernummer & " - BezugsNr: " & ABGABEN.Bezugsnummer
+ ABGABEN.SAVE(errHInweis)
+ End If
+ End If
+ End If
+
+ Next
+ End If
+ End Sub
+
+ Shared Function getLeistungsBez(LeistungsBez)
+ Select Case LeistungsBez
+ Case "0ML"
+ getLeistungsBez = "Altlastenbeitrag"
+ Case "0PB"
+ getLeistungsBez = "Punzierungskontrollgeb. Platin"
+ Case "0PG"
+ getLeistungsBez = "Punzierungskontrollgebühr Gold"
+ Case "0PS"
+ getLeistungsBez = "Punzierungskontrollgeb. Silber"
+ Case "1BD"
+ getLeistungsBez = "Bemessungsdatum"
+ Case "1LG"
+ getLeistungsBez = "Lagergeld gemäß §104 ZollR-DG"
+ Case "1ZK"
+ getLeistungsBez = "Kreditzinsen, Säumniszinsen"
+ Case "1ZN"
+ getLeistungsBez = "Nebenansprüche"
+ Case "2AS"
+ getLeistungsBez = "Agrarsicherheiten"
+ Case "2DU"
+ getLeistungsBez = "Antidumping-Sicherheit"
+ Case "2EU"
+ getLeistungsBez = "EUSt-Sicherheit"
+ Case "2IG"
+ getLeistungsBez = "Sicherheit EUSt ig. Lieferung"
+ Case "2KO"
+ getLeistungsBez = "Sicherheit für Kontingent"
+ Case "2PE"
+ getLeistungsBez = "Sicherheit bei Einfuhrwerten"
+ Case "2RB"
+ getLeistungsBez = "Sicherheit Bürgerschaft"
+ Case "2SB"
+ getLeistungsBez = "Summe der befreiten Sicherheit"
+ Case "2SI"
+ getLeistungsBez = "Sicherheit Geldbetragerlag"
+ Case "2VF"
+ getLeistungsBez = "Sicherheit bei Verifizierung"
+ Case "2VS"
+ getLeistungsBez = "Summe der vorg. Sicherheit"
+ Case "2ZG"
+ getLeistungsBez = "Zusatzzoll Geflügel"
+ Case "2ZZ"
+ getLeistungsBez = "Zusatzzoll Zucker"
+ Case "2ZZ"
+ getLeistungsBez = "Zusatzzoll 2ZZ"
+ Case "5DU"
+ getLeistungsBez = "Antidumping-und Ausgleichszoll"
+ Case "5EU"
+ getLeistungsBez = "Einfuhrumsatzsteuer"
+ Case "5EV"
+ getLeistungsBez = "EUSt gem. §26 Abs. 3Z.2UStG"
+ Case "5SI"
+ getLeistungsBez = "Agrarsicherheit"
+ Case "5VS"
+ getLeistungsBez = "Verbrauchsteuern"
+ Case "5ZO"
+ getLeistungsBez = "Zoll 5ZO"
+ Case "5ZZ"
+ getLeistungsBez = "Zusatzzoll 5ZZ"
+ Case "6AK"
+ getLeistungsBez = "Alkoholsteuer"
+ Case "6BE"
+ getLeistungsBez = "Biersteuer"
+ Case "6MS"
+ getLeistungsBez = "Mineralölsteuer"
+ Case "6SS"
+ getLeistungsBez = "Schaumweinsteuer"
+ Case "6TS"
+ getLeistungsBez = "Tabaksteuer"
+ Case "6ZW"
+ getLeistungsBez = "Zwischenerzeugnissteuer"
+ Case "9EA"
+ getLeistungsBez = "Summe Gesamtabgaben"
+ Case "A00"
+ getLeistungsBez = "Zölle auf gewerbliche Waren"
+ Case "A00"
+ getLeistungsBez = "Zollabgaben"
+ Case "A10"
+ getLeistungsBez = "Zölle landwirt. Erzeugnisse"
+ Case "A20"
+ getLeistungsBez = "Zusatzzölle"
+ Case "A30"
+ getLeistungsBez = "endgültige Antidumpingzölle"
+ Case "A35"
+ getLeistungsBez = "vorläufige Antidumpingzölle"
+ Case "A40"
+ getLeistungsBez = "endgültiger Ausgleichszoll"
+ Case "A45"
+ getLeistungsBez = "vorläufiger Ausgleichszoll"
+ Case "B00"
+ getLeistungsBez = "Einfuhrumsatzsteuer(EUSt)"
+ Case "B10"
+ getLeistungsBez = "Ausgleichszinsen(EUSt)"
+ Case "C00"
+ getLeistungsBez = "Ausfuhrabgaben"
+ Case "C10"
+ getLeistungsBez = "Ausfuhrabg. landwirt. Erzeug."
+ Case "D00"
+ getLeistungsBez = "Verzugszinsen"
+ Case "D10"
+ getLeistungsBez = "Ausgleichszinsen"
+ Case "E00"
+ getLeistungsBez = "Abgaben anderer Länder"
+ Case Else
+ getLeistungsBez = ""
+ End Select
End Function
@@ -380,36 +535,7 @@ Public Class cZOLL_IMPORT
Dim FindPOS = SENDUNG.ABRECHNUNG.Find(Function(x) x.sndabr_beteiligter = "AUFTR" And x.sndabr_wert = "ERSTATTUNG")
If FindPOS IsNot Nothing Then SPEDITIONSBUCH.AuftraggeberBetragKassiert = If(FindPOS.sndabr_preis, 0)
- Try
-
- Dim dt As DataTable = KDSQL.loadDgvBySql("SELECT * FROM ( " &
- " SELECT rksv_BelegId, isnull(rksv_umsatz ,0) as rksv_umsatz, isnull((Select Name from Personal where ID=b.Benutzer),'') as Benutzer FROM [tblEABelegnummer] as b INNER JOIN [tblEABelegposition] as p ON (b.BelegNr = p.BelegNr AND b.BelegDat = p.BelegDat AND b.Benutzer = p.Benutzer AND b.Niederlassung = p.Niederlassung AND b.Mandant = p.Mandant) where b.AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and b.FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and storniert=0 and gebuchtstorno=0 " &
- " UNION " &
- " SELECT rksv_BelegId , sum(p.Betrag) as rksv_umsatz,isnull((Select Name from Personal where ID=b.Benutzer),'') as Benutzer FROM [tblEABelegnummer] as b INNER JOIN [tblEABelegposition] as p ON (b.BelegNr = p.BelegNr AND b.BelegDat = p.BelegDat AND b.Benutzer = p.Benutzer AND b.Niederlassung = p.Niederlassung AND b.Mandant = p.Mandant) where p.AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and p.FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and storniert=0 and gebuchtstorno=0 group by rksv_BelegId,b.Benutzer " &
- " ) as Tb order by rksv_BelegId", "FMZOLL")
- Dim BenutzerTmp = ""
- Dim BelegNrTmp = ""
- Dim BetragTmp As Double = 0
-
- If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
-
- For Each r In dt.Rows
- If BenutzerTmp = "" Then BenutzerTmp = r("Benutzer")
- If r("Benutzer") <> BenutzerTmp Then BenutzerTmp = "Div.Benutzer"
- If (IsNumeric(r("rksv_umsatz"))) Then BetragTmp += r("rksv_umsatz")
- BelegNrTmp &= r("rksv_BelegId") & ","
- Next
- 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
-
- End If
- Catch ex As Exception
- VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "BAR-Err: Beträge konnten nicht geladen werden!", "al@verag.ag", "al@verag.ag")
- End Try
+ SetBarKassiert(SPEDITIONSBUCH)
'If If(SENDUNG.tblSnd_bar, False) Then
'SPEDITIONSBUCH.Bar = True
@@ -584,6 +710,43 @@ Public Class cZOLL_IMPORT
Return SPEDITIONSBUCH
End Function
+
+ Shared Sub SetBarKassiert(ByRef SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch)
+ Try
+
+ Dim KDSQL As New SQL
+ Dim dt As DataTable = KDSQL.loadDgvBySql("SELECT * FROM ( " &
+ " SELECT rksv_BelegId, isnull(rksv_umsatz ,0) as rksv_umsatz, isnull((Select Name from Personal where ID=b.Benutzer),'') as Benutzer FROM [tblEABelegnummer] as b INNER JOIN [tblEABelegposition] as p ON (b.BelegNr = p.BelegNr AND b.BelegDat = p.BelegDat AND b.Benutzer = p.Benutzer AND b.Niederlassung = p.Niederlassung AND b.Mandant = p.Mandant) where b.AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and b.FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and storniert=0 and gebuchtstorno=0 " &
+ " UNION " &
+ " SELECT rksv_BelegId , sum(p.Betrag) as rksv_umsatz,isnull((Select Name from Personal where ID=b.Benutzer),'') as Benutzer FROM [tblEABelegnummer] as b INNER JOIN [tblEABelegposition] as p ON (b.BelegNr = p.BelegNr AND b.BelegDat = p.BelegDat AND b.Benutzer = p.Benutzer AND b.Niederlassung = p.Niederlassung AND b.Mandant = p.Mandant) where p.AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and p.FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and storniert=0 and gebuchtstorno=0 group by rksv_BelegId,b.Benutzer " &
+ " ) as Tb order by rksv_BelegId", "FMZOLL")
+ Dim BenutzerTmp = ""
+ Dim BelegNrTmp = ""
+ Dim BetragTmp As Double = 0
+
+ If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+ For Each r In dt.Rows
+ If BenutzerTmp = "" Then BenutzerTmp = r("Benutzer")
+ If r("Benutzer") <> BenutzerTmp Then BenutzerTmp = "Div.Benutzer"
+ If (IsNumeric(r("rksv_umsatz"))) Then BetragTmp += r("rksv_umsatz")
+ BelegNrTmp &= r("rksv_BelegId") & ","
+ Next
+ 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
+
+ End If
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "BAR-Err: Beträge konnten nicht geladen werden!", "al@verag.ag", "al@verag.ag")
+ End Try
+
+ End Sub
+
+
Shared Function getBenutzerShort(s As String) As String
If s.ToString.Contains(" ") Then
Dim split() = s.ToString.Split(" ")
diff --git a/TELOTEK_Worker_lib/TELOTEC/vifDec.Designer.vb b/TELOTEK_Worker_lib/TELOTEC/vifDec.Designer.vb
index 70c69e4..58072d9 100644
--- a/TELOTEK_Worker_lib/TELOTEC/vifDec.Designer.vb
+++ b/TELOTEK_Worker_lib/TELOTEC/vifDec.Designer.vb
@@ -1,6 +1,6 @@
'' ------------------------------------------------------------------------------
''
-'' Generated by Xsd2Code++. Version 4.4.0.7
+'' Generated by Xsd2Code++. Version 5.0.0.47. www.xsd2code.com
'' vifDecListVisualBasicFalseFalseFalseOnlyIfDifferentFalseNet45AllTrueTrueTrueFalseFalseFalseFalseFalseNoneStartWithUnderscoreFalseFalseFalseFalseFalsePublicTrueFalseFalseFalseFalseFalseFalseFalseFalseTrueTrueTrueFalseTrueSerializeDeserializeSaveToFileLoadFromFileFalseTrueIndent2SpaceFalseFalseUTF8XmlSerializerFalseFalseFalseFalseFalseFalseFalseEntityBaseFalseFalse
''
'' ------------------------------------------------------------------------------
@@ -21,11 +21,11 @@ Namespace vifDec
System.SerializableAttribute(),
System.Diagnostics.DebuggerStepThroughAttribute(),
System.ComponentModel.DesignerCategoryAttribute("code"),
- System.Xml.Serialization.XmlRootAttribute("interfaceData", [Namespace]:="", IsNullable:=False)>
+ System.Xml.Serialization.XmlRootAttribute("interfaceData", [Namespace]:="", IsNullable:=True)>
Partial Public Class InterfaceDataType
#Region "Private fields"
- Private _interfaceType As InterfaceDataTypeInterfaceType
+ Private _interfaceType As String
Private _vifDec As List(Of vifDec)
@@ -37,7 +37,7 @@ Namespace vifDec
Me._vifDec = New List(Of vifDec)()
End Sub
- Public Property interfaceType() As InterfaceDataTypeInterfaceType
+ Public Property interfaceType() As String
Get
Return Me._interfaceType
End Get
@@ -211,15 +211,6 @@ Namespace vifDec
End Function
End Class
-
- Public Enum InterfaceDataTypeInterfaceType
-
- '''
- vifDec
- End Enum
-
+ Public Property CarrTra_Na() As String
+ Get
+ Return Me._carrTra_Na
+ End Get
+ Set
+ Me._carrTra_Na = Value
+ End Set
+ End Property
+
+
+ Public Property CarrTra_Strt() As String
+ Get
+ Return Me._carrTra_Strt
+ End Get
+ Set
+ Me._carrTra_Strt = Value
+ End Set
+ End Property
+
+
+ Public Property CarrTra_Pst() As String
+ Get
+ Return Me._carrTra_Pst
+ End Get
+ Set
+ Me._carrTra_Pst = Value
+ End Set
+ End Property
+
+
+ Public Property CarrTra_Cty() As String
+ Get
+ Return Me._carrTra_Cty
+ End Get
+ Set
+ Me._carrTra_Cty = Value
+ End Set
+ End Property
+
+
+ Public Property CarrTra_Ctry() As String
+ Get
+ Return Me._carrTra_Ctry
+ End Get
+ Set
+ Me._carrTra_Ctry = Value
+ End Set
+ End Property
+
+
+ Public Property CarrTra_TIN() As String
+ Get
+ Return Me._carrTra_TIN
+ End Get
+ Set
+ Me._carrTra_TIN = Value
+ End Set
+ End Property
+
Public Property vifDecAdjust() As List(Of vifDecAdjust)
Get
@@ -1733,6 +1799,16 @@ Namespace vifDec
End Set
End Property
+
+ Public Property vifDecTotDuties() As List(Of vifDecTotDuties)
+ Get
+ Return Me._vifDecTotDuties
+ End Get
+ Set
+ Me._vifDecTotDuties = Value
+ End Set
+ End Property
+
Private Shared ReadOnly Property Serializer() As XmlSerializer
Get
If (sSerializer Is Nothing) Then
@@ -2228,6 +2304,274 @@ Namespace vifDec
End Function
End Class
+
+ Partial Public Class vifDecTotDuties
+
+#Region "Private fields"
+ Private _mandant_ID As String
+
+ Private _bereich_ID As String
+
+ Private _referenz_ID As String
+
+ Private _comIndicator As Byte
+
+ Private _totDuties_ID As Integer
+
+ Private _ty As String
+
+ Private _amnt As System.Nullable(Of Double)
+
+ Private _tyInd As String
+
+ Private _erstelldatum As System.Nullable(Of Date)
+
+ Private Shared sSerializer As XmlSerializer
+#End Region
+
+ Public Property Mandant_ID() As String
+ Get
+ Return Me._mandant_ID
+ End Get
+ Set
+ Me._mandant_ID = Value
+ End Set
+ End Property
+
+ Public Property Bereich_ID() As String
+ Get
+ Return Me._bereich_ID
+ End Get
+ Set
+ Me._bereich_ID = Value
+ End Set
+ End Property
+
+ Public Property Referenz_ID() As String
+ Get
+ Return Me._referenz_ID
+ End Get
+ Set
+ Me._referenz_ID = Value
+ End Set
+ End Property
+
+ Public Property ComIndicator() As Byte
+ Get
+ Return Me._comIndicator
+ End Get
+ Set
+ Me._comIndicator = Value
+ End Set
+ End Property
+
+ Public Property TotDuties_ID() As Integer
+ Get
+ Return Me._totDuties_ID
+ End Get
+ Set
+ Me._totDuties_ID = Value
+ End Set
+ End Property
+
+
+ Public Property Ty() As String
+ Get
+ Return Me._ty
+ End Get
+ Set
+ Me._ty = Value
+ End Set
+ End Property
+
+
+ Public Property Amnt() As System.Nullable(Of Double)
+ Get
+ Return Me._amnt
+ End Get
+ Set
+ Me._amnt = Value
+ End Set
+ End Property
+
+
+ Public Property TyInd() As String
+ Get
+ Return Me._tyInd
+ End Get
+ Set
+ Me._tyInd = Value
+ End Set
+ End Property
+
+
+ Public Property Erstelldatum() As System.Nullable(Of Date)
+ Get
+ Return Me._erstelldatum
+ End Get
+ Set
+ Me._erstelldatum = Value
+ End Set
+ End Property
+
+ Private Shared ReadOnly Property Serializer() As XmlSerializer
+ Get
+ If (sSerializer Is Nothing) Then
+ sSerializer = New XmlSerializerFactory().CreateSerializer(GetType(vifDecTotDuties))
+ End If
+ Return sSerializer
+ End Get
+ End Property
+
+#Region "Serialize/Deserialize"
+ '''
+ ''' Serializes current vifDecTotDuties object into an XML string
+ '''
+ ''' string XML value
+ Public Overridable Function Serialize() As String
+ Dim streamReader As System.IO.StreamReader = Nothing
+ Dim memoryStream As System.IO.MemoryStream = Nothing
+ Try
+ memoryStream = New System.IO.MemoryStream()
+ Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+ xmlWriterSettings.Indent = True
+ xmlWriterSettings.IndentChars = " "
+ Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
+ Serializer.Serialize(xmlWriter, Me)
+ memoryStream.Seek(0, SeekOrigin.Begin)
+ streamReader = New System.IO.StreamReader(memoryStream)
+ Return streamReader.ReadToEnd
+ Finally
+ If (Not (streamReader) Is Nothing) Then
+ streamReader.Dispose()
+ End If
+ If (Not (memoryStream) Is Nothing) Then
+ memoryStream.Dispose()
+ End If
+ End Try
+ End Function
+
+ '''
+ ''' Deserializes workflow markup into an vifDecTotDuties object
+ '''
+ ''' string workflow markup to deserialize
+ ''' Output vifDecTotDuties object
+ ''' output Exception value if deserialize failed
+ ''' true if this Serializer can deserialize the object; otherwise, false
+ Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As vifDecTotDuties, ByRef exception As System.Exception) As Boolean
+ exception = Nothing
+ obj = CType(Nothing, vifDecTotDuties)
+ Try
+ obj = Deserialize(input)
+ Return True
+ Catch ex As System.Exception
+ exception = ex
+ Return False
+ End Try
+ End Function
+
+ Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As vifDecTotDuties) As Boolean
+ Dim exception As System.Exception = Nothing
+ Return Deserialize(input, obj, exception)
+ End Function
+
+ Public Overloads Shared Function Deserialize(ByVal input As String) As vifDecTotDuties
+ Dim stringReader As System.IO.StringReader = Nothing
+ Try
+ stringReader = New System.IO.StringReader(input)
+ Return CType(Serializer.Deserialize(XmlReader.Create(stringReader)), vifDecTotDuties)
+ Finally
+ If (Not (stringReader) Is Nothing) Then
+ stringReader.Dispose()
+ End If
+ End Try
+ End Function
+
+ Public Overloads Shared Function Deserialize(ByVal s As System.IO.Stream) As vifDecTotDuties
+ Return CType(Serializer.Deserialize(s), vifDecTotDuties)
+ End Function
+#End Region
+
+ '''
+ ''' Serializes current vifDecTotDuties object into file
+ '''
+ ''' full path of outupt xml file
+ ''' output Exception value if failed
+ ''' true if can serialize and save into file; otherwise, false
+ Public Overridable Overloads Function SaveToFile(ByVal fileName As String, ByRef exception As System.Exception) As Boolean
+ exception = Nothing
+ Try
+ SaveToFile(fileName)
+ Return True
+ Catch e As System.Exception
+ exception = e
+ Return False
+ End Try
+ End Function
+
+ Public Overridable Overloads Sub SaveToFile(ByVal fileName As String)
+ Dim streamWriter As System.IO.StreamWriter = Nothing
+ Try
+ Dim xmlString As String = Serialize()
+ Dim xmlFile As System.IO.FileInfo = New System.IO.FileInfo(fileName)
+ streamWriter = xmlFile.CreateText
+ streamWriter.WriteLine(xmlString)
+ streamWriter.Close()
+ Finally
+ If (Not (streamWriter) Is Nothing) Then
+ streamWriter.Dispose()
+ End If
+ End Try
+ End Sub
+
+ '''
+ ''' Deserializes xml markup from file into an vifDecTotDuties object
+ '''
+ ''' string xml file to load and deserialize
+ ''' Output vifDecTotDuties object
+ ''' output Exception value if deserialize failed
+ ''' true if this Serializer can deserialize the object; otherwise, false
+ Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As vifDecTotDuties, ByRef exception As System.Exception) As Boolean
+ exception = Nothing
+ obj = CType(Nothing, vifDecTotDuties)
+ Try
+ obj = LoadFromFile(fileName)
+ Return True
+ Catch ex As System.Exception
+ exception = ex
+ Return False
+ End Try
+ End Function
+
+ Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As vifDecTotDuties) As Boolean
+ Dim exception As System.Exception = Nothing
+ Return LoadFromFile(fileName, obj, exception)
+ End Function
+
+ Public Overloads Shared Function LoadFromFile(ByVal fileName As String) As vifDecTotDuties
+ Dim file As System.IO.FileStream = Nothing
+ Dim sr As System.IO.StreamReader = Nothing
+ Try
+ file = New System.IO.FileStream(fileName, FileMode.Open, FileAccess.Read)
+ sr = New System.IO.StreamReader(file)
+ Dim xmlString As String = sr.ReadToEnd
+ sr.Close()
+ file.Close()
+ Return Deserialize(xmlString)
+ Finally
+ If (Not (file) Is Nothing) Then
+ file.Dispose()
+ End If
+ If (Not (sr) Is Nothing) Then
+ sr.Dispose()
+ End If
+ End Try
+ End Function
+ End Class
+
+ Partial Public Class vifDecDutyCalc
+
+#Region "Private fields"
+ Private _mandant_ID As String
+
+ Private _bereich_ID As String
+
+ Private _referenz_ID As String
+
+ Private _comIndicator As Byte
+
+ Private _pos_ID As Integer
+
+ Private _dutyCalc_ID As Integer
+
+ Private _ty As String
+
+ Private _baseD As System.Nullable(Of Date)
+
+ Private _curr As String
+
+ Private _unit As String
+
+ Private _base As System.Nullable(Of Double)
+
+ Private _rate As String
+
+ Private _rateUsed As String
+
+ Private _amnt As System.Nullable(Of Double)
+
+ Private _meaID As System.Nullable(Of Integer)
+
+ Private _tyInd As String
+
+ Private Shared sSerializer As XmlSerializer
+#End Region
+
+ Public Property Mandant_ID() As String
+ Get
+ Return Me._mandant_ID
+ End Get
+ Set
+ Me._mandant_ID = Value
+ End Set
+ End Property
+
+ Public Property Bereich_ID() As String
+ Get
+ Return Me._bereich_ID
+ End Get
+ Set
+ Me._bereich_ID = Value
+ End Set
+ End Property
+
+ Public Property Referenz_ID() As String
+ Get
+ Return Me._referenz_ID
+ End Get
+ Set
+ Me._referenz_ID = Value
+ End Set
+ End Property
+
+ Public Property ComIndicator() As Byte
+ Get
+ Return Me._comIndicator
+ End Get
+ Set
+ Me._comIndicator = Value
+ End Set
+ End Property
+
+ Public Property Pos_ID() As Integer
+ Get
+ Return Me._pos_ID
+ End Get
+ Set
+ Me._pos_ID = Value
+ End Set
+ End Property
+
+ Public Property DutyCalc_ID() As Integer
+ Get
+ Return Me._dutyCalc_ID
+ End Get
+ Set
+ Me._dutyCalc_ID = Value
+ End Set
+ End Property
+
+
+ Public Property Ty() As String
+ Get
+ Return Me._ty
+ End Get
+ Set
+ Me._ty = Value
+ End Set
+ End Property
+
+
+ Public Property BaseD() As System.Nullable(Of Date)
+ Get
+ Return Me._baseD
+ End Get
+ Set
+ Me._baseD = Value
+ End Set
+ End Property
+
+
+ Public Property Curr() As String
+ Get
+ Return Me._curr
+ End Get
+ Set
+ Me._curr = Value
+ End Set
+ End Property
+
+
+ Public Property Unit() As String
+ Get
+ Return Me._unit
+ End Get
+ Set
+ Me._unit = Value
+ End Set
+ End Property
+
+
+ Public Property Base() As System.Nullable(Of Double)
+ Get
+ Return Me._base
+ End Get
+ Set
+ Me._base = Value
+ End Set
+ End Property
+
+
+ Public Property Rate() As String
+ Get
+ Return Me._rate
+ End Get
+ Set
+ Me._rate = Value
+ End Set
+ End Property
+
+
+ Public Property RateUsed() As String
+ Get
+ Return Me._rateUsed
+ End Get
+ Set
+ Me._rateUsed = Value
+ End Set
+ End Property
+
+
+ Public Property Amnt() As System.Nullable(Of Double)
+ Get
+ Return Me._amnt
+ End Get
+ Set
+ Me._amnt = Value
+ End Set
+ End Property
+
+
+ Public Property MeaID() As System.Nullable(Of Integer)
+ Get
+ Return Me._meaID
+ End Get
+ Set
+ Me._meaID = Value
+ End Set
+ End Property
+
+
+ Public Property TyInd() As String
+ Get
+ Return Me._tyInd
+ End Get
+ Set
+ Me._tyInd = Value
+ End Set
+ End Property
+
+ Private Shared ReadOnly Property Serializer() As XmlSerializer
+ Get
+ If (sSerializer Is Nothing) Then
+ sSerializer = New XmlSerializerFactory().CreateSerializer(GetType(vifDecDutyCalc))
+ End If
+ Return sSerializer
+ End Get
+ End Property
+
+#Region "Serialize/Deserialize"
+ '''
+ ''' Serializes current vifDecDutyCalc object into an XML string
+ '''
+ ''' string XML value
+ Public Overridable Function Serialize() As String
+ Dim streamReader As System.IO.StreamReader = Nothing
+ Dim memoryStream As System.IO.MemoryStream = Nothing
+ Try
+ memoryStream = New System.IO.MemoryStream()
+ Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+ xmlWriterSettings.Indent = True
+ xmlWriterSettings.IndentChars = " "
+ Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
+ Serializer.Serialize(xmlWriter, Me)
+ memoryStream.Seek(0, SeekOrigin.Begin)
+ streamReader = New System.IO.StreamReader(memoryStream)
+ Return streamReader.ReadToEnd
+ Finally
+ If (Not (streamReader) Is Nothing) Then
+ streamReader.Dispose()
+ End If
+ If (Not (memoryStream) Is Nothing) Then
+ memoryStream.Dispose()
+ End If
+ End Try
+ End Function
+
+ '''
+ ''' Deserializes workflow markup into an vifDecDutyCalc object
+ '''
+ ''' string workflow markup to deserialize
+ ''' Output vifDecDutyCalc object
+ ''' output Exception value if deserialize failed
+ ''' true if this Serializer can deserialize the object; otherwise, false
+ Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As vifDecDutyCalc, ByRef exception As System.Exception) As Boolean
+ exception = Nothing
+ obj = CType(Nothing, vifDecDutyCalc)
+ Try
+ obj = Deserialize(input)
+ Return True
+ Catch ex As System.Exception
+ exception = ex
+ Return False
+ End Try
+ End Function
+
+ Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As vifDecDutyCalc) As Boolean
+ Dim exception As System.Exception = Nothing
+ Return Deserialize(input, obj, exception)
+ End Function
+
+ Public Overloads Shared Function Deserialize(ByVal input As String) As vifDecDutyCalc
+ Dim stringReader As System.IO.StringReader = Nothing
+ Try
+ stringReader = New System.IO.StringReader(input)
+ Return CType(Serializer.Deserialize(XmlReader.Create(stringReader)), vifDecDutyCalc)
+ Finally
+ If (Not (stringReader) Is Nothing) Then
+ stringReader.Dispose()
+ End If
+ End Try
+ End Function
+
+ Public Overloads Shared Function Deserialize(ByVal s As System.IO.Stream) As vifDecDutyCalc
+ Return CType(Serializer.Deserialize(s), vifDecDutyCalc)
+ End Function
+#End Region
+
+ '''
+ ''' Serializes current vifDecDutyCalc object into file
+ '''
+ ''' full path of outupt xml file
+ ''' output Exception value if failed
+ ''' true if can serialize and save into file; otherwise, false
+ Public Overridable Overloads Function SaveToFile(ByVal fileName As String, ByRef exception As System.Exception) As Boolean
+ exception = Nothing
+ Try
+ SaveToFile(fileName)
+ Return True
+ Catch e As System.Exception
+ exception = e
+ Return False
+ End Try
+ End Function
+
+ Public Overridable Overloads Sub SaveToFile(ByVal fileName As String)
+ Dim streamWriter As System.IO.StreamWriter = Nothing
+ Try
+ Dim xmlString As String = Serialize()
+ Dim xmlFile As System.IO.FileInfo = New System.IO.FileInfo(fileName)
+ streamWriter = xmlFile.CreateText
+ streamWriter.WriteLine(xmlString)
+ streamWriter.Close()
+ Finally
+ If (Not (streamWriter) Is Nothing) Then
+ streamWriter.Dispose()
+ End If
+ End Try
+ End Sub
+
+ '''
+ ''' Deserializes xml markup from file into an vifDecDutyCalc object
+ '''
+ ''' string xml file to load and deserialize
+ ''' Output vifDecDutyCalc object
+ ''' output Exception value if deserialize failed
+ ''' true if this Serializer can deserialize the object; otherwise, false
+ Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As vifDecDutyCalc, ByRef exception As System.Exception) As Boolean
+ exception = Nothing
+ obj = CType(Nothing, vifDecDutyCalc)
+ Try
+ obj = LoadFromFile(fileName)
+ Return True
+ Catch ex As System.Exception
+ exception = ex
+ Return False
+ End Try
+ End Function
+
+ Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As vifDecDutyCalc) As Boolean
+ Dim exception As System.Exception = Nothing
+ Return LoadFromFile(fileName, obj, exception)
+ End Function
+
+ Public Overloads Shared Function LoadFromFile(ByVal fileName As String) As vifDecDutyCalc
+ Dim file As System.IO.FileStream = Nothing
+ Dim sr As System.IO.StreamReader = Nothing
+ Try
+ file = New System.IO.FileStream(fileName, FileMode.Open, FileAccess.Read)
+ sr = New System.IO.StreamReader(file)
+ Dim xmlString As String = sr.ReadToEnd
+ sr.Close()
+ file.Close()
+ Return Deserialize(xmlString)
+ Finally
+ If (Not (file) Is Nothing) Then
+ file.Dispose()
+ End If
+ If (Not (sr) Is Nothing) Then
+ sr.Dispose()
+ End If
+ End Try
+ End Function
+ End Class
+
+ Public Property vifDecDutyCalc() As List(Of vifDecDutyCalc)
+ Get
+ Return Me._vifDecDutyCalc
+ End Get
+ Set
+ Me._vifDecDutyCalc = Value
+ End Set
+ End Property
+
Private Shared ReadOnly Property Serializer() As XmlSerializer
Get
If (sSerializer Is Nothing) Then
diff --git a/TELOTEK_Worker_lib/TELOTEC/vifDec.xsd b/TELOTEK_Worker_lib/TELOTEC/vifDec.xsd
index ae344e7..716ba82 100644
--- a/TELOTEK_Worker_lib/TELOTEC/vifDec.xsd
+++ b/TELOTEK_Worker_lib/TELOTEC/vifDec.xsd
@@ -1,16 +1,10 @@
-
+
-
-
-
-
-
-
-
-
+
+
@@ -137,9 +131,16 @@
+
+
+
+
+
+
+
@@ -192,6 +193,7 @@
+
@@ -276,6 +278,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -292,6 +314,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -453,6 +488,13 @@
+
+
+
+
+
+
+
diff --git a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj
index 0531370..7c62f7d 100644
--- a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj
+++ b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj
@@ -65,6 +65,7 @@
+
diff --git a/TELOTEK_Worker_lib/cTC_Functions.vb b/TELOTEK_Worker_lib/cTC_Functions.vb
new file mode 100644
index 0000000..ae874a5
--- /dev/null
+++ b/TELOTEK_Worker_lib/cTC_Functions.vb
@@ -0,0 +1,425 @@
+Imports Renci.SshNet
+Imports System.IO
+
+Public Class cTC_Functions
+
+
+ Shared Function send_Data_To_TC(file, dySt_BezugsNr, dy_Id, FRIMA_DY)
+ Try
+ 'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_DakosyZA_Senden", "AVISO") Then
+ ' MsgBox("Sie haben keine Sendeberechtigung.")
+ ' Return False
+ 'End If
+
+ If Not IO.File.Exists(file) Then Return False
+ Dim fi As New System.IO.FileInfo(file)
+ Dim UPLOAD_PFAD = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("TELOTEC_PFAD_SEND", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
+
+
+ Dim destFilenameTMP = UPLOAD_PFAD + "." & If(IO.File.Exists(UPLOAD_PFAD & "." & fi.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & fi.Name
+
+ 'Datei hochladen
+ IO.File.Copy(file, destFilenameTMP)
+ ' If IO.File.Exists(destFilenameTMP) Then IO.File.Delete(F) 'Datei nach erfolgreichem Herunterladen vom Server löschen
+
+ 'Gültiger Filename
+ Dim destFilename = UPLOAD_PFAD & If(IO.File.Exists(UPLOAD_PFAD & fi.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & fi.Name
+ IO.File.Move(destFilenameTMP, destFilename) 'Datei umbenennen
+
+
+ 'Dim STATUS As New TELOTEC_Worker.cTC_Status
+ 'STATUS.dySt_BezugsNr = dySt_BezugsNr
+ 'STATUS.dySt_artMitteilung = "VERAG_SND"
+ 'STATUS.dySt_dyArt = "" '"NCTS" 'T1/T2
+
+ 'STATUS.dySt_status = TELOTEC_Worker.cDY_Statusliste.S_03
+ ''STATUS.dySt_ergCode = "ANR"
+ 'STATUS.dySt_ergCode = "SND"
+ 'STATUS.dySt_ergMitteilung = "An Dakosy gesendet"
+ 'STATUS.dySt_ergZeitpunkt = Now
+
+ 'STATUS.dySt_dyId = dy_Id
+ 'STATUS.SAVE()
+
+ Return True
+ Catch ex As Exception
+ MsgBox(ex.Message & ex.StackTrace)
+ Return False
+ End Try
+ End Function
+
+ 'Shared Function send_Data_To_Dakosy_FTP_file(file, FRIMA_DY, Optional misc = False)
+ ' Try
+ ' If Not IO.File.Exists(file) Then Return False
+ ' Dim F As New System.IO.FileInfo(file)
+
+ ' Dim DY_server = ""
+ ' Dim DY_name = ""
+ ' Dim DY_pwd = ""
+ ' Dim DY_port = ""
+ ' Dim DY_PFAD_IN = ""
+ ' Dim DY_PFAD_IN_KD = ""
+
+ ' If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "" Then VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
+ ' If FRIMA_DY = "" Then FRIMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+ ' getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY)
+
+ ' Dim ConnectionInfo As New ConnectionInfo(DY_server, DY_port, DY_name, New PasswordAuthenticationMethod(DY_name, DY_pwd))
+ ' Using client = New SftpClient(ConnectionInfo)
+ ' client.Connect()
+ ' 'client.Create(file, file)
+ ' If misc Then
+ ' client.ChangeDirectory(DY_PFAD_IN_KD) 'DY_PFAD_IN.Replace("gebox", "misc"))
+ ' Else
+ ' client.ChangeDirectory(DY_PFAD_IN)
+ ' End If
+
+ ' If IO.File.Exists(file) Then
+ ' 'MsgBox(file)
+ ' Using uplfileStream = System.IO.File.OpenRead(file)
+ ' client.UploadFile(uplfileStream, "." & F.Name, True)
+ ' client.RenameFile("." & F.Name, F.Name)
+ ' End Using
+ ' client.Disconnect()
+ ' Else
+ ' MsgBox("Sendedatei nicht gefunden!")
+ ' End If
+
+
+ ' End Using
+
+ ' Return True
+ ' Catch ex As Exception
+ ' MsgBox(ex.Message & ex.StackTrace)
+ ' Return False
+ ' End Try
+ 'End Function
+
+
+
+
+ Shared Function getKDData() As DataTable
+ Dim sqlstr = "SELECT TOP 999 * "
+ sqlstr &= " ,(SELECT TOP 1 [Länderverzeichnis für die Außenhandelsstatistik].LandKz AS LandKzISO2 FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN Währungstabelle ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = Währungstabelle.Währungsschlüssel"
+ sqlstr &= " WHERE Währungstabelle.LandKz=[Adressen].LandKz) as LandKzISO2"
+ sqlstr &= " FROM [Kunden] inner join Adressen on AdressenNr=KundenNr"
+ sqlstr &= " where DakosyExport Is null And EORITIN Is Not null"
+ 'sqlstr &= " and KundenNrZentrale=KundenNr "
+ sqlstr &= " and Auswahl='A' "
+ sqlstr &= " order by Kunden.[Geändert am] desc"
+ ' MsgBox(sqlstr)
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ Return SQL.loadDgvBySql(sqlstr, "FMZOLL")
+ End Function
+
+ Shared Function getKDDataByKdNr(KdNR As Integer) As DataTable
+ Dim sqlstr = "SELECT TOP 1 * "
+ sqlstr &= " ,(SELECT TOP 1 [Länderverzeichnis für die Außenhandelsstatistik].LandKz AS LandKzISO2 FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN Währungstabelle ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = Währungstabelle.Währungsschlüssel"
+ sqlstr &= " WHERE Währungstabelle.LandKz=[Adressen].LandKz) as LandKzISO2"
+ sqlstr &= " FROM [Kunden] inner join Adressen on AdressenNr=KundenNr"
+ sqlstr &= " where " '/*DakosyExport Is null And EORITIN Is Not null */"
+ sqlstr &= " KundenNr='" & KdNR & "' "
+ sqlstr &= " order by Kunden.[Geändert am] desc"
+ ' MsgBox(sqlstr)
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ Return SQL.loadDgvBySql(sqlstr, "FMZOLL")
+ End Function
+
+
+ Shared Function updateKdDakosyExportDate(KdNR As Integer) As Boolean
+ Dim sqlstr = "update [Kunden] SET [DakosyExport]=getDate() WHERE KundenNr='" & KdNR & "' "
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ Return SQL.doSQL(sqlstr, "FMZOLL")
+ End Function
+
+
+ 'Shared Function sendData(Optional defaultFolder As String = "") ', Optional Dakosy_Mandant As String = "VERG")
+ ' Dim Dakosy_Mandant = "VERG"
+ ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+ ' Case "UNISPED" : Dakosy_Mandant = "UNAT"
+ ' 'Case Else
+ ' ' Dakosy_Mandant = "VERG"
+ ' End Select
+
+ ' Dim dt = TELOTEC_Worker.cTC_Functions.getKDData
+
+ ' If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+ ' Dim saveFile = ""
+ ' If TELOTEC_Worker.cTC_Functions.generateVERAGKdData(dt, getDefaultFolder_SEND, saveFile, Dakosy_Mandant) Then
+ ' If cTC_Functions.send_Data_To_Dakosy_FTP_file(saveFile, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, True) Then
+ ' For Each ROW As DataRow In dt.Rows
+ ' updateKdDakosyExportDate(ROW("KundenNr"))
+ ' Next
+ ' Return True
+ ' End If
+ ' End If
+ ' End If
+ ' Return False
+ 'End Function
+
+ 'Shared Function sendDataByKdNr(KdNr As Integer, Optional defaultFolder As String = "") ', Optional Dakosy_Mandant As String = "VERG")
+ ' Dim Dakosy_Mandant = "VERG"
+ ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+ ' Case "UNISPED" : Dakosy_Mandant = "UNAT"
+ ' 'Case Else
+ ' ' Dakosy_Mandant = "VERG"
+ ' End Select
+
+ ' 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
+ ' ' MsgBox("Übertrag derzeit nicht möglich!")
+ ' ' Return False
+ ' 'End If
+ ' Dim dt = TELOTEC_Worker.cTC_Functions.getKDDataByKdNr(KdNr)
+
+ ' If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+ ' Dim saveFile = ""
+ ' If TELOTEC_Worker.cTC_Functions.generateVERAGKdData(dt, getDefaultFolder_SEND, saveFile, Dakosy_Mandant) Then
+ ' If cTC_Functions.send_Data_To_Dakosy_FTP_file(saveFile, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, True) Then
+ ' updateKdDakosyExportDate(KdNr)
+ ' Return True
+ ' End If
+ ' End If
+ ' End If
+ ' Return False
+ 'End Function
+
+ Shared Function getDefaultFolder_SEND() As String
+ Try
+ getDefaultFolder_SEND = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir(False) & "TELOTEC\" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TESTSYSTEM", "ECHTSYSTEM") & "\Ausgang_Kundendaten\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\" ' Path.GetTempPath
+ If Not IO.Directory.Exists(getDefaultFolder_SEND) Then
+ IO.Directory.CreateDirectory(getDefaultFolder_SEND)
+ End If
+ Catch ex As Exception
+ Try
+ getDefaultFolder_SEND = "C:\TEMP\" ' Path.GetTempPath
+ If Not IO.Directory.Exists(getDefaultFolder_SEND) Then
+ IO.Directory.CreateDirectory(getDefaultFolder_SEND)
+ End If
+ Catch ex2 As Exception
+ MsgBox(ex2.Message & ex2.StackTrace)
+ getDefaultFolder_SEND = ""
+ End Try
+ End Try
+
+ End Function
+
+ 'Shared Function generateVERAGKdData(dt As DataTable, path As String, ByRef saveFile As String, Optional Dakosy_Mandant As String = "VERG") As Boolean
+ ' Return generateVERAGKdData_V2(dt, path, saveFile, Dakosy_Mandant)
+ ' 'Alle mit V2
+ ' '---------------------
+
+ ' If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then Return generateVERAGKdData_V2(dt, path, saveFile, Dakosy_Mandant)
+ ' Select Case Dakosy_Mandant
+ ' Case "UNAT" : Return generateVERAGKdData_V2(dt, path, saveFile, Dakosy_Mandant)
+ ' Case Else : Return generateVERAGKdData_V1(dt, path, saveFile, Dakosy_Mandant)
+ ' End Select
+ 'End Function
+
+
+ 'Shared Function generateVERAGKdData_V1(dt As DataTable, path As String, ByRef saveFile As String, Optional Dakosy_Mandant As String = "VERG") As Boolean
+ ' Try
+
+ ' Dim Interface_VERSION = "003"
+
+ ' Dim XML As New TELOTEC_Worker.VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORT
+
+ ' For Each ROW As DataRow In dt.Rows
+ ' Dim KD As New TELOTEC_Worker.VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDaten
+ ' KD.Dakosy_Mandant = Dakosy_Mandant
+ ' KD.KundenNr = ROW("KundenNr")
+ ' KD.EORI = ROW("EORITIN")
+ ' If ROW("EORITIN_NL") Is DBNull.Value OrElse If(ROW("EORITIN_NL"), "") = "" Then
+ ' KD.EORI_Niederlassung = "0000"
+ ' Else
+ ' KD.EORI_Niederlassung = ROW("EORITIN_NL")
+ ' End If
+ ' If ROW("Ordnungsbegriff") IsNot DBNull.Value Then KD.Kurzname = ROW("Ordnungsbegriff")
+ ' If ROW("Name 1") IsNot DBNull.Value Then KD.Name1 = ROW("Name 1")
+
+ ' If ROW("Name 2") IsNot DBNull.Value Then KD.Name2 = ROW("Name 2")
+ ' If ROW("UstIdKz") IsNot DBNull.Value And ("UstIdNr") IsNot DBNull.Value Then KD.UID_Nr = ROW("UstIdKz") & ROW("UstIdNr")
+
+ ' KD.Adresse = New TELOTEC_Worker.VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDatenAdresse
+ ' If ROW("Straße") IsNot DBNull.Value Then KD.Adresse.Strasse = ROW("Straße")
+ ' If ROW("PLZ") IsNot DBNull.Value Then KD.Adresse.Plz = ROW("PLZ")
+ ' If ROW("Ort") IsNot DBNull.Value Then KD.Adresse.Ort = ROW("Ort")
+ ' If ROW("LandKz") IsNot DBNull.Value Then KD.Adresse.LandKz = ROW("LandKzISO2")
+
+
+
+
+ ' KD.Kontakt = New TELOTEC_Worker.VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDatenKontakt
+ ' If ROW("E-Mail") IsNot DBNull.Value Then KD.Kontakt.EMail = ROW("E-Mail")
+ ' If ROW("Telefon") IsNot DBNull.Value Then KD.Kontakt.Tel = ROW("Telefon")
+ ' If ROW("Telefax") IsNot DBNull.Value Then KD.Kontakt.Fax = ROW("Telefax")
+ ' If ROW("Ansprechpartner") IsNot DBNull.Value Then KD.Kontakt.Ansprechpartner = If(ROW("Anrede") IsNot DBNull.Value, ROW("Anrede") & " ", "") & ROW("Ansprechpartner")
+
+
+ ' Dim KD_AKTO = VERAG_PROG_ALLGEMEIN.cKundenAufschubkonten.LOAD_ListAufschubKTOByKdNr(KD.KundenNr)
+
+ ' If KD_AKTO IsNot Nothing Then
+ ' Dim AKTOLIST = New List(Of VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDatenAufschub)
+
+ ' For Each KTO In KD_AKTO
+ ' If If(KTO.kdAkto_bin, "").ToString.Trim <> String.Empty And
+ ' If(KTO.kdAkto_eori, "").ToString.Trim <> String.Empty And
+ ' If(KTO.kdAkto_hauptzollamt, "").ToString.Trim <> String.Empty And
+ ' If(KTO.kdAkto_kontonummer, "").ToString.Trim <> String.Empty Then
+
+
+ ' Dim AUFSCH As New TELOTEC_Worker.VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDatenAufschub
+ ' Select Case KTO.kdAkto_art
+ ' Case "10" : AUFSCH.Art = VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item10
+ ' Case "15" : AUFSCH.Art = VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item15
+ ' Case "20" : AUFSCH.Art = VERAG_KundenStamm_Export.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item20
+ ' End Select
+
+ ' AUFSCH.BIN = KTO.kdAkto_bin
+ ' AUFSCH.EORI = KTO.kdAkto_eori
+ ' If KTO.kdAkto_eoriNL IsNot Nothing Then AUFSCH.EORI_Niederlassung = KTO.kdAkto_eoriNL Else AUFSCH.EORI_Niederlassung = "0000"
+ ' AUFSCH.Hauptzollamt = KTO.kdAkto_hauptzollamt
+ ' AUFSCH.KontoNr = KTO.kdAkto_kontonummer
+
+ ' AKTOLIST.Add(AUFSCH)
+ ' If AKTOLIST.Count = 2 Then Exit For 'max. 2 Aufschub
+ ' End If
+ ' Next
+ ' If AKTOLIST.Count > 0 Then KD.Aufschubkonten = AKTOLIST
+ ' End If
+
+ ' XML.KundenDaten.Add(KD)
+
+ ' Next
+
+ ' Dim saveDir = path
+ ' If Not IO.Directory.Exists(saveDir) Then
+ ' IO.Directory.CreateDirectory(saveDir)
+ ' End If
+ ' Dim counter = 1
+ ' While IO.File.Exists(saveDir & "VERAG_KD_" & counter.ToString("D4") & ".xml")
+ ' counter += 1
+ ' End While
+ ' saveFile = saveDir & "VERAG_KD_" & counter.ToString("D4") & ".xml"
+
+ ' XML.SaveToFile(saveFile)
+
+ ' Return True
+
+ ' Catch ex As Exception
+ ' MsgBox(ex.Message & ex.StackTrace)
+ ' Return False
+ ' End Try
+ 'End Function
+
+
+ 'Shared Function generateVERAGKdData_V2(dt As DataTable, path As String, ByRef saveFile As String, Optional Dakosy_Mandant As String = "VERG") As Boolean
+ ' Try
+
+ ' 'Dim Interface_VERSION = "003"
+
+ ' Dim XML As New TELOTEC_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORT
+
+ ' Dim TRANS As New TELOTEC_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTTransaktion
+ ' TRANS.Version = "002"
+ ' TRANS.IOPartner = Dakosy_Mandant
+
+ ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+ ' Case "IMEX" : TRANS.IODivision1 = "IMEX"
+ ' Case "UNISPED" : TRANS.IODivision1 = "UNAT" : TRANS.IOPartner = "UNAT"
+ ' Case "ATILLA" : TRANS.IODivision1 = "ATIL"
+ ' Case Else
+ ' TRANS.IODivision1 = "VERG"
+ ' End Select
+ ' XML.Transaktion = TRANS
+
+
+ ' For Each ROW As DataRow In dt.Rows
+ ' Dim KD As New TELOTEC_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDaten
+ ' KD.Dakosy_Mandant = Dakosy_Mandant
+ ' KD.KundenNr = ROW("KundenNr")
+ ' KD.EORI = ROW("EORITIN")
+ ' If ROW("EORITIN_NL") Is DBNull.Value OrElse If(ROW("EORITIN_NL"), "") = "" Then
+ ' KD.EORI_Niederlassung = "0000"
+ ' Else
+ ' KD.EORI_Niederlassung = ROW("EORITIN_NL")
+ ' End If
+ ' If ROW("Ordnungsbegriff") IsNot DBNull.Value Then KD.Kurzname = ROW("Ordnungsbegriff")
+ ' If ROW("Name 1") IsNot DBNull.Value Then KD.Name1 = ROW("Name 1")
+
+ ' If ROW("Name 2") IsNot DBNull.Value Then KD.Name2 = ROW("Name 2")
+ ' If ROW("UstIdKz") IsNot DBNull.Value And ("UstIdNr") IsNot DBNull.Value Then KD.UID_Nr = ROW("UstIdKz") & ROW("UstIdNr")
+
+ ' KD.Adresse = New TELOTEC_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAdresse
+ ' If ROW("Straße") IsNot DBNull.Value Then KD.Adresse.Strasse = ROW("Straße")
+ ' If ROW("PLZ") IsNot DBNull.Value Then KD.Adresse.Plz = ROW("PLZ")
+ ' If ROW("Ort") IsNot DBNull.Value Then KD.Adresse.Ort = ROW("Ort")
+ ' If ROW("LandKz") IsNot DBNull.Value Then KD.Adresse.LandKz = ROW("LandKzISO2")
+
+
+
+
+ ' KD.Kontakt = New TELOTEC_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenKontakt
+ ' If ROW("E-Mail") IsNot DBNull.Value Then KD.Kontakt.EMail = ROW("E-Mail")
+ ' If ROW("Telefon") IsNot DBNull.Value Then KD.Kontakt.Tel = ROW("Telefon")
+ ' If ROW("Telefax") IsNot DBNull.Value Then KD.Kontakt.Fax = ROW("Telefax")
+ ' If ROW("Ansprechpartner") IsNot DBNull.Value Then KD.Kontakt.Ansprechpartner = If(ROW("Anrede") IsNot DBNull.Value, ROW("Anrede") & " ", "") & ROW("Ansprechpartner")
+
+
+ ' Dim KD_AKTO = VERAG_PROG_ALLGEMEIN.cKundenAufschubkonten.LOAD_ListAufschubKTOByKdNr(KD.KundenNr)
+
+ ' If KD_AKTO IsNot Nothing Then
+ ' Dim AKTOLIST = New List(Of VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschub)
+
+ ' For Each KTO In KD_AKTO
+ ' If If(KTO.kdAkto_bin, "").ToString.Trim <> String.Empty And
+ ' If(KTO.kdAkto_eori, "").ToString.Trim <> String.Empty And
+ ' If(KTO.kdAkto_hauptzollamt, "").ToString.Trim <> String.Empty And
+ ' If(KTO.kdAkto_kontonummer, "").ToString.Trim <> String.Empty Then
+
+
+ ' Dim AUFSCH As New TELOTEC_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschub
+ ' Select Case KTO.kdAkto_art
+ ' Case "10" : AUFSCH.Art = VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item10
+ ' Case "15" : AUFSCH.Art = VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item15
+ ' Case "20" : AUFSCH.Art = VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item20
+ ' End Select
+
+ ' AUFSCH.BIN = KTO.kdAkto_bin
+ ' AUFSCH.EORI = KTO.kdAkto_eori
+ ' If KTO.kdAkto_eoriNL IsNot Nothing Then AUFSCH.EORI_Niederlassung = KTO.kdAkto_eoriNL Else AUFSCH.EORI_Niederlassung = "0000"
+ ' AUFSCH.Hauptzollamt = KTO.kdAkto_hauptzollamt
+ ' AUFSCH.KontoNr = KTO.kdAkto_kontonummer
+
+ ' AKTOLIST.Add(AUFSCH)
+ ' If AKTOLIST.Count = 2 Then Exit For 'max. 2 Aufschub
+ ' End If
+ ' Next
+ ' If AKTOLIST.Count > 0 Then KD.Aufschubkonten = AKTOLIST
+ ' End If
+
+ ' XML.KundenDaten.Add(KD)
+
+ ' Next
+
+ ' Dim saveDir = path
+ ' If Not IO.Directory.Exists(saveDir) Then
+ ' IO.Directory.CreateDirectory(saveDir)
+ ' End If
+ ' Dim counter = 1
+ ' While IO.File.Exists(saveDir & "VERAG_KD_" & counter.ToString("D4") & ".xml")
+ ' counter += 1
+ ' End While
+ ' saveFile = saveDir & "VERAG_KD_" & counter.ToString("D4") & ".xml"
+
+ ' XML.SaveToFile(saveFile)
+
+ ' Return True
+
+ ' Catch ex As Exception
+ ' MsgBox(ex.Message & ex.StackTrace)
+ ' Return False
+ ' End Try
+ 'End Function
+
+End Class
diff --git a/TELOTEK_Worker_lib/cTelokec.vb b/TELOTEK_Worker_lib/cTelokec.vb
index 3d79fc8..dce740f 100644
--- a/TELOTEK_Worker_lib/cTelokec.vb
+++ b/TELOTEK_Worker_lib/cTelokec.vb
@@ -55,7 +55,7 @@ Public Class cTelotec_Anmeldung
Property Hea_PayMet As Object = Nothing ' INT NULL,
Property Hea_AExpRef As Object = Nothing ' BIT NULL,
Property Hea_Fin As Object = Nothing ' VARCHAR(2) NULL,
- Property Hea_Simp As Object = Nothing ' BIT Not NULL,
+ Property Hea_Simp As Boolean = False ' BIT Not NULL,
Property Hea_IssD As Object = Nothing ' Date NULL,
Property Hea_AuthID As Object = Nothing ' VARCHAR(17) NULL,
Property Hea_TransDat As Object = Nothing ' BIT NULL,
@@ -90,7 +90,7 @@ Public Class cTelotec_Anmeldung
Property Transp_CrossTy As Object = Nothing ' INT NULL,
Property Transp_CrossIdnt As Object = Nothing ' VARCHAR(27) NULL,
Property Transp_CrossIdntNat As Object = Nothing ' VARCHAR(2) NULL,
- Property Transp_ContInd As Object = Nothing ' BIT NULL,
+ Property Transp_ContInd As Boolean = False ' BIT NULL,
Property ValData_TermDelCd As Object = Nothing ' VARCHAR(3) NULL,
Property ValData_TermDelPlc As Object = Nothing ' VARCHAR(35) NULL,
Property ValData_TermDelSit As Object = Nothing ' VARCHAR(1) NULL,
@@ -146,6 +146,8 @@ Public Class cTelotec_Anmeldung
Property POSITIONSDATEN As New List(Of cTelotec_Positionsdaten)
Property SICHERHEIT As New List(Of cTelotec_Sicherheit)
+ Property ABGABEN As New List(Of cTelotec_Abgaben)
+
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
'Sub New()
@@ -170,6 +172,36 @@ Public Class cTelotec_Anmeldung
LOAD()
End Sub
+
+ Sub initData()
+ me.telanm_Status = "00"
+ Me.telanm_Status_KEWILL_Equivalent = "00"
+ Me.telanm_Erstellung = Now
+ Me.telanm_Erstellung_SB = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+ Me.telanm_LetzteBearbeitung=now
+ Me.telanm_LetzteBearbeitung_SB = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+ Me.[Mandant_ID] = "IMEX"
+ Me.[Bereich_ID] = 0
+ Me.[Referenz_ID] = 0 '"TC_IMP_" & Now.ToShortDateString("ddMMyyyy_HHmmssfff ")
+ Me.[ComIndicator] = 1
+
+ Me.[dec_ProzessArt] = "TA"
+
+ Me.[dec_CreateDate] = Now
+
+
+ Me.[Refs_LRN] = Me.telanm_BezugsNr
+
+
+ Me.[Hea_DecTy] = "IMA" '??
+ Me.[Hea_TotItem] = 0
+
+ Me.[Hea_Simp] = 0
+ Me.[Hea_DecDT] = CDate(Now.ToShortDateString)
+ Me.[Hea_DecPlc] = "Suben"
+
+ End Sub
+
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telanm_id", telanm_id, , True, True))
@@ -331,8 +363,10 @@ Public Class cTelotec_Anmeldung
telanm_id = SQL.doSQLVarListID(telanm_id, sqlstr, "FMZOLL", , list)
If telanm_id > 0 And saveAll Then
SAVE_Positionsdaten()
- SAVE_SICHERHEIT
+ SAVE_Sicherheit()
+ SAVE_Abgaben()
End If
+
Return telanm_id > 0
End Function
@@ -379,6 +413,7 @@ Public Class cTelotec_Anmeldung
If loadALL Then
POSITIONSDATEN.Clear()
SICHERHEIT.Clear()
+ ABGABEN.Clear()
End If
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblTelotec_Anmeldung WHERE telanm_id=@telanm_id ", conn)
@@ -398,6 +433,7 @@ Public Class cTelotec_Anmeldung
If loadALL Then
LOAD_Positionsdaten()
LOAD_Sicherheit()
+ LOAD_Abgaben()
End If
End If
dr.Close()
@@ -414,6 +450,7 @@ Public Class cTelotec_Anmeldung
Dim TC As New cTelotec_Anmeldung
TC.POSITIONSDATEN.Clear()
TC.SICHERHEIT.Clear()
+ TC.ABGABEN.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblTelotec_Anmeldung WHERE telanm_BezugsNr=@BezugsNr AND [telnam_aktuellsteNachricht]=1 ", conn)
@@ -433,6 +470,7 @@ Public Class cTelotec_Anmeldung
If loadALL Then
TC.LOAD_Positionsdaten()
TC.LOAD_Sicherheit()
+ TC.LOAD_Abgaben()
End If
Return TC
End If
@@ -494,6 +532,7 @@ Public Class cTelotec_Anmeldung
If loadALL Then
NCTS.POSITIONSDATEN.Clear()
NCTS.SICHERHEIT.Clear()
+ NCTS.ABGABEN.Clear()
End If
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblTelotec_Anmeldung WHERE telanm_id=@telanm_id ", conn)
@@ -513,6 +552,7 @@ Public Class cTelotec_Anmeldung
If loadALL Then
NCTS.LOAD_Positionsdaten()
NCTS.LOAD_Sicherheit()
+ NCTS.LOAD_Abgaben()
End If
dr.Close()
Return NCTS
@@ -535,6 +575,7 @@ Public Class cTelotec_Anmeldung
If loadALL Then
NCTS.POSITIONSDATEN.Clear()
NCTS.SICHERHEIT.Clear()
+ NCTS.ABGABEN.Clear()
End If
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblTelotec_Anmeldung WHERE telanm_BezugsNr=@bezugsNr " & If(MsgType <> "", " AND MsgType=@MsgType ", ""), conn)
@@ -555,6 +596,7 @@ Public Class cTelotec_Anmeldung
If loadALL Then
NCTS.LOAD_Positionsdaten()
NCTS.LOAD_Sicherheit()
+ NCTS.LOAD_Abgaben()
End If
dr.Close()
Return NCTS
@@ -591,29 +633,22 @@ Public Class cTelotec_Anmeldung
Return False
End Function
- 'Public Sub UPDATE_DATA()
- ' Try
- ' Select Case telanm_ART
- ' Case "T1", "T2"
- ' 'SQL, die daten aus den jeweiligen tabellen ausliest und hier aktualisiert
- ' Dim Dakosy_NCTSOut As New DAKOSY_Worker.cDakosyNCTSOut
- ' Dakosy_NCTSOut.LOADByAnmID(telanm_id, False)
- ' If Dakosy_NCTSOut IsNot Nothing Then
- ' Me.telanm_BezugsNr = Dakosy_NCTSOut.ncts_ObjectName
- ' Me.telanm_Status = Dakosy_NCTSOut.ncts_Status
- ' Me.telanm_Status_KEWILL_Equivalent = Dakosy_NCTSOut.ncts_Status_KEWILL_Equivalent
- ' Me.telanm_Erstellung = Dakosy_NCTSOut.ncts_Erstellung
- ' Me.telanm_Erstellung_SB = Dakosy_NCTSOut.ncts_Erstellung_SB
- ' Me.telanm_LetzteBearbeitung = Dakosy_NCTSOut.ncts_LetzteBearbeitung
- ' Me.telanm_LetzteBearbeitung_SB = Dakosy_NCTSOut.ncts_LetzteBearbeitung_SB
- ' End If
- ' End Select
+ Public Sub UPDATE_DATA()
+ Try
+ 'Me.dy_BezugsNr = Dakosy_NCTSOut.ncts_ObjectName
+ 'Me.dy_Status = Dakosy_NCTSOut.ncts_Status
+ 'Me.dy_Status_KEWILL_Equivalent = Dakosy_NCTSOut.ncts_Status_KEWILL_Equivalent
+ 'Me.dy_Erstellung = Dakosy_NCTSOut.ncts_Erstellung
+ 'Me.dy_Erstellung_SB = Dakosy_NCTSOut.ncts_Erstellung_SB
+ 'Me.dy_LetzteBearbeitung = Dakosy_NCTSOut.ncts_LetzteBearbeitung
+ 'Me.dy_LetzteBearbeitung_SB = Dakosy_NCTSOut.ncts_LetzteBearbeitung_SB
- ' Catch ex As Exception
- ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
- ' End Try
- 'End Sub
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+ End Sub
@@ -678,7 +713,7 @@ Public Class cTelotec_Anmeldung
notFound = False
Select Case art
- Case "EZA" : TELOTECDatenbereitstellung_EZA(SPEDITIONSBUCH, DY, notFound, PosAnzahl)
+ Case "EZA", "EUA" : TELOTECDatenbereitstellung_EZA(SPEDITIONSBUCH, DY, notFound, PosAnzahl)
Case "NCTS" : TELOTECDatenbereitstellung_NCTS(SPEDITIONSBUCH, DY, notFound, PosAnzahl)
End Select
@@ -703,7 +738,7 @@ Public Class cTelotec_Anmeldung
If SPEDITIONSBUCH.Abfertigungsdatum Is Nothing Then SPEDITIONSBUCH.Abfertigungsdatum = Now 'CDate(DY.eza_Trans_DatumZeit).ToShortDateString
- SPEDITIONSBUCH.Abfertigungsart = "1" 'FISKAL !!!!!!!!!!!!
+ SPEDITIONSBUCH.Abfertigungsart = "1" 'FISKAL !!!!!????
SPEDITIONSBUCH.Versendungsland = DY.Locs_Disp
SPEDITIONSBUCH.Bestimmungsland = DY.Locs_Dest
@@ -991,6 +1026,7 @@ Public Class cTelotec_Anmeldung
End If
Next
l.LOAD_Packstücke()
+ l.LOAD_Abgaben()
POSITIONSDATEN.Add(l)
End While
dr.Close()
@@ -1030,11 +1066,46 @@ Public Class cTelotec_Anmeldung
End Try
End Sub
+
+
+ Public Sub LOAD_Abgaben()
+ Try
+ ABGABEN.Clear()
+ Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+ Using cmd As New SqlCommand("SELECT * FROM tblTelotec_Abgaben WHERE telAbg_telanmId=@telanm_id ", conn)
+ cmd.Parameters.AddWithValue("@telanm_id", Me.telanm_id)
+ Dim dr = cmd.ExecuteReader()
+ While dr.Read
+ Dim l As New cTelotec_Abgaben
+ For Each i In l.getParameterList()
+ Dim propInfo As PropertyInfo = l.GetType.GetProperty(i.Scalarvariable)
+ If dr.Item(i.Text) Is DBNull.Value Then
+ propInfo.SetValue(l, Nothing)
+ Else
+ propInfo.SetValue(l, dr.Item(i.Text))
+ End If
+ Next
+ ABGABEN.Add(l)
+ End While
+ dr.Close()
+ End Using
+ End Using
+ Catch ex As Exception
+ MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ End Sub
+
+
Function DELETE_Packstücke() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " DELETE FROM [tblTelotec_Packstuecke] WHERE telpospk_telanmId =" & Me.telanm_id & " "
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function
+ Function DELETE_PositionsdatenAbgaben() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+ Dim sqlstr = " DELETE FROM [tblTelotec_PositionsdatenAbgaben] WHERE telposAbg_telanmId =" & Me.telanm_id & " "
+ Return SQL.doSQL(sqlstr, "FMZOLL")
+ End Function
+
Function DELETE_Positionsdaten() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " DELETE FROM [tblTelotec_Positionsdaten] WHERE telpos_telanmId =" & Me.telanm_id & " "
Return SQL.doSQL(sqlstr, "FMZOLL")
@@ -1044,6 +1115,10 @@ Public Class cTelotec_Anmeldung
Dim sqlstr = " DELETE FROM [tblTelotec_Sicherheit] WHERE telgrt_telanmId =" & Me.telanm_id & " "
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function
+ Function DELETE_Abgaben() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+ Dim sqlstr = " DELETE FROM [tblTelotec_Abgaben] WHERE telAbg_telanmId =" & Me.telanm_id & " "
+ Return SQL.doSQL(sqlstr, "FMZOLL")
+ End Function
Public Function SAVE_Sicherheit() As Boolean
'Zuserst alle OffertenPos von dem Offert löschen
@@ -1062,15 +1137,33 @@ Public Class cTelotec_Anmeldung
Return True
End Function
+ Public Function SAVE_Abgaben() As Boolean
+ 'Zuserst alle OffertenPos von dem Offert löschen
+ If DELETE_Abgaben() Then 'And DELETE_SicherheitUnterlagen() And DELETE_SicherheitVerbrauchssteuer() Then
+ 'jetzt die Standartofferten einfügen
+ For Each p In ABGABEN
+ p.telAbg_telanmId = telanm_id
+ If p.INSERT() Then
+ Else
+ Return False
+ End If
+ Next
+ Else
+ Return False
+ End If
+
+ Return True
+ End Function
Public Function SAVE_Positionsdaten() As Boolean
'Zuserst alle OffertenPos von dem Offert löschen
- If DELETE_Positionsdaten() And DELETE_Packstücke() Then 'And DELETE_PositionsdatenUnterlagen() And DELETE_PositionsdatenVerbrauchssteuer() Then
+ If DELETE_Positionsdaten() And DELETE_Packstücke() And DELETE_PositionsdatenAbgaben() Then 'And DELETE_PositionsdatenUnterlagen() And DELETE_PositionsdatenVerbrauchssteuer() Then
'jetzt die Standartofferten einfügen
For Each p In POSITIONSDATEN
p.telpos_telanmId = telanm_id
If p.INSERT() Then
p.INSERT_Packstücke(p.telpos_id, Me.telanm_id)
+ p.INSERT_Abgaben(p.telpos_id, Me.telanm_id)
'p.INSERT_PositionsdatenUnterlagen(p.ezaWP_Id, Me.eza_Id)
'p.INSERT_PositionsdatenVerbrauchssteuer(p.ezaWP_Id, Me.eza_Id)
Else
@@ -1118,6 +1211,7 @@ Public Class cTelotec_Positionsdaten
Property Telo_ArtikelMEH As Object = Nothing
Property PACKSTUECKE As New List(Of cTelotec_Packstuecke)
+ Property ABGABEN As New List(Of cTelotec_PositionsdatenAbgaben)
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -1201,6 +1295,41 @@ Public Class cTelotec_Positionsdaten
End Try
End Sub
+ Public Function INSERT_Abgaben(telpos_id, telanm_id) As Boolean
+ For Each p In ABGABEN
+ p.telposAbg_telanmId = telanm_id
+ p.telposAbg_telposId = telpos_id
+ If Not p.INSERT() Then Return False
+ Next
+ Return True
+ End Function
+
+ Public Sub LOAD_Abgaben()
+ Try
+ ABGABEN.Clear()
+ Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+ Using cmd As New SqlCommand("SELECT * FROM tblTelotec_PositionsdatenAbgaben WHERE telposabg_telposId=@telpos_id ", conn)
+ cmd.Parameters.AddWithValue("@telpos_id", Me.telpos_id)
+ Dim dr = cmd.ExecuteReader()
+ While dr.Read
+ Dim l As New cTelotec_PositionsdatenAbgaben
+ For Each i In l.getParameterList()
+ Dim propInfo As PropertyInfo = l.GetType.GetProperty(i.Scalarvariable)
+ If dr.Item(i.Text) Is DBNull.Value Then
+ propInfo.SetValue(l, Nothing)
+ Else
+ propInfo.SetValue(l, dr.Item(i.Text))
+ End If
+ Next
+ ABGABEN.Add(l)
+ End While
+ dr.Close()
+ End Using
+ End Using
+ Catch ex As Exception
+ MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ End Sub
Public Function getInsertCmd() As String
Try
@@ -1324,8 +1453,6 @@ Public Class cTelotec_Sicherheit
- Property PACKSTUECKE As List(Of cTelotec_Packstuecke)
-
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Sub New()
@@ -1385,3 +1512,168 @@ Public Class cTelotec_Sicherheit
End Class
+
+
+Public Class cTelotec_Abgaben
+
+
+ Property telAbg_id As Integer
+ Property telAbg_telanmId As Integer
+ Property Mandant_ID As Object = Nothing
+ Property Bereich_ID As Object = Nothing
+ Property Referenz_ID As Object = Nothing
+ Property ComIndicator As Boolean
+ Property TotDuties_ID As Integer
+ Property Ty As Object = Nothing
+ Property Amnt As Object = Nothing
+ Property TyInd As Object = Nothing
+ Property Erstelldatum As Object = Nothing
+
+
+
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+ Sub New()
+ End Sub
+
+
+ Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telAbg_id", telAbg_id, , True, True))
+
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telAbg_telanmId", telAbg_telanmId))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Mandant_ID", Mandant_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bereich_ID", Bereich_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Referenz_ID", Referenz_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ComIndicator", ComIndicator))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TotDuties_ID", TotDuties_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ty", Ty))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Amnt", Amnt))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TyInd", TyInd))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Erstelldatum", Erstelldatum))
+ Return list
+ End Function
+
+
+ Public Function INSERT() As Boolean
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+ 'Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", , list)
+ telAbg_id = SQL.doSQLVarListID(telAbg_id, getInsertCmd, "FMZOLL", , list)
+ Return telAbg_id > 0
+ End Function
+
+
+
+
+ Public Function getInsertCmd() As String
+ Try
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+ Dim str As String = ""
+ Dim values As String = ""
+ For Each i In list
+ If Not i.isPrimaryParam Then
+ str &= "[" & i.Text & "],"
+ values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+ End If
+ Next
+ str = str.Substring(0, str.Length - 1) 'wg. ','
+ values = values.Substring(0, values.Length - 1) 'wg. ','
+ Return (" INSERT INTO tblTelotec_Abgaben (" & str & ") VALUES(" & values & ") ")
+ Catch ex As Exception
+ MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ Return ""
+ End Function
+
+End Class
+
+Public Class cTelotec_PositionsdatenAbgaben
+
+
+ Property telposAbg_id As Integer
+ Property telposAbg_telposId As Integer
+ Property telposAbg_telanmId As Integer
+ Property Mandant_ID As Object = Nothing
+ Property Bereich_ID As Object = Nothing
+ Property Referenz_ID As Object = Nothing
+ Property ComIndicator As Boolean
+ Property Pos_ID As Integer
+ Property DutyCalc_ID As Object = Nothing
+ Property Ty As Object = Nothing
+ Property BaseD As Object = Nothing
+ Property Curr As Object = Nothing
+ Property Unit As Object = Nothing
+ Property Base As Object = Nothing
+ Property Rate As Object = Nothing
+ Property RateUsed As Object = Nothing
+ Property Amnt As Object = Nothing
+ Property MeaID As Object = Nothing
+ Property TyInd As Object = Nothing
+
+
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+ Sub New()
+ End Sub
+
+
+ Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_id", telposAbg_id, , True, True))
+
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_telposId", telposAbg_telposId))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_telanmId", telposAbg_telanmId))
+
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Mandant_ID", Mandant_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bereich_ID", Bereich_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Referenz_ID", Referenz_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ComIndicator", ComIndicator))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Pos_ID", Pos_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DutyCalc_ID", DutyCalc_ID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ty", Ty))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BaseD", BaseD))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Curr", Curr))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Unit", Unit))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Base", Base))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Rate", Rate))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RateUsed", RateUsed))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Amnt", Amnt))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MeaID", MeaID))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TyInd", TyInd))
+ Return list
+ End Function
+
+
+ Public Function INSERT() As Boolean
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+ 'Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", , list)
+ telposAbg_id = SQL.doSQLVarListID(telposAbg_id, getInsertCmd, "FMZOLL", , list)
+ Return telposAbg_id > 0
+ End Function
+
+
+
+
+ Public Function getInsertCmd() As String
+ Try
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+ Dim str As String = ""
+ Dim values As String = ""
+ For Each i In list
+ If Not i.isPrimaryParam Then
+ str &= "[" & i.Text & "],"
+ values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+ End If
+ Next
+ str = str.Substring(0, str.Length - 1) 'wg. ','
+ values = values.Substring(0, values.Length - 1) 'wg. ','
+ Return (" INSERT INTO tblTelotec_PositionsdatenAbgaben (" & str & ") VALUES(" & values & ") ")
+ Catch ex As Exception
+ MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ Return ""
+ End Function
+
+End Class
+
+
diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj
index 93279a6..2a8b911 100644
--- a/UID/ADMIN.vbproj
+++ b/UID/ADMIN.vbproj
@@ -699,6 +699,9 @@
Always
+
+ Always
+
Always
diff --git a/UID/Dienstplan/frmDienstplan.vb b/UID/Dienstplan/frmDienstplan.vb
index 1cf3c87..2863316 100644
--- a/UID/Dienstplan/frmDienstplan.vb
+++ b/UID/Dienstplan/frmDienstplan.vb
@@ -48,8 +48,11 @@ Public Class frmDienstplan
End Sub
Public Sub initDienstplan()
+ Dim datum As Date = CalendarWeek(aktWoche, aktJahr)
Dim pf As New cProgramFunctions
- pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
+
+ Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(datum)
+ pf.KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
' initDienstplan()
If pnl.Controls.Count > 0 Then DirectCast(pnl.Controls(0), usrcntlDienstplanStunden).loaded = False
@@ -63,7 +66,6 @@ Public Class frmDienstplan
Else
Button14.Text = "Woche abschließen"
End If
- Dim datum As Date = CalendarWeek(aktWoche, aktJahr)
Dim arrZoll1 As String() = {"dgvZoll1_Mo", "dgvZoll1_Di", "dgvZoll1_Mi", "dgvZoll1_Do", "dgvZoll1_Fr", "dgvZoll1_Sa", "dgvZoll1_So"}
Dim arrZoll2 As String() = {"dgvZoll2_Mo", "dgvZoll2_Di", "dgvZoll2_Mi", "dgvZoll2_Do", "dgvZoll2_Fr", "dgvZoll2_Sa", "dgvZoll2_So"}
@@ -1844,9 +1846,9 @@ Public Class frmDienstplan
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
Exit Sub
- Dim pf As New cProgramFunctions
- pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
- initDienstplan()
+ 'Dim pf As New cProgramFunctions
+ 'pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
+ 'initDienstplan()
End Sub
diff --git a/UID/Dienstplan/frmDienstplanATILLA.vb b/UID/Dienstplan/frmDienstplanATILLA.vb
index fa3acd0..e360144 100644
--- a/UID/Dienstplan/frmDienstplanATILLA.vb
+++ b/UID/Dienstplan/frmDienstplanATILLA.vb
@@ -49,9 +49,10 @@ Public Class frmDienstplanATILLA
End Sub
Public Sub initDienstplan()
+ Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(CalendarWeek(aktWoche, aktJahr))
Dim pf As New cProgramFunctions
- pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
+ pf.KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
' initDienstplan()
If pnl.Controls.Count > 0 Then DirectCast(pnl.Controls(0), usrcntlDienstplanStunden).loaded = False
@@ -1897,9 +1898,9 @@ Public Class frmDienstplanATILLA
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
Exit Sub
- Dim pf As New cProgramFunctions
- pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
- initDienstplan()
+ 'Dim pf As New cProgramFunctions
+ 'pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
+ 'initDienstplan()
End Sub
diff --git a/UID/Dienstplan/frmDienstplanVariabel.vb b/UID/Dienstplan/frmDienstplanVariabel.vb
index 8ca94de..8e4f94b 100644
--- a/UID/Dienstplan/frmDienstplanVariabel.vb
+++ b/UID/Dienstplan/frmDienstplanVariabel.vb
@@ -56,7 +56,9 @@ Public Class frmDienstplanVariabel
End Sub
Public Sub initDienstplan()
- pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
+ Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(CalendarWeek(aktWoche, aktJahr))
+
+ pf.KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
' initDienstplan()
If Panel6.Controls.Count > 0 Then DirectCast(Panel6.Controls(0), usrcntlDienstplanStunden).loaded = False
@@ -636,7 +638,7 @@ Public Class frmDienstplanVariabel
End If
End Function
- Public Function CalendarWeek(ByVal nWeek As Integer, ByVal nYear As Integer) As Date
+ Public Shared Function CalendarWeek(ByVal nWeek As Integer, ByVal nYear As Integer) As Date
' Wochentag des 4. Januar des Jahres ermitteln
Dim dStart As New Date(nYear, 1, 4)
@@ -2355,8 +2357,8 @@ Public Class frmDienstplanVariabel
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
Exit Sub
' Dim pf As New cProgramFunctions
- pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
- initDienstplan()
+ 'pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
+ 'initDienstplan()
End Sub
@@ -2449,12 +2451,18 @@ Public Class frmDienstplanVariabel
Try
With exclApp
.Visible = False
+ Dim useAlwaysTime = False
- If SQLDienst.getValueTxtBySql("SELECT isnull([dpset_firma],'') FROM [tblDienstSettings] WHERE [dpset_niederlassung]='" & niederlassung & "'", "ADMIN") = "IMEX" Then
- Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat IMEX.xlsx")
- Else
- Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat.xlsx")
- End If
+ Select Case SQLDienst.getValueTxtBySql("SELECT isnull([dpset_firma],'') FROM [tblDienstSettings] WHERE [dpset_niederlassung]='" & niederlassung & "'", "ADMIN")
+ Case "IMEX"
+ Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat IMEX.xlsx")
+ Case "AMBAR"
+ Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat AMBAR.xlsx")
+ useAlwaysTime = True
+ Case Else
+ Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat.xlsx")
+
+ End Select
Blatt = Datei.Worksheets("DIENSTPLAN")
@@ -2464,11 +2472,12 @@ Public Class frmDienstplanVariabel
Dim cnt = 0
If dt_Ma IsNot Nothing Then
-
'-----------------------Datum-------------------
Dim dateWork = CDate("01." & aktDate.Month & "." & aktDate.Year & "")
Dim dateEnde = dateWork.AddMonths(1).AddDays(-1)
+ Blatt.Range("C1").Value = dateWork.ToString("MMMM yyyy")
+
Dim FT As New cFeiertage(dateWork.Year) 'Evtl Jahressprung, darum neu definieren
Dim cnt3 = 0
@@ -2495,9 +2504,6 @@ Public Class frmDienstplanVariabel
'-----------------------------------------------
- Blatt.Range("C1").Value = dateWork.ToString("MMMM yyyy")
-
-
For Each r As DataRow In dt_Ma.Rows
Dim splate = Chr(Asc("B") + cnt)
Blatt.Range(splate & "2").Value = r("dstma_kuerzel")
@@ -2515,30 +2521,36 @@ Public Class frmDienstplanVariabel
If dt_Tag IsNot Nothing AndAlso dt_Tag.Rows.Count > 0 Then
If dt_Tag.Rows(0)("dstetr_info") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dstetr_info") <> "" Then
Tag_Bez = dt_Tag.Rows(0)("dstetr_info")
+
Else
Tag_Bez = dt_Tag.Rows(0)("dstetr_von") & "-" & dt_Tag.Rows(0)("dstetr_bis")
+
+ 'useAlwaysTime --> keine Bezeichnungen der Schicht zulassen, nur die Uhrzeiten
+
Dim dt_Zeit = SQLDienst.loadDGV("SELECT * FROM [ADMIN].[dbo].[tblDienstplanSchichtenZeiten] where dsz_dedetId=" & dt_Tag.Rows(0)("dedet_id") & " and dsz_woTag='" & dateWork.ToString("ddd").Replace(".", "").ToUpper & "'")
If dt_Tag IsNot Nothing AndAlso dt_Tag.Rows.Count > 0 Then
+ If Not useAlwaysTime Or dt_Tag.Rows(0)("dedet_benutzerdefinierteSchicht") = 0 Then
+ 'Wenn keine benutzerdefinierteSchicht ODER von=von, bis=bis --> Bezeichnung hinschreiben, sonst wird die Zeit (lt. oben) genau angegeben.
+ If dt_Tag.Rows(0)("dedet_benutzerdefinierteSchicht") = 0 Or (dt_Zeit.Rows(0)("dsz_von") = dt_Tag.Rows(0)("dstetr_von") And dt_Zeit.Rows(0)("dsz_bis") = dt_Tag.Rows(0)("dstetr_bis")) Then
+ If dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") <> "" Then
+ Tag_Bez = dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung")
+ If dt_Tag.Rows(0)("dedet_ExcelMonatFarbe") IsNot DBNull.Value Then BGcolor = dt_Tag.Rows(0)("dedet_ExcelMonatFarbe")
+ ElseIf dt_Tag.Rows(0)("dedet_bezeichnungDP") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "" Then
+ Tag_Bez = dt_Tag.Rows(0)("dedet_bezeichnungDP")
+ Else
+ Tag_Bez = dt_Tag.Rows(0)("dedet_abt")
+ End If
+
+ ' Tag_Bez = If(dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "", dt_Tag.Rows(0)("dedet_bezeichnungDP"), dt_Tag.Rows(0)("dedet_abt"))
+
- 'Wenn keine benutzerdefinierteSchicht ODER von=von, bis=bis --> Bezeichnung hinschreiben, sonst wird die Zeit (lt. oben) genau angegeben.
- If dt_Tag.Rows(0)("dedet_benutzerdefinierteSchicht") = 0 Or (dt_Zeit.Rows(0)("dsz_von") = dt_Tag.Rows(0)("dstetr_von") And dt_Zeit.Rows(0)("dsz_bis") = dt_Tag.Rows(0)("dstetr_bis")) Then
- If dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") <> "" Then
- Tag_Bez = dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung")
- If dt_Tag.Rows(0)("dedet_ExcelMonatFarbe") IsNot DBNull.Value Then BGcolor = dt_Tag.Rows(0)("dedet_ExcelMonatFarbe")
- ElseIf dt_Tag.Rows(0)("dedet_bezeichnungDP") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "" Then
- Tag_Bez = dt_Tag.Rows(0)("dedet_bezeichnungDP")
- Else
- Tag_Bez = dt_Tag.Rows(0)("dedet_abt")
End If
- ' Tag_Bez = If(dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "", dt_Tag.Rows(0)("dedet_bezeichnungDP"), dt_Tag.Rows(0)("dedet_abt"))
-
End If
End If
-
End If
End If
diff --git a/UID/Dienstplan/frmDiestAddMa.Designer.vb b/UID/Dienstplan/frmDiestAddMa.Designer.vb
index 9d981b5..1380cba 100644
--- a/UID/Dienstplan/frmDiestAddMa.Designer.vb
+++ b/UID/Dienstplan/frmDiestAddMa.Designer.vb
@@ -22,6 +22,7 @@ Partial Class frmDiestAddMa
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
_
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDiestAddMa))
Me.cboMA = New System.Windows.Forms.ComboBox()
Me.txtWoStd = New System.Windows.Forms.TextBox()
@@ -264,6 +265,7 @@ Partial Class frmDiestAddMa
Me.txtBlau2BisMo = New System.Windows.Forms.TextBox()
Me.cboBlau2So = New System.Windows.Forms.ComboBox()
Me.txtBlau2VonMo = New System.Windows.Forms.TextBox()
+ Me.dgvAbwWStd = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label26 = New System.Windows.Forms.Label()
Me.txtReihenfolge = New System.Windows.Forms.TextBox()
Me.ColorDialog1 = New System.Windows.Forms.ColorDialog()
@@ -276,6 +278,7 @@ Partial Class frmDiestAddMa
Me.cbxInaktiv = New System.Windows.Forms.CheckBox()
Me.Label57 = New System.Windows.Forms.Label()
Me.txtStdFeiertagTZ = New System.Windows.Forms.TextBox()
+ Me.Label58 = New System.Windows.Forms.Label()
Me.grpTeilzeit.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -284,6 +287,7 @@ Partial Class frmDiestAddMa
Me.pnl4.SuspendLayout()
Me.TabPage3.SuspendLayout()
Me.pnl3.SuspendLayout()
+ CType(Me.dgvAbwWStd, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'cboMA
@@ -402,7 +406,7 @@ Partial Class frmDiestAddMa
'
Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnOK.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.btnOK.Location = New System.Drawing.Point(15, 427)
+ Me.btnOK.Location = New System.Drawing.Point(15, 555)
Me.btnOK.Name = "btnOK"
Me.btnOK.Size = New System.Drawing.Size(161, 37)
Me.btnOK.TabIndex = 22
@@ -2711,6 +2715,15 @@ Partial Class frmDiestAddMa
Me.txtBlau2VonMo.TabIndex = 22
Me.txtBlau2VonMo.Text = "00:00"
'
+ 'dgvAbwWStd
+ '
+ Me.dgvAbwWStd.AKTUALISIERUNGS_INTERVALL = -1
+ Me.dgvAbwWStd.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+ Me.dgvAbwWStd.Location = New System.Drawing.Point(21, 439)
+ Me.dgvAbwWStd.Name = "dgvAbwWStd"
+ Me.dgvAbwWStd.Size = New System.Drawing.Size(459, 110)
+ Me.dgvAbwWStd.TabIndex = 0
+ '
'Label26
'
Me.Label26.AutoSize = True
@@ -2771,7 +2784,7 @@ Partial Class frmDiestAddMa
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.Button2.Location = New System.Drawing.Point(182, 427)
+ Me.Button2.Location = New System.Drawing.Point(182, 555)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(86, 37)
Me.Button2.TabIndex = 23
@@ -2817,12 +2830,23 @@ Partial Class frmDiestAddMa
Me.txtStdFeiertagTZ.TabIndex = 26
Me.txtStdFeiertagTZ.Visible = False
'
+ 'Label58
+ '
+ Me.Label58.AutoSize = True
+ Me.Label58.Location = New System.Drawing.Point(18, 423)
+ Me.Label58.Name = "Label58"
+ Me.Label58.Size = New System.Drawing.Size(138, 13)
+ Me.Label58.TabIndex = 27
+ Me.Label58.Text = "Abweichende WochenStd.:"
+ '
'frmDiestAddMa
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
- Me.ClientSize = New System.Drawing.Size(503, 476)
+ Me.ClientSize = New System.Drawing.Size(503, 626)
+ Me.Controls.Add(Me.Label58)
+ Me.Controls.Add(Me.dgvAbwWStd)
Me.Controls.Add(Me.Label57)
Me.Controls.Add(Me.txtStdFeiertagTZ)
Me.Controls.Add(Me.cbxInaktiv)
@@ -2867,6 +2891,7 @@ Partial Class frmDiestAddMa
Me.TabPage3.ResumeLayout(False)
Me.pnl3.ResumeLayout(False)
Me.pnl3.PerformLayout()
+ CType(Me.dgvAbwWStd, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -3124,4 +3149,6 @@ Partial Class frmDiestAddMa
Friend WithEvents cbxInaktiv As CheckBox
Friend WithEvents Label57 As Label
Friend WithEvents txtStdFeiertagTZ As TextBox
+ Friend WithEvents dgvAbwWStd As VERAG_PROG_ALLGEMEIN.MyDatagridview
+ Friend WithEvents Label58 As Label
End Class
diff --git a/UID/Dienstplan/frmDiestAddMa.vb b/UID/Dienstplan/frmDiestAddMa.vb
index 4d09ee6..d852595 100644
--- a/UID/Dienstplan/frmDiestAddMa.vb
+++ b/UID/Dienstplan/frmDiestAddMa.vb
@@ -12,6 +12,7 @@ Public Class frmDiestAddMa
Dim MusterErr As Boolean = False
Dim SCHICHTEN_ARTEN As New List(Of cDienstplanSchicht)
Dim ADMIN As New cOptionenDAL
+ Dim DGVBind As VERAG_PROG_ALLGEMEIN.cEasyBinding
Private Sub frmDiestAddMa_KeyPress(sender As Object, e As KeyPressEventArgs) Handles Me.KeyPress
If e.KeyChar = Microsoft.VisualBasic.ChrW(Keys.Return) Then
@@ -34,8 +35,6 @@ Public Class frmDiestAddMa
initCboMuster()
fillCboMA()
- '
-
If niederlassung = "ATILLA" Then
cboAbt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZOLL", "ZOLL"))
@@ -64,7 +63,13 @@ Public Class frmDiestAddMa
If cboMyItemSelect(cboMA, SQLDienst.getValueTxtBySql("SELECT isnull([dstma_mitId],-1) FROM [tblDienstMitarb] WHERE dstma_id=" & MA_ID, "ADMIN")) Then
loadMA()
End If
+ Else
+ dgvAbwWStd.Enabled = False
End If
+
+
+ initDgvAbwWStd()
+
loaded = True
End Sub
Sub fillCboMA()
@@ -73,6 +78,31 @@ Public Class frmDiestAddMa
Next
End Sub
+ Sub initDgvAbwWStd()
+ Try
+
+ With dgvAbwWStd
+ ' .DataSource = SQLDienst.loadDGV("SELECT * FROM [tblDienstMitarbAbweichendeWochenstunden] WHERE [dstaw_dstmaId]=133")
+
+ DGVBind = New VERAG_PROG_ALLGEMEIN.cEasyBinding("ADMIN")
+
+ DGVBind.initBinding("SELECT * FROM [tblDienstMitarbAbweichendeWochenstunden] WHERE [dstaw_dstmaId]='" & MA.dstma_id & "'", "tblDienstMitarbAbweichendeWochenstunden")
+ .DataSource = DGVBind.bindingdataTable
+ DGVBind.bindingdataTable.Columns("dstaw_dstmaId").DefaultValue = MA.dstma_id
+ If .Columns.Count > 0 Then
+ .Columns("dstaw_id").Visible = False
+ .Columns("dstaw_dstmaId").Visible = False
+ .Columns("dstaw_von").HeaderText = "von"
+ .Columns("dstaw_bis").HeaderText = "bis"
+ .Columns("dstaw_std").HeaderText = "Std."
+ End If
+
+ End With
+ Catch ex As Exception
+ MsgBox(ex.Message & ex.StackTrace)
+ End Try
+ End Sub
+
Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
' MsgBox(txtRotVonMo.Text)
MusterErr = False
@@ -80,7 +110,7 @@ Public Class frmDiestAddMa
If initMA() Then
Dim tz As List(Of cDienstTeilzeit) = initArbVerh()
If MusterErr Then MsgBox("Bei der Prüfung der Daten für die Muster-Vorlage ist ein Fehler aufgetreten! Bitte um Prüfung!") : Exit Sub
- If SQLDienst.insertDienstMA(MA, niederlassung) Then ' Me.Close()
+ If SQLDienst.insertDienstMA(MA, niederlassung) And DGVBind.updateBinding Then ' Me.Close()
SQLDienst.delDienstTeilzeit(MA.dstma_id)
If cbxMuster.Checked Then 'cboArbVerh.SelectedIndex = 1 Then
For Each t In tz
diff --git a/UID/Dienstplan/usrCntlAuswertungWocheAuslastung.vb b/UID/Dienstplan/usrCntlAuswertungWocheAuslastung.vb
index b29565d..d5c3ee7 100644
--- a/UID/Dienstplan/usrCntlAuswertungWocheAuslastung.vb
+++ b/UID/Dienstplan/usrCntlAuswertungWocheAuslastung.vb
@@ -77,7 +77,9 @@
Return getStd
End Function
Function getAbf(datum As Date) As Double
- Dim art = ""
+ Try
+
+ Dim art = ""
Dim nl = ""
If DP_SETTINGS Is Nothing Then Return 0
@@ -115,5 +117,8 @@
' Return cDIENST.getValueTxtBySql("SELECT count(*) as anz FROM [Speditionsbuch] where Abfertigungsdatum = '" & datum.ToShortDateString & "' AND FilialenNr IN (" & filiale & ") AND Abfertigungsart IN(" & art & ")", "FMZOLL")
Return cDIENST.getValueTxtBySql(sql, "FMZOLL")
+ Catch ex As Exception
+ MsgBox(ex.Message & ex.StackTrace)
+ End Try
End Function
End Class
diff --git a/UID/Dienstplan/usrCntlDienstplan.vb b/UID/Dienstplan/usrCntlDienstplan.vb
index 1999ac7..3cc44a3 100644
--- a/UID/Dienstplan/usrCntlDienstplan.vb
+++ b/UID/Dienstplan/usrCntlDienstplan.vb
@@ -452,7 +452,9 @@ Public Class usrCntlDienstplan
Dim aktJahr = cPF.DateToWeek(datumMO).Substring(0, 4)
Dim SCHICHT = cPF.getSchicht(aktWoche, aktJahr)
- Dim sollStd As Double = cPF.getWochenstunden(MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd)
+ Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(datumMO)
+
+ Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd)
Dim tatStd As Double = SQLDienst.getDstStunden(MA_DST.dstma_id, datumMO, datumMO.AddDays(6), niederlassung)
' MsgBox(sollStd)
diff --git a/UID/Dienstplan/usrcntlDienstplanStunden.vb b/UID/Dienstplan/usrcntlDienstplanStunden.vb
index 8fc17b8..2b9727f 100644
--- a/UID/Dienstplan/usrcntlDienstplanStunden.vb
+++ b/UID/Dienstplan/usrcntlDienstplanStunden.vb
@@ -79,6 +79,7 @@ Public Class usrcntlDienstplanStunden
MsgBox("initStdMa-Error: " & ex.StackTrace)
End Try
+ Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(CalendarWeek(aktWoche, aktJahr))
For Each r As DataGridViewRow In .Rows
Try : r.DefaultCellStyle.ForeColor = ColorTranslator.FromHtml(r.Cells("dstma_farbe").Value) : Catch : End Try
@@ -90,14 +91,15 @@ Public Class usrcntlDienstplanStunden
Dim Wochenstunden As Double = 0
If IsNumeric(ma.dstma_wochenStunden) Then Wochenstunden = ma.dstma_wochenStunden
+
'MsgBox(ma.dstma_wochenStunden)
'hier wird berechnet, wie viele Stunden tatsächlich zu arbeiten sind (abzgl. Feiertage)
- Wochenstunden = cPF.getWochenstunden(Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
+ Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
'Hier wird berechnet wie viele Std tastächlich gearbeitet wurden:
Dim tatStd As Double = SQLDienst.getDstStunden(r.Cells("dstma_id").Value, datum_montag, datum_montag.AddDays(6), niederlassung)
-
+
r.Cells("stundenBerechnet").Value = (Wochenstunden)
r.Cells("stunden").Value = (tatStd) & " (" & tatStd - Wochenstunden & ")"
Dim arb As New cArbeitstage
@@ -108,7 +110,6 @@ Public Class usrcntlDienstplanStunden
loaded = True
Catch ex As Exception
MsgBox("initStdMa-Error: " & ex.Message)
-
End Try
initUestd()
End Sub
diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
index 1c0c702..7149b0f 100644
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -62,6 +62,10 @@ Partial Class frmMitarbDetails
Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.cboALIASDomain2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.txtALIASUser2 = New System.Windows.Forms.TextBox()
+ Me.Label54 = New System.Windows.Forms.Label()
+ Me.cboFirmaHaupt = New System.Windows.Forms.ComboBox()
Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label53 = New System.Windows.Forms.Label()
Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -95,6 +99,7 @@ Partial Class frmMitarbDetails
Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label9 = New System.Windows.Forms.Label()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
Me.cbxTestaccount = New System.Windows.Forms.CheckBox()
Me.cbxGebDat = New System.Windows.Forms.CheckBox()
Me.txtGebDat = New System.Windows.Forms.DateTimePicker()
@@ -164,9 +169,6 @@ 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.cboFirmaHaupt = New System.Windows.Forms.ComboBox()
- Me.Label54 = New System.Windows.Forms.Label()
- Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -243,9 +245,10 @@ Partial Class frmMitarbDetails
'
'btnCancel
'
+ Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btnCancel.BackColor = System.Drawing.Color.White
Me.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCancel.Location = New System.Drawing.Point(191, 795)
+ Me.btnCancel.Location = New System.Drawing.Point(191, 844)
Me.btnCancel.Name = "btnCancel"
Me.btnCancel.Size = New System.Drawing.Size(88, 36)
Me.btnCancel.TabIndex = 52
@@ -254,9 +257,10 @@ Partial Class frmMitarbDetails
'
'btnOK
'
+ Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btnOK.BackColor = System.Drawing.Color.White
Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnOK.Location = New System.Drawing.Point(12, 795)
+ Me.btnOK.Location = New System.Drawing.Point(12, 844)
Me.btnOK.Name = "btnOK"
Me.btnOK.Size = New System.Drawing.Size(173, 36)
Me.btnOK.TabIndex = 51
@@ -270,7 +274,7 @@ Partial Class frmMitarbDetails
Me.TabControl2.Location = New System.Drawing.Point(12, 63)
Me.TabControl2.Name = "TabControl2"
Me.TabControl2.SelectedIndex = 0
- Me.TabControl2.Size = New System.Drawing.Size(723, 726)
+ Me.TabControl2.Size = New System.Drawing.Size(723, 773)
Me.TabControl2.TabIndex = 0
'
'TabPage1
@@ -283,7 +287,7 @@ Partial Class frmMitarbDetails
Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage1.Size = New System.Drawing.Size(715, 700)
+ Me.TabPage1.Size = New System.Drawing.Size(715, 747)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Daten"
Me.TabPage1.UseVisualStyleBackColor = True
@@ -292,7 +296,7 @@ Partial Class frmMitarbDetails
'
Me.tbcntr.Controls.Add(Me.TabPage2)
Me.tbcntr.Controls.Add(Me.TabPage4)
- Me.tbcntr.Location = New System.Drawing.Point(2, 494)
+ Me.tbcntr.Location = New System.Drawing.Point(2, 539)
Me.tbcntr.Name = "tbcntr"
Me.tbcntr.SelectedIndex = 0
Me.tbcntr.Size = New System.Drawing.Size(450, 200)
@@ -616,7 +620,7 @@ Partial Class frmMitarbDetails
'Label4
'
Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(461, 494)
+ Me.Label4.Location = New System.Drawing.Point(461, 539)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(28, 13)
Me.Label4.TabIndex = 85
@@ -624,6 +628,8 @@ Partial Class frmMitarbDetails
'
'GroupBox2
'
+ Me.GroupBox2.Controls.Add(Me.cboALIASDomain2)
+ Me.GroupBox2.Controls.Add(Me.txtALIASUser2)
Me.GroupBox2.Controls.Add(Me.Label54)
Me.GroupBox2.Controls.Add(Me.cboFirmaHaupt)
Me.GroupBox2.Controls.Add(Me.cboTeam)
@@ -661,11 +667,53 @@ Partial Class frmMitarbDetails
Me.GroupBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox2.Location = New System.Drawing.Point(2, 245)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Size = New System.Drawing.Size(709, 243)
+ Me.GroupBox2.Size = New System.Drawing.Size(709, 288)
Me.GroupBox2.TabIndex = 84
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Firmendaten"
'
+ 'cboALIASDomain2
+ '
+ Me.cboALIASDomain2._allowedValuesFreiText = Nothing
+ Me.cboALIASDomain2._allowFreiText = False
+ Me.cboALIASDomain2._value = ""
+ Me.cboALIASDomain2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.cboALIASDomain2.FormattingEnabled = True
+ Me.cboALIASDomain2.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
+ Me.cboALIASDomain2.Location = New System.Drawing.Point(409, 60)
+ Me.cboALIASDomain2.Name = "cboALIASDomain2"
+ Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
+ Me.cboALIASDomain2.TabIndex = 106
+ '
+ 'txtALIASUser2
+ '
+ Me.txtALIASUser2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.txtALIASUser2.Location = New System.Drawing.Point(524, 60)
+ Me.txtALIASUser2.Name = "txtALIASUser2"
+ Me.txtALIASUser2.Size = New System.Drawing.Size(179, 20)
+ Me.txtALIASUser2.TabIndex = 105
+ '
+ 'Label54
+ '
+ Me.Label54.AutoSize = True
+ Me.Label54.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label54.Location = New System.Drawing.Point(135, 60)
+ Me.Label54.Name = "Label54"
+ Me.Label54.Size = New System.Drawing.Size(42, 13)
+ Me.Label54.TabIndex = 104
+ Me.Label54.Text = "Haupt.:"
+ '
+ 'cboFirmaHaupt
+ '
+ Me.cboFirmaHaupt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cboFirmaHaupt.Enabled = False
+ Me.cboFirmaHaupt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.cboFirmaHaupt.FormattingEnabled = True
+ Me.cboFirmaHaupt.Location = New System.Drawing.Point(138, 76)
+ Me.cboFirmaHaupt.Name = "cboFirmaHaupt"
+ Me.cboFirmaHaupt.Size = New System.Drawing.Size(57, 21)
+ Me.cboFirmaHaupt.TabIndex = 103
+ '
'cboTeam
'
Me.cboTeam._allowedValuesFreiText = Nothing
@@ -736,7 +784,7 @@ Partial Class frmMitarbDetails
'
Me.Label45.AutoSize = True
Me.Label45.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label45.Location = New System.Drawing.Point(548, 87)
+ Me.Label45.Location = New System.Drawing.Point(548, 104)
Me.Label45.Name = "Label45"
Me.Label45.Size = New System.Drawing.Size(146, 26)
Me.Label45.TabIndex = 97
@@ -747,7 +795,7 @@ Partial Class frmMitarbDetails
Me.MyListBox1._value = ""
Me.MyListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.MyListBox1.FormattingEnabled = True
- Me.MyListBox1.Location = New System.Drawing.Point(551, 116)
+ Me.MyListBox1.Location = New System.Drawing.Point(551, 133)
Me.MyListBox1.MultiColumn = True
Me.MyListBox1.Name = "MyListBox1"
Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
@@ -803,7 +851,7 @@ Partial Class frmMitarbDetails
Me.cbxEinsteigsDat.Checked = True
Me.cbxEinsteigsDat.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxEinsteigsDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.cbxEinsteigsDat.Location = New System.Drawing.Point(20, 214)
+ Me.cbxEinsteigsDat.Location = New System.Drawing.Point(16, 238)
Me.cbxEinsteigsDat.Name = "cbxEinsteigsDat"
Me.cbxEinsteigsDat.Size = New System.Drawing.Size(15, 14)
Me.cbxEinsteigsDat.TabIndex = 90
@@ -813,7 +861,7 @@ Partial Class frmMitarbDetails
'
Me.Label30.AutoSize = True
Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label30.Location = New System.Drawing.Point(17, 195)
+ Me.Label30.Location = New System.Drawing.Point(31, 238)
Me.Label30.Name = "Label30"
Me.Label30.Size = New System.Drawing.Size(81, 13)
Me.Label30.TabIndex = 89
@@ -822,7 +870,7 @@ Partial Class frmMitarbDetails
'datEinstiegsdatum
'
Me.datEinstiegsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.datEinstiegsdatum.Location = New System.Drawing.Point(41, 212)
+ Me.datEinstiegsdatum.Location = New System.Drawing.Point(113, 234)
Me.datEinstiegsdatum.Name = "datEinstiegsdatum"
Me.datEinstiegsdatum.Size = New System.Drawing.Size(200, 20)
Me.datEinstiegsdatum.TabIndex = 2
@@ -832,7 +880,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(406, 76)
+ Me.cboPosition.Location = New System.Drawing.Point(18, 155)
Me.cboPosition.Name = "cboPosition"
Me.cboPosition.Size = New System.Drawing.Size(136, 21)
Me.cboPosition.TabIndex = 5
@@ -841,7 +889,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(403, 60)
+ Me.Label29.Location = New System.Drawing.Point(15, 139)
Me.Label29.Name = "Label29"
Me.Label29.Size = New System.Drawing.Size(47, 13)
Me.Label29.TabIndex = 87
@@ -851,7 +899,7 @@ Partial Class frmMitarbDetails
'
Me.datGekuendigtAm.Enabled = False
Me.datGekuendigtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.datGekuendigtAm.Location = New System.Drawing.Point(301, 212)
+ Me.datGekuendigtAm.Location = New System.Drawing.Point(113, 257)
Me.datGekuendigtAm.Name = "datGekuendigtAm"
Me.datGekuendigtAm.Size = New System.Drawing.Size(200, 20)
Me.datGekuendigtAm.TabIndex = 9
@@ -860,7 +908,7 @@ Partial Class frmMitarbDetails
'
Me.cbxGekuendigt.AutoSize = True
Me.cbxGekuendigt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.cbxGekuendigt.Location = New System.Drawing.Point(301, 194)
+ Me.cbxGekuendigt.Location = New System.Drawing.Point(16, 262)
Me.cbxGekuendigt.Name = "cbxGekuendigt"
Me.cbxGekuendigt.Size = New System.Drawing.Size(96, 17)
Me.cbxGekuendigt.TabIndex = 8
@@ -870,7 +918,7 @@ Partial Class frmMitarbDetails
'txtEmail
'
Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.txtEmail.Location = New System.Drawing.Point(304, 160)
+ Me.txtEmail.Location = New System.Drawing.Point(304, 204)
Me.txtEmail.Name = "txtEmail"
Me.txtEmail.Size = New System.Drawing.Size(241, 20)
Me.txtEmail.TabIndex = 7
@@ -879,7 +927,7 @@ Partial Class frmMitarbDetails
'
Me.Label20.AutoSize = True
Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label20.Location = New System.Drawing.Point(301, 144)
+ Me.Label20.Location = New System.Drawing.Point(301, 188)
Me.Label20.Name = "Label20"
Me.Label20.Size = New System.Drawing.Size(39, 13)
Me.Label20.TabIndex = 83
@@ -888,7 +936,7 @@ Partial Class frmMitarbDetails
'txtDurchwahl
'
Me.txtDurchwahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.txtDurchwahl.Location = New System.Drawing.Point(18, 160)
+ Me.txtDurchwahl.Location = New System.Drawing.Point(18, 204)
Me.txtDurchwahl.Name = "txtDurchwahl"
Me.txtDurchwahl.Size = New System.Drawing.Size(272, 20)
Me.txtDurchwahl.TabIndex = 6
@@ -897,7 +945,7 @@ Partial Class frmMitarbDetails
'
Me.Label19.AutoSize = True
Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label19.Location = New System.Drawing.Point(15, 144)
+ Me.Label19.Location = New System.Drawing.Point(15, 188)
Me.Label19.Name = "Label19"
Me.Label19.Size = New System.Drawing.Size(86, 13)
Me.Label19.TabIndex = 81
@@ -1034,6 +1082,19 @@ Partial Class frmMitarbDetails
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Person"
'
+ 'cbxChatBenutzer
+ '
+ Me.cbxChatBenutzer.AutoSize = True
+ Me.cbxChatBenutzer.Checked = True
+ Me.cbxChatBenutzer.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.cbxChatBenutzer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.cbxChatBenutzer.Location = New System.Drawing.Point(304, 194)
+ Me.cbxChatBenutzer.Name = "cbxChatBenutzer"
+ Me.cbxChatBenutzer.Size = New System.Drawing.Size(93, 17)
+ Me.cbxChatBenutzer.TabIndex = 93
+ Me.cbxChatBenutzer.Text = "Chat-Benutzer"
+ Me.cbxChatBenutzer.UseVisualStyleBackColor = True
+ '
'cbxTestaccount
'
Me.cbxTestaccount.AutoSize = True
@@ -1285,7 +1346,7 @@ Partial Class frmMitarbDetails
'
'txtInfo
'
- Me.txtInfo.Location = New System.Drawing.Point(464, 510)
+ Me.txtInfo.Location = New System.Drawing.Point(464, 555)
Me.txtInfo.Name = "txtInfo"
Me.txtInfo.Size = New System.Drawing.Size(245, 184)
Me.txtInfo.TabIndex = 0
@@ -1337,7 +1398,7 @@ Partial Class frmMitarbDetails
Me.TabPage3.Location = New System.Drawing.Point(4, 22)
Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage3.Size = New System.Drawing.Size(715, 700)
+ Me.TabPage3.Size = New System.Drawing.Size(715, 747)
Me.TabPage3.TabIndex = 1
Me.TabPage3.Text = "Programme"
Me.TabPage3.UseVisualStyleBackColor = True
@@ -1772,46 +1833,12 @@ Partial Class frmMitarbDetails
Me.Label7.TabIndex = 78
Me.Label7.Text = "Berechtigung:"
'
- 'cboFirmaHaupt
- '
- Me.cboFirmaHaupt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cboFirmaHaupt.Enabled = False
- Me.cboFirmaHaupt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.cboFirmaHaupt.FormattingEnabled = True
- Me.cboFirmaHaupt.Location = New System.Drawing.Point(138, 76)
- Me.cboFirmaHaupt.Name = "cboFirmaHaupt"
- Me.cboFirmaHaupt.Size = New System.Drawing.Size(57, 21)
- Me.cboFirmaHaupt.TabIndex = 103
- '
- 'Label54
- '
- Me.Label54.AutoSize = True
- Me.Label54.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label54.Location = New System.Drawing.Point(135, 60)
- Me.Label54.Name = "Label54"
- Me.Label54.Size = New System.Drawing.Size(42, 13)
- Me.Label54.TabIndex = 104
- Me.Label54.Text = "Haupt.:"
- '
- 'cbxChatBenutzer
- '
- Me.cbxChatBenutzer.AutoSize = True
- Me.cbxChatBenutzer.Checked = True
- Me.cbxChatBenutzer.CheckState = System.Windows.Forms.CheckState.Checked
- Me.cbxChatBenutzer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.cbxChatBenutzer.Location = New System.Drawing.Point(304, 194)
- Me.cbxChatBenutzer.Name = "cbxChatBenutzer"
- Me.cbxChatBenutzer.Size = New System.Drawing.Size(93, 17)
- Me.cbxChatBenutzer.TabIndex = 93
- Me.cbxChatBenutzer.Text = "Chat-Benutzer"
- Me.cbxChatBenutzer.UseVisualStyleBackColor = True
- '
'frmMitarbDetails
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.WhiteSmoke
- Me.ClientSize = New System.Drawing.Size(747, 841)
+ Me.ClientSize = New System.Drawing.Size(747, 892)
Me.Controls.Add(Me.TabControl2)
Me.Controls.Add(Me.btnCancel)
Me.Controls.Add(Me.btnOK)
@@ -1992,4 +2019,6 @@ Partial Class frmMitarbDetails
Friend WithEvents Label54 As Label
Friend WithEvents cboFirmaHaupt As ComboBox
Friend WithEvents cbxChatBenutzer As CheckBox
+ Friend WithEvents cboALIASDomain2 As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents txtALIASUser2 As TextBox
End Class
diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb
index 9c48790..3c05e76 100644
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -77,6 +77,16 @@
cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-NCTS (ATILLA)", "VERAG-NCTS"))
cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISU.AT"))
+ cboALIASDomain2.Items.Clear()
+ cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+ cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAGOST", "VERAGOST"))
+ cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+ cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-SBG", "VERAG-SBG"))
+ cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAGNEUHAUS", "VERAGNEUHAUS"))
+ cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-NCTS (ATILLA)", "VERAG-NCTS"))
+ cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISU.AT"))
+
+
cboFirma.Items.Clear()
cboFirma.Items.Add("VERAG")
@@ -229,6 +239,9 @@
cboALIASDomain.changeItem(mitarbeiter.mit_AliasAD_Domain)
txtALIASUser.Text = mitarbeiter.mit_AliasAD_Username
+ cboALIASDomain2.changeItem(mitarbeiter.mit_AliasAD_Domain2)
+ txtALIASUser2.Text = mitarbeiter.mit_AliasAD_Username2
+
If mitarbeiter.mit_firma = "ALL" Then
cboFirma.Text = "ALLE"
@@ -469,6 +482,8 @@
mitarbeiter.mit_TELOTEC_SB = txtTelotecSB.Text
mitarbeiter.mit_AliasAD_Domain = cboALIASDomain._value
mitarbeiter.mit_AliasAD_Username = txtALIASUser.Text
+ mitarbeiter.mit_AliasAD_Domain2 = cboALIASDomain2._value
+ mitarbeiter.mit_AliasAD_Username2 = txtALIASUser2.Text
mitarbeiter.mit_teamId = If(cboTeam._value = "", Nothing, cboTeam._value)
diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb
index a059e52..d898ee3 100644
--- a/UID/My Project/Resources.Designer.vb
+++ b/UID/My Project/Resources.Designer.vb
@@ -635,7 +635,7 @@ Namespace My.Resources
End Property
'''
- ''' Sucht eine lokalisierte Zeichenfolge, die 1.9.2 ähnelt.
+ ''' Sucht eine lokalisierte Zeichenfolge, die 1.9.6 ähnelt.
'''
Friend ReadOnly Property Version() As String
Get
diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx
index 29926e5..b3d62c2 100644
--- a/UID/My Project/Resources.resx
+++ b/UID/My Project/Resources.resx
@@ -188,7 +188,7 @@
Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;
- 1.9.2
+ 1.9.6
..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/UID/Resources/Dienstplan Variabel Monat AMBAR.xlsx b/UID/Resources/Dienstplan Variabel Monat AMBAR.xlsx
new file mode 100644
index 0000000..6542a3f
Binary files /dev/null and b/UID/Resources/Dienstplan Variabel Monat AMBAR.xlsx differ
diff --git a/UID/Resources/Dienstplan Variabel Monat IMEX.xlsx b/UID/Resources/Dienstplan Variabel Monat IMEX.xlsx
index 364c6d6..0732b7d 100644
Binary files a/UID/Resources/Dienstplan Variabel Monat IMEX.xlsx and b/UID/Resources/Dienstplan Variabel Monat IMEX.xlsx differ
diff --git a/UID/Resources/Dienstplan Variabel Monat.xlsx b/UID/Resources/Dienstplan Variabel Monat.xlsx
index 8b7ccfd..4c86139 100644
Binary files a/UID/Resources/Dienstplan Variabel Monat.xlsx and b/UID/Resources/Dienstplan Variabel Monat.xlsx differ
diff --git a/UID/cClasses.vb b/UID/cClasses.vb
index 720de32..f4039f7 100644
--- a/UID/cClasses.vb
+++ b/UID/cClasses.vb
@@ -202,4 +202,93 @@ Public Class cDienstNA
Property dstna_grund As String = ""
Property dstna_info As String = ""
-End Class
\ No newline at end of file
+End Class
+
+
+
+Public Class cDienstMitarbAbweichendeWochenstunden
+ Property dstaw_id As Integer
+ Property dstaw_dstmaId As Integer
+ Property dstaw_von As Date
+ Property dstaw_bis As Date
+ Property dstaw_std As Integer
+
+ Shared Function GET_STD(dstmaId As Integer, datum As Date) As Double
+ Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+ Return sql.getValueTxtBySql("SELECT TOP 1 [dstaw_std] FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and '" & datum.ToShortDateString & "' between dstaw_von and dstaw_bis", "ADMIN",,, -1)
+ End Function
+
+ Shared Function GET_STD_LIST(datum As Date) As List(Of cDienstMitarbAbweichendeWochenstunden)
+ GET_STD_LIST = New List(Of cDienstMitarbAbweichendeWochenstunden)
+ Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+ Dim dt = sql.loadDgvBySql("SELECT * FROM [tblDienstMitarbAbweichendeWochenstunden]", "ADMIN")
+ If dt IsNot Nothing Then
+ For Each r In dt.Rows
+ Dim ABW As New cDienstMitarbAbweichendeWochenstunden
+ ABW.dstaw_id = r("dstaw_id")
+ ABW.dstaw_dstmaId = r("dstaw_dstmaId")
+ ABW.dstaw_von = r("dstaw_von")
+ ABW.dstaw_bis = r("dstaw_bis")
+ ABW.dstaw_std = r("dstaw_std")
+ GET_STD_LIST.Add(ABW)
+ Next
+ End If
+ ' Return sql.getValueTxtBySql("SELECT TOP 1 [dstaw_std] FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and '" & datum.ToShortDateString & "' between dstaw_von and dstaw_bis", "ADMIN",,, -1)
+ End Function
+
+
+ Shared Function GET_STD(dstmaId As Integer, datumMontag As Date, NormalWochenstunden As Integer, TZTagesStunden As Integer) As Double
+ GET_STD = 0
+ Dim abw_bool As Boolean = False
+ Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+
+ Dim exists = sql.getValueTxtBySql("SELECT count(*) FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and dstaw_bis > '" & datumMontag.ToShortDateString & "' ", "ADMIN",,, -1)
+ If exists <= 0 Then Return NormalWochenstunden
+
+ For i = 0 To 4
+ Dim abw = sql.getValueTxtBySql("SELECT TOP 1 [dstaw_std] FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and '" & datumMontag.AddDays(i).ToShortDateString & "' between dstaw_von and dstaw_bis", "ADMIN",,, -1)
+
+ If abw > 0 Then
+ GET_STD += abw / 5
+ abw_bool = True
+ Else
+ If False Then 'TZTagesStunden > 0 Then
+ GET_STD += TZTagesStunden
+ Else
+ GET_STD += NormalWochenstunden / 5
+ End If
+ End If
+ Next
+ If Not abw_bool Then GET_STD = NormalWochenstunden ' Wenn keine Abweicheung, einfach normal belassen...
+ End Function
+
+
+
+ Shared Function GET_STD_LIST(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), dstmaId As Integer, datumMontag As Date, NormalWochenstunden As Integer, TZTagesStunden As Integer) As Double
+ If STD_LIST Is Nothing Then Return NormalWochenstunden
+ GET_STD_LIST = 0
+ Dim abw_bool As Boolean = False
+
+ For i = 0 To 4
+ Dim abw = 0
+ For Each l In STD_LIST
+ If l.dstaw_dstmaId = dstmaId AndAlso (datumMontag.AddDays(i) >= l.dstaw_von And datumMontag.AddDays(i) <= l.dstaw_bis) Then
+ abw = l.dstaw_std
+ End If
+ Next
+
+ If abw > 0 Then
+ GET_STD_LIST += abw / 5
+ abw_bool = True
+ Else
+ If False Then 'TZTagesStunden > 0 Then
+ GET_STD_LIST += TZTagesStunden
+ Else
+ GET_STD_LIST += NormalWochenstunden / 5
+ End If
+ End If
+ Next
+ If Not abw_bool Then GET_STD_LIST = NormalWochenstunden ' Wenn keine Abweicheung, einfach normal belassen...
+ End Function
+
+End Class
diff --git a/UID/cProgramFunctions.vb b/UID/cProgramFunctions.vb
index 5e57551..1c8801c 100644
--- a/UID/cProgramFunctions.vb
+++ b/UID/cProgramFunctions.vb
@@ -901,8 +901,9 @@ Public Class cProgramFunctions
Dim SQLDienst As New cDienstplan
- Public Function getWochenstunden(Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object) As Double
- getWochenstunden = Wochenstunden
+ Public Function getWochenstunden(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object) As Double
+ getWochenstunden = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(STD_LIST, dstma_id, datum, Wochenstunden, If(StdFeiertag, -1))
+
Dim UrlStd As Double = 8
If StdFeiertag IsNot Nothing Then UrlStd = StdFeiertag
@@ -1046,7 +1047,7 @@ Public Class cProgramFunctions
End Function
- Public Sub KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
+ Public Sub KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
Try
Dim SQLDienst As New cDienstplan
@@ -1069,7 +1070,7 @@ Public Class cProgramFunctions
If IsNumeric(ma.dstma_wochenStunden) Then Wochenstunden = ma.dstma_wochenStunden
' MsgBox(Wochenstunden)
- Wochenstunden = cPF.getWochenstunden(Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
+ Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
Dim tatStd As Double = SQLDienst.getDstStunden(r("dstma_id"), datum_montag, datum_montag.AddDays(6), niederlassung)
' : ANDERES ERG"""""!!!!!!!!!!!!!!!!!!!!
diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb
index 02d252c..52c2954 100644
--- a/UID/cSqlDb.vb
+++ b/UID/cSqlDb.vb
@@ -1512,8 +1512,12 @@ 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_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt) 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_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt )"
+ "(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_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 ) 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_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 )"
+
+
+
+
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn)
@@ -1561,11 +1565,23 @@ 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_AliasAD_Domain2", If(m.mit_AliasAD_Domain2, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_AliasAD_Username2", If(m.mit_AliasAD_Username2, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_teamId", If(m.mit_teamId, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ChatBenutzer", m.mit_ChatBenutzer)
cmd.Parameters.AddWithValue("@mit_FirmaHaupt", If(m.mit_FirmaHaupt, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_ChatEasteregg", m.mit_ChatEasteregg)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_SettingsTstmp ", If(m.mit_MAVerzeichnis_SettingsTstmp, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDat ", m.mit_MAVerzeichnis_allowGebDat)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowWohnadresse ", m.mit_MAVerzeichnis_allowWohnadresse)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDatOhneJahr ", m.mit_MAVerzeichnis_allowGebDatOhneJahr)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Spitzname ", If(m.mit_MAVerzeichnis_Spitzname, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_foto_DocId", If(m.mit_foto_DocId, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Motto", If(m.mit_MAVerzeichnis_Motto, DBNull.Value))
+
+
Try
cmd.ExecuteNonQuery()
Return True
@@ -1582,7 +1598,8 @@ 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_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_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " &
+ "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_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " &
+ " ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto " &
" WHERE mit_id=@mit_id "
@@ -1636,11 +1653,24 @@ 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_AliasAD_Domain2", If(m.mit_AliasAD_Domain2, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_AliasAD_Username2", If(m.mit_AliasAD_Username2, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_teamId", If(m.mit_teamId, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ChatBenutzer", m.mit_ChatBenutzer)
cmd.Parameters.AddWithValue("@mit_FirmaHaupt", If(m.mit_FirmaHaupt, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_ChatEasteregg", m.mit_ChatEasteregg)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_SettingsTstmp ", If(m.mit_MAVerzeichnis_SettingsTstmp, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDat ", m.mit_MAVerzeichnis_allowGebDat)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowWohnadresse ", m.mit_MAVerzeichnis_allowWohnadresse)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDatOhneJahr ", m.mit_MAVerzeichnis_allowGebDatOhneJahr)
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Spitzname ", If(m.mit_MAVerzeichnis_Spitzname, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_foto_DocId", If(m.mit_foto_DocId, DBNull.Value))
+ cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Motto", If(m.mit_MAVerzeichnis_Motto, DBNull.Value))
+
+
+
Try
cmd.ExecuteNonQuery()
diff --git a/UID/frmLogin.vb b/UID/frmLogin.vb
index e4991ea..46f7195 100644
--- a/UID/frmLogin.vb
+++ b/UID/frmLogin.vb
@@ -54,9 +54,11 @@ Public Class frmLogin
Dim pf As New cProgramFunctions
Dim kw As Integer = pf.DateToWeek(Now.AddDays(-1)).Substring(4)
Dim year As Integer = Now.AddDays(-1).Year
- If parameter(i) = "initDP_ATILLA" Then pf.KWAbschluss("ATILLA", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
- If parameter(i) = "initDP_SUB" Then pf.KWAbschluss("SUB", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
- If parameter(i) = "initDP_WAI" Then pf.KWAbschluss("WAI", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
+ Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(frmDienstplanVariabel.CalendarWeek(kw, year))
+
+ If parameter(i) = "initDP_ATILLA" Then pf.KWAbschluss(STD_LIST, "ATILLA", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
+ If parameter(i) = "initDP_SUB" Then pf.KWAbschluss(STD_LIST, "SUB", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
+ If parameter(i) = "initDP_WAI" Then pf.KWAbschluss(STD_LIST, "WAI", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
Next
End If
diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb
index 07f0d86..ba45695 100644
--- a/UID/usrctlProcedures.vb
+++ b/UID/usrctlProcedures.vb
@@ -1703,15 +1703,15 @@ Public Class usrctlProcedures
End Function
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
- Dim pf As New cProgramFunctions
+ 'Dim pf As New cProgramFunctions
- For i = CInt(TextBox6.Text) To CInt(TextBox7.Text)
+ 'For i = CInt(TextBox6.Text) To CInt(TextBox7.Text)
- Dim kw = i
- Dim jahr = TextBox5.Text
- pf.KWAbschluss(TextBox4.Text, jahr, kw, getSchicht(kw, jahr))
+ ' Dim kw = i
+ ' Dim jahr = TextBox5.Text
+ ' pf.KWAbschluss(TextBox4.Text, jahr, kw, getSchicht(kw, jahr))
- Next
+ 'Next
End Sub
Function getSchicht(aktWoche, aktJahr) As String
diff --git a/cNCTSPartnerWorker/cNCTS_TR.vb b/cNCTSPartnerWorker/cNCTS_TR.vb
index 299e407..7b0d329 100644
--- a/cNCTSPartnerWorker/cNCTS_TR.vb
+++ b/cNCTSPartnerWorker/cNCTS_TR.vb
@@ -167,6 +167,21 @@ Public Class cNCTS_TR
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ Function GET_SHIPMENTS(Partnersystem, VorpapierArt, VorpapierNr) As List(Of VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL)
+ GET_SHIPMENTS = New List(Of VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL)
+ Dim dt = SQL.loadDgvBySql("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'", "FMZOLL")
+ MsgBox("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'")
+ If dt IsNot Nothing Then
+ For Each r In dt.Rows
+ Dim SH As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(CInt(r("shTr_id")))
+ If SH IsNot Nothing Then
+ GET_SHIPMENTS.Add(SH)
+ End If
+ Next
+ End If
+
+ End Function
+
Sub New()
End Sub
diff --git a/initATLASAufschubkonten/EZollAufschubEinlesen.vb b/initATLASAufschubkonten/EZollAufschubEinlesen.vb
index 7c02f48..329e617 100644
--- a/initATLASAufschubkonten/EZollAufschubEinlesen.vb
+++ b/initATLASAufschubkonten/EZollAufschubEinlesen.vb
@@ -32,7 +32,7 @@ Public Class EZollAufschubEinlesen
LeistungsNr = "76"
Case Else '1BD,0ML, 0PB, 0PG, 0PS, 1LG, 1ZN, 2AS, 2KO, 2RB, 2SB, 2SI, 2VF, 2VS, 5SI, 5VS, 6AK, 6BE, 6MS, 6SS, 6TS, 6ZW, 9EA, D00,D10,E00
LeistungsNr = "482"
- LeistungsBez = getLeistungsBez(d1.Abgabenart)
+ LeistungsBez = DAKOSY_Worker.cZOLL_IMPORT.getLeistungsBez(d1.Abgabenart)
End Select
If saveAbgaben Then
@@ -64,114 +64,6 @@ Public Class EZollAufschubEinlesen
'MsgBox("TEST3")
End Sub
- Function getLeistungsBez(LeistungsBez)
- Select Case LeistungsBez
- Case "0ML"
- getLeistungsBez = "Altlastenbeitrag"
- Case "0PB"
- getLeistungsBez = "Punzierungskontrollgeb. Platin"
- Case "0PG"
- getLeistungsBez = "Punzierungskontrollgebühr Gold"
- Case "0PS"
- getLeistungsBez = "Punzierungskontrollgeb. Silber"
- Case "1BD"
- getLeistungsBez = "Bemessungsdatum"
- Case "1LG"
- getLeistungsBez = "Lagergeld gemäß §104 ZollR-DG"
- Case "1ZK"
- getLeistungsBez = "Kreditzinsen, Säumniszinsen"
- Case "1ZN"
- getLeistungsBez = "Nebenansprüche"
- Case "2AS"
- getLeistungsBez = "Agrarsicherheiten"
- Case "2DU"
- getLeistungsBez = "Antidumping-Sicherheit"
- Case "2EU"
- getLeistungsBez = "EUSt-Sicherheit"
- Case "2IG"
- getLeistungsBez = "Sicherheit EUSt ig. Lieferung"
- Case "2KO"
- getLeistungsBez = "Sicherheit für Kontingent"
- Case "2PE"
- getLeistungsBez = "Sicherheit bei Einfuhrwerten"
- Case "2RB"
- getLeistungsBez = "Sicherheit Bürgerschaft"
- Case "2SB"
- getLeistungsBez = "Summe der befreiten Sicherheit"
- Case "2SI"
- getLeistungsBez = "Sicherheit Geldbetragerlag"
- Case "2VF"
- getLeistungsBez = "Sicherheit bei Verifizierung"
- Case "2VS"
- getLeistungsBez = "Summe der vorg. Sicherheit"
- Case "2ZG"
- getLeistungsBez = "Zusatzzoll Geflügel"
- Case "2ZZ"
- getLeistungsBez = "Zusatzzoll Zucker"
- Case "2ZZ"
- getLeistungsBez = "Zusatzzoll 2ZZ"
- Case "5DU"
- getLeistungsBez = "Antidumping-und Ausgleichszoll"
- Case "5EU"
- getLeistungsBez = "Einfuhrumsatzsteuer"
- Case "5EV"
- getLeistungsBez = "EUSt gem. §26 Abs. 3Z.2UStG"
- Case "5SI"
- getLeistungsBez = "Agrarsicherheit"
- Case "5VS"
- getLeistungsBez = "Verbrauchsteuern"
- Case "5ZO"
- getLeistungsBez = "Zoll 5ZO"
- Case "5ZZ"
- getLeistungsBez = "Zusatzzoll 5ZZ"
- Case "6AK"
- getLeistungsBez = "Alkoholsteuer"
- Case "6BE"
- getLeistungsBez = "Biersteuer"
- Case "6MS"
- getLeistungsBez = "Mineralölsteuer"
- Case "6SS"
- getLeistungsBez = "Schaumweinsteuer"
- Case "6TS"
- getLeistungsBez = "Tabaksteuer"
- Case "6ZW"
- getLeistungsBez = "Zwischenerzeugnissteuer"
- Case "9EA"
- getLeistungsBez = "Summe Gesamtabgaben"
- Case "A00"
- getLeistungsBez = "Zölle auf gewerbliche Waren"
- Case "A00"
- getLeistungsBez = "Zollabgaben"
- Case "A10"
- getLeistungsBez = "Zölle landwirt. Erzeugnisse"
- Case "A20"
- getLeistungsBez = "Zusatzzölle"
- Case "A30"
- getLeistungsBez = "endgültige Antidumpingzölle"
- Case "A35"
- getLeistungsBez = "vorläufige Antidumpingzölle"
- Case "A40"
- getLeistungsBez = "endgültiger Ausgleichszoll"
- Case "A45"
- getLeistungsBez = "vorläufiger Ausgleichszoll"
- Case "B00"
- getLeistungsBez = "Einfuhrumsatzsteuer(EUSt)"
- Case "B10"
- getLeistungsBez = "Ausgleichszinsen(EUSt)"
- Case "C00"
- getLeistungsBez = "Ausfuhrabgaben"
- Case "C10"
- getLeistungsBez = "Ausfuhrabg. landwirt. Erzeug."
- Case "D00"
- getLeistungsBez = "Verzugszinsen"
- Case "D10"
- getLeistungsBez = "Ausgleichszinsen"
- Case "E00"
- getLeistungsBez = "Abgaben anderer Länder"
- Case Else
- getLeistungsBez = ""
- End Select
- End Function
Public Function loadSqlZOLARIS(ByVal datumVon As DateTime, ByVal datumBis As DateTime, Optional where As String = "") As List(Of cEZollData)
Try
diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.Designer.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.Designer.vb
index 650a220..0889910 100644
--- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.Designer.vb
+++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.Designer.vb
@@ -27,6 +27,8 @@ Partial Class frmDYNachrichtenVerarbeitung
Me.btn = New System.Windows.Forms.Button()
Me.pnl = New System.Windows.Forms.Panel()
Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.Label9 = New System.Windows.Forms.Label()
Me.Button2 = New System.Windows.Forms.Button()
Me.Label7 = New System.Windows.Forms.Label()
@@ -37,8 +39,6 @@ Partial Class frmDYNachrichtenVerarbeitung
Me.btnOK = New System.Windows.Forms.Button()
Me.Label2 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
- Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.pnl.SuspendLayout()
CType(Me.dgvEinarbeitung, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
@@ -98,6 +98,18 @@ Partial Class frmDYNachrichtenVerarbeitung
Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145)
Me.dgvEinarbeitung.TabIndex = 18
'
+ 'clmnArt
+ '
+ Me.clmnArt.HeaderText = "Art"
+ Me.clmnArt.Name = "clmnArt"
+ Me.clmnArt.Width = 150
+ '
+ 'Column1
+ '
+ Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+ Me.Column1.HeaderText = "BezugsNr"
+ Me.Column1.Name = "Column1"
+ '
'Label9
'
Me.Label9.AutoSize = True
@@ -199,18 +211,6 @@ Partial Class frmDYNachrichtenVerarbeitung
Me.Label1.TabIndex = 8
Me.Label1.Text = "Einarbeitung:"
'
- 'clmnArt
- '
- Me.clmnArt.HeaderText = "Art"
- Me.clmnArt.Name = "clmnArt"
- Me.clmnArt.Width = 150
- '
- 'Column1
- '
- Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
- Me.Column1.HeaderText = "BezugsNr"
- Me.Column1.Name = "Column1"
- '
'frmDYNachrichtenVerarbeitung
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
index 3d316ff..0f5bd04 100644
--- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
@@ -5154,8 +5154,8 @@ Public Class frmDYNachrichtenVerarbeitung
End If
End Sub
+ Private Sub pnl_Paint(sender As Object, e As PaintEventArgs) Handles pnl.Paint
-
-
+ End Sub
End Class
diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
index b6a4aa7..86b59ef 100644
--- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
@@ -573,10 +573,9 @@ Public Class frmMDMNachrichtenVerarbeitung
currentRow = MyReader.ReadFields()
- If currentRow.Length > 24 Then
+ If currentRow.Length > 24 AndAlso currentRow(12) <> "839160" Then 'KDNR <> VERAG --> Die Kosten bleiben uns
Dim PLOSE As New MDM_Worker.cPLOSE
-
PLOSE.plose_Datensatztyp = SQL.isleernothing(currentRow(0))
PLOSE.plose_KodexMautTankstelle = SQL.isleernothing(currentRow(1))
PLOSE.plose_BeschreibungMautTankstelle = SQL.isleernothing(currentRow(2))
diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb
index 29d15b3..05fcd23 100644
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -81,6 +81,10 @@ Partial Class frmStartOptions
Me.Label6 = New System.Windows.Forms.Label()
Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.TabPage3 = New System.Windows.Forms.TabPage()
+ Me.LinkLabel29 = New System.Windows.Forms.LinkLabel()
+ Me.LinkLabel30 = New System.Windows.Forms.LinkLabel()
+ Me.Label11 = New System.Windows.Forms.Label()
Me.CheckBox2 = New System.Windows.Forms.CheckBox()
Me.LinkLabel25 = New System.Windows.Forms.LinkLabel()
Me.CheckBox1 = New System.Windows.Forms.CheckBox()
@@ -104,10 +108,7 @@ Partial Class frmStartOptions
Me.LinkLabel3 = New System.Windows.Forms.LinkLabel()
Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel()
Me.lblRoutineManager = New System.Windows.Forms.Label()
- Me.TabPage3 = New System.Windows.Forms.TabPage()
- Me.LinkLabel29 = New System.Windows.Forms.LinkLabel()
- Me.LinkLabel30 = New System.Windows.Forms.LinkLabel()
- Me.Label11 = New System.Windows.Forms.Label()
+ Me.CheckBox3 = New System.Windows.Forms.CheckBox()
Me.pnl.SuspendLayout()
Me.tbcntr.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -124,17 +125,18 @@ Partial Class frmStartOptions
Me.TabPage2.SuspendLayout()
CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.TabPage3.SuspendLayout()
CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.TabPage3.SuspendLayout()
Me.SuspendLayout()
'
'pnl
'
Me.pnl.BackColor = System.Drawing.Color.White
Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.pnl.Controls.Add(Me.CheckBox3)
Me.pnl.Controls.Add(Me.tbcntr)
Me.pnl.Controls.Add(Me.CheckBox2)
Me.pnl.Controls.Add(Me.LinkLabel25)
@@ -868,6 +870,50 @@ Partial Class frmStartOptions
Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(119, 21)
Me.txtVRGOut_BezugsNr.TabIndex = 5
'
+ 'TabPage3
+ '
+ Me.TabPage3.Controls.Add(Me.LinkLabel29)
+ Me.TabPage3.Controls.Add(Me.LinkLabel30)
+ Me.TabPage3.Controls.Add(Me.Label11)
+ Me.TabPage3.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage3.Name = "TabPage3"
+ Me.TabPage3.Size = New System.Drawing.Size(780, 395)
+ Me.TabPage3.TabIndex = 2
+ Me.TabPage3.Text = "Partner-Systeme"
+ Me.TabPage3.UseVisualStyleBackColor = True
+ '
+ 'LinkLabel29
+ '
+ Me.LinkLabel29.AutoSize = True
+ Me.LinkLabel29.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.LinkLabel29.Location = New System.Drawing.Point(11, 80)
+ Me.LinkLabel29.Name = "LinkLabel29"
+ Me.LinkLabel29.Size = New System.Drawing.Size(180, 13)
+ Me.LinkLabel29.TabIndex = 24
+ Me.LinkLabel29.TabStop = True
+ Me.LinkLabel29.Text = "Eingangsnachrichten abrufen PROD"
+ '
+ 'LinkLabel30
+ '
+ Me.LinkLabel30.AutoSize = True
+ Me.LinkLabel30.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.LinkLabel30.Location = New System.Drawing.Point(11, 55)
+ Me.LinkLabel30.Name = "LinkLabel30"
+ Me.LinkLabel30.Size = New System.Drawing.Size(177, 13)
+ Me.LinkLabel30.TabIndex = 23
+ Me.LinkLabel30.TabStop = True
+ Me.LinkLabel30.Text = "Eingangsnachrichten abrufen TEST"
+ '
+ 'Label11
+ '
+ Me.Label11.AutoSize = True
+ Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label11.Location = New System.Drawing.Point(11, 28)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(251, 13)
+ Me.Label11.TabIndex = 22
+ Me.Label11.Text = "MAVI Nachrichtenverarbeitung (NCTS TR):"
+ '
'CheckBox2
'
Me.CheckBox2.AutoSize = True
@@ -1135,49 +1181,15 @@ Partial Class frmStartOptions
Me.lblRoutineManager.TabIndex = 1
Me.lblRoutineManager.Text = "Routine Manager"
'
- 'TabPage3
+ 'CheckBox3
'
- Me.TabPage3.Controls.Add(Me.LinkLabel29)
- Me.TabPage3.Controls.Add(Me.LinkLabel30)
- Me.TabPage3.Controls.Add(Me.Label11)
- Me.TabPage3.Location = New System.Drawing.Point(4, 22)
- Me.TabPage3.Name = "TabPage3"
- Me.TabPage3.Size = New System.Drawing.Size(780, 395)
- Me.TabPage3.TabIndex = 2
- Me.TabPage3.Text = "Partner-Systeme"
- Me.TabPage3.UseVisualStyleBackColor = True
- '
- 'LinkLabel29
- '
- Me.LinkLabel29.AutoSize = True
- Me.LinkLabel29.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel29.Location = New System.Drawing.Point(11, 80)
- Me.LinkLabel29.Name = "LinkLabel29"
- Me.LinkLabel29.Size = New System.Drawing.Size(180, 13)
- Me.LinkLabel29.TabIndex = 24
- Me.LinkLabel29.TabStop = True
- Me.LinkLabel29.Text = "Eingangsnachrichten abrufen PROD"
- '
- 'LinkLabel30
- '
- Me.LinkLabel30.AutoSize = True
- Me.LinkLabel30.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.LinkLabel30.Location = New System.Drawing.Point(11, 55)
- Me.LinkLabel30.Name = "LinkLabel30"
- Me.LinkLabel30.Size = New System.Drawing.Size(177, 13)
- Me.LinkLabel30.TabIndex = 23
- Me.LinkLabel30.TabStop = True
- Me.LinkLabel30.Text = "Eingangsnachrichten abrufen TEST"
- '
- 'Label11
- '
- Me.Label11.AutoSize = True
- Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label11.Location = New System.Drawing.Point(11, 28)
- Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(251, 13)
- Me.Label11.TabIndex = 22
- Me.Label11.Text = "MAVI Nachrichtenverarbeitung (NCTS TR):"
+ Me.CheckBox3.AutoSize = True
+ Me.CheckBox3.Location = New System.Drawing.Point(302, 173)
+ Me.CheckBox3.Name = "CheckBox3"
+ Me.CheckBox3.Size = New System.Drawing.Size(103, 17)
+ Me.CheckBox3.TabIndex = 38
+ Me.CheckBox3.Text = "History (1Monat)"
+ Me.CheckBox3.UseVisualStyleBackColor = True
'
'frmStartOptions
'
@@ -1211,12 +1223,12 @@ Partial Class frmStartOptions
Me.TabPage2.PerformLayout()
CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.TabPage3.ResumeLayout(False)
+ Me.TabPage3.PerformLayout()
CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
- Me.TabPage3.ResumeLayout(False)
- Me.TabPage3.PerformLayout()
Me.ResumeLayout(False)
End Sub
@@ -1305,4 +1317,5 @@ Partial Class frmStartOptions
Friend WithEvents LinkLabel29 As LinkLabel
Friend WithEvents LinkLabel30 As LinkLabel
Friend WithEvents Label11 As Label
+ Friend WithEvents CheckBox3 As CheckBox
End Class
diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb
index 901516c..c2c3201 100644
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -621,7 +621,7 @@ Public Class frmStartOptions
Function getUID_Pruefung(maxAnz As Integer) As Boolean
Try
- Dim dt = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefungALL(CDate(Now.ToString("01.MM.yyyy")).AddMonths(-2), True, False, maxAnz, False)
+ Dim dt = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefungALL(CDate(Now.ToString("01.MM.yyyy")).AddMonths(-1), True, False, maxAnz, False)
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim PDF = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False)
If PDF <> "" Then
@@ -935,7 +935,7 @@ Public Class frmStartOptions
End Sub
Private Sub LinkLabel25_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel25.LinkClicked
- importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), Now))
+ importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs)
diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb
index 1a2d4d8..f6cfd6b 100644
--- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb
@@ -520,6 +520,7 @@ Public Class frmTCNachrichtenVerarbeitung
'Art der Anmeldung
Select Case TC.Hea_DecTy
Case "T1", "T2", "T2L" : TC.telanm_ART = TC.Hea_DecTy
+ Case "EUA" : TC.telanm_ART = TC.Hea_DecTy 'EZA
Case Else : TC.telanm_ART = TC.Hea_DecTy '^^
End Select
@@ -534,6 +535,10 @@ Public Class frmTCNachrichtenVerarbeitung
Case "TT131" 'Erledigungsmeldung
TC.telanm_Status = TELOTEC_Worker.cTC_Statusliste.S_60
TC.telanm_Status_KEWILL_Equivalent = TELOTEC_Worker.cTC_Statusliste.S_60
+
+ Case "TT922" 'EZA / Abgabenbescheid
+ TC.telanm_Status = TELOTEC_Worker.cTC_Statusliste.S_60
+ TC.telanm_Status_KEWILL_Equivalent = TELOTEC_Worker.cTC_Statusliste.S_60
Case Else
Return "" 'Nicht erkannt
End Select
@@ -680,6 +685,7 @@ Public Class frmTCNachrichtenVerarbeitung
'TC.CtrlRslt_ResCd = vifDEC.CtrlRslt_ResCd'--> in Schnittstelle nicht vorhanden
TC.CtrlRslt_DLimit = vifDEC.CtrlRslt_DLimit
+
TC.POSITIONSDATEN.Clear() 'Falls DS schon Mal eingearbeitet wurde
If vifDEC.vifDecItem IsNot Nothing AndAlso vifDEC.vifDecItem.Count > 0 Then
For Each vidDescITEM In vifDEC.vifDecItem
@@ -732,12 +738,35 @@ Public Class frmTCNachrichtenVerarbeitung
Next
End If
- TC.POSITIONSDATEN.Add(POS)
+ POS.ABGABEN.Clear() 'Falls DS schon Mal eingearbeitet wurde
+ If vidDescITEM.vifDecDutyCalc IsNot Nothing AndAlso vidDescITEM.vifDecDutyCalc.Count > 0 Then
+ For Each vifDecDutyCalc In vidDescITEM.vifDecDutyCalc
+ Dim ABG As New TELOTEC_Worker.cTelotec_PositionsdatenAbgaben
+
+ ABG.Mandant_ID = vifDecDutyCalc.Mandant_ID
+ ABG.Bereich_ID = vifDecDutyCalc.Bereich_ID
+ ABG.Referenz_ID = vifDecDutyCalc.Referenz_ID
+ ABG.ComIndicator = vifDecDutyCalc.ComIndicator
+ ABG.Pos_ID = vifDecDutyCalc.Pos_ID
+ ABG.DutyCalc_ID = vifDecDutyCalc.DutyCalc_ID
+ ABG.Ty = vifDecDutyCalc.Ty
+ ABG.BaseD = vifDecDutyCalc.BaseD
+ ABG.Curr = vifDecDutyCalc.Curr
+ ABG.Unit = vifDecDutyCalc.Unit
+ ABG.Base = vifDecDutyCalc.Base
+ ABG.Rate = vifDecDutyCalc.Rate
+ ABG.RateUsed = vifDecDutyCalc.RateUsed
+ ABG.Amnt = vifDecDutyCalc.Amnt
+ ABG.MeaID = vifDecDutyCalc.MeaID
+ ABG.TyInd = vifDecDutyCalc.TyInd
+
+ POS.ABGABEN.Add(ABG)
+ Next
+ End If
+ TC.POSITIONSDATEN.Add(POS)
Next
End If
-
-
TC.SICHERHEIT.Clear() 'Falls DS schon Mal eingearbeitet wurde
If vifDEC.vifDecGrteeRef IsNot Nothing AndAlso vifDEC.vifDecGrteeRef.Count > 0 Then
For Each vifDecGrteeRef In vifDEC.vifDecGrteeRef
@@ -756,12 +785,33 @@ Public Class frmTCNachrichtenVerarbeitung
GRT.GVal = vifDecGrteeRef.GVal
GRT.Curr = vifDecGrteeRef.Curr
-
TC.SICHERHEIT.Add(GRT)
Next
End If
+
+
+ TC.ABGABEN.Clear() 'Falls DS schon Mal eingearbeitet wurde
+ If vifDEC.vifDecTotDuties IsNot Nothing AndAlso vifDEC.vifDecTotDuties.Count > 0 Then
+ For Each vifDecTotDuties In vifDEC.vifDecTotDuties
+ Dim ABG As New TELOTEC_Worker.cTelotec_Abgaben
+
+ ABG.Mandant_ID = vifDecTotDuties.Mandant_ID
+ ABG.Bereich_ID = vifDecTotDuties.Bereich_ID
+ ABG.Referenz_ID = vifDecTotDuties.Referenz_ID
+ ABG.ComIndicator = vifDecTotDuties.ComIndicator
+ ABG.TotDuties_ID = vifDecTotDuties.TotDuties_ID
+ ABG.Ty = vifDecTotDuties.Ty
+ ABG.Amnt = vifDecTotDuties.Amnt
+ ABG.TyInd = vifDecTotDuties.TyInd
+ ABG.Erstelldatum = vifDecTotDuties.Erstelldatum
+
+ TC.ABGABEN.Add(ABG)
+ Next
+ End If
+
+
''''Aktuellste Nachricht
If SQL.getValueTxtBySql("Select COUNT(*) FROM [tblTelotec_Anmeldung] WHERE telanm_BezugsNr='" & TC.telanm_BezugsNr & "' and telanm_Status>'" & TC.telanm_Status & "' ", "FMZOLL") > 0 Then
TC.telnam_aktuellsteNachricht = 0
@@ -775,7 +825,8 @@ Public Class frmTCNachrichtenVerarbeitung
If If(TC.telanm_Status, 0) = TELOTEC_Worker.cTC_Statusliste.S_60 Then
' TC.insertIntoSpedBuch()
Dim ZOLLIMPORT As New DAKOSY_Worker.cZOLL_IMPORT
- ZOLLIMPORT.TelotecImport(TC)
+ ZOLLIMPORT.TelotecImport(TC)
+ ZOLLIMPORT.insertAbgabenTELOTEC(TC)
End If
' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME
If TC.telanm_ART = "T1" Or TC.telanm_ART.ToString.Contains("T2") Or TC.telanm_ART.ToString.StartsWith("T-") Then