WIP
This commit is contained in:
@@ -82,7 +82,8 @@ CREATE TABLE [dbo].[TBEDI_XML_ITEMS](
|
||||
[XML_NAME] [nvarchar](50) NOT NULL,
|
||||
[XML_NODE_ID] [int] NOT NULL,
|
||||
[XML_TYPE_ID] [int] NOT NULL,
|
||||
[READ_ONLY] [bit] NOT NULL,
|
||||
[IS_READ_ONLY] [bit] NOT NULL,
|
||||
[IS_VISIBLE] [bit] NOT NULL,
|
||||
[FUNCTION_ID] [int] NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
@@ -96,8 +97,8 @@ ALTER TABLE [dbo].[TBEDI_XML_ITEMS]
|
||||
REFERENCES [dbo].[TBEDI_XML_ITEMS] (GUID)
|
||||
|
||||
ALTER TABLE [dbo].[TBEDI_XML_ITEMS]
|
||||
ADD CONSTRAINT DF_TBEDI_XML_ITEMS_READ_ONLY
|
||||
DEFAULT 0 FOR READ_ONLY
|
||||
ADD CONSTRAINT DF_TBEDI_XML_ITEMS_IS_READ_ONLY
|
||||
DEFAULT 0 FOR IS_READ_ONLY
|
||||
|
||||
|
||||
DROP VIEW [dbo].[VWEDI_XML_ITEMS]
|
||||
@@ -114,7 +115,8 @@ AS
|
||||
,[TBFUNCTIONS].[GUID] [FUNCTION_ID]
|
||||
,[TBFUNCTIONS].[NAME] [FUNCTION_NAME]
|
||||
,[TBFUNCTIONS].[PARAMETERS] [FUNCTION_PARAMETERS]
|
||||
,[TBITEMS].[READ_ONLY]
|
||||
,[TBITEMS].[IS_READ_ONLY]
|
||||
,[TBITEMS].[IS_VISIBLE]
|
||||
FROM
|
||||
[dbo].[TBEDI_XML_ITEMS] [TBITEMS]
|
||||
INNER JOIN [dbo].[TBEDI_XML_NODES] [TBNODES] ON [TBITEMS].[XML_NODE_ID] = [TBNODES].[GUID]
|
||||
@@ -127,33 +129,58 @@ GO
|
||||
|
||||
/* Kopfdaten */
|
||||
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('BELEGKEY', 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Fakt_Kontonummer', 1, 1, 1, 1)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Laufnummer', 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Bestellt_von', 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Lief_Kontonummer', 1, 1, 1, 1)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Belegart', 1, 2, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Datum_Auftrag-Bestellung', 1, 3, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Auftrags-Bestellnummer', 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Leistungsdatum', 1, 3, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Infotext', 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('BELEGKEY', 1, 1, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Fakt_Kontonummer', 1, 1, 1, 1, 1)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Laufnummer', 1, 1, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Bestellt_von', 1, 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Lief_Kontonummer', 1, 1, 1, 1, 1)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Belegart', 1, 2, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Datum_Auftrag-Bestellung', 1, 3, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Auftrags-Bestellnummer', 1, 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Leistungsdatum', 1, 3, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Infotext', 1, 1, 1, 0, NULL)
|
||||
|
||||
/* Positionsdaten */
|
||||
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('BELEGKEY', 2, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Zeilennummer', 2, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Datentyp', 2, 2, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Artikelnummer', 2, 1, 1, 2)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Bezeichnung', 2, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Lieferantenartikelnummer', 2, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Menge_bestellt', 2, 5, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Menge_geliefert', 2, 5, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Colli', 2, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Einzelpreis', 2, 5, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Zeilenrabatt1', 2, 5, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Zeilenrabatt2', 2, 5, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Zeilenrabatt3', 2, 5, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Zeilenrabatt4', 2, 5, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('Umsatzsteuerprozent_Zeile', 2, 2, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, READ_ONLY, FUNCTION_ID) VALUES ('EDI_Infotext', 2, 1, 1, NULL)
|
||||
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('BELEGKEY', 2, 1, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Zeilennummer', 2, 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Datentyp', 2, 2, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Artikelnummer', 2, 1, 1, 1, 2)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Bezeichnung', 2, 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Lieferantenartikelnummer', 2, 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Menge_bestellt', 2, 5, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Menge_geliefert', 2, 5, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Colli', 2, 1, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Einzelpreis', 2, 5, 1, 1, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Zeilenrabatt1', 2, 5, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Zeilenrabatt2', 2, 5, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Zeilenrabatt3', 2, 5, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Zeilenrabatt4', 2, 5, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('Umsatzsteuerprozent_Zeile', 2, 2, 1, 0, NULL)
|
||||
INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
|
||||
VALUES ('EDI_Infotext', 2, 1, 1, 0, NULL)
|
||||
@@ -38,4 +38,12 @@
|
||||
MyBase.New(message)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Public Class MalformedXmlException
|
||||
Inherits ApplicationException
|
||||
|
||||
Public Sub New(message As String)
|
||||
MyBase.New(message)
|
||||
End Sub
|
||||
End Class
|
||||
End Class
|
||||
|
||||
16
EDIDocumentImport/FormHelpers.vb
Normal file
16
EDIDocumentImport/FormHelpers.vb
Normal file
@@ -0,0 +1,16 @@
|
||||
Imports DigitalData.Modules.Logging
|
||||
|
||||
Public Class Message
|
||||
Private Logger As Logger
|
||||
|
||||
Public Sub New(pLogConfig As LogConfig)
|
||||
Logger = pLogConfig.GetLogger()
|
||||
End Sub
|
||||
|
||||
Public Sub [Error](pException As Exception, pMessage As String)
|
||||
Logger.Error(pException)
|
||||
Dim oMessage As String = $"{pMessage}{vbNewLine}{vbNewLine}{pException.Message}"
|
||||
MsgBox(oMessage, MsgBoxStyle.Critical, "Schwerwiegender Fehler")
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -18,9 +18,14 @@ Public Class GridLoader
|
||||
}
|
||||
|
||||
Dim oInvisibleColumns As New List(Of String) From {
|
||||
"Zeilennummer",
|
||||
"BELEGKEY",
|
||||
"Infotext"
|
||||
"Zeilennummer",
|
||||
"Belegart",
|
||||
"Infotext",
|
||||
"Leistungsdatum",
|
||||
"Projektnummer",
|
||||
"Auftragsreferenz",
|
||||
"Laufnummer"
|
||||
}
|
||||
|
||||
oGrid.ForceInitialize()
|
||||
@@ -63,16 +68,16 @@ Public Class GridLoader
|
||||
|
||||
Private Function GetColumnType(pColumn As Schemas.Schema.Column)
|
||||
Select Case pColumn.DataType
|
||||
Case Schemas.Schema.ColumnType.Boolean
|
||||
Case ImporterShared.Constants.ColumnType.Boolean
|
||||
Return DevExpress.Data.UnboundColumnType.Boolean
|
||||
|
||||
Case Schemas.Schema.ColumnType.Date
|
||||
Case ImporterShared.Constants.ColumnType.Date
|
||||
Return DevExpress.Data.UnboundColumnType.DateTime
|
||||
|
||||
Case Schemas.Schema.ColumnType.Integer
|
||||
Case ImporterShared.Constants.ColumnType.Integer
|
||||
Return DevExpress.Data.UnboundColumnType.Integer
|
||||
|
||||
Case Schemas.Schema.ColumnType.Decimal
|
||||
Case ImporterShared.Constants.ColumnType.Decimal
|
||||
Return DevExpress.Data.UnboundColumnType.Decimal
|
||||
|
||||
Case Else
|
||||
|
||||
@@ -151,6 +151,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Exceptions.vb" />
|
||||
<Compile Include="FormHelpers.vb" />
|
||||
<Compile Include="frmImportMain.Designer.vb">
|
||||
<DependentUpon>frmImportMain.vb</DependentUpon>
|
||||
</Compile>
|
||||
|
||||
37
EDIDocumentImport/frmImportMain.Designer.vb
generated
37
EDIDocumentImport/frmImportMain.Designer.vb
generated
@@ -42,6 +42,7 @@ Partial Class frmImportMain
|
||||
Me.SplitContainerGrids = New DevExpress.XtraEditors.SplitContainerControl()
|
||||
Me.SplitContainerGrids1 = New DevExpress.XtraEditors.SplitContainerControl()
|
||||
Me.SplitContainerGrids2 = New DevExpress.XtraEditors.SplitContainerControl()
|
||||
Me.txtMandator = New DevExpress.XtraBars.BarStaticItem()
|
||||
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SplitContainerControl1.SuspendLayout()
|
||||
@@ -60,9 +61,9 @@ Partial Class frmImportMain
|
||||
'RibbonControl
|
||||
'
|
||||
Me.RibbonControl.ExpandCollapseItem.Id = 0
|
||||
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile})
|
||||
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.txtMandator})
|
||||
Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
|
||||
Me.RibbonControl.MaxItemId = 12
|
||||
Me.RibbonControl.MaxItemId = 13
|
||||
Me.RibbonControl.Name = "RibbonControl"
|
||||
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
||||
Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||
@@ -75,15 +76,17 @@ Partial Class frmImportMain
|
||||
'txtVersion
|
||||
'
|
||||
Me.txtVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
|
||||
Me.txtVersion.Caption = "BarStaticItem1"
|
||||
Me.txtVersion.Caption = "Version 1.0.0.0"
|
||||
Me.txtVersion.Id = 1
|
||||
Me.txtVersion.Name = "txtVersion"
|
||||
Me.txtVersion.Tag = "Version {0}"
|
||||
'
|
||||
'txtFilesLoaded
|
||||
'
|
||||
Me.txtFilesLoaded.Caption = "BarStaticItem2"
|
||||
Me.txtFilesLoaded.Caption = "0 Dateien geladen"
|
||||
Me.txtFilesLoaded.Id = 2
|
||||
Me.txtFilesLoaded.Name = "txtFilesLoaded"
|
||||
Me.txtFilesLoaded.Tag = "{0} Dateien geladen"
|
||||
'
|
||||
'btnLoadFiles
|
||||
'
|
||||
@@ -154,6 +157,7 @@ Partial Class frmImportMain
|
||||
'
|
||||
Me.RibbonStatusBar.ItemLinks.Add(Me.txtVersion)
|
||||
Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded)
|
||||
Me.RibbonStatusBar.ItemLinks.Add(Me.txtMandator)
|
||||
Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 722)
|
||||
Me.RibbonStatusBar.Name = "RibbonStatusBar"
|
||||
Me.RibbonStatusBar.Ribbon = Me.RibbonControl
|
||||
@@ -169,7 +173,7 @@ Partial Class frmImportMain
|
||||
Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerMain)
|
||||
Me.SplitContainerControl1.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerControl1.Size = New System.Drawing.Size(1215, 590)
|
||||
Me.SplitContainerControl1.SplitterPosition = 325
|
||||
Me.SplitContainerControl1.SplitterPosition = 362
|
||||
Me.SplitContainerControl1.TabIndex = 2
|
||||
'
|
||||
'GridControlFiles
|
||||
@@ -179,7 +183,7 @@ Partial Class frmImportMain
|
||||
Me.GridControlFiles.MainView = Me.GridViewFiles
|
||||
Me.GridControlFiles.MenuManager = Me.RibbonControl
|
||||
Me.GridControlFiles.Name = "GridControlFiles"
|
||||
Me.GridControlFiles.Size = New System.Drawing.Size(325, 590)
|
||||
Me.GridControlFiles.Size = New System.Drawing.Size(362, 590)
|
||||
Me.GridControlFiles.TabIndex = 0
|
||||
Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles})
|
||||
'
|
||||
@@ -188,6 +192,8 @@ Partial Class frmImportMain
|
||||
Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelected, Me.colFilename})
|
||||
Me.GridViewFiles.GridControl = Me.GridControlFiles
|
||||
Me.GridViewFiles.Name = "GridViewFiles"
|
||||
Me.GridViewFiles.OptionsView.ShowDetailButtons = False
|
||||
Me.GridViewFiles.OptionsView.ShowIndicator = False
|
||||
'
|
||||
'colSelected
|
||||
'
|
||||
@@ -195,6 +201,8 @@ Partial Class frmImportMain
|
||||
Me.colSelected.FieldName = "Selected"
|
||||
Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
|
||||
Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
|
||||
Me.colSelected.MaxWidth = 30
|
||||
Me.colSelected.MinWidth = 30
|
||||
Me.colSelected.Name = "colSelected"
|
||||
Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean]
|
||||
Me.colSelected.Visible = True
|
||||
@@ -208,6 +216,7 @@ Partial Class frmImportMain
|
||||
Me.colFilename.Name = "colFilename"
|
||||
Me.colFilename.Visible = True
|
||||
Me.colFilename.VisibleIndex = 1
|
||||
Me.colFilename.Width = 333
|
||||
'
|
||||
'SplitContainerMain
|
||||
'
|
||||
@@ -218,7 +227,7 @@ Partial Class frmImportMain
|
||||
Me.SplitContainerMain.Panel1.Text = "Panel1"
|
||||
Me.SplitContainerMain.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerMain.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1
|
||||
Me.SplitContainerMain.Size = New System.Drawing.Size(880, 590)
|
||||
Me.SplitContainerMain.Size = New System.Drawing.Size(843, 590)
|
||||
Me.SplitContainerMain.SplitterPosition = 588
|
||||
Me.SplitContainerMain.TabIndex = 1
|
||||
'
|
||||
@@ -232,7 +241,7 @@ Partial Class frmImportMain
|
||||
Me.SplitContainerGrids.Panel1.Text = "Panel1"
|
||||
Me.SplitContainerGrids.Panel2.Controls.Add(Me.SplitContainerGrids2)
|
||||
Me.SplitContainerGrids.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerGrids.Size = New System.Drawing.Size(880, 590)
|
||||
Me.SplitContainerGrids.Size = New System.Drawing.Size(843, 590)
|
||||
Me.SplitContainerGrids.SplitterPosition = 288
|
||||
Me.SplitContainerGrids.TabIndex = 0
|
||||
'
|
||||
@@ -244,7 +253,7 @@ Partial Class frmImportMain
|
||||
Me.SplitContainerGrids1.Name = "SplitContainerGrids1"
|
||||
Me.SplitContainerGrids1.Panel1.Text = "Panel1"
|
||||
Me.SplitContainerGrids1.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerGrids1.Size = New System.Drawing.Size(880, 288)
|
||||
Me.SplitContainerGrids1.Size = New System.Drawing.Size(843, 288)
|
||||
Me.SplitContainerGrids1.SplitterPosition = 118
|
||||
Me.SplitContainerGrids1.TabIndex = 0
|
||||
'
|
||||
@@ -256,10 +265,17 @@ Partial Class frmImportMain
|
||||
Me.SplitContainerGrids2.Name = "SplitContainerGrids2"
|
||||
Me.SplitContainerGrids2.Panel1.Text = "Panel1"
|
||||
Me.SplitContainerGrids2.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerGrids2.Size = New System.Drawing.Size(880, 292)
|
||||
Me.SplitContainerGrids2.Size = New System.Drawing.Size(843, 292)
|
||||
Me.SplitContainerGrids2.SplitterPosition = 126
|
||||
Me.SplitContainerGrids2.TabIndex = 0
|
||||
'
|
||||
'txtMandator
|
||||
'
|
||||
Me.txtMandator.Caption = "Mandant: Keiner"
|
||||
Me.txtMandator.Id = 12
|
||||
Me.txtMandator.Name = "txtMandator"
|
||||
Me.txtMandator.Tag = "Mandant: {0}"
|
||||
'
|
||||
'frmImportMain
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@@ -312,4 +328,5 @@ Partial Class frmImportMain
|
||||
Friend WithEvents btnOpenSchemaDirectory As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl
|
||||
Friend WithEvents btnReloadFile As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents txtMandator As DevExpress.XtraBars.BarStaticItem
|
||||
End Class
|
||||
|
||||
@@ -24,75 +24,92 @@ Public Class frmImportMain
|
||||
Private PositionData As PositionData
|
||||
Private DocumentLoader As Documents.DocumentLoader
|
||||
Private SchemaLoader As Schemas.SchemaLoader
|
||||
Private Message As Message
|
||||
|
||||
Private Grids As List(Of GridControl)
|
||||
Private GridLoader As GridLoader
|
||||
Private GridBuilder As GridBuilder
|
||||
|
||||
Private CurrentSchema As String
|
||||
Private CurrentSchemaName As String
|
||||
Private CurrentSchema As Schema
|
||||
Private CurrentDocument As Document
|
||||
|
||||
Private Sub frmImportMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
txtVersion.Caption = String.Format(txtVersion.Caption, Application.ProductVersion)
|
||||
Try
|
||||
txtVersion.Caption = String.Format(txtVersion.Caption, Application.ProductVersion)
|
||||
|
||||
LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "EDI Document Importer")
|
||||
Logger = LogConfig.GetLogger()
|
||||
Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion)
|
||||
LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "EDI Document Importer")
|
||||
Logger = LogConfig.GetLogger()
|
||||
Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion)
|
||||
|
||||
ConfigManager = New ConfigManager(Of Config)(LogConfig,
|
||||
ConfigManager = New ConfigManager(Of Config)(LogConfig,
|
||||
Application.UserAppDataPath,
|
||||
Application.CommonAppDataPath,
|
||||
Application.StartupPath)
|
||||
|
||||
GridBuilder = New GridBuilder(GridViewFiles)
|
||||
GridBuilder.
|
||||
Message = New Message(LogConfig)
|
||||
|
||||
GridBuilder = New GridBuilder(GridViewFiles)
|
||||
GridBuilder.
|
||||
WithDefaults.
|
||||
WithReadOnlyOptions.
|
||||
WithClipboardHandler()
|
||||
|
||||
FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
|
||||
FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
|
||||
|
||||
' If ConnectionString does not exist, show SQL Config Form
|
||||
If ConfigManager.Config.ConnectionString = String.Empty Then
|
||||
Dim oForm As New frmSQLConfig(LogConfig) With {
|
||||
' If ConnectionString does not exist, show SQL Config Form
|
||||
If ConfigManager.Config.ConnectionString = String.Empty Then
|
||||
Dim oForm As New frmSQLConfig(LogConfig) With {
|
||||
.FormTitle = "EDI Document Importer"
|
||||
}
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
|
||||
If oResult = DialogResult.OK Then
|
||||
ConfigManager.Config.ConnectionString = oForm.ConnectionString
|
||||
ConfigManager.Save()
|
||||
If oResult = DialogResult.OK Then
|
||||
ConfigManager.Config.ConnectionString = oForm.ConnectionString
|
||||
ConfigManager.Save()
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
' Initialize Database
|
||||
Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
|
||||
Database = New MSSQLServer(LogConfig, oConnectionString)
|
||||
Winline = New Data(LogConfig, Database, ConfigManager.Config)
|
||||
WebService = New WebService(LogConfig, ConfigManager.Config)
|
||||
PositionData = New PositionData(LogConfig, Winline)
|
||||
|
||||
' Initialize Database
|
||||
Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
|
||||
Database = New MSSQLServer(LogConfig, oConnectionString)
|
||||
Winline = New Data(LogConfig, Database, ConfigManager.Config)
|
||||
WebService = New WebService(LogConfig, ConfigManager.Config)
|
||||
PositionData = New PositionData(LogConfig, Winline)
|
||||
Catch ex As Exception
|
||||
Message.Error(ex, "Fehler beim Initialisieren der Anwendung Daten")
|
||||
End Try
|
||||
|
||||
' Load WinLine Data
|
||||
Winline.Mandators.Clear()
|
||||
Winline.LoadMandators()
|
||||
Winline.LoadEconomicYears()
|
||||
Winline.LoadDocumentKinds(Winline.Mandators)
|
||||
Winline.LoadTemplateConfiguration()
|
||||
For Each oMandator In Winline.Mandators
|
||||
Winline.LoadAccounts(oMandator)
|
||||
Next
|
||||
Try
|
||||
Winline.Mandators.Clear()
|
||||
Winline.LoadMandators()
|
||||
Winline.LoadEconomicYears()
|
||||
Winline.LoadDocumentKinds(Winline.Mandators)
|
||||
Winline.LoadTemplateConfiguration()
|
||||
For Each oMandator In Winline.Mandators
|
||||
Winline.LoadAccounts(oMandator)
|
||||
Next
|
||||
Catch ex As Exception
|
||||
Message.Error(ex, "Fehler beim Laden der WinLine Daten")
|
||||
End Try
|
||||
|
||||
DocumentLoader = New DocumentLoader(LogConfig, Winline)
|
||||
SchemaLoader = New SchemaLoader(LogConfig)
|
||||
GridLoader = New GridLoader(LogConfig)
|
||||
Try
|
||||
DocumentLoader = New DocumentLoader(LogConfig, Winline)
|
||||
SchemaLoader = New SchemaLoader(LogConfig)
|
||||
GridLoader = New GridLoader(LogConfig)
|
||||
|
||||
SchemaLoader.LoadFiles(ConfigManager.Config.SchemaDirectory)
|
||||
CurrentSchema = SchemaLoader.SchemaList.First().FullName
|
||||
|
||||
Dim oSchema = SchemaLoader.GetSchemaFromFile(CurrentSchema)
|
||||
Grids = CreateGridsAndColumns(oSchema)
|
||||
SchemaLoader.LoadFiles(ConfigManager.Config.SchemaDirectory)
|
||||
CurrentSchemaName = SchemaLoader.SchemaList.First().FullName
|
||||
CurrentSchema = SchemaLoader.GetSchemaFromFile(CurrentSchemaName)
|
||||
|
||||
Grids = CreateGridsAndColumns(CurrentSchema)
|
||||
Catch ex As Exception
|
||||
Message.Error(ex, "Fehler beim Laden der Vorlagen Daten")
|
||||
End Try
|
||||
|
||||
txtVersion.Caption = String.Format(txtVersion.Tag.ToString, My.Application.Info.Version.ToString)
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -175,8 +192,9 @@ Public Class frmImportMain
|
||||
End Sub
|
||||
|
||||
Private Sub btnLoadFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnLoadFiles.ItemClick
|
||||
If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory) Then
|
||||
If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory, CurrentSchema) Then
|
||||
GridControlFiles.DataSource = DocumentLoader.Files
|
||||
txtFilesLoaded.Caption = String.Format(txtFilesLoaded.Tag.ToString, DocumentLoader.Files.Count)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -280,7 +298,7 @@ Public Class frmImportMain
|
||||
If oResult = DialogResult.Yes Then
|
||||
Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
|
||||
|
||||
Dim oNewDocument = DocumentLoader.LoadFile(oDocument.File)
|
||||
Dim oNewDocument = DocumentLoader.LoadFile(oDocument.File, CurrentSchema)
|
||||
Dim oIndex = DocumentLoader.Files.IndexOf(oDocument)
|
||||
DocumentLoader.Files.Item(oIndex) = oNewDocument
|
||||
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
Imports System.IO
|
||||
Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DevExpress.XtraGrid.Columns
|
||||
Imports DevExpress.XtraRichEdit
|
||||
Imports DevExpress.XtraEditors
|
||||
Imports DevExpress.XtraReports.UI
|
||||
Imports DevExpress.DataAccess.ObjectBinding
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Config
|
||||
@@ -12,9 +9,7 @@ Imports DigitalData.Controls.SQLConfig
|
||||
Imports DigitalData.GUIs.Common
|
||||
Imports ImporterShared.Documents
|
||||
Imports ImporterShared.Winline
|
||||
Imports ImporterShared.Schemas
|
||||
Imports ImporterForm.Positions
|
||||
Imports DevExpress.XtraLayout
|
||||
|
||||
Public Class frmImportMain_old
|
||||
Public LogConfig As LogConfig
|
||||
@@ -125,7 +120,7 @@ Public Class frmImportMain_old
|
||||
|
||||
Private Sub btnLoadDocuments_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnLoadDocuments.ItemClick
|
||||
Try
|
||||
If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory) = True Then
|
||||
If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory, Nothing) = True Then
|
||||
|
||||
RibbonGroupDataTransmission.Enabled = True
|
||||
RibbonGroupDocument.Enabled = True
|
||||
|
||||
@@ -5,16 +5,17 @@ Imports ImporterShared.Documents
|
||||
Imports ImporterShared.DocumentRow
|
||||
Imports DevExpress.XtraEditors.Repository
|
||||
Imports ImporterShared.Winline
|
||||
Imports DigitalData.Modules.Language
|
||||
|
||||
Public Class frmRowEditor
|
||||
Private ReadOnly _Columns As List(Of String)
|
||||
Private ReadOnly _DataTable As New DataTable
|
||||
Private ReadOnly _Accounts As List(Of Account)
|
||||
Private _DocumentRow As ImporterShared.DocumentRow
|
||||
Private ReadOnly _DocumentRow As ImporterShared.DocumentRow
|
||||
|
||||
Private DatePicker As New RepositoryItemDateEdit()
|
||||
Private MultilineEditor As New RepositoryItemMemoEdit()
|
||||
Private AccountPicker As New RepositoryItemSearchLookUpEdit
|
||||
Private ReadOnly DatePicker As New RepositoryItemDateEdit()
|
||||
Private ReadOnly MultilineEditor As New RepositoryItemMemoEdit()
|
||||
Private ReadOnly AccountPicker As New RepositoryItemSearchLookUpEdit
|
||||
|
||||
Private Const COL_KEY = "KEY"
|
||||
Private Const COL_VALUE_ORIGINAL = "VALUE_ORIGINAL"
|
||||
@@ -39,6 +40,11 @@ Public Class frmRowEditor
|
||||
AccountPicker.DataSource = _Accounts
|
||||
AccountPicker.DisplayMember = "Name"
|
||||
AccountPicker.ValueMember = "Id"
|
||||
|
||||
'DatePicker.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime
|
||||
'DatePicker.EditFormat.FormatString = "dd/MM/yyyy"
|
||||
'DatePicker.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
|
||||
'DatePicker.DisplayFormat.FormatString = "yyyy-MM-dd"
|
||||
End Sub
|
||||
|
||||
Private Sub frmRowEditor_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
@@ -82,8 +88,8 @@ Public Class frmRowEditor
|
||||
oField = New KeyValuePair(Of String, FieldValue)(oRow.Item(COL_KEY), New FieldValue())
|
||||
End If
|
||||
|
||||
Dim oFieldValue = oField.Value
|
||||
oFieldValue.Final = oRow.Item(COL_VALUE_FINAL)
|
||||
Dim oFieldValue As FieldValue = oField.Value
|
||||
oFieldValue.Final = Utils.Notnull(oRow.Item(COL_VALUE_FINAL), String.Empty)
|
||||
|
||||
If _DocumentRow.Fields.ContainsKey(oField.Key) Then
|
||||
_DocumentRow.Fields.Item(oField.Key) = oFieldValue
|
||||
|
||||
Reference in New Issue
Block a user