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
Try
Me.Button1.PerformClick()
Me.FindForm.Close()
Catch
End Try
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 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)

View File

@@ -272,7 +272,7 @@ Public Class KdSearchBox
SQLstr &= " AND ( Ordnungsbegriff LIKE '" & srch & "%' OR AdressenNr LIKE '" & srch & "%' ) "
If srch2 <> "" Then SQLstr &= " AND ( PLZ LIKE '" & srch2 & "%' OR Ort LIKE '" & srch2 & "%' OR LandKz LIKE '" & srch2 & "%' OR Straße LIKE '" & srch2 & "%' ) "
SQLstr &= " AND [Auswahl]='A' "
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" Then
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then
SQLstr &= " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' "
Else
'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "
@@ -314,7 +314,7 @@ Public Class KdSearchBox
SQLstr &= " AND ( Ordnungsbegriff LIKE '" & srch & "%' OR AdressenNr LIKE '" & srch & "%' ) "
If srch2 <> "" Then SQLstr &= " AND ( PLZ LIKE '" & srch2 & "%' OR Ort LIKE '" & srch2 & "%' OR LandKz LIKE '" & srch2 & "%' OR Straße LIKE '" & srch2 & "%' ) "
SQLstr &= " AND [Auswahl]='I' "
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" Then
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then
SQLstr &= " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' "
Else
'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "

View File

@@ -66,6 +66,7 @@ Public Class cSendungen
Property tblSnd_WarenwertWaehrung As Object = Nothing
Property ABRECHNUNG As New List(Of cSendungAbrechnung)
Property HANDLING As New List(Of cSendHandling)
'Dim cDatenbank As New cDatenbank
@@ -274,6 +275,37 @@ Public Class cSendungen
' Return Nothing
End Sub
Public Sub LOAD_HANDLING()
Try
Me.HANDLING.Clear()
Dim conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
Using cmd2 As New SqlCommand("SELECT * FROM tblSendhandling WHERE sndhdg_sendId=@sndhdg_sendId ", conn)
cmd2.Parameters.AddWithValue("@sndhdg_sendId", Me.tblSnd_SendungID)
Dim dr2 = cmd2.ExecuteReader()
While dr2.Read
Dim a As New cSendHandling(Me.tblSnd_SendungID)
a.sndhdg_id = SQL.checkNullReturnValue(dr2.Item("sndhdg_id"), Nothing)
'a.sndhdg_sendId = SQL.checkNullReturnValue(dr2.Item("sndhdg_sendId"), Nothing)
a.sndhdg_abrArt = SQL.checkNullReturnValue(dr2.Item("sndhdg_abrArt"), Nothing)
a.sndhdg_nr = SQL.checkNullReturnValue(dr2.Item("sndhdg_nr"), Nothing)
Me.HANDLING.Add(a)
End While
dr2.Close()
End Using
conn.Close()
'End Using
'Return Nothing
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
' Return Nothing
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_SendungID", tblSnd_SendungID, , True)) 'UPDATE INSERT ISPRIMARY!
@@ -398,6 +430,20 @@ Public Class cSendungen
End Function
Public Function SAVE_HANDLING() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
' Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
SAVE_HANDLING = False
Dim sqlstr = " DELETE FROM tblSendHandling WHERE sndhdg_sendId=" & Me.tblSnd_SendungID
' MsgBox(sqlstr)
If SQL.doSQL(sqlstr, "AVISO") Then
SAVE_HANDLING = True
For Each a In HANDLING
If Not a.INSERT() Then SAVE_HANDLING = False
Next
End If
' Return b
End Function
Public Shared Function SET_SpedbuchEntry(tblSnd_SendungID As Integer, tblSnd_SpeditionsbuchEingetragen As Boolean) As String
@@ -483,4 +529,61 @@ Public Class cSendungAbrechnung
End Class
Public Class cSendHandling
Property sndhdg_id As Integer = Nothing
Property sndhdg_sendId As Integer = Nothing
Property sndhdg_abrArt As String = Nothing
Property sndhdg_nr As String = Nothing
Dim SQL As New SQL
Sub New(sndhdg_sendId)
Me.sndhdg_sendId = sndhdg_sendId
End Sub
Sub New(sndhdg_sendId, sndabr_beteiligter, sndabr_abrArt, sndabr_wert)
Me.sndhdg_sendId = sndhdg_sendId
Me.sndhdg_abrArt = sndhdg_abrArt
Me.sndhdg_nr = sndhdg_nr
End Sub
Sub New(sndhdg_sendId, sndhdg_abrArt, sndhdg_nr)
Me.sndhdg_sendId = sndhdg_sendId
Me.sndhdg_abrArt = sndhdg_abrArt
Me.sndhdg_nr = sndhdg_nr
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_id", sndhdg_id, , True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_sendId", sndhdg_sendId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_abrArt", sndhdg_abrArt))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_nr", sndhdg_nr))
Return list
End Function
Public Function INSERT() As Boolean
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
Dim values As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "],"
values &= "@" & i.Text.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
values = values.Substring(0, values.Length - 1) 'wg. ','
Return SQL.doSQLVarList(" INSERT INTO [tblSendHandling] (" & str & ") VALUES(" & values & ") ", "AVISO", , list)
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return False
End Function
End Class

