Gesamtsicherheiten, Sendungsdetails (Ausdruck Anhang Rechnung)
This commit is contained in:
@@ -75,7 +75,7 @@ Public Class frmGesamtsicherheitenNEU
|
||||
panOverlay.Visible = True
|
||||
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
|
||||
cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
|
||||
cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND [wo_firma] = " & firmaId & " AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
|
||||
|
||||
If datum = Nothing Then datum = Date.Now
|
||||
nextGessicherheitID = -1
|
||||
@@ -114,15 +114,15 @@ Public Class frmGesamtsicherheitenNEU
|
||||
|
||||
txtGestellInfo.Text = ""
|
||||
Dim sqladd1 As String = ""
|
||||
If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust"
|
||||
If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", (([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100) as gs_ust"
|
||||
If currentGesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]"
|
||||
Dim sqlSearchSting As String = ""
|
||||
If withFilterParam = True Then
|
||||
If txtSuche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
|
||||
If txtSuche.Text <> "" Then sqlSearchSting &= " AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
|
||||
If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0"
|
||||
End If
|
||||
|
||||
Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
|
||||
Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
|
||||
|
||||
dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
|
||||
dgvGesamtsicherheit.LOAD()
|
||||
@@ -153,6 +153,7 @@ Public Class frmGesamtsicherheitenNEU
|
||||
.Columns("gs_atr").Width = 35
|
||||
.Columns("gs_ust").Width = 70
|
||||
.Columns("gs_ust").HeaderText = "Ust"
|
||||
.Columns("gs_ust").DefaultCellStyle.Format = "c2"
|
||||
|
||||
Case Else
|
||||
|
||||
@@ -220,13 +221,6 @@ Public Class frmGesamtsicherheitenNEU
|
||||
|
||||
Next
|
||||
|
||||
'Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'ATB Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',
|
||||
' [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext
|
||||
' from [tblGesamtsicherheit]
|
||||
' inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
|
||||
' where [gs_gsnr] IN (" & gsnr & ")
|
||||
' order by gs_gsId"
|
||||
|
||||
|
||||
Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'ATB Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt'
|
||||
From [tblGesamtsicherheit]
|
||||
@@ -725,6 +719,7 @@ Public Class frmGesamtsicherheitenNEU
|
||||
.gsp_ust = ""
|
||||
.gsp_avisoId = Me.avisoID
|
||||
.gsp_gsNr = OPEN.gs_gsNr
|
||||
.gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
End With
|
||||
|
||||
|
||||
@@ -791,6 +786,7 @@ Public Class frmGesamtsicherheitenNEU
|
||||
.gsp_ust = currentSicherheit.gs_ust
|
||||
.gsp_ATCNr = txtPositionenCRN.Text
|
||||
.gsp_avisoId = Me.avisoID
|
||||
.gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
End With
|
||||
|
||||
SicherheitsPos.SAVE()
|
||||
@@ -990,6 +986,8 @@ Public Class frmGesamtsicherheitenNEU
|
||||
End With
|
||||
|
||||
If checkSicherheitsbetrag() = False Then Exit Sub
|
||||
currentSicherheit.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
currentSicherheit.gs_zuletztgeandert = Now()
|
||||
currentSicherheit.SAVE()
|
||||
txtAnzahlPos.Enabled = True
|
||||
btnUpdateSicherheit.Visible = False
|
||||
@@ -1002,7 +1000,10 @@ Public Class frmGesamtsicherheitenNEU
|
||||
Private Sub btnUpdatePos_Click(sender As Object, e As EventArgs) Handles btnUpdatePos.Click
|
||||
|
||||
|
||||
If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then Exit Sub
|
||||
If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then
|
||||
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
With currentSPos
|
||||
|
||||
@@ -1016,11 +1017,17 @@ Public Class frmGesamtsicherheitenNEU
|
||||
currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
|
||||
Else
|
||||
currentSPos.gsp_datum = Nothing
|
||||
If .gsp_ATCNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then
|
||||
MsgBox("Datum/Uhrzeit bei Position " & currentSPos.gsp_gspPosId & " muss eingetragen werden!")
|
||||
Exit Sub
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
End With
|
||||
If checkSicherheitsbetrag() = False Then Exit Sub
|
||||
currentSPos.gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
currentSPos.gsp_zuletztgeandert = Now()
|
||||
currentSPos.SAVE()
|
||||
btnAddPos.Visible = True
|
||||
btnUpdatePos.Visible = False
|
||||
@@ -1123,6 +1130,8 @@ Public Class frmGesamtsicherheitenNEU
|
||||
sicherheiten.gs_abfertigungsnr = gessich.Abfertigungsnummer
|
||||
sicherheiten.gs_LKWKZ = gessich.LKWKZ
|
||||
sicherheiten.gs_warenort = gessich.warenortID
|
||||
sicherheiten.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -1886,6 +1895,7 @@ Public Class frmGesamtsicherheitenNEU
|
||||
.gsp_ATCNr = "Korrekt. Rundungsdiff. " & gessicherheitID
|
||||
.gsp_isPosRundungsdiff = True
|
||||
.gsp_avisoId = Me.avisoID
|
||||
.gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
End With
|
||||
|
||||
SicherheitsPos.SAVE()
|
||||
|
||||
Reference in New Issue
Block a user