diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb index c5dab6ba..8e692a6a 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb @@ -434,9 +434,9 @@ Partial Class usrcntlVollmacht_DE_indirekt Me.lblVollmachtDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblVollmachtDE.Location = New System.Drawing.Point(43, 9) Me.lblVollmachtDE.Name = "lblVollmachtDE" - Me.lblVollmachtDE.Size = New System.Drawing.Size(118, 20) + Me.lblVollmachtDE.Size = New System.Drawing.Size(193, 20) Me.lblVollmachtDE.TabIndex = 1 - Me.lblVollmachtDE.Text = "Vollmacht DE" + Me.lblVollmachtDE.Text = "Vollmacht DE - indirekt" ' 'btnDown ' diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 1d499121..78c5c35a 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1959,7 +1959,9 @@ Public Class FormularManagerNEU listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 80, 90, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 80, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT)) + + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVmDat.Text, 25, 260, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT)) If usrCntl.txtOrt.Text <> "" Then @@ -1990,13 +1992,30 @@ Public Class FormularManagerNEU listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "") End If + Dim dat As Date = Now + + If IsDate(usrCntl.txtVmDat.Text) Then + dat = CDate(usrCntl.txtVmDat.Text) + End If + + If dat < CDate("01.01.2023") Then + + Select Case usrCntl.cboSprache._value + Case "EN" + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_EN_001", listTowrite) + Case Else + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_001", listTowrite) + End Select + Else + Select Case usrCntl.cboSprache._value + Case "EN" + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_EN", listTowrite) + Case Else + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT", listTowrite) + End Select + + End If - Select Case usrCntl.cboSprache._value - Case "EN" - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_EN", listTowrite) - Case Else - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT", listTowrite) - End Select Return "" End Function diff --git a/SDL/Resources/Zoll/EORI_UID.dotx b/SDL/Resources/Zoll/EORI_UID.dotx new file mode 100644 index 00000000..365c4236 Binary files /dev/null and b/SDL/Resources/Zoll/EORI_UID.dotx differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 3a2340d8..dbed160f 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4909,6 +4909,9 @@ + + Always + Reference.map diff --git a/SDL/kunden/frmKundenUIDEORI_List.Designer.vb b/SDL/kunden/frmKundenUIDEORI_List.Designer.vb index 322c6dcf..121abf91 100644 --- a/SDL/kunden/frmKundenUIDEORI_List.Designer.vb +++ b/SDL/kunden/frmKundenUIDEORI_List.Designer.vb @@ -25,7 +25,10 @@ Partial Class frmKundenUIDEORI_List Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenUIDEORI_List)) Me.dgv = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Button1 = New System.Windows.Forms.Button() CType(Me.dgv, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'dgv @@ -44,23 +47,49 @@ Partial Class frmKundenUIDEORI_List Me.dgv.ReadOnly = True Me.dgv.RowHeadersVisible = False Me.dgv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgv.Size = New System.Drawing.Size(800, 450) + Me.dgv.Size = New System.Drawing.Size(800, 391) Me.dgv.TabIndex = 0 ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.Button1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Panel1.Location = New System.Drawing.Point(0, 391) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(800, 59) + Me.Panel1.TabIndex = 1 + ' + 'Button1 + ' + Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button1.Image = Global.SDL.My.Resources.Resources.android_note12 + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.Button1.Location = New System.Drawing.Point(704, 7) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 49) + Me.Button1.TabIndex = 0 + Me.Button1.Text = "Bericht" + Me.Button1.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.Button1.UseVisualStyleBackColor = True + ' 'frmKundenUIDEORI_List ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) Me.Controls.Add(Me.dgv) + Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmKundenUIDEORI_List" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Liste" CType(Me.dgv, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) Me.ResumeLayout(False) End Sub Friend WithEvents dgv As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Panel1 As Panel + Friend WithEvents Button1 As Button End Class diff --git a/SDL/kunden/frmKundenUIDEORI_List.vb b/SDL/kunden/frmKundenUIDEORI_List.vb index 4d8bc8bc..a6a0c5f9 100644 --- a/SDL/kunden/frmKundenUIDEORI_List.vb +++ b/SDL/kunden/frmKundenUIDEORI_List.vb @@ -1,3 +1,108 @@ -Public Class frmKundenUIDEORI_List + +Imports Microsoft.Office.Interop +Public Class frmKundenUIDEORI_List + Dim ART = "" 'UID/EORI + Dim kdNr As Integer = 0 + Dim kundenSQL As New kundenSQL + Private Sub frmKundenUIDEORI_List_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + ' genReport() + + Select Case ART + Case "UID" + Case "EORI" + End Select + End Sub + + + Public Function genReport(dt As DataTable) As Microsoft.Office.Interop.Word.Document + Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing + Try + Dim pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\Zoll\EORI_UID.dotx" + ' Select Case language + 'Case "DE" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_DE.dotx" + 'Case "YU" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_YU.dotx" + 'Case "RO" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_RO.dotx" + 'Case "TR" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_TR.dotx" + 'Case Else : MsgBox("Keine Sprache ausgewählt!") : Return odoc + ' End Select + + Dim cGenWord As New cGenWord + Dim oWord As New Microsoft.Office.Interop.Word.Application + odoc = cGenWord.openWord(pfadWord, True, oWord) + + + ' Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr=210 AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'") + Dim KUNDE = kundenSQL.getKundeFMZOLLByKdNr(kdNr) + If KUNDE Is Nothing Then MsgBox("Kunde nicht gefunden!") : Return odoc + ' Dim PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr) + + Dim oTable As Word.Table + + odoc.FormFields("Adresse1").Range.Text = KUNDE.Name_1 & " " & If(KUNDE.Name_2, "") + odoc.FormFields("Adresse2").Range.Text = KUNDE.Straße + odoc.FormFields("Adresse3").Range.Text = KUNDE.LandKz & " " & KUNDE.PLZ & " " & KUNDE.Ort + If KUNDE.Telefax <> "" Then + odoc.FormFields("Adresse5").Range.Text = "FAX: " & KUNDE.Telefax + ElseIf KUNDE.E_Mail <> "" Then + odoc.FormFields("Adresse5").Range.Text = "E-Mail: " & KUNDE.E_Mail + End If + + + ' odoc.FormFields("KdNrVERAG").Range.Text = KUNDE.KundenNr + ' odoc.FormFields("KdNrMST").Range.Text = PartnerKdNrFromFMZOLL.MSEKundenNr + odoc.FormFields("Datum").Range.Text = Now.ToShortDateString + odoc.FormFields("KundenNr").Range.Text = KUNDE.AdressenNr + odoc.FormFields("AuftragsNr").Range.Text = ART + + Dim pinVisible = False + If odoc.Range.Bookmarks.Exists("TabelleKarten") Then + If odoc.Bookmarks("TabelleKarten").Range.Tables.Count > 0 Then + oTable = odoc.Bookmarks("TabelleKarten").Range.Tables(1) + Dim i = 1 + Dim kfzTmp = "" + ' MsgBox(dt.Rows.Count) + For Each r As DataRow In dt.Rows + If r("KfzKennzeichen").ToString <> "" Or r("KartenNr").ToString <> "" Then + If cSqlDb.checkNullStr(r("KfzKennzeichen")) <> kfzTmp Then + kfzTmp = cSqlDb.checkNullStr(r("KfzKennzeichen")) + oTable.Rows(i + 1).Cells(1).Range.Text = kfzTmp + Else + oTable.Rows(i + 1).Cells(1).Range.Text = "" + End If + oTable.Rows(i + 1).Cells(2).Range.Text = cSqlDb.checkNullStr(r("KarteBoxBezeichnung")) + oTable.Rows(i + 1).Cells(3).Range.Text = cSqlDb.checkNullStr(r("KartenNr")) + oTable.Rows(i + 1).Cells(4).Range.Text = cSqlDb.checkNullStr(r("PIN")) + If i < dt.Rows.Count Then oTable.Rows.Add() + ' MsgBox(cSqlDb.checkNullStr(r("KarteBoxBezeichnung"))) + i += 1 + + + End If + Next + End If + Else + MessageBox.Show("Textmarke nicht vorhanden!") + End If + + + odoc.Save() : odoc.Activate() + + 'If autodruck Then + ' Dim t As New Threading.Thread(Sub() + ' Print(odoc, PrinterName) + ' End Sub) + ' t.IsBackground = True + ' t.Start() + 'End If + + Catch ex As Exception + MessageBox.Show(ex.ToString) + End Try + Return odoc + End Function End Class \ No newline at end of file