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

jj: merge

Browse Source
This commit is contained in:
Jonathan Jenne
2018-05-15 11:08:07 +02:00
parent 28dcddec33 4da319f88b
commit a43e94020d
11 changed files with 52 additions and 1345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
SchaumKommiCollo/.vs/KommiCollo/v15/.suo
View File

Binary file not shown.

1346
SchaumKommiCollo/KommiCollo/MyDataset.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

9
SchaumKommiCollo/KommiCollo/MyDataset.xsd
View File

@@ -918,10 +918,11 @@ SELECT GUID, SENDUNGNR, SDG_LHM_ID, PACKSTUECKANZAHL, POSINHALT, GEWICHT, FRACHT
<MainSource> <MainSource>
<DbSource ConnectionRef="SCHAUM_IIDConnectionString (MySettings)" DbObjectName="SCHAUM_IID.dbo.TBKOMMCOLLI_TEXTSCHLUESSEL" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill"> <DbSource ConnectionRef="SCHAUM_IIDConnectionString (MySettings)" DbObjectName="SCHAUM_IID.dbo.TBKOMMCOLLI_TEXTSCHLUESSEL" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand> <SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true"> <DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT GUID, BEZEICHNUNG <CommandText>SELECT GUID, CODE + '-' + BEZEICHNUNG AS BEZEICHNUNG
FROM TBKOMMCOLLI_TEXTSCHLUESSEL FROM TBKOMMCOLLI_TEXTSCHLUESSEL
WHERE (AKTIV = 1) AND (QUALIFIER = 0)</CommandText> WHERE (AKTIV = 1) AND (QUALIFIER = 0)
ORDER BY CODE</CommandText>
<Parameters /> <Parameters />
</DbCommand> </DbCommand>
</SelectCommand> </SelectCommand>
@@ -1347,7 +1348,7 @@ FROM VWKOMMCOLLI_UEBERSICHT</CommandText>
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" /> <xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
<xs:element name="BEZEICHNUNG" msprop:Generator_ColumnVarNameInTable="columnBEZEICHNUNG" msprop:Generator_ColumnPropNameInRow="BEZEICHNUNG" msprop:Generator_ColumnPropNameInTable="BEZEICHNUNGColumn" msprop:Generator_UserColumnName="BEZEICHNUNG"> <xs:element name="BEZEICHNUNG" msprop:Generator_ColumnVarNameInTable="columnBEZEICHNUNG" msprop:Generator_ColumnPropNameInRow="BEZEICHNUNG" msprop:Generator_ColumnPropNameInTable="BEZEICHNUNGColumn" msprop:Generator_UserColumnName="BEZEICHNUNG" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="500" /> <xs:maxLength value="500" />

31
SchaumKommiCollo/KommiCollo/MyDataset.xss
View File

