diff --git a/VERAG_REST_SERVER.sln b/VERAG_REST_SERVER.sln index 7823097..1f934e3 100644 --- a/VERAG_REST_SERVER.sln +++ b/VERAG_REST_SERVER.sln @@ -4,11 +4,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_REST_SERVER", "VERAG_REST_SERVER\VERAG_REST_SERVER.vbproj", "{7DF44971-3806-4AEB-9F92-4A1A07837616}" + ProjectSection(ProjectDependencies) = postProject + {A3B497BD-842C-4A2B-B398-ED1976849DF1} = {A3B497BD-842C-4A2B-B398-ED1976849DF1} + EndProjectSection EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NCTSPartnerWorker", "..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj", "{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGMonitoring", "..\ADMIN\ADMIN\VERAGMonitoring\VERAGMonitoring.vbproj", "{6C5CFB90-BE10-4824-997D-B494A7CFF565}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -41,6 +46,14 @@ Global {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|Any CPU.Build.0 = Release|Any CPU {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x64.ActiveCfg = Release|Any CPU {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x64.Build.0 = Release|Any CPU + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Debug|x64.ActiveCfg = Debug|x64 + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Debug|x64.Build.0 = Debug|x64 + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Release|Any CPU.Build.0 = Release|Any CPU + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Release|x64.ActiveCfg = Release|x64 + {6C5CFB90-BE10-4824-997D-B494A7CFF565}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VERAG_REST_SERVER/App_Start/BasicAuthenticationAttribute.vb b/VERAG_REST_SERVER/App_Start/BasicAuthenticationAttribute.vb index 70b09ef..cd1c25a 100644 --- a/VERAG_REST_SERVER/App_Start/BasicAuthenticationAttribute.vb +++ b/VERAG_REST_SERVER/App_Start/BasicAuthenticationAttribute.vb @@ -3,12 +3,8 @@ Imports System.Net.Http Imports System.Security.Principal Imports System.Threading Imports System.Web.Http.Controllers -Imports System.Web.Http.Description Imports System.Web.Http.Filters -Imports Microsoft.AspNetCore.Authorization -Imports Swashbuckle.Swagger Imports VERAG_PROG_ALLGEMEIN -Imports VERAG_PROG_ALLGEMEIN.TESTJSON @@ -25,6 +21,7 @@ Public Class BasicAuthenticationAttribute Dim usernamePasswordArray = decodedAuthenticationToken.Split(":"c) Dim userName = usernamePasswordArray(0) Dim password = usernamePasswordArray(1) + 'Dim hashedPW = BCrypt.Net.BCrypt.HashPassword(password) @@ -51,9 +48,9 @@ Public Class BasicAuthenticationAttribute Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim authenticated As Boolean = False - Dim Response = SQL.DLookup("username", "tblAuthentication", "username='" & user & "' and password='" & password & "'", "FMZOLL", "") - If Response <> "" Then - authenticated = True + Dim hashedPassword = SQL.DLookup("hashedPassword", "tblRESTAuthentication", "username='" & user & "' AND type = 'REST'", "ADMIN", "") + If hashedPassword <> "" Then + authenticated = BCrypt.Net.BCrypt.Verify(password, hashedPassword) End If Return authenticated diff --git a/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb b/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb index 74a311b..10253b2 100644 --- a/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb +++ b/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb @@ -26,24 +26,25 @@ Public Class SwaggerConfig Dim commentsFileName = Assembly.GetExecutingAssembly().GetName().Name + ".XML" Dim commentsFile = Path.Combine(baseDirectory, commentsFileName) - GlobalConfiguration.Configuration.EnableSwagger(Function(c) + GlobalConfiguration.Configuration.EnableSwagger(Function(c) As SwaggerDocsConfig c.PrettyPrint() - c.MultipleApiVersions(Function(apiDesc, targetApiVersion) ResolveVersionSupportByRouteConstraint(apiDesc, targetApiVersion), Function(vc) + c.MultipleApiVersions(Function(apiDesc, targetApiVersion) ResolveVersionSupportByRouteConstraint(apiDesc, targetApiVersion), Function(vc) As VersionInfoBuilder - vc.Version("v1", descr & " V1").Description("A sample API for testing ").TermsOfService("Some Terms").Contact(Function(cont) - cont.Name("VERAG AG") - cont.Url("http://test.at") - cont.Email("Mail.test") - End Function).License(Function(lic) - lic.Name("Lizenz") - lic.Url("http://test.at") - End Function) + vc.Version("1", descr & " V1").Description("A sample API for testing ").TermsOfService("Some Terms").Contact(Function(cont) As ContactBuilder + cont.Name("VERAG AG") + cont.Url("http://test.at") + cont.Email("Mail.test") + End Function).License(Function(lic) + lic.Name("Lizenz") + lic.Url("http://test.at") + End Function) - vc.Version("v2", descr & " V2") - vc.Version("v3", descr & " V3") + vc.Version("2", descr & " V2") + vc.Version("3", descr & " V3") + Return vc End Function) @@ -59,8 +60,8 @@ Public Class SwaggerConfig 'c.OperationFilter(Of BasicAuthenticationAttribute)() - - End Function).EnableSwaggerUi(Function(c) + Return c + End Function).EnableSwaggerUi(Function(c) As SwaggerUiConfig c.DocumentTitle(descr) c.EnableDiscoveryUrlSelector() @@ -68,13 +69,13 @@ Public Class SwaggerConfig c.CustomAsset("index", thisAssembly, "VERAG_REST_SERVER.my_index.html") - - - - + Return c End Function) + + + End Sub @@ -85,15 +86,27 @@ Public Class SwaggerConfig End Function Public Shared Sub Register(ByVal config As HttpConfiguration) + RouteTable.Routes.MapOwinPath("swagger", Function(app) As Owin.IAppBuilder - Return app.UseSwaggerUi3(GetType(WebApiApplication).Assembly, Function(settings) As SwaggerUi3Settings(Of NSwag.Generation.WebApi.WebApiOpenApiDocumentGeneratorSettings) - settings.MiddlewareBasePath = "/swagger" - settings.GeneratorSettings.DefaultUrlTemplate = "api/{controller}/{id}" - Return settings - End Function) + app.UseSwaggerUi(GetType(WebApiApplication).Assembly, Function(settings) As SwaggerUiSettings(Of NSwag.Generation.WebApi.WebApiOpenApiDocumentGeneratorSettings) + settings.MiddlewareBasePath = "/swagger" + settings.GeneratorSettings.DefaultUrlTemplate = "api/{controller}/{id}" + settings.DocumentTitle = descr + settings.DocExpansion = "list" + settings.DefaultModelsExpandDepth = -1 + Return settings + End Function) + + + + Return app End Function) + + End Sub + + End Class diff --git a/VERAG_REST_SERVER/App_Start/WebApiConfig.vb b/VERAG_REST_SERVER/App_Start/WebApiConfig.vb index 97e1222..46aa6b7 100644 --- a/VERAG_REST_SERVER/App_Start/WebApiConfig.vb +++ b/VERAG_REST_SERVER/App_Start/WebApiConfig.vb @@ -73,14 +73,14 @@ Public Module WebApiConfig - config.AddApiVersioning(Function(options) - options.ReportApiVersions = True - options.AssumeDefaultVersionWhenUnspecified = True - options.ApiVersionReader = ApiVersionReader.Combine(New UrlSegmentApiVersionReader(), - New HeaderApiVersionReader("x-api-version"), - New MediaTypeApiVersionReader("x-api-version")) - 'options.DefaultApiVersion = New ApiVersion("1") - End Function) + 'config.AddApiVersioning(Function(options) + ' options.ReportApiVersions = True + ' options.AssumeDefaultVersionWhenUnspecified = True + ' options.ApiVersionReader = ApiVersionReader.Combine(New UrlSegmentApiVersionReader(), + ' New HeaderApiVersionReader("x-api-version"), + ' New MediaTypeApiVersionReader("x-api-version")) + ' 'options.DefaultApiVersion = New ApiVersion("1") + ' End Function) config.AddVersionedApiExplorer(Function(c) @@ -98,15 +98,50 @@ Public Module WebApiConfig Public Sub Register(ByVal config As HttpConfiguration) - SwaggerConfig.Register(config) + Dim constraintsResolver = New DefaultInlineConstraintResolver() constraintsResolver.ConstraintMap.Add("apiVersion", GetType(ApiVersionRouteConstraint)) - config.MapHttpAttributeRoutes(constraintsResolver) - 'config.Filters.Add(New AuthorizeAttribute) 'wenn alle API Aufrufe autorisiert werden müssen/ansonsten können einzelene Controlleraufrufe auth. werden! - config.Filters.Add(New BasicAuthenticationAttribute()) + + 'config.AddApiVersioning(Sub(options As Action(Of ApiVersioningOptions) + ' '// reporting api versions will return the headers "api-supported-versions" and "api-deprecated-versions" + + ' options.ReportApiVersions = True + ' options.AssumeDefaultVersionWhenUnspecified = True + ' options.ApiVersionReader = ApiVersionReader.Combine(New UrlSegmentApiVersionReader(), + ' New HeaderApiVersionReader("x-api-version"), + ' New MediaTypeApiVersionReader("x-api-version")) + + + ' End Sub) + + + config.AddApiVersioning(Sub(options As Microsoft.Web.Http.Versioning.ApiVersioningOptions) + options.AssumeDefaultVersionWhenUnspecified = True + options.ReportApiVersions = True + + options.DefaultApiVersion = New Microsoft.Web.Http.ApiVersion(1, 0) + options.DefaultApiVersion = New Microsoft.Web.Http.ApiVersion(2, 0) + + options.ApiVersionSelector = New Microsoft.Web.Http.Versioning.LowestImplementedApiVersionSelector(options) + End Sub) + + config.AddVersionedApiExplorer(Function(c) + c.GroupNameFormat = "'v'VVV" + c.SubstituteApiVersionInUrl = True + End Function) + + + If False Then 'wenn alle API Aufrufe autorisiert werden müssen/ansonsten können einzelene Controlleraufrufe auth. werden! + config.Filters.Add(New AuthorizeAttribute) + Else + config.Filters.Add(New BasicAuthenticationAttribute()) + End If + + + SwaggerConfig.Register(config) End Sub diff --git a/VERAG_REST_SERVER/Controllers/ATEZ/ATEZController CBAM.vb b/VERAG_REST_SERVER/Controllers/ATEZ/ATEZController CBAM.vb new file mode 100644 index 0000000..6d48fcd --- /dev/null +++ b/VERAG_REST_SERVER/Controllers/ATEZ/ATEZController CBAM.vb @@ -0,0 +1,66 @@ +Imports Microsoft.Web.Http + + +Namespace ApiController.Controllers + + + Public Class ATEZControllerCBAM + Inherits System.Web.Http.ApiController + + ''' + ''' Delivers the CBAM-Data + ''' Currently only data for DE and Q3 2024 available. + ''' + ''' + ''' Base64 String with CBAM-Data + ''' + ''' Request OK and returns CBAM Data as Base64 String + ''' Returns Parameter are not valid + ''' + + + + Public Function getCBAM(ByVal Firma As String, country As String, Year As Integer, Quarter As Integer, DirectRepresenation As Boolean) As String + Dim Teilnehmner = "" + Dim von As Date + Dim bis As Date + Select Case Firma + Case "VERAG" : Teilnehmner = "SUB" + Case "IMEX" : Teilnehmner = "IME" + Case "UNISPED" : Teilnehmner = "UNAT" + End Select + + Select Case Quarter + Case 1 : von = New Date("01.01." & Year) : bis = New Date("30.03" & Year) + Case 2 : von = New Date("01.04." & Year) : bis = New Date("30.06" & Year) + Case 3 : von = New Date("01.07." & Year) : bis = New Date("30.09" & Year) + Case 4 : von = New Date("01.10." & Year) : bis = New Date("31.12" & Year) + End Select + + 'country aktuell nur DE -> Weil aktuell nur DAKOSY-Datensätzr + 'Year aktuell nur 2024 Datensätze + 'Quartal aktuell nur q3 Datensätze + + Dim where = "where 1 = 1 " + If Teilnehmner <> "" Then where &= "and Teilnehmer =" & Teilnehmner + where &= "and [Vertreter_des_Anmelders] = " & IIf(DirectRepresenation, "1", "2") + where &= "and [Überlassungsdatum] is between" & von & " and " & bis + + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim sqlString = "select * from tbl_DY_Zollmeldungen_Import " & where + + + + Dim dt As DataTable = sql.loadDgvBySql(sqlString, "AVISO") + If dt.Rows.Count > 0 Then + + Dim Bytes = System.IO.File.ReadAllBytes(VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt)) + Return Convert.ToBase64String(Bytes) + + End If + + End Function + + End Class + +End Namespace \ No newline at end of file diff --git a/VERAG_REST_SERVER/Controllers/ATEZ/ATEZController.vb b/VERAG_REST_SERVER/Controllers/ATEZ/ATEZController.vb new file mode 100644 index 0000000..c0d6c60 --- /dev/null +++ b/VERAG_REST_SERVER/Controllers/ATEZ/ATEZController.vb @@ -0,0 +1,421 @@ +Imports Microsoft.Web.Http +Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN.TESTJSON +Imports VERAGMonitoring + +Namespace ApiController.Controllers + + + Public Class ATEZController + Inherits System.Web.Http.ApiController + + ''' + ''' Delivers the sum of the guarantee for the requested GRN + ''' + ''' + ''' sum of the guarantee + ''' + ''' Request OK and returns the sum sum of the guarantee + ''' Returns Failure if GRN is not valid + ''' + + + + Public Function getSumOfGRN(ByVal GRN As String) As String + + Dim BRG As New cBrgDb 'Monitoring + Dim DE_DIFFERENZ As Double = 1000000 ' PUFFER FÜR UK!!! + + If GRN = "" Then Return -1 + + 'ZOLARIS AT TAG + Dim AtTag_zolaris As Double = BRG.getBrgSumFromFMZOLL_Zolaris(Now.AddMonths(-1).ToShortDateString, Now.ToShortDateString, "50", "50", GRN, " AND DatumBestimmungErreicht IS NULL ") + + 'TELOTEC AT TAG + Dim AtTag_telotec As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddMonths(-1).ToShortDateString, Now.ToShortDateString, "50", "50", GRN) + + 'DE TAG + Dim tag_de2 As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", GRN) + 'NCTS_TR AT TAG + Dim DetTag_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", GRN) + + Dim saldo = AtTag_zolaris + AtTag_telotec + tag_de2 + DetTag_nctsTR + + If saldo = 0 Then Return saldo + + + Return saldo + DE_DIFFERENZ + + End Function + + ''' + ''' Delivers the CBAM-Data + ''' Currently only data for DE and Q3 2024 available. + ''' + ''' VERAG or IMEX or UNISPED as parameter + ''' AT or DE as parameter + ''' Year (2024) as parameter + ''' Quarter (1, 2, ,3, 4 ) as parameter + ''' Direct or indirect representation + ''' Base64 String with CBAM-Data + ''' + ''' Request OK and returns CBAM Data as Base64 String + ''' Returns Parameter are not valid + + + + + Public Function getCBAM(ByVal company As String, country As String, year As Integer, quarter As Integer, directRepresenation As Boolean) As String + Dim Teilnehmner = "" + Dim von As DateTime + Dim bis As DateTime + Select Case company + Case "VERAG" : Teilnehmner = "SUB" + Case "IMEX" : Teilnehmner = "IME" + Case "UNISPED" : Teilnehmner = "UNAT" + Case Else + Return "" + End Select + + Select Case quarter + Case 1 : von = New DateTime(year, 1, 1) : bis = New DateTime(year, 3, 30) + Case 2 : von = New DateTime(year, 4, 1) : bis = New DateTime(year, 6, 30) + Case 3 : von = New DateTime(year, 7, 1) : bis = New DateTime(year, 9, 30) + Case 4 : von = New DateTime(year, 10, 1) : bis = New DateTime(year, 12, 30) + End Select + + 'New DateTime(year, month + 1, 1) + + 'country aktuell nur DE -> Weil aktuell nur DAKOSY-Datensätze + 'Year aktuell nur 2024 Datensätze + 'Quartal aktuell nur q3 Datensätze + + Dim where = "where 1 = 1 " + If Teilnehmner <> "" Then where &= "and Teilnehmer ='" & Teilnehmner & "'" + where &= " and [Vertreter_des_Anmelders] = " & IIf(directRepresenation, "1", "2") + where &= " and [Überlassungsdatum] between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "'" + + 'Filter auf CBAM-Pflichtige Warennummern! + where &= " WHERE ( + left(Warentarifnummer,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(Warentarifnummer,4) between 7301 and 7311 + OR left(Warentarifnummer,4) between 7205 and 7229 + OR left(Warentarifnummer,4) between 7603 and 7614 + OR Warentarifnummer like '25070080%' + OR Warentarifnummer like '283421%' + OR Warentarifnummer like '260112%' + OR Warentarifnummer like '720211%' + OR Warentarifnummer like '720219%' + OR Warentarifnummer like '720241%' + OR Warentarifnummer like '720249%' + OR Warentarifnummer like '720260%' + OR Warentarifnummer like '280410%' + ) and Warentarifnummer not like '310560%' " + + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim sqlString = "select * from tbl_DY_Zollmeldungen_Import " & where + + Dim dt As DataTable = sql.loadDgvBySql(sqlString, "AVISO") + If dt.Rows.Count > 0 Then + + Dim Bytes = System.IO.File.ReadAllBytes(VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(dt)) + Return Convert.ToBase64String(Bytes) + Else + Return "" + + End If + + End Function + + + ''' + ''' Delivers the Adresse Data for a given EORI-Nr + ''' If the EORI cannot be found, an empty String will be returned. + ''' + ''' EORI-No. as parameter + ''' EORI-No. for netherland + ''' VERAG or IMEX or UNISPED as parameter + ''' Comma seperated string with adress-data of the given EORI-NR or EORI-NL + ''' + ''' Request OK and returns the Adress + ''' Returns Parameter are not valid + + + + + Public Function getCBAMEORI(company As String, Optional eoriNr As String = "", Optional eoriNr_NL As String = "") As String + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim firma As String + Dim regexAufbauEORI As Boolean = False + Dim regexAufbauEORINL As Boolean = False + + + If eoriNr <> "" Then regexAufbauEORI = Regex.IsMatch(eoriNr, "^[A-Z]{2}[0-9A-Z]{7,15}$") + If eoriNr_NL <> "" Then regexAufbauEORINL = Regex.IsMatch(eoriNr_NL, "^[NL]{2}[0-9A-Z]{9}$") + + If eoriNr = "" And eoriNr_NL = "" Then + Return "NO EORI NR SUBMITTED" + End If + + If eoriNr <> "" And Not regexAufbauEORI Then + Return "WRONG EORI-NR" + End If + + If eoriNr_NL <> "" And Not regexAufbauEORINL Then + Return "WRONG EORI-NL" + End If + + + Select Case company + Case "VERAG" : firma = "VERAG" + Case "IMEX" : firma = "IMEX" + Case "UNISPED" : firma = "UNISPED" + Case Else + Return "NO COMPANY/WRONG COMPANY SUBMITTED" + End Select + + + Dim kdNrTmp = sql.getFMZOLLKdNrFromEORI(eoriNr, eoriNr_NL, firma) + If IsNumeric(kdNrTmp) Then + Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(kdNrTmp) + Dim returnStringAdresse = "" + + + If AD IsNot Nothing Then + returnStringAdresse &= AD.Name_1 & ";" + returnStringAdresse &= AD.Name_2 & ";" + returnStringAdresse &= AD.Straße & ";" + returnStringAdresse &= AD.PLZ & ";" + returnStringAdresse &= AD.Ort & ";" + returnStringAdresse &= VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2Land(AD.LandKz) & ";" + End If + + Return returnStringAdresse.ToString + Else + Return "NO DATA" + + End If + + End Function + + + + ''' + ''' Delivers the Adresse Data for a given EORI-Nr + ''' If the EORI cannot be found, an empty String will be returned. + ''' + ''' EORI-No. as parameter + ''' EORI-No. for netherland + ''' VERAG or IMEX or UNISPED as parameter + ''' Comma seperated string with adress-data of the given EORI-NR or EORI-NL + ''' + ''' Request OK and returns the Adress + ''' Returns Parameter are not valid + + + + + Public Function getCBAMNEW() As String + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + + Dim sqlString = "SELECT [Id] + ,[Teilnehmer] + ,[Anmeldeart_A] + ,[Verfahren] + ,[Bezugsnummer_LRN] + ,[Anlagedatum] + ,[Zeit] + ,[Zeitpunkt_der_letzten_CUSTAX] + ,[Überlassungsdatum] + ,[Annahmedatum] + ,[Registriernummer_MRN] + ,[Weitere_Reg_Nr] + ,[EDIFNR] + ,[Versendungsland] + ,[Art_der_Vertretung] + ,[Vertreter_des_Anmelders] + ,[Vertreter_AE_EORI] + ,[AE_Name] + ,[Versender_CZ_EORI] + ,Abs_Adr.[Name 1] as Versender_Name + ,Abs_Adr.[Name 2] as Versender_Name2 + ,Abs_Adr.[LandKz] as Versender_Country + ,Abs_Adr.[Strasse] as Versender_Street + ,'' as Versender_Street_additional_line + ,Abs_Adr.[PLZ] as Versender_Postcode + ,Abs_Adr.[Ort] as Versender_City + ,'' as VersenderPOBox + ,Abs_Adr.[Ansprechpartner] as Versender_ContactName + ,Abs_Adr.[Telefon] as Versender_Contact_Phone_number + ,Abs_Adr.[E-Mail] as Versender_Contact_Email + ,[CZ_Code] + ,[CZ_Name] + ,[CZ_Ländercode] + ,[Empfänger_CN_EORI] + ,Emp_Adr.[Name 1] as Empfänger_Name + ,Emp_Adr.[Name 2] as Empfänger_Name2 + ,Emp_Adr.[LandKz] as Empfänger_Country + ,Emp_Adr.[Strasse] as Empfänger_Street + ,'' as Empfänger_Street_additional_line + ,Emp_Adr.[PLZ] as Empfänger_Postcode + ,Emp_Adr.[Ort] as Empfänger_City + ,'' as EmpfängerPOBox + ,Emp_Adr.[Ansprechpartner] as Empfänger_ContactName + ,Emp_Adr.[Telefon] as Empfänger_Contact_Phone_number + ,Emp_Adr.[E-Mail] as Empfänger_Contact_Email + ,[CN_Code] + ,[CN_Name] + ,[CN_Ländercode] + ,[Anmelder_DT_EORI] + ,[DT_Code] + ,[DT_Name] + ,[DT_Ländercode] + ,[UstID_DT] + ,[Käufer_BY_Name] + ,[BY_EORI] + ,[Verkäufer_SL_Name] + ,[SL_EORI] + ,[ZollRechtlicherStatus] + ,[Bewilligungsnummer] + ,[Gesamtgewicht] + ,[Liefercode] + ,[Lieferort] + ,[Lieferkey] + ,[Geschäftsart] + ,[Rechnungsbetrag] + ,[Rechnungswährung] + ,[Rechnungskurs] + ,[Zollstelle] + ,[Aufschubart] + ,[HZAZoll] + ,[KontoZoll] + ,[TextZoll] + ,[EORIZoll] + ,[KennzeichenEigenZoll] + ,[ArtEust] + ,[HZAEust] + ,[KontoEusT] + ,[TextEust] + ,[EORIEust] + ,[KennzeichenEigenEust] + ,[Container] + ,[Unterlagenzeile] + ,[Unterlagenbereich] + ,[Unterlagenart] + ,[Unterlagennummer] + ,[Unterlagendatum] + ,[PositionNo] + ,[Positionen] + ,[Vorausstl_Zollabgabe] + ,[Vorausstl_Zollsatzabgabe] + ,[Vorausstl_Eustabgabe] + ,[Vorausstl_Eustsatzabgabe] + ,[Zollwert] + ,[AbgabeZoll] + ,[AbgabeZollsatz] + ,[Eustwert] + ,[AbgabeEust] + ,[AbgabeEustsatz] + ,[AbgabeAntidumping] + ,[AbgabeAntidumpingSatz] + ,[Status_Steuerbescheid] + ,[ArtikelCode] + ,[Warentarifnummer] + ,[Warenzusatz1] + ,[Warenzusatz2] + ,[Warenbezeichnung] + ,[Verfahren2] + ,[EU_Code] + ,[Artikelpreis] + ,[Statistischerwert] + ,[Eust_manuell] + ,[Ursprung] + ,[Präferenzursprungsland] + ,[Beguenstigung] + ,[Rohmasse] + ,[Rohmasseeinheit] + ,[Eigenmasse] + ,[Eigenmasseeinheit] + ,[Positionszusatz] + ,[Aussenhandelstatistische_Menge] + ,[Maßeinheit] + ,[AnzahlPackstücke] + ,[Packstückart] + ,[Packstückbezeichnung] + ,[Zusätzliche_angaben] + ,[SonderAbgabeZoll] + ,[SonderAbgabeEust] + ,[AbgabeZusatzzölle] + ,[SonderAbgabeAntidumping] + ,[Verbrauchssteuern] + ,[Positionsunterlagenzeile] + ,[Positionsunterlagenbereich] + ,[Positionsunterlagenart] + ,[Positionsunterlagennummer] + ,[Positionsunterlagendatum] + ,[DV1Rechnungsbetrag] + ,[DV1Währung] + ,[DV1UmgerechnerterRechnungsbetrag] + ,[DV1UmgerechneteWährung] + ,[DV1Versicherung] + ,[DV1Versicherungswährung] + ,[DV1Luftfrachtkosten] + ,[DV1Luftfrachtwährung] + ,[DV1Frachtkosten] + ,[DV1Frachtwährung] + ,[DV1Materialien] + ,[DV1Materialwährung] + ,[DV1Provisionen] + ,[DV1Provisionwährung] + ,[Abflughafen_Code] + ,[Abflughafen_Text] + ,[Vorpapierart] + ,[Vorpapiere_Regnummer] + ,[BEAnteil_SumA] + ,[BEAnteil_ZL] + ,[BEAnteil_AV] + ,[UST_ID_Einführer] + ,[UST_ID_Erwerber] + ,[UST_ID_Fiskalvertreter] + ,[Shipmentnummer] + ,[Importstatus] + FROM [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] + + left JOIN [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Kunden] as Empfaenger on Empfaenger.[EORITIN] = [Empfänger_CN_EORI] and Empfaenger.[FilialenNr] = LEFT(Bezugsnummer_LRN,4) + left JOIN [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Adressen] as Emp_Adr on Emp_Adr.AdressenNr = Empfaenger.KundenNr + + left JOIN [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Kunden] as Absender on Absender.[EORITIN] = [Versender_CZ_EORI] and Absender.[FilialenNr] = LEFT(Bezugsnummer_LRN,4) + left JOIN [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Adressen] as Abs_Adr on Abs_Adr.AdressenNr = Absender.KundenNr + + WHERE ( + left(Warentarifnummer,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(Warentarifnummer,4) between 7301 and 7311 + OR left(Warentarifnummer,4) between 7205 and 7229 + OR left(Warentarifnummer,4) between 7603 and 7614 + OR Warentarifnummer like '25070080%' + OR Warentarifnummer like '283421%' + OR Warentarifnummer like '260112%' + OR Warentarifnummer like '720211%' + OR Warentarifnummer like '720219%' + OR Warentarifnummer like '720241%' + OR Warentarifnummer like '720249%' + OR Warentarifnummer like '720260%' + OR Warentarifnummer like '280410%' + ) and Warentarifnummer not like '310560%'" + + Dim dt As DataTable = sql.loadDgvBySql(sqlString, "AVISO") + If dt.Rows.Count > 0 Then + + Dim Bytes = System.IO.File.ReadAllBytes(VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(dt)) + Return Convert.ToBase64String(Bytes) + Else + Return "" + + End If + + + End Function + + End Class + +End Namespace \ No newline at end of file diff --git a/VERAG_REST_SERVER/Controllers/AvisoController/AVISOController.vb b/VERAG_REST_SERVER/Controllers/AvisoController/AVISOController.vb index 93076db..15af21b 100644 --- a/VERAG_REST_SERVER/Controllers/AvisoController/AVISOController.vb +++ b/VERAG_REST_SERVER/Controllers/AvisoController/AVISOController.vb @@ -1,214 +1,375 @@ - -Imports System.Web.Http +Imports System.IO +Imports System.Web.Http.Description Imports Microsoft.Web.Http +Imports VERAG_PROG_ALLGEMEIN Namespace ApiController.Controllers - - - + Public Class AVISOController Inherits System.Web.Http.ApiController - - ''' - ''' Gets the Hello World Response + ''' Upload Files in Base64-Format and attach it to an existring LKW (with avisoId) or an specific consignment (with sendungsId) ''' - ''' A SharePriceResponse which contains the price of the share - ''' Returns 200 And Hallo World - ''' Returns 400 if the query Is invalid - Public Function GetValue() As String - Return "Hello world!" + ''' + ''' OK, if file is uploaded or ERROR-Code if something went wrong + + ''' Returns 200 file is uploaded sucessfully + ''' Returns 400 upload failed + + + + + Public Function uploadAvisoAttachment(anhangsart As String, arrayOfFiles() As String, Optional avisoId As Integer = -1, Optional sendungsId As Integer = -1) As String + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Try + Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() + + 'Dim bodyText + 'Dim json + + 'If HttpContext.Current.Request.GetBufferedInputStream IsNot Nothing Then + ' Dim bodyStream As Stream = HttpContext.Current.Request.GetBufferedInputStream + ' Dim reader = New StreamReader(bodyStream) + ' If bodyStream.CanRead Then + ' bodyText = reader.ReadToEnd + + ' json = JsonConvert.DeserializeObject(bodyText) + + ' Else + ' uploadAvisoAttachment = "STREAMREADER_ERR" + ' Return uploadAvisoAttachment + ' End If + 'Else + + + ' uploadAvisoAttachment = "UPLOAD_ERR" + ' Return uploadAvisoAttachment + 'End If + + uploadAvisoAttachment = "ERR" + + If arrayOfFiles Is Nothing OrElse arrayOfFiles.Length < 0 Then + + uploadAvisoAttachment = "FILESARRAY_EMPTY_ERR" + Return uploadAvisoAttachment + End If + + + + If anhangsart <> "" Then ' AndAlso listOfImages IsNot Nothing AndAlso listOfImages.Count > 0 + + + If sendungsId > 0 Then + + Dim SENDUNG = New VERAG_PROG_ALLGEMEIN.cSendungen(sendungsId) + If SENDUNG Is Nothing Then + uploadAvisoAttachment = "NO_SENDUNG_ERR" + Return uploadAvisoAttachment + + Else + + For Each image In arrayOfFiles + Dim filetemp = image.Replace("data:application/pdf;base64,", "") + + Try + Convert.FromBase64String(filetemp) + Catch ex As Exception + uploadAvisoAttachment = "BASE64_FORMAT_ERR" + Return uploadAvisoAttachment + End Try + + Dim fileextension = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getFileExtensionFromBase64String(filetemp) + + 'If fileextension.ToLower = "unknown" Then + ' uploadAvisoAttachment = "UNKNOWN_ATTACHMENT_EXTENSION_ERR" + ' Return uploadAvisoAttachment + 'End If + + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "AVISO_ANHAENGE", SENDUNG.tblSnd_AvisoID, Now.ToString("ddMMyy_HHmmss.ffff"), "", anhangsart & "_" & Now.ToString("ddMMyy_HHmmss"), False) + DS.uploadDataToDATENSERVER_fromBase64String(filetemp, DS.da_name, IIf(fileextension.ToLower <> "unknown", "." & fileextension, "." & "jpg"), False, False) + + If DS.da_id <= 0 Then + uploadAvisoAttachment = "UPLOAD_DS_ERR" + Return uploadAvisoAttachment + End If + Dim fileName = DS.da_name + Dim destPath = DS.GET_TOP1_PATH + fileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName) + Dim fi As New FileInfo(destPath) + Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(SENDUNG.tblSnd_AvisoID, fileName, DS.da_id, anhangsart, fi.Extension, sendungsId,, fi.Length,) + If Not ANH.SAVE Then + uploadAvisoAttachment = "SAVE_ANH_ERR" + Return uploadAvisoAttachment + End If + + + + Next + + + End If + + ElseIf avisoId > 0 Then + Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(avisoId) + If AVISO Is Nothing Then + uploadAvisoAttachment = "NO_AVISO_ERR" + Return uploadAvisoAttachment + Else + For Each image In arrayOfFiles + Dim filetemp = image.Replace("data:application/pdf;base64,", "") + Try + Convert.FromBase64String(filetemp) + Catch ex As Exception + uploadAvisoAttachment = "BASE64_FORMAT_ERR" + Return uploadAvisoAttachment + End Try + + + Dim fileextension = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getFileExtensionFromBase64String(filetemp) + + 'If fileextension.ToLower = "unknown" Then + ' uploadAvisoAttachment = "UNKNOWN_ATTACHMENT_EXTENSION_ERR" + ' Return uploadAvisoAttachment + 'End If + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "AVISO_ANHAENGE", avisoId, Now.ToString("ddMMyy_HHmmss.ffff"), "", anhangsart & "_" & Now.ToString("ddMMyy_HHmmss"), False) + DS.uploadDataToDATENSERVER_fromBase64String(filetemp, DS.da_name, IIf(fileextension.ToLower <> "unknown", "." & fileextension, "." & "jpg"), False, False) + + If DS.da_id <= 0 Then + uploadAvisoAttachment = "UPLOAD_DS_ERR" + Return uploadAvisoAttachment + End If + Dim fileName = DS.da_name + Dim destPath = DS.GET_TOP1_PATH + fileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName) + Dim fi As New FileInfo(destPath) + Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(avisoId, fileName, DS.da_id, anhangsart, fi.Extension, sendungsId,, fi.Length,) + If Not ANH.SAVE Then + uploadAvisoAttachment = "SAVE_ANH_ERR" + Return uploadAvisoAttachment + End If + Next + + End If + + + Else + + Return uploadAvisoAttachment + + End If + + + Return "OK" + End If + + + Catch ex As Exception + Return uploadAvisoAttachment + End Try + + + + Return uploadAvisoAttachment End Function - ''' - ''' Set the Test - ''' - ''' TRAviso - ''' A SharePriceResponse which contains the price of the share - ''' Returns 200 and the TRAviso-JSON-Object - ''' Returns 400 if the query Is invalid - ''' Returns 401 if your are not authorized - Public Function PostValue(ByVal API_AVISO As VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAviso) As String + + + + + + Public Function uploadAvisoAttString(anhangsart As String, arrayOfFiles As String, Optional avisoId As Integer = -1, Optional sendungsId As Integer = -1) As String VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Try + Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() + + 'Dim bodyText + 'Dim json + + 'If HttpContext.Current.Request.GetBufferedInputStream IsNot Nothing Then + ' Dim bodyStream As Stream = HttpContext.Current.Request.GetBufferedInputStream + ' Dim reader = New StreamReader(bodyStream) + ' If bodyStream.CanRead Then + ' bodyText = reader.ReadToEnd + + ' json = JsonConvert.DeserializeObject(bodyText) + + ' Else + ' uploadAvisoAttachment = "STREAMREADER_ERR" + ' Return uploadAvisoAttachment + ' End If + 'Else + + + ' uploadAvisoAttachment = "UPLOAD_ERR" + ' Return uploadAvisoAttachment + 'End If + + Dim listOfFiles As List(Of String) = arrayOfFiles.Split(",").ToList + + If Not (listOfFiles IsNot Nothing AndAlso listOfFiles.Count > 0) Then + uploadAvisoAttString = "FILESARRAY_EMPTY_ERR" + Return uploadAvisoAttString + End If + + + + If anhangsart <> "" Then ' AndAlso listOfImages IsNot Nothing AndAlso listOfImages.Count > 0 + + + If sendungsId > 0 Then + + Dim SENDUNG = New VERAG_PROG_ALLGEMEIN.cSendungen(sendungsId) + If SENDUNG Is Nothing Then + uploadAvisoAttString = "NO_SENDUNG_ERR" + Return uploadAvisoAttString + + Else + + For Each image In listOfFiles + Dim filetemp = image.Replace("data:application/pdf;base64,", "") + + + Try + Convert.FromBase64String(filetemp) + Catch ex As Exception + uploadAvisoAttString = "BASE64_FORMAT_ERR" + Return uploadAvisoAttString + End Try + + Dim fileextension = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getFileExtensionFromBase64String(filetemp) + + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "AVISO_ANHAENGE", SENDUNG.tblSnd_AvisoID, Now.ToString("ddMMyy_HHmmss.ffff"), "", anhangsart & "_" & Now.ToString("ddMMyy_HHmmss"), False) + DS.uploadDataToDATENSERVER_fromBase64String(filetemp, DS.da_name, IIf(fileextension.ToLower <> "unknown", "." & fileextension, ""), False, False) + + If DS.da_id <= 0 Then + uploadAvisoAttString = "UPLOAD_DS_ERR" + Return uploadAvisoAttString + End If + Dim fileName = DS.da_name + Dim destPath = DS.GET_TOP1_PATH + fileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName) + Dim fi As New FileInfo(destPath) + Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(SENDUNG.tblSnd_AvisoID, fileName, DS.da_id, anhangsart, fi.Extension, sendungsId,, fi.Length,) + If Not ANH.SAVE Then + uploadAvisoAttString = "SAVE_ANH_ERR" + Return uploadAvisoAttString + End If + + + + Next + + + End If + + ElseIf avisoId > 0 Then + Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(avisoId) + If AVISO Is Nothing Then + uploadAvisoAttString = "NO_AVISO_ERR" + Return uploadAvisoAttString + Else + For Each image In listOfFiles + Dim filetemp = image.Replace("data:application/pdf;base64,", "") + Try + Convert.FromBase64String(filetemp) + Catch ex As Exception + uploadAvisoAttString = "BASE64_FORMAT_ERR" + Return uploadAvisoAttString + End Try + + + + Dim fileextension = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getFileExtensionFromBase64String(filetemp) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "AVISO_ANHAENGE", avisoId, Now.ToString("ddMMyy_HHmmss.ffff"), "", anhangsart & "_" & Now.ToString("ddMMyy_HHmmss"), False) + DS.uploadDataToDATENSERVER_fromBase64String(filetemp, DS.da_name, IIf(fileextension.ToLower <> "unknown", "." & fileextension, ""), False, False) + + If DS.da_id <= 0 Then + uploadAvisoAttString = "UPLOAD_DS_ERR" + Return uploadAvisoAttString + End If + Dim fileName = DS.da_name + Dim destPath = DS.GET_TOP1_PATH + fileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName) + Dim fi As New FileInfo(destPath) + Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(avisoId, fileName, DS.da_id, anhangsart, fi.Extension, sendungsId,, fi.Length,) + If Not ANH.SAVE Then + uploadAvisoAttString = "SAVE_ANH_ERR" + Return uploadAvisoAttString + End If + Next + + End If + + + Else + + Return uploadAvisoAttString + + End If + + + Return "OK" + End If + + + Catch ex As Exception + Return uploadAvisoAttString + End Try + + + + Return uploadAvisoAttString + End Function + + + + + '------------------------------------------------------------------------ + '----------------------------------TEST---------------------------------- + '------------------------------------------------------------------------ + + + + + + Public Function TESTEN_POST(ByVal API_AVISO As VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAviso) As String + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('IN_AVISO_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - Try - - Dim resultJson2 = jsonString.FromClass(API_AVISO) - SQL.doSQL("insert into tbltest (test) Values('IN_AVISO_" & resultJson2 & "')", "FMZOLL") - + SQL.doSQL("insert into tbltest (test,ipaddress) Values('IN_AVISO_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") Catch ex As Exception End Try - - PostValue = "IN_AVISO_ERR" - Try - If API_AVISO Is Nothing Then Return VERAG_IN_AVISO_Exceptions.ERR_01_Wrong_Format - If API_AVISO.Company Is Nothing OrElse API_AVISO.Company = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_02_Missing_Company - If API_AVISO.Department Is Nothing OrElse API_AVISO.Department = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_03_Missing_Department - If API_AVISO.PartnerTID Is Nothing OrElse API_AVISO.PartnerTID = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_04_Missing_PartnerID - If API_AVISO.TransportLicensePlate Is Nothing OrElse API_AVISO.TransportLicensePlate = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_09_Missing_PlateNr - - Dim TR_AVISO As New VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAvisoFULL - - - TR_AVISO.trAv_PartnerSystem = API_AVISO.PartnerTID - TR_AVISO.trAv_gewicht = API_AVISO.TotGrossWeight - TR_AVISO.trAv_colli = API_AVISO.TotPackage - TR_AVISO.trAv_Transportmittel = API_AVISO.TransportBorderType - TR_AVISO.trAv_Grenzueberschreitung = API_AVISO.TransportModeBorder - 'TR_AVISO.trAv_FraechterKdNr = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_Fraechter = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_AvisiererKdNr = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_Avisierer = API_AVISO.PaXXXXXXXrtnerTID - TR_AVISO.trAv_Nationalitaet = API_AVISO.TransportCountryCode - TR_AVISO.trAv_Kennzeichen = API_AVISO.TransportLicensePlate - TR_AVISO.trAv_Reference = API_AVISO.Reference - TR_AVISO.trAv_Fraechter = API_AVISO.FreightCompany - TR_AVISO.trAv_FraechterKdNr = API_AVISO.FreightCompanyID - TR_AVISO.trAv_Niederlassung = API_AVISO.Department - TR_AVISO.trAv_Firma = API_AVISO.Company - TR_AVISO.trAv_datetime = Now - TR_AVISO.trAv_Info = API_AVISO.Info - - If Not TR_AVISO.SAVE(False) Then Return VERAG_IN_AVISO_Exceptions.ERR_05_InternalVerarb - - If API_AVISO.DOCUMENTS IsNot Nothing Then - For Each ANH In API_AVISO.DOCUMENTS - Dim TR_DOC As New VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAvisoAnhaenge - TR_DOC.DocumentType = ANH.DocumentType - TR_DOC.DocumentNr = ANH.DocumentNr - TR_DOC.DocumentDate = ANH.DocumentDate - - If ANH.base64BinaryStream IsNot Nothing AndAlso ANH.base64BinaryStream <> "" Then - TR_DOC.trAvAh_docID = VERAG_IN_AVISO_Functions.base64toDS(ANH.base64BinaryStream, TR_AVISO.trAv_Id, ANH.FileName) - End If - TR_AVISO.ANHAENGE.Add(TR_DOC) - Next - End If - - If Not TR_AVISO.SAVE_Anhaenge Then Return VERAG_IN_AVISO_Exceptions.ERR_05_InternalVerarb - - - If API_AVISO.POSITIONS IsNot Nothing Then - For Each SH In API_AVISO.POSITIONS - Dim EZA As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - Dim SHIPMENT As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA) - ' Dim SHIPMENT As New VERAG_PROG_ALLGEMEIN.cVERAG_in_shippment() - SHIPMENT.shTr_TRAvisoId = TR_AVISO.trAv_Id 'Zur Verknüfung - - EZA.Company = API_AVISO.Company - EZA.Department = API_AVISO.Department - EZA.Reference = SH.Reference - - - EZA.DeclarationCountry = SH.DeclarationCountry - EZA.DeclarationType = SH.DeclarationType - - EZA.TotPackage = SH.NumberOfPackages - EZA.TotGrossWeight = SH.GrossWeight - 'EZA.TotGrossWeight = SH.GrossWeight - - EZA.CustomsCodeDeparture = SH.CustomsCodeDeparture - EZA.CustomsCodeDestination = SH.CustomsCodeDestination - 'EZA.CustomsCodeEntry = API_AVISO.CustomsCodeEntry - EZA.TransportModeBorder = API_AVISO.TransportModeBorder - - EZA.CountryCodeDeparture = SH.CountryCodeDeparture - EZA.CountryCodeDestination = SH.CountryCodeDestination - EZA.DEStateCodeDestination = SH.DEStateCodeDestination - - EZA.TransportArrivalLicensePlate = API_AVISO.TransportLicensePlate - EZA.TransportArrivalCountryCode = API_AVISO.TransportCountryCode - EZA.TransportBorderType = API_AVISO.TransportBorderType - EZA.TransportBorderLicensePlate = API_AVISO.TransportLicensePlate - EZA.Incoterm = SH.Incoterm - - EZA.PrePaperCode = SH.PrePaperCode - EZA.PrePaperNr = SH.PrePaperNr - ' EZA.KindOfBusiness = SH.ReferenceXXXXXXXXXXXX - EZA.InvoiceAmount = SH.InvoiceAmount - EZA.InvoiceCurrency = SH.InvoiceCurrency - - - EZA.ContainerNr1 = SH.ContainerNr1 - EZA.ContainerNr2 = SH.ContainerNr2 - EZA.ContainerNr3 = SH.ContainerNr3 - EZA.ContainerNr4 = SH.ContainerNr4 - - - - If SH.ADDRESS IsNot Nothing Then - For Each ADD In SH.ADDRESS - Dim TR_ADD As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen - TR_ADD.AddressCode = ADD.AddressCode - TR_ADD.CustomerID = ADD.CustomerID - TR_ADD.EORI = ADD.EORI - TR_ADD.NLNR = ADD.NLNR - TR_ADD.Name1 = ADD.Name1 - TR_ADD.Name2 = ADD.Name2 - TR_ADD.Name3 = ADD.Name3 - TR_ADD.Street1 = ADD.Street1 - TR_ADD.Street2 = ADD.Street2 - TR_ADD.City = ADD.City - TR_ADD.CountryCode = ADD.CountryCode - TR_ADD.PostalCode = ADD.PostalCode - TR_ADD.UStID = ADD.UStID - - EZA.ADDRESS.Add(TR_ADD) - Next - End If - - If SH.DOCUMENTS IsNot Nothing Then - For Each DOC In SH.DOCUMENTS - Dim TR_DOC As New VERAG_PROG_ALLGEMEIN.cVERAG_in_shipment_Document - TR_DOC.DocumentType = DOC.DocumentType - TR_DOC.DocumentNr = DOC.DocumentNr - TR_DOC.DocumentDate = DOC.DocumentDate - - If DOC.base64BinaryStream IsNot Nothing AndAlso DOC.base64BinaryStream <> "" Then - TR_DOC.shTrPosDoc_docID = VERAG_IN_AVISO_Functions.base64toDS(DOC.base64BinaryStream, TR_AVISO.trAv_Id, DOC.FileName, "SND_ATTACHMENT") - End If - - EZA.DOCUMENTS.Add(TR_DOC) - Next - End If - - If Not SHIPMENT.SAVE() Then - Return VERAG_IN_AVISO_Exceptions.ERR_06_InternalSave - End If - Next - End If - - Return "OK" - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & NCTS_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & NCTS_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return NCTS_Exceptions.ERR_03_InternalVerarb - End Try + Return "OK" ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - Return PostValue + Return TESTEN_POST End Function + End Class - '------------------------------------------------------------------------ - '----------------------------------TEST---------------------------------- - '------------------------------------------------------------------------ - + 'hide controller Public Class AVISO1TESTController @@ -392,9 +553,6 @@ Namespace ApiController.Controllers End Class - - - Class VERAG_IN_AVISO_Exceptions Public Const ERR_01_Wrong_Format As String = "ERR_01" Public Const ERR_02_Missing_Company As String = "ERR_02" diff --git a/VERAG_REST_SERVER/Controllers/CustomsDeclaration/CustomsDeclarationController.vb b/VERAG_REST_SERVER/Controllers/CustomsDeclaration/CustomsDeclarationController.vb index 706b88e..103dd3a 100644 --- a/VERAG_REST_SERVER/Controllers/CustomsDeclaration/CustomsDeclarationController.vb +++ b/VERAG_REST_SERVER/Controllers/CustomsDeclaration/CustomsDeclarationController.vb @@ -1,12 +1,14 @@ Imports System.Net Imports System.Web.Http +Imports System.Web.Http.Description Imports Microsoft.Web.Http Imports Newtonsoft.Json Namespace api_CustomsDeclaration.Controllers - + 'hide controller + Public Class CustomsDeclaration1Controller Inherits System.Web.Http.ApiController @@ -21,78 +23,78 @@ Namespace api_CustomsDeclaration.Controllers Return EZA End Function - Public Function PostValue(ByVal EZA_FREMD As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza) As String - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) + 'Public Function PostValue(ByVal EZA_FREMD As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza) As String + ' ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() + ' VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL + ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + ' Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_START_X101_ " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") + ' SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_START_X101_ " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - Try + ' Try - Dim resultJson2 = jsonString.FromClass(EZA_FREMD) - SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson2.Replace("'", "") & "')", "FMZOLL") + ' Dim resultJson2 = jsonString.FromClass(EZA_FREMD) + ' SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson2.Replace("'", "") & "')", "FMZOLL") - Catch ex As Exception - SQL.doSQL("insert into tbltest (test) Values('ERR:EZA_101_" & ex.Message & "')", "FMZOLL") + ' Catch ex As Exception + ' SQL.doSQL("insert into tbltest (test) Values('ERR:EZA_101_" & ex.Message & "')", "FMZOLL") - End Try + ' End Try - PostValue = "EZA_ERR" - Try - If EZA_FREMD Is Nothing Then Return EZA_Exceptions.ERR_01_Wrong_Format - ' If EZA_FREMD.TransportBorderLicensePlate = "" Then Return EZA_Exceptions.ERR_07_Missing_PlateNr - ' If EZA_FREMD.Reference = "" Then Return EZA_Exceptions.ERR_08_Missing_Reference + ' PostValue = "EZA_ERR" + ' Try + ' If EZA_FREMD Is Nothing Then Return EZA_Exceptions.ERR_01_Wrong_Format + ' ' If EZA_FREMD.TransportBorderLicensePlate = "" Then Return EZA_Exceptions.ERR_07_Missing_PlateNr + ' ' If EZA_FREMD.Reference = "" Then Return EZA_Exceptions.ERR_08_Missing_Reference - Dim Reference = If(EZA_FREMD.Reference, "") + ' Dim Reference = If(EZA_FREMD.Reference, "") - Dim EZA_TR = VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL.LOADByReference("ATEZ", Reference, True) + ' Dim EZA_TR = VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL.LOADByReference("ATEZ", Reference, True) - If EZA_TR Is Nothing Then - EZA_TR = New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA_FREMD) - Else - EZA_TR.setEZA(EZA_FREMD) - End If + ' If EZA_TR Is Nothing Then + ' EZA_TR = New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA_FREMD) + ' Else + ' EZA_TR.setEZA(EZA_FREMD) + ' End If - EZA_TR.shTr_Partnersystem = "ATEZ" - EZA_TR.shTr_Status = 5 - 'EZA_TR.shTr_Status_KEWILL_Equivalent = 5 + ' EZA_TR.shTr_Partnersystem = "ATEZ" + ' EZA_TR.shTr_Status = 5 + ' 'EZA_TR.shTr_Status_KEWILL_Equivalent = 5 - EZA_TR.EZA.Company = "VERAG" - EZA_TR.EZA.Department = "SUB" - 'EZA_TR.Reference = "" + ' EZA_TR.EZA.Company = "VERAG" + ' EZA_TR.EZA.Department = "SUB" + ' 'EZA_TR.Reference = "" - If EZA_TR.SAVE_ALL Then - 'PostValue = "EZA_OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString - 'Dim resultJson = jsonString.FromClass(EZA_FREMD) - 'SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson & "')", "FMZOLL") - 'SQL.doSQL("insert into tbltest (test) Values('ATEZ_EZA_TEST: " & EZA_FREMD.TransportBorderLicensePlate & " - " & EZA_FREMD.Reference & "')", "FMZOLL") - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_OK - ID: " & EZA_TR.shTr_id & "','" & ip & "')", "FMZOLL") + ' If EZA_TR.SAVE_ALL Then + ' 'PostValue = "EZA_OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString + ' 'Dim resultJson = jsonString.FromClass(EZA_FREMD) + ' 'SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson & "')", "FMZOLL") + ' 'SQL.doSQL("insert into tbltest (test) Values('ATEZ_EZA_TEST: " & EZA_FREMD.TransportBorderLicensePlate & " - " & EZA_FREMD.Reference & "')", "FMZOLL") + ' SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_OK - ID: " & EZA_TR.shTr_id & "','" & ip & "')", "FMZOLL") - Return "OK" - Else - PostValue = EZA_Exceptions.ERR_04_InternalSave - End If + ' Return "OK" + ' Else + ' PostValue = EZA_Exceptions.ERR_04_InternalSave + ' End If - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & EZA_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & EZA_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return EZA_Exceptions.ERR_03_InternalVerarb - End Try + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & EZA_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' SQL.doSQL("insert into tbltest (test) Values('" & EZA_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") + ' Return EZA_Exceptions.ERR_03_InternalVerarb + ' End Try - ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") + ' ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - Return PostValue + ' Return PostValue - End Function + 'End Function End Class diff --git a/VERAG_REST_SERVER/Controllers/NCTS/NCTSController.vb b/VERAG_REST_SERVER/Controllers/NCTS/NCTSController.vb index c37fa0c..3604aea 100644 --- a/VERAG_REST_SERVER/Controllers/NCTS/NCTSController.vb +++ b/VERAG_REST_SERVER/Controllers/NCTS/NCTSController.vb @@ -1,12 +1,13 @@ Imports System.Net Imports System.Web.Http +Imports System.Web.Http.Description Imports Microsoft.Web.Http Imports Newtonsoft.Json Namespace ApiController.Controllers - + 'hide controller Public Class TR_NCTS1Controller @@ -39,7 +40,7 @@ Namespace ApiController.Controllers 'End Function Public Function PostValue(ByVal NCTS_ATEZ As VERAG_PROG_ALLGEMEIN.cATEZ_NCTS) As String - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) + ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -261,7 +262,7 @@ Namespace ApiController.Controllers '------------------------------------------------------------------------ '----------------------------------TEST---------------------------------- '------------------------------------------------------------------------ - + 'hide controller Public Class TR_NCTSV001TESTController diff --git a/VERAG_REST_SERVER/Controllers/NEWTESTController/NEWTESTController.vb b/VERAG_REST_SERVER/Controllers/NEWTESTController/NEWTESTController.vb index ad57986..d966556 100644 --- a/VERAG_REST_SERVER/Controllers/NEWTESTController/NEWTESTController.vb +++ b/VERAG_REST_SERVER/Controllers/NEWTESTController/NEWTESTController.vb @@ -1,5 +1,6 @@ Imports System.Net Imports System.Web.Http +Imports System.Web.Http.Description Imports Microsoft.Web.Http Imports Newtonsoft.Json @@ -8,6 +9,7 @@ Imports Newtonsoft.Json Namespace NEWTESTController.Controllers + 'hide controller Public Class NEWTEST1Controller diff --git a/VERAG_REST_SERVER/Controllers/TestController/TESTController.vb b/VERAG_REST_SERVER/Controllers/TestController/TESTController.vb index efe26fc..4cae415 100644 --- a/VERAG_REST_SERVER/Controllers/TestController/TESTController.vb +++ b/VERAG_REST_SERVER/Controllers/TestController/TESTController.vb @@ -1,11 +1,13 @@ Imports System.Net Imports System.Web.Http +Imports System.Web.Http.Description Imports Microsoft.Web.Http Imports Newtonsoft.Json Namespace ApiController.Controllers + 'hide controller Public Class TESTController diff --git a/VERAG_REST_SERVER/Controllers/V1/AvisoController/AVISOController.vb b/VERAG_REST_SERVER/Controllers/V1/AvisoController/AVISOController.vb deleted file mode 100644 index 93076db..0000000 --- a/VERAG_REST_SERVER/Controllers/V1/AvisoController/AVISOController.vb +++ /dev/null @@ -1,420 +0,0 @@ - -Imports System.Web.Http -Imports Microsoft.Web.Http - -Namespace ApiController.Controllers - - - - - Public Class AVISOController - Inherits System.Web.Http.ApiController - - - - ''' - ''' Gets the Hello World Response - ''' - ''' A SharePriceResponse which contains the price of the share - ''' Returns 200 And Hallo World - ''' Returns 400 if the query Is invalid - Public Function GetValue() As String - Return "Hello world!" - End Function - - ''' - ''' Set the Test - ''' - ''' TRAviso - ''' A SharePriceResponse which contains the price of the share - ''' Returns 200 and the TRAviso-JSON-Object - ''' Returns 400 if the query Is invalid - ''' Returns 401 if your are not authorized - Public Function PostValue(ByVal API_AVISO As VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAviso) As String - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - - Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('IN_AVISO_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - Try - - Dim resultJson2 = jsonString.FromClass(API_AVISO) - SQL.doSQL("insert into tbltest (test) Values('IN_AVISO_" & resultJson2 & "')", "FMZOLL") - - Catch ex As Exception - - End Try - - - PostValue = "IN_AVISO_ERR" - Try - If API_AVISO Is Nothing Then Return VERAG_IN_AVISO_Exceptions.ERR_01_Wrong_Format - If API_AVISO.Company Is Nothing OrElse API_AVISO.Company = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_02_Missing_Company - If API_AVISO.Department Is Nothing OrElse API_AVISO.Department = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_03_Missing_Department - If API_AVISO.PartnerTID Is Nothing OrElse API_AVISO.PartnerTID = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_04_Missing_PartnerID - If API_AVISO.TransportLicensePlate Is Nothing OrElse API_AVISO.TransportLicensePlate = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_09_Missing_PlateNr - - Dim TR_AVISO As New VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAvisoFULL - - - TR_AVISO.trAv_PartnerSystem = API_AVISO.PartnerTID - TR_AVISO.trAv_gewicht = API_AVISO.TotGrossWeight - TR_AVISO.trAv_colli = API_AVISO.TotPackage - TR_AVISO.trAv_Transportmittel = API_AVISO.TransportBorderType - TR_AVISO.trAv_Grenzueberschreitung = API_AVISO.TransportModeBorder - 'TR_AVISO.trAv_FraechterKdNr = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_Fraechter = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_AvisiererKdNr = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_Avisierer = API_AVISO.PaXXXXXXXrtnerTID - TR_AVISO.trAv_Nationalitaet = API_AVISO.TransportCountryCode - TR_AVISO.trAv_Kennzeichen = API_AVISO.TransportLicensePlate - TR_AVISO.trAv_Reference = API_AVISO.Reference - TR_AVISO.trAv_Fraechter = API_AVISO.FreightCompany - TR_AVISO.trAv_FraechterKdNr = API_AVISO.FreightCompanyID - TR_AVISO.trAv_Niederlassung = API_AVISO.Department - TR_AVISO.trAv_Firma = API_AVISO.Company - TR_AVISO.trAv_datetime = Now - TR_AVISO.trAv_Info = API_AVISO.Info - - If Not TR_AVISO.SAVE(False) Then Return VERAG_IN_AVISO_Exceptions.ERR_05_InternalVerarb - - If API_AVISO.DOCUMENTS IsNot Nothing Then - For Each ANH In API_AVISO.DOCUMENTS - Dim TR_DOC As New VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAvisoAnhaenge - TR_DOC.DocumentType = ANH.DocumentType - TR_DOC.DocumentNr = ANH.DocumentNr - TR_DOC.DocumentDate = ANH.DocumentDate - - If ANH.base64BinaryStream IsNot Nothing AndAlso ANH.base64BinaryStream <> "" Then - TR_DOC.trAvAh_docID = VERAG_IN_AVISO_Functions.base64toDS(ANH.base64BinaryStream, TR_AVISO.trAv_Id, ANH.FileName) - End If - TR_AVISO.ANHAENGE.Add(TR_DOC) - Next - End If - - If Not TR_AVISO.SAVE_Anhaenge Then Return VERAG_IN_AVISO_Exceptions.ERR_05_InternalVerarb - - - If API_AVISO.POSITIONS IsNot Nothing Then - For Each SH In API_AVISO.POSITIONS - Dim EZA As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - Dim SHIPMENT As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA) - ' Dim SHIPMENT As New VERAG_PROG_ALLGEMEIN.cVERAG_in_shippment() - SHIPMENT.shTr_TRAvisoId = TR_AVISO.trAv_Id 'Zur Verknüfung - - EZA.Company = API_AVISO.Company - EZA.Department = API_AVISO.Department - EZA.Reference = SH.Reference - - - EZA.DeclarationCountry = SH.DeclarationCountry - EZA.DeclarationType = SH.DeclarationType - - EZA.TotPackage = SH.NumberOfPackages - EZA.TotGrossWeight = SH.GrossWeight - 'EZA.TotGrossWeight = SH.GrossWeight - - EZA.CustomsCodeDeparture = SH.CustomsCodeDeparture - EZA.CustomsCodeDestination = SH.CustomsCodeDestination - 'EZA.CustomsCodeEntry = API_AVISO.CustomsCodeEntry - EZA.TransportModeBorder = API_AVISO.TransportModeBorder - - EZA.CountryCodeDeparture = SH.CountryCodeDeparture - EZA.CountryCodeDestination = SH.CountryCodeDestination - EZA.DEStateCodeDestination = SH.DEStateCodeDestination - - EZA.TransportArrivalLicensePlate = API_AVISO.TransportLicensePlate - EZA.TransportArrivalCountryCode = API_AVISO.TransportCountryCode - EZA.TransportBorderType = API_AVISO.TransportBorderType - EZA.TransportBorderLicensePlate = API_AVISO.TransportLicensePlate - EZA.Incoterm = SH.Incoterm - - EZA.PrePaperCode = SH.PrePaperCode - EZA.PrePaperNr = SH.PrePaperNr - ' EZA.KindOfBusiness = SH.ReferenceXXXXXXXXXXXX - EZA.InvoiceAmount = SH.InvoiceAmount - EZA.InvoiceCurrency = SH.InvoiceCurrency - - - EZA.ContainerNr1 = SH.ContainerNr1 - EZA.ContainerNr2 = SH.ContainerNr2 - EZA.ContainerNr3 = SH.ContainerNr3 - EZA.ContainerNr4 = SH.ContainerNr4 - - - - If SH.ADDRESS IsNot Nothing Then - For Each ADD In SH.ADDRESS - Dim TR_ADD As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen - TR_ADD.AddressCode = ADD.AddressCode - TR_ADD.CustomerID = ADD.CustomerID - TR_ADD.EORI = ADD.EORI - TR_ADD.NLNR = ADD.NLNR - TR_ADD.Name1 = ADD.Name1 - TR_ADD.Name2 = ADD.Name2 - TR_ADD.Name3 = ADD.Name3 - TR_ADD.Street1 = ADD.Street1 - TR_ADD.Street2 = ADD.Street2 - TR_ADD.City = ADD.City - TR_ADD.CountryCode = ADD.CountryCode - TR_ADD.PostalCode = ADD.PostalCode - TR_ADD.UStID = ADD.UStID - - EZA.ADDRESS.Add(TR_ADD) - Next - End If - - If SH.DOCUMENTS IsNot Nothing Then - For Each DOC In SH.DOCUMENTS - Dim TR_DOC As New VERAG_PROG_ALLGEMEIN.cVERAG_in_shipment_Document - TR_DOC.DocumentType = DOC.DocumentType - TR_DOC.DocumentNr = DOC.DocumentNr - TR_DOC.DocumentDate = DOC.DocumentDate - - If DOC.base64BinaryStream IsNot Nothing AndAlso DOC.base64BinaryStream <> "" Then - TR_DOC.shTrPosDoc_docID = VERAG_IN_AVISO_Functions.base64toDS(DOC.base64BinaryStream, TR_AVISO.trAv_Id, DOC.FileName, "SND_ATTACHMENT") - End If - - EZA.DOCUMENTS.Add(TR_DOC) - Next - End If - - If Not SHIPMENT.SAVE() Then - Return VERAG_IN_AVISO_Exceptions.ERR_06_InternalSave - End If - Next - End If - - Return "OK" - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & NCTS_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & NCTS_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return NCTS_Exceptions.ERR_03_InternalVerarb - End Try - - ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - Return PostValue - End Function - End Class - - - '------------------------------------------------------------------------ - '----------------------------------TEST---------------------------------- - '------------------------------------------------------------------------ - - - - - Public Class AVISO1TESTController - Inherits System.Web.Http.ApiController - - ''' - ''' Gets the Hello World Response - ''' - Public Function GetValue() As String - Return "Hello world!" - End Function - - Public Function PostValue(ByVal API_AVISO As VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAviso) As String - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - - Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('IN_AVISO_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - Try - Dim resultJson2 = jsonString.FromClass(API_AVISO) - SQL.doSQL("insert into tbltest (test) Values('IN_AVISO_" & resultJson2 & "')", "FMZOLL") - Catch ex As Exception - - End Try - - - PostValue = "IN_AVISO_ERR" - Try - If API_AVISO Is Nothing Then Return VERAG_IN_AVISO_Exceptions.ERR_01_Wrong_Format - If API_AVISO.Company Is Nothing OrElse API_AVISO.Company = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_02_Missing_Company - If API_AVISO.Department Is Nothing OrElse API_AVISO.Department = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_03_Missing_Department - If API_AVISO.PartnerTID Is Nothing OrElse API_AVISO.PartnerTID = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_04_Missing_PartnerID - If API_AVISO.TransportLicensePlate Is Nothing OrElse API_AVISO.TransportLicensePlate = "" Then Return VERAG_IN_AVISO_Exceptions.ERR_09_Missing_PlateNr - - Dim TR_AVISO As New VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAvisoFULL - - - TR_AVISO.trAv_PartnerSystem = API_AVISO.PartnerTID - TR_AVISO.trAv_gewicht = API_AVISO.TotGrossWeight - TR_AVISO.trAv_colli = API_AVISO.TotPackage - TR_AVISO.trAv_Transportmittel = API_AVISO.TransportBorderType - TR_AVISO.trAv_Grenzueberschreitung = API_AVISO.TransportModeBorder - 'TR_AVISO.trAv_FraechterKdNr = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_Fraechter = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_AvisiererKdNr = API_AVISO.PaXXXXXXXrtnerTID - 'TR_AVISO.trAv_Avisierer = API_AVISO.PaXXXXXXXrtnerTID - TR_AVISO.trAv_Nationalitaet = API_AVISO.TransportCountryCode - TR_AVISO.trAv_Kennzeichen = API_AVISO.TransportLicensePlate - TR_AVISO.trAv_Reference = API_AVISO.Reference - TR_AVISO.trAv_Fraechter = API_AVISO.FreightCompany - TR_AVISO.trAv_FraechterKdNr = API_AVISO.FreightCompanyID - TR_AVISO.trAv_Niederlassung = API_AVISO.Department - TR_AVISO.trAv_Firma = API_AVISO.Company - TR_AVISO.trAv_datetime = Now - TR_AVISO.trAv_Info = API_AVISO.Info - - If Not TR_AVISO.SAVE(False) Then Return VERAG_IN_AVISO_Exceptions.ERR_05_InternalVerarb - - If API_AVISO.DOCUMENTS IsNot Nothing Then - For Each ANH In API_AVISO.DOCUMENTS - Dim TR_DOC As New VERAG_PROG_ALLGEMEIN.cVERAG_in_TRAvisoAnhaenge - TR_DOC.DocumentType = ANH.DocumentType - TR_DOC.DocumentNr = ANH.DocumentNr - TR_DOC.DocumentDate = ANH.DocumentDate - - If ANH.base64BinaryStream IsNot Nothing AndAlso ANH.base64BinaryStream <> "" Then - TR_DOC.trAvAh_docID = VERAG_IN_AVISO_Functions.base64toDS(ANH.base64BinaryStream, TR_AVISO.trAv_Id, ANH.FileName) - End If - TR_AVISO.ANHAENGE.Add(TR_DOC) - Next - End If - - If Not TR_AVISO.SAVE_Anhaenge Then Return VERAG_IN_AVISO_Exceptions.ERR_05_InternalVerarb - - - If API_AVISO.POSITIONS IsNot Nothing Then - For Each SH In API_AVISO.POSITIONS - Dim EZA As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - Dim SHIPMENT As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA) - ' Dim SHIPMENT As New VERAG_PROG_ALLGEMEIN.cVERAG_in_shippment() - SHIPMENT.shTr_TRAvisoId = TR_AVISO.trAv_Id 'Zur Verknüfung - - EZA.Company = API_AVISO.Company - EZA.Department = API_AVISO.Department - EZA.Reference = SH.Reference - - - EZA.DeclarationCountry = SH.DeclarationCountry - EZA.DeclarationType = SH.DeclarationType - - EZA.TotPackage = SH.NumberOfPackages - EZA.TotGrossWeight = SH.GrossWeight - 'EZA.TotGrossWeight = SH.GrossWeight - - EZA.CustomsCodeDeparture = SH.CustomsCodeDeparture - EZA.CustomsCodeDestination = SH.CustomsCodeDestination - 'EZA.CustomsCodeEntry = API_AVISO.CustomsCodeEntry - EZA.TransportModeBorder = API_AVISO.TransportModeBorder - - EZA.CountryCodeDeparture = SH.CountryCodeDeparture - EZA.CountryCodeDestination = SH.CountryCodeDestination - EZA.DEStateCodeDestination = SH.DEStateCodeDestination - - EZA.TransportArrivalLicensePlate = API_AVISO.TransportLicensePlate - EZA.TransportArrivalCountryCode = API_AVISO.TransportCountryCode - EZA.TransportBorderType = API_AVISO.TransportBorderType - EZA.TransportBorderLicensePlate = API_AVISO.TransportLicensePlate - EZA.Incoterm = SH.Incoterm - - EZA.PrePaperCode = SH.PrePaperCode - EZA.PrePaperNr = SH.PrePaperNr - ' EZA.KindOfBusiness = SH.ReferenceXXXXXXXXXXXX - EZA.InvoiceAmount = SH.InvoiceAmount - EZA.InvoiceCurrency = SH.InvoiceCurrency - - - EZA.ContainerNr1 = SH.ContainerNr1 - EZA.ContainerNr2 = SH.ContainerNr2 - EZA.ContainerNr3 = SH.ContainerNr3 - EZA.ContainerNr4 = SH.ContainerNr4 - - - - If SH.ADDRESS IsNot Nothing Then - For Each ADD In SH.ADDRESS - Dim TR_ADD As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen - TR_ADD.AddressCode = ADD.AddressCode - TR_ADD.CustomerID = ADD.CustomerID - TR_ADD.EORI = ADD.EORI - TR_ADD.NLNR = ADD.NLNR - TR_ADD.Name1 = ADD.Name1 - TR_ADD.Name2 = ADD.Name2 - TR_ADD.Name3 = ADD.Name3 - TR_ADD.Street1 = ADD.Street1 - TR_ADD.Street2 = ADD.Street2 - TR_ADD.City = ADD.City - TR_ADD.CountryCode = ADD.CountryCode - TR_ADD.PostalCode = ADD.PostalCode - TR_ADD.UStID = ADD.UStID - - EZA.ADDRESS.Add(TR_ADD) - Next - End If - - If SH.DOCUMENTS IsNot Nothing Then - For Each DOC In SH.DOCUMENTS - Dim TR_DOC As New VERAG_PROG_ALLGEMEIN.cVERAG_in_shipment_Document - TR_DOC.DocumentType = DOC.DocumentType - TR_DOC.DocumentNr = DOC.DocumentNr - TR_DOC.DocumentDate = DOC.DocumentDate - - If DOC.base64BinaryStream IsNot Nothing AndAlso DOC.base64BinaryStream <> "" Then - TR_DOC.shTrPosDoc_docID = VERAG_IN_AVISO_Functions.base64toDS(DOC.base64BinaryStream, TR_AVISO.trAv_Id, DOC.FileName, "SND_ATTACHMENT") - End If - - EZA.DOCUMENTS.Add(TR_DOC) - Next - End If - - If Not SHIPMENT.SAVE() Then - Return VERAG_IN_AVISO_Exceptions.ERR_06_InternalSave - End If - Next - End If - - Return "OK" - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & NCTS_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & NCTS_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return NCTS_Exceptions.ERR_03_InternalVerarb - End Try - - ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - Return PostValue - End Function - End Class - - - - - - Class VERAG_IN_AVISO_Exceptions - Public Const ERR_01_Wrong_Format As String = "ERR_01" - Public Const ERR_02_Missing_Company As String = "ERR_02" - Public Const ERR_03_Missing_Department As String = "ERR_03" - Public Const ERR_04_Missing_PartnerID As String = "ERR_04" - Public Const ERR_05_InternalVerarb As String = "ERR_05" - Public Const ERR_06_InternalSave As String = "ERR_06" - Public Const ERR_07_Missing_Colli As String = "ERR_07" - Public Const ERR_08_Missing_Gewicht As String = "ERR_08" - Public Const ERR_09_Missing_PlateNr As String = "ERR_09" - - End Class - - Class VERAG_IN_AVISO_Functions - - Public Shared Function base64toDS(base64 As String, AvisoTRID As Integer, FileName As String, Optional uOrdner3 As String = "AVISO_ATTACHMENT") As Integer - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("INTERFACE", "IN", "TR_AVISO", uOrdner3, AvisoTRID, FileName) - DS.uploadDataToDATENSERVER_fromBase64String(base64, FileName,, False) - Return DS.da_id - End Function - - End Class -End Namespace \ No newline at end of file diff --git a/VERAG_REST_SERVER/Controllers/V1/CustomsDeclaration/CustomsDeclarationController.vb b/VERAG_REST_SERVER/Controllers/V1/CustomsDeclaration/CustomsDeclarationController.vb deleted file mode 100644 index 706b88e..0000000 --- a/VERAG_REST_SERVER/Controllers/V1/CustomsDeclaration/CustomsDeclarationController.vb +++ /dev/null @@ -1,151 +0,0 @@ -Imports System.Net -Imports System.Web.Http -Imports Microsoft.Web.Http -Imports Newtonsoft.Json - - -Namespace api_CustomsDeclaration.Controllers - - - - Public Class CustomsDeclaration1Controller - Inherits System.Web.Http.ApiController - - Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - Dim EZA As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - EZA.POSITIONS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position) - EZA.POSITIONS(0).DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position_document) - 'EZA.DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_document) - EZA.ADDRESS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen) - - Return EZA - End Function - - Public Function PostValue(ByVal EZA_FREMD As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza) As String - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) - - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_START_X101_ " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - - Try - - Dim resultJson2 = jsonString.FromClass(EZA_FREMD) - SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson2.Replace("'", "") & "')", "FMZOLL") - - Catch ex As Exception - SQL.doSQL("insert into tbltest (test) Values('ERR:EZA_101_" & ex.Message & "')", "FMZOLL") - - End Try - - - PostValue = "EZA_ERR" - Try - If EZA_FREMD Is Nothing Then Return EZA_Exceptions.ERR_01_Wrong_Format - ' If EZA_FREMD.TransportBorderLicensePlate = "" Then Return EZA_Exceptions.ERR_07_Missing_PlateNr - ' If EZA_FREMD.Reference = "" Then Return EZA_Exceptions.ERR_08_Missing_Reference - - Dim Reference = If(EZA_FREMD.Reference, "") - - Dim EZA_TR = VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL.LOADByReference("ATEZ", Reference, True) - - If EZA_TR Is Nothing Then - EZA_TR = New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA_FREMD) - Else - EZA_TR.setEZA(EZA_FREMD) - End If - - EZA_TR.shTr_Partnersystem = "ATEZ" - EZA_TR.shTr_Status = 5 - 'EZA_TR.shTr_Status_KEWILL_Equivalent = 5 - - EZA_TR.EZA.Company = "VERAG" - EZA_TR.EZA.Department = "SUB" - 'EZA_TR.Reference = "" - - - If EZA_TR.SAVE_ALL Then - 'PostValue = "EZA_OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString - 'Dim resultJson = jsonString.FromClass(EZA_FREMD) - 'SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson & "')", "FMZOLL") - 'SQL.doSQL("insert into tbltest (test) Values('ATEZ_EZA_TEST: " & EZA_FREMD.TransportBorderLicensePlate & " - " & EZA_FREMD.Reference & "')", "FMZOLL") - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_OK - ID: " & EZA_TR.shTr_id & "','" & ip & "')", "FMZOLL") - - Return "OK" - Else - PostValue = EZA_Exceptions.ERR_04_InternalSave - End If - - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & EZA_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & EZA_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return EZA_Exceptions.ERR_03_InternalVerarb - End Try - - ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - Return PostValue - - - End Function - - - End Class - - -End Namespace - - - -Public Class jsonString - - Shared Function FromClass(Of T)(data As T, - Optional isEmptyToNull As Boolean = False, - Optional jsonSettings As JsonSerializerSettings = Nothing) As String - - Dim response As String = String.Empty - - If Not EqualityComparer(Of T).Default.Equals(data, Nothing) Then - response = JsonConvert.SerializeObject(data, jsonSettings) - End If - - Return If(isEmptyToNull, (If(response = "{}", "null", response)), response) - - End Function - - Shared Function ToClass(Of T)(data As String, - Optional jsonSettings As JsonSerializerSettings = Nothing) As T - - Dim response = Nothing - - If Not String.IsNullOrEmpty(data) Then - response = If(jsonSettings Is Nothing, - JsonConvert.DeserializeObject(Of T)(data), - JsonConvert.DeserializeObject(Of T)(data, jsonSettings)) - End If - - Return response - - End Function - - - -End Class - -Class EZA_Exceptions - Public Const ERR_01_Wrong_Format As String = "ERR_01" - Public Const ERR_02_Missing_MRN As String = "ERR_02" - Public Const ERR_03_InternalVerarb As String = "ERR_03" - Public Const ERR_04_InternalSave As String = "ERR_04" - Public Const ERR_05_Missing_Colli As String = "ERR_05" - Public Const ERR_06_Missing_Gewicht As String = "ERR_06" - Public Const ERR_07_Missing_PlateNr As String = "ERR_07" - Public Const ERR_08_Missing_Reference As String = "ERR_08" - -End Class - diff --git a/VERAG_REST_SERVER/Controllers/V1/NCTS/NCTSController.vb b/VERAG_REST_SERVER/Controllers/V1/NCTS/NCTSController.vb deleted file mode 100644 index c37fa0c..0000000 --- a/VERAG_REST_SERVER/Controllers/V1/NCTS/NCTSController.vb +++ /dev/null @@ -1,500 +0,0 @@ -Imports System.Net -Imports System.Web.Http -Imports Microsoft.Web.Http -Imports Newtonsoft.Json - -Namespace ApiController.Controllers - - - - - - Public Class TR_NCTS1Controller - Inherits System.Web.Http.ApiController - - 'Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_out_ncts - ' Dim NCTS As New VERAG_PROG_ALLGEMEIN.cVERAG_out_ncts - ' NCTS.ncts_WARENPOS.Add(New VERAG_PROG_ALLGEMEIN.cDakosy_NCTSOut_Warenposition) - ' NCTS.ncts_SICHERHEITSANGABEN.Add(New VERAG_PROG_ALLGEMEIN.cDakosy_NCTSOut_Sicherheitsangaben) - ' NCTS.ncts_WARENPOS(0).nctsWP_PACKSTUECKE.Add(New VERAG_PROG_ALLGEMEIN.cDakosy_NCTSOut_WarenpositionPackstuecke) - ' NCTS.ncts_WARENPOS(0).nctsWP_UNTERLAGEN.Add(New VERAG_PROG_ALLGEMEIN.cDakosy_NCTSOut_WarenpositionVorgelegteUnterlagen) - - ' 'NCTS.ADDRESS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen) - - - ' Return NCTS - 'End Function - - - 'Public Function PostValue(ByVal value As String) As String - ' 'Dim file As System.IO.StreamWriter - ' 'file = My.Computer.FileSystem.OpenTextFileWriter("G:\test.txt", True) - ' 'file.WriteLine(value) - ' 'file.Close() - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - ' SQL.doSQL("insert into tbltest (test) Values('000')", "FMZOLL") - - ' Return "asd" & value - 'End Function - - Public Function PostValue(ByVal NCTS_ATEZ As VERAG_PROG_ALLGEMEIN.cATEZ_NCTS) As String - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - - Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_NCTS_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - Try - - Dim resultJson2 = jsonString.FromClass(NCTS_ATEZ) - SQL.doSQL("insert into tbltest (test) Values('NCTS_" & resultJson2 & "')", "FMZOLL") - - Catch ex As Exception - - End Try - - - PostValue = "NCTS_ERR" - Try - If NCTS_ATEZ Is Nothing OrElse NCTS_ATEZ.CC015B Is Nothing Then Return NCTS_Exceptions.ERR_01_Wrong_Format - If NCTS_ATEZ.CC015B.MRNNumber Is Nothing OrElse NCTS_ATEZ.CC015B.MRNNumber = "" Then Return NCTS_Exceptions.ERR_02_Missing_MRN - - - Dim MRN = If(NCTS_ATEZ.CC015B.MRNNumber, "") - - Dim NCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByMRN(MRN, True,, "ATEZ") - If NCTS_TR Is Nothing Then - NCTS_TR = New VERAG_PROG_ALLGEMEIN.cNCTS_TR - End If - - NCTS_TR.ncts_Partnersystem = "ATEZ" - NCTS_TR.ncts_Status = 5 - NCTS_TR.ncts_Status_KEWILL_Equivalent = 5 - - NCTS_TR.ncts_MRN = NCTS_ATEZ.CC015B.MRNNumber - - - - 'NCTS_TR.ncts_ObjectName = NCTS_ATEZ.CC015B.RefId - 'NCTS_TR.ncts_ObjectAlias = NCTS_ATEZ.CC015B.RefId - - If NCTS_ATEZ.CC015B.HEAHEA IsNot Nothing Then - NCTS_TR.ncts_dyaArt = NCTS_ATEZ.CC015B.HEAHEA.TypOfDecHEA24 - NCTS_TR.ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend = NCTS_ATEZ.CC015B.HEAHEA.IdeOfMeaOfTraCroHEA85 - NCTS_TR.ncts_Befoerderungsmittel_StaatszugehoerigkeitGrenzueberschreitendCode = NCTS_ATEZ.CC015B.HEAHEA.NatOfMeaOfTraCroHEA87 - NCTS_TR.ncts_Befoerderungsmittel_KennzeichenAbgang = NCTS_ATEZ.CC015B.HEAHEA.IdeOfMeaOfTraAtDHEA78 - End If - - If NCTS_ATEZ.CC015B.CARTRA100 IsNot Nothing Then - NCTS_TR.ncts_SumA_Befoerderer_Name = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.NamCARTRA121, 35) - NCTS_TR.ncts_SumA_Befoerderer_StrasseHausnummer = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.StrAndNumCARTRA254, 35) - NCTS_TR.ncts_SumA_Befoerderer_PLZ = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.PosCodCARTRA121, 9) - NCTS_TR.ncts_SumA_Befoerderer_Ort = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.CitCARTRA789, 35) - NCTS_TR.ncts_SumA_Befoerderer_Land = NCTS_ATEZ.CC015B.CARTRA100.CouCodCARTRA587 - - 'If NCTS_ATEZ.CC015B.CARTRA100.TINCARTRA254 IsNot Nothing And NCTS_ATEZ.CC015B.CARTRA100.NADCARTRA121 IsNot Nothing Then - ' NCTS_TR.ncts_SumA_Befoerderer_EORI = NCTS_ATEZ.CC015B.CARTRA100.TINCARTRA254 & NCTS_ATEZ.CC015B.CARTRA100.NADCARTRA121 - 'End If - End If - - If NCTS_ATEZ.CC015B.TRACORSEC037 IsNot Nothing Then - NCTS_TR.ncts_SumA_Versender_Name = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.NamTRACORSEC041, 35) - NCTS_TR.ncts_SumA_Versender_StrasseHausnummer = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.StrNumTRACORSEC043, 35) - NCTS_TR.ncts_SumA_Versender_PLZ = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.PosCodTRACORSEC042, 9) - NCTS_TR.ncts_SumA_Versender_Ort = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.CitTRACORSEC038, 35) - NCTS_TR.ncts_SumA_Versender_Land = NCTS_ATEZ.CC015B.TRACORSEC037.CouCodTRACORSEC039 - - 'If NCTS_ATEZ.CC015B.TRACORSEC037.TRACORSEC037LNG IsNot Nothing And NCTS_ATEZ.CC015B.TRACORSEC037.TINTRACORSEC044 IsNot Nothing Then - ' NCTS_TR.ncts_SumA_Befoerderer_EORI = NCTS_ATEZ.CC015B.TRACORSEC037.TRACORSEC037LNG & NCTS_ATEZ.CC015B.TRACORSEC037.TINTRACORSEC044 - 'End If - End If - - If NCTS_ATEZ.CC015B.TRACONSEC029 IsNot Nothing Then - NCTS_TR.ncts_SumA_Versender_Name = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.NameTRACONSEC033, 35) - NCTS_TR.ncts_SumA_Versender_StrasseHausnummer = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.StrNumTRACONSEC035, 35) - NCTS_TR.ncts_SumA_Versender_PLZ = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.PosCodTRACONSEC034, 9) - NCTS_TR.ncts_SumA_Versender_Ort = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.CitTRACONSEC030, 35) - NCTS_TR.ncts_SumA_Versender_Land = NCTS_ATEZ.CC015B.TRACONSEC029.CouCodTRACONSEC031 - - 'If NCTS_ATEZ.CC015B.TRACONSEC029.TRACONSEC029LNG IsNot Nothing And NCTS_ATEZ.CC015B.TRACONSEC029.TINTRACONSEC036 IsNot Nothing Then - ' NCTS_TR.ncts_SumA_Befoerderer_EORI = NCTS_ATEZ.CC015B.TRACONSEC029.TRACONSEC029LNG & NCTS_ATEZ.CC015B.TRACONSEC029.TINTRACONSEC036 - 'End If - End If - - 'Dim cnt = 1 - 'If NCTS_ATEZ.CC015B.ITI IsNot Nothing Then - ' For Each R In NCTS_ATEZ.CC015B.ITI - ' Select Case cnt - ' Case 1 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand1 = R - ' Case 2 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand2 = R - ' Case 3 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand3 = R - ' Case 4 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand4 = R - ' Case 5 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand5 = R - ' Case 6 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand6 = R - ' Case 7 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand7 = R - ' Case 8 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand8 = R - ' Case 9 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand9 = R - ' Case 10 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand10 = R - ' Case 11 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand11 = R - ' Case 12 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand12 = R - ' End Select - - ' cnt += 1 - ' Next - - 'End If - - - - - If NCTS_ATEZ.CC015B.GOOITEGDS IsNot Nothing Then - For Each ITEM In NCTS_ATEZ.CC015B.GOOITEGDS - Dim POS As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_Warenposition - POS.nctsWP_PositionsNummer = ITEM.IteNumGDS7 - POS.nctsWP_Warenbezeichnung = ITEM.GooDesGDS23 - - POS.nctsWP_Rohmasse = ITEM.GroMasGDS46 - POS.nctsWP_Eigenmasse = ITEM.NetMasGDS48 - If ITEM.ComCodTarCodGDS10 IsNot Nothing Then - If ITEM.ComCodTarCodGDS10.ToString.Length > 10 Then - POS.nctsWP_Warennummer = ITEM.ComCodTarCodGDS10.Substring(0, 10) - Else - POS.nctsWP_Warennummer = ITEM.ComCodTarCodGDS10 - End If - End If - If ITEM.PACGS2 IsNot Nothing Then - - For Each PAC In ITEM.PACGS2 - Dim PACK As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_WarenpositionPackstuecke - PACK.nctsWpPk_PackstueckeAnzahl = PAC.NumOfPacGS24 - PACK.nctsWpPk_Verpackungsart = PAC.KinOfPacGS23 - POS.nctsWP_PACKSTUECKE.Add(PACK) - If PACK.nctsWpPk_PackstueckeAnzahl Is Nothing Then Return NCTS_Exceptions.ERR_05_Missing_Colli - Next - Else - Return NCTS_Exceptions.ERR_05_Missing_Colli - End If - - ' For Each PACGS In ITEM.PACGS2 - ' Dim PACK As New cNCTSPartnerWorker.cNCTS_TR_WarenpositionPackstuecke - ' PACK.nctsWpPk_PackstueckeAnzahl = PACGS.NumOfPacGS24 - ' PACK.nctsWpPk_Verpackungsart = PACGS.KinOfPacGS23 - '' PACK.nctsWpPk_ZeichenNummern = PACGS.MarNumOfPacGS21 - ' POS.nctsWP_PACKSTUECKE.Add(PACK) - ' Next - NCTS_TR.ncts_WARENPOS.Add(POS) - If POS.nctsWP_Rohmasse Is Nothing Then Return NCTS_Exceptions.ERR_06_Missing_Gewicht - If POS.nctsWP_Rohmasse Is Nothing Then Return NCTS_Exceptions.ERR_06_Missing_Gewicht - If POS.nctsWP_PACKSTUECKE.Count = 0 Then Return NCTS_Exceptions.ERR_05_Missing_Colli - Next - - End If - - If NCTS_TR.ncts_Befoerderungsmittel_KennzeichenAbgang Is Nothing Then Return NCTS_Exceptions.ERR_07_Missing_PlateNr - - - - If NCTS_TR.SAVE_ALL Then - 'PostValue = "NCTS_OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString - 'SQL.doSQL("insert into tbltest (test) Values('ATEZ_NCTS_TEST: " & NCTS_ATEZ.CC015B.MRNNumber & "')", "FMZOLL") - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_NCTS_OK - ID: " & NCTS_TR.ncts_Id & "','" & ip & "')", "FMZOLL") - - Return "OK" - Else - PostValue = NCTS_Exceptions.ERR_04_InternalSave - End If - ' Return "TEST3" - - 'SQL.doSQL("insert into tbltest (test) Values('" & "OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "')", "FMZOLL") - - 'MsgBox(resultJson) - 'Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("INTERFACE", "ATEZ", "IN", "NCTS_ATEZ") - 'DS.uploadDataToDATENSERVER_fromBytes() - - 'Dim client = New RestClient(_baseURI) - 'Dim request = New RestRequest("/datasources/{identifier}/data", Method.GET) - 'request.AddUrlSegment("identifier", _identifier) - 'request.AddHeader("Authorization", "Basic " + _token) - 'Dim jstr = client.Execute(request).Content - 'Dim allDATA As List(Of GeneralInfo) = JsonConvert.DeserializeObject(Of List(Of GeneralInfo))(jstr) - - - - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & NCTS_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & NCTS_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return NCTS_Exceptions.ERR_03_InternalVerarb - End Try - - ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - Return PostValue - End Function - - - '' POST api/CustomsDeclaration_V001/ - 'Public Sub PostValue( ByVal value As String) - - 'End Sub - - '' PUT api/CustomsDeclaration_V001//5 - 'Public Sub PutValue(ByVal id As Integer, ByVal value As String) - - 'End Sub - - '' DELETE api/CustomsDeclaration_V001//5 - 'Public Sub DeleteValue(ByVal id As Integer) - - 'End Sub - - - End Class - - - - '------------------------------------------------------------------------ - '----------------------------------TEST---------------------------------- - '------------------------------------------------------------------------ - - - - Public Class TR_NCTSV001TESTController - Inherits System.Web.Http.ApiController - - - Public Function PostValue(ByVal NCTS_ATEZ As VERAG_PROG_ALLGEMEIN.cATEZ_NCTS) As String - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - - Try - - Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_NCTS_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - Try - - Dim resultJson2 = jsonString.FromClass(NCTS_ATEZ) - SQL.doSQL("insert into tbltest (test) Values('NCTS_" & resultJson2 & "')", "FMZOLL") - - Catch ex As Exception - - End Try - - - PostValue = "NCTS_ERR" - - If NCTS_ATEZ Is Nothing OrElse NCTS_ATEZ.CC015B Is Nothing Then Return NCTS_Exceptions.ERR_01_Wrong_Format - If NCTS_ATEZ.CC015B.MRNNumber Is Nothing OrElse NCTS_ATEZ.CC015B.MRNNumber = "" Then Return NCTS_Exceptions.ERR_02_Missing_MRN - - - - Dim MRN = If(NCTS_ATEZ.CC015B.MRNNumber, "") - - Dim NCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByMRN(MRN, True,, "ATEZ") - If NCTS_TR Is Nothing Then - NCTS_TR = New VERAG_PROG_ALLGEMEIN.cNCTS_TR - End If - - - NCTS_TR.ncts_Partnersystem = "ATEZ" - NCTS_TR.ncts_Status = 5 - NCTS_TR.ncts_Status_KEWILL_Equivalent = 5 - - NCTS_TR.ncts_MRN = NCTS_ATEZ.CC015B.MRNNumber - - - 'NCTS_TR.ncts_ObjectName = NCTS_ATEZ.CC015B.RefId - 'NCTS_TR.ncts_ObjectAlias = NCTS_ATEZ.CC015B.RefId - - If NCTS_ATEZ.CC015B.HEAHEA IsNot Nothing Then - NCTS_TR.ncts_dyaArt = NCTS_ATEZ.CC015B.HEAHEA.TypOfDecHEA24 - NCTS_TR.ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend = NCTS_ATEZ.CC015B.HEAHEA.IdeOfMeaOfTraCroHEA85 - NCTS_TR.ncts_Befoerderungsmittel_StaatszugehoerigkeitGrenzueberschreitendCode = NCTS_ATEZ.CC015B.HEAHEA.NatOfMeaOfTraCroHEA87 - NCTS_TR.ncts_Befoerderungsmittel_KennzeichenAbgang = NCTS_ATEZ.CC015B.HEAHEA.IdeOfMeaOfTraAtDHEA78 - End If - - If NCTS_ATEZ.CC015B.CARTRA100 IsNot Nothing Then - NCTS_TR.ncts_SumA_Befoerderer_Name = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.NamCARTRA121, 35) - NCTS_TR.ncts_SumA_Befoerderer_StrasseHausnummer = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.StrAndNumCARTRA254, 35) - NCTS_TR.ncts_SumA_Befoerderer_PLZ = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.PosCodCARTRA121, 9) - NCTS_TR.ncts_SumA_Befoerderer_Ort = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.CARTRA100.CitCARTRA789, 35) - NCTS_TR.ncts_SumA_Befoerderer_Land = NCTS_ATEZ.CC015B.CARTRA100.CouCodCARTRA587 - - 'If NCTS_ATEZ.CC015B.CARTRA100.TINCARTRA254 IsNot Nothing And NCTS_ATEZ.CC015B.CARTRA100.NADCARTRA121 IsNot Nothing Then - ' NCTS_TR.ncts_SumA_Befoerderer_EORI = NCTS_ATEZ.CC015B.CARTRA100.TINCARTRA254 & NCTS_ATEZ.CC015B.CARTRA100.NADCARTRA121 - 'End If - End If - - If NCTS_ATEZ.CC015B.TRACORSEC037 IsNot Nothing Then - NCTS_TR.ncts_SumA_Versender_Name = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.NamTRACORSEC041, 35) - NCTS_TR.ncts_SumA_Versender_StrasseHausnummer = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.StrNumTRACORSEC043, 35) - NCTS_TR.ncts_SumA_Versender_PLZ = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.PosCodTRACORSEC042, 9) - NCTS_TR.ncts_SumA_Versender_Ort = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACORSEC037.CitTRACORSEC038, 35) - NCTS_TR.ncts_SumA_Versender_Land = NCTS_ATEZ.CC015B.TRACORSEC037.CouCodTRACORSEC039 - - 'If NCTS_ATEZ.CC015B.TRACORSEC037.TRACORSEC037LNG IsNot Nothing And NCTS_ATEZ.CC015B.TRACORSEC037.TINTRACORSEC044 IsNot Nothing Then - ' NCTS_TR.ncts_SumA_Befoerderer_EORI = NCTS_ATEZ.CC015B.TRACORSEC037.TRACORSEC037LNG & NCTS_ATEZ.CC015B.TRACORSEC037.TINTRACORSEC044 - 'End If - End If - - If NCTS_ATEZ.CC015B.TRACONSEC029 IsNot Nothing Then - NCTS_TR.ncts_SumA_Versender_Name = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.NameTRACONSEC033, 35) - NCTS_TR.ncts_SumA_Versender_StrasseHausnummer = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.StrNumTRACONSEC035, 35) - NCTS_TR.ncts_SumA_Versender_PLZ = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.PosCodTRACONSEC034, 9) - NCTS_TR.ncts_SumA_Versender_Ort = NCTS_Functions.cutlength(NCTS_ATEZ.CC015B.TRACONSEC029.CitTRACONSEC030, 35) - NCTS_TR.ncts_SumA_Versender_Land = NCTS_ATEZ.CC015B.TRACONSEC029.CouCodTRACONSEC031 - - 'If NCTS_ATEZ.CC015B.TRACONSEC029.TRACONSEC029LNG IsNot Nothing And NCTS_ATEZ.CC015B.TRACONSEC029.TINTRACONSEC036 IsNot Nothing Then - ' NCTS_TR.ncts_SumA_Befoerderer_EORI = NCTS_ATEZ.CC015B.TRACONSEC029.TRACONSEC029LNG & NCTS_ATEZ.CC015B.TRACONSEC029.TINTRACONSEC036 - 'End If - End If - - 'Dim cnt = 1 - 'If NCTS_ATEZ.CC015B.ITI IsNot Nothing Then - ' For Each R In NCTS_ATEZ.CC015B.ITI - ' Select Case cnt - ' Case 1 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand1 = R - ' Case 2 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand2 = R - ' Case 3 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand3 = R - ' Case 4 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand4 = R - ' Case 5 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand5 = R - ' Case 6 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand6 = R - ' Case 7 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand7 = R - ' Case 8 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand8 = R - ' Case 9 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand9 = R - ' Case 10 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand10 = R - ' Case 11 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand11 = R - ' Case 12 : NCTS_TR.ncts_SumA_BefoerderungsrouteLand12 = R - ' End Select - - ' cnt += 1 - ' Next - - 'End If - - - - If NCTS_ATEZ.CC015B.GOOITEGDS IsNot Nothing Then - For Each ITEM In NCTS_ATEZ.CC015B.GOOITEGDS - Dim POS As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_Warenposition - POS.nctsWP_PositionsNummer = ITEM.IteNumGDS7 - POS.nctsWP_Warenbezeichnung = ITEM.GooDesGDS23 - - POS.nctsWP_Rohmasse = ITEM.GroMasGDS46 - POS.nctsWP_Eigenmasse = ITEM.NetMasGDS48 - If ITEM.ComCodTarCodGDS10 IsNot Nothing Then - If ITEM.ComCodTarCodGDS10.ToString.Length > 10 Then - POS.nctsWP_Warennummer = ITEM.ComCodTarCodGDS10.Substring(0, 10) - Else - POS.nctsWP_Warennummer = ITEM.ComCodTarCodGDS10 - End If - End If - If ITEM.PACGS2 IsNot Nothing Then - For Each PAC In ITEM.PACGS2 - Dim PACK As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_WarenpositionPackstuecke - PACK.nctsWpPk_PackstueckeAnzahl = PAC.NumOfPacGS24 - PACK.nctsWpPk_Verpackungsart = PAC.KinOfPacGS23 - POS.nctsWP_PACKSTUECKE.Add(PACK) - If PACK.nctsWpPk_PackstueckeAnzahl Is Nothing Then Return NCTS_Exceptions.ERR_05_Missing_Colli - Next - Else - Return NCTS_Exceptions.ERR_05_Missing_Colli - End If - - ' For Each PACGS In ITEM.PACGS2 - ' Dim PACK As New cNCTSPartnerWorker.cNCTS_TR_WarenpositionPackstuecke - ' PACK.nctsWpPk_PackstueckeAnzahl = PACGS.NumOfPacGS24 - ' PACK.nctsWpPk_Verpackungsart = PACGS.KinOfPacGS23 - '' PACK.nctsWpPk_ZeichenNummern = PACGS.MarNumOfPacGS21 - ' POS.nctsWP_PACKSTUECKE.Add(PACK) - ' Next - NCTS_TR.ncts_WARENPOS.Add(POS) - If POS.nctsWP_Rohmasse Is Nothing Then Return NCTS_Exceptions.ERR_06_Missing_Gewicht - If POS.nctsWP_Rohmasse Is Nothing Then Return NCTS_Exceptions.ERR_06_Missing_Gewicht - If POS.nctsWP_PACKSTUECKE.Count = 0 Then Return NCTS_Exceptions.ERR_05_Missing_Colli - Next - - End If - - If NCTS_TR.ncts_Befoerderungsmittel_KennzeichenAbgang Is Nothing Then Return NCTS_Exceptions.ERR_07_Missing_PlateNr - - - - - If NCTS_TR.SAVE_ALL Then - 'PostValue = "NCTS_OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString - 'SQL.doSQL("insert into tbltest (test) Values('ATEZ_NCTS_TEST: " & NCTS_ATEZ.CC015B.MRNNumber & "')", "FMZOLL") - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_NCTS_OK - ID: " & NCTS_TR.ncts_Id & "','" & ip & "')", "FMZOLL") - - Return "OK" - Else - PostValue = NCTS_Exceptions.ERR_04_InternalSave - End If - - - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & NCTS_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & NCTS_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return NCTS_Exceptions.ERR_03_InternalVerarb - End Try - - ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - Return PostValue - End Function - - - - End Class - - -End Namespace - -Class NCTS_Exceptions - Public Const ERR_01_Wrong_Format As String = "ERR_01" - Public Const ERR_02_Missing_MRN As String = "ERR_02" - Public Const ERR_03_InternalVerarb As String = "ERR_03" - Public Const ERR_04_InternalSave As String = "ERR_04" - Public Const ERR_05_Missing_Colli As String = "ERR_05" - Public Const ERR_06_Missing_Gewicht As String = "ERR_06" - Public Const ERR_07_Missing_PlateNr As String = "ERR_07" - Public Const ERR_08_Missing_Reference As String = "ERR_08" -End Class - - -Class NCTS_Functions - - Public Shared Function cutlength(o, l) As Object - Try - - If o IsNot Nothing Then - If o.ToString.Length > l Then - Return o.ToString.Substring(0, l) - End If - End If - Return o - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) - - Return o - End Try - End Function -End Class - - - -'Enum NCTS_ERR_CODES -' ERR_01 -'End Enum \ No newline at end of file diff --git a/VERAG_REST_SERVER/Controllers/V1/NEWTESTController/NEWTESTController.vb b/VERAG_REST_SERVER/Controllers/V1/NEWTESTController/NEWTESTController.vb deleted file mode 100644 index ad57986..0000000 --- a/VERAG_REST_SERVER/Controllers/V1/NEWTESTController/NEWTESTController.vb +++ /dev/null @@ -1,21 +0,0 @@ -Imports System.Net -Imports System.Web.Http -Imports Microsoft.Web.Http -Imports Newtonsoft.Json - - - - -Namespace NEWTESTController.Controllers - - - - Public Class NEWTEST1Controller - Inherits System.Web.Http.ApiController - - Public Function GetValues() As String - Return "NEWTEST 1111" - End Function - - End Class -End Namespace diff --git a/VERAG_REST_SERVER/Controllers/V1/TestController/TESTController.vb b/VERAG_REST_SERVER/Controllers/V1/TestController/TESTController.vb deleted file mode 100644 index efe26fc..0000000 --- a/VERAG_REST_SERVER/Controllers/V1/TestController/TESTController.vb +++ /dev/null @@ -1,22 +0,0 @@ -Imports System.Net -Imports System.Web.Http -Imports Microsoft.Web.Http -Imports Newtonsoft.Json - - -Namespace ApiController.Controllers - - - - Public Class TESTController - Inherits System.Web.Http.ApiController - - - Public Function GetValues() As String - Return "TEST 1" - End Function - - End Class - - -End Namespace diff --git a/VERAG_REST_SERVER/Controllers/V2/CustomsDeclarationController/CustomDeclarationController.vb b/VERAG_REST_SERVER/Controllers/V2/CustomsDeclarationController/CustomDeclarationController.vb deleted file mode 100644 index f5968de..0000000 --- a/VERAG_REST_SERVER/Controllers/V2/CustomsDeclarationController/CustomDeclarationController.vb +++ /dev/null @@ -1,392 +0,0 @@ -Imports System.Net -Imports System.Web.Http -Imports Microsoft.Web.Http - -Namespace api_CustomsDeclaration.Controllers - - - - Public Class CustomsDeclaration2Controller - Inherits System.Web.Http.ApiController - - Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - Dim EZA As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - EZA.POSITIONS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position) - EZA.POSITIONS(0).DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position_document) - 'EZA.DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_document) - EZA.ADDRESS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen) - - Return EZA - End Function - - - '' GET api/CustomsDeclaration_V001/ - 'Public Function GetValues() As IEnumerable(Of String) - ' Return New String() {"value1", "value2"} - 'End Function - - '' GET api/CustomsDeclaration_V001//5 - 'Public Function GetValue(ByVal id As Integer) As String - ' Return "value" - 'End Function - - ' POST api/CustomsDeclaration_V001/ - 'Public Function PostValue( ByVal value As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza) As Boolean - ' Dim EZA As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza = value - - - 'End Function - - 'Public Function PostValue(ByVal value As String) As String - ' 'Dim file As System.IO.StreamWriter - ' 'file = My.Computer.FileSystem.OpenTextFileWriter("G:\test.txt", True) - ' 'file.WriteLine(value) - ' 'file.Close() - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - ' SQL.doSQL("insert into tbltest (test) Values('000')", "FMZOLL") - - ' Return "asd" & value - 'End Function - - Public Function PostValue(ByVal EZA_FREMD As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza) As String - - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) - - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_START_001_ " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - - Try - - Dim resultJson2 = jsonString.FromClass(EZA_FREMD) - SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson2 & "')", "FMZOLL") - - Catch ex As Exception - - End Try - - - PostValue = "EZA_ERR" - Try - If EZA_FREMD Is Nothing Then Return EZA_Exceptions.ERR_01_Wrong_Format - ' If EZA_FREMD.TransportBorderLicensePlate = "" Then Return EZA_Exceptions.ERR_07_Missing_PlateNr - ' If EZA_FREMD.Reference = "" Then Return EZA_Exceptions.ERR_08_Missing_Reference - - Dim Reference = If(EZA_FREMD.Reference, "") - - Dim EZA_TR = VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL.LOADByReference("ATEZ", Reference, True) - - If EZA_TR Is Nothing Then - EZA_TR = New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA_FREMD) - Else - EZA_TR.setEZA(EZA_FREMD) - End If - - EZA_TR.shTr_Partnersystem = "ATEZ" - EZA_TR.shTr_Status = 5 - 'EZA_TR.shTr_Status_KEWILL_Equivalent = 5 - - EZA_TR.EZA.Company = "VERAG" - EZA_TR.EZA.Department = "SUB" - 'EZA_TR.Reference = "" - - - - - If EZA_TR.SAVE_ALL Then - 'PostValue = "EZA_OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString - 'Dim resultJson = jsonString.FromClass(EZA_FREMD) - 'SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson & "')", "FMZOLL") - 'SQL.doSQL("insert into tbltest (test) Values('ATEZ_EZA_TEST: " & EZA_FREMD.TransportBorderLicensePlate & " - " & EZA_FREMD.Reference & "')", "FMZOLL") - SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_OK - ID: " & EZA_TR.shTr_id & "','" & ip & "')", "FMZOLL") - - Return "OK" - Else - PostValue = EZA_Exceptions.ERR_04_InternalSave - End If - ' Return "TEST3" - - 'SQL.doSQL("insert into tbltest (test) Values('" & "OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "')", "FMZOLL") - - 'MsgBox(resultJson) - 'Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("INTERFACE", "ATEZ", "IN", "EZA_FREMD") - 'DS.uploadDataToDATENSERVER_fromBytes() - - 'Dim client = New RestClient(_baseURI) - 'Dim request = New RestRequest("/datasources/{identifier}/data", Method.GET) - 'request.AddUrlSegment("identifier", _identifier) - 'request.AddHeader("Authorization", "Basic " + _token) - 'Dim jstr = client.Execute(request).Content - 'Dim allDATA As List(Of GeneralInfo) = JsonConvert.DeserializeObject(Of List(Of GeneralInfo))(jstr) - - - - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & EZA_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - SQL.doSQL("insert into tbltest (test) Values('" & EZA_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - Return EZA_Exceptions.ERR_03_InternalVerarb - End Try - - ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - Return PostValue - - - 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - 'Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - 'SQL.doSQL("insert into tbltest (test) Values('C_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "')", "FMZOLL") - - - 'PostValue = "ERR" - 'Try - - ' If EZA Is Nothing Then - ' PostValue = "ERR " & Now.ToShortDateString & "-" & Now.ToShortTimeString - ' Else - ' PostValue = "OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString - - ' 'SQL.doSQL("insert into tbltest (test) Values('" & "OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "')", "FMZOLL") - ' Dim resultJson = jsonString.FromClass(EZA) - ' 'PostValue = resultJson - ' SQL.doSQL("insert into tbltest (test) Values('" & resultJson & "')", "FMZOLL") - - ' 'MsgBox(resultJson) - ' 'Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("INTERFACE", "ATEZ", "IN", "EZA") - ' 'DS.uploadDataToDATENSERVER_fromBytes() - - ' 'Dim client = New RestClient(_baseURI) - ' 'Dim request = New RestRequest("/datasources/{identifier}/data", Method.GET) - ' 'request.AddUrlSegment("identifier", _identifier) - ' 'request.AddHeader("Authorization", "Basic " + _token) - ' 'Dim jstr = client.Execute(request).Content - ' 'Dim allDATA As List(Of GeneralInfo) = JsonConvert.DeserializeObject(Of List(Of GeneralInfo))(jstr) - - - ' End If - - 'Catch ex As Exception - ' ' SQL.doSQL("insert into tbltest (test) Values('" & "ERRNOTHING " & ex.Message & "')", "FMZOLL") - - 'End Try - - '' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - 'Return PostValue - End Function - - - '' POST api/CustomsDeclaration_V001/ - 'Public Sub PostValue( ByVal value As String) - - 'End Sub - - '' PUT api/CustomsDeclaration_V001//5 - 'Public Sub PutValue(ByVal id As Integer, ByVal value As String) - - 'End Sub - - '' DELETE api/CustomsDeclaration_V001//5 - 'Public Sub DeleteValue(ByVal id As Integer) - - 'End Sub - - - - End Class - - - - - - ' - ' - 'Public Class CustomsDeclarationV101Controller - ' Inherits System.Web.Http.ApiController - - ' Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - ' Dim EZA As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - ' EZA.POSITIONS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position) - ' EZA.POSITIONS(0).DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position_document) - ' 'EZA.DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_document) - ' EZA.ADDRESS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen) - - ' Return EZA - ' End Function - - - - ' Public Function PostValue(ByVal EZA_FREMD As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza) As String - ' ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cREST_Options.isTESTSSTEM(Request) - - ' VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - ' Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - ' SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_START_101 " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - - ' Try - - ' Dim resultJson2 = jsonString.FromClass(EZA_FREMD) - ' SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson2 & "')", "FMZOLL") - - ' Catch ex As Exception - ' SQL.doSQL("insert into tbltest (test) Values('ERR:EZA_101_" & ex.Message & "')", "FMZOLL") - - ' End Try - - ' SQL.doSQL("insert into tbltest (test) Values('EZA_101_')", "FMZOLL") - - ' PostValue = "EZA_ERR" - ' Try - ' If EZA_FREMD Is Nothing Then Return EZA_Exceptions.ERR_01_Wrong_Format - ' ' If EZA_FREMD.TransportBorderLicensePlate = "" Then Return EZA_Exceptions.ERR_07_Missing_PlateNr - ' ' If EZA_FREMD.Reference = "" Then Return EZA_Exceptions.ERR_08_Missing_Reference - - ' Dim Reference = If(EZA_FREMD.Reference, "") - - ' Dim EZA_TR = VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL.LOADByReference("ATEZ", Reference, True) - - ' If EZA_TR Is Nothing Then - ' EZA_TR = New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA_FREMD) - ' Else - ' EZA_TR.setEZA(EZA_FREMD) - ' End If - - ' EZA_TR.shTr_Partnersystem = "ATEZ" - ' EZA_TR.shTr_Status = 5 - ' 'EZA_TR.shTr_Status_KEWILL_Equivalent = 5 - - ' EZA_TR.EZA.Company = "VERAG" - ' EZA_TR.EZA.Department = "SUB" - ' 'EZA_TR.Reference = "" - - - ' If EZA_TR.SAVE_ALL Then - ' 'PostValue = "EZA_OK " & Now.ToShortDateString & "-" & Now.ToShortTimeString - ' 'Dim resultJson = jsonString.FromClass(EZA_FREMD) - ' 'SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson & "')", "FMZOLL") - ' 'SQL.doSQL("insert into tbltest (test) Values('ATEZ_EZA_TEST: " & EZA_FREMD.TransportBorderLicensePlate & " - " & EZA_FREMD.Reference & "')", "FMZOLL") - ' SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_OK - ID: " & EZA_TR.shTr_id & "','" & ip & "')", "FMZOLL") - - ' Return "OK" - ' Else - ' PostValue = EZA_Exceptions.ERR_04_InternalSave - ' End If - - - ' Catch ex As Exception - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & EZA_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' SQL.doSQL("insert into tbltest (test) Values('" & EZA_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - ' Return EZA_Exceptions.ERR_03_InternalVerarb - ' End Try - - ' ' SQL.doSQL("insert into tbltest (test) Values('" & PostValue & "')", "FMZOLL") - - ' Return PostValue - - - ' End Function - - - 'End Class - - - - '-------------------------------------------------------------------- - '----------------------------------TEST---------------------------------- - '------------------------------------------------------------------------ - - - ' - ' - 'Public Class CustomsDeclarationV001_TESTController - ' Inherits System.Web.Http.ApiController - - ' Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - ' Dim EZA As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza - ' EZA.POSITIONS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position) - ' EZA.POSITIONS(0).DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_position_document) - ' 'EZA.DOCUMENTS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_document) - ' EZA.ADDRESS.Add(New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_Adressen) - - ' Return EZA - ' End Function - - - - ' Public Function PostValue(ByVal EZA_FREMD As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza) As String - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True - - ' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = Debugger.IsAttached - ' VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - - ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - ' Dim ip = Request.Properties("MS_HttpContext").Request.UserHostAddress() - - ' SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_START " & Now.ToShortDateString & "-" & Now.ToShortTimeString & "','" & ip & "')", "FMZOLL") - - - ' Try - - ' Dim resultJson2 = jsonString.FromClass(EZA_FREMD) - ' SQL.doSQL("insert into tbltest (test) Values('EZA_" & resultJson2 & "')", "FMZOLL") - - ' Catch ex As Exception - - ' End Try - - - ' PostValue = "EZA_ERR" - ' Try - ' If EZA_FREMD Is Nothing Then Return EZA_Exceptions.ERR_01_Wrong_Format - - ' Dim Reference = If(EZA_FREMD.Reference, "") - - ' Dim EZA_TR = VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL.LOADByReference("ATEZ", Reference, True) - - ' If EZA_TR Is Nothing Then - ' EZA_TR = New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(EZA_FREMD) - ' Else - ' EZA_TR.setEZA(EZA_FREMD) - ' End If - - - - ' EZA_TR.shTr_Partnersystem = "ATEZ" - ' EZA_TR.shTr_Status = 5 - ' 'EZA_TR.shTr_Status_KEWILL_Equivalent = 5 - - ' EZA_TR.EZA.Company = "VERAG" - ' EZA_TR.EZA.Department = "SUB" - - - ' If EZA_TR.SAVE_ALL Then - ' SQL.doSQL("insert into tbltest (test,ipaddress) Values('ATEZ_EZA_OK - ID: " & EZA_TR.shTr_id & "','" & ip & "')", "FMZOLL") - - ' Return "OK" - ' Else - ' PostValue = EZA_Exceptions.ERR_04_InternalSave - ' End If - - ' Catch ex As Exception - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & EZA_Exceptions.ERR_03_InternalVerarb, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' SQL.doSQL("insert into tbltest (test) Values('" & EZA_Exceptions.ERR_03_InternalVerarb & ex.Message & "')", "FMZOLL") - ' Return EZA_Exceptions.ERR_03_InternalVerarb - ' End Try - - ' Return PostValue - - ' End Function - - - 'End Class -End Namespace - diff --git a/VERAG_REST_SERVER/Controllers/V2/NEWTESTController/NEWTESTController.vb b/VERAG_REST_SERVER/Controllers/V2/NEWTESTController/NEWTESTController.vb deleted file mode 100644 index 39acb3a..0000000 --- a/VERAG_REST_SERVER/Controllers/V2/NEWTESTController/NEWTESTController.vb +++ /dev/null @@ -1,20 +0,0 @@ -Imports System.Net -Imports System.Web.Http -Imports Microsoft.Web.Http -Imports Newtonsoft.Json - - -Namespace NEWTESTController.Controllers - - - - - Public Class NEWTEST2Controller - Inherits System.Web.Http.ApiController - - Public Function GetValues() As String - Return "NEWTEST 2222" - End Function - - End Class -End Namespace \ No newline at end of file diff --git a/VERAG_REST_SERVER/Controllers/V2/TestController/TESTController.vb b/VERAG_REST_SERVER/Controllers/V2/TestController/TESTController.vb deleted file mode 100644 index 38dc4fb..0000000 --- a/VERAG_REST_SERVER/Controllers/V2/TestController/TESTController.vb +++ /dev/null @@ -1,24 +0,0 @@ -Imports System.Net -Imports System.Web.Http -Imports Microsoft.Web.Http -Imports Newtonsoft.Json - - -Namespace TESTController.Controllers.V2 - - - - - - Public Class TESTController - Inherits System.Web.Http.ApiController - - Public Function GetValues() As String - Return "TEST 2" - End Function - - End Class - - -End Namespace - diff --git a/VERAG_REST_SERVER/My Project/Resources.Designer.vb b/VERAG_REST_SERVER/My Project/Resources.Designer.vb index e073b82..db527af 100644 --- a/VERAG_REST_SERVER/My Project/Resources.Designer.vb +++ b/VERAG_REST_SERVER/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/VERAG_REST_SERVER/My Project/Settings.Designer.vb b/VERAG_REST_SERVER/My Project/Settings.Designer.vb index 91be83e..f355d48 100644 --- a/VERAG_REST_SERVER/My Project/Settings.Designer.vb +++ b/VERAG_REST_SERVER/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/VERAG_REST_SERVER/VERAG_REST_SERVER.vbproj b/VERAG_REST_SERVER/VERAG_REST_SERVER.vbproj index 4ce3ecf..aaee0bf 100644 --- a/VERAG_REST_SERVER/VERAG_REST_SERVER.vbproj +++ b/VERAG_REST_SERVER/VERAG_REST_SERVER.vbproj @@ -1,5 +1,7 @@  + + @@ -14,7 +16,7 @@ Library VERAG_REST_SERVER VERAG_REST_SERVER - v4.7 + v4.8 Custom true @@ -35,6 +37,7 @@ bin\ VERAG_REST_SERVER.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + x64 true @@ -45,8 +48,22 @@ bin\ VERAG_REST_SERVER.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + Off + AnyCPU + + ..\packages\Asp.Versioning.Abstractions.7.0.0\lib\netstandard2.0\Asp.Versioning.Abstractions.dll + + + ..\packages\Asp.Versioning.WebApi.7.1.0\lib\net45\Asp.Versioning.WebApi.dll + + + ..\packages\BCrypt.Net-Next.4.0.3\lib\net462\BCrypt.Net-Next.dll + + + ..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll + ..\packages\Microsoft.AspNet.WebApi.Versioning.4.1.1\lib\net45\Microsoft.AspNet.WebApi.Versioning.dll @@ -84,6 +101,18 @@ ..\packages\Microsoft.AspNetCore.Metadata.7.0.3\lib\net462\Microsoft.AspNetCore.Metadata.dll + + ..\packages\Microsoft.AspNetCore.Mvc.Abstractions.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.Abstractions.dll + + + ..\packages\Microsoft.AspNetCore.Mvc.ApiExplorer.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.ApiExplorer.dll + + + ..\packages\Microsoft.AspNetCore.Mvc.Core.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.Core.dll + + + ..\packages\Microsoft.AspNetCore.Mvc.DataAnnotations.2.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.DataAnnotations.dll + ..\packages\Microsoft.AspNetCore.ResponseCaching.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.ResponseCaching.Abstractions.dll @@ -166,20 +195,20 @@ ..\packages\Microsoft.Net.Http.Headers.2.2.8\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll - - ..\packages\Microsoft.OpenApi.1.6.1\lib\netstandard2.0\Microsoft.OpenApi.dll + + ..\packages\Microsoft.OpenApi.1.6.14\lib\netstandard2.0\Microsoft.OpenApi.dll ..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll + + ..\packages\Microsoft.Owin.FileSystems.4.2.2\lib\net45\Microsoft.Owin.FileSystems.dll ..\packages\Microsoft.Owin.Host.SystemWeb.4.2.2\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - ..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll + + ..\packages\Microsoft.Owin.StaticFiles.4.2.2\lib\net45\Microsoft.Owin.StaticFiles.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -187,30 +216,45 @@ ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll - - ..\packages\Namotion.Reflection.2.1.0\lib\net45\Namotion.Reflection.dll + + ..\packages\Namotion.Reflection.3.1.1\lib\net462\Namotion.Reflection.dll - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\NJsonSchema.10.8.0\lib\net45\NJsonSchema.dll + + ..\packages\NJsonSchema.11.0.2\lib\net462\NJsonSchema.dll - - ..\packages\NSwag.AspNet.Owin.13.18.2\lib\net45\NSwag.AspNet.Owin.dll + + ..\packages\NJsonSchema.Annotations.11.0.2\lib\net462\NJsonSchema.Annotations.dll - - ..\packages\NSwag.Core.13.18.2\lib\net45\NSwag.Core.dll + + ..\packages\NJsonSchema.NewtonsoftJson.11.0.2\lib\net462\NJsonSchema.NewtonsoftJson.dll - - ..\packages\NSwag.Generation.13.18.2\lib\net45\NSwag.Generation.dll + + ..\packages\NSwag.AspNet.Owin.14.1.0\lib\net462\NSwag.AspNet.Owin.dll - - ..\packages\NSwag.Generation.WebApi.13.18.2\lib\net45\NSwag.Generation.WebApi.dll + + ..\packages\NSwag.Core.14.1.0\lib\net462\NSwag.Core.dll + + + ..\packages\NSwag.Generation.14.1.0\lib\net462\NSwag.Generation.dll + + + ..\packages\NSwag.Generation.WebApi.14.1.0\lib\net462\NSwag.Generation.WebApi.dll ..\packages\Owin.1.0\lib\net40\Owin.dll + + ..\packages\Swashbuckle.AspNetCore.Swagger.6.7.1\lib\netstandard2.0\Swashbuckle.AspNetCore.Swagger.dll + + + ..\packages\Swashbuckle.AspNetCore.SwaggerGen.6.7.1\lib\netstandard2.0\Swashbuckle.AspNetCore.SwaggerGen.dll + + + ..\packages\Swashbuckle.AspNetCore.SwaggerUI.6.7.1\lib\netstandard2.0\Swashbuckle.AspNetCore.SwaggerUI.dll + ..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll @@ -250,11 +294,7 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - + @@ -283,12 +323,12 @@ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll @@ -300,10 +340,6 @@ - - False - ..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll - ..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll @@ -342,14 +378,12 @@ - - - - - - - - + + + + + + Global.asax @@ -360,6 +394,7 @@ True Application.myapp + True Microsoft.VisualBasic.Web.MyExtension @@ -412,6 +447,14 @@ {2bbd7643-82a1-481f-a014-eb7fcdeed3b5} NCTSPartnerWorker + + {6C5CFB90-BE10-4824-997D-B494A7CFF565} + VERAGMonitoring + + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN + 10.0 @@ -432,6 +475,9 @@ false + + true + @@ -460,9 +506,13 @@ + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - + + + + + - \ No newline at end of file + + \ No newline at end of file diff --git a/VERAG_REST_SERVER/packages.config b/VERAG_REST_SERVER/packages.config index 26d3401..5fed17f 100644 --- a/VERAG_REST_SERVER/packages.config +++ b/VERAG_REST_SERVER/packages.config @@ -1,5 +1,8 @@  + + + @@ -24,14 +27,19 @@ + + + + - + + @@ -46,31 +54,38 @@ - - - - + + + + - + - + - + - - - - - - - + + + + + + + + + + + + + + - +