Compare commits
No commits in common. "master" and "1.1.4" 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
|
||||||
@ -289,6 +288,9 @@ Public Class MainForm
|
|||||||
cboRegColor.Items.Add("White_Pink")
|
cboRegColor.Items.Add("White_Pink")
|
||||||
cboRegColor.Items.Add("White_Sky")
|
cboRegColor.Items.Add("White_Sky")
|
||||||
Case "V3"
|
Case "V3"
|
||||||
|
cboRegColor.Items.Add("White_Brown")
|
||||||
|
cboRegColor.Items.Add("White_Pink")
|
||||||
|
cboRegColor.Items.Add("White_Sky")
|
||||||
cboRegColor.Items.Add("LineFrends_Brown")
|
cboRegColor.Items.Add("LineFrends_Brown")
|
||||||
cboRegColor.Items.Add("LineFrends_Sally")
|
cboRegColor.Items.Add("LineFrends_Sally")
|
||||||
Case Else
|
Case Else
|
||||||
@ -418,6 +420,12 @@ Public Class MainForm
|
|||||||
TypeCode = "3" 'V3 혼란스럽지 않게 3으로 고정
|
TypeCode = "3" 'V3 혼란스럽지 않게 3으로 고정
|
||||||
|
|
||||||
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
|
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
|
||||||
|
Case "White_Pink"
|
||||||
|
ColorCode = "1"
|
||||||
|
Case "White_Sky"
|
||||||
|
ColorCode = "2"
|
||||||
|
Case "White_Brown"
|
||||||
|
ColorCode = "3"
|
||||||
Case "LineFrends_Brown"
|
Case "LineFrends_Brown"
|
||||||
ColorCode = "4"
|
ColorCode = "4"
|
||||||
Case "LineFrends_Sally"
|
Case "LineFrends_Sally"
|
||||||
@ -560,7 +568,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.4"
|
||||||
|
|
||||||
Me.Text = ProgramName & VersionNum
|
Me.Text = ProgramName & VersionNum
|
||||||
Me.Size = New Size(1920, 1050)
|
Me.Size = New Size(1920, 1050)
|
||||||
@ -813,7 +821,7 @@ FailFunc:
|
|||||||
If DBSerialCheck() Then
|
If DBSerialCheck() Then
|
||||||
Return False
|
Return False
|
||||||
Else
|
Else
|
||||||
MsgBox("생성 할 시리얼 번호 " & SerialNum & "은 이미 존재 합니다.", vbCritical)
|
MsgBox("시리얼 번호를 생성하는 과정에서 오류가 발생하였습니다.", vbCritical)
|
||||||
Return True
|
Return True
|
||||||
End If
|
End If
|
||||||
End Function
|
End Function
|
||||||
@ -890,7 +898,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 +958,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()
|
||||||
@ -1261,7 +1268,7 @@ FinishFunc:
|
|||||||
|
|
||||||
If ProdRegData(txbPDCP.Text, txbPDCC.Text, txbPDAgency.Text) Then
|
If ProdRegData(txbPDCP.Text, txbPDCC.Text, txbPDAgency.Text) Then
|
||||||
If ShotReg(0) Then
|
If ShotReg(0) Then
|
||||||
If ShotSearch() = "0" Then 'If ShotSearch() = "False" Then 'hjw test
|
If ShotSearch() = 0 Then
|
||||||
If DBProdReg(txbPDCP.Text, txbPDCC.Text, txbPDAgency.Text, 0) Then
|
If DBProdReg(txbPDCP.Text, txbPDCC.Text, txbPDAgency.Text, 0) Then
|
||||||
If TraySuccess() Then
|
If TraySuccess() Then
|
||||||
|
|
||||||
@ -1283,8 +1290,7 @@ FinishFunc:
|
|||||||
GoTo LoadFail
|
GoTo LoadFail
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
MsgBox("샷 수 정보 확인 실패!", vbCritical)
|
MsgBox("샷 수 정보 확인 실패 !", vbCritical)
|
||||||
MsgBox("통신 포트 연결을 확인하세요", vbExclamation, "포트 연결 확인")
|
|
||||||
GoTo LoadFail
|
GoTo LoadFail
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
@ -1466,7 +1472,7 @@ 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 > 0 Then
|
||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
@ -3157,7 +3163,7 @@ 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
|
||||||
|
@ -65,7 +65,7 @@ Module mySQLModule
|
|||||||
Return True
|
Return True
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
MsgBox("MySQL Command Error:" + vbCrLf + Err.Description + "debug : " + cmdStr)
|
MsgBox("MySQL Command Error:" + vbCrLf + Err.Description)
|
||||||
DBClose()
|
DBClose()
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
1. program ver 1.1.12
|
1. EFFECT cartridge color code를 SET에서 V2, V3로 분기 처리
|
||||||
2. DBQueryScalar(DBCmd) 의 값이 count인 경우 integer로 받도록 수정
|
1) V2 : 0
|
||||||
- "False" 를 0으로 변경
|
2) V3 : 3
|
||||||
- Dim CtMaxResult As String = DBQueryScalar(DBCmd)
|
|
||||||
- If CtMaxResult = "False" Then
|
|
||||||
3. prodinputFunc()의 info1, info2 userID 점검 코드 삭제
|
|
Loading…
x
Reference in New Issue
Block a user