Compare commits
No commits in common. "master" and "1.1.9" have entirely different histories.
@ -1,9 +1,8 @@
|
|||||||
Imports System.IO
|
Imports System.IO
|
||||||
Imports System.IO.Ports
|
Imports System.IO.Ports
|
||||||
Imports System.Math
|
|
||||||
Imports System.Text
|
Imports System.Text
|
||||||
Imports System.Threading
|
Imports System.Threading
|
||||||
Imports Microsoft.VisualBasic.ApplicationServices
|
Imports System.Math
|
||||||
|
|
||||||
Public Class MainForm
|
Public Class MainForm
|
||||||
Private Const TDMaxLength As Int16 = 10
|
Private Const TDMaxLength As Int16 = 10
|
||||||
@ -560,7 +559,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.9"
|
||||||
|
|
||||||
Me.Text = ProgramName & VersionNum
|
Me.Text = ProgramName & VersionNum
|
||||||
Me.Size = New Size(1920, 1050)
|
Me.Size = New Size(1920, 1050)
|
||||||
@ -890,7 +889,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
|
||||||
@ -950,7 +949,6 @@ 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 = ""
|
|
||||||
|
|
||||||
StepReset()
|
StepReset()
|
||||||
ValueReset()
|
ValueReset()
|
||||||
@ -1466,8 +1464,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 +3155,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 > "False" Then
|
||||||
Return True ''있을 경우
|
Return True ''있을 경우
|
||||||
Else
|
Else
|
||||||
Return False '' 없을 경우
|
Return False '' 없을 경우
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
1. program ver 1.1.12
|
1. program ver 1.1.9
|
||||||
2. DBQueryScalar(DBCmd) 의 값이 count인 경우 integer로 받도록 수정
|
2. 샷 수 검색 조건 변경
|
||||||
- "False" 를 0으로 변경
|
- If ShotSearch() = "0" Then
|
||||||
- Dim CtMaxResult As String = DBQueryScalar(DBCmd)
|
|
||||||
- If CtMaxResult = "False" Then
|
|
||||||
3. prodinputFunc()의 info1, info2 userID 점검 코드 삭제
|
|
Loading…
x
Reference in New Issue
Block a user