This commit is contained in:
2019-11-06 16:33:03 +01:00
parent c5595a729a
commit 99ba5f4513
17 changed files with 521 additions and 92 deletions

View File

@@ -10,7 +10,7 @@ Public Class cRKSV
Try
Dim client As RKSVWcfClient = New RKSVWcfClient()
client.Endpoint.Address = New System.ServiceModel.EndpointAddress("http://192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl")
client.Endpoint.Address = New System.ServiceModel.EndpointAddress(getRKSVLink(kasse))
client.Open()
' svcRKSV.DBUserCredentials m_credentials = new svcRKSV.DBUserCredentials();
Dim credentials As New SDL.RKSVServer.DBUserCredentials
@@ -111,8 +111,9 @@ Public Class cRKSV
End Function
Shared Function getDEP(ByVal kasse_id As Integer, ByRef exportResult As String) As Boolean
Dim KASSE As New cRKSV_Kasse(kasse_id)
Dim client As RKSVWcfClient = New RKSVWcfClient()
client.Endpoint.Address = New System.ServiceModel.EndpointAddress("http://192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl")
client.Endpoint.Address = New System.ServiceModel.EndpointAddress(getRKSVLink(KASSE))
client.Open()
' svcRKSV.DBUserCredentials m_credentials = new svcRKSV.DBUserCredentials();
Dim credentials As New SDL.RKSVServer.DBUserCredentials
@@ -126,7 +127,6 @@ Public Class cRKSV
credentials.Password = "verag#2"
Dim KASSE As New cRKSV_Kasse(kasse_id)
If KASSE.rksv_ITG_id Is Nothing Then
MsgBox("Keine RKSV-ITG-ID vorhanden!")
@@ -161,7 +161,16 @@ Public Class cRKSV
Return True
End Function
Shared Function getRKSVLink(ByVal kasse As String) As String
If kasse = "FRONT-OFFICE-SUB-KASSE" Then
Return "http://192.168.0.25:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl"
End If
Return "http://192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl"
End Function
Shared Function getRKSVLink(ByVal kasse As cRKSV_Kasse) As String
Return getRKSVLink(kasse.rksv_bez)
End Function
Shared Function stornoRKSV(ByVal kasse As cRKSV_Kasse, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, ByRef answer As String) As Boolean
Try
@@ -170,7 +179,7 @@ Public Class cRKSV
Return False
End If
Dim client As RKSVWcfClient = New RKSVWcfClient()
client.Endpoint.Address = New System.ServiceModel.EndpointAddress("http://192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl")
client.Endpoint.Address = New System.ServiceModel.EndpointAddress(getRKSVLink(kasse))
client.Open()
' svcRKSV.DBUserCredentials m_credentials = new svcRKSV.DBUserCredentials();
Dim credentials As New SDL.RKSVServer.DBUserCredentials
@@ -466,6 +475,11 @@ Public Class cRKSV
rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple
rpt.lblFirma_Name.Text = "IMEX Customs Service GmbH"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 15" & vbNewLine & "UID: ATU68490714 "
Case "FRONT-OFFICE-SUB-KASSE"
'Default Werte:
rpt.picVERAG.Image = My.Resources.FrontOfficeSUB
rpt.lblFirma_Name.Text = "Front-Office Suben eG"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 14" & vbNewLine & "UID: ATU74813856 "
End Select
If KASSE.rksv_aktiv Then
@@ -678,6 +692,12 @@ Public Class cRKSV
rpt.lblFirma_Name.Text = "IMEX Customs Service GmbH"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 15" & vbNewLine & "UID: ATU68490714 "
rpt.Label1.Text = "Wir bestätigen, den o.g. Betrag von der Firma IMEX Customs Service GmbH erhalten zu haben."
Case "FRONT-OFFICE-SUB-KASSE"
'Default Werte:
rpt.picVERAG.Image = My.Resources.FrontOfficeSUB
rpt.lblFirma_Name.Text = "Front-Office Suben eG"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 14" & vbNewLine & "UID: ATU74813856 "
rpt.Label1.Text = "Wir bestätigen, den o.g. Betrag von der Firma Front-Office Suben eG erhalten zu haben."
End Select
@@ -885,10 +905,11 @@ Public Class cRKSV
End Function
Public Shared Function getCardSerialInReader(reader As String)
Public Shared Function getCardSerialInReader(kasse_id As Integer, reader As String)
Try
Dim KASSE As New cRKSV_Kasse(kasse_id)
Dim client As RKSVWcfClient = New RKSVWcfClient()
client.Endpoint.Address = New System.ServiceModel.EndpointAddress("http://192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl")
client.Endpoint.Address = New System.ServiceModel.EndpointAddress(getRKSVLink(KASSE))
client.Open()
' svcRKSV.DBUserCredentials m_credentials = new svcRKSV.DBUserCredentials();
Dim credentials As New SDL.RKSVServer.DBUserCredentials
@@ -903,7 +924,6 @@ Public Class cRKSV
Return client.GetCardInReader(reader)
Catch ex As Exception
MsgBox("ERROR " & ex.Message & ex.StackTrace)
@@ -1008,6 +1028,11 @@ Public Class cRKSV
rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple
rpt.lblFirma_Name.Text = "IMEX Customs Service GmbH"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 15" & vbNewLine & "UID: ATU68490714 "
Case "FRONT-OFFICE-SUB-KASSE"
'Default Werte:
rpt.picVERAG.Image = My.Resources.FrontOfficeSUB
rpt.lblFirma_Name.Text = "Front-Office Suben eG"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 14" & vbNewLine & "UID: ATU74813856 "
End Select
End If
@@ -1129,6 +1154,11 @@ Public Class cRKSV
rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple
rpt.lblFirma_Name.Text = "IMEX Customs Service GmbH"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 15" & vbNewLine & "UID: ATU68490714 "
Case "FRONT-OFFICE-SUB-KASSE"
'Default Werte:
rpt.picVERAG.Image = My.Resources.FrontOfficeSUB
rpt.lblFirma_Name.Text = "Front-Office Suben eG"
rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 14" & vbNewLine & "UID: ATU74813856 "
End Select
print.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous

