Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
Imports DAKOSY_Worker
|
||||
Imports System.Windows.Media.Animation
|
||||
Imports DAKOSY_Worker
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
|
||||
@@ -13,12 +15,15 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen
|
||||
Dim sentToDakosy = False
|
||||
|
||||
Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz
|
||||
Dim Standort As String = ""
|
||||
|
||||
|
||||
Property FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
|
||||
|
||||
|
||||
Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String)
|
||||
Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String)
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
|
||||
@@ -26,6 +31,9 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
Me.SENDUNG = SENDUNG
|
||||
Me.FIRMA_DY = FIRMA_DY
|
||||
|
||||
Me.GesamtsicherheitREF = GesamtsicherheitREF
|
||||
Me.Standort = Standort
|
||||
|
||||
|
||||
|
||||
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||
@@ -63,7 +71,25 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
|
||||
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='AA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1", False, "FMZOLL", True)
|
||||
' MsgBox("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='AA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1")
|
||||
cboStammreferenz.changeItem("")
|
||||
|
||||
Select Case Standort
|
||||
Case "VERAG GmbH"
|
||||
For i As Integer = 0 To cboStammreferenz.Items.Count - 1
|
||||
If cboStammreferenz.Items(i).ToString().Contains("MITTICH") Then
|
||||
cboStammreferenz.SelectedIndex = i
|
||||
Exit For
|
||||
End If
|
||||
Next
|
||||
|
||||
|
||||
Case Else
|
||||
|
||||
cboStammreferenz.changeItem("")
|
||||
End Select
|
||||
|
||||
|
||||
|
||||
|
||||
If cboStammreferenz.Items.Count = 2 Then
|
||||
cboStammreferenz.SelectedIndex = 1
|
||||
End If
|
||||
@@ -107,6 +133,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
|
||||
If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen.
|
||||
MsgBox("Gesendet!")
|
||||
createGesamtsicherheitDummy(GesamtsicherheitREF, Standort)
|
||||
Else
|
||||
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
|
||||
MsgBox("Sendefehler!")
|
||||
@@ -182,7 +209,60 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
Return True
|
||||
End Function
|
||||
|
||||
Private Function createGesamtsicherheitDummy(GesSichRef, Standort)
|
||||
|
||||
Try
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
Dim OPEN As New cSicherheiten()
|
||||
Dim firmaId As Integer = -1
|
||||
|
||||
Select Case Standort
|
||||
Case "Verag GmbH"
|
||||
firmaId = 2
|
||||
Case "Verag AG"
|
||||
firmaId = 1
|
||||
Case "Unisped GmbH"
|
||||
firmaId = 21
|
||||
Case "AMBAR GmbH"
|
||||
firmaId = 24
|
||||
Case "Verag CS"
|
||||
firmaId = 11
|
||||
Case "IMEX"
|
||||
firmaId = 20
|
||||
|
||||
End Select
|
||||
|
||||
With OPEN
|
||||
.gs_gsNr = SQL.getValueTxtBySql("select MAX([gs_gsNr]) + 1 as MaxGesSich from tblGesamtsicherheit", "AVISO")
|
||||
.gs_ATBNr = SENDUNG.tblSnd_ATB_T1
|
||||
.gs_posNr = 1
|
||||
.gs_MRNNr = ""
|
||||
.gs_posSubNr = 1
|
||||
.gs_datum = Today()
|
||||
.gs_warenwert = SENDUNG.tblSnd_Warenwert
|
||||
.gs_sicherheitsbetrag = Math.Round(SENDUNG.tblSnd_Warenwert * (GesSichRef.gsr_zollsatz / 100))
|
||||
.gs_standort = Me.Standort
|
||||
.gs_art = "OPEN"
|
||||
.gs_erstellungsdatum = CDate(DateTime.Now)
|
||||
.gs_freitext = "DUMMY"
|
||||
.gs_saldo = GesSichRef.gsr_Saldo
|
||||
.gs_atr = "0"
|
||||
.gs_zollsatz = GesSichRef.gsr_zollsatz
|
||||
.gs_avisoId = AVISO.AvisoID
|
||||
.gs_filialenNr = SENDUNG.FilialenNr
|
||||
.gs_abfertigungsnr = SENDUNG.AbfertigungsNr
|
||||
.SAVE()
|
||||
|
||||
End With
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
|
||||
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
Imports DAKOSY_Worker
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class frmZollanmeldung
|
||||
Dim ART As String = ""
|
||||
@@ -19,6 +20,10 @@ Public Class frmZollanmeldung
|
||||
|
||||
Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = Nothing
|
||||
|
||||
Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz = Nothing
|
||||
Dim Standort As String = ""
|
||||
|
||||
|
||||
|
||||
Sub New(ART As String, DY As DAKOSY_Worker.cDakosy_Zollanmeldungen, Optional ZOLL_SYSTEM As String = "DAKOSY") ', JAHR As Integer) ', Optional ZA = Nothing)
|
||||
|
||||
@@ -72,6 +77,39 @@ Public Class frmZollanmeldung
|
||||
End Sub
|
||||
|
||||
|
||||
Sub New(ART As String, DY As DAKOSY_Worker.cDakosy_Zollanmeldungen, AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, JAHR As Integer, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, Optional ZOLL_SYSTEM As String = "DAKOSY") ', Optional ZA = Nothing)
|
||||
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
' If DY Is Nothing Then DY = New DAKOSY_Worker.cDakosy_Zollanmeldungen
|
||||
|
||||
Me.DY = DY
|
||||
Me.AVISO = AVISO
|
||||
Me.ART = ART
|
||||
Me.SENDUNG = SENDUNG
|
||||
Me.JAHR = JAHR
|
||||
Me.ZOLL_SYSTEM = ZOLL_SYSTEM
|
||||
|
||||
Me.GesamtsicherheitREF = GesamtsicherheitREF
|
||||
Me.Standort = Standort
|
||||
|
||||
If SENDUNG IsNot Nothing Then
|
||||
Me.FilialenNr = SENDUNG.FilialenNr
|
||||
Me.AbfertigungsNr = SENDUNG.AbfertigungsNr
|
||||
End If
|
||||
' If ZA IsNot Nothing Then
|
||||
'Select Case ZA.GetType.ToString
|
||||
' Case GetType(DAKOSY_Worker.cDakosyNCTSOut).ToString : NCTS = ZA
|
||||
' Case GetType(DAKOSY_Worker.cDakosyAES).ToString : AES = ZA
|
||||
' End Select
|
||||
' End If
|
||||
|
||||
|
||||
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
|
||||
@@ -210,7 +248,7 @@ Public Class frmZollanmeldung
|
||||
End If
|
||||
|
||||
Case "AA" 'AnkunftsAnzeige
|
||||
Dim usrcntl As New usrCntlATLAS_AnkunftsAnzeige(AVISO, SENDUNG, FIRMA_DY)
|
||||
Dim usrcntl As New usrCntlATLAS_AnkunftsAnzeige(AVISO, SENDUNG, FIRMA_DY, GesamtsicherheitRef, Standort)
|
||||
usrcntl.Dock = DockStyle.Fill
|
||||
Me.pnl.Controls.Add(usrcntl)
|
||||
Me.Text = "AnkunftsAnzeige - Verwahrung"
|
||||
|
||||
@@ -1220,7 +1220,7 @@ Public Class cAvisoDAL
|
||||
Return daten
|
||||
End Function
|
||||
|
||||
Public Function Suche_LKW(LKW_Nr As String) As String
|
||||
Public Function Suche_LKW(ByRef LKW_Nr As String, ByRef Optional avisoID As Integer = 1) As String
|
||||
'hier wird nachgesehen, wann diese LKW-Nr zuletzt eingetragen war
|
||||
|
||||
|
||||
@@ -1236,7 +1236,9 @@ Public Class cAvisoDAL
|
||||
If CDate(VarToDate(dr.Item("Datum"))) > Now.AddDays(-4) Then
|
||||
Suche_LKW = "Achtung: der LKW mit der Nr. " & LKW_Nr & " wurde bereits vor kurzem eingetragen - und zwar am " &
|
||||
Format(CDate(VarToDate(dr.Item("Datum"))), "ddd, dd.MM.yyyy - HH:mm")
|
||||
avisoID = CInt(dr.Item("AvisoID"))
|
||||
End If
|
||||
|
||||
End If
|
||||
dr.Close()
|
||||
End Using
|
||||
@@ -1245,7 +1247,7 @@ Public Class cAvisoDAL
|
||||
Return Suche_LKW
|
||||
End Function
|
||||
|
||||
Public Function Suche_LKWStatus(LKW_Nr As String) As String
|
||||
Public Function Suche_LKWStatus(ByRef LKW_Nr As String, Optional ByRef AVISOID As Integer = -1) As String
|
||||
'hier wird nachgesehen, wann diese LKW-Nr zuletzt eingetragen war
|
||||
Suche_LKWStatus = ""
|
||||
|
||||
@@ -1269,6 +1271,7 @@ Public Class cAvisoDAL
|
||||
dr.Read()
|
||||
Suche_LKWStatus = "Achtung: der LKW mit der Nr. " & LKW_Nr & " existiert bereits mit dem Status '" & cGlobal.getStatusText(VarToInt2(dr.Item("Status"))) & "', Eingetragen, am " &
|
||||
Format(CDate(VarToDate(dr.Item("Datum"))), "ddd, dd.MM.yyyy - HH:mm")
|
||||
AVISOID = CInt(dr.Item("AvisoID"))
|
||||
End If
|
||||
dr.Close()
|
||||
End Using
|
||||
|
||||
@@ -326,7 +326,7 @@ Public Class cMessenger
|
||||
Public Sub LOAD_ByLKW(chat_AvisoId As Integer, chat_SendungsId As Integer, chat_art As String, Optional topMax As String = "", Optional dateTmp As Object = Nothing)
|
||||
Try
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
|
||||
Using cmd As New SqlCommand("Select * FROM tblMessenger_Chat WHERE chat_AvisoId=@chat_AvisoId " & If(chat_SendungsId > 0, " AND chat_SendungsId=chat_SendungsId ", "") & " AND chat_art='" & chat_art & "'", conn)
|
||||
Using cmd As New SqlCommand("Select * FROM tblMessenger_Chat WHERE chat_AvisoId=@chat_AvisoId " & If(chat_SendungsId > 0, " AND chat_SendungsId=@chat_SendungsId ", "") & " AND chat_art='" & chat_art & "'", conn)
|
||||
cmd.Parameters.AddWithValue("@chat_AvisoId", chat_AvisoId)
|
||||
cmd.Parameters.AddWithValue("@chat_SendungsId", chat_SendungsId)
|
||||
cmd.Parameters.AddWithValue("@chat_art", chat_art)
|
||||
|
||||
@@ -978,6 +978,7 @@ Public Class cStandardofferten
|
||||
Me.LeistungsBez = LeistungsBez
|
||||
LOAD()
|
||||
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("OffertenNr", OffertenNr))
|
||||
@@ -1085,5 +1086,28 @@ Public Class cStandardofferten
|
||||
Return ""
|
||||
End Function
|
||||
|
||||
Public Shared Sub updateBezeichnung_MULTILINGUAL(Währungscode As String, LeistungsNr As Integer, LeistungsBez As String, LeistungsBez_EN As String, LeistungsBez_RO As String, LeistungsBez_TR As String)
|
||||
|
||||
|
||||
If Währungscode <> "" AndAlso LeistungsNr > 0 And LeistungsBez <> "" Then
|
||||
|
||||
Dim UPDATESTRING As String = ""
|
||||
|
||||
If LeistungsBez_EN <> "" Then UPDATESTRING &= " [LeistungsBez_EN] = '" & LeistungsBez_EN & "',"
|
||||
If LeistungsBez_TR <> "" Then UPDATESTRING &= " [LeistungsBez_TR] = '" & LeistungsBez_TR & "',"
|
||||
If LeistungsBez_RO <> "" Then UPDATESTRING &= " [LeistungsBez_RO] = '" & LeistungsBez_RO & "',"
|
||||
|
||||
If UPDATESTRING <> "" Then
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
SQL.doSQL("UPDATE [Standardofferten] SET " & UPDATESTRING & " aktualisiert = getDate() WHERE Währungscode='" & Währungscode & "' AND LeistungsNr=" & LeistungsNr & " AND LeistungsBez='" & LeistungsBez & "'", "FMZOLL")
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
|
||||
@@ -95,6 +95,7 @@ Public Class cSendungen
|
||||
|
||||
Property tblSnd_ATB_Nr As Object = Nothing
|
||||
Property tblSnd_ATB_T1 As Object = Nothing
|
||||
Property tblSnd_T1_Frist As Object = Nothing
|
||||
|
||||
Property tblSnd_Vorpapier As Object = Nothing
|
||||
Property tblSnd_Vorpapier_Pos As Object = Nothing
|
||||
@@ -489,7 +490,7 @@ Public Class cSendungen
|
||||
Me.tblSnd_Firma = SQL.checkNullReturnValue(dr.Item("tblSnd_Firma"), Nothing)
|
||||
Me.tblSnd_Cluster = SQL.checkNullReturnValue(dr.Item("tblSnd_Cluster"), Nothing)
|
||||
Me.tblSnd_ATBFakturieren = SQL.checkNullReturnValue(dr.Item("tblSnd_ATBFakturieren"), Nothing)
|
||||
|
||||
Me.tblSnd_T1_Frist = SQL.checkNullReturnValue(dr.Item("tblSnd_T1_Frist"), Nothing)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ Public Class cDatev_Interface
|
||||
|
||||
'STAMMDATEN
|
||||
Shared Function getStammdaten(filialNr As Integer) As DataTable
|
||||
Dim sqlStr = "Select right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ, isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse], isnull(Adressen.landkz,'') as [Länderkennzeichen]"
|
||||
Dim sqlStr = "Select right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ, isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse], isnull(Adressen.landkz,'') as [Länderkennzeichen], isnull(Kunden.Zahlungsziel, 10) as ZahlungszielInTagen"
|
||||
sqlStr &= " FROM Adressen INNER JOIN Kunden ON Kundennr=AdressenNr "
|
||||
sqlStr &= " LEFT JOIN tblKundenErweitert ON KundenNr=kde_KundenNr "
|
||||
sqlStr &= " LEFT JOIN [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz "
|
||||
@@ -76,7 +76,10 @@ Public Class cDatev_Interface
|
||||
personenRow &= FormatStringDVO(row("Bankkonto")) & ";"
|
||||
personenRow &= emptyFormatedValue()
|
||||
personenRow &= FormatStringDVO(row("IBAN")) & ";"
|
||||
personenRow &= emptyFormatedValue(197)
|
||||
personenRow &= emptyFormatedValue(65)
|
||||
personenRow &= FormatStringDVO(row("ZahlungszielInTagen")) & ";"
|
||||
personenRow &= emptyFormatedValue(144)
|
||||
|
||||
|
||||
Return personenRow
|
||||
|
||||
|
||||
Reference in New Issue
Block a user