neu

2020-08-04 16:34:47 +02:00
parent 40295a2819
commit 89d8e0a3a8
95 changed files with 3655 additions and 697 deletions
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb
@@ -212,6 +212,8 @@ Partial Class frmNacherfassungNEU
        Me.Label51 = New System.Windows.Forms.Label()
        Me.Label58 = New System.Windows.Forms.Label()
        Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.Label63 = New System.Windows.Forms.Label()
+        Me.cboGrenze = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtHandlingZuKassieren = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label60 = New System.Windows.Forms.Label()
        Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -224,8 +226,8 @@ Partial Class frmNacherfassungNEU
        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Label63 = New System.Windows.Forms.Label()
-        Me.cboGrenze = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboAbklärungFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label64 = New System.Windows.Forms.Label()
        Me.pnl.SuspendLayout()
        Me.Panel3.SuspendLayout()
        Me.GroupBox4.SuspendLayout()
@@ -1906,6 +1908,8 @@ Partial Class frmNacherfassungNEU
        Me.Panel2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Panel2.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel2.Controls.Add(Me.Label64)
+        Me.Panel2.Controls.Add(Me.cboAbklärungFiliale)
        Me.Panel2.Controls.Add(Me.lblSachbearbeiterIch)
        Me.Panel2.Controls.Add(Me.Label52)
        Me.Panel2.Controls.Add(Me.Button1)
@@ -2008,7 +2012,7 @@ Partial Class frmNacherfassungNEU
        Me.cboQuickStopMa.FormattingEnabled = True
        Me.cboQuickStopMa.Location = New System.Drawing.Point(7, 19)
        Me.cboQuickStopMa.Name = "cboQuickStopMa"
-        Me.cboQuickStopMa.Size = New System.Drawing.Size(305, 24)
+        Me.cboQuickStopMa.Size = New System.Drawing.Size(242, 24)
        Me.cboQuickStopMa.TabIndex = 1
        '
        'lblErrPruefAnzahl
@@ -2069,6 +2073,7 @@ Partial Class frmNacherfassungNEU
        Me.txtAvisierer.searchActive = True
        Me.txtAvisierer.Size = New System.Drawing.Size(265, 20)
        Me.txtAvisierer.TabIndex = 12
+        Me.txtAvisierer.TIMER_SEARCH = True
        Me.txtAvisierer.usrcntl = Nothing
        '
        'btnAvisiererSrch
@@ -2141,6 +2146,7 @@ Partial Class frmNacherfassungNEU
        Me.txtEUFiskalEmpf.searchActive = True
        Me.txtEUFiskalEmpf.Size = New System.Drawing.Size(21, 20)
        Me.txtEUFiskalEmpf.TabIndex = 70
+        Me.txtEUFiskalEmpf.TIMER_SEARCH = True
        Me.txtEUFiskalEmpf.usrcntl = Nothing
        Me.txtEUFiskalEmpf.Visible = False
        '
@@ -2169,6 +2175,7 @@ Partial Class frmNacherfassungNEU
        Me.txtEndEmpf.searchActive = True
        Me.txtEndEmpf.Size = New System.Drawing.Size(265, 20)
        Me.txtEndEmpf.TabIndex = 40
+        Me.txtEndEmpf.TIMER_SEARCH = True
        Me.txtEndEmpf.usrcntl = Nothing
        '
        'txtFraechter
@@ -2196,6 +2203,7 @@ Partial Class frmNacherfassungNEU
        Me.txtFraechter.searchActive = True
        Me.txtFraechter.Size = New System.Drawing.Size(265, 20)
        Me.txtFraechter.TabIndex = 17
+        Me.txtFraechter.TIMER_SEARCH = True
        Me.txtFraechter.usrcntl = Nothing
        '
        'txtAuftraggeber
@@ -2223,6 +2231,7 @@ Partial Class frmNacherfassungNEU
        Me.txtAuftraggeber.searchActive = True
        Me.txtAuftraggeber.Size = New System.Drawing.Size(265, 20)
        Me.txtAuftraggeber.TabIndex = 23
+        Me.txtAuftraggeber.TIMER_SEARCH = True
        Me.txtAuftraggeber.usrcntl = Nothing
        '
        'txtEmpfaenger
@@ -2250,6 +2259,7 @@ Partial Class frmNacherfassungNEU
        Me.txtEmpfaenger.searchActive = True
        Me.txtEmpfaenger.Size = New System.Drawing.Size(265, 20)
        Me.txtEmpfaenger.TabIndex = 34
+        Me.txtEmpfaenger.TIMER_SEARCH = True
        Me.txtEmpfaenger.usrcntl = Nothing
        '
        'txtAbsender
@@ -2277,6 +2287,7 @@ Partial Class frmNacherfassungNEU
        Me.txtAbsender.searchActive = True
        Me.txtAbsender.Size = New System.Drawing.Size(265, 20)
        Me.txtAbsender.TabIndex = 29
+        Me.txtAbsender.TIMER_SEARCH = True
        Me.txtAbsender.usrcntl = Nothing
        '
        'txtZucker_Aufschub
@@ -3040,6 +3051,28 @@ Partial Class frmNacherfassungNEU
        Me.Panel4.Size = New System.Drawing.Size(665, 52)
        Me.Panel4.TabIndex = 49
        '
