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-08-04 16:34:47 +02:00
parent 40295a2819
commit 89d8e0a3a8
95 changed files with 3655 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SDL/kunden/Vorauskasse/frmVorauskasse.vb
View File

@@ -328,6 +328,8 @@
Dim VK As New VERAG_PROG_ALLGEMEIN.cVorauskasse(MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
VK.SET_GELDEINGANG(True, txtBemerkung.Text)
cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14)
'cVorauskasseOptions.SpeichernVermerkIDAufgehoben(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14)
txtBemerkung.Text = ""
MyDatagridview1.RELOAD()
setDGVOptions()
@@ -518,12 +520,18 @@ End Class
Public Class cVorauskasseOptions
Shared Sub insertVermerk(FilialenNr, AbfertigungsNr, VermerkCodeId, Optional DatumTmp = Nothing, Optional Freigegeben = False, Optional ByRef VermerkId = -1, Optional tblSnd_SendungID = -1)
Shared Sub insertVermerk(FilialenNr, AbfertigungsNr, VermerkCodeId, Optional DatumTmp = Nothing, Optional Freigegeben = False, Optional ByRef VermerkId = -1, Optional tblSnd_SendungID = -1, Optional vk_Betrag = Nothing)
Try
If vk_Betrag Is Nothing Then vk_Betrag = 0
If vk_Betrag.ToString = "" Then vk_Betrag = 0
' MsgBox(vk_Betrag)
Dim veragSQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim VermerkeDAL As New VERAG_PROG_ALLGEMEIN.cVermerkeDAL
' MsgBox("SELECT TOP 1 [tblSnd_SendungID],[tblSnd_AvisoID] FROM [tblSendungen] where AbfertigungsNr='" & AbfertigungsNr & "' and FilialenNr='" & FilialenNr & "'")
' MsgBox("ThenSELECT TOP 1 [tblSnd_SendungID],[tblSnd_AvisoID] FROM [tblSendungen] where AbfertigungsNr='" & AbfertigungsNr & "' and FilialenNr='" & FilialenNr & "'")
Dim dt As DataTable = Nothing
If tblSnd_SendungID > 0 Then
dt = veragSQL.loadDgvBySql("SELECT TOP 1 [tblSnd_SendungID],[tblSnd_AvisoID] FROM [tblSendungen] where tblSnd_SendungID='" & tblSnd_SendungID & "' ", "AVISO")
@@ -547,7 +555,7 @@ Public Class cVorauskasseOptions
myVermerk.Mitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " (AUTO)"
myVermerk.MitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
Select Case VermerkCodeId
Case 13 : myVermerk.Hinweis_Vermerk = "Vorauskasse angefordert"
Case 13 : myVermerk.Hinweis_Vermerk = "Vorauskasse angefordert" & If(CDbl(vk_Betrag) > 0, " (" & CDbl(vk_Betrag).ToString("C2") & ")", "")
Case 14 : myVermerk.Hinweis_Vermerk = "Vorauskasse erhalten"
Case 59 : myVermerk.Hinweis_Vermerk = "Vorauskasse freigegeben"
Case Else : Exit Sub
@@ -566,7 +574,7 @@ Public Class cVorauskasseOptions
Dim veragSQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt As DataTable = veragSQL.loadDgvBySql("SELECT TOP 1 [tblSnd_SendungID] FROM [tblSendungen] where AbfertigungsNr='" & AbfertigungsNr & "' and FilialenNr='" & FilialenNr & "'", "AVISO")
If dt.Rows.Count = 0 Then Exit Sub
If dt.Rows.Count = 0 Then Exit Sub
If Not IsNumeric(dt.Rows(0)("tblSnd_SendungID")) Then Exit Sub
veragSQL.doSQL("DELETE TOP (1) FROM [Vermerke] where SendungID='" & dt.Rows(0)("tblSnd_SendungID") & "' AND VermerkeCode='" & VermerkCodeId & "' ", "AVISO")