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

gesamtsicherheiut, etc.

Browse Source
This commit is contained in:
d.breimaier
2025-12-16 16:10:42 +01:00
parent 9af2107ea0
commit 636df85a8c
2 changed files with 69 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("4.1.8.8")> <Assembly: AssemblyVersion("4.1.8.9")>
<Assembly: AssemblyFileVersion("4.1.8.8")> <Assembly: AssemblyFileVersion("4.1.8.9")>

77
Aviso/frmGesamtsicherheitenNEU.vb
View File

@@ -714,7 +714,14 @@ Public Class frmGesamtsicherheitenNEU
Case Else Case Else
With OPEN With OPEN
.gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1 .gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1
.gs_posSubNr = getLatestSubPosNr(gessicherheitID, txtMRNNr.Text) + 1
If .gs_MRNNr <> "" Then
.gs_posSubNr = getLatestSubPosNr(gessicherheitID, txtSicherheitATBNr.Text, txtMRNNr.Text) + 1
Else
.gs_posSubNr = Nothing
End If
End With End With
attachPosNrToExistingATB = True attachPosNrToExistingATB = True
indexGsId = OPEN.SAVEOBJECT() indexGsId = OPEN.SAVEOBJECT()
@@ -777,7 +784,11 @@ Public Class frmGesamtsicherheitenNEU
.gs_gsNr = gessicherheitID .gs_gsNr = gessicherheitID
.gs_ATBNr = "" .gs_ATBNr = ""
.gs_MRNNr = "" .gs_MRNNr = ""
.gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_MRNNr) + 1 If .gs_MRNNr <> "" Then
.gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
Else
.gs_posSubNr = Nothing
End If
.gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1 .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
.gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text) .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
.gs_warenwert = 0 .gs_warenwert = 0
@@ -1003,7 +1014,11 @@ Public Class frmGesamtsicherheitenNEU
.gs_ATBNr = txtSicherheitATBNr.Text .gs_ATBNr = txtSicherheitATBNr.Text
.gs_MRNNr = txtMRNNr.Text .gs_MRNNr = txtMRNNr.Text
.gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text)) .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
.gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_MRNNr) + 1) If .gs_MRNNr <> "" Then
.gs_posSubNr = IIf(Integer.Parse(setNullToZero(txtSPosNr.Text)) <> 0, Integer.Parse(setNullToZero(txtSPosNr.Text)), Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1)
Else
.gs_posSubNr = Nothing
End If
.gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDat.Text, txtSicherheitTime.Text) .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDat.Text, txtSicherheitTime.Text)
.gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text) .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text)
.gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
@@ -1101,8 +1116,10 @@ Public Class frmGesamtsicherheitenNEU
Dim posNr = currentSicherheit.gs_posNr Dim posNr = currentSicherheit.gs_posNr
Dim ATBNr = currentSicherheit.gs_ATBNr Dim ATBNr = currentSicherheit.gs_ATBNr
Dim gsNr = currentSicherheit.gs_gsNr Dim gsNr = currentSicherheit.gs_gsNr
Dim subPosNr = currentSicherheit.gs_posSubNr
currentSicherheit.Delete() currentSicherheit.Delete()
rearangePosNr(gsNr, ATBNr, posNr) rearangePosNr(gsNr, ATBNr, posNr)
'rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
btnUpdateSicherheit.Visible = False btnUpdateSicherheit.Visible = False
btnAddSicherheit.Visible = True btnAddSicherheit.Visible = True
btnDeleteSicherheit.Visible = False btnDeleteSicherheit.Visible = False
@@ -1192,9 +1209,9 @@ Public Class frmGesamtsicherheitenNEU
End Function End Function
Private Function getLatestSubPosNr(gs_gsnr As Integer, gs_MRNNr As String) As Integer Private Function getLatestSubPosNr(gs_gsnr As Integer, gs_ATBNr As String, gs_MRNNr As String) As Integer
Dim posNr As Integer = 0 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 = '" & gs_MRNNr & "'" 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 Dim dt As New DataTable
dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True) dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
@@ -1620,7 +1637,7 @@ Public Class frmGesamtsicherheitenNEU
If posNr = -1 Or posNr = 1 Then Exit Sub 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 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 Dim dt As New DataTable
dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True) dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
@@ -1628,10 +1645,39 @@ Public Class frmGesamtsicherheitenNEU
For i As Integer = 0 To dt.Rows.Count - 1 For i As Integer = 0 To dt.Rows.Count - 1
'MsgBox("gs_gsId: " & dt.Rows(i).Item("gs_gsId").ToString & " " & "gs_posNr: " & dt.Rows(i).Item("gs_posNr").ToString)
Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr")) Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"))
Dim currentPos = sicherheit.gs_posNr Dim currentPos = sicherheit.gs_posNr
If sicherheit.gs_posSubNr IsNot Nothing Then
rearangeSubPosNr(gsNr, ATBNr, currentPos, sicherheit.gs_posSubNr)
End If
sicherheit.gs_posNr = currentPos - 1 sicherheit.gs_posNr = currentPos - 1
sicherheit.UPDATEWithNewPosNr(True)
Next
End Sub
Private 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_posNr >= " & posNr & " AND gs_posSubNr >= " & subposNr
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 = 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() sicherheit.UPDATEWithNewPosNr()
Next Next
@@ -1912,7 +1958,7 @@ Public Class frmGesamtsicherheitenNEU
Private Sub changeLabel(Optional isATR As Boolean = True) Private Sub changeLabel(Optional isATR As Boolean = True)
If Standort = "Verag GmbH" Then If Standort = "Verag GmbH" Then
Label1.Text = "Reg-Nr." 'Label1.Text = "Reg-Nr."
If isATR Then If isATR Then
Label12.Text = "Reg-Nr. / MRN" Label12.Text = "Reg-Nr. / MRN"
@@ -1924,10 +1970,10 @@ Public Class frmGesamtsicherheitenNEU
ElseIf Standort = "VERAG AG" Then ElseIf Standort = "VERAG AG" Then
Label12.Text = "T1 CRN" Label12.Text = "T1 CRN"
Label1.Text = "T1 MRN" 'Label1.Text = "T1 MRN"
Else Else
Label12.Text = "EZA / T1 CRN" Label12.Text = "EZA / T1 CRN"
Label1.Text = "T1 MRN" 'Label1.Text = "T1 MRN"
End If End If
End Sub End Sub
@@ -1944,7 +1990,13 @@ Public Class frmGesamtsicherheitenNEU
.gs_ATBNr = "Korrekt. Rundungsdiff. " & gessicherheitID .gs_ATBNr = "Korrekt. Rundungsdiff. " & gessicherheitID
.gs_MRNNr = "" .gs_MRNNr = ""
.gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1 .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1
.gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_MRNNr) + 1
If .gs_MRNNr <> "" Then
.gs_posSubNr = Me.getLatestSubPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr, currentSicherheit.gs_MRNNr) + 1
Else
.gs_posSubNr = Nothing
End If
.gs_datum = DateTime.Now .gs_datum = DateTime.Now
.gs_warenwert = 0 .gs_warenwert = 0
.gs_sicherheitsbetrag = 0 .gs_sicherheitsbetrag = 0
@@ -2103,9 +2155,12 @@ Public Class frmGesamtsicherheitenNEU
Dim posNr = currentSicherheit.gs_posNr Dim posNr = currentSicherheit.gs_posNr
Dim ATBNr = currentSicherheit.gs_ATBNr Dim ATBNr = currentSicherheit.gs_ATBNr
Dim gsNr = currentSicherheit.gs_gsNr Dim gsNr = currentSicherheit.gs_gsNr
Dim subPosNr = currentSicherheit.gs_posSubNr
If currentSicherheit.hasEntry Then If currentSicherheit.hasEntry Then
currentSicherheit.Delete() currentSicherheit.Delete()
rearangePosNr(gsNr, ATBNr, posNr) rearangePosNr(gsNr, ATBNr, posNr)
' If subPosNr IsNot Nothing Then rearangeSubPosNr(gsNr, ATBNr, posNr, subPosNr)
End If End If