ATB QR

2024-10-30 13:46:43 +01:00
parent 0ce0181350
commit 82cd82243a
7 changed files with 86 additions and 89 deletions
--- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
@@ -22,9 +22,12 @@ Partial Class frmSendungAnhangImport
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungAnhangImport))
        Me.lbl = New System.Windows.Forms.Label()
        Me.flpnlAviso = New System.Windows.Forms.FlowLayoutPanel()
+        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
+        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
        Me.flpnlSendungen = New System.Windows.Forms.FlowLayoutPanel()
        Me.lblSendungen = New System.Windows.Forms.Label()
        Me.lblImport = New System.Windows.Forms.Label()
@@ -46,7 +49,7 @@ Partial Class frmSendungAnhangImport
        Me.lblSeiten = New System.Windows.Forms.Label()
        Me.cbxDelPDF = New System.Windows.Forms.CheckBox()
        Me.btnAdd = New System.Windows.Forms.Button()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DateiScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AusZwischenablageeinfügenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -54,6 +57,7 @@ Partial Class frmSendungAnhangImport
        Me.pnl = New System.Windows.Forms.Panel()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.PdfViewer = New Spire.PdfViewer.Forms.PdfViewer()
+        Me.WebBrowser = New System.Windows.Forms.WebBrowser()
        Me.Button3 = New System.Windows.Forms.Button()
        Me.btnSndDel = New System.Windows.Forms.Button()
        Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
@@ -68,9 +72,6 @@ Partial Class frmSendungAnhangImport
        Me.Button17 = New System.Windows.Forms.Button()
        Me.lblRgPreis = New System.Windows.Forms.Label()
        Me.pnlSendung = New System.Windows.Forms.Panel()
-        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
-        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
-        Me.WebBrowser = New System.Windows.Forms.WebBrowser()
        Me.flpnlAviso.SuspendLayout()
        Me.pnlAnfuegen.SuspendLayout()
        Me.cntxt.SuspendLayout()
@@ -102,6 +103,38 @@ Partial Class frmSendungAnhangImport
        Me.flpnlAviso.Size = New System.Drawing.Size(200, 825)
        Me.flpnlAviso.TabIndex = 7
        '
+        'UsrCntlSendungAnhangElement1
+        '
+        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_SIZE = "False"
+        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
+        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
+        '
+        'UsrCntlSendungAnhangElement2
+        '
+        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_SIZE = "False"
+        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
+        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
+        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
+        '
        'flpnlSendungen
        '
        Me.flpnlSendungen.AllowDrop = True
@@ -463,6 +496,7 @@ Partial Class frmSendungAnhangImport
        Me.PdfViewer.FindTextHighLightColor = System.Drawing.Color.FromArgb(CType(CType(200, Byte), Integer), CType(CType(153, Byte), Integer), CType(CType(193, Byte), Integer), CType(CType(218, Byte), Integer))
        Me.PdfViewer.FormFillEnabled = False
        Me.PdfViewer.IgnoreCase = False
+        Me.PdfViewer.ImeMode = System.Windows.Forms.ImeMode.NoControl
        Me.PdfViewer.IsToolBarVisible = True
        Me.PdfViewer.Location = New System.Drawing.Point(0, 0)
        Me.PdfViewer.MultiPagesThreshold = 60
@@ -473,6 +507,15 @@ Partial Class frmSendungAnhangImport
        Me.PdfViewer.Threshold = 60
        Me.PdfViewer.ViewerBackgroundColor = System.Drawing.Color.FromArgb(CType(CType(229, Byte), Integer), CType(CType(229, Byte), Integer), CType(CType(229, Byte), Integer))
        '
+        'WebBrowser
+        '
+        Me.WebBrowser.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.WebBrowser.Location = New System.Drawing.Point(0, 0)
+        Me.WebBrowser.MinimumSize = New System.Drawing.Size(20, 20)
+        Me.WebBrowser.Name = "WebBrowser"
+        Me.WebBrowser.Size = New System.Drawing.Size(844, 655)
+        Me.WebBrowser.TabIndex = 1
+        '
        'Button3
        '
        Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -631,45 +674,6 @@ Partial Class frmSendungAnhangImport
        Me.pnlSendung.Size = New System.Drawing.Size(243, 860)
        Me.pnlSendung.TabIndex = 0
        '
-        'UsrCntlSendungAnhangElement1
-        '
-        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
-        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
-        '
-        'UsrCntlSendungAnhangElement2
-        '
-        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
-        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
-        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
-        '
-        'WebBrowser
-        '
-        Me.WebBrowser.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.WebBrowser.Location = New System.Drawing.Point(0, 0)
-        Me.WebBrowser.MinimumSize = New System.Drawing.Size(20, 20)
-        Me.WebBrowser.Name = "WebBrowser"
-        Me.WebBrowser.Size = New System.Drawing.Size(844, 655)
-        Me.WebBrowser.TabIndex = 1
-        '
        'frmSendungAnhangImport
        '
        Me.AllowDrop = True
