Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024
This commit is contained in:
@@ -5425,7 +5425,7 @@ mwst:
|
||||
Case 1, 3, 5, 7, 26, 28, 38, 39, 29, 66
|
||||
Dim docID As Integer = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, 13567402, 13638537)
|
||||
|
||||
Dim exists = dgv.Rows.Cast(Of DataGridViewRow)().Any(Function(r) Not r.IsNewRow AndAlso CInt(r.Cells("anh_docId").Value) = docID)
|
||||
Dim exists = dgv.Rows.Cast(Of DataGridViewRow)().Any(Function(r) Not r.IsNewRow AndAlso CInt(r.Cells("clmnDsId").Value) = docID)
|
||||
|
||||
If Not exists Then
|
||||
dgv.Rows.Add(1, "INFO", "CBAM-FLYER", docID, 0)
|
||||
|
||||
@@ -11,12 +11,13 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz
|
||||
Dim Standort As String = ""
|
||||
Dim gsnr As Integer = -1
|
||||
Dim WarenwertEUR As Double = 0
|
||||
|
||||
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, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, gsnr As Integer)
|
||||
Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, gsnr As Integer, WarenwertEUR As Double)
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
|
||||
@@ -27,6 +28,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
Me.GesamtsicherheitREF = GesamtsicherheitREF
|
||||
Me.Standort = Standort
|
||||
Me.gsnr = gsnr
|
||||
Me.WarenwertEUR = WarenwertEUR
|
||||
|
||||
|
||||
|
||||
@@ -76,8 +78,6 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
If cboStammreferenz.Items.Count = 2 Then
|
||||
cboStammreferenz.SelectedIndex = 1
|
||||
End If
|
||||
@@ -135,7 +135,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, BezugsNrBez, dy_Id, FIRMA_DY) Then
|
||||
If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen.
|
||||
MsgBox("Gesendet!")
|
||||
createGesamtsicherheitDummy(GesamtsicherheitREF, Standort, txtWarenort.Text, gsnr)
|
||||
createGesamtsicherheitDummy(GesamtsicherheitREF, Standort, txtWarenort.Text, gsnr, WarenwertEUR)
|
||||
Else
|
||||
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
|
||||
MsgBox("Sendefehler!")
|
||||
@@ -211,7 +211,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
Return True
|
||||
End Function
|
||||
|
||||
Private Function createGesamtsicherheitDummy(GesSichRef, Standort, Warenort, gsnr)
|
||||
Private Function createGesamtsicherheitDummy(GesSichRef As cGesamtsicherheitsReferenz, Standort As String, Warenort As String, gsnr As Integer, WarenwertEUR As Double)
|
||||
|
||||
Try
|
||||
|
||||
@@ -244,8 +244,8 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
.gs_MRNNr = ""
|
||||
.gs_posSubNr = Nothing
|
||||
.gs_datum = Today()
|
||||
.gs_warenwert = SENDUNG.tblSnd_Warenwert
|
||||
.gs_sicherheitsbetrag = Math.Round(SENDUNG.tblSnd_Warenwert * (GesSichRef.gsr_zollsatz / 100), 2)
|
||||
.gs_warenwert = WarenwertEUR
|
||||
.gs_sicherheitsbetrag = Math.Round(WarenwertEUR * (GesSichRef.gsr_zollsatz / 100), 2)
|
||||
.gs_standort = Me.Standort
|
||||
.gs_art = "OPEN"
|
||||
.gs_datum = DateTime.Now
|
||||
@@ -302,7 +302,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
|
||||
|
||||
CLOSED_DUMMY.SAVE()
|
||||
|
||||
GesSichRef.calcSaldo()
|
||||
GesSichRef.CalcSaldo()
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
|
||||
@@ -23,6 +23,7 @@ Public Class frmZollanmeldung
|
||||
Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz = Nothing
|
||||
Dim Standort As String = ""
|
||||
Dim gsnr As Integer = -1
|
||||
Dim WarenwertEUR As Double = 0
|
||||
|
||||
|
||||
|
||||
@@ -78,7 +79,7 @@ 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 gsnr As Integer = -1, Optional ZOLL_SYSTEM As String = "DAKOSY") ', Optional ZA = Nothing)
|
||||
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, WarenwertEUR As Double, Optional gsnr As Integer = -1, Optional ZOLL_SYSTEM As String = "DAKOSY") ', Optional ZA = Nothing)
|
||||
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
@@ -94,6 +95,7 @@ Public Class frmZollanmeldung
|
||||
Me.GesamtsicherheitREF = GesamtsicherheitREF
|
||||
Me.Standort = Standort
|
||||
Me.gsnr = gsnr
|
||||
Me.WarenwertEUR = WarenwertEUR
|
||||
|
||||
If SENDUNG IsNot Nothing Then
|
||||
Me.FilialenNr = SENDUNG.FilialenNr
|
||||
@@ -250,7 +252,7 @@ Public Class frmZollanmeldung
|
||||
End If
|
||||
|
||||
Case "AA" 'AnkunftsAnzeige
|
||||
Dim usrcntl As New usrCntlATLAS_AnkunftsAnzeige(AVISO, SENDUNG, FIRMA_DY, GesamtsicherheitREF, Standort, gsnr)
|
||||
Dim usrcntl As New usrCntlATLAS_AnkunftsAnzeige(AVISO, SENDUNG, FIRMA_DY, GesamtsicherheitREF, Standort, gsnr, WarenwertEUR)
|
||||
usrcntl.Dock = DockStyle.Fill
|
||||
Me.pnl.Controls.Add(usrcntl)
|
||||
Me.Text = "AnkunftsAnzeige - Verwahrung"
|
||||
|
||||
@@ -11,6 +11,7 @@ Imports itextsharp.text.pdf
|
||||
Imports SDL.eu.europa.ec
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports GrapeCity.DataVisualization.TypeScript
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class cBerechtignungenFunctions
|
||||
|
||||
@@ -142,6 +143,58 @@ Public Class cProgramFunctions
|
||||
Return valid
|
||||
End Function
|
||||
|
||||
|
||||
Public Shared Sub genUIDEORIList(kdNr, typeListe, Optional UIDVeranldgungskunden = False)
|
||||
If kdNr <= 0 Then Exit Sub
|
||||
Dim frmList As New frmKundenUIDEORI_List
|
||||
Select Case typeListe
|
||||
Case "UID"
|
||||
Dim dt = (New SQL).loadDgvBySql("SELECT [uid_id],[uid_KundenNr] KundenNr,[uid_UstIdKz]UstIdKz,[uid_UstIdNr]UstIdNr,[uid_Datum]Datum,[uid_valid]Gültig,[uid_Sachbearbeiter]Sachbearbeiter,[uid_stufe]Stufe FROM [tblUIDPruefung] where uid_KundenNr='" & kdNr & "' AND ISNULL(uid_typ, 'UID') = '" & IIf(UIDVeranldgungskunden, "VAK", "UID") & "' ORDER BY uid_Datum desc", "FMZOLL")
|
||||
If dt IsNot Nothing Then
|
||||
frmList.dgv.DataSource = dt
|
||||
frmList.dgv.Columns("uid_id").Visible = False
|
||||
AddHandler frmList.dgv.CellDoubleClick, Sub()
|
||||
Dim PdfTmp = SDL.FormularManagerNEU.UID_PRUEFUNG_PROTOKOLL(frmList.dgv.SelectedRows(0).Cells("uid_id").Value)
|
||||
If PdfTmp <> "" Then
|
||||
Process.Start(PdfTmp)
|
||||
|
||||
End If
|
||||
End Sub
|
||||
frmList.Show()
|
||||
End If
|
||||
Case "EORI"
|
||||
|
||||
Dim dt = (New SQL).loadDgvBySql("SELECT [eori_id],[eori_KdNr] KundenNr,[eori_Datum]Datum,[eori_valid]Gültig,[eori_sachbearbeiter]Sachbearbeiter FROM [tblEORIPruefung] where eori_KdNr='" & kdNr & "' ORDER BY eori_Datum desc", "FMZOLL")
|
||||
If dt IsNot Nothing Then
|
||||
frmList.dgv.DataSource = dt
|
||||
frmList.dgv.Columns("eori_id").Visible = False
|
||||
|
||||
Dim KUNDE As New cKunde(kdNr)
|
||||
'--------------------------
|
||||
AddHandler frmList.dgv.CellDoubleClick, Sub()
|
||||
Dim eoripruef As New cEORIPruefung(frmList.dgv.SelectedRows(0).Cells("eori_id").Value)
|
||||
Dim msgErgebnis
|
||||
If eoripruef.eori_valid Then
|
||||
msgErgebnis = "EORI-Nr. GÜLTIG - OK"
|
||||
Else
|
||||
msgErgebnis = "EORI-Nr. UNGÜLTIG"
|
||||
End If
|
||||
|
||||
Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, eoripruef.eori_firma, eoripruef.eori_sessionID, KUNDE.EORITIN,, eoripruef.eori_sendungsid, eoripruef.eori_datum, eoripruef.eori_sachbearbeiter, eoripruef.eori_FirmaID)
|
||||
If PdfTmp <> "" Then
|
||||
Process.Start(PdfTmp)
|
||||
|
||||
End If
|
||||
End Sub
|
||||
'--------------------------
|
||||
|
||||
frmList.Show()
|
||||
End If
|
||||
|
||||
End Select
|
||||
|
||||
|
||||
End Sub
|
||||
Shared Function getISO2Land(LandKz As String)
|
||||
If LandKz Is Nothing Then Return Nothing
|
||||
Dim sqlstr = "SELECT TOP 1 isnull([Länderverzeichnis für die Außenhandelsstatistik].LandKz,'') AS LandKzISO2 FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN Währungstabelle ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = Währungstabelle.Währungsschlüssel WHERE Währungstabelle.LandKz='" & LandKz & "' "
|
||||
@@ -468,7 +521,7 @@ Public Class cProgramFunctions
|
||||
'raus hier bei nicht-nummerischem Argument
|
||||
If Not IsNumeric(varNr) Then Exit Function
|
||||
|
||||
fctRound = Fix("" & varNr * (10 ^ varPl) + Math.Sign(varNr) * 0.5) / (10 ^ varPl)
|
||||
fctRound = Fix("" & varNr * (10 ^ varPl) + Math.sign(varNr) * 0.5) / (10 ^ varPl)
|
||||
|
||||
End Function
|
||||
|
||||
@@ -1451,9 +1504,9 @@ Public Class cProgramFunctions
|
||||
|
||||
|
||||
For Each dgvCol As DataGridViewColumn In dgv.Columns
|
||||
col = New DataColumn(dgvCol.Name)
|
||||
dt.Columns.Add(col)
|
||||
Next
|
||||
col = New DataColumn(dgvCol.Name)
|
||||
dt.Columns.Add(col)
|
||||
Next
|
||||
|
||||
'Add Rows from the datagridview
|
||||
Dim row As DataRow
|
||||
|
||||
2528
SDL/kunden/usrCntlKundenuebersicht.Designer.vb
generated
2528
SDL/kunden/usrCntlKundenuebersicht.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -209,6 +209,21 @@
|
||||
ZKu8wIj8cOK/xAMdlNTj9YkAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>832, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>989, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1146, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1303, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>153, 56</value>
|
||||
</metadata>
|
||||
<metadata name="KtoId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@@ -230,21 +245,6 @@
|
||||
<metadata name="BIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>832, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>989, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1146, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1303, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>153, 56</value>
|
||||
</metadata>
|
||||
<metadata name="SessionService1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 56</value>
|
||||
</metadata>
|
||||
|
||||
@@ -449,6 +449,19 @@ Public Class usrCntlKundenuebersicht
|
||||
End If
|
||||
End If
|
||||
|
||||
txtUIDVeranlagt.Text = ""
|
||||
|
||||
|
||||
Dim SQLUIDVeranlagt = "SELECT STUFF((
|
||||
SELECT ', ' + UstIdKz + '-' + UstIdNr +
|
||||
CASE
|
||||
WHEN [UstIdGeprüft] IS NULL THEN ' (nicht geprüft)'
|
||||
ELSE ' (' + CAST(CAST([UstIdGeprüft] AS DATE) AS NVARCHAR) + ')'
|
||||
END
|
||||
FROM [VERAG].[dbo].[tblKundenveranlagungUID]
|
||||
WHERE [KdNr] = " & KUNDE.KundenNr & "FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS Result;"
|
||||
|
||||
txtUIDVeranlagt.Text = SQL.getValueTxtBySql(SQLUIDVeranlagt, "FMZOLL")
|
||||
|
||||
|
||||
lblEORI.Text = ""
|
||||
@@ -2804,7 +2817,7 @@ Public Class usrCntlKundenuebersicht
|
||||
End Sub
|
||||
|
||||
Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click
|
||||
genUIDEORIList(kdNr, "UID")
|
||||
SDL.cProgramFunctions.genUIDEORIList(kdNr, "UID")
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -3310,7 +3323,7 @@ Public Class usrCntlKundenuebersicht
|
||||
End Sub
|
||||
|
||||
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
|
||||
genUIDEORIList(kdNr, "EORI")
|
||||
SDL.cProgramFunctions.genUIDEORIList(kdNr, "EORI")
|
||||
End Sub
|
||||
|
||||
Private Sub setCreditsafereportEntry(cs As cCreditSafeAPI, company As cCreditSafeAPI.Company, Optional forecedReqest As Boolean = False)
|
||||
@@ -3651,4 +3664,8 @@ Public Class usrCntlKundenuebersicht
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click
|
||||
SDL.cProgramFunctions.genUIDEORIList(KUNDE.KundenNr, "UID", True)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
@@ -1530,13 +1530,13 @@ Public Class usrcntlKundeBearbeitenFull
|
||||
|
||||
Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click
|
||||
|
||||
genUIDEORIList(KUNDE.KundenNr, "UID")
|
||||
SDL.cProgramFunctions.genUIDEORIList(KUNDE.KundenNr, "UID")
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button13_new_Click(sender As Object, e As EventArgs) Handles Button5.Click
|
||||
|
||||
genUIDEORIList(KUNDE.KundenNr, "UID", True)
|
||||
SDL.cProgramFunctions.genUIDEORIList(KUNDE.KundenNr, "UID", True)
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user