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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
d.breimaier
2026-03-19 13:38:54 +01:00
parent 297365fec6 b639457bc1
commit bf46d47e77
6 changed files with 290 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb
View File

@@ -189,21 +189,28 @@ Public Class usrCntlATLAS_EZA
POSITIONEN = New usrCntlATLAS_EZA_Positionen(EZA, Me)
DV1 = New usrCntlATLAS_EZA_DV1(EZA)
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
'Case "SUB" : txtDyNiederlassung.Text = "VERG"
'Case "SUW" : txtDyNiederlassung.Text = "ATIL"
''Case "SBG" : txtDyNiederlassung.Text = "IMEX"
'Case "NEU" : txtDyNiederlassung.Text = "IMEX"
'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
'End Select
Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
End Select
'Select Case FIRMA_DY
' Case "VERAG" : txtDyMandant.Text = "VERG"
' txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' sdf
' ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' 'Case "SUB" : txtDyNiederlassung.Text = "VERG"
' 'Case "SUW" : txtDyNiederlassung.Text = "ATIL"
' ''Case "SBG" : txtDyNiederlassung.Text = "IMEX"
' 'Case "NEU" : txtDyNiederlassung.Text = "IMEX"
' 'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
' 'End Select
' Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
' Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
' Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
' Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
'End Select
'FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me) ??? AUch gut ??
txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY, "EZA")
txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY, "EZA")
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung='" & txtDyNiederlassung.Text.Replace("DTB", "SUB") & "' and dySr_visible=1", False, "FMZOLL", True)

33
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb
View File

@@ -162,22 +162,25 @@ Public Class usrCntlATLAS_NCTS004
AusGestllungToolStripMenuItem.Visible = True
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
'Case "SUB" : txtDyNiederlassung.Text = "VERG"
'Case "SUW" : txtDyNiederlassung.Text = "ATIL"
''Case "SBG" : txtDyNiederlassung.Text = "IMEX"
'Case "NEU" : txtDyNiederlassung.Text = "IMEX"
'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
'End Select
Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
End Select
'Select Case FIRMA_DY
' Case "VERAG" : txtDyMandant.Text = "VERG"
' txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' 'Case "SUB" : txtDyNiederlassung.Text = "VERG"
' 'Case "SUW" : txtDyNiederlassung.Text = "ATIL"
' ''Case "SBG" : txtDyNiederlassung.Text = "IMEX"
' 'Case "NEU" : txtDyNiederlassung.Text = "IMEX"
' 'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
' 'End Select
' Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
' Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
' Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
' Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
'End Select
' FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me)?
txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY)
txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY, "NCTS")
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text.Replace("DTB", "SUB") & "') and dySr_visible=1", False, "FMZOLL", True)
cboStammreferenz.changeItem("")

34
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb
View File

@@ -43,21 +43,25 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Datensatz an ZOLL senden", DY_ObjektAktion.OBJ_SEND))
cboDakosyAction.changeItem(DY_ObjektAktion.OBJ_CREATE)
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
'Case "SUB" : txtDyNiederlassung.Text = "VERG"
'Case "SUW" : txtDyNiederlassung.Text = "ATIL"
''Case "SBG" : txtDyNiederlassung.Text = "IMEX"
'Case "NEU" : txtDyNiederlassung.Text = "IMEX"
'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
'End Select
Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
Case "IMEX" : txtDyMandant.Text = "VERG" : txtDyNiederlassung.Text = "SUB" 'VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG 'txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
End Select
'Select Case FIRMA_DY
' Case "VERAG" : txtDyMandant.Text = "VERG"
' txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' 'Case "SUB" : txtDyNiederlassung.Text = "VERG"
' 'Case "SUW" : txtDyNiederlassung.Text = "ATIL"
' ''Case "SBG" : txtDyNiederlassung.Text = "IMEX"
' 'Case "NEU" : txtDyNiederlassung.Text = "IMEX"
' 'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
' 'End Select
' Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
' Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
' Case "IMEX" : txtDyMandant.Text = "VERG" : txtDyNiederlassung.Text = "SUB" 'VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG 'txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
' Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
'End Select
txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY, "AA")
txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY, "AA")
Dim BezugsNr As String = ""