USTAV Pos

SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb

@@ -56,11 +56,20 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.cboSchnittstellennr = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.TabControl1 = New System.Windows.Forms.TabControl()
+        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.TabPage2.SuspendLayout()
         Me.tbcntr.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.pnl.SuspendLayout()
         Me.Panel1.SuspendLayout()
+        Me.Panel3.SuspendLayout()
+        Me.Panel4.SuspendLayout()
+        Me.TabControl1.SuspendLayout()
+        Me.TabPage1.SuspendLayout()
         Me.SuspendLayout()
         '
         'scanLieferschein
@@ -72,16 +81,15 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.scanLieferschein._DATENSERVER_UOrdner2 = Nothing
         Me.scanLieferschein._DATENSERVER_UOrdner3 = Nothing
         Me.scanLieferschein._MULTI_FILES = True
-        Me.scanLieferschein._TEXT_PDF = "Lieferschein"
+        Me.scanLieferschein._TEXT_PDF = "XX Vollmacht"
         Me.scanLieferschein.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.scanLieferschein.BackColor = System.Drawing.Color.White
         Me.scanLieferschein.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.scanLieferschein.Cursor = System.Windows.Forms.Cursors.Default
-        Me.scanLieferschein.Location = New System.Drawing.Point(3, 198)
+        Me.scanLieferschein.Location = New System.Drawing.Point(146, 3)
         Me.scanLieferschein.Name = "scanLieferschein"
-        Me.scanLieferschein.Size = New System.Drawing.Size(94, 24)
+        Me.scanLieferschein.Size = New System.Drawing.Size(111, 34)
         Me.scanLieferschein.TabIndex = 2
-        Me.scanLieferschein.Visible = False
         '
         'TabPage2
         '
@@ -89,7 +97,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(270, 213)
+        Me.TabPage2.Size = New System.Drawing.Size(256, 170)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Dokumente"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -111,17 +119,17 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.scanSonstiges.Location = New System.Drawing.Point(3, 3)
         Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0)
         Me.scanSonstiges.Name = "scanSonstiges"
-        Me.scanSonstiges.Size = New System.Drawing.Size(264, 207)
+        Me.scanSonstiges.Size = New System.Drawing.Size(250, 164)
         Me.scanSonstiges.TabIndex = 0
         '
         'tbcntr
         '
         Me.tbcntr.Controls.Add(Me.TabPage2)
-        Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Right
+        Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.tbcntr.Location = New System.Drawing.Point(1022, 30)
+        Me.tbcntr.Location = New System.Drawing.Point(0, 43)
         Me.tbcntr.Name = "tbcntr"
         Me.tbcntr.SelectedIndex = 0
-        Me.tbcntr.Size = New System.Drawing.Size(278, 239)
+        Me.tbcntr.Size = New System.Drawing.Size(264, 196)
         Me.tbcntr.TabIndex = 3
         '
         'cbxAPI
@@ -520,27 +528,86 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnl.Location = New System.Drawing.Point(0, 30)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(1022, 239)
+        Me.pnl.Size = New System.Drawing.Size(1300, 239)
         Me.pnl.TabIndex = 1
         '
         'Panel1
         '
         Me.Panel1.Controls.Add(Me.btnBildAuf)
         Me.Panel1.Controls.Add(Me.Button1)
-        Me.Panel1.Controls.Add(Me.scanLieferschein)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right
-        Me.Panel1.Location = New System.Drawing.Point(923, 30)
+        Me.Panel1.Location = New System.Drawing.Point(937, 30)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(99, 239)
         Me.Panel1.TabIndex = 2
         '
