AppCustom/SchaumKommi
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj: version 2.2.0.6

Browse Source
This commit is contained in:
Jonathan Jenne
2018-11-09 15:28:07 +01:00
parent b8207487cf
commit 627a5cd201
3 changed files with 67 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SchaumKommiCollo/KommiCollo/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.2.0.5")> <Assembly: AssemblyVersion("2.2.0.6")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

22
SchaumKommiCollo/KommiCollo/frmMain.Designer.vb generated
View File

@@ -58,6 +58,7 @@ Partial Class frmMain
Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.GESAMTGEWICHTTextBox = New System.Windows.Forms.TextBox() Me.GESAMTGEWICHTTextBox = New System.Windows.Forms.TextBox()
Me.Label10 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label()
Me.cmbTerminart = New System.Windows.Forms.ComboBox() Me.cmbTerminart = New System.Windows.Forms.ComboBox()
Me.TBKOMMCOLLI_TERMINARTBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBKOMMCOLLI_TERMINARTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -400,6 +401,7 @@ Partial Class frmMain
Me.pnlAddBarcodes.Controls.Add(Me.ListViewBarcodes) Me.pnlAddBarcodes.Controls.Add(Me.ListViewBarcodes)
Me.pnlAddBarcodes.Controls.Add(GESAMTGEWICHTLabel) Me.pnlAddBarcodes.Controls.Add(GESAMTGEWICHTLabel)
Me.pnlAddBarcodes.Controls.Add(Me.GESAMTGEWICHTTextBox) Me.pnlAddBarcodes.Controls.Add(Me.GESAMTGEWICHTTextBox)
Me.pnlAddBarcodes.Controls.Add(Me.Label10)
Me.pnlAddBarcodes.Controls.Add(Me.Label4) Me.pnlAddBarcodes.Controls.Add(Me.Label4)
Me.pnlAddBarcodes.Controls.Add(Me.cmbTerminart) Me.pnlAddBarcodes.Controls.Add(Me.cmbTerminart)
Me.pnlAddBarcodes.Controls.Add(Label3) Me.pnlAddBarcodes.Controls.Add(Label3)
@@ -445,15 +447,25 @@ Partial Class frmMain
Me.GESAMTGEWICHTTextBox.Size = New System.Drawing.Size(211, 29) Me.GESAMTGEWICHTTextBox.Size = New System.Drawing.Size(211, 29)
Me.GESAMTGEWICHTTextBox.TabIndex = 1 Me.GESAMTGEWICHTTextBox.TabIndex = 1
' '
'Label10
'
Me.Label10.AutoSize = True
Me.Label10.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label10.Location = New System.Drawing.Point(154, 116)
Me.Label10.Name = "Label10"
Me.Label10.Size = New System.Drawing.Size(146, 17)
Me.Label10.TabIndex = 13
Me.Label10.Text = "(Trennzeichen: | oder _ )"
'
'Label4 'Label4
' '
Me.Label4.AutoSize = True Me.Label4.AutoSize = True
Me.Label4.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label4.Location = New System.Drawing.Point(154, 94) Me.Label4.Location = New System.Drawing.Point(154, 94)
Me.Label4.Name = "Label4" Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(396, 17) Me.Label4.Size = New System.Drawing.Size(486, 17)
Me.Label4.TabIndex = 13 Me.Label4.TabIndex = 13
Me.Label4.Text = "Bitte wie folgt Eingabe tätigen: <EDV-Nummer>|<Lieferschein-Nr>" Me.Label4.Text = "Bitte wie folgt Eingabe tätigen: <EDV-Nummer><Trennzeichen><Lieferschein-Nr>"
' '
'cmbTerminart 'cmbTerminart
' '
@@ -1053,9 +1065,10 @@ Partial Class frmMain
Me.Label6.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label6.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label6.Location = New System.Drawing.Point(182, 97) Me.Label6.Location = New System.Drawing.Point(182, 97)
Me.Label6.Name = "Label6" Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(396, 17) Me.Label6.Size = New System.Drawing.Size(628, 17)
Me.Label6.TabIndex = 13 Me.Label6.TabIndex = 13
Me.Label6.Text = "Bitte wie folgt Eingabe tätigen: <EDV-Nummer>|<Lieferschein-Nr>" Me.Label6.Text = "Bitte wie folgt Eingabe tätigen: <EDV-Nummer><Trennzeichen><Lieferschein-Nr> (Tre" &
"nnzeichen: | oder _ )"
' '
'btnSendungFertig 'btnSendungFertig
' '
@@ -1258,4 +1271,5 @@ Partial Class frmMain
Friend WithEvents GridViewLHM As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridViewLHM As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents ToolStripStatusLabelVersion As ToolStripStatusLabel Friend WithEvents ToolStripStatusLabelVersion As ToolStripStatusLabel
Friend WithEvents tslblConString As ToolStripStatusLabel Friend WithEvents tslblConString As ToolStripStatusLabel
Friend WithEvents Label10 As Label
End Class End Class

