ms Änderungen RS Marvin

This commit is contained in:
Digital Data - Marlon Schreiber 2018-01-29 14:23:40 +01:00
parent 2aefc23b8c
commit 135e31f0d1
20 changed files with 89 additions and 20 deletions

1
.gitignore vendored
View File

@ -154,3 +154,4 @@ $RECYCLE.BIN/
# Mac desktop service store files
.DS_Store
/SchaumKommiCollo/.vs/KommiCollo/v15/Server/sqlite3

View File

@ -11,6 +11,8 @@
providerName="System.Data.SqlClient" />
<add name="KommiCollo.My.MySettings.CP2DDConnectionString" connectionString="Data Source=192.168.13.101;Initial Catalog=CP2DD;User ID=sa;Password=dd"
providerName="System.Data.SqlClient" />
<add name="SCHAUM_IID_Connection" connectionString="XpoProvider=MSSqlServer;data source=192.168.13.101;user id=sa;password=dd;initial catalog=SCHAUM_IID;Persist Security Info=true" />
<add name="192.168.13.101_SCHAUM_IID_Connection" connectionString="XpoProvider=MSSqlServer;data source=192.168.13.101;user id=sa;password=dd;initial catalog=SCHAUM_IID;Persist Security Info=true" />
</connectionStrings>
<system.diagnostics>
<sources>

View File

@ -285,8 +285,7 @@
End If
End If
End Sub
Private Sub cmbMandant_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbMandant.SelectedIndexChanged
Sub Refresh_Grid()
VWAbschlussDataGridView.Visible = False
VWAbschlussDataGridView.Dock = DockStyle.None
VWHUP_REPORT1DataGridView.Visible = False
@ -310,6 +309,9 @@
btnAbschluss.Text = "Mandanten '" & cmbMandant.Text & "' abschliessen"
End If
End Sub
Private Sub cmbMandant_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbMandant.SelectedIndexChanged
Refresh_Grid()
End Sub
@ -336,4 +338,8 @@
End Try
End Sub
Private Sub frmAbschluss_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Refresh_Grid()
End Sub
End Class

View File

@ -1,7 +1,7 @@
Public Class frmAdressChange
Private Sub btnsave_Click(sender As Object, e As EventArgs) Handles btnsave.Click
Dim upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET NAME1 = '{0}', NAME2 = '{1}', STRASSE = '{2}', PLZ = '{3}', ORT = '{4}' WHERE GUID = {5}",
txtName1.Text, txtName1.Text, txtStrasse.Text, txtPLZ.Text, txtOrt.Text, CURRENT_SENDUNG)
txtName1.Text, txtName2.Text, txtStrasse.Text, txtPLZ.Text, txtOrt.Text, CURRENT_SENDUNG)
If ClassDatabase.Execute_non_Query(upd) = True Then
Me.Close()
End If

View File

@ -118,30 +118,34 @@ Public Class frmMain
_EDV_no = ""
End Try
Try
_LS_no = split(1)
_LS_no = RTrim(LTrim(split(1)))
Catch ex As Exception
_LS_no = ""
End Try
If _EDV_no <> String.Empty And _LS_no <> String.Empty Then
Dim getMERC_SELECT = String.Format("select TOP 1 vkkopf_kunde FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
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 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
MsgBox("Für diese Kombination aus Lieferschein und EDV-Nr konnten keine Werte aus mercator geholt werden!", MsgBoxStyle.Exclamation)
MsgBox("Für diese Kombination aus Lieferschein und EDV-Nr konnten keine Werte aus Merkator geholt werden!", MsgBoxStyle.Exclamation)
Return False
End If
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name1])) FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name1])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
Dim MERC_LIEFADR1 = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name2])) FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name2])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
Dim MERC_LIEFADR2 = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_strasse])) FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_strasse])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
Dim MERC_LIEFSTR = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_land_nr])) FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_land_nr])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
Dim MERC_LIEFLAND = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ldplz])) FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ldplz])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
Dim MERC_LIEFPLZ = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ort])) FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ort])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
Dim MERC_LIEFORT = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_gew_netto])) FROM VKKOPF WHERE vkkopf_kopfpos = 0 AND vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_gew_netto])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
Dim MERC_GEWICHT = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
If CURR_LIEFADR = "" And CURR_Ort = "" Then

