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

Update Modules

Browse Source
This commit is contained in:
Jonathan Jenne
2023-09-13 16:13:10 +02:00
parent 7b3a36336a
commit 77e760f9b4
6 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MultiTool.Common/Winline/WinlineData.vb
View File

@@ -1,8 +1,7 @@
Imports System.Text.RegularExpressions
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.Filesystem
Imports DigitalData.Modules.Base
Imports MultiTool.Common.Winline.Entities
Imports MultiTool.Common.Constants
Imports MultiTool.Common.Templates
@@ -17,7 +16,7 @@ Namespace Winline
Private ReadOnly Property MandatorConfig As MandatorConfig
Private ReadOnly Property MappingConfig As MappingConfig
Private ReadOnly Property Patterns As Patterns
Private ReadOnly Property FileEx As File
Private ReadOnly Property FileEx As FilesystemEx
Public Property Articles As New List(Of Article)
Public Property Accounts As New List(Of Account)
@@ -33,7 +32,7 @@ Namespace Winline
Config = pConfig
MandatorConfig = pMandatorConfig
MappingConfig = pMappingConfig
FileEx = New File(pLogConfig)
FileEx = New FilesystemEx(pLogConfig)
Years = LoadEconomicYears()
End Sub
@@ -572,7 +571,7 @@ Namespace Winline
FROM [{pMandator.Database}].[dbo].[v021]
WHERE [c011] = '{pArticleNumber}'
AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
Dim oEAN As String = Utils.NotNull(Database.GetScalarValue(oSQL), Nothing)
Dim oEAN As String = ObjectEx.NotNull(Database.GetScalarValue(oSQL), Nothing)
' EAN not found in this Mandator, continue to next one
If oEAN Is Nothing Then
@@ -942,7 +941,7 @@ Namespace Winline
Return pRunningNumber
Else
Logger.Debug("Running number [{0}] already exists. Checking again.", pRunningNumber)
Dim oVersionResult = FileEx.GetVersionedString(pRunningNumber, "~"c)
Dim oVersionResult = FileEx.GetVersionedString(pRunningNumber)
Dim oNewVersion = oVersionResult.Item2 + 1
Dim oFinalLength As Integer = oVersionResult.Item1.Count + oNewVersion.ToString.Count + 1