neu

Aviso/frmLogin.vb

@@ -45,7 +45,8 @@ Public Class frmLogin
                 Case "UNISPED" : firma = "AMBAR"
                 Case "AMBAR" : firma = "FRONTOFFICE"
                 Case "FRONTOFFICE" : firma = "VERIMEX"
-                Case "VERIMEX" : firma = "VERAG"
+                Case "VERIMEX" : firma = "WARENORT"
+                Case "WARENORT" : firma = "VERAG"
 
             End Select
             ' firma = If(firma = "VERAG", "ATILLA", If(firma = "ATILLA", "IMEX", "VERAG"))
@@ -67,9 +68,17 @@ Public Class frmLogin
         Dim pfadDatei As String = Application.StartupPath & "\Standort.txt"
         firma = "VERAG"
 
+
         VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "AVISO_NEW"
         VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = 16
         VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = Application.ProductVersion
+
+        'initCBOWarenort
+        Dim testSysTMP = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+        cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO]  FROM [tblGrenzstelle] where [grz_Warenort]=1", False, "AVISO")
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testSysTMP
+
         If File.Exists(pfadDatei) Then
             Dim fs As New FileStream(pfadDatei, FileMode.Open, FileAccess.Read)
             Dim strmReader As New StreamReader(fs)
@@ -191,6 +200,7 @@ Public Class frmLogin
 
     Sub initstart(Optional secret = False)
         picLogin.Size = New Size(picLogin.Width, 50)
+        cboWarenort.Visible = False
         Select Case firma
             Case "VERAG"
                 '  cGlobal.ConnStrFMZOLL = VERAG_PROG_ALLGEMEIN.My.MySettings.Default.FMZOLL_PRODConnectionString
@@ -217,6 +227,11 @@ Public Class frmLogin
             Case "FRONTOFFICE"
                 picLogin.Size = New Size(picLogin.Width, 71)
                 picLogin.Image = My.Resources.FrontOfficeSUB
+            Case "WARENORT"
+                picLogin.Size = New Size(picLogin.Width, 71)
+                picLogin.Image = Nothing
+
+                cboWarenort.Visible = True
             Case "VERIMEX"
                 picLogin.Size = New Size(picLogin.Width, 71)
                 picLogin.Image = My.Resources.verimex
@@ -256,7 +271,22 @@ Public Class frmLogin
 
     End Sub
     Private Sub btnOK_Click(sender As System.Object, e As System.EventArgs) Handles btnOK.Click
+        VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = False
 
+        'Auf WARENORT UMSTELLEN
+        If firma = "WARENORT" Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = True
+            VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT = cboWarenort._value
+
+            Dim testSysTMP = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
+            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+            firma = SQL.DLookup("grz_Firma", "tblGrenzstelle", "grz_Grenzstelle='" & cboWarenort._value & "'", "AVISO", "")
+            If firma = "" Then firma = "WARENORT" : Exit Sub
+            'NIEDERLASSUNG?
+            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testSysTMP
+
+        End If
 
         If firma = "ATILLA" Then
             Dim büroDatei As String = "C:\VERAG\büro.txt"