View File

@@ -221,7 +221,7 @@ Public Class cDATENSERVER
If DATA_LIST.ADD(srcPath, destpath, bezeichnung, "", coll_archiv) Then
Return (destpath <> "")
End If
Return ""
Return False
End Function
Public Function insertDataToDATENSERVER(srcPath, Optional bezeichnung = "", Optional endung = "", Optional allowMsg = True, Optional coll_archiv = False) As Boolean

View File

@@ -38,11 +38,14 @@ Namespace VERAG_OUT_NCTS
Private _nCTS_Data As VERAG_out_nctsNCTS_Data
Private _attachments As List(Of VERAG_out_nctsAttachment)
Private Shared sSerializer As XmlSerializer
#End Region
Public Sub New()
MyBase.New
Me._attachments = New List(Of VERAG_out_nctsAttachment)()
Me._nCTS_Data = New VERAG_out_nctsNCTS_Data()
Me._processData = New VERAG_out_nctsProcessData()
Me._internalReference = New VERAG_out_nctsInternalReference()
@@ -102,6 +105,16 @@ Namespace VERAG_OUT_NCTS
End Set
End Property
<System.Xml.Serialization.XmlArrayItemAttribute("Attachment", IsNullable:=False)>
Public Property Attachments() As List(Of VERAG_out_nctsAttachment)
Get
Return Me._attachments
End Get
Set
Me._attachments = Value
End Set
End Property
Private Shared ReadOnly Property Serializer() As XmlSerializer
Get
If (sSerializer Is Nothing) Then
@@ -694,7 +707,7 @@ Namespace VERAG_OUT_NCTS
Private _carrier As VERAG_out_nctsNCTS_DataCarrier
Private _garantee As VERAG_out_nctsNCTS_DataGarantee
Private _guarantee As VERAG_out_nctsNCTS_DataGuarantee
Private _sumGrossWeight As Decimal
@@ -706,7 +719,7 @@ Namespace VERAG_OUT_NCTS
Public Sub New()
MyBase.New
Me._position = New List(Of VERAG_out_nctsNCTS_DataPosition)()
Me._garantee = New VERAG_out_nctsNCTS_DataGarantee()
Me._guarantee = New VERAG_out_nctsNCTS_DataGuarantee()
Me._carrier = New VERAG_out_nctsNCTS_DataCarrier()
Me._consignee = New VERAG_out_nctsNCTS_DataConsignee()
Me._sender = New VERAG_out_nctsNCTS_DataSender()
@@ -794,12 +807,12 @@ Namespace VERAG_OUT_NCTS
End Set
End Property
Public Property Garantee() As VERAG_out_nctsNCTS_DataGarantee
Public Property Guarantee() As VERAG_out_nctsNCTS_DataGuarantee
Get
Return Me._garantee
Return Me._guarantee
End Get
Set
Me._garantee = Value
Me._guarantee = Value
End Set
End Property
@@ -2290,7 +2303,7 @@ Namespace VERAG_OUT_NCTS
System.Diagnostics.DebuggerStepThroughAttribute(),
System.ComponentModel.DesignerCategoryAttribute("code"),
System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=True)>
Partial Public Class VERAG_out_nctsNCTS_DataGarantee
Partial Public Class VERAG_out_nctsNCTS_DataGuarantee
#Region "Private fields"
Private _gRN As Object
@@ -2321,7 +2334,7 @@ Namespace VERAG_OUT_NCTS
Private Shared ReadOnly Property Serializer() As XmlSerializer
Get
If (sSerializer Is Nothing) Then
sSerializer = New XmlSerializerFactory().CreateSerializer(GetType(VERAG_out_nctsNCTS_DataGarantee))
sSerializer = New XmlSerializerFactory().CreateSerializer(GetType(VERAG_out_nctsNCTS_DataGuarantee))
End If
Return sSerializer
End Get
@@ -2329,7 +2342,7 @@ Namespace VERAG_OUT_NCTS
#Region "Serialize/Deserialize"
''' <summary>
''' Serializes current VERAG_out_nctsNCTS_DataGarantee object into an XML string
''' Serializes current VERAG_out_nctsNCTS_DataGuarantee object into an XML string
''' </summary>
''' <returns>string XML value</returns>
Public Overridable Function Serialize() As String
@@ -2356,15 +2369,15 @@ Namespace VERAG_OUT_NCTS
End Function
''' <summary>
''' Deserializes workflow markup into an VERAG_out_nctsNCTS_DataGarantee object
''' Deserializes workflow markup into an VERAG_out_nctsNCTS_DataGuarantee object
''' </summary>
''' <param name="input">string workflow markup to deserialize</param>
''' <param name="obj">Output VERAG_out_nctsNCTS_DataGarantee object</param>
''' <param name="obj">Output VERAG_out_nctsNCTS_DataGuarantee object</param>
''' <param name="exception">output Exception value if deserialize failed</param>
''' <returns>true if this Serializer can deserialize the object; otherwise, false</returns>
Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As VERAG_out_nctsNCTS_DataGarantee, ByRef exception As System.Exception) As Boolean
Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As VERAG_out_nctsNCTS_DataGuarantee, ByRef exception As System.Exception) As Boolean
exception = Nothing
obj = CType(Nothing, VERAG_out_nctsNCTS_DataGarantee)
obj = CType(Nothing, VERAG_out_nctsNCTS_DataGuarantee)
Try
obj = Deserialize(input)
Return True
@@ -2374,16 +2387,16 @@ Namespace VERAG_OUT_NCTS
End Try
End Function
Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As VERAG_out_nctsNCTS_DataGarantee) As Boolean
Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As VERAG_out_nctsNCTS_DataGuarantee) As Boolean
Dim exception As System.Exception = Nothing
Return Deserialize(input, obj, exception)
End Function
Public Overloads Shared Function Deserialize(ByVal input As String) As VERAG_out_nctsNCTS_DataGarantee
Public Overloads Shared Function Deserialize(ByVal input As String) As VERAG_out_nctsNCTS_DataGuarantee
Dim stringReader As System.IO.StringReader = Nothing
Try
stringReader = New System.IO.StringReader(input)
Return CType(Serializer.Deserialize(XmlReader.Create(stringReader)), VERAG_out_nctsNCTS_DataGarantee)
Return CType(Serializer.Deserialize(XmlReader.Create(stringReader)), VERAG_out_nctsNCTS_DataGuarantee)
Finally
If (Not (stringReader) Is Nothing) Then
stringReader.Dispose()
@@ -2391,13 +2404,13 @@ Namespace VERAG_OUT_NCTS
End Try
End Function
Public Overloads Shared Function Deserialize(ByVal s As System.IO.Stream) As VERAG_out_nctsNCTS_DataGarantee
Return CType(Serializer.Deserialize(s), VERAG_out_nctsNCTS_DataGarantee)
Public Overloads Shared Function Deserialize(ByVal s As System.IO.Stream) As VERAG_out_nctsNCTS_DataGuarantee
Return CType(Serializer.Deserialize(s), VERAG_out_nctsNCTS_DataGuarantee)
End Function
#End Region
''' <summary>
''' Serializes current VERAG_out_nctsNCTS_DataGarantee object into file
''' Serializes current VERAG_out_nctsNCTS_DataGuarantee object into file
''' </summary>
''' <param name="fileName">full path of outupt xml file</param>
''' <param name="exception">output Exception value if failed</param>
@@ -2429,15 +2442,15 @@ Namespace VERAG_OUT_NCTS
End Sub
''' <summary>
''' Deserializes xml markup from file into an VERAG_out_nctsNCTS_DataGarantee object
''' Deserializes xml markup from file into an VERAG_out_nctsNCTS_DataGuarantee object
''' </summary>
''' <param name="fileName">string xml file to load and deserialize</param>
''' <param name="obj">Output VERAG_out_nctsNCTS_DataGarantee object</param>
''' <param name="obj">Output VERAG_out_nctsNCTS_DataGuarantee object</param>
''' <param name="exception">output Exception value if deserialize failed</param>
''' <returns>true if this Serializer can deserialize the object; otherwise, false</returns>
Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As VERAG_out_nctsNCTS_DataGarantee, ByRef exception As System.Exception) As Boolean
Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As VERAG_out_nctsNCTS_DataGuarantee, ByRef exception As System.Exception) As Boolean
exception = Nothing
obj = CType(Nothing, VERAG_out_nctsNCTS_DataGarantee)
obj = CType(Nothing, VERAG_out_nctsNCTS_DataGuarantee)
Try
obj = LoadFromFile(fileName)
Return True
@@ -2447,12 +2460,12 @@ Namespace VERAG_OUT_NCTS
End Try
End Function
Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As VERAG_out_nctsNCTS_DataGarantee) As Boolean
Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As VERAG_out_nctsNCTS_DataGuarantee) As Boolean
Dim exception As System.Exception = Nothing
Return LoadFromFile(fileName, obj, exception)
End Function
Public Overloads Shared Function LoadFromFile(ByVal fileName As String) As VERAG_out_nctsNCTS_DataGarantee
Public Overloads Shared Function LoadFromFile(ByVal fileName As String) As VERAG_out_nctsNCTS_DataGuarantee
Dim file As System.IO.FileStream = Nothing
Dim sr As System.IO.StreamReader = Nothing
Try
@@ -2693,4 +2706,238 @@ Namespace VERAG_OUT_NCTS
End Try
End Function
End Class
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0"),
System.SerializableAttribute(),
System.Diagnostics.DebuggerStepThroughAttribute(),
System.ComponentModel.DesignerCategoryAttribute("code"),
System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=True)>
Partial Public Class VERAG_out_nctsAttachment
#Region "Private fields"
Private _name As Object
Private _fileType As Object
Private _description As Object
Private _documentType As VERAG_out_nctsAttachmentDocumentType
Private _base64BinaryStream() As Byte
Private Shared sSerializer As XmlSerializer
#End Region
Public Property Name() As Object
Get
Return Me._name
End Get
Set
Me._name = Value
End Set
End Property
Public Property FileType() As Object
Get
Return Me._fileType
End Get
Set
Me._fileType = Value
End Set
End Property
Public Property Description() As Object
Get
Return Me._description
End Get
Set
Me._description = Value
End Set
End Property
Public Property DocumentType() As VERAG_out_nctsAttachmentDocumentType
Get
Return Me._documentType
End Get
Set
Me._documentType = Value
End Set
End Property
<System.Xml.Serialization.XmlElementAttribute(DataType:="base64Binary")>
Public Property base64BinaryStream() As Byte()
Get
Return Me._base64BinaryStream
End Get
Set
Me._base64BinaryStream = Value
End Set
End Property
Private Shared ReadOnly Property Serializer() As XmlSerializer
Get
If (sSerializer Is Nothing) Then
sSerializer = New XmlSerializerFactory().CreateSerializer(GetType(VERAG_out_nctsAttachment))
End If
Return sSerializer
End Get
End Property
#Region "Serialize/Deserialize"
''' <summary>
''' Serializes current VERAG_out_nctsAttachment object into an XML string
''' </summary>
''' <returns>string XML value</returns>
Public Overridable Function Serialize() As String
Dim streamReader As System.IO.StreamReader = Nothing
Dim memoryStream As System.IO.MemoryStream = Nothing
Try
memoryStream = New System.IO.MemoryStream()
Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
xmlWriterSettings.Indent = True
xmlWriterSettings.IndentChars = " "
Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
Serializer.Serialize(xmlWriter, Me)
memoryStream.Seek(0, SeekOrigin.Begin)
streamReader = New System.IO.StreamReader(memoryStream)
Return streamReader.ReadToEnd
Finally
If (Not (streamReader) Is Nothing) Then
streamReader.Dispose()
End If
If (Not (memoryStream) Is Nothing) Then
memoryStream.Dispose()
End If
End Try
End Function
''' <summary>
''' Deserializes workflow markup into an VERAG_out_nctsAttachment object
''' </summary>
''' <param name="input">string workflow markup to deserialize</param>
''' <param name="obj">Output VERAG_out_nctsAttachment object</param>
''' <param name="exception">output Exception value if deserialize failed</param>
''' <returns>true if this Serializer can deserialize the object; otherwise, false</returns>
Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As VERAG_out_nctsAttachment, ByRef exception As System.Exception) As Boolean
exception = Nothing
obj = CType(Nothing, VERAG_out_nctsAttachment)
Try
obj = Deserialize(input)
Return True
Catch ex As System.Exception
exception = ex
Return False
End Try
End Function
Public Overloads Shared Function Deserialize(ByVal input As String, ByRef obj As VERAG_out_nctsAttachment) As Boolean
Dim exception As System.Exception = Nothing
Return Deserialize(input, obj, exception)
End Function
Public Overloads Shared Function Deserialize(ByVal input As String) As VERAG_out_nctsAttachment
Dim stringReader As System.IO.StringReader = Nothing
Try
stringReader = New System.IO.StringReader(input)
Return CType(Serializer.Deserialize(XmlReader.Create(stringReader)), VERAG_out_nctsAttachment)
Finally
If (Not (stringReader) Is Nothing) Then
stringReader.Dispose()
End If
End Try
End Function
Public Overloads Shared Function Deserialize(ByVal s As System.IO.Stream) As VERAG_out_nctsAttachment
Return CType(Serializer.Deserialize(s), VERAG_out_nctsAttachment)
End Function
#End Region
''' <summary>
''' Serializes current VERAG_out_nctsAttachment object into file
''' </summary>
''' <param name="fileName">full path of outupt xml file</param>
''' <param name="exception">output Exception value if failed</param>
''' <returns>true if can serialize and save into file; otherwise, false</returns>
Public Overridable Overloads Function SaveToFile(ByVal fileName As String, ByRef exception As System.Exception) As Boolean
exception = Nothing
Try
SaveToFile(fileName)
Return True
Catch e As System.Exception
exception = e
Return False
End Try
End Function
Public Overridable Overloads Sub SaveToFile(ByVal fileName As String)
Dim streamWriter As System.IO.StreamWriter = Nothing
Try
Dim xmlString As String = Serialize()
Dim xmlFile As System.IO.FileInfo = New System.IO.FileInfo(fileName)
streamWriter = xmlFile.CreateText
streamWriter.WriteLine(xmlString)
streamWriter.Close()
Finally
If (Not (streamWriter) Is Nothing) Then
streamWriter.Dispose()
End If
End Try
End Sub
''' <summary>
''' Deserializes xml markup from file into an VERAG_out_nctsAttachment object
''' </summary>
''' <param name="fileName">string xml file to load and deserialize</param>
''' <param name="obj">Output VERAG_out_nctsAttachment object</param>
''' <param name="exception">output Exception value if deserialize failed</param>
''' <returns>true if this Serializer can deserialize the object; otherwise, false</returns>
Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As VERAG_out_nctsAttachment, ByRef exception As System.Exception) As Boolean
exception = Nothing
obj = CType(Nothing, VERAG_out_nctsAttachment)
Try
obj = LoadFromFile(fileName)
Return True
Catch ex As System.Exception
exception = ex
Return False
End Try
End Function
Public Overloads Shared Function LoadFromFile(ByVal fileName As String, ByRef obj As VERAG_out_nctsAttachment) As Boolean
Dim exception As System.Exception = Nothing
Return LoadFromFile(fileName, obj, exception)
End Function
Public Overloads Shared Function LoadFromFile(ByVal fileName As String) As VERAG_out_nctsAttachment
Dim file As System.IO.FileStream = Nothing
Dim sr As System.IO.StreamReader = Nothing
Try
file = New System.IO.FileStream(fileName, FileMode.Open, FileAccess.Read)
sr = New System.IO.StreamReader(file)
Dim xmlString As String = sr.ReadToEnd
sr.Close()
file.Close()
Return Deserialize(xmlString)
Finally
If (Not (file) Is Nothing) Then
file.Dispose()
End If
If (Not (sr) Is Nothing) Then
sr.Dispose()
End If
End Try
End Function
End Class
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3056.0"),
System.SerializableAttribute(),
System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=True)>
Public Enum VERAG_out_nctsAttachmentDocumentType
'''<remarks/>
NCTS
'''<remarks/>
OTHER
End Enum
End Namespace

View File

@@ -4,7 +4,7 @@
<xs:element name="VERAG_out_ncts">
<xs:complexType>
<xs:sequence>
<xs:element name="Version" default="1.0.2"/>
<xs:element name="Version" default="2.0.0"/>
<xs:element name="Company"/>
<xs:element name="Department" minOccurs="0"/>
<xs:element name="InternalReference" minOccurs="0">
@@ -99,7 +99,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Garantee" minOccurs="0">
<xs:element name="Guarantee" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="GRN"/>
@@ -128,6 +128,30 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Attachments" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Attachment" minOccurs="0" maxOccurs="999">
<xs:complexType>
<xs:sequence>
<xs:element name="Name"/>
<xs:element name="FileType"/>
<xs:element name="Description"/>
<xs:element name="DocumentType">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="NCTS"/>
<xs:enumeration value="OTHER"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="base64BinaryStream" type="xs:base64Binary"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -93,11 +93,11 @@
<Reference Include="RichTextBoxEx">
<HintPath>..\..\..\dll\RichTextBoxEx.dll</HintPath>
</Reference>
<Reference Include="Spire.License, Version=1.3.7.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
<Reference Include="Spire.License, Version=1.3.7.40, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\AVISO\Aviso\packages\Spire.PDFViewer.4.9.5\lib\net46\Spire.License.dll</HintPath>
</Reference>
<Reference Include="Spire.Pdf, Version=5.10.2.2046, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
<Reference Include="Spire.Pdf, Version=5.10.8.2040, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\AVISO\Aviso\packages\Spire.PDFViewer.4.9.5\lib\net46\Spire.Pdf.dll</HintPath>
</Reference>