Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

2024-08-02 15:21:30 +02:00
parent e2e533f56a 5b9b992d13
commit a1d52ebb81
5 changed files with 117 additions and 22 deletions
--- a/Aviso/Anhänge/frmSendungAnhangImport.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.vb
@@ -1451,10 +1451,10 @@ Public Class frmSendungAnhangImport
        Return True
    End Function

-    Public Shared Function quickScan(AvisoId, Optional SendungsId = Nothing) As Boolean
+    Private Shared Function scantoAvisoDS(AvisoId, SendungsId, Art) As Boolean
        Try
            'If KdNr < 0 Then Exit Sub
-            Dim frmScan As New VERAG_PROG_ALLGEMEIN.frmScan("QuickScan")
+            Dim frmScan As New VERAG_PROG_ALLGEMEIN.frmScan(Art)
            frmScan.DefaultFileName = "Scan" ' Me._TEXT_PDF

            If frmScan.ShowDialog() = DialogResult.OK Then
@@ -1479,6 +1479,14 @@ Public Class frmSendungAnhangImport
        Return False
    End Function

+    Public Shared Function quickScanWithMenue(AvisoId, Optional SendungsId = Nothing) As Boolean
+        Return scantoAvisoDS(AvisoId, SendungsId, "")
+    End Function
+
+    Public Shared Function quickScan(AvisoId, Optional SendungsId = Nothing) As Boolean
+        Return scantoAvisoDS(AvisoId, SendungsId, "QuickScan")
+    End Function
+
    Private Sub WebBrowser1_DocumentCompleted(sender As Object, e As WebBrowserDocumentCompletedEventArgs)
        BrowserLoaded = True
    End Sub
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1500,7 +1500,11 @@ Public Class frmSendungsdetailsNEU
                    If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then
                        usrcntl_ATB.cbxATBFakturieren.CheckState = CheckState.Indeterminate
                    Else
-                        usrcntl_ATB.cbxATBFakturieren.Checked = CBool(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren)
+                        If CBool(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren) Then
+                            usrcntl_ATB.cbxATBFakturieren.CheckState = CheckState.Checked
+                        Else
+                            usrcntl_ATB.cbxATBFakturieren.CheckState = CheckState.Unchecked
+                        End If
                    End If

                    pnlT1.Controls.Add(usrcntl_ATB)
@@ -3038,6 +3042,8 @@ Public Class frmSendungsdetailsNEU
        Dim sperren = False
        If cbxFremdspedition.Checked Then
            sperren = True
+        ElseIf cboAbfertigungsart._value = "44" Then
+              sperren = False
        Else
            If cboFiliale._value <> "" Then
                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
--- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
@@ -54,7 +54,6 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
        Me.tbcntr = New System.Windows.Forms.TabControl()
        Me.tbVermerke = New System.Windows.Forms.TabPage()
-        Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla()
        Me.tbZollanmeldungen = New System.Windows.Forms.TabPage()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.dgvZollAnmeldungen = New System.Windows.Forms.DataGridView()
@@ -158,6 +157,8 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.Button13 = New System.Windows.Forms.Button()
+        Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla()
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -277,17 +278,6 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.tbVermerke.Text = "Vermerk eintragen"
        Me.tbVermerke.UseVisualStyleBackColor = True
        '
-        'UsrCntlVermerkeATilla1
-        '
-        Me.UsrCntlVermerkeATilla1.AutoScroll = True
-        Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control
-        Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1"
-        Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151)
-        Me.UsrCntlVermerkeATilla1.TabIndex = 0
-        '
        'tbZollanmeldungen
        '
        Me.tbZollanmeldungen.Controls.Add(Me.Panel1)
@@ -561,6 +551,7 @@ Partial Class usrcntlAktDetailsATILLANeu
        '
        'Panel5
        '
+        Me.Panel5.Controls.Add(Me.Button13)
        Me.Panel5.Controls.Add(Me.btnImportAssi)
        Me.Panel5.Controls.Add(Me.btnQuckScan)
        Me.Panel5.Controls.Add(Me.Button11)
@@ -581,7 +572,7 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.btnImportAssi.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnImportAssi.Location = New System.Drawing.Point(1, 1)
        Me.btnImportAssi.Name = "btnImportAssi"