+        'Label63
+        '
+        Me.Label63.AutoSize = True
+        Me.Label63.Location = New System.Drawing.Point(604, 5)
+        Me.Label63.Name = "Label63"
+        Me.Label63.Size = New System.Drawing.Size(44, 13)
+        Me.Label63.TabIndex = 10
+        Me.Label63.Text = "Grenze:"
+        '
+        'cboGrenze
+        '
+        Me.cboGrenze._allowedValuesFreiText = Nothing
+        Me.cboGrenze._allowFreiText = False
+        Me.cboGrenze._value = ""
+        Me.cboGrenze.DropDownWidth = 280
+        Me.cboGrenze.Font = New System.Drawing.Font("Microsoft Tai Le", 8.0!)
+        Me.cboGrenze.FormattingEnabled = True
+        Me.cboGrenze.Location = New System.Drawing.Point(607, 21)
+        Me.cboGrenze.Name = "cboGrenze"
+        Me.cboGrenze.Size = New System.Drawing.Size(52, 22)
+        Me.cboGrenze.TabIndex = 11
+        '
        'txtHandlingZuKassieren
        '
        Me.txtHandlingZuKassieren._DateTimeOnly = False
@@ -3177,27 +3210,28 @@ Partial Class frmNacherfassungNEU
        Me.DataGridViewTextBoxColumn5.HeaderText = "Anzahl"
        Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5"
        '
-        'Label63
+        'cboAbklärungFiliale
        '
-        Me.Label63.AutoSize = True
-        Me.Label63.Location = New System.Drawing.Point(604, 5)
-        Me.Label63.Name = "Label63"
-        Me.Label63.Size = New System.Drawing.Size(44, 13)
-        Me.Label63.TabIndex = 10
-        Me.Label63.Text = "Grenze:"
+        Me.cboAbklärungFiliale._allowedValuesFreiText = Nothing
+        Me.cboAbklärungFiliale._allowFreiText = False
+        Me.cboAbklärungFiliale._value = ""
+        Me.cboAbklärungFiliale.DropDownWidth = 280
+        Me.cboAbklärungFiliale.Font = New System.Drawing.Font("Microsoft Tai Le", 10.0!)
+        Me.cboAbklärungFiliale.FormattingEnabled = True
+        Me.cboAbklärungFiliale.Location = New System.Drawing.Point(248, 19)
+        Me.cboAbklärungFiliale.Name = "cboAbklärungFiliale"
+        Me.cboAbklärungFiliale.Size = New System.Drawing.Size(63, 24)
+        Me.cboAbklärungFiliale.TabIndex = 12
        '
-        'cboGrenze
+        'Label64
        '
-        Me.cboGrenze._allowedValuesFreiText = Nothing
-        Me.cboGrenze._allowFreiText = False
-        Me.cboGrenze._value = ""
-        Me.cboGrenze.DropDownWidth = 280
-        Me.cboGrenze.Font = New System.Drawing.Font("Microsoft Tai Le", 8.0!)
-        Me.cboGrenze.FormattingEnabled = True
-        Me.cboGrenze.Location = New System.Drawing.Point(607, 21)
-        Me.cboGrenze.Name = "cboGrenze"
-        Me.cboGrenze.Size = New System.Drawing.Size(52, 22)
-        Me.cboGrenze.TabIndex = 11
+        Me.Label64.AutoSize = True
+        Me.Label64.ForeColor = System.Drawing.Color.Black
+        Me.Label64.Location = New System.Drawing.Point(245, 3)
+        Me.Label64.Name = "Label64"
+        Me.Label64.Size = New System.Drawing.Size(36, 13)
+        Me.Label64.TabIndex = 13
+        Me.Label64.Text = "Filiale:"
        '
        'frmNacherfassungNEU
        '
@@ -3432,4 +3466,6 @@ Partial Class frmNacherfassungNEU
    Friend WithEvents txtCMRNr As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Label63 As Label
    Public WithEvents cboGrenze As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label64 As Label
+    Public WithEvents cboAbklärungFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
@@ -299,6 +299,7 @@ Public Class frmNacherfassungNEU
        txtCMRNr.Text = If(SPEDITIONSBUCH.SB_CMRNr, "")

        cboFilialeHandling.changeItem(If(SPEDITIONSBUCH.FilialenNrHandling, ""))
+        cboAbklärungFiliale.changeItem(If(SPEDITIONSBUCH.FilialenNrAbklaerung, ""))
        txtHandlingZuKassieren._value = SPEDITIONSBUCH.HandlingZuKassieren

        cboGrenze.changeItem(If(SPEDITIONSBUCH.Grenzstelle, ""))
@@ -565,6 +566,7 @@ Public Class frmNacherfassungNEU

        cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        cboFilialeHandling.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
+        cboAbklärungFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)


        Dim where = ""
@@ -955,6 +957,7 @@ Public Class frmNacherfassungNEU


        SPEDITIONSBUCH.FilialenNrHandling = cProgramFunctions.isLeerNothing(cboFilialeHandling._value)
+        SPEDITIONSBUCH.FilialenNrAbklaerung = cProgramFunctions.isLeerNothing(cboAbklärungFiliale._value)
        SPEDITIONSBUCH.HandlingZuKassieren = If(IsNumeric(txtHandlingZuKassieren._value), CDbl(txtHandlingZuKassieren._value), 0)

        SPEDITIONSBUCH.Grenzstelle = cProgramFunctions.isLeerNothing(cboGrenze._value)