edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vers

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-11-27 14:09:42 +01:00
parent 549e8d595c
commit 8c45d7a12e
2 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

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

72
SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.vb
View File

@@ -669,8 +669,9 @@ Public Class usrCntlTCeZOLL_EZA
Dim startFound As Boolean = False
Dim endFound As Boolean = False
Dim startRows As Integer = -1
If Not checkExcel_trendyol(Blatt) Then 'VALIDIERUNG
If Not checkExcel_trendyol(Blatt, startRows) Then 'VALIDIERUNG
Me.Cursor = Cursors.Default
lblUpload.Visible = False : Return False
End If
@@ -681,7 +682,14 @@ Public Class usrCntlTCeZOLL_EZA
End If
End If
Dim startRows As Integer = 25
MsgBox(startRows)
' Inhalt durchlaufen
Dim endRows As Integer = startRows
While endRows < Blatt.UsedRange.Rows.Count
@@ -713,16 +721,15 @@ Public Class usrCntlTCeZOLL_EZA
Dim sqlTest = "SELECT ezt_Codenummer,case when ezt_text Like '%für Frauen%' then 'Damen' when ezt_text Like '%für Männer%' THEN 'HERREN' ELSE '' END,
case
when ezt_text Like '%aus synthetischen Chemiefasern%' then ', aus synthetischen Chemiefasern'
when ezt_text Like '%Gewirken oder Gestricken%' then ', gewirkt oder gestickt'
when ezt_text Like '%aus Kunststoff%' THEN ', aus Kunststoff'
ELSE '' END,
ezt_text
FROM [VERAG].[dbo].[tblEZT_Importcodenummern]
where ezt_Codenummer LIKE '6206400000%'
"
case
when ezt_text Like '%aus synthetischen Chemiefasern%' then ', aus synthetischen Chemiefasern'
when ezt_text Like '%Gewirken oder Gestricken%' then ', gewirkt oder gestickt'
when ezt_text Like '%aus Kunststoff%' THEN ', aus Kunststoff'
ELSE '' END,
ezt_text
FROM [VERAG].[dbo].[tblEZT_Importcodenummern]
where ezt_Codenummer LIKE '6206400000%'
"
lblUpload.Text = "Laden & Übersetzen..."
@@ -966,12 +973,47 @@ ezt_text
End Try
End Function
Private Function checkExcel_trendyol(Blatt As Excel.Worksheet) As Boolean
Private Function checkExcel_trendyol(Blatt As Excel.Worksheet, ByRef startRows As Integer) As Boolean
'Prüfung
Try
If Blatt Is Nothing Then Return False
If Blatt.Range("B24") Is Nothing Then Return False
If Blatt.Range("B24").Value.ToString <> "DESCRIPTION" Then Return False
'If Blatt.Range("B24") Is Nothing Then Return False
'If Blatt.Range("B24").Value.ToString <> "DESCRIPTION" Then Return False
'---> Start finden:
' Dim startRows As Integer = -1
Dim zeile As Integer = 1
Dim gefunden As Boolean = False
Try
' Schleife durch alle Zeilen
While zeile < 100 Or Blatt.Range("B" & zeile).Value IsNot Nothing
' MsgBox(Blatt.Range("B" & zeile).Value.ToString())
' Überprüfen, ob in Spalte B (2) "DESCRIPTION" steht
If Blatt.Range("B" & zeile).Value IsNot Nothing AndAlso Blatt.Range("B" & zeile).Value.ToString().Trim().ToUpper() = "DESCRIPTION" Then
MsgBox(Blatt.Range("B" & zeile).Value.ToString())
startRows = zeile + 1
gefunden = True
Exit While
End If
zeile += 1
End While
If Not gefunden Then
MsgBox("Format nicht erkannt!")
Me.Cursor = Cursors.Default
lblUpload.Visible = False : Return False
End If
Catch ex As Exception
Console.WriteLine("Fehler: " & ex.Message)
End Try
Catch ex As Exception
MsgBox("Fehler bei der Prüfung!" & ex.Message)