-        Me.btnImportAssi.Size = New System.Drawing.Size(93, 37)
+        Me.btnImportAssi.Size = New System.Drawing.Size(61, 37)
        Me.btnImportAssi.TabIndex = 112
        Me.btnImportAssi.Text = "Import-Assistent"
        Me.btnImportAssi.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -594,9 +585,9 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.btnQuckScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnQuckScan.Image = CType(resources.GetObject("btnQuckScan.Image"), System.Drawing.Image)
        Me.btnQuckScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnQuckScan.Location = New System.Drawing.Point(442, 1)
+        Me.btnQuckScan.Location = New System.Drawing.Point(458, 1)
        Me.btnQuckScan.Name = "btnQuckScan"
-        Me.btnQuckScan.Size = New System.Drawing.Size(119, 37)
+        Me.btnQuckScan.Size = New System.Drawing.Size(103, 37)
        Me.btnQuckScan.TabIndex = 108
        Me.btnQuckScan.Text = "Quick-Scan"
        Me.btnQuckScan.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -608,9 +599,9 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button11.Image = CType(resources.GetObject("Button11.Image"), System.Drawing.Image)
        Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button11.Location = New System.Drawing.Point(90, 1)
+        Me.Button11.Location = New System.Drawing.Point(46, 1)
        Me.Button11.Name = "Button11"
-        Me.Button11.Size = New System.Drawing.Size(83, 37)
+        Me.Button11.Size = New System.Drawing.Size(66, 37)
        Me.Button11.TabIndex = 111
        Me.Button11.Text = "CMR"
        Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -622,7 +613,7 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button4.Image = CType(resources.GetObject("Button4.Image"), System.Drawing.Image)
        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button4.Location = New System.Drawing.Point(172, 1)
+        Me.Button4.Location = New System.Drawing.Point(111, 1)
        Me.Button4.Name = "Button4"
        Me.Button4.Size = New System.Drawing.Size(124, 37)
        Me.Button4.TabIndex = 109
@@ -636,7 +627,7 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button10.Image = CType(resources.GetObject("Button10.Image"), System.Drawing.Image)
        Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button10.Location = New System.Drawing.Point(295, 1)
+        Me.Button10.Location = New System.Drawing.Point(234, 1)
        Me.Button10.Name = "Button10"
        Me.Button10.Size = New System.Drawing.Size(148, 37)
        Me.Button10.TabIndex = 110
@@ -1754,6 +1745,31 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30)
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)"
        '
+        'Button13
+        '
+        Me.Button13.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button13.Image = CType(resources.GetObject("Button13.Image"), System.Drawing.Image)
+        Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button13.Location = New System.Drawing.Point(379, 1)
+        Me.Button13.Name = "Button13"
+        Me.Button13.Size = New System.Drawing.Size(80, 37)
+        Me.Button13.TabIndex = 113
+        Me.Button13.Text = "Scan.."
+        Me.Button13.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button13.UseVisualStyleBackColor = True
+        '
+        'UsrCntlVermerkeATilla1
+        '
+        Me.UsrCntlVermerkeATilla1.AutoScroll = True
+        Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control
+        Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1"
+        Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151)
+        Me.UsrCntlVermerkeATilla1.TabIndex = 0
+        '
        'usrcntlAktDetailsATILLANeu
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1933,4 +1949,5 @@ Partial Class usrcntlAktDetailsATILLANeu
    Friend WithEvents Label12 As Label
    Friend WithEvents Button12 As Button
    Friend WithEvents btnImportAssi As Button
+    Friend WithEvents Button13 As Button
 End Class
--- a/Aviso/usrcntlAktDetailsATILLANeu.resx
+++ b/Aviso/usrcntlAktDetailsATILLANeu.resx
@@ -132,6 +132,57 @@
        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="Button13.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        AAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="btnImportAssi.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/Aviso/usrcntlAktDetailsATILLANeu.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.vb
@@ -1729,4 +1729,17 @@ Public Class usrcntlAktDetailsATILLANeu
        reload(AvisoID)
        'initDataBinding()
    End Sub
+
+    Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click
+
+        Try
+            Me.Cursor = Cursors.WaitCursor
+            If frmSendungAnhangImport.quickScanWithMenue(AvisoID) Then
+                initAnhaenge()
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler QuickScan")
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
 End Class