@@ -4,23 +4,22 @@
Changes to this file may cause incorrect behavior and will be lost if Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated. the code is regenerated.
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="366" ViewPortY="-31" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:TBKOMMCOLLI_MANDANT" ZOrder="16" X="42" Y="-21" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="233" /> <Shape ID="DesignTable:TBKOMMCOLLI_MANDANT" ZOrder="15" X="42" Y="-21" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="233" />
<Shape ID="DesignTable:TBWH_MANDANT" ZOrder="15" X="432" Y="31" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" /> <Shape ID="DesignTable:TBWH_MANDANT" ZOrder="14" X="432" Y="31" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:TBKOMMCOLLI_PAKET_KOPF" ZOrder="8" X="57" Y="337" Height="476" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:TBKOMMCOLLI_PAKET_KOPF" ZOrder="7" X="57" Y="337" Height="476" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TBKOMMCOLLI_PAKET_POS" ZOrder="7" X="525" Y="421" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" /> <Shape ID="DesignTable:TBKOMMCOLLI_PAKET_POS" ZOrder="6" X="525" Y="421" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:VWKOMMCOLLI_ABSCHLUSS_PAKET" ZOrder="9" X="840" Y="110" Height="286" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:VWKOMMCOLLI_ABSCHLUSS_PAKET" ZOrder="8" X="840" Y="110" Height="286" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:TBKOMMCOLLI_TERMINART" ZOrder="11" X="1225" Y="0" Height="206" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="116" /> <Shape ID="DesignTable:TBKOMMCOLLI_TERMINART" ZOrder="10" X="1225" Y="0" Height="206" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="116" />
<Shape ID="DesignTable:TBKOMMCOLLI_PAKET_POS_LS" ZOrder="6" X="1278" Y="332" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" /> <Shape ID="DesignTable:TBKOMMCOLLI_PAKET_POS_LS" ZOrder="5" X="1278" Y="332" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:TBKOMMCOLLI_SDGPOSITIONEN" ZOrder="5" X="523" Y="142" Height="172" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" /> <Shape ID="DesignTable:TBKOMMCOLLI_SDGPOSITIONEN" ZOrder="4" X="523" Y="142" Height="172" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:TBKOMMCOLLI_TEXTSCHLUESSEL" ZOrder="4" X="835" Y="417" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" /> <Shape ID="DesignTable:TBKOMMCOLLI_TEXTSCHLUESSEL" ZOrder="1" X="835" Y="417" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:TBKOMMCOLLI_HINWEIS" ZOrder="3" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" /> <Shape ID="DesignTable:TBKOMMCOLLI_HINWEIS" ZOrder="3" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
<Shape ID="DesignTable:VWHUP_REPORT1" ZOrder="1" X="1420" Y="28" Height="305" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:VWHUP_REPORT1" ZOrder="2" X="1108" Y="298" Height="305" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:VWKOMMCOLLI_UEBERSICHT" ZOrder="2" X="1206" Y="474" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
</Shapes> </Shapes>
<Connectors> <Connectors>
<Connector ID="DesignRelation:FK_TBKOMMCOLLI_PAKET_KOPF_MANDANT_ID" ZOrder="14" LineWidth="11"> <Connector ID="DesignRelation:FK_TBKOMMCOLLI_PAKET_KOPF_MANDANT_ID" ZOrder="13" LineWidth="11">
<RoutePoints> <RoutePoints>
<Point> <Point>
<X>206</X> <X>206</X>
@@ -32,7 +31,7 @@
</Point> </Point>
</RoutePoints> </RoutePoints>
</Connector> </Connector>
<Connector ID="DesignRelation:FK_TBKOMMCOLLI_PAKET_POS_KOPF_ID" ZOrder="13" LineWidth="11"> <Connector ID="DesignRelation:FK_TBKOMMCOLLI_PAKET_POS_KOPF_ID" ZOrder="12" LineWidth="11">
<RoutePoints> <RoutePoints>
<Point> <Point>
<X>357</X> <X>357</X>
@@ -44,7 +43,7 @@
</Point> </Point>
</RoutePoints> </RoutePoints>
</Connector> </Connector>
<Connector ID="DesignRelation:FK_TBKOMMCOLLI_PAKET_KOPF_MANDANT_ID1" ZOrder="12" LineWidth="11"> <Connector ID="DesignRelation:FK_TBKOMMCOLLI_PAKET_KOPF_MANDANT_ID1" ZOrder="11" LineWidth="11">
<RoutePoints> <RoutePoints>
<Point> <Point>
<X>840</X> <X>840</X>
@@ -56,7 +55,7 @@
</Point> </Point>
</RoutePoints> </RoutePoints>
</Connector> </Connector>
<Connector ID="DesignRelation:FK_TBKOMMCOLLI_TERMINART_MANDANT_ID" ZOrder="10" LineWidth="11"> <Connector ID="DesignRelation:FK_TBKOMMCOLLI_TERMINART_MANDANT_ID" ZOrder="9" LineWidth="11">
<RoutePoints> <RoutePoints>
<Point> <Point>
<X>342</X> <X>342</X>

BIN
SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe
View File

Binary file not shown.

BIN
SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb
View File

Binary file not shown.

11
SchaumKommiCollo/KommiCollo/frmMain.vb
View File

@@ -401,6 +401,8 @@ Public Class frmMain
btnAddPaket.Enabled = True btnAddPaket.Enabled = True
tsinfolabel.Text = "Vorgang abgebrochen" tsinfolabel.Text = "Vorgang abgebrochen"
tsinfolabel.Visible = True tsinfolabel.Visible = True
ListBox1.ResetText()
txtFreitext.Text = ""
Catch ex As Exception Catch ex As Exception
ShowError("Fehler in Abbruch Paket: " & vbNewLine & ex.Message) ShowError("Fehler in Abbruch Paket: " & vbNewLine & ex.Message)
End Try End Try
@@ -643,8 +645,11 @@ Public Class frmMain
btnAddPaket.Enabled = True btnAddPaket.Enabled = True
tsinfolabel.Text = "Vorgang abgebrochen" tsinfolabel.Text = "Vorgang abgebrochen"
tsinfolabel.Visible = True tsinfolabel.Visible = True
ListBox1.ResetText()
frmPrintOptions.ShowDialog() frmPrintOptions.ShowDialog()
GridControlLHM.DataSource = Nothing
GridViewLHM.Columns.Clear()
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
@@ -802,4 +807,10 @@ Public Class frmMain
txtFreitext.Text = "" txtFreitext.Text = ""
End If End If
End Sub End Sub
Private Sub txtFreitext_TextChanged(sender As Object, e As EventArgs) Handles txtFreitext.TextChanged
If txtFreitext.Text.Length >= 70 Then
MsgBox("Achtung: Maximale Anzahl Textzeichen erreicht!", MsgBoxStyle.Critical)
End If
End Sub
End Class End Class

BIN
SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe
View File

Binary file not shown.

BIN
SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb
View File

Binary file not shown.

BIN
SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache
View File

Binary file not shown.

BIN
SchaumKommiCollo/KommiCollo/obj/x86/Debug/TempPE/MyDataset.Designer.vb.dll
View File

Binary file not shown.