Compare commits

..

No commits in common. "master" and "1.1.11" have entirely different histories.

2 changed files with 26 additions and 12 deletions

View File

@ -560,7 +560,7 @@ Public Class MainForm
Private Sub FormSetting() Private Sub FormSetting()
Const ProgramName As String = "Product Program Ver_" Const ProgramName As String = "Product Program Ver_"
Const VersionNum As String = "1.1.12" Const VersionNum As String = "1.1.11"
Me.Text = ProgramName & VersionNum Me.Text = ProgramName & VersionNum
Me.Size = New Size(1920, 1050) Me.Size = New Size(1920, 1050)
@ -890,7 +890,7 @@ FailFunc:
DBCmd = "SELECT COUNT(NUMBER) FROM " & ApplyNonTDDB & " WHERE Product_SN = '" & SerialNum & "'" DBCmd = "SELECT COUNT(NUMBER) FROM " & ApplyNonTDDB & " WHERE Product_SN = '" & SerialNum & "'"
End If End If
Dim UseCheck As Integer = DBQueryScalar(DBCmd) Dim UseCheck As String = DBQueryScalar(DBCmd)
If UseCheck = 0 Then If UseCheck = 0 Then
Return True Return True
@ -952,6 +952,24 @@ FailFunc:
Private Sub ProdInputFunc(sender As Object, e As EventArgs, SearchData As String) Private Sub ProdInputFunc(sender As Object, e As EventArgs, SearchData As String)
Dim userID As String = "" Dim userID As String = ""
' info1 또는 info2 NowState가 1인 사용자 조회
DBCmd = "SELECT UserID FROM " & LoginDB & " WHERE NowState = '1' AND (UserID = 'info1' OR UserID = 'info2')"
If DBQueryReader(DBCmd) Then
userID = sqlDataQuery(0)
Else
MsgBox("사용자 정보 읽기 실패", vbExclamation)
GoTo FailFunc
End If
If userID = "info1" Or userID = "info2" Then
' PASS
Else
MsgBox("info1 또는 info2 계정을 사용하세요", vbExclamation)
GoTo FailFunc
End If
StepReset() StepReset()
ValueReset() ValueReset()
@ -1466,8 +1484,8 @@ FinishFunc:
Private Function CreateSerialCompare(SerialNum As String) As Boolean Private Function CreateSerialCompare(SerialNum As String) As Boolean
DBCmd = "SELECT COUNT(NUMBER) FROM " & ApplyCartDB & " WHERE Product_SN = '" & SerialNum & "'" DBCmd = "SELECT COUNT(NUMBER) FROM " & ApplyCartDB & " WHERE Product_SN = '" & SerialNum & "'"
Dim CompareData As Integer = DBQueryScalar(DBCmd) Dim CompareData As String = DBQueryScalar(DBCmd)
If CompareData > 0 Then If CompareData > "False" Then
Return False Return False
End If End If
@ -3157,8 +3175,8 @@ FailLoad:
Private Function BeforeTrayData(NowYear As Int16, NowMonth As Int16) As Boolean Private Function BeforeTrayData(NowYear As Int16, NowMonth As Int16) As Boolean
DBCmd = "SELECT COUNT(UserID) FROM " & InfoRegStateDB & " WHERE UserID= '" & IDName & "' AND ModelNum = '" & ModelCode & "' AND TypeNum = '" & TypeCode & "' AND ColorNum = '" & ColorCode & "' AND UsageNum = '" & ClassCode & "' AND CreateYear = '" & NowYear & "' AND CreateMonth = '" & NowMonth & "'" DBCmd = "SELECT COUNT(UserID) FROM " & InfoRegStateDB & " WHERE UserID= '" & IDName & "' AND ModelNum = '" & ModelCode & "' AND TypeNum = '" & TypeCode & "' AND ColorNum = '" & ColorCode & "' AND UsageNum = '" & ClassCode & "' AND CreateYear = '" & NowYear & "' AND CreateMonth = '" & NowMonth & "'"
Dim BeforeData As Integer = DBQueryScalar(DBCmd) Dim BeforeData As String = DBQueryScalar(DBCmd)
If BeforeData > 0 Then If BeforeData > "0" Then
Return True ''있을 경우 Return True ''있을 경우
Else Else
Return False '' 없을 경우 Return False '' 없을 경우

View File

@ -1,6 +1,2 @@
1. program ver 1.1.12 1. program ver 1.1.11
2. DBQueryScalar(DBCmd) 의 값이 count인 경우 integer로 받도록 수정 2. BeforeTrayData fucntion fix ( BeforeData > "0" )
- "False" 를 0으로 변경
- Dim CtMaxResult As String = DBQueryScalar(DBCmd)
- If CtMaxResult = "False" Then
3. prodinputFunc()의 info1, info2 userID 점검 코드 삭제