Merge branch 'master' of http://172.24.11.74:90/scm/git/SchaumKommi

SchaumKommiCollo/KommiCollo/frmMain.Designer.vb

@@ -692,7 +692,7 @@ Partial Class frmMain
         Me.TabPage3.Location = New System.Drawing.Point(4, 26)
         Me.TabPage3.Name = "TabPage3"
         Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(932, 111)
+        Me.TabPage3.Size = New System.Drawing.Size(921, 105)
         Me.TabPage3.TabIndex = 0
         Me.TabPage3.Text = "Übersicht Lieferscheine"
         Me.TabPage3.UseVisualStyleBackColor = True
@@ -705,7 +705,7 @@ Partial Class frmMain
         Me.GridControlPos.Location = New System.Drawing.Point(3, 3)
         Me.GridControlPos.MainView = Me.grvwGridPos
         Me.GridControlPos.Name = "GridControlPos"
-        Me.GridControlPos.Size = New System.Drawing.Size(926, 105)
+        Me.GridControlPos.Size = New System.Drawing.Size(915, 99)
         Me.GridControlPos.TabIndex = 2
         Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos})
         '

SchaumKommiCollo/KommiCollo/frmMain.vb

@@ -125,7 +125,11 @@ Public Class frmMain
             End Try
             If _EDV_no <> String.Empty And _LS_no <> String.Empty Then
                 Dim sql = String.Format("SELECT MIN(GUID) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
-                Dim GUID As Integer = ClassDatabase.Execute_Scalar_CS(sql, My.Settings.ConfigConnStringMercator, True)
+                Dim GUID = ClassDatabase.Execute_Scalar_CS(sql, My.Settings.ConfigConnStringMercator, True)
+                If IsDBNull(GUID) Then
+                    MsgBox("Für diese Kombination aus Lieferschein und EDV-Nr existieren keine Daten!", MsgBoxStyle.Exclamation)
+                    Return False
+                End If
                 Dim getMERC_SELECT = String.Format("select TOP 1 vkkopf_kunde FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
                 Dim MERC_KDNR = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
                 If MERC_KDNR Is Nothing Then
@@ -226,8 +230,9 @@ Public Class frmMain
     Sub Refresh_LHM(SDG As Integer)
         Try
             GridControlLHM.DataSource = Nothing
+            'hh
             GridViewLHM.Columns.Clear()
-            Dim sel = String.Format("SELECT T.GUID,T1.LHM, T.FERTIG,T.GEWICHT, T.POSINHALT FROM TBKOMMCOLLI_SDG_LHM T, TBKOMMCOLLI_LHM T1 WHERE T.LHM_ID = T1.GUID AND T.SENDUNGNR = {0}", SDG)
+            Dim sel = String.Format("SELECT T.GUID,T1.LHM, T.POSINHALT, T.GEWICHT,T.FERTIG FROM TBKOMMCOLLI_SDG_LHM T, TBKOMMCOLLI_LHM T1 WHERE T.LHM_ID = T1.GUID AND T.SENDUNGNR = {0}", SDG)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sel, True)
             If Not DT Is Nothing Then
                 GridControlLHM.DataSource = DT
@@ -649,6 +654,7 @@ Public Class frmMain
                         aktLHM_SDG_ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBKOMMCOLLI_SDG_LHM", True)
                         If aktLHM_SDG_ID > 0 Then
                             btnPalfertig.Text = "Palette (" & aktLHM_SDG_ID.ToString & ", " & cmbLHM.Text & ") fertig"
+                            Refresh_LHM(CURRENT_SENDUNG)
                             'ins = String.Format("INSERT INTO TBKOMMCOLLI_SDGPOSITIONEN (SENDUNGNR,SDG_LHM_ID,ERSTELLTWER) VALUES ({0},{1},'{2}')", CURRENT_SENDUNG, aktLHM_SDG_ID, Environment.UserName)
                             'If ClassDatabase.Execute_non_Query(ins, True) = False Then
                             'cmbLHM.Enabled = False
@@ -673,6 +679,10 @@ Public Class frmMain
     End Sub
 
     Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
+        If IsNothing(CURR_IP_PRINTER) Then
+            MsgBox("Bitte wählen Sie den Versendertyp aus! (HuP oder GLS)", MsgBoxStyle.Information)
+            Exit Sub
+        End If
         'frmLabel.ShowDialog()
         frmPrintOptions.ShowDialog()
 
@@ -734,6 +744,7 @@ Public Class frmMain
             Case 0
                 btndeletePosLHM.Text = "Lösche Position/Lieferschein"
                 btndeletePosLHM.Enabled = True
+                Refresh_POS(CURRENT_SENDUNG)
             Case 1
                 Refresh_LHM(CURRENT_SENDUNG)
                 btndeletePosLHM.Text = "Lösche LHM"
@@ -760,4 +771,22 @@ Public Class frmMain
             MsgBox("Error in GridViewLHM.CellValueChanged:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
+
+    Private Sub txtHinweistext_TextChanged(sender As Object, e As EventArgs) Handles txtHinweistext.TextChanged
+        If txtHinweistext.Text <> String.Empty Then
+            If txtHinweistext.Text.Length > 35 Then
+                Dim text = txtHinweistext.Text
+                text = txtHinweistext.Text.Substring(0, 35)
+                txtHinweistext.Text = text
+                txtHinweistext.SelectionStart = 36
+                MsgBox("Achtung, hier sind nur 35 Zeichen erlaubt!",MsgBoxStyle.Information)
+            End If
+        End If
+    End Sub
+
+    Private Sub pnlHuP_VisibleChanged(sender As Object, e As EventArgs) Handles pnlHuP.VisibleChanged
+        If pnlHuP.Visible = True Then
+            txtFreitext.Text = ""
+        End If
+    End Sub
 End Class

SchaumKommiCollo/KommiCollo/frmPrintOptions.vb

@@ -94,7 +94,7 @@ Public Class frmPrintOptions
             pText.AppendLine("^AU^FO150,610^CI27^^FD" & empStrasse & "^FS")
             pText.AppendLine("^AU^FO80,610^CI27^^FDDE-" & empPLZ & " " & empOrt & "^FS")
             pText.AppendLine("^XZ") 'Every Format must end with this command
-
+            Dim tempZPL = pText.ToString
             Try
                 'Open Connection
                 Dim client As New System.Net.Sockets.TcpClient

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt

@@ -1,2 +1,2 @@
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.wixpdb

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.BindOutputsFileListde-DE.txt

@@ -1,2 +1,2 @@
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.wixpdb

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt

@@ -2,8 +2,8 @@ E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.ms
 E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.wixpdb
 E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi
 E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.wixpdb
 obj\Debug\Product.wixobj
 obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt
 obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt