diff --git a/TELOTEK_Worker_lib/cTC_Functions.vb b/TELOTEK_Worker_lib/cTC_Functions.vb index 791e773..c8743dd 100644 --- a/TELOTEK_Worker_lib/cTC_Functions.vb +++ b/TELOTEK_Worker_lib/cTC_Functions.vb @@ -24,7 +24,7 @@ Public Class cTC_Functions Dim destFilenameTMP = UPLOAD_PFAD + "." & If(IO.File.Exists(UPLOAD_PFAD & "." & fi.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & fi.Name - MsgBox(destFilenameTMP) + ' MsgBox(destFilenameTMP) 'Datei hochladen IO.File.Copy(file, destFilenameTMP) ' If IO.File.Exists(destFilenameTMP) Then IO.File.Delete(F) 'Datei nach erfolgreichem Herunterladen vom Server löschen diff --git a/TELOTEK_Worker_lib/cTelokec.vb b/TELOTEK_Worker_lib/cTelokec.vb index c19bbbe..64701ca 100644 --- a/TELOTEK_Worker_lib/cTelokec.vb +++ b/TELOTEK_Worker_lib/cTelokec.vb @@ -186,7 +186,7 @@ Public Class cTelotec_Anmeldung Case "ATILLA" Me.[Mandant_ID] = "Atilla" Case Else - Me.[Mandant_ID] = "VER" + Me.[Mandant_ID] = "VERCUS" End Select Me.[Bereich_ID] = 0 @@ -1158,6 +1158,10 @@ Public Class cTelotec_Anmeldung Dim sqlstr = " DELETE FROM [tblTelotec_PositionsdatenDokumente] WHERE telposAbg_telanmId =" & Me.telanm_id & " " Return SQL.doSQL(sqlstr, "FMZOLL") End Function + Function DELETE_PositionsdatenMasseinheiten() As Boolean 'obj As Object, tablename As String, where As String) As Boolean + Dim sqlstr = " DELETE FROM [tblTelotec_PositionsdatenMasseinheiten] WHERE telposAbg_telanmId =" & Me.telanm_id & " " + Return SQL.doSQL(sqlstr, "FMZOLL") + End Function Function DELETE_Positionsdaten() As Boolean 'obj As Object, tablename As String, where As String) As Boolean Dim sqlstr = " DELETE FROM [tblTelotec_Positionsdaten] WHERE telpos_telanmId =" & Me.telanm_id & " " @@ -1211,7 +1215,7 @@ Public Class cTelotec_Anmeldung Public Function SAVE_Positionsdaten() As Boolean 'Zuserst alle OffertenPos von dem Offert löschen - If DELETE_Positionsdaten() And DELETE_Packstücke() And DELETE_PositionsdatenAbgaben() And DELETE_PositionsdatenDokumente() Then 'And DELETE_PositionsdatenUnterlagen() And DELETE_PositionsdatenVerbrauchssteuer() Then + If DELETE_Positionsdaten() And DELETE_Packstücke() And DELETE_PositionsdatenAbgaben() And DELETE_PositionsdatenDokumente() And DELETE_PositionsdatenMasseinheiten() Then 'And DELETE_PositionsdatenUnterlagen() And DELETE_PositionsdatenVerbrauchssteuer() Then 'jetzt die Standartofferten einfügen For Each p In POSITIONSDATEN p.telpos_telanmId = telanm_id @@ -1225,6 +1229,7 @@ Public Class cTelotec_Anmeldung p.INSERT_Packstücke(p.telpos_id, Me.telanm_id) p.INSERT_Abgaben(p.telpos_id, Me.telanm_id) p.INSERT_Dokumente(p.telpos_id, Me.telanm_id) + p.INSERT_Masseinheiten(p.telpos_id, Me.telanm_id) 'p.INSERT_PositionsdatenUnterlagen(p.ezaWP_Id, Me.eza_Id) 'p.INSERT_PositionsdatenVerbrauchssteuer(p.ezaWP_Id, Me.eza_Id) Else @@ -1274,6 +1279,7 @@ Public Class cTelotec_Positionsdaten Property PACKSTUECKE As New List(Of cTelotec_Packstuecke) Property ABGABEN As New List(Of cTelotec_PositionsdatenAbgaben) Property DOC_CERTS As New List(Of cTelotec_PositionsdatenDokumente) + Property MASSEINHEITEN As New List(Of cTelotec_PositionsdatenMasseinheiten) Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -1373,6 +1379,14 @@ Public Class cTelotec_Positionsdaten Next Return True End Function + Public Function INSERT_Masseinheiten(telpos_id, telanm_id) As Boolean + For Each p In MASSEINHEITEN + p.telposAbg_telanmId = telanm_id + p.telposAbg_telposId = telpos_id + If Not p.INSERT() Then Return False + Next + Return True + End Function Public Sub LOAD_Abgaben() Try @@ -1426,6 +1440,32 @@ Public Class cTelotec_Positionsdaten MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) End Try End Sub + Public Sub LOAD_Masseinheiten() + Try + MASSEINHEITEN.Clear() + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblTelotec_PositionsdatenMasseinheiten WHERE telposabg_telposId=@telpos_id ", conn) + cmd.Parameters.AddWithValue("@telpos_id", Me.telpos_id) + Dim dr = cmd.ExecuteReader() + While dr.Read + Dim l As New cTelotec_PositionsdatenMasseinheiten + For Each i In l.getParameterList() + Dim propInfo As PropertyInfo = l.GetType.GetProperty(i.Scalarvariable) + If dr.Item(i.Text) Is DBNull.Value Then + propInfo.SetValue(l, Nothing) + Else + propInfo.SetValue(l, dr.Item(i.Text)) + End If + Next + MASSEINHEITEN.Add(l) + End While + dr.Close() + 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) + End Try + End Sub Public Function getInsertCmd() As String Try @@ -1774,6 +1814,80 @@ End Class +Public Class cTelotec_PositionsdatenMasseinheiten + + + Property telposAbg_id As Integer + Property telposAbg_telposId As Integer + Property telposAbg_telanmId As Integer + Property Mandant_ID As Object = Nothing + Property Bereich_ID As Object = Nothing + Property Referenz_ID As Object = Nothing + Property ComIndicator As Boolean + Property Pos_ID As Integer + + Property SupplUnt_ID As Object = Nothing + Property SupplUnt_Unit As Object = Nothing + Property SupplUnt_SUQuant As Object = Nothing + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Sub New() + End Sub + + + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_id", telposAbg_id, , True, True)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_telposId", telposAbg_telposId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("telposAbg_telanmId", telposAbg_telanmId)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Mandant_ID", Mandant_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bereich_ID", Bereich_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Referenz_ID", Referenz_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ComIndicator", ComIndicator)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Pos_ID", Pos_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SupplUnt_ID", SupplUnt_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SupplUnt_Unit", SupplUnt_Unit)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SupplUnt_SUQuant", SupplUnt_SUQuant)) + Return list + End Function + + + Public Function INSERT() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + 'Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", , list) + telposAbg_id = SQL.doSQLVarListID(telposAbg_id, getInsertCmd, "FMZOLL", , list) + Return telposAbg_id > 0 + End Function + + + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblTelotec_Positionsdaten_Masseinheiten (" & 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) + End Try + Return "" + End Function + +End Class + + + Public Class cTelotec_PositionsdatenDokumente diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 9fc454d..cce964b 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -72,6 +72,8 @@ 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.LinkLabel67 = New System.Windows.Forms.LinkLabel() + Me.PictureBox26 = New System.Windows.Forms.PictureBox() Me.cbxGestellungspeichern = New System.Windows.Forms.CheckBox() Me.Label41 = New System.Windows.Forms.Label() Me.LinkLabel99 = New System.Windows.Forms.LinkLabel() @@ -281,8 +283,7 @@ Partial Class frmStartOptions Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.LinkLabel67 = New System.Windows.Forms.LinkLabel() - Me.PictureBox26 = New System.Windows.Forms.PictureBox() + Me.Button26 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() @@ -290,6 +291,7 @@ Partial Class frmStartOptions CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() + CType(Me.PictureBox26, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox99, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox17, System.ComponentModel.ISupportInitialize).BeginInit() @@ -323,6 +325,7 @@ Partial Class frmStartOptions ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.Button26) Me.pnl.Controls.Add(Me.txtMRNPrefix) Me.pnl.Controls.Add(Me.LinkLabel66) Me.pnl.Controls.Add(Me.PictureBox24) @@ -923,7 +926,6 @@ Partial Class frmStartOptions ' 'TabPage1 ' - Me.TabPage1.Controls.Add(Me.LinkLabel67) Me.TabPage1.Controls.Add(Me.PictureBox26) Me.TabPage1.Controls.Add(Me.cbxGestellungspeichern) Me.TabPage1.Controls.Add(Me.MyTextBox4) @@ -982,6 +984,28 @@ Partial Class frmStartOptions Me.TabPage1.Text = "Zollverfahren" Me.TabPage1.UseVisualStyleBackColor = True ' + 'LinkLabel67 + ' + Me.LinkLabel67.AutoSize = True + Me.LinkLabel67.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel67.Location = New System.Drawing.Point(772, 37) + Me.LinkLabel67.Name = "LinkLabel67" + Me.LinkLabel67.Size = New System.Drawing.Size(52, 13) + Me.LinkLabel67.TabIndex = 140 + Me.LinkLabel67.TabStop = True + Me.LinkLabel67.Text = "KN8 EZT" + ' + 'PictureBox26 + ' + Me.PictureBox26.BackgroundImage = CType(resources.GetObject("PictureBox26.BackgroundImage"), System.Drawing.Image) + Me.PictureBox26.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox26.Location = New System.Drawing.Point(837, 32) + Me.PictureBox26.Name = "PictureBox26" + Me.PictureBox26.Size = New System.Drawing.Size(18, 18) + Me.PictureBox26.TabIndex = 141 + Me.PictureBox26.TabStop = False + Me.PictureBox26.Visible = False + ' 'cbxGestellungspeichern ' Me.cbxGestellungspeichern.AutoSize = True @@ -3665,6 +3689,17 @@ Partial Class frmStartOptions Me.LinkLabel67.TabIndex = 151 Me.LinkLabel67.TabStop = True Me.LinkLabel67.Text = "Ländercode ISO2 einfügen" + 'Button26 + ' + Me.Button26.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button26.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button26.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button26.Location = New System.Drawing.Point(1062, 429) + Me.Button26.Name = "Button26" + Me.Button26.Size = New System.Drawing.Size(123, 24) + Me.Button26.TabIndex = 139 + Me.Button26.Text = "test ATEZ" + Me.Button26.UseVisualStyleBackColor = True ' 'frmStartOptions ' @@ -3688,6 +3723,7 @@ Partial Class frmStartOptions Me.tbcntr.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + CType(Me.PictureBox26, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox99, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox17, System.ComponentModel.ISupportInitialize).EndInit() @@ -3979,4 +4015,5 @@ Partial Class frmStartOptions Friend WithEvents cbxUTATestkunden As CheckBox Friend WithEvents LinkLabel67 As LinkLabel Friend WithEvents PictureBox26 As PictureBox + Friend WithEvents Button26 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 344ce48..5daa1d6 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -5425,4 +5425,11 @@ Public Class frmStartOptions Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try Me.Cursor = Cursors.Default End Sub + + 'Private Sub Button26_Click(sender As Object, e As EventArgs) Handles Button26.Click + ' 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.get_ie015_xml_by_mrn("24TR34340000000145") + End Sub End Class \ No newline at end of file