+        'Panel3
+        '
+        Me.Panel3.Controls.Add(Me.tbcntr)
+        Me.Panel3.Controls.Add(Me.Panel4)
+        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Right
+        Me.Panel3.Location = New System.Drawing.Point(1036, 30)
+        Me.Panel3.Name = "Panel3"
+        Me.Panel3.Size = New System.Drawing.Size(264, 239)
+        Me.Panel3.TabIndex = 25
+        '
+        'Panel4
+        '
+        Me.Panel4.Controls.Add(Me.TabControl1)
+        Me.Panel4.Controls.Add(Me.scanLieferschein)
+        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
+        Me.Panel4.Location = New System.Drawing.Point(0, 0)
+        Me.Panel4.Name = "Panel4"
+        Me.Panel4.Size = New System.Drawing.Size(264, 43)
+        Me.Panel4.TabIndex = 26
+        '
+        'TabControl1
+        '
+        Me.TabControl1.Controls.Add(Me.TabPage1)
+        Me.TabControl1.Location = New System.Drawing.Point(39, 49)
+        Me.TabControl1.Name = "TabControl1"
+        Me.TabControl1.SelectedIndex = 0
+        Me.TabControl1.Size = New System.Drawing.Size(278, 239)
+        Me.TabControl1.TabIndex = 3
+        '
+        'TabPage1
+        '
+        Me.TabPage1.Controls.Add(Me.UsrcntlPDFScanList1)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage1.Name = "TabPage1"
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage1.Size = New System.Drawing.Size(270, 213)
+        Me.TabPage1.TabIndex = 1
+        Me.TabPage1.Text = "Dokumente"
+        Me.TabPage1.UseVisualStyleBackColor = True
+        '
+        'UsrcntlPDFScanList1
+        '
+        Me.UsrcntlPDFScanList1._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.UsrcntlPDFScanList1._DATENSERVER_ORDNER = "MDM"
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner1 = ""
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner2 = ""
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = ""
+        Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False
+        Me.UsrcntlPDFScanList1._TYPE = "PDF"
+        Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
+        Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.UsrcntlPDFScanList1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0)
+        Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1"
+        Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207)
+        Me.UsrcntlPDFScanList1.TabIndex = 0
+        '
         'ustCntlUSTV_AntragPosition
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.Panel3)
         Me.Controls.Add(Me.pnl)
-        Me.Controls.Add(Me.tbcntr)
         Me.Controls.Add(Me.Panel2)
         Me.Name = "ustCntlUSTV_AntragPosition"
         Me.Size = New System.Drawing.Size(1300, 269)
@@ -551,6 +618,10 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.pnl.ResumeLayout(False)
         Me.pnl.PerformLayout()
         Me.Panel1.ResumeLayout(False)
+        Me.Panel3.ResumeLayout(False)
+        Me.Panel4.ResumeLayout(False)
+        Me.TabControl1.ResumeLayout(False)
+        Me.TabPage1.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -587,4 +658,9 @@ Partial Class ustCntlUSTV_AntragPosition
     Friend WithEvents cboSchnittstellennr As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents pnl As Panel
     Friend WithEvents Panel1 As Panel
+    Friend WithEvents Panel3 As Panel
+    Friend WithEvents Panel4 As Panel
+    Friend WithEvents TabControl1 As TabControl
+    Friend WithEvents TabPage1 As TabPage
+    Friend WithEvents UsrcntlPDFScanList1 As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb

@@ -102,6 +102,7 @@ Public Class cSendungen
     Property tblSnd_Vorpapier3_Pos As Object = Nothing
     Property tblSnd_Frachtkosten As Object = Nothing
     Property tblSnd_FrachtkostenNichtEU As Object = Nothing
+    Property tblSnd_FrachtkostenGesamt As Object = Nothing
 
 
     Property tblSnd_AbfertigungTR As Object = Nothing
@@ -414,6 +415,7 @@ Public Class cSendungen
                     Me.tblSnd_Vorpapier3_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3_Pos"), Nothing)
                     Me.tblSnd_Frachtkosten = SQL.checkNullReturnValue(dr.Item("tblSnd_Frachtkosten"), Nothing)
                     Me.tblSnd_FrachtkostenNichtEU = SQL.checkNullReturnValue(dr.Item("tblSnd_FrachtkostenNichtEU"), Nothing)
+                    Me.tblSnd_FrachtkostenGesamt = SQL.checkNullReturnValue(dr.Item("tblSnd_FrachtkostenGesamt"), Nothing)
                     Me.tblSnd_AbfertigungTR = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR"), Nothing)
                     Me.tblSnd_AbfertigungTR_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR_MA"), Nothing)
 
@@ -627,6 +629,7 @@ Public Class cSendungen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3_Pos", tblSnd_Vorpapier3_Pos))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Frachtkosten", tblSnd_Frachtkosten))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_FrachtkostenNichtEU", tblSnd_FrachtkostenNichtEU))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_FrachtkostenGesamt", tblSnd_FrachtkostenGesamt))
 
         'If saveStatus Then --> in getUpdateCmd
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Status", tblSnd_Status,,, Not saveSachbearbeiter))