View File

@@ -301,14 +301,19 @@ Public Class usrCntlATLAS_EZA
End Sub
If sentToDakosy Then
Me.Button1.PerformClick()
Me.FindForm.Close()
Try
Me.Button1.PerformClick()
Me.FindForm.Close()
Catch
End Try
End If
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_DakosyZA_AVISO_Edit", "AVISO") Then
Me.FindForm.Close()
End If
Try
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_DakosyZA_AVISO_Edit", "AVISO") Then
Me.FindForm.Close()
End If
Catch
End Try
End Sub
Sub buttonClick(sender As Object, e As EventArgs) 'HANDLED

View File

@@ -361,9 +361,9 @@ Public Class cFakturierung
End If
End Function
Public Shared Function doRechnungsDruck(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "") As Boolean
Public Shared Function doRechnungsDruck(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional SammelrechnungAnlagendruck As Boolean = False) As Boolean
If RK_ID <= 0 Then Return False
Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName)
Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName,, SammelrechnungAnlagendruck)
End Function
Shared Sub initRgFirma(ByRef rpt As rptRechnungDruck, FIRMA As VERAG_PROG_ALLGEMEIN.cFirmen, Rechnung As VERAG_PROG_ALLGEMEIN.cRechnungsausgang)
@@ -517,7 +517,7 @@ Public Class cFakturierung
Return CBool(CInt(SQL.getValueTxtBySql("SELECT TOP 1 isnull(count(*),0) FROM [tblVorauskassen] inner join Rechnungsausgang ON [vk_FilialeNr]=FilialenNr AND [vk_AbfertigungsNr]=AbfertigungsNr AND [vk_KdNr]=RechnungsKundenNr WHERE RechnungsNr='" & RechnungsNr & "' AND Buchungsjahr='" & Buchungsjahr & "'", "FMZOLL")) > 0)
End Function
Public Shared Function doRechnungsDruck(RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printOriginalRg As Boolean = False) As Boolean
Public Shared Function doRechnungsDruck(RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printOriginalRg As Boolean = False, Optional SammelrechnungAnlagendruck As Boolean = False) As Boolean
If RECHNUNG Is Nothing Then MsgBox("Fehler beim Laden der Rechnungsdaten!") : Return False
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Try
@@ -529,7 +529,9 @@ Public Class cFakturierung
If FIRMA Is Nothing Then MsgBox("Keine Firma gewählt!") : Return False
If vorschau = False And RECHNUNG.Sammelrechnung <> "0" Then MsgBox("Nur bei Einzelrechnung möglich!") : Return False
If Not SammelrechnungAnlagendruck Then
If vorschau = False And RECHNUNG.Sammelrechnung <> "0" Then MsgBox("Nur bei Einzelrechnung möglich!") : Return False
End If
If RECHNUNG.POSITIONEN.Count = 0 Then MsgBox("Keine Daten vorhanden!") : Return False
Dim dtDataSource As New DataTable
@@ -822,6 +824,7 @@ Public Class cFakturierung
rpt.Run(False)
p.NeverEmbedFonts = ""
p.Export(rpt.Document, tmpPath)
Path = tmpPath
'THEREFORE IMPORT:
'-------------------------------------------------------------------------------
@@ -839,7 +842,7 @@ Public Class cFakturierung
Select Case If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0))'If(AD.Rechnungsdruck, 0)
Case 0, 1 'DRUCKEN
Return cProgramFunctions.printRpt(rpt, PrinterName)
Return cProgramFunctions.printRpt(rpt, PrinterName, False)
'Case 1 'FAX
Case 2 'MAIL
@@ -1232,6 +1235,21 @@ Public Class cFakturierung
' Else
' Process.Start(pathPDF)
End If
'THEREFORE IMPORT:
'-------------------------------------------------------------------------------
Try
If Not SRDruckWiederholen And Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
Select Case Firma_ID
Case 1, 11
VERAG_PROG_ALLGEMEIN.cTherefore.saveFileTo_ImportFolder(pathPDF, "SA " & RechnungsNr & " " & dt.Rows(0)("RechnungsName 1"), "")
End Select
End If
Catch ex As Exception
MsgBox("Therefore-Import fehlgeschlagen!" & ex.Message & ex.StackTrace)
End Try
'-------------------------------------------------------------------------------
End If
'-------------- ENDE --------------
End Function
@@ -1241,8 +1259,8 @@ Public Class cFakturierung
If dt IsNot Nothing Then
For Each r In dt.Rows
Dim Path = ""
If Not doRechnungsDruck(r("RK_ID"),,, RechnungsdruckArt, Path, PrinterName) Then
MsgBox("Fehler beim Sammel-Rechnungsdruck - Anlage zur Rechnung: " & r("RechnungsNr"))
If Not doRechnungsDruck(r("RK_ID"),, false, RechnungsdruckArt, Path, PrinterName, True) Then
MsgBox("Fehler beim Sammel-Rechnungsdruck - Anlage zur Rechnung: " & RechnungsNr)
Return False
End If
If Path <> "" Then pathPDF_Anlage.Add(Path)
@@ -1257,9 +1275,6 @@ Public Class cFakturierung
Shared Function doSAMMELRechnungDruck_Rechnungsdruck_Sammelrechnungsbericht(RechnungsNr As Integer, DruckdatumUhrzeit As Date, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional PrinterName As String = "") As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean
Try
Dim rpt As New rptSammelRechnungAnlagenDruck
Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM Rechnungsausgang WHERE Rechnungsausgang.Status IN(3) And CONVERT(datetime,DruckDatumZeit ,104)='" & DruckdatumUhrzeit.ToString("dd.MM.yyyy HH:mm:ss.fff") & "' and RechnungsNr='" & RechnungsNr & "' ORDER BY FilialenNr, AbfertigungsNr", "FMZOLL")
@@ -1457,18 +1472,20 @@ Public Class cFakturierung
Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr"))
Dim RG_Bezeichnung = "VERAG_Rechnung_" & RechnungsNr & ".pdf"
'Rechnugnsdruck = Individuell für deise Rechnung, wird optional mitgegeben
Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
Dim pEx As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
rpt.Run(False)
pEx.NeverEmbedFonts = ""
pEx.Export(rpt.Document, tmpPath)
Path = tmpPath
Select Case If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0))'If(AD.Rechnungsdruck, 0)
Case 0, 1 'DRUCKEN
Return cProgramFunctions.printRpt(rpt, PrinterName)
Return cProgramFunctions.printRpt(rpt, PrinterName, False)
'Case 1 'FAX
Case 2 'MAIL
Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
rpt.Run(False)
p.NeverEmbedFonts = ""
p.Export(rpt.Document, tmpPath)
Path = tmpPath
rpt.Dispose()
@@ -1489,11 +1506,11 @@ Public Class cFakturierung
Case 3 'PDF + öffnen
Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
rpt.Run(False)
p.NeverEmbedFonts = ""
p.Export(rpt.Document, tmpPath)
'Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
'Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
'rpt.Run(False)
'p.NeverEmbedFonts = ""
'p.Export(rpt.Document, tmpPath)
rpt.Dispose()
Path = tmpPath
@@ -1501,11 +1518,11 @@ Public Class cFakturierung
Return True
Case 4 'PDF
Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
rpt.Run(False)
p.NeverEmbedFonts = ""
p.Export(rpt.Document, tmpPath)
'Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
'Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
'rpt.Run(False)
'p.NeverEmbedFonts = ""
'p.Export(rpt.Document, tmpPath)
rpt.Dispose()
Path = tmpPath
@@ -1761,24 +1778,11 @@ Public Class cFakturierung
p.NeverEmbedFonts = ""
p.Export(rpt.Document, tmpPath)
'THEREFORE IMPORT:
'-------------------------------------------------------------------------------
Try
If Not SRDruckWiederholen And Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
Select Case ROW("Firma_ID")
Case 1, 11
VERAG_PROG_ALLGEMEIN.cTherefore.saveFileTo_ImportFolder(tmpPath, "SA " & RechnungsNr & " " & ROW("RechnungsName 1"), "")
End Select
End If
Catch ex As Exception
MsgBox("Therefore-Import fehlgeschlagen!" & ex.Message & ex.StackTrace)
End Try
'-------------------------------------------------------------------------------
Select Case If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0))'If(AD.Rechnungsdruck, 0)
Case 0, 1 'DRUCKEN
Return cProgramFunctions.printRpt(rpt, PrinterName)
Path = tmpPath 'wird für Therefore benötigt
Return cProgramFunctions.printRpt(rpt, PrinterName, False)
'Case 1 'FAX
Case 2 'MAIL