View File

@ -100,6 +100,9 @@ Partial Class frmPrintOptions
Me.PrintPreviewBarCheckItem17 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem()
Me.DocumentViewerEx1 = New KommiCollo.DocumentViewerEx()
Me.btnUebernahme = New System.Windows.Forms.Button()
Me.Button2 = New System.Windows.Forms.Button()
Me.txtNVE = New System.Windows.Forms.TextBox()
Me.Label2 = New System.Windows.Forms.Label()
CType(Me.VWHUP_REPORT1BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DocumentViewerBarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -839,12 +842,45 @@ Partial Class frmPrintOptions
Me.btnUebernahme.Text = "Übernahmebestätigung"
Me.btnUebernahme.UseVisualStyleBackColor = True
'
'Button2
'
Me.Button2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button2.Image = Global.KommiCollo.My.Resources.Resources.BarCodeHS
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button2.Location = New System.Drawing.Point(766, 55)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(154, 28)
Me.Button2.TabIndex = 26
Me.Button2.Text = "Testetikett"
Me.Button2.UseVisualStyleBackColor = True
'
'txtNVE
'
Me.txtNVE.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtNVE.Location = New System.Drawing.Point(766, 102)
Me.txtNVE.Name = "txtNVE"
Me.txtNVE.Size = New System.Drawing.Size(275, 22)
Me.txtNVE.TabIndex = 31
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label2.Location = New System.Drawing.Point(763, 86)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(53, 13)
Me.Label2.TabIndex = 32
Me.Label2.Text = "Test NVE:"
'
'frmPrintOptions
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.Cancel_Button
Me.ClientSize = New System.Drawing.Size(1070, 699)
Me.Controls.Add(Me.Label2)
Me.Controls.Add(Me.txtNVE)
Me.Controls.Add(Me.Button2)
Me.Controls.Add(Me.DocumentViewerEx1)
Me.Controls.Add(Me.btnUebernahme)
Me.Controls.Add(Me.Cancel_Button)
@ -951,4 +987,7 @@ Partial Class frmPrintOptions
Friend WithEvents PrintPreviewBarCheckItem17 As DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem
Friend WithEvents DocumentViewerEx1 As DocumentViewerEx
Friend WithEvents btnUebernahme As Button
Friend WithEvents Button2 As Button
Friend WithEvents Label2 As Label
Friend WithEvents txtNVE As TextBox
End Class

View File

@ -136,7 +136,7 @@
<data name="DocumentViewerBarManager1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
MTUuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhDAMAAABR
MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhDAMAAABR
U3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlU
b2tlbj1iMDNmNWY3ZjExZDUwYTNhBQEAAAAoRGV2RXhwcmVzcy5VdGlscy5JbWFnZUNvbGxlY3Rpb25T
dHJlYW1lcgIAAAAJSW1hZ2VTaXplBERhdGEEBxNTeXN0ZW0uRHJhd2luZy5TaXplAwAAAAICAAAABfz/

View File

@ -25,6 +25,9 @@ Public Class frmPrintOptions
SQL = "SELECT * FROM TBKOMMCOLLI_SDG_LHM where SENDUNGNR = " & CURRENT_SENDUNG
Dim DTKOMMCOLLI_SDG_LHM As DataTable = ClassDatabase.Return_Datatable(SQL)
If DTKOMMCOLLI_SDG_LHM.Rows.Count > 0 Then
SQL = "SELECT COUNT(*) FROM TBKOMMCOLLI_SDG_LHM where SENDUNGNR = " & CURRENT_SENDUNG
Dim PS = ClassDatabase.Execute_Scalar(SQL, True)
For Each row As DataRow In DTKOMMCOLLI_SDG_LHM.Rows
Dim NAME1 = DTSENDUNG.Rows(0).Item("NAME1").ToString.Trim
Dim STRASSE = DTSENDUNG.Rows(0).Item("STRASSE").ToString.Trim
@ -32,6 +35,7 @@ Public Class frmPrintOptions
Dim LKZ = DTSENDUNG.Rows(0).Item("LKZ").ToString.Trim
Dim ORT = DTSENDUNG.Rows(0).Item("ORT").ToString.Trim
Dim NVE = row.Item("NVE")
'Dim PS = row.Item("PACKSTUECKANZAHL")
If IsDBNull(NVE) Then
MsgBox("Es wurden noch keine NVE's erzeugt. Schliessen Sie die Sendung ab!")
Dim result As MsgBoxResult = MsgBox("Wollen Sie ein Beispieletikett drucken?", MsgBoxStyle.YesNo, "Bitte bestätigen")
@ -40,7 +44,7 @@ Public Class frmPrintOptions
PrintViaIP(CURR_IP_PRINTER, NAME1, STRASSE, PLZ, LKZ, ORT, "123456789101112", 1)
End If
Else
PrintViaIP(CURR_IP_PRINTER, NAME1, STRASSE, PLZ, LKZ, ORT, NVE, Me.txtAnzahl.Text)
PrintViaIP(CURR_IP_PRINTER, NAME1, STRASSE, PLZ, LKZ, ORT, NVE, Me.txtAnzahl.Text, PS)
End If
Next
@ -53,7 +57,8 @@ Public Class frmPrintOptions
End Try
End Sub
Sub PrintViaIP(IP As String, empname As String, empStrasse As String, empPLZ As String, empLKZ As String, empOrt As String, _NVE As String, Optional Anz As Integer = 1)
Sub PrintViaIP(IP As String, empname As String, empStrasse As String, empPLZ As String, empLKZ As String, empOrt As String, _NVE As String,
Optional Anz As Integer = 1, Optional Packstueck As Integer = 1)
Try
Dim ipAddress As String = IP
Dim port As Integer = 9100
@ -82,7 +87,7 @@ Public Class frmPrintOptions
pText.AppendLine("^FO405,600^GB1,500,3^FS")
pText.AppendLine("^AT^^FO360,610^CI27^^FDAnzahl Packstücke:^FS")
pText.AppendLine("^AT^^FO360,950^FD99^FS") 'Anzahl Packstücke Linie
pText.AppendLine("^AT^^FO360,950^FD" & Packstueck.ToString & "^FS") 'Anzahl Packstücke Linie
pText.AppendLine("^FO330,600^GB1,500,3^FS")
pText.AppendLine("^AT^FO290,610^CI27^^FDEmpfänger:^FS")
pText.AppendLine("^AU^FO230,610^CI27^^FD" & empname & "^FS")
@ -130,4 +135,15 @@ Public Class frmPrintOptions
report.CreateDocument(False)
DocumentViewerEx1.Source = report
End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
If txtNVE.Text <> "" Then
PrintViaIP(CURR_IP_PRINTER, "Hans Mustermann", "Musermannstrasse 1", "12345", "DE", "Musterstadt", txtNVE.Text, 1)
End If
End Sub
Private Sub txtAnzahl_TextChanged(sender As Object, e As EventArgs) Handles txtAnzahl.TextChanged
End Sub
End Class

View File

@ -952,6 +952,8 @@ E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debu
E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe
E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.xml
E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.pdb
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmAbschluss.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmLabel.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\Testreport.rdlc
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\KommiCollo.exe.config
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\KommiCollo.exe
@ -1130,10 +1132,8 @@ E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debu
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\ru\DevExpress.Pdf.v15.2.Core.resources.dll
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbprojResolveAssemblyReference.cache
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.DocumentViewerEx.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmAbschluss.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmAdressChange.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmConnection.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmLabel.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmMain.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmPrintOptions.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmStammdatenverwaltung.resources
@ -1141,6 +1141,7 @@ E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.reportUebergabe.resources
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.GenerateResource.Cache
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe.licenses
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.CoreCompileInputs.cache
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.xml
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.pdb