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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2020-11-05 07:59:47 +01:00
parent dcb3cea10e
commit 3b532b0a10
37 changed files with 2804 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb
View File

@@ -10,7 +10,7 @@
Dim freetoselect = False
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim SelectNL = False
Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Sub New(land, verfahren, freetoselect, Optional Kdnr = Nothing, Optional nl = Nothing, Optional FIRMA_DY = "")
@@ -29,7 +29,7 @@
End Sub
Private Sub frmDakosyStammreferenz_Load(sender As Object, e As EventArgs) Handles Me.Load
SelectNL = False
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
@@ -43,7 +43,7 @@
Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = If(nl <> "", nl, "IME")
Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSP"
Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" : SelectNL = True
End Select
cboVerfahren.Items.Clear()
@@ -89,7 +89,7 @@
.RowTemplate.Height = 30
.RowTemplate.DefaultCellStyle.Font = New Font(Me.Font.FontFamily, 10)
.DataSource = SQL.loadDgvBySql("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung],isnull(dySr_dyId,-1) as dySr_dyId,dySr_dy_Standard,dySr_dy_Niederlassung,dySr_dy_Mandant FROM [tblDakosy_Stammreferenzen] LEFT JOIN Adressen ON AdressenNr=dyStr_KdNr WHERE dySr_Land='" & cboLand._value & "' AND dySr_Verfahren='" & cboVerfahren._value & "' and dySr_dy_Mandant='" & txtDyMandant.Text & "' /* and (dySr_dy_Niederlassung is null or dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' ) */ and dySr_visible=1 " & where & " order by dySr_Bezeichnung ", "FMZOLL")
.DataSource = SQL.loadDgvBySql("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung],isnull(dySr_dyId,-1) as dySr_dyId,dySr_dy_Standard,dySr_dy_Niederlassung,dySr_dy_Mandant FROM [tblDakosy_Stammreferenzen] LEFT JOIN Adressen ON AdressenNr=dyStr_KdNr WHERE dySr_Land='" & cboLand._value & "' AND dySr_Verfahren='" & cboVerfahren._value & "' and dySr_dy_Mandant='" & txtDyMandant.Text & "' " & If(SelectNL, " AND dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' ", "") & " /* and (dySr_dy_Niederlassung is null or dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' ) */ and dySr_visible=1 " & where & " order by dySr_Bezeichnung ", "FMZOLL")
.Columns("dySr_dyId").Visible = False
.Columns("dySr_Stammreferenz").Visible = False
.Columns("dySr_dy_Standard").Visible = False
@@ -115,7 +115,7 @@
.RowTemplate.Height = 30
.RowTemplate.DefaultCellStyle.Font = New Font(Me.Font.FontFamily, 10)
.DataSource = SQL.loadDgvBySql("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung],isnull(dySr_dyId,-1) as dySr_dyId,dySr_dy_Standard,dyStr_KdNr,Ordnungsbegriff,dySr_dy_Niederlassung FROM [tblDakosy_Stammreferenzen] LEFT JOIN Adressen ON AdressenNr=dyStr_KdNr WHERE dySr_Land='" & cboLand._value & "' AND dySr_Verfahren='" & cboVerfahren._value & "' and dySr_dy_Mandant='" & txtDyMandant.Text & "' /*and (dySr_dy_Niederlassung is null or dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' )*/ and dySr_visible=1 " & where & " order by dyStr_KdNr,dySr_Bezeichnung ", "FMZOLL")
.DataSource = SQL.loadDgvBySql("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung],isnull(dySr_dyId,-1) as dySr_dyId,dySr_dy_Standard,dyStr_KdNr,Ordnungsbegriff,dySr_dy_Niederlassung FROM [tblDakosy_Stammreferenzen] LEFT JOIN Adressen ON AdressenNr=dyStr_KdNr WHERE dySr_Land='" & cboLand._value & "' AND dySr_Verfahren='" & cboVerfahren._value & "' and dySr_dy_Mandant='" & txtDyMandant.Text & "' " & If(SelectNL, " AND dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' ", "") & " /*and (dySr_dy_Niederlassung is null or dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' )*/ and dySr_visible=1 " & where & " order by dyStr_KdNr,dySr_Bezeichnung ", "FMZOLL")
.Columns("dySr_dyId").Visible = False
.Columns("dySr_Stammreferenz").Visible = False
.Columns("dySr_dy_Standard").Visible = False

1
SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmStammreferenzPopup.vb
View File

@@ -54,6 +54,7 @@
Case "ATIL"
cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("alle", ""))
cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUW", "SUW"))
cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBWO", "AMBWO"))
End Select
cboNL.changeItem(nl)

2
SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb
View File

@@ -72,7 +72,7 @@
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") And FilialenNr = 5501 Then
FIRMA_DY = "IMEX"
ElseIf FilialenNr = 5701 Then
FIRMA_DY = "AMBWO"
FIRMA_DY = "AMBAR"
Else
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then