View File

@@ -519,7 +519,7 @@ Public Class frmAbrechnungsMaske
initBtns("")
End Sub
Private Sub MyTextBox2_TextChanged(sender As Object, e As KeyEventArgs) Handles MyTextBox2.KeyDown, MyTextBox3.KeyDown, MyTextBox2.TextChanged
Private Sub MyTextBox2_TextChanged(sender As Object, e As KeyEventArgs) Handles MyTextBox2.KeyDown, MyTextBox3.KeyDown ', MyTextBox2.TextChanged
If e.KeyCode = Keys.Return Then
initBtns("")
End If

View File

@@ -668,6 +668,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property FrontOfficeSUB() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("FrontOfficeSUB", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

View File

@@ -742,4 +742,7 @@
<data name="plose_it" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\plose_it.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FrontOfficeSUB" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\FrontOfficeSUB.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -3716,6 +3716,7 @@
<None Include="Resources\chimes.wav" />
<None Include="Resources\chimes2.wav" />
<None Include="Resources\ambar_simple1.png" />
<None Include="Resources\FrontOfficeSUB.jpg" />
<Content Include="Resources\GS\gsdll32.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

View File

@@ -38,9 +38,9 @@ End Class
Public Class cProgramFunctions
Public Shared Function printRpt(rpt As GrapeCity.ActiveReports.SectionReport, printername As String) As Boolean
Public Shared Function printRpt(rpt As GrapeCity.ActiveReports.SectionReport, printername As String, Optional runReport As Boolean = True) As Boolean
Try
rpt.Run(False)
If runReport Then rpt.Run(False)
rpt.Document.Printer.PrinterSettings.Copies = 1
If printername <> "" Then
rpt.Document.Printer.PrinterName = printername

View File

@@ -1069,7 +1069,7 @@ Public Class frmKassenbuch
Dim reader = InputBox("Bitte ReaderNamen angeben:")
If reader <> "" Then
Dim serial = cRKSV.getCardSerialInReader(reader)
Dim serial = cRKSV.getCardSerialInReader(cboKassen._value, reader)
If serial <> "" Then MsgBox(serial) Else MsgBox("Karte nicht gefunden!")
End If
End Sub

View File

@@ -59,10 +59,12 @@
Case CheckState.Unchecked : SQLstr &= " AND Auswahl='I' " : suchparam = True
End Select
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : SQLstr &= " AND [FilialenNr]='5501' " : suchparam = True
Case Else : SQLstr &= " AND isnull([FilialenNr],0)<>'5501' " : suchparam = True
Case "VERAG", "ATILLA" : SQLstr &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') " : suchparam = True
Case Else : SQLstr &= " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' " : suchparam = True
End Select
'If txtPostfachOrt.Text <> "" Then SQLstr &= " AND Postfach LIKE '%" & txtPostfachOrt.Text & "%'" : suchparam = True
'If txtPostfachPlz.Text <> "" Then SQLstr &= " AND PLZPf LIKE '%" & txtPostfachPlz.Text & "%'" : suchparam = True
'MsgBox(SQLstr)