From 297365fec65c84b38c82753db0780fef9189e864 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 19 Mar 2026 13:38:47 +0100 Subject: [PATCH] systa, etc. --- .../usrCntlATLAS_AnkunftsAnzeige.vb | 5 +- .../Schnittstellen/cSyska_Interface.vb | 2 +- VERAG_PROG_ALLGEMEIN/cSicherheiten.vb | 122 ++++++++++++++++++ 3 files changed, 125 insertions(+), 4 deletions(-) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb index 31327f8a..8e0d4120 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -1,5 +1,4 @@ -Imports System.Windows.Media.Animation -Imports DAKOSY_Worker +Imports DAKOSY_Worker Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlATLAS_AnkunftsAnzeige @@ -247,7 +246,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige .gs_art = "OPEN" .gs_datum = DateTime.Now .gs_erstellungsdatum = DateTime.Now - .gs_freitext = "DAKOSY DUMMY" + .gs_freitext = "DAKOSY-DUMMY" .gs_saldo = GesSichRef.gsr_Saldo .gs_atr = "0" .gs_zollsatz = GesSichRef.gsr_zollsatz diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb index b791479a..74c7a823 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb @@ -129,7 +129,7 @@ Public Class cSyska_Interface 'DATEIPFAD für Stammdaten '------------------------------------------------------------------------------------------- Dim pathArchivKD = "\\datenarchiv\Datenarchiv\SYSKA\" & FIRMA.Firma_ID & "\" & Now.Year & "\" & Now.Date.ToShortDateString & "\Archiv\" - Dim pathKD = "\\fmzoll\f\FMZoll\FiBu\Syska\" & FIRMA.Firma_ID & "\" + Dim pathKD = "\\syncluster01.verag.ost.dmn\F\BUCHHALTUNG\FIBU\Syska\" & FIRMA.Firma_ID & "\" 'pathKD = pathArchivKD 'TEST If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index 83fadf31..8bd769c2 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -317,4 +317,126 @@ Public Class cSicherheiten SQL.doSQL("delete from [tblGesamtsicherheit] where gs_gsId = '" & Me.gs_gsId & "' AND gs_posNr='" & Me.gs_posNr & "'", "AVISO") End Function + + Public Shared Sub rearangePosNr(gsNr As Integer, ATBNr As String, posNr As Integer) + + If posNr = -1 Or posNr = 1 Then Exit Sub + + Dim sqlq As String = "select [gs_gsId], [gs_posNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posNr >= " & posNr + Dim dt As New DataTable + dt = (New SQL).loadDgvBySql(sqlq, "AVISO", 100, True) + + If (dt.Rows.Count = 0) Then Exit Sub + + + For i As Integer = 0 To dt.Rows.Count - 1 + Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr")) + Dim currentPos = sicherheit.gs_posNr + + If sicherheit.gs_posSubNr IsNot Nothing Then + rearangeSubPosNr(gsNr, ATBNr, currentPos, sicherheit.gs_posSubNr) + End If + + If currentPos > 0 Then + sicherheit.gs_posNr = currentPos - 1 + End If + + sicherheit.UPDATEWithNewPosNr(True) + + Next + + + End Sub + + Public Shared Function rearangePosNrByDakosyLaufNr(gsNr As Integer, ATBNr As String) + + If gsNr > 0 AndAlso ATBNr <> "" Then + + Dim SQLString = "WITH Ordered AS ( + SELECT + gs_gsId, + ROW_NUMBER() OVER ( + ORDER BY gs_DK_laufnr, gs_posSubNr + ) - 1 AS NewPosNr + FROM tblGesamtsicherheit + WHERE gs_gsnr = " & gsNr & " + AND gs_ATBNR = '" & ATBNr & "' + ) + UPDATE t + SET gs_posNr = o.NewPosNr + FROM tblGesamtsicherheit t + INNER JOIN Ordered o ON t.gs_gsId = o.gs_gsId" + + If (New SQL).doSQL(SQLString, "AVISO") Then + Return True + Else + Return False + End If + Else + Return False + End If + + End Function + + + + Public Shared Sub rearangeSubPosNr(gsNr As Integer, ATBNr As String, posNr As Integer, subposNr As Integer) + + If subposNr = -1 Or subposNr = 1 Then Exit Sub + + Dim sqlq As String = "select [gs_gsId], [gs_posNr] ,[gs_posSubNr] from [tblGesamtsicherheit] where gs_gsnr = " & gsNr & " AND gs_ATBNR = '" & ATBNr & "' AND gs_posSubNr >= " & subposNr + Dim dt As New DataTable + dt = (New SQL).loadDgvBySql(sqlq, "AVISO", 100, True) + + If (dt.Rows.Count = 0) Then Exit Sub + + + For i As Integer = 0 To dt.Rows.Count - 1 + Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"), dt.Rows(i).Item("gs_posSubNr")) + Dim currentPos = sicherheit.gs_posSubNr + sicherheit.gs_posSubNr = currentPos - 1 + sicherheit.UPDATEWithNewPosNr() + + Next + + + End Sub + + + Public Shared Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer + Dim posNr As Integer = 0 + Dim sqlq As String = "Select MAX([gs_posNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_ATBNR = '" & gs_ATBNr & "'" + Dim dt As New DataTable + dt = (New SQL).loadDgvBySql(sqlq, "AVISO", 100, True) + + If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then + + posNr = dt.Rows(0).Item(0) + + End If + + Return posNr + + End Function + + + + + Public Shared Function getLatestSubPosNr(gs_gsnr As Integer, gs_ATBNr As String, gs_MRNNr As String) As Integer + Dim posNr As Integer = 0 + Dim sqlq As String = "Select MAX([gs_posSubNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_MRNNr is not null and gs_MRNNr = '" & gs_MRNNr & "' And gs_ATBNR = '" & gs_ATBNr & "'" + Dim dt As New DataTable + dt = (New SQL).loadDgvBySql(sqlq, "AVISO", 100, True) + + If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then + + posNr = dt.Rows(0).Item(0) + + End If + + Return posNr + + End Function + + End Class