Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
sporting committed Apr 23, 2020
1 parent 2ec3b1b commit c087f45
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Data/Common/DB/Sqlite/SYSCNTM.vb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Namespace Data.Common.DB.Sqlite
CreateTable()
End Sub

Public Function GetNextVal(ByVal leadingCode As String) As String
Public Function GetNextVal(ByVal leadingCode As String, Optional ByVal formatLength As Integer = 2) As String
Dim today As String = Now.ToString("yyyyMMdd")
Dim dt As SaDataTableFN = SelectWhere(String.Format("{0}={1} AND RESET_DATE={2}", "COUNTER_ID", leadingCode.QuotedStr(), today.QuotedStr()))
Dim nextVal As String
Expand All @@ -34,11 +34,11 @@ Namespace Data.Common.DB.Sqlite

UpdateRow(New SYSCNTMFields(leadingCode, today, 0), New SYSCNTMFields(leadingCode, today, val))

nextVal = String.Format("{0}{1}{2:00}", leadingCode, today, val)
nextVal = String.Format("{0}{1}{" + formatLength.ToString() + ":00}", leadingCode, today, val)
Else
InsertRow(New SYSCNTMFields(leadingCode, today, 1))

nextVal = String.Format("{0}{1}{2:00}", leadingCode, today, 1)
nextVal = String.Format("{0}{1}{" + formatLength.ToString() + ":00}", leadingCode, today, 1)
End If
Return nextVal
End Function
Expand Down
10 changes: 8 additions & 2 deletions SaWindows/Forms/SaNumericTextBox.vb
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,23 @@ Namespace SaWindows.Forms
End Sub


Public ReadOnly Property IntValue() As Integer
Public Property IntValue() As Integer
Get
Return Int32.Parse(Me.Text)
End Get
Set(value As Integer)
Me.Text = value.ToString()
End Set
End Property


Public ReadOnly Property DecimalValue() As Decimal
Public Property DecimalValue() As Decimal
Get
Return [Decimal].Parse(Me.Text)
End Get
Set(value As [Decimal])
Me.Text = value.ToString()
End Set
End Property


Expand Down
20 changes: 10 additions & 10 deletions SportingAppFW.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,27 +103,27 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\CrossDBOps\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\CrossDBOps\packages\Newtonsoft.Json.12.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\CrossDBOps\packages\NPOI.2.3.0\lib\net20\NPOI.dll</HintPath>
<Reference Include="NPOI">
<HintPath>packages\NPOI.2.3.0\lib\net20\NPOI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPOI.OOXML, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\CrossDBOps\packages\NPOI.2.3.0\lib\net20\NPOI.OOXML.dll</HintPath>
<Reference Include="NPOI.OOXML">
<HintPath>packages\NPOI.2.3.0\lib\net20\NPOI.OOXML.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPOI.OpenXml4Net, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\CrossDBOps\packages\NPOI.2.3.0\lib\net20\NPOI.OpenXml4Net.dll</HintPath>
<Reference Include="NPOI.OpenXml4Net">
<HintPath>packages\NPOI.2.3.0\lib\net20\NPOI.OpenXml4Net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPOI.OpenXmlFormats, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\CrossDBOps\packages\NPOI.2.3.0\lib\net20\NPOI.OpenXmlFormats.dll</HintPath>
<Reference Include="NPOI.OpenXmlFormats">
<HintPath>packages\NPOI.2.3.0\lib\net20\NPOI.OpenXmlFormats.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86" />
Expand Down

0 comments on commit c087f45

Please sign in to comment.