Compare commits

..

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

3 changed files with 9 additions and 15 deletions

View File

@ -1,9 +1,8 @@
Imports System.IO
Imports System.IO.Ports
Imports System.Math
Imports System.Text
Imports System.Threading
Imports Microsoft.VisualBasic.ApplicationServices
Imports System.Math
Public Class MainForm
Private Const TDMaxLength As Int16 = 10
@ -560,7 +559,7 @@ Public Class MainForm
Private Sub FormSetting()
Const ProgramName As String = "Product Program Ver_"
Const VersionNum As String = "1.1.12"
Const VersionNum As String = "1.1.6"
Me.Text = ProgramName & VersionNum
Me.Size = New Size(1920, 1050)
@ -890,7 +889,7 @@ FailFunc:
DBCmd = "SELECT COUNT(NUMBER) FROM " & ApplyNonTDDB & " WHERE Product_SN = '" & SerialNum & "'"
End If
Dim UseCheck As Integer = DBQueryScalar(DBCmd)
Dim UseCheck As String = DBQueryScalar(DBCmd)
If UseCheck = 0 Then
Return True
@ -950,7 +949,6 @@ FailFunc:
Private Sub ProdInputFunc(sender As Object, e As EventArgs, SearchData As String)
Dim userID As String = ""
StepReset()
ValueReset()
@ -1261,7 +1259,7 @@ FinishFunc:
If ProdRegData(txbPDCP.Text, txbPDCC.Text, txbPDAgency.Text) Then
If ShotReg(0) Then
If ShotSearch() = "0" Then 'If ShotSearch() = "False" Then 'hjw test
If ShotSearch() = "False" Then
If DBProdReg(txbPDCP.Text, txbPDCC.Text, txbPDAgency.Text, 0) Then
If TraySuccess() Then
@ -1466,7 +1464,7 @@ FinishFunc:
Private Function CreateSerialCompare(SerialNum As String) As Boolean
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
Return False
End If
@ -3157,7 +3155,7 @@ FailLoad:
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 & "'"
Dim BeforeData As Integer = DBQueryScalar(DBCmd)
Dim BeforeData As String = DBQueryScalar(DBCmd)
If BeforeData > 0 Then
Return True ''있을 경우
Else

View File

@ -65,7 +65,7 @@ Module mySQLModule
Return True
Catch ex As Exception
MsgBox("MySQL Command Error:" + vbCrLf + Err.Description + "debug : " + cmdStr)
MsgBox("MySQL Command Error:" + vbCrLf + Err.Description)
DBClose()
Return False
End Try

View File

@ -1,6 +1,2 @@
1. program ver 1.1.12
2. DBQueryScalar(DBCmd) 의 값이 count인 경우 integer로 받도록 수정
- "False" 를 0으로 변경
- Dim CtMaxResult As String = DBQueryScalar(DBCmd)
- If CtMaxResult = "False" Then
3. prodinputFunc()의 info1, info2 userID 점검 코드 삭제
1. 샷정보 확인 중 통신 연결 문제 발생 시 메세지 박스 중복 출현 가능 하도록 수정
2. program version 1.1.7