diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb index 262a9a2..afb871b 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb @@ -795,7 +795,7 @@ Public Class cDakosyNCTSOut004 End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return LOAD End Function @@ -834,7 +834,7 @@ Public Class cDakosyNCTSOut004 End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return Nothing End Function @@ -853,7 +853,7 @@ Public Class cDakosyNCTSOut004 Return SQL.doSQLVarList(" UPDATE [tblDakosy_NCTSOut004] SET ncts_Status_KEWILL_Equivalent=@ncts_Status_KEWILL_Equivalent,ncts_Status=@ncts_Status WHERE ncts_Id=@ncts_Id ", "FMZOLL", , list) Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End If Return "" @@ -884,7 +884,7 @@ Public Class cDakosyNCTSOut004 Next If loadALL Then - LOAD_GUARANTEE() + LOAD_Guarantee() LOAD_HouseConsignment() LOAD_TransportEquipment() End If @@ -894,7 +894,7 @@ Public Class cDakosyNCTSOut004 End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return LOADByAnmID End Function @@ -935,7 +935,7 @@ Public Class cDakosyNCTSOut004 End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return Nothing End Function @@ -953,7 +953,7 @@ Public Class cDakosyNCTSOut004 Return SQL.doSQLVarList(" UPDATE [tblDakosy_NCTSOut004] SET ncts_Status_KEWILL_Equivalent=@ncts_Status_KEWILL_Equivalent,ncts_Status=@ncts_Status WHERE ncts_Id=@ncts_Id ", "FMZOLL", , list) Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End If Return "" @@ -974,7 +974,7 @@ Public Class cDakosyNCTSOut004 Return (" UPDATE [tblDakosy_NCTSOut004] SET " & str & " WHERE ncts_Id=@ncts_Id ") Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" End Function @@ -995,7 +995,7 @@ Public Class cDakosyNCTSOut004 values = values.Substring(0, values.Length - 1) 'wg. ',' Return (" INSERT INTO tblDakosy_NCTSOut004 (" & str & ") VALUES(" & values & ") ") Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" End Function @@ -1023,7 +1023,7 @@ Public Class cDakosyNCTSOut004 End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub Public Sub LOAD_TransportEquipment() @@ -1049,7 +1049,7 @@ Public Class cDakosyNCTSOut004 End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -1077,7 +1077,7 @@ Public Class cDakosyNCTSOut004 End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -1108,7 +1108,7 @@ Public Class cDakosyNCTSOut004 End Using Return ncts_HOUSE_CONSIGNMENT Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return Nothing End Function @@ -1666,7 +1666,7 @@ Public Class cDakosy_NCTSOut004_Guarantee values = values.Substring(0, values.Length - 1) 'wg. ',' Return (" INSERT INTO tblDakosy_NCTSOut004_Guarantee (" & str & ") VALUES(" & values & ") ") Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" End Function @@ -1759,7 +1759,7 @@ Public Class cDakosy_NCTSOut004_TransportEquipment values = values.Substring(0, values.Length - 1) 'wg. ',' Return (" INSERT INTO tblDakosy_NCTSOut004_TransportEquipment (" & str & ") VALUES(" & values & ") ") Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" End Function @@ -2159,7 +2159,7 @@ Public Class cDakosy_NCTSOut004_HouseConsignment values = values.Substring(0, values.Length - 1) 'wg. ',' Return (" INSERT INTO tblDakosy_NCTSOut004_HouseConsignment (" & str & ") VALUES(" & values & ") ") Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" End Function @@ -2191,7 +2191,7 @@ Public Class cDakosy_NCTSOut004_HouseConsignment End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -2616,7 +2616,8 @@ Public Class cDakosy_NCTSOut004_HouseConsignment_ConsignmentItem values = values.Substring(0, values.Length - 1) 'wg. ',' Return (" INSERT INTO tblDakosy_NCTSOut004_HouseConsignment_ConsignmentItem (" & str & ") VALUES(" & values & ") ") Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" End Function @@ -2647,7 +2648,7 @@ Public Class cDakosy_NCTSOut004_HouseConsignment_ConsignmentItem End Using End Using Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -2733,7 +2734,7 @@ Public Class cDakosy_NCTSOut004_HouseConsignment_ConsignmentItem_Packaging values = values.Substring(0, values.Length - 1) 'wg. ',' Return (" INSERT INTO tblDakosy_NCTSOut004_HouseConsignment_ConsignmentItem_Packaging (" & str & ") VALUES(" & values & ") ") Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" End Function diff --git a/MDM_Worker/cPLOSE.vb b/MDM_Worker/cPLOSE.vb index c1584b8..75a554b 100644 --- a/MDM_Worker/cPLOSE.vb +++ b/MDM_Worker/cPLOSE.vb @@ -251,7 +251,6 @@ Public Class cPLOSE End Function - Public Shared Function GET_Antraege_ByLieferantCode(ByRef LIST As List(Of cPLOSE_USTV_ANTR), LieferantCode As String, von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 4887147..2a71e95 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/VERAGMonitoring/My Project/AssemblyInfo.vb b/VERAGMonitoring/My Project/AssemblyInfo.vb index 1639f37..3031053 100644 --- a/VERAGMonitoring/My Project/AssemblyInfo.vb +++ b/VERAGMonitoring/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/VERAGMonitoring/cSqlDb.vb b/VERAGMonitoring/cSqlDb.vb index 3c97071..9bfe636 100644 --- a/VERAGMonitoring/cSqlDb.vb +++ b/VERAGMonitoring/cSqlDb.vb @@ -370,10 +370,39 @@ Public Class cBrgDb End Function Public Function loadDgvBySqlFromBrgKtoDAKOSYDetails004(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As DataTable - Dim sql As String = "SELECT ncts_MRN,ncts_Status,[nctsGRT_AmountToBeCovered]nctsSA_AbgabenBetrag,[nctsGRT_AmountToBeCovered], ncts_dyaAnmID, ncts_Declarationtype ncts_ArtAnmeldung,ncts_ArtAnmeldung,[nctsGRT_GRN] nctsSA_GRN,ncts_Consignee_IdentificationNumber ncts_Empfaenger_eori,ncts_Consignee_SubsidiaryNumber ncts_Empfaenger_NLNR,ncts_Empfaenger_Name,ncts_Bearbeiter" + Dim sql As String = "SELECT ncts_MRN,ncts_Status,[nctsGRT_AmountToBeCovered]nctsSA_AbgabenBetrag,[nctsGRT_AmountToBeCovered], ncts_dyaAnmID, ncts_Declarationtype ncts_ArtAnmeldung,ncts_Declarationtype,[nctsGRT_GRN] nctsSA_GRN,ncts_Consignee_IdentificationNumber ncts_Empfaenger_eori,ncts_Consignee_SubsidiaryNumber ncts_Empfaenger_NLNR,ncts_Consignee_Name,ncts_Bearbeiter" sql &= " ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],ncts_GrossMass ncts_GesamtRohmasse,0 As ncts_GesamtAnzahlPackstuecke " sql &= " from tblDakosy_NCTSOut004_Guarantee inner join [tblDakosy_NCTSOut004] on ncts_Id = nctsGRT_NctsId" - sql &= " where ncts_Status between '" & statusVon & "' and '" & statusBis & "' AND nctsSA_GRN='" & buergschaft & "' " & where + sql &= " where ncts_Status between '" & statusVon & "' and '" & statusBis & "' AND nctsGRT_GRN='" & buergschaft & "' " & where + 'MsgBox(sql) + While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() + Try + Dim myTable = New DataTable() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand(sql, conn) + Dim dr As SqlDataReader = cmd.ExecuteReader() + myTable.Load(dr) + dr.Close() + End Using + conn.Close() + End Using + Return myTable 'While Schleife wird hier verlassen + Catch ex As Exception + Dim antwort As MsgBoxResult = MsgBox(ex.Message, CType(MsgBoxStyle.RetryCancel + MsgBoxStyle.Exclamation, MsgBoxStyle), + "Problem in Function 'loadDgvBySqlZOLARIS'") + End Try + End While + + Return Nothing + End Function + + + + Public Function loadDgvBySqlFromBrgKt_NCTS_FREMD_Details(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As DataTable + Dim sql As String = "SELECT ncts_MRN,ncts_Status,[nctsGRT_AmountToBeCovered]nctsSA_AbgabenBetrag,[nctsGRT_AmountToBeCovered], ncts_dyaAnmID, ncts_Declarationtype ncts_ArtAnmeldung,ncts_Declarationtype,[nctsGRT_GRN] nctsSA_GRN,ncts_Consignee_IdentificationNumber ncts_Empfaenger_eori,ncts_Consignee_SubsidiaryNumber ncts_Empfaenger_NLNR,ncts_Consignee_Name,ncts_Bearbeiter" + sql &= " ,[ncts_ObjectName],[ncts_Eroeffnung] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],ncts_GrossMass ncts_GesamtRohmasse,0 As ncts_GesamtAnzahlPackstuecke " + sql &= " from tblNCTS_FREMD_Guarantee inner join [tblNCTS_FREMD] on ncts_Id = nctsGRT_NctsId" + sql &= " where ncts_Status between '" & statusVon & "' and '" & statusBis & "' AND nctsGRT_GRN='" & buergschaft & "' " & where 'MsgBox(sql) While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try @@ -614,7 +643,8 @@ Public Class cBrgDb Public Function getBrgSumFromFMZOLL_NCTS_TR(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String Dim tmp_DY As String = getBrgSumFrom_NCTS_TR(datumVon, datumBis, statusVon, statusBis, buergschaft, where) - Return CDbl(tmp_DY) + Dim tmp_FREMD As String = getBrgSumFrom_NCTS_FREMD(datumVon, datumBis, statusVon, statusBis, buergschaft, where) + Return CDbl(tmp_DY) + CDbl(tmp_FREMD) End Function @@ -716,6 +746,39 @@ Public Class cBrgDb End Function + Public Function getBrgSumFrom_NCTS_FREMD(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String + 'Return Nothing + + Dim sql As String = "SELECT sum([nctsGRT_AmountToBeCovered])" + sql &= " from [tblNCTS_FREMD_Guarantee] inner join [tblNCTS_FREMD] on ncts_Id = nctsGRT_NctsId" + sql &= " where [ncts_Eroeffnung] BETWEEN '" & datumVon.ToShortDateString & " 00:00:00' AND '" & datumBis.ToShortDateString & " 23:23:59' AND ncts_Status BETWEEN '" & statusVon & "' AND '" & statusBis & "' AND [nctsGRT_GRN] = '" & buergschaft & "' " & where + 'MsgBox(sql) + Dim dr As SqlDataReader + Dim daten As New List(Of cBuergschaft) + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand(sql, conn) + dr = cmd.ExecuteReader() + Try + Dim cnt As Integer = 0 + If dr.Read Then + If Not dr.GetValue(0) Is DBNull.Value Then + ' MsgBox(dr.GetValue(0)) + Return dr.GetValue(0) + + End If + End If + Return "0" + Catch ex As Exception + MsgBox(System.Reflection.MethodInfo.GetCurrentMethod.Name & ": Fehler mit der Datenbankverbindung:" & vbCrLf & vbCrLf & ex.Message, vbExclamation, "Datenbankfehler") + Finally + dr.Close() + End Try + End Using + End Using + Return Nothing + End Function + + Public Function getBrgSumFrom_NCTS_TR(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String 'Return Nothing Dim sql As String = "SELECT sum(nctsSA_AbgabenBetrag)" @@ -747,6 +810,8 @@ Public Class cBrgDb Return Nothing End Function + + Public Function getBrgSumFrom_TELOTEC(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String 'Return Nothing Dim sql As String = " SELECT sum(tblTelotec_Sicherheit.GVal) diff --git a/VERAGMonitoring/frmShowData.Designer.vb b/VERAGMonitoring/frmShowData.Designer.vb index 8e623e2..1008f27 100644 --- a/VERAGMonitoring/frmShowData.Designer.vb +++ b/VERAGMonitoring/frmShowData.Designer.vb @@ -36,6 +36,7 @@ Partial Class frmShowData Me.Button1 = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() + Me.TabPage5 = New System.Windows.Forms.TabPage() CType(Me.dgv, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.tbcntr.SuspendLayout() @@ -49,12 +50,11 @@ Partial Class frmShowData Me.dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.ColumnHeader Me.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgv.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgv.Location = New System.Drawing.Point(0, 85) - Me.dgv.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.dgv.Location = New System.Drawing.Point(0, 55) Me.dgv.Name = "dgv" Me.dgv.ReadOnly = True Me.dgv.RowHeadersWidth = 62 - Me.dgv.Size = New System.Drawing.Size(1584, 1278) + Me.dgv.Size = New System.Drawing.Size(1056, 831) Me.dgv.TabIndex = 1 ' 'Panel1 @@ -67,27 +67,24 @@ Partial Class frmShowData Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) - Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1584, 85) + Me.Panel1.Size = New System.Drawing.Size(1056, 55) Me.Panel1.TabIndex = 2 ' 'datBIS ' Me.datBIS.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datBIS.Location = New System.Drawing.Point(672, 20) - Me.datBIS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.datBIS.Location = New System.Drawing.Point(448, 13) Me.datBIS.Name = "datBIS" - Me.datBIS.Size = New System.Drawing.Size(139, 26) + Me.datBIS.Size = New System.Drawing.Size(94, 20) Me.datBIS.TabIndex = 4 ' 'datVON ' Me.datVON.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datVON.Location = New System.Drawing.Point(368, 20) - Me.datVON.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.datVON.Location = New System.Drawing.Point(245, 13) Me.datVON.Name = "datVON" - Me.datVON.Size = New System.Drawing.Size(139, 26) + Me.datVON.Size = New System.Drawing.Size(94, 20) Me.datVON.TabIndex = 4 ' 'tbcntr @@ -99,73 +96,67 @@ Partial Class frmShowData Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Controls.Add(Me.NCTS_TR) - Me.tbcntr.Location = New System.Drawing.Point(0, 48) - Me.tbcntr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbcntr.Controls.Add(Me.TabPage5) + Me.tbcntr.Location = New System.Drawing.Point(0, 31) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1580, 40) + Me.tbcntr.Size = New System.Drawing.Size(1053, 26) Me.tbcntr.TabIndex = 3 ' 'TabPage2 ' - Me.TabPage2.Location = New System.Drawing.Point(4, 29) - Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.TabPage2.Size = New System.Drawing.Size(1572, 7) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.TabPage2.Size = New System.Drawing.Size(1045, 0) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "DAKOSY" Me.TabPage2.UseVisualStyleBackColor = True ' 'TabPage1 ' - Me.TabPage1.Location = New System.Drawing.Point(4, 29) - Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.TabPage1.Size = New System.Drawing.Size(1572, 7) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.TabPage1.Size = New System.Drawing.Size(1045, 0) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "BLUJAY" Me.TabPage1.UseVisualStyleBackColor = True ' 'TabPage3 ' - Me.TabPage3.Location = New System.Drawing.Point(4, 29) - Me.TabPage3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(1572, 7) + Me.TabPage3.Size = New System.Drawing.Size(1045, 0) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "EZOLL" Me.TabPage3.UseVisualStyleBackColor = True ' 'TabPage4 ' - Me.TabPage4.Location = New System.Drawing.Point(4, 29) - Me.TabPage4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.TabPage4.Size = New System.Drawing.Size(1572, 7) + Me.TabPage4.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.TabPage4.Size = New System.Drawing.Size(1045, 0) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "TELOTEC" Me.TabPage4.UseVisualStyleBackColor = True ' 'NCTS_TR ' - Me.NCTS_TR.Location = New System.Drawing.Point(4, 29) - Me.NCTS_TR.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.NCTS_TR.Location = New System.Drawing.Point(4, 22) Me.NCTS_TR.Name = "NCTS_TR" - Me.NCTS_TR.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.NCTS_TR.Size = New System.Drawing.Size(1572, 7) + Me.NCTS_TR.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.NCTS_TR.Size = New System.Drawing.Size(1045, 0) Me.NCTS_TR.TabIndex = 4 - Me.NCTS_TR.Text = "NCTS_FREMD" + Me.NCTS_TR.Text = "NCTS_TR" Me.NCTS_TR.UseVisualStyleBackColor = True ' 'Button1 ' - Me.Button1.Location = New System.Drawing.Point(898, 8) - Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.Button1.Location = New System.Drawing.Point(599, 5) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(184, 35) + Me.Button1.Size = New System.Drawing.Size(123, 23) Me.Button1.TabIndex = 1 Me.Button1.Text = "In Excel konvertieren" Me.Button1.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -174,10 +165,9 @@ Partial Class frmShowData 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(1434, 14) - Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label2.Location = New System.Drawing.Point(956, 9) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(62, 20) + Me.Label2.Size = New System.Drawing.Size(42, 13) Me.Label2.TabIndex = 0 Me.Label2.Text = "Anzahl:" Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -186,22 +176,29 @@ Partial Class frmShowData ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(4, 14) - Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Location = New System.Drawing.Point(3, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(111, 20) + Me.Label1.Size = New System.Drawing.Size(75, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Datensätze:" ' + 'TabPage5 + ' + Me.TabPage5.Location = New System.Drawing.Point(4, 22) + Me.TabPage5.Name = "TabPage5" + Me.TabPage5.Size = New System.Drawing.Size(1045, 0) + Me.TabPage5.TabIndex = 5 + Me.TabPage5.Text = "NCTS_FREMD" + Me.TabPage5.UseVisualStyleBackColor = True + ' 'frmShowData ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1584, 1363) + Me.ClientSize = New System.Drawing.Size(1056, 886) Me.Controls.Add(Me.dgv) Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "frmShowData" Me.Text = "Details" CType(Me.dgv, System.ComponentModel.ISupportInitialize).EndInit() @@ -224,4 +221,5 @@ Partial Class frmShowData Friend WithEvents datVON As System.Windows.Forms.DateTimePicker Friend WithEvents TabPage4 As TabPage Friend WithEvents NCTS_TR As TabPage + Friend WithEvents TabPage5 As TabPage End Class diff --git a/VERAGMonitoring/frmShowData.vb b/VERAGMonitoring/frmShowData.vb index a059804..3931c3c 100644 --- a/VERAGMonitoring/frmShowData.vb +++ b/VERAGMonitoring/frmShowData.vb @@ -85,7 +85,7 @@ Public Class frmShowData Case "BRG" Select Case tbcntr.SelectedIndex Case 0 'DY - dgv.DataSource = BRG.loadDgvBySqlFromBrgKtoDAKOSYDetails(datVON.Value.ToShortDateString, datBIS.Value.ToShortDateString, "50", "50", BRG_GRN) + dgv.DataSource = BRG.loadDgvBySqlFromBrgKtoDAKOSYDetails004(datVON.Value.ToShortDateString, datBIS.Value.ToShortDateString, "50", "50", BRG_GRN) If dgv.Columns.Count > 0 Then dgv.Columns("nctsSA_AbgabenBetrag").DefaultCellStyle.Format = "N2" dgv.Columns("ncts_GesamtRohmasse").DefaultCellStyle.Format = "N2" @@ -129,6 +129,16 @@ Public Class frmShowData dgv.Columns("ncts_GesamtRohmasse").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight dgv.Columns("ncts_GesamtAnzahlPackstuecke").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight End If + Case 5 'NCTS_FREMD + dgv.DataSource = BRG.loadDgvBySqlFromBrgKt_NCTS_FREMD_Details(datVON.Value.ToShortDateString, datBIS.Value.ToShortDateString, "50", "50", BRG_GRN) + If dgv.Columns.Count > 0 Then + dgv.Columns("nctsSA_AbgabenBetrag").DefaultCellStyle.Format = "N2" + dgv.Columns("ncts_GesamtRohmasse").DefaultCellStyle.Format = "N2" + dgv.Columns("ncts_GesamtAnzahlPackstuecke").DefaultCellStyle.Format = "N0" + dgv.Columns("nctsSA_AbgabenBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + dgv.Columns("ncts_GesamtRohmasse").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + dgv.Columns("ncts_GesamtAnzahlPackstuecke").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + End If End Select Case "AUFSCHUB" End Select diff --git a/cNCTSPartnerWorker/cTR_NCTS.vb b/cNCTSPartnerWorker/cTR_NCTS.vb index 49bc16a..0773bf0 100644 --- a/cNCTSPartnerWorker/cTR_NCTS.vb +++ b/cNCTSPartnerWorker/cTR_NCTS.vb @@ -118,7 +118,7 @@ Public Class cTR_NCTS '--> EUR If BRG.nctsSA_AbgabenBetragFremdWaehrung IsNot Nothing Then If If(BRG.nctsSA_Waerung, "") <> "EUR" Then - Dim betragEUR = VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse.EXCHANGE_EURTOCUR(BRG.nctsSA_AbgabenBetragFremdWaehrung, BRG.nctsSA_Waerung, NCTS.ncts_Trans_DatumZeit) + Dim betragEUR = VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse.EXCHANGE_CURTOEUR(BRG.nctsSA_AbgabenBetragFremdWaehrung, BRG.nctsSA_Waerung, NCTS.ncts_Trans_DatumZeit) BRG.nctsSA_AbgabenBetrag = If(betragEUR > 0, betragEUR, BRG.nctsSA_AbgabenBetragFremdWaehrung) Else BRG.nctsSA_AbgabenBetrag = BRG.nctsSA_AbgabenBetragFremdWaehrung diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index c338523..4069983 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -27,6 +27,8 @@ Partial Class frmStartOptions Me.pnl = New System.Windows.Forms.Panel() Me.LinkLabel69 = New System.Windows.Forms.LinkLabel() Me.Button26 = New System.Windows.Forms.Button() + Me.Button27 = New System.Windows.Forms.Button() + Me.Button26 = New System.Windows.Forms.Button() Me.txtMRNPrefix = New System.Windows.Forms.TextBox() Me.LinkLabel66 = New System.Windows.Forms.LinkLabel() Me.PictureBox24 = New System.Windows.Forms.PictureBox() @@ -80,6 +82,7 @@ Partial Class frmStartOptions Me.CheckBox3 = New System.Windows.Forms.CheckBox() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.LinkLabel68 = New System.Windows.Forms.LinkLabel() Me.PictureBox26 = New System.Windows.Forms.PictureBox() Me.cbxGestellungspeichern = New System.Windows.Forms.CheckBox() Me.MyTextBox4 = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -322,6 +325,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl @@ -329,6 +333,7 @@ Partial Class frmStartOptions Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnl.Controls.Add(Me.LinkLabel69) + Me.pnl.Controls.Add(Me.Button27) Me.pnl.Controls.Add(Me.Button26) Me.pnl.Controls.Add(Me.txtMRNPrefix) Me.pnl.Controls.Add(Me.LinkLabel66) @@ -412,16 +417,17 @@ Partial Class frmStartOptions Me.pnl.Size = New System.Drawing.Size(1229, 1007) Me.pnl.TabIndex = 0 ' - 'LinkLabel69 + 'Button27 ' - Me.LinkLabel69.AutoSize = True - Me.LinkLabel69.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel69.Location = New System.Drawing.Point(668, 73) - Me.LinkLabel69.Name = "LinkLabel69" - Me.LinkLabel69.Size = New System.Drawing.Size(121, 13) - Me.LinkLabel69.TabIndex = 140 - Me.LinkLabel69.TabStop = True - Me.LinkLabel69.Text = "LandKZ in Steuertabelle" + Me.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button27.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button27.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button27.Location = New System.Drawing.Point(1062, 459) + Me.Button27.Name = "Button27" + Me.Button27.Size = New System.Drawing.Size(123, 24) + Me.Button27.TabIndex = 140 + Me.Button27.Text = "test ATEZ" + Me.Button27.UseVisualStyleBackColor = True ' 'Button26 ' @@ -432,7 +438,7 @@ Partial Class frmStartOptions Me.Button26.Name = "Button26" Me.Button26.Size = New System.Drawing.Size(123, 24) Me.Button26.TabIndex = 139 - Me.Button26.Text = "test ATEZ" + Me.Button26.Text = "NCTS Einlesen" Me.Button26.UseVisualStyleBackColor = True ' 'txtMRNPrefix @@ -1069,6 +1075,7 @@ Partial Class frmStartOptions ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.LinkLabel68) Me.TabPage1.Controls.Add(Me.PictureBox26) Me.TabPage1.Controls.Add(Me.cbxGestellungspeichern) Me.TabPage1.Controls.Add(Me.MyTextBox4) @@ -1127,6 +1134,17 @@ Partial Class frmStartOptions Me.TabPage1.Text = "Zollverfahren" Me.TabPage1.UseVisualStyleBackColor = True ' + 'LinkLabel68 + ' + Me.LinkLabel68.AutoSize = True + Me.LinkLabel68.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel68.Location = New System.Drawing.Point(760, 37) + Me.LinkLabel68.Name = "LinkLabel68" + Me.LinkLabel68.Size = New System.Drawing.Size(52, 13) + Me.LinkLabel68.TabIndex = 140 + Me.LinkLabel68.TabStop = True + Me.LinkLabel68.Text = "KN8 EZT" + ' 'PictureBox26 ' Me.PictureBox26.BackgroundImage = CType(resources.GetObject("PictureBox26.BackgroundImage"), System.Drawing.Image) @@ -3772,6 +3790,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -4037,4 +4056,5 @@ Partial Class frmStartOptions Friend WithEvents Button26 As Button Friend WithEvents LinkLabel69 As LinkLabel Friend WithEvents LinkLabel70 As LinkLabel + Friend WithEvents Button27 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 0d99ed6..be3d98d 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -5414,7 +5414,7 @@ Public Class frmStartOptions End Sub - Private Sub LinkLabel67_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel68.LinkClicked + Private Sub LinkLabel68_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel68.LinkClicked Me.Cursor = Cursors.WaitCursor Try Dim erg = VERAG_PROG_ALLGEMEIN.cTariffKN8_Interface.UPDATE_KN8() @@ -5427,7 +5427,12 @@ Public Class frmStartOptions ' VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.query_declarations(CDate("01.01.2024"), CDate("31.12.2024")) 'End Sub Private Sub Button26_Click(sender As Object, e As EventArgs) Handles Button26.Click + VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.query_declarations("01.12.2024", "31.12.2024") + End Sub + + Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.get_ie015_xml_by_mrn("24TR34340000000145") + End Sub Private Sub LinkLabel70_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel70.LinkClicked