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

EXG, DY Atilla

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-02-12 12:42:28 +01:00
parent 1270932d29
commit cb798cd22b
8 changed files with 247 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb
View File

@@ -801,7 +801,7 @@ Public Class cDakosyNCTSOut004
End Function
Shared Function LOADByAnmIDFull(ncts_dyaAnmID As String, loadALL As Boolean) As cDakosyNCTSOut004
Shared Function LOADByAnmIDFull(ncts_dyaAnmID As Integer, loadALL As Boolean) As cDakosyNCTSOut004
Try
Dim NCTS As New cDakosyNCTSOut004
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

21
DAKOSY_Worker/cDakosyFunftions.vb
View File

@@ -62,15 +62,18 @@ Public Class cDakosyFunftions
Case "AMBAR"
Return "AMBWO"
Case "VERAG"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
Case "SUB" : Return "SUB"
Case "SBG" : Return "SBG"
Case "NKD" : Return "NKD"
Case "NEU" : Return "NEU"
Case "WAI" : Return "WAI"
Case Else : Return "SUB"
End Select
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing Then
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
Case "SUB" : Return "SUB"
Case "SBG" : Return "SBG"
Case "NKD" : Return "NKD"
Case "NEU" : Return "NEU"
Case "WAI" : Return "WAI"
Case Else : Return "SUB"
End Select
Else
Return "SUB"
End If
Case "UNISPED"
Return ""'"ATSP"
Case "IMEX"

10
DAKOSY_Worker/cZOLL_IMPORT.vb
View File

@@ -337,7 +337,7 @@ Public Class cZOLL_IMPORT
Dim filiale = getFiliale(LRN, filialeBez)
Select Case filiale
Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX"
Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung
Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" ' Return False 'Keine Atoerfassung --> ab 11.02.2025 schon!
Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE"
Case "5601" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
End Select
@@ -958,7 +958,11 @@ Public Class cZOLL_IMPORT
Try
If SPEDITIONSBUCH.Personalnummer Is Nothing Then Return False
If If(SPEDITIONSBUCH.Vermittler, "") = "" Then Return False
Select Case SPEDITIONSBUCH.FilialenNr
Case 4801, 4802
Case Else
If If(SPEDITIONSBUCH.Vermittler, "") = "" Then Return False
End Select
If Not IsNumeric(If(SPEDITIONSBUCH.Abfertigungsart, "")) Then Return False
If SPEDITIONSBUCH.Abfertigungsanzahl = 0 Then Return False
@@ -994,7 +998,7 @@ Public Class cZOLL_IMPORT
End If
Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt As DataTable = VERAGSQL.loadDgvBySql("SELECT isnull(veoant_beznr,'') as veoant_beznr FROM veoant WHERE basman_nr='" & strManNr & "' And basman_nl='" & strManNl & "' And (veoant_beznr LIKE '%" & filiale & "/" & pos & "/" & jahr & "%' OR veoant_beznr LIKE '%" & filiale & "-" & pos & "-" & jahr & "%') AND veoant_stat BETWEEN 50 AND 60 ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr DESC", ATLAS_SERVER_VERBINDUNG)
Dim dt As DataTable = VERAGSQL.loadDgvBySql("Select isnull(veoant_beznr,'') as veoant_beznr FROM veoant WHERE basman_nr='" & strManNr & "' And basman_nl='" & strManNl & "' And (veoant_beznr LIKE '%" & filiale & "/" & pos & "/" & jahr & "%' OR veoant_beznr LIKE '%" & filiale & "-" & pos & "-" & jahr & "%') AND veoant_stat BETWEEN 50 AND 60 ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr DESC", ATLAS_SERVER_VERBINDUNG)
If dt IsNot Nothing Then
For Each r As DataRow In dt.Rows