--- a/Aviso/AvisoReports/rptQRAviso.vb
+++ b/Aviso/AvisoReports/rptQRAviso.vb
@@ -52,9 +52,9 @@ Public Class rptQRAviso
        txtGrenze.Text = AVISO.Grenzstelle
        txtFraechter.Text = AVISO.Fr<EFBFBD>chter
        ' QR.Image = getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(AVISO.AvisoID))
-        QR.Image = getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID))
+        QR.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID))

-        picQRAviso.Image = getBARCODEAviso(AVISO.AvisoID)
+        picQRAviso.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getBARCODEAviso(AVISO.AvisoID)


        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -98,41 +98,5 @@ Public Class rptQRAviso

    End Sub

-    Function getQRCode(QRtext As String, Optional QZSize As Integer = 4, Optional QRVersion As Integer = 7, Optional CorrectionLevel As QRCodeEncoder.ERROR_CORRECTION = QRCodeEncoder.ERROR_CORRECTION.M, Optional encoding As QRCodeEncoder.ENCODE_MODE = QRCodeEncoder.ENCODE_MODE.BYTE) As Image
-        Dim qrCodeEncoder As QRCodeEncoder = New QRCodeEncoder()
-
-        qrCodeEncoder.QRCodeEncodeMode = encoding
-
-        Try
-            Dim scale As Integer = Convert.ToInt16(QZSize)
-            qrCodeEncoder.QRCodeScale = scale
-        Catch ex As Exception
-            MessageBox.Show("Invalid size!")
-            Return Nothing
-        End Try
-
-        Try
-            Dim version As Integer = Convert.ToInt16(QRVersion)
-            qrCodeEncoder.QRCodeVersion = version
-        Catch ex As Exception
-            MessageBox.Show("Invalid version !")
-        End Try
-
-        Dim errorCorrect As String = CorrectionLevel
-
-        qrCodeEncoder.QRCodeErrorCorrect = CorrectionLevel
-
-        Dim image As Image
-        Dim data As String = QRtext
-        image = qrCodeEncoder.Encode(data)
-        Return image
-    End Function
-
-    Function getBARCODEAviso(AvisoID As String) As Image
-        Dim barcode As Image = Code128Rendering.MakeBarcodeImage("/" & AvisoID & "/", 1, True, 25)
-        '  barcode.RotateFlip(RotateFlipType.Rotate90FlipNone)
-
-        Return barcode
-    End Function

 End Class
--- a/Aviso/Classes/cSendungsoptions.vb
+++ b/Aviso/Classes/cSendungsoptions.vb
@@ -163,6 +163,13 @@ Public Class SendungOptions
        If barcodeLKW IsNot Nothing Then VALUES.barcodeLKW = barcodeLKW
        If barcode IsNot Nothing Then VALUES.barcodeSendung = barcode

+        Dim imgQR As Image = Nothing
+        If SENDUNG.tblSnd_Abfertigungsart_ID.ToString = "44" Then
+            imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID))
+            'imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) & "&SendungId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(SENDUNG.tblSnd_SendungID))
+        End If
+        If barcode IsNot Nothing Then VALUES.imgQR = imgQR
+
        VALUES.ABF_ART = SENDUNG.tblSnd_Abfertigungsart_ID
        VALUES.Abfertigungsnummer = SENDUNG.AbfertigungsNr
        VALUES.FilialeNr = SENDUNG.FilialenNr
@@ -172,7 +179,7 @@ Public Class SendungOptions
        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("RPT_SND_Grenzstelle") Then
            If AVISO.Zollstelle IsNot Nothing AndAlso AVISO.Zollstelle <> "" Then
                '                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
-                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+            VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")

            Else
                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("4.0.4.3")>
-<Assembly: AssemblyFileVersion("4.0.4.3")>
+<Assembly: AssemblyVersion("4.0.4.4")>
+<Assembly: AssemblyFileVersion("4.0.4.4")>
--- a/Gemeinsames/rptSendungen.Designer.vb
+++ b/Gemeinsames/rptSendungen.Designer.vb
--- a/Gemeinsames/rptSendungen.resx
+++ b/Gemeinsames/rptSendungen.resx
--- a/Gemeinsames/rptSendungen.vb
+++ b/Gemeinsames/rptSendungen.vb
@@ -180,6 +180,7 @@ Public Class rptSendungen
        End If

        barcodeSendung.Image = If(VALUES.barcodeSendung, Nothing)
+        picQR.Image = If(VALUES.imgQR, Nothing)


        'OFFERTE!
@@ -331,6 +332,7 @@ Public Class rptSendungenValues

    Property barcodeLKW As Image = Nothing
    Property barcodeSendung As Image = Nothing
+    Property imgQR As Image = Nothing

    Property AbfKost As String = ""
    Property AbfKostKdnr As Integer = -1