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

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-10-11 13:27:56 +02:00
parent aa26988458 5867cf5060
commit df341a7910
17 changed files with 1402 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
View File

@@ -148,6 +148,13 @@ Public Class cRechnungsausgang
Return cnt > 0
End Function
Public Function checkRechnungsNrIsSet() As Boolean
'Prüfugn ob Eintrag mit dieser Rechnungsnr in DB existiert
If Me.RechnungsNr <= 0 Then Return False
Dim cnt = SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Rechnungsausgang] WHERE RechnungsNr='" & Me.RechnungsNr & "' and DruckDatumZeit is not null and Buchungsjahr = " & Me.Buchungsjahr & " and Firma_ID = '" & Me.Firma_ID & "'", "FMZOLL")
Return cnt > 0
End Function
Public Shared Function getMaxRGUnterNr(FilialenNr As Integer, AbfertigungsNr As Integer, SpeditionsbuchUnterNr As Integer) As Integer
' Dim Nr = SQL.getValueTxtBySql("Select isnull([UnterNr], -1) + 1 FROM [Rechnungsausgang] where [FilialenNr]='" & FilialenNr & "' And AbfertigungsNr='" & AbfertigungsNr & "' And SpeditionsbuchUnterNr='" & SpeditionsbuchUnterNr & "' ORDER BY [UnterNr] desc", "FMZOLL")
Dim Nr = SQL.getValueTxtBySql("Select TOP 1 isnull([UnterNr], -1) + 1 FROM [Rechnungsausgang] where [FilialenNr]='" & FilialenNr & "' And AbfertigungsNr='" & AbfertigungsNr & "' ORDER BY [UnterNr] desc", "FMZOLL")
@@ -485,7 +492,7 @@ Public Class cRechnungsausgang
End If
Return True
End Function
End Function
Public Function SAVE_POSITIONEN(RK_ID) As Boolean
If DELETE_POSITIONEN() Then ' zuerst Einträge löschen...

3
VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb
View File

@@ -87,7 +87,8 @@ Public Class cSDL
Me.KundenNr = KundenNr
Me.KfzKennzeichen = KfzKennzeichen
Me.SDLNr = SDLNr
Me.History = SQL.getValueTxtBySql("SELECT TOP 1 History FROM SDL WHERE KundenNr='" & KundenNr & "' AND KfzKennzeichen='" & KfzKennzeichen & "' AND SDLNr='" & SDLNr & "' ORDER BY History DESC", "SDL")
Dim histroyTemp = SQL.getValueTxtBySql("SELECT TOP 1 History FROM SDL WHERE KundenNr='" & KundenNr & "' AND KfzKennzeichen='" & KfzKennzeichen & "' AND SDLNr='" & SDLNr & "' ORDER BY History DESC", "SDL")
Me.History = IIf(histroyTemp <> "", histroyTemp, 0)
LOAD()
End Sub

3
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -1354,9 +1354,10 @@ Public Class cFormularManager
doc.PageSettings.Orientation = Spire.Pdf.PdfPageOrientation.Landscape
doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.FitSize, True)
' doc.PrinterName = printerName
' doc.PrintDocument.Print()
doc.SaveToFile(targetPath)
End If

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
View File

@@ -858,7 +858,7 @@ Public Class cATEZ_NCTS_IN
'Dim json1 As New Chilkat.JsonObject
success = bd.LoadFile(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
success = jsonData.UpdateString("Attachments.Attachment[" & i & "].FileType", r.Cells("anh_Typ").Value)
success = jsonData.UpdateString("Attachments.Attachment[" & i & "].DocumentType", r.Cells("anh_Art").Value)
success = jsonData.UpdateString("Attachments.Attachment[" & i & "].DocumentType", IIf(r.Cells("anh_Art").Value IsNot DBNull.Value, r.Cells("anh_Art").Value, "OTHER"))
success = jsonData.UpdateString("Attachments.Attachment[" & i & "].base64BinaryStream", bd.GetEncoded("base64"))
i = i + 1
End If

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -534,7 +534,7 @@ Public Class cTimasAPI
If (rest.ResponseStatusCode <> 201) Then
Debug.WriteLine(rest.ResponseHeader)
MsgBox(rest.ResponseStatusCode & " " & rest.ResponseStatusText)
MsgBox(rest.ResponseStatusCode & " " & rest.ResponseStatusText & vbNewLine & sbResponseBody.ToString)
Return Nothing
End If