88
SchaumKommiCollo/KommiCollo/frmMain.vb
View File

@@ -94,7 +94,7 @@ Public Class frmMain
Sub AddBarcode(BC As String) Sub AddBarcode(BC As String)
Try Try
If BC.Contains("'") Then If BC.Contains("'") Then
BC = BC.Replace("'", "|") BC = BC.Replace("'", "_")
End If End If
If cmbAuswMandant.SelectedValue = 0 Then If cmbAuswMandant.SelectedValue = 0 Then
@@ -116,22 +116,30 @@ Public Class frmMain
End Try End Try
End Sub End Sub
Private Function AddBarcodeHuP(BC As String) Private Function AddBarcodeHuP(BarcodeString As String)
Dim separators As New List(Of String) From {"|", "_", "'"}
Try Try
If BC.Contains("'") Then Dim BarcodeArray() As String
BC = BC.Replace("'", "|")
End If For Each separator In separators
Dim split() = BC.Split("|") If BarcodeString.Contains(separator) Then
BarcodeArray = BarcodeString.Split(separator)
Exit For
End If
Next
Try Try
_EDV_no = split(0) _EDV_no = Trim(BarcodeArray(0))
Catch ex As Exception Catch ex As Exception
_EDV_no = "" _EDV_no = ""
End Try End Try
Try Try
_LS_no = RTrim(LTrim(split(1))) _LS_no = Trim(BarcodeArray(1))
Catch ex As Exception Catch ex As Exception
_LS_no = "" _LS_no = ""
End Try End Try
If _EDV_no <> String.Empty And _LS_no <> String.Empty Then If _EDV_no <> String.Empty And _LS_no <> String.Empty Then
Dim sql = String.Format("SELECT * FROM VKKOPF WHERE GUID = (SELECT MAX(GUID) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}')", _EDV_no) Dim sql = String.Format("SELECT * FROM VKKOPF WHERE GUID = (SELECT MAX(GUID) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}')", _EDV_no)
Dim DT_ROW As DataTable = ClassDatabase.Return_Datatable_CS(sql, My.Settings.ConfigConnStringMercator) Dim DT_ROW As DataTable = ClassDatabase.Return_Datatable_CS(sql, My.Settings.ConfigConnStringMercator)
@@ -192,42 +200,42 @@ Public Class frmMain
End If End If
Dim Upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET KUNDEN_ID = '{0}',NAME1 = '{1}',NAME2 = '{2}',STRASSE = '{3}',LKZ = '{4}',PLZ = '{5}',ORT = '{6}' WHERE GUID = {7}", MERC_KDNR, MERC_LIEFADR1, MERC_LIEFADR2, MERC_LIEFSTR, MERC_LIEFLAND, MERC_LIEFPLZ, MERC_LIEFORT, CURRENT_SENDUNG) Dim Upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET KUNDEN_ID = '{0}',NAME1 = '{1}',NAME2 = '{2}',STRASSE = '{3}',LKZ = '{4}',PLZ = '{5}',ORT = '{6}' WHERE GUID = {7}", MERC_KDNR, MERC_LIEFADR1, MERC_LIEFADR2, MERC_LIEFSTR, MERC_LIEFLAND, MERC_LIEFPLZ, MERC_LIEFORT, CURRENT_SENDUNG)
If ClassDatabase.Execute_non_Query(Upd, True) = True Then If ClassDatabase.Execute_non_Query(Upd, True) = True Then
Dim exists = String.Format("SELECT COUNT(*) FROM TBKOMMCOLLI_SDG_LHM WHERE SENDUNGNR = {0} AND FERTIG = 0", CURRENT_SENDUNG) Dim exists = String.Format("SELECT COUNT(*) FROM TBKOMMCOLLI_SDG_LHM WHERE SENDUNGNR = {0} AND FERTIG = 0", CURRENT_SENDUNG)
Dim LHM_exists As Boolean = False Dim LHM_exists As Boolean = False
If ClassDatabase.Execute_Scalar(exists, True) >= 1 Then If ClassDatabase.Execute_Scalar(exists, True) >= 1 Then
LHM_exists = True LHM_exists = True
End If End If
If LHM_exists = False Then If LHM_exists = False Then
Dim ins = String.Format("INSERT INTO TBKOMMCOLLI_SDG_LHM (SENDUNGNR,LHM_ID,ERSTELLTWER) VALUES ({0},{1},'{2}')", CURRENT_SENDUNG, aktLHM_ID, Environment.UserName) Dim ins = String.Format("INSERT INTO TBKOMMCOLLI_SDG_LHM (SENDUNGNR,LHM_ID,ERSTELLTWER) VALUES ({0},{1},'{2}')", CURRENT_SENDUNG, aktLHM_ID, Environment.UserName)
If ClassDatabase.Execute_non_Query(ins, True) = True Then If ClassDatabase.Execute_non_Query(ins, True) = True Then
End If
End If
aktLHM_SDG_ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBKOMMCOLLI_SDG_LHM WHERE FERTIG = 0", True)
If aktLHM_SDG_ID > 0 Then
btnPalfertig.Text = "Palette (" & aktLHM_SDG_ID.ToString & ", " & cmbLHM.Text & ") fertig"
MERC_GEWICHT = MERC_GEWICHT.ToString.Replace(",", ".")
Dim ins = String.Format("INSERT INTO TBKOMMCOLLI_SDGPOSITIONEN (SENDUNGNR,SDG_LHM_ID,GEWICHT,ERSTELLTWER) VALUES ({0},{1},{2},'{3}')", CURRENT_SENDUNG, aktLHM_SDG_ID, MERC_GEWICHT, Environment.UserName)
If ClassDatabase.Execute_non_Query(ins, True) = True Then
'cmbLHM.Enabled = False
Refresh_POS(CURRENT_SENDUNG)
End If
End If
If txtFreitext.Text <> "" Then
Upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET BEMERKUNG = '{0}' WHERE GUID = {1}", txtFreitext.Text & ", " & _LS_no, CURRENT_SENDUNG)
Else
Upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET BEMERKUNG = '{0}' WHERE GUID = {1}", _LS_no, CURRENT_SENDUNG)
End If
If ClassDatabase.Execute_non_Query(Upd, True) = True Then
txtFreitext.Text = ClassDatabase.Execute_Scalar("SELECT BEMERKUNG FROM TBKOMMCOLLI_SENDUNGEN WHERE GUID = " & CURRENT_SENDUNG, True)
End If End If
End If End If
End If aktLHM_SDG_ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBKOMMCOLLI_SDG_LHM WHERE FERTIG = 0", True)
If aktLHM_SDG_ID > 0 Then
btnPalfertig.Text = "Palette (" & aktLHM_SDG_ID.ToString & ", " & cmbLHM.Text & ") fertig"
MERC_GEWICHT = MERC_GEWICHT.ToString.Replace(",", ".")
Dim ins = String.Format("INSERT INTO TBKOMMCOLLI_SDGPOSITIONEN (SENDUNGNR,SDG_LHM_ID,GEWICHT,ERSTELLTWER) VALUES ({0},{1},{2},'{3}')", CURRENT_SENDUNG, aktLHM_SDG_ID, MERC_GEWICHT, Environment.UserName)
If ClassDatabase.Execute_non_Query(ins, True) = True Then
'cmbLHM.Enabled = False
Refresh_POS(CURRENT_SENDUNG)
End If
End If
deactivate_Error() If txtFreitext.Text <> "" Then
Upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET BEMERKUNG = '{0}' WHERE GUID = {1}", txtFreitext.Text & ", " & _LS_no, CURRENT_SENDUNG)
Else
Upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET BEMERKUNG = '{0}' WHERE GUID = {1}", _LS_no, CURRENT_SENDUNG)
End If
If ClassDatabase.Execute_non_Query(Upd, True) = True Then
txtFreitext.Text = ClassDatabase.Execute_Scalar("SELECT BEMERKUNG FROM TBKOMMCOLLI_SENDUNGEN WHERE GUID = " & CURRENT_SENDUNG, True)
End If
End If
End If
deactivate_Error()
Catch ex As Exception Catch ex As Exception
If ex.Message.Contains("UNIQ_BARCODE_PER_POS") Then If ex.Message.Contains("UNIQ_BARCODE_PER_POS") Then