neu
This commit is contained in:
@@ -436,7 +436,9 @@ Public Class cDakosyEZA
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
|
||||
' Using cmd As New SqlCommand("SELECT TOP 1 * FROM (SELECT * FROM tblDakosy_EZA WHERE eza_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND eza_status BETWEEN 40 and 90 ", "") & " ) AS T order by eza_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE eza_dyaAnmID=dySt_dyId order by dySt_ts desc) desc,eza_LetzteBearbeitung desc ", conn)
|
||||
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EZA WHERE eza_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND eza_status BETWEEN 40 and 90 ", "") & " order by eza_LetzteBearbeitung desc ", conn)
|
||||
' MsgBox("SELECT TOP 1 * FROM tblDakosy_EZA WHERE eza_ObjectName Like " & bezugsNr & " " & If(checkValidStatus, " And eza_status BETWEEN 40 And 90 ", "") & " order by eza_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] inner join tblDakosy_Zollanmeldungen on dy_id = dySt_dyId WHERE eza_dyaAnmID=dy_id order by dySt_ts desc) desc,eza_LetzteBearbeitung desc ")
|
||||
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
If dr.Read Then
|
||||
@@ -1060,18 +1062,18 @@ Public Class cDakosyEZA
|
||||
|
||||
|
||||
For Each ADR In DY.eza_ADRESSEN
|
||||
'Verkäufer
|
||||
If ADR.ezaAd_AdressTyp = "CZ" Then
|
||||
Dim AD = getAdresseFromEORI(ADR.ezaAd_TeilnehmerEORI, SQL)
|
||||
If AD IsNot Nothing Then
|
||||
SPEDITIONSBUCH.AbsenderKundenNr = AD.AdressenNr
|
||||
SPEDITIONSBUCH.Absender = AD.Ordnungsbegriff
|
||||
End If
|
||||
If If(SPEDITIONSBUCH.Absender, "").Trim = String.Empty Then
|
||||
SPEDITIONSBUCH.Absender = (If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "")).trim
|
||||
SPEDITIONSBUCH.Absender &= ", " & If(ADR.ezaAd_LandCode, "")
|
||||
SPEDITIONSBUCH.Absender &= " " & If(ADR.ezaAd_PLZ, "")
|
||||
SPEDITIONSBUCH.Absender &= " " & If(ADR.ezaAd_Ort, "")
|
||||
'Verkäufer
|
||||
If ADR.ezaAd_AdressTyp = "CZ" Then
|
||||
Dim AD = getAdresseFromEORI(ADR.ezaAd_TeilnehmerEORI, SQL)
|
||||
If AD IsNot Nothing Then
|
||||
SPEDITIONSBUCH.AbsenderKundenNr = AD.AdressenNr
|
||||
SPEDITIONSBUCH.Absender = AD.Ordnungsbegriff
|
||||
End If
|
||||
If If(SPEDITIONSBUCH.Absender, "").Trim = String.Empty Then
|
||||
SPEDITIONSBUCH.Absender = (If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "")).trim
|
||||
SPEDITIONSBUCH.Absender &= ", " & If(ADR.ezaAd_LandCode, "")
|
||||
SPEDITIONSBUCH.Absender &= " " & If(ADR.ezaAd_PLZ, "")
|
||||
SPEDITIONSBUCH.Absender &= " " & If(ADR.ezaAd_Ort, "")
|
||||
SPEDITIONSBUCH.Absender = SPEDITIONSBUCH.Absender.Trim
|
||||
If SPEDITIONSBUCH.Absender.Length > 50 Then
|
||||
SPEDITIONSBUCH.Absender = SPEDITIONSBUCH.Absender.Substring(0, 50)
|
||||
@@ -1107,7 +1109,7 @@ Public Class cDakosyEZA
|
||||
Next
|
||||
|
||||
|
||||
If If(SPEDITIONSBUCH.Abfertigungsart, 0) < 1 Then
|
||||
If If(SPEDITIONSBUCH.Abfertigungsart, 0) < 1 Then
|
||||
If DY.eza_FiskalvertretungKz Then
|
||||
SPEDITIONSBUCH.Abfertigungsart = 28
|
||||
Else
|
||||
@@ -1117,48 +1119,48 @@ Public Class cDakosyEZA
|
||||
|
||||
|
||||
SPEDITIONSBUCH.Rechnungsbetrag = DY.eza_Rechnungspreis
|
||||
' SPEDITIONSBUCH.Umrechnungskurs = DY.eza_Rechnungswaehrung
|
||||
SPEDITIONSBUCH.Rohmasse = DY.eza_GesamtRohmasse
|
||||
' SPEDITIONSBUCH.Umrechnungskurs = DY.eza_Rechnungswaehrung
|
||||
SPEDITIONSBUCH.Rohmasse = DY.eza_GesamtRohmasse
|
||||
|
||||
|
||||
'Personal Abfertigung:
|
||||
Try
|
||||
If DY.eza_Bearbeiter IsNot Nothing Then
|
||||
Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE [mit_DAKOSY_SB]='" & DY.eza_Bearbeiter & "'", "ADMIN")
|
||||
SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing)
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Fehler DAKOSY Personal: " & vbNewLine & ex.Message & vbNewLine & ex.StackTrace)
|
||||
End Try
|
||||
'Personal Abfertigung:
|
||||
Try
|
||||
If DY.eza_Bearbeiter IsNot Nothing Then
|
||||
Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE [mit_DAKOSY_SB]='" & DY.eza_Bearbeiter & "'", "ADMIN")
|
||||
SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing)
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Fehler DAKOSY Personal: " & vbNewLine & ex.Message & vbNewLine & ex.StackTrace)
|
||||
End Try
|
||||
|
||||
|
||||
Dim PackstAnz As Integer = 0
|
||||
Dim cnt = 0
|
||||
Dim rohmasseTmp As Double = 0
|
||||
Dim rechnungspreisTmp As Double = 0
|
||||
Dim packst As String = ""
|
||||
For Each p In DY.eza_WARENPOS
|
||||
If p.ezaWP_PackstueckAnzahl IsNot Nothing AndAlso IsNumeric(p.ezaWP_PackstueckAnzahl) Then
|
||||
PackstAnz += p.ezaWP_PackstueckAnzahl
|
||||
packst &= p.ezaWP_PackstueckAnzahl & " "
|
||||
End If
|
||||
If p.ezaWP_PackstueckArt IsNot Nothing Then
|
||||
packst &= p.ezaWP_PackstueckArt & " "
|
||||
End If
|
||||
packst &= If(p.ezaWP_Warenbezeichnung, "") & vbNewLine
|
||||
rohmasseTmp += If(p.ezaWP_Rohmasse, 0)
|
||||
rechnungspreisTmp += If(p.ezaWP_Artikelpreis, 0)
|
||||
If cnt = 0 Then
|
||||
Dim PackstAnz As Integer = 0
|
||||
Dim cnt = 0
|
||||
Dim rohmasseTmp As Double = 0
|
||||
Dim rechnungspreisTmp As Double = 0
|
||||
Dim packst As String = ""
|
||||
For Each p In DY.eza_WARENPOS
|
||||
If p.ezaWP_PackstueckAnzahl IsNot Nothing AndAlso IsNumeric(p.ezaWP_PackstueckAnzahl) Then
|
||||
PackstAnz += p.ezaWP_PackstueckAnzahl
|
||||
packst &= p.ezaWP_PackstueckAnzahl & " "
|
||||
End If
|
||||
If p.ezaWP_PackstueckArt IsNot Nothing Then
|
||||
packst &= p.ezaWP_PackstueckArt & " "
|
||||
End If
|
||||
packst &= If(p.ezaWP_Warenbezeichnung, "") & vbNewLine
|
||||
rohmasseTmp += If(p.ezaWP_Rohmasse, 0)
|
||||
rechnungspreisTmp += If(p.ezaWP_Artikelpreis, 0)
|
||||
If cnt = 0 Then
|
||||
|
||||
End If
|
||||
cnt += 1
|
||||
Next
|
||||
packst = packst.Trim
|
||||
PosAnzahl = DY.eza_WARENPOS.Count
|
||||
SPEDITIONSBUCH.Packstücke = packst
|
||||
End If
|
||||
cnt += 1
|
||||
Next
|
||||
packst = packst.Trim
|
||||
PosAnzahl = DY.eza_WARENPOS.Count
|
||||
SPEDITIONSBUCH.Packstücke = packst & ", " & rohmasseTmp.ToString("N1") & " kg"
|
||||
|
||||
If If(SPEDITIONSBUCH.Rohmasse, 0) = 0 AndAlso rohmasseTmp > 0 Then SPEDITIONSBUCH.Rohmasse = CInt(rohmasseTmp)
|
||||
If If(SPEDITIONSBUCH.Rechnungsbetrag, 0) = 0 AndAlso rechnungspreisTmp > 0 Then SPEDITIONSBUCH.Rechnungsbetrag = (rechnungspreisTmp)
|
||||
If If(SPEDITIONSBUCH.Rohmasse, 0) = 0 AndAlso rohmasseTmp > 0 Then SPEDITIONSBUCH.Rohmasse = CInt(rohmasseTmp)
|
||||
If If(SPEDITIONSBUCH.Rechnungsbetrag, 0) = 0 AndAlso rechnungspreisTmp > 0 Then SPEDITIONSBUCH.Rechnungsbetrag = (rechnungspreisTmp)
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -1302,6 +1304,13 @@ Public Class cDakosy_EZA_Aufschub
|
||||
Property ezaAfb_HZA As Object = Nothing
|
||||
Property ezaAfb_AufschuBIN As Object = Nothing
|
||||
|
||||
Property ezaAfb_Faelligkeit As Object = Nothing
|
||||
Property ezaAfb_Zahlungsart As Object = Nothing
|
||||
Property ezaAfb_Abgabenbetrag As Object = Nothing
|
||||
Property ezaAfb_AbgabeArt As Object = Nothing
|
||||
Property AufschubnehmerName As Object = Nothing
|
||||
|
||||
|
||||
'Public selButton As Object = Nothing ' Für die GUI
|
||||
'Public SA_OBJECT As Object = Nothing ' Für die GUI
|
||||
|
||||
@@ -1327,6 +1336,13 @@ Public Class cDakosy_EZA_Aufschub
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_AufschuBIN", ezaAfb_AufschuBIN))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_HZA", ezaAfb_HZA))
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_Faelligkeit", ezaAfb_Faelligkeit))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_Zahlungsart", ezaAfb_Zahlungsart))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_Abgabenbetrag", ezaAfb_Abgabenbetrag))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_AbgabeArt", ezaAfb_AbgabeArt))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AufschubnehmerName", AufschubnehmerName))
|
||||
|
||||
|
||||
Return list
|
||||
End Function
|
||||
|
||||
|
||||
@@ -505,31 +505,34 @@ Public Class cDakosyNCTSOut
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
|
||||
' Using cmd As New SqlCommand("SELECT TOP 1 * FROM (SELECT * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " ) AS T order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE ncts_dyaAnmID=ncts_dyaAnmID order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ", conn)
|
||||
'Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE ncts_dyaAnmID=ncts_dyaAnmID order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ", conn)
|
||||
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_LetzteBearbeitung desc", conn)
|
||||
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
If dr.Read Then
|
||||
For Each l In NCTS.getParameterList()
|
||||
Dim propInfo As PropertyInfo = NCTS.GetType.GetProperty(l.Scalarvariable)
|
||||
'MsgBox("SELECT TOP 1 * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName LIKE " & bezugsNr & " " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] inner join tblDakosy_Zollanmeldungen on dy_id = dySt_dyId WHERE ncts_dyaAnmID=dy_id order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ")
|
||||
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
If dr.Read Then
|
||||
For Each l In NCTS.getParameterList()
|
||||
Dim propInfo As PropertyInfo = NCTS.GetType.GetProperty(l.Scalarvariable)
|
||||
|
||||
If dr.Item(l.Text) Is DBNull.Value Then
|
||||
propInfo.SetValue(NCTS, Nothing)
|
||||
Else
|
||||
propInfo.SetValue(NCTS, dr.Item(l.Text))
|
||||
If dr.Item(l.Text) Is DBNull.Value Then
|
||||
propInfo.SetValue(NCTS, Nothing)
|
||||
Else
|
||||
propInfo.SetValue(NCTS, dr.Item(l.Text))
|
||||
End If
|
||||
|
||||
Next
|
||||
If loadALL Then
|
||||
NCTS.LOAD_Sicherheitsangaben()
|
||||
NCTS.LOAD_Warenposition()
|
||||
End If
|
||||
|
||||
Next
|
||||
If loadALL Then
|
||||
NCTS.LOAD_Sicherheitsangaben()
|
||||
NCTS.LOAD_Warenposition()
|
||||
dr.Close()
|
||||
Return NCTS
|
||||
End If
|
||||
|
||||
dr.Close()
|
||||
Return NCTS
|
||||
End If
|
||||
dr.Close()
|
||||
End Using
|
||||
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
|
||||
@@ -652,8 +655,42 @@ Public Class cDakosyNCTSOut
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
|
||||
Public Shared Function get_Warenposition(ncts_Id As Integer, Optional loadAll As Boolean = False) As List(Of cDakosy_NCTSOut_Warenposition)
|
||||
Try
|
||||
Dim ncts_WARENPOS As New List(Of cDakosy_NCTSOut_Warenposition)
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
|
||||
Using cmd As New SqlCommand("SELECT * FROM tblDakosy_NCTSOut_Warenposition WHERE nctsWP_NctsId=@ncts_Id ", conn)
|
||||
cmd.Parameters.AddWithValue("@ncts_Id", ncts_Id)
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
While dr.Read
|
||||
Dim l As New cDakosy_NCTSOut_Warenposition()
|
||||
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
|
||||
l.LOAD_WarenpositionPackstuecke()
|
||||
l.LOAD_WarenpositionUnterlagen()
|
||||
ncts_WARENPOS.Add(l)
|
||||
End While
|
||||
dr.Close()
|
||||
End Using
|
||||
End Using
|
||||
Return ncts_WARENPOS
|
||||
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 Nothing
|
||||
End Function
|
||||
|
||||
Function DELETE_Warenpositionen() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
|
||||
Dim sqlstr = " DELETE FROM [tblDakosy_NCTSOut_Warenposition] WHERE nctsWP_NctsId=" & Me.ncts_Id & " "
|
||||
' MsgBox(sqlstr)
|
||||
Return SQL.doSQL(sqlstr, "FMZOLL")
|
||||
End Function
|
||||
|
||||
@@ -1024,7 +1061,7 @@ Public Class cDakosyNCTSOut
|
||||
If sumBrg > 0 Then SPEDITIONSBUCH.Rechnungsbetrag = sumBrg
|
||||
End If
|
||||
|
||||
If packSt.Trim <> String.Empty Then SPEDITIONSBUCH.Packstücke = packSt.Trim
|
||||
If packSt.Trim <> String.Empty Then SPEDITIONSBUCH.Packstücke = packSt.Trim & ", " & CDbl(DY.ncts_GesamtRohmasse).ToString("N1") & " kg"
|
||||
|
||||
If DY.ncts_GesamtRohmasse IsNot Nothing AndAlso IsNumeric(DY.ncts_GesamtRohmasse) Then SPEDITIONSBUCH.Rohmasse = CInt(DY.ncts_GesamtRohmasse) 'CDbl(DY.ncts_GesamtRohmasse).ToString("N2")
|
||||
'Personal Abfertigung:
|
||||
@@ -1212,6 +1249,7 @@ Public Class cDakosy_NCTSOut_Warenposition
|
||||
Property nctsWP_SumAEmpfaenger_Land As Object = Nothing
|
||||
|
||||
|
||||
Property nctsWP_KdRefNr As Object = Nothing
|
||||
|
||||
|
||||
Property nctsWP_PACKSTUECKE As New List(Of cDakosy_NCTSOut_WarenpositionPackstuecke)
|
||||
@@ -1309,6 +1347,7 @@ Public Class cDakosy_NCTSOut_Warenposition
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsWP_SumAEmpfaenger_Ort", nctsWP_SumAEmpfaenger_Ort))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsWP_SumAEmpfaenger_PLZ", nctsWP_SumAEmpfaenger_PLZ))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsWP_SumAEmpfaenger_Land", nctsWP_SumAEmpfaenger_Land))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsWP_KdRefNr", nctsWP_KdRefNr))
|
||||
|
||||
|
||||
Return list
|
||||
|
||||
@@ -4,7 +4,7 @@ Imports System.IO
|
||||
Public Class cDakosyFunftions
|
||||
|
||||
|
||||
Shared Function send_Data_To_Dakosy_FTP(file, dySt_BezugsNr, dy_Id)
|
||||
Shared Function send_Data_To_Dakosy_FTP(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.")
|
||||
@@ -21,7 +21,7 @@ Public Class cDakosyFunftions
|
||||
Dim DY_PFAD_IN = ""
|
||||
Dim DY_PFAD_IN_KD = ""
|
||||
|
||||
getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD)
|
||||
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)
|
||||
@@ -63,7 +63,7 @@ Public Class cDakosyFunftions
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Shared Function send_Data_To_Dakosy_FTP(file, Optional misc = False)
|
||||
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)
|
||||
@@ -76,7 +76,9 @@ Public Class cDakosyFunftions
|
||||
Dim DY_PFAD_IN_KD = ""
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "" Then VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
|
||||
getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD)
|
||||
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)
|
||||
@@ -110,31 +112,31 @@ Public Class cDakosyFunftions
|
||||
End Function
|
||||
|
||||
|
||||
Shared Sub getSFTPLoginData(ByRef DY_server, ByRef DY_name, ByRef DY_pwd, ByRef DY_port, ByRef DY_PFAD_IN, ByRef DY_PFAD_OUT, ByRef DY_PFAD_IN_KD)
|
||||
Shared Sub getSFTPLoginData(ByRef DY_server, ByRef DY_name, ByRef DY_pwd, ByRef DY_port, ByRef DY_PFAD_IN, ByRef DY_PFAD_OUT, ByRef DY_PFAD_IN_KD, FIRMA_DY)
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
|
||||
DY_server = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_SERVER", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_name = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_NAME", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_pwd = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_PASSWORD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_port = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_PORT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_server = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_SERVER", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_name = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_NAME", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_pwd = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_PASSWORD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_port = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_PORT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
|
||||
DY_PFAD_IN = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_PFAD_OUT = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_OUT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_PFAD_IN = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_PFAD_OUT = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_OUT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
If DY_PFAD_IN = "" Then DY_PFAD_IN = "in/test/gebox/"
|
||||
If DY_PFAD_OUT = "" Then DY_PFAD_OUT = "out/test/"
|
||||
|
||||
DY_PFAD_IN_KD = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN_KD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_PFAD_IN_KD = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN_KD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
Else
|
||||
DY_server = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_SERVER", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_name = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_NAME", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_pwd = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_PASSWORD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_port = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_PORT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_server = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_SERVER", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_name = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_NAME", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_pwd = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_PASSWORD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_port = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_PORT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
|
||||
DY_PFAD_IN = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_PFAD_OUT = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_OUT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_PFAD_IN = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
DY_PFAD_OUT = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_OUT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
If DY_PFAD_IN = "" Then DY_PFAD_IN = "in/prod/gebox/"
|
||||
If DY_PFAD_OUT = "" Then DY_PFAD_OUT = "out/prod/"
|
||||
|
||||
DY_PFAD_IN_KD = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN_KD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
|
||||
DY_PFAD_IN_KD = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN_KD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY)
|
||||
End If
|
||||
|
||||
End Sub
|
||||
@@ -188,7 +190,7 @@ Public Class cDakosyFunftions
|
||||
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
|
||||
Dim saveFile = ""
|
||||
If DAKOSY_Worker.cDakosyFunftions.generateVERAGKdData(dt, getDefaultFolder_SEND, saveFile, Dakosy_Mandant) Then
|
||||
If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, True) Then
|
||||
If cDakosyFunftions.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
|
||||
@@ -207,16 +209,16 @@ Public Class cDakosyFunftions
|
||||
' Dakosy_Mandant = "VERG"
|
||||
End Select
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
|
||||
MsgBox("Übertrag derzeit nicht möglich!")
|
||||
Return False
|
||||
End If
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
|
||||
' MsgBox("Übertrag derzeit nicht möglich!")
|
||||
' Return False
|
||||
'End If
|
||||
Dim dt = DAKOSY_Worker.cDakosyFunftions.getKDDataByKdNr(KdNr)
|
||||
|
||||
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
|
||||
Dim saveFile = ""
|
||||
If DAKOSY_Worker.cDakosyFunftions.generateVERAGKdData(dt, getDefaultFolder_SEND, saveFile, Dakosy_Mandant) Then
|
||||
If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, True) Then
|
||||
If cDakosyFunftions.send_Data_To_Dakosy_FTP_file(saveFile, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, True) Then
|
||||
updateKdDakosyExportDate(KdNr)
|
||||
Return True
|
||||
End If
|
||||
@@ -227,7 +229,7 @@ Public Class cDakosyFunftions
|
||||
|
||||
Shared Function getDefaultFolder_SEND() As String
|
||||
Try
|
||||
getDefaultFolder_SEND = "\\192.168.0.91\Datenarchiv\DAKOSY\" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TESTSYSTEM", "ECHTSYSTEM") & "\Ausgang_Kundendaten\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\" ' Path.GetTempPath
|
||||
getDefaultFolder_SEND = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir(False) & "DAKOSY\" & 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
|
||||
@@ -246,6 +248,11 @@ Public Class cDakosyFunftions
|
||||
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)
|
||||
|
||||
@@ -987,8 +987,9 @@ End Class
|
||||
Public Class cDY_Paramter
|
||||
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
Shared Function GET_PARAM_ByName(dyParam_name, TESTSYSTEM) As String
|
||||
Return SQL.getValueTxtBySql("SELECT TOP 1 [dyParam_value] FROM [tbl_DY_Paramter] WHERE [dyParam_name]='" & dyParam_name & "' AND dyParam_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
|
||||
Shared Function GET_PARAM_ByName(dyParam_name, TESTSYSTEM, Optional FIRMA_DY = "") As String
|
||||
If FIRMA_DY = "" Then FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Return SQL.getValueTxtBySql("SELECT TOP 1 [dyParam_value] FROM [tbl_DY_Paramter] WHERE [dyParam_name]='" & dyParam_name & "' AND dyParam_firma='" & FIRMA_DY & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
|
||||
End Function
|
||||
End Class
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
If tryFindAviso(LRN, SPEDBUCH.AvisoID, SPEDBUCH.SendungID) Then
|
||||
If filiale <> "" And abfertigungsnummer <> "" Then
|
||||
If countSpedbuchEntrys(filiale, LRN) = 0 Then
|
||||
If countSpedbuchEntrys(filiale, LRN, art) = 0 Then
|
||||
|
||||
SPEDBUCH.FilialenNr = filiale
|
||||
SPEDBUCH.AbfertigungsNr = abfertigungsnummer
|
||||
@@ -130,7 +130,7 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
SPEDBUCH.Abfertigungsanzahl = 1
|
||||
SPEDBUCH.Fakturiert = 0
|
||||
SPEDBUCH.AtlasBezNrEZA = LRN
|
||||
' SPEDBUCH.AtlasBezNrEZA = LRN
|
||||
SPEDBUCH.Zollsystem = "E"
|
||||
SPEDBUCH.Sachbearbeiter = "AUTO"
|
||||
|
||||
@@ -207,11 +207,23 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
|
||||
|
||||
Shared Function countSpedbuchEntrys(filiale, ncts) As Integer
|
||||
Shared Function countSpedbuchEntrys(filiale, bezugsnr, art) As Integer
|
||||
If art = "NCTS" Then
|
||||
Return countSpedbuchEntrysNCTS(filiale, bezugsnr)
|
||||
Else
|
||||
Return countSpedbuchEntrysEZA(filiale, bezugsnr)
|
||||
End If
|
||||
End Function
|
||||
Shared Function countSpedbuchEntrysNCTS(filiale, ncts) As Integer
|
||||
If If(ncts, "") = "" Then Return 0
|
||||
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AtlasBezNrNCTS='" & ncts & "'", "FMZOLL")
|
||||
End Function
|
||||
|
||||
Shared Function countSpedbuchEntrysEZA(filiale, eza) As Integer
|
||||
If If(eza, "") = "" Then Return 0
|
||||
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AtlasBezNrEZA='" & eza & "'", "FMZOLL")
|
||||
End Function
|
||||
|
||||
Shared Function getFiliale(ByVal bezugsNr, ByRef filialeBez) As String
|
||||
If If(bezugsNr, "").ToString.Length > 4 Then
|
||||
Select Case bezugsNr.ToString.Substring(0, 4)
|
||||
@@ -379,7 +391,7 @@ Public Class cZOLL_IMPORT
|
||||
Dim BelegNrTmp = ""
|
||||
Dim BetragTmp As Double = 0
|
||||
|
||||
If dt.Rows.Count > 0 Then
|
||||
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
|
||||
|
||||
For Each r In dt.Rows
|
||||
If BenutzerTmp = "" Then BenutzerTmp = r("Benutzer")
|
||||
@@ -396,7 +408,7 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("BAR-Err: Beträge konnten nicht geladen werden!" & vbNewLine & ex.Message & ex.StackTrace)
|
||||
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
|
||||
|
||||
'If If(SENDUNG.tblSnd_bar, False) Then
|
||||
@@ -444,6 +456,12 @@ Public Class cZOLL_IMPORT
|
||||
If Aviso.Freigabe > CDate("01.01.2000") Then 'SPEDITIONSBUCH.Abfertigungsdatum Then
|
||||
SPEDITIONSBUCH.Abfertigungsdatum = CDate(Aviso.Freigabe).ToShortDateString
|
||||
End If
|
||||
If Aviso.FreigabeFiliale IsNot Nothing AndAlso IsNumeric(Aviso.FreigabeFiliale) AndAlso Aviso.FreigabeFiliale > 0 Then
|
||||
SPEDITIONSBUCH.FilialenNrHandling = Aviso.FreigabeFiliale
|
||||
'Else
|
||||
' SPEDITIONSBUCH.FilialenNrHandling = SPEDITIONSBUCH.FilialenNr
|
||||
End If
|
||||
|
||||
' pnl3.Visible = True
|
||||
' txtAuftraggeber.Text = Aviso.Auftraggeber
|
||||
' txtAuftraggeberKdNr.Text = Aviso.Auftraggeber_KdNr
|
||||
@@ -481,28 +499,29 @@ Public Class cZOLL_IMPORT
|
||||
SPEDITIONSBUCH.Frachtführer = SENDUNG.tblSnd_Frachtfuehrer
|
||||
If getint(SENDUNG.tblSnd_FrachtfuehrerKdNr) > 0 Then SPEDITIONSBUCH.FrachtführerKundenNr = SENDUNG.tblSnd_FrachtfuehrerKdNr
|
||||
|
||||
|
||||
|
||||
If SENDUNG.tblSnd_BARzuKassieren IsNot Nothing AndAlso IsNumeric(SENDUNG.tblSnd_BARzuKassieren) AndAlso SPEDITIONSBUCH.HandlingZuKassieren <= 0 Then
|
||||
SPEDITIONSBUCH.HandlingZuKassieren = SENDUNG.tblSnd_BARzuKassieren
|
||||
End If
|
||||
|
||||
If SPEDITIONSBUCH.AbsenderKundenNr Is Nothing OrElse SPEDITIONSBUCH.AbsenderKundenNr <= 0 Then
|
||||
If SENDUNG.tblSnd_AbsenderKdNr > 0 Then
|
||||
SPEDITIONSBUCH.AbsenderKundenNr = SENDUNG.tblSnd_AbsenderKdNr
|
||||
If SENDUNG.tblSnd_AbsenderKdNr > 0 Then
|
||||
SPEDITIONSBUCH.AbsenderKundenNr = SENDUNG.tblSnd_AbsenderKdNr
|
||||
End If
|
||||
If SPEDITIONSBUCH.Absender Is Nothing OrElse SPEDITIONSBUCH.Absender = "" Then SPEDITIONSBUCH.Absender = SENDUNG.tblSnd_Absender
|
||||
End If
|
||||
If SPEDITIONSBUCH.EmpfängerKundenNr Is Nothing OrElse SPEDITIONSBUCH.EmpfängerKundenNr <= 0 Then
|
||||
If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr
|
||||
If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger
|
||||
End If
|
||||
|
||||
If SPEDITIONSBUCH.VermittlerKundenNr Is Nothing OrElse SPEDITIONSBUCH.VermittlerKundenNr <= 0 Then
|
||||
|
||||
If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr)
|
||||
If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber
|
||||
End If
|
||||
If SPEDITIONSBUCH.Absender Is Nothing OrElse SPEDITIONSBUCH.Absender = "" Then SPEDITIONSBUCH.Absender = SENDUNG.tblSnd_Absender
|
||||
End If
|
||||
If SPEDITIONSBUCH.EmpfängerKundenNr Is Nothing OrElse SPEDITIONSBUCH.EmpfängerKundenNr <= 0 Then
|
||||
If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr
|
||||
If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger
|
||||
End If
|
||||
|
||||
If SPEDITIONSBUCH.VermittlerKundenNr Is Nothing OrElse SPEDITIONSBUCH.VermittlerKundenNr <= 0 Then
|
||||
|
||||
If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr)
|
||||
If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber
|
||||
End If
|
||||
End If
|
||||
|
||||
SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
||||
SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
||||
SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
|
||||
|
||||
If PosAnzahl > 0 Then
|
||||
@@ -1030,13 +1049,13 @@ Public Class cZOLL_IMPORT
|
||||
' In Euro umrechnen.
|
||||
'HIER
|
||||
If SPEDITIONSBUCH.Abfertigungsdatum IsNot Nothing Then
|
||||
Dim dATLAS2 As DataTable = KDSQL.loadDgvBySql("SELECT baskur_kurs" & _
|
||||
" FROM baskur" & _
|
||||
" WHERE (baskur_code = '" & r.Item("veoerz_baswrg") & "')" & _
|
||||
" AND (baskur_typ = 1 OR baskur_typ = 2)" & _
|
||||
" AND (baskur_gvdat <= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" & _
|
||||
" AND (baskur_gbdat >= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "'as DATETIME))" & _
|
||||
" AND (baskur_wkz = 'EUR')" & _
|
||||
Dim dATLAS2 As DataTable = KDSQL.loadDgvBySql("SELECT baskur_kurs" &
|
||||
" FROM baskur" &
|
||||
" WHERE (baskur_code = '" & r.Item("veoerz_baswrg") & "')" &
|
||||
" AND (baskur_typ = 1 OR baskur_typ = 2)" &
|
||||
" AND (baskur_gvdat <= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" &
|
||||
" AND (baskur_gbdat >= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "'as DATETIME))" &
|
||||
" AND (baskur_wkz = 'EUR')" &
|
||||
" ORDER BY baskur_gvdat DESC, baskur_gbdat DESC", ATLAS_SERVER_VERBINDUNG)
|
||||
|
||||
' rst2 = GetRecordsetADO(strSQL, cnn, adOpenForwardOnly, adLockReadOnly, adCmdText)
|
||||
|
||||
@@ -6,6 +6,11 @@
|
||||
|
||||
Property Colli As String
|
||||
Property Gewicht As String
|
||||
|
||||
|
||||
Property num_Colli As Integer = 0
|
||||
Property num_Gewicht As Double = 0
|
||||
|
||||
Property Rechnungspreis As String
|
||||
Property Warenbezeichung As String
|
||||
|
||||
@@ -19,19 +24,26 @@
|
||||
Property Sachbearbeiter As String
|
||||
|
||||
Property VerBestLandZst As String
|
||||
Property Vorpapier As String
|
||||
|
||||
Property ATCMRN As String
|
||||
|
||||
Property isUeT1 As Boolean = False
|
||||
|
||||
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
'Sub New(BezugsNr, Abfertigungsart)
|
||||
' getDataByBezugsnummer(BezugsNr, Abfertigungsart)
|
||||
'End Sub
|
||||
|
||||
Function getATAMRNBezugsnummer(BezugsNr As String, Abfertigungsart As String) As String
|
||||
If BezugsNr.Length <= 12 Then Return ""
|
||||
Function getATAMRNBezugsnummer(BezugsNr As String, Abfertigungsart As String, DY_Ref As String) As String
|
||||
If If(DY_Ref, "") <> "" Then
|
||||
BezugsNr = DY_Ref
|
||||
Else
|
||||
If BezugsNr.Length <= 12 Then Return ""
|
||||
BezugsNr = BezugsNr & "%"
|
||||
End If
|
||||
|
||||
BezugsNr = BezugsNr & "%"
|
||||
getATAMRNBezugsnummer = ""
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
' Case "IMEX"
|
||||
@@ -42,6 +54,7 @@
|
||||
Case 38, 26 'AT
|
||||
' getADFrom_EZOLL
|
||||
getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr, True) 'Ü-T1
|
||||
isUeT1 = (getATAMRNBezugsnummer <> "")
|
||||
Sachbearbeiter = "" ' Bei Ü-T1 soll der SB leer sein, sonst wird dieser evtl. beim Austragen herangezogen...
|
||||
Case 1, 2, 3, 28, 39
|
||||
getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr, True)
|
||||
@@ -57,9 +70,15 @@
|
||||
|
||||
End Function
|
||||
|
||||
Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String) As Boolean
|
||||
If BezugsNr.Length <= 12 Then Return ""
|
||||
BezugsNr = BezugsNr & "%"
|
||||
Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String, DY_Ref As String) As Boolean
|
||||
If If(DY_Ref, "") <> "" Then
|
||||
BezugsNr = DY_Ref
|
||||
Else
|
||||
If BezugsNr.Length <= 12 Then Return False
|
||||
BezugsNr = BezugsNr & "%"
|
||||
End If
|
||||
|
||||
|
||||
getDataByBezugsnummer = False
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
' Case "UNISPED"
|
||||
@@ -69,6 +88,7 @@
|
||||
Case 38, 26 'AT
|
||||
' getADFrom_EZOLL
|
||||
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True) 'Ü-T1
|
||||
isUeT1 = (getDataByBezugsnummer)
|
||||
Sachbearbeiter = "" ' Bei Ü-T1 soll der SB leer sein, sonst wird dieser evtl. beim Austragen herangezogen...
|
||||
Case 1, 2, 3, 28, 39
|
||||
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
|
||||
@@ -130,7 +150,7 @@
|
||||
EZA.LOAD_Warenposition()
|
||||
|
||||
'
|
||||
If IsNumeric(If(EZA.eza_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(EZA.eza_GesamtRohmasse).ToString("N1") & " kg"
|
||||
If IsNumeric(If(EZA.eza_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(EZA.eza_GesamtRohmasse).ToString("N1") & " kg" : num_Gewicht = CDbl(EZA.eza_GesamtRohmasse).ToString("N1")
|
||||
If IsNumeric(If(EZA.eza_Rechnungspreis, "")) Then Me.Rechnungspreis = CDbl(EZA.eza_Rechnungspreis).ToString("N2")
|
||||
Me.Rechnungspreis &= " " & If(EZA.eza_Rechnungswaehrung, "")
|
||||
ATCMRN = If(EZA.eza_ANR, "")
|
||||
@@ -162,6 +182,7 @@
|
||||
cnt += 1
|
||||
Next
|
||||
End If
|
||||
num_Colli = Colli
|
||||
Me.Colli = Colli & " Pk."
|
||||
|
||||
For Each AD In EZA.eza_ADRESSEN
|
||||
@@ -196,6 +217,12 @@
|
||||
addIfNotExists(AUFSCHUB_List, kto & load_KdFromAKto(kto))
|
||||
Next
|
||||
|
||||
If EZA.eza_VorpapierArtCode IsNot Nothing AndAlso EZA.eza_VorpapierArtCode <> "" AndAlso EZA.eza_VorpapierArtCode <> "OHNE" Then
|
||||
Vorpapier = EZA.eza_VorpapierArtCode
|
||||
If If(EZA.eza_VorpapierNr, "") <> "" Then Vorpapier &= ": " & EZA.eza_VorpapierNr
|
||||
End If
|
||||
|
||||
|
||||
AbgabenKonto = listToString(AUFSCHUB_List)
|
||||
|
||||
|
||||
@@ -223,7 +250,7 @@
|
||||
NCTS.LOAD_Warenposition()
|
||||
|
||||
'
|
||||
If IsNumeric(If(NCTS.ncts_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(NCTS.ncts_GesamtRohmasse).ToString("N1") & " kg"
|
||||
If IsNumeric(If(NCTS.ncts_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(NCTS.ncts_GesamtRohmasse).ToString("N1") & " kg" : num_Gewicht = CDbl(NCTS.ncts_GesamtRohmasse).ToString("N1")
|
||||
|
||||
' Me.Rechnungspreis &= " " & If(NCTS.NCTS_Rechnungswaehrung, "")
|
||||
'Property Absender As String
|
||||
@@ -259,6 +286,7 @@
|
||||
cnt += 1
|
||||
Next
|
||||
End If
|
||||
num_Colli = Colli
|
||||
Me.Colli = Colli & " Pk."
|
||||
Me.Rechnungspreis = Warenwert.ToString("N2") & " " & WarenwertWaehrung
|
||||
|
||||
@@ -329,9 +357,9 @@
|
||||
If DY_TMP Is Nothing Then Return Nothing
|
||||
If NCTS_TMP Is Nothing Then Return Nothing
|
||||
NCTS_TMP.LOAD_Warenposition()
|
||||
|
||||
num_Colli = If(NCTS_TMP.ncts_GesamtAnzahlPackstuecke, 0)
|
||||
Me.Colli = If(NCTS_TMP.ncts_GesamtAnzahlPackstuecke, "") & " Pk."
|
||||
If IsNumeric(If(NCTS_TMP.ncts_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(NCTS_TMP.ncts_GesamtRohmasse).ToString("N1") & " kg"
|
||||
If IsNumeric(If(NCTS_TMP.ncts_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(NCTS_TMP.ncts_GesamtRohmasse).ToString("N1") & " kg" : num_Gewicht = CDbl(NCTS_TMP.ncts_GesamtRohmasse).ToString("N1")
|
||||
|
||||
|
||||
Dim RG_List As New List(Of String)
|
||||
|
||||
Reference in New Issue
Block a user