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-09-23 07:24:25 +02:00
parent 89d8e0a3a8
commit ce31c2c398
84 changed files with 4953 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,7 +327,7 @@
If MyDatagridview1.SelectedRows.Count > 0 Then
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.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14,,,,,, MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
'cVorauskasseOptions.SpeichernVermerkIDAufgehoben(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14)
txtBemerkung.Text = ""
@@ -456,12 +456,10 @@
If MyDatagridview1.SelectedRows.Count > 0 Then
Dim VK As New VERAG_PROG_ALLGEMEIN.cVorauskasse(MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
VK.SET_FREIGEGEBEN(True, txtBemerkung.Text)
cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 59,, True, If(VK.vk_VermerkId, -1), If(VK.vk_SendungId, -1))
cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 59,, True, If(VK.vk_VermerkId, -1), If(VK.vk_SendungId, -1),, MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
txtBemerkung.Text = ""
MyDatagridview1.RELOAD()
setDGVOptions()
End If
End Sub
@@ -520,7 +518,7 @@ 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, Optional vk_Betrag = Nothing)
Shared Sub insertVermerk(FilialenNr, AbfertigungsNr, VermerkCodeId, Optional DatumTmp = Nothing, Optional Freigegeben = False, Optional ByRef VermerkId = -1, Optional tblSnd_SendungID = -1, Optional vk_Betrag = Nothing, Optional VorauskasseId = Nothing)
Try
If vk_Betrag Is Nothing Then vk_Betrag = 0
@@ -533,6 +531,7 @@ Public Class cVorauskasseOptions
Dim VermerkeDAL As New VERAG_PROG_ALLGEMEIN.cVermerkeDAL
' 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")
Else
@@ -552,6 +551,7 @@ Public Class cVorauskasseOptions
myVermerk.SendungID = dt.Rows(0)("tblSnd_SendungID")
myVermerk.Datum = If(DatumTmp, Now)
myVermerk.VermerkArt = "S"
myVermerk.VorauskasseId = VorauskasseId
myVermerk.Mitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " (AUTO)"
myVermerk.MitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
Select Case VermerkCodeId