Compare commits

..

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

3 changed files with 988 additions and 723 deletions

File diff suppressed because it is too large Load Diff

View File

@ -14,9 +14,6 @@ Public Class MainForm
Private TDSNHead1 As String = "DIT"
Private TDSNHead2 As String = "J"
Const oldSearchLength As Int16 = 12
Const newSearchLength As Int16 = 16
Private DBCmd As String
Private tmpCmdMessage As String
Private rxMessage, cmdMessage As String
@ -33,7 +30,6 @@ Public Class MainForm
Private TypeCode As String
Private ColorCode As String
Private ClassCode As String
Private VersionCode As String
Private ProdCode As String
Private TDUseCompare As Boolean = False
@ -120,7 +116,7 @@ Public Class MainForm
Select Case NowMode
Case ModeList.Prod_Input
If InStr(txbPVSN.Text, "[START]") > 0 Or txbPVSN.Text.Length = oldSearchLength Or txbPVSN.Text.Length = newSearchLength Then
If InStr(txbPVSN.Text, "[START]") > 0 Or txbPVSN.Text.Length = 12 Then
btnEnter_Click(sender, e)
End If
Case ModeList.TDRecycle
@ -204,60 +200,44 @@ Public Class MainForm
Private Sub RegCboSetting()
ModelCboSetting()
ClassCboSetting()
VersionCboSetting()
cboClear()
End Sub
Private Sub ClassCboSetting()
cboRegClass.DisplayMember = "Key"
cboRegClass.ValueMember = "Value"
cboRegClass.Items.Clear()
cboRegClass.Items.Add(New DictionaryEntry("국내-세트", 1))
cboRegClass.Items.Add(New DictionaryEntry("국내-A/S", 2))
cboRegClass.Items.Add(New DictionaryEntry("국내-샵용", 3))
cboRegClass.Items.Add(New DictionaryEntry("해외-세트", 5))
cboRegClass.Items.Add(New DictionaryEntry("해외-A/S", 6))
cboRegClass.Items.Add(New DictionaryEntry("체험단", 7))
End Sub
Private Sub VersionCboSetting()
cboRegVersion.DisplayMember = "Key"
cboRegVersion.ValueMember = "Value"
cboRegVersion.Items.Clear()
cboRegVersion.Items.Add(New DictionaryEntry("V1", 0))
cboRegVersion.Items.Add(New DictionaryEntry("V2", 1))
cboRegVersion.Items.Add(New DictionaryEntry("V3", 2))
cboRegVersion.Items.Add(New DictionaryEntry("V4", 3))
cboRegVersion.Items.Add(New DictionaryEntry("V5", 4))
cboRegVersion.Items.Add(New DictionaryEntry("V6", 5))
cboRegVersion.Items.Add(New DictionaryEntry("V7", 6))
cboRegVersion.Items.Add(New DictionaryEntry("V8", 7))
cboRegVersion.Items.Add(New DictionaryEntry("V9", 8))
cboRegClass.Items.Add("국내-세트")
cboRegClass.Items.Add("국내-A/S")
cboRegClass.Items.Add("국내-샵용")
cboRegClass.Items.Add("해외-세트")
cboRegClass.Items.Add("해외-A/S")
cboRegClass.Items.Add("체험단")
End Sub
Private Sub ModelCboSetting()
cboRegModel.Items.Clear()
DBCmd = "SELECT ModelName FROM " & ApplyModelInfoDB & " WHERE DeviceTypeCode = 'A' GROUP BY ModelName"
If DBQueryReader(DBCmd) Then
For i = 0 To sqlDataQuery.Length - 1
cboRegModel.Items.Add(sqlDataQuery(i))
Next
End If
cboRegModel.Items.Add("MAXIMUM")
cboRegModel.Items.Add("ALTO")
cboRegModel.Items.Add("EFFECT")
cboRegModel.Items.Add("MAXIMUM ALPHA")
End Sub
Private Sub cboRegModel_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboRegModel.SelectedIndexChanged
If cboRegModel.SelectedIndex > -1 Then
cboRegType.Items.Clear()
DBCmd = "SELECT CartTypeName FROM " & ApplyModelInfoDB & " WHERE ModelName = '" & cboRegModel.SelectedItem & "' GROUP BY CartTypeCode ORDER BY CartTypeCode ASC"
If DBQueryReader(DBCmd) Then
For i = 0 To sqlDataQuery.Length - 1
cboRegType.Items.Add(sqlDataQuery(i))
Next
End If
Select Case cboRegModel.SelectedItem
Case "MAXIMUM"
cboRegType.Items.Add("V1")
cboRegType.Items.Add("V2")
Case "ALTO"
cboRegType.Items.Add("SET")
Case "EFFECT"
cboRegType.Items.Add("V2")
cboRegType.Items.Add("V3")
Case "MAXIMUM ALPHA"
cboRegType.Items.Add("SET")
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
cboRegType.SelectedIndex = -1
cboRegType.Text = "SELECT!"
@ -269,12 +249,68 @@ Public Class MainForm
If cboRegType.SelectedIndex > -1 Then
cboRegColor.Items.Clear()
DBCmd = "SELECT ColorName FROM " & ApplyModelInfoDB & " WHERE ModelName = '" & cboRegModel.SelectedItem & "' AND CartTypeName = '" & cboRegType.SelectedItem & "' ORDER BY ColorCode ASC"
If DBQueryReader(DBCmd) Then
For i = 0 To sqlDataQuery.Length - 1
cboRegColor.Items.Add(sqlDataQuery(i))
Next
End If
Select Case cboRegModel.SelectedItem
Case "MAXIMUM"
Select Case cboRegType.SelectedItem
Case "V1"
cboRegColor.Items.Add("White")
cboRegColor.Items.Add("Pink")
cboRegColor.Items.Add("Mint")
cboRegColor.Items.Add("Purple")
cboRegColor.Items.Add("Yellow")
cboRegColor.Items.Add("Black_Gold")
Case "V2"
cboRegColor.Items.Add("White")
cboRegColor.Items.Add("Shine_Mint")
cboRegColor.Items.Add("Black_Black")
cboRegColor.Items.Add("Peach")
cboRegColor.Items.Add("Purple")
cboRegColor.Items.Add("Black_Gold")
cboRegColor.Items.Add("Pink")
cboRegColor.Items.Add("Yellow")
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
Case "ALTO"
Select Case cboRegType.SelectedItem
Case "SET"
cboRegColor.Items.Add("White")
cboRegColor.Items.Add("Purple")
cboRegColor.Items.Add("Black_Gold")
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
Case "EFFECT"
Select Case cboRegType.SelectedItem
Case "V2"
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
Case "MAXIMUM ALPHA"
Select Case cboRegType.SelectedItem
Case "SET"
cboRegColor.Items.Add("Ruby_Red")
cboRegColor.Items.Add("Topaz_Orange")
cboRegColor.Items.Add("Emerald_Green")
cboRegColor.Items.Add("Sapphire_Blue")
cboRegColor.Items.Add("Topaz_Brown")
cboRegColor.Items.Add("Sitrin_Gold")
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
cboRegColor.SelectedIndex = -1
cboRegColor.Text = "SELECT!"
@ -283,22 +319,145 @@ Public Class MainForm
End Sub
Private Function ColorSet(cboSelect As Integer) As Boolean
Dim modelName As String = dgvDataSet.Rows(cboSelect).Cells(1).Value
Dim cartTypeName As String = dgvDataSet.Rows(cboSelect).Cells(2).Value
Dim colorName As String = dgvDataSet.Rows(cboSelect).Cells(5).Value
DBCmd = "SELECT ModelCode, CartTypeCode, ColorCode, TDUseYn FROM " & ApplyModelInfoDB & " WHERE ModelName = '" & modelName & "' AND CartTypeName = '" & cartTypeName & "' AND ColorName = '" & colorName & "'"
If DBQueryReader(DBCmd) Then
ModelCode = sqlDataQuery(0)
TypeCode = sqlDataQuery(1)
ColorCode = sqlDataQuery(2)
If sqlDataQuery(3) <> "Y" Then
TDUseCompare = False
Else
Select Case dgvDataSet.Rows(cboSelect).Cells(1).Value
Case "MAXIMUM"
ModelCode = "3"
TDUseCompare = True
End If
End If
Select Case dgvDataSet.Rows(cboSelect).Cells(2).Value
Case "V1"
TypeCode = "0"
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
Case "White"
ColorCode = "0"
Case "Pink"
ColorCode = "3"
Case "Yellow"
ColorCode = "5"
Case "Mint"
ColorCode = "7"
Case "Purple"
ColorCode = "8"
Case "Black_Gold"
ColorCode = "9"
Case Else
Return True
End Select
Case "V2"
TypeCode = "1"
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
Case "White"
ColorCode = "0"
Case "Shine_Mint"
ColorCode = "2"
Case "Black_Black"
ColorCode = "4"
Case "Peach"
ColorCode = "6"
Case "Purple"
ColorCode = "8"
Case "Black_Gold"
ColorCode = "9"
Case "Pink"
ColorCode = "3"
Case "Yellow"
ColorCode = "5"
Case Else
Return True
End Select
Case Else
Return True
End Select
Case "ALTO"
ModelCode = "5"
TDUseCompare = False
Select Case dgvDataSet.Rows(cboSelect).Cells(2).Value
Case "SET"
TypeCode = "0"
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
Case "White"
ColorCode = "0"
Case "Purple"
ColorCode = "8"
Case "Black_Gold"
ColorCode = "9"
Case Else
Return True
End Select
End Select
Case "EFFECT"
ModelCode = "6"
TDUseCompare = True
Select Case dgvDataSet.Rows(cboSelect).Cells(2).Value
Case "V2"
TypeCode = "0" 'SET 였을 0 으로 고정
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
Case "White_Pink"
ColorCode = "1"
Case "White_Sky"
ColorCode = "2"
Case "White_Brown"
ColorCode = "3"
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"
ModelCode = "7"
TDUseCompare = True
Select Case dgvDataSet.Rows(cboSelect).Cells(2).Value
Case "SET"
TypeCode = "0"
Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
Case "Ruby_Red"
ColorCode = "1"
Case "Topaz_Orange"
ColorCode = "2"
Case "Emerald_Green"
ColorCode = "3"
Case "Sapphire_Blue"
ColorCode = "4"
Case "Topaz_Brown"
ColorCode = "5"
Case "Sitrin_Gold"
ColorCode = "6"
Case Else
Return True
End Select
End Select
Case Else
TDUseCompare = False
Return True
End Select
Return False
End Function
@ -401,7 +560,7 @@ Public Class MainForm
Private Sub FormSetting()
Const ProgramName As String = "Product Program Ver_"
Const VersionNum As String = "2.0.2"
Const VersionNum As String = "1.1.13"
Me.Text = ProgramName & VersionNum
Me.Size = New Size(1920, 1050)
@ -647,14 +806,9 @@ FailFunc:
ProdCode = txbNowNum.Text
End If
If ModelCode.Length = 2 Then '16자리 시리얼번호
Dim Serial As String = ProdCode.PadLeft(6, "0"c)
SerialNum = ModelCode & ColorCode & Format(Now, "yyMM") & Serial & ClassCode & TypeCode & VersionCode
Else '12자리 시리얼번호
Dim FrontSerial As String = Mid(ProdCode, 1, 3)
Dim BackSerial As String = Mid(ProdCode, 4, 3)
SerialNum = ModelCode & TypeCode & Format(Now, "yyMM") & BackSerial & FrontSerial
End If
Dim FrontSerial As String = Mid(ProdCode, 1, 3)
Dim BackSerial As String = Mid(ProdCode, 4, 3)
SerialNum = ModelCode & TypeCode & Format(Now, "yyMM") & BackSerial & FrontSerial
If DBSerialCheck() Then
Return False
@ -821,7 +975,10 @@ FailFunc:
TraySerialSetting()
Else
If SearchData.Length <> oldSearchLength And SearchData.Length <> newSearchLength Then
Const SearchLength As Int16 = 12
If SearchData.Length <> SearchLength Then
MsgBox("잘못된 제품 코드입니다. 확인하여 주십시오.", vbExclamation)
GoTo FailFunc
End If
@ -1019,19 +1176,6 @@ FinishFunc:
ThreadSwitch = False
End Sub
Private Function CheckRfUse() As Boolean
DBCmd = "SELECT RfUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' AND CartTypeCode = '" & TypeCode & "' AND ColorCode = '" & ColorCode & "'"
If DBQueryReader(DBCmd) Then
If sqlDataQuery(0) = "Y" Then
Return True
End If
End If
Return False
End Function
Private Sub RunTimer_Tick(sender As Object, e As EventArgs) Handles RunTimer.Tick
Dim ConfigStr As String
@ -1040,7 +1184,7 @@ FinishFunc:
If ckbOpAlto.Checked = False Then
If txbTDNum.Text.Length = TDMaxLength Then
If Not (CheckRfUse() = False And (Val(TDData(SearchList.TestStep)) = 21 Or Val(TDData(SearchList.TestStep)) = 25)) Then
If Not (ModelCode = 6 And (Val(TDData(SearchList.TestStep)) = 21 Or Val(TDData(SearchList.TestStep)) = 25)) Then
If Val(TDData(SearchList.TestStep)) <> 23 And Val(TDData(SearchList.TestStep)) <> 27 And Val(TDData(SearchList.TestStep)) <> 30 And Val(TDData(SearchList.TestStep)) <> 32 And Val(TDData(SearchList.TestStep)) <> 41 Then
If Val(TDData(SearchList.TestStep)) > 29 Then
RunStateFunc("중복 처리", Color.Red)
@ -1108,13 +1252,9 @@ FinishFunc:
txbPDNum.Text = SerialNum
Else
SerialNum = txbPDNum.Text
If SerialNum.Length = oldSearchLength Then '12자리 시리얼번호
Dim FrontSetSerial As String = Mid(SerialNum, 7, 3)
Dim BackSetSerial As String = Mid(SerialNum, 10, 3)
ProdCode = BackSetSerial & FrontSetSerial
ElseIf SerialNum.Length = newSearchLength Then '16자리 시리얼번호
ProdCode = Mid(SerialNum, 8, 6)
End If
Dim FrontSetSerial As String = Mid(SerialNum, 7, 3)
Dim BackSetSerial As String = Mid(SerialNum, 10, 3)
ProdCode = BackSetSerial & FrontSetSerial
End If
PrintFunc()
@ -1372,41 +1512,22 @@ FinishFunc:
Const Commander As String = "wrsconf1"
Dim retVal As String
If ModelCode.Length = 2 Then '16자리 시리얼번호
Dim Model As String = Mid(SerialNum, 1, 2)
Dim ModelOpt As String = Mid(SerialNum, 3, 1)
Dim BoardSN As String = Mid(SerialNum, 4, 10)
Dim QcOpt As String = Mid(SerialNum, 14, 3)
Dim ProdCode As String = Mid(SerialNum, 1, 2)
Dim ProdDate As String = Mid(SerialNum, 3, 4)
Dim FrontSetSerial As String = Mid(SerialNum, 7, 3)
Dim BackSetSerial As String = Mid(SerialNum, 10, 3)
Dim UseSerial As String = ProdDate & BackSetSerial & FrontSetSerial
tmpCmdMessage = "[" & Commander & " " & Factory & "," & BoardSN & "," & Model & "," & ModelOpt & "," & QcOpt & "," & Country & "," & Agency & "]" + vbCrLf
tmpCmdMessage = "[" & Commander & " " & Factory & "," & UseSerial & "," & ProdCode & "," & Country & "," & Agency & "]" + vbCrLf
If SendData(tmpCmdMessage) Then
Return False
End If
If SendData(tmpCmdMessage) Then
Return False
End If
retVal = PollingReceiveData(2000)
retVal = PollingReceiveData(2000)
If retVal <> Factory & "," & BoardSN & "," & Model & "," & ModelOpt & "," & QcOpt & "," & Country & "," & Agency Then
Return False
End If
Else '12자리 시리얼번호
Dim ProdCode As String = Mid(SerialNum, 1, 2)
Dim ProdDate As String = Mid(SerialNum, 3, 4)
Dim FrontSetSerial As String = Mid(SerialNum, 7, 3)
Dim BackSetSerial As String = Mid(SerialNum, 10, 3)
Dim UseSerial As String = ProdDate & BackSetSerial & FrontSetSerial
tmpCmdMessage = "[" & Commander & " " & Factory & "," & UseSerial & "," & ProdCode & "," & Country & "," & Agency & "]" + vbCrLf
If SendData(tmpCmdMessage) Then
Return False
End If
retVal = PollingReceiveData(2000)
If retVal <> Factory.ToLower & "," & UseSerial & "," & ProdCode & "," & Country & "," & Agency Then
Return False
End If
If retVal <> Factory.ToLower & "," & UseSerial & "," & ProdCode & "," & Country & "," & Agency Then
Return False
End If
Return True
@ -1560,7 +1681,7 @@ FinishFunc:
Private Function ParsingData(CmdInclude As Boolean) As String
Dim cmdStr As String
Dim cmdVal(0 To 8) As String
Dim cmdVal(0 To 6) As String
Dim i As Integer
Try
@ -1575,7 +1696,7 @@ FinishFunc:
cmdStr = Mid(cmdMessage, 1, (InStr(rxMessage, " ") - 2))
cmdMessage = Mid(rxMessage, InStr(rxMessage, " ") + 1, Len(cmdMessage))
For i = 1 To 7
For i = 1 To 5
If InStr(cmdMessage, ",") <> 0 Then
cmdVal(i) = Mid(cmdMessage, 1, InStr(cmdMessage, ",") - 1)
cmdMessage = Mid(cmdMessage, InStr(cmdMessage, ",") + 1, Len(cmdMessage))
@ -1599,11 +1720,7 @@ FinishFunc:
cmdStr = (cmdVal(1) & "," & cmdVal(2))
Return cmdStr
Case "wrsconf1"
If ModelCode.Length = 2 Then '16자리 시리얼번호
cmdStr = cmdVal(1) & "," & cmdVal(2) & "," & cmdVal(3) & "," & cmdVal(4) & "," & cmdVal(5) & "," & cmdVal(6) & "," & cmdVal(7)
Else '12자리 시리얼번호
cmdStr = cmdVal(1) & "," & cmdVal(2) & "," & cmdVal(3) & "," & cmdVal(4) & "," & cmdVal(5)
End If
cmdStr = cmdVal(1) & "," & cmdVal(2) & "," & cmdVal(3) & "," & cmdVal(4) & "," & cmdVal(5)
Return cmdStr
Case "settdsn"
cmdStr = cmdVal(1)
@ -1940,13 +2057,14 @@ FailFunc:
Select Case NowMode
Case ModeList.Prod_Input
DBCmd = "SELECT InfoRegOkCntColumnName, InfoRegNgCntColumnName FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1"
If DBQueryReader(DBCmd) Then
Dim InfoRegOkCntColumnName As String = sqlDataQuery(0)
Dim InfoRegNgCntColumnName As String = sqlDataQuery(1)
DBCmd = "UPDATE " & ApplyPD1CntDB & " SET PD1_InfoTotalCnt = '" & CountSelect(CountList.Total) & "', " & InfoRegOkCntColumnName & " = '" & CountSelect(CountList.Success) & "', " & InfoRegNgCntColumnName & " = '" & CountSelect(CountList.Fail) & "' WHERE PD1_Date = '" & NowDate & "'"
If ModelCode = 3 Then
DBCmd = "UPDATE " & ApplyPD1CntDB & " SET PD1_InfoTotalCnt = '" & CountSelect(CountList.Total) & "', PD1_InfoMaxOk = '" & CountSelect(CountList.Success) & "', PD1_InfoMaxNg = '" & CountSelect(CountList.Fail) & "' WHERE PD1_Date = '" & NowDate & "'"
ElseIf ModelCode = 5 Then
DBCmd = "UPDATE " & ApplyPD1CntDB & " SET PD1_InfoTotalCnt = '" & CountSelect(CountList.Total) & "', PD1_InfoAltoOk = '" & CountSelect(CountList.Success) & "', PD1_InfoAltoNg = '" & CountSelect(CountList.Fail) & "' WHERE PD1_Date = '" & NowDate & "'"
ElseIf ModelCode = 6 Then
DBCmd = "UPDATE " & ApplyPD1CntDB & " SET PD1_InfoTotalCnt = '" & CountSelect(CountList.Total) & "', PD1_InfoEffectOk = '" & CountSelect(CountList.Success) & "', PD1_InfoEffectNg = '" & CountSelect(CountList.Fail) & "' WHERE PD1_Date = '" & NowDate & "'"
ElseIf ModelCode = 7 Then
DBCmd = "UPDATE " & ApplyPD1CntDB & " SET PD1_InfoTotalCnt = '" & CountSelect(CountList.Total) & "', PD1_InfoMaxAlphaOk = '" & CountSelect(CountList.Success) & "', PD1_InfoMaxAlphaNg = '" & CountSelect(CountList.Fail) & "' WHERE PD1_Date = '" & NowDate & "'"
Else
MsgBox("수량 업데이트, 잘못된 경로입니다.", vbCritical)
Return True
@ -1970,18 +2088,21 @@ FailFunc:
Select Case NowMode
Case ModeList.Prod_Input
DBCmd = "SELECT InfoRegOkCntColumnName, InfoRegNgCntColumnName FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1"
If DBQueryReader(DBCmd) Then
Dim InfoRegOkCntColumnName As String = sqlDataQuery(0)
Dim InfoRegNgCntColumnName As String = sqlDataQuery(1)
DBCmd = "SELECT PD1_InfoTotalCnt," & InfoRegOkCntColumnName & "," & InfoRegNgCntColumnName & " FROM " & ApplyPD1CntDB & " WHERE PD1_Date = '" & NowDate & "'"
If ModelCode = "3" Then
DBCmd = "SELECT PD1_InfoTotalCnt,PD1_InfoMaxOk,PD1_InfoMaxNg FROM " & ApplyPD1CntDB & " WHERE PD1_Date = '" & NowDate & "'"
ElseIf ModelCode = "5" Then
DBCmd = "SELECT PD1_InfoTotalCnt,PD1_InfoAltoOk,PD1_InfoAltoNg FROM " & ApplyPD1CntDB & " WHERE PD1_Date = '" & NowDate & "'"
ElseIf ModelCode = "6" Then
DBCmd = "SELECT PD1_InfoTotalCnt,PD1_InfoEffectOk,PD1_InfoEffectNg FROM " & ApplyPD1CntDB & " WHERE PD1_Date = '" & NowDate & "'"
ElseIf ModelCode = "7" Then
DBCmd = "SELECT PD1_InfoTotalCnt,PD1_InfoMaxAlphaOk,PD1_InfoMaxAlphaNg FROM " & ApplyPD1CntDB & " WHERE PD1_Date = '" & NowDate & "'"
Else
MsgBox("수량 카운터 잘못된 경로입니다.", vbCritical)
Return True
End If
Case ModeList.TDRecycle
DBCmd = "SELECT PD1_RecycleCnt,'0','0' FROM " & ApplyPD1CntDB & " WHERE PD1_Date = '" & NowDate & "'"
Case Else
@ -2129,7 +2250,6 @@ FailFunc:
End If
ClassCode = dgvDataSet.Rows(SelectData).Cells(6).Value
VersionCode = dgvDataSet.Rows(SelectData).Cells(7).Value
With txbPDModel
.Text = dgvDataSet.Rows(SelectData).Cells(1).Value
@ -2214,8 +2334,6 @@ FailFunc:
cboRegColor.Text = "SELECT!"
cboRegClass.SelectedIndex = -1
cboRegClass.Text = "SELECT!"
cboRegVersion.SelectedIndex = -1
cboRegVersion.Text = "SELECT!"
End Sub
Private Sub btnRegOK_Click(sender As Object, e As EventArgs) Handles btnRegOK.Click
@ -2248,17 +2366,12 @@ FailFunc:
MsgBox("대리점코드를 입력하지 않으셨습니다. 확인하여 주십시오.", vbExclamation)
txbRegAgency.Focus()
Else
If cboRegVersion.SelectedIndex = -1 Then
MsgBox("HW버전코드를 입력하지 않으셨습니다. 확인하여 주십시오.", vbExclamation)
cboRegVersion.Focus()
Else
dgvDataSet.Rows.Add(txbRegName.Text, cboRegModel.SelectedItem, cboRegType.SelectedItem, txbRegCountry.Text, txbRegAgency.Text, cboRegColor.SelectedItem, cboRegClass.SelectedItem.Value, cboRegVersion.SelectedItem.Value.ToString)
dgvDataSet.Rows.Add(txbRegName.Text, cboRegModel.SelectedItem, cboRegType.SelectedItem, txbRegCountry.Text, txbRegAgency.Text, cboRegColor.SelectedItem, ClassNumber(cboRegClass.SelectedIndex))
txbRegName.Text = String.Empty
txbRegCountry.Text = String.Empty
txbRegAgency.Text = String.Empty
OptionChange = True
End If
txbRegName.Text = String.Empty
txbRegCountry.Text = String.Empty
txbRegAgency.Text = String.Empty
OptionChange = True
End If
End If
End If
@ -2315,7 +2428,7 @@ FailFunc:
Select Case SaveType
Case SaveList.Info
For i = 0 To dgvDataSet.Rows.Count - 2
Dim RowData As String = dgvDataSet.Rows(i).Cells(0).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(1).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(2).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(3).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(4).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(5).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(6).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(7).Value.ToString & "|@"
Dim RowData As String = dgvDataSet.Rows(i).Cells(0).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(1).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(2).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(3).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(4).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(5).Value.ToString & "|" & dgvDataSet.Rows(i).Cells(6).Value.ToString & "|@"
SaveData = SaveData & RowData
Next
@ -2759,11 +2872,7 @@ FailLoad:
End If
If CtMax = "0" Then
If ModelCode.Length = 2 Then '16자리 시리얼번호
MinResult = "0"
Else '12자리 시리얼번호
MinResult = ClassCode & ColorCode & "0000"
End If
MinResult = ClassCode & ColorCode & "0000"
Else
MinResult = CtMax
End If

View File

@ -20,16 +20,12 @@
Public Const LoginDB As String = "jomtAccountDB.jomtTesterUserIDTbl"
Public Const InfoRegStateDB As String = "jomtTesterDB.jomtInfoRegStateTbl"
Private Const mainModelInfoDB As String = "jomtTesterDB.jomtModelInfoTbl"
Private Const testModelInfoDB As String = "jomtTesterServerDB.jomtModelInfoTbl"
Public ApplyCartDB As String = mainCartDB
Public ApplyHFTestDB As String = mainHFTestDB
Public ApplyRFTestDB As String = mainRFTestDB
Public ApplyPD1CntDB As String = mainPD1CntDB
Public ApplyNonTDDB As String = mainNonTDDB
Public ApplyReturnDB As String = MainReturnDB
Public ApplyModelInfoDB As String = mainModelInfoDB
Public Sub ServerChanger(ChangeState As Boolean)
If ChangeState = True Then