Compare commits

..

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

3 changed files with 20 additions and 38 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
@ -231,8 +230,7 @@ Public Class MainForm
Case "ALTO"
cboRegType.Items.Add("SET")
Case "EFFECT"
cboRegType.Items.Add("V2")
cboRegType.Items.Add("V3")
cboRegType.Items.Add("SET")
Case "MAXIMUM ALPHA"
cboRegType.Items.Add("SET")
Case Else
@ -284,13 +282,10 @@ Public Class MainForm
Case "EFFECT"
Select Case cboRegType.SelectedItem
Case "V2"
Case "SET"
cboRegColor.Items.Add("White_Brown")
cboRegColor.Items.Add("White_Pink")
cboRegColor.Items.Add("White_Sky")
Case "V3"
cboRegColor.Items.Add("LineFrends_Brown")
cboRegColor.Items.Add("LineFrends_Sally")
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
@ -400,8 +395,8 @@ Public Class MainForm
TDUseCompare = True
Select Case dgvDataSet.Rows(cboSelect).Cells(2).Value
Case "V2"
TypeCode = "0" 'SET 였을 0 으로 고정
Case "SET"
TypeCode = "0"
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
Case "White_Pink"
@ -413,18 +408,6 @@ Public Class MainForm
Case Else
Return True
End Select
Case "V3"
TypeCode = "3" 'V3 혼란스럽지 않게 3으로 고정
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
Case "LineFrends_Brown"
ColorCode = "4"
Case "LineFrends_Sally"
ColorCode = "5"
Case Else
Return True
End Select
End Select
Case "MAXIMUM ALPHA"
@ -560,7 +543,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.3"
Me.Text = ProgramName & VersionNum
Me.Size = New Size(1920, 1050)
@ -813,7 +796,7 @@ FailFunc:
If DBSerialCheck() Then
Return False
Else
MsgBox("생성 할 시리얼 번호 " & SerialNum & "은 이미 존재 합니다.", vbCritical)
MsgBox("시리얼 번호를 생성하는 과정에서 오류가 발생하였습니다.", vbCritical)
Return True
End If
End Function
@ -890,7 +873,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 +933,6 @@ FailFunc:
Private Sub ProdInputFunc(sender As Object, e As EventArgs, SearchData As String)
Dim userID As String = ""
StepReset()
ValueReset()
@ -1261,7 +1243,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() = 0 Then
If DBProdReg(txbPDCP.Text, txbPDCC.Text, txbPDAgency.Text, 0) Then
If TraySuccess() Then
@ -1283,8 +1265,7 @@ FinishFunc:
GoTo LoadFail
End If
Else
MsgBox("샷 수 정보 확인 실패!", vbCritical)
MsgBox("통신 포트 연결을 확인하세요", vbExclamation, "포트 연결 확인")
MsgBox("샷 수 정보 확인 실패 !", vbCritical)
GoTo LoadFail
End If
Else
@ -1466,7 +1447,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 +3138,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,7 @@
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. 모델 이름(MAXIMUM ALPHA)에 따른 변수 길이 수정
- DB : jomtTesterDB > jomtCartidgeTbl ]
- Ct_Model VARCHAR 10 >> 13
- P0_Model VARCHAR 10 >> 13
- P1_Model VARCHAR 10 >> 13
- P2_Model VARCHAR 5 >> 13