support custom windows for article window
This commit is contained in:
parent
a020fbc480
commit
a143aaf09e
@ -111,11 +111,11 @@ Public Class Winline
|
||||
|
||||
For Each oRow As DataRow In oDatatable.Rows
|
||||
Dim oVersion As New ProductVersion() With {
|
||||
.Guid = oRow.Item("GUID"),
|
||||
.VersionId = oRow.Item("VERSION"),
|
||||
.GroupId = oRow.Item("GROUP_ID"),
|
||||
.Name = oRow.Item("NAME"),
|
||||
.Code = oRow.Item("CODE")
|
||||
.Guid = NotNull(oRow.Item("GUID"), 0),
|
||||
.VersionId = NotNull(oRow.Item("VERSION"), 0),
|
||||
.GroupId = NotNull(oRow.Item("GROUP_ID"), 0),
|
||||
.Name = NotNull(oRow.Item("NAME"), "(Kein Name)"),
|
||||
.Code = NotNull(oRow.Item("CODE"), "(Kein Code)")
|
||||
}
|
||||
|
||||
oVersions.Add(oVersion)
|
||||
|
||||
@ -8,6 +8,10 @@
|
||||
Private ReadOnly Config As Config = My.Application.ConfigManager.Config
|
||||
Private ReadOnly Logger As Logger = My.Application.LogConfig.GetLogger
|
||||
|
||||
Private Const TEMPLATE_NUMBER_NORMAL_ARTICLE = 45
|
||||
Private Const TEMPLATE_NUMBER_SERIAL_ARTICLE = 46
|
||||
Private Const CUSTOM_WINDOW_ID = 529
|
||||
|
||||
Private Sub frmCreateArticle_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
txtRunningNumber.Text = RunningNumber
|
||||
txtArticleNumber.Text = ArticleNumber
|
||||
@ -57,7 +61,7 @@
|
||||
Dim oArticle = StartArticleCreation(True)
|
||||
If oArticle IsNot Nothing Then
|
||||
My.Computer.Clipboard.SetText(oArticle)
|
||||
My.Application.Winline.RunWinlineMacro(My.Application.ConfigManager.Config.CompletionMacro, oArticle)
|
||||
My.Application.Winline.RunWinlineMacro(My.Application.ConfigManager.Config.CompletionMacro, oArticle, CUSTOM_WINDOW_ID, TEMPLATE_NUMBER_SERIAL_ARTICLE)
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
@ -66,7 +70,7 @@
|
||||
Dim oArticle = StartArticleCreation(False)
|
||||
If oArticle IsNot Nothing Then
|
||||
My.Computer.Clipboard.SetText(oArticle)
|
||||
My.Application.Winline.RunWinlineMacro(My.Application.ConfigManager.Config.CompletionMacro, oArticle)
|
||||
My.Application.Winline.RunWinlineMacro(My.Application.ConfigManager.Config.CompletionMacro, oArticle, CUSTOM_WINDOW_ID, TEMPLATE_NUMBER_NORMAL_ARTICLE)
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
Loading…
x
Reference in New Issue
Block a user