1. 보급형 td 계엘(세모,원) ckbopV1인 경우 적용
2. ckbopV1 검사에서 네모, 마름모 적용되지 않게 수정
This commit is contained in:
parent
0e3c8585f9
commit
b507d11e36
@ -3,6 +3,7 @@ Imports System.IO
|
|||||||
Imports System.IO.Ports
|
Imports System.IO.Ports
|
||||||
Imports System.Math
|
Imports System.Math
|
||||||
Imports System.Threading
|
Imports System.Threading
|
||||||
|
Imports Mysqlx.XDevAPI.Relational
|
||||||
|
|
||||||
Public Class mainForm
|
Public Class mainForm
|
||||||
Private Enum formModList
|
Private Enum formModList
|
||||||
@ -571,7 +572,7 @@ Public Class mainForm
|
|||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If ckbopV1.Checked = True And modelCompare() <> "ALTO" Then
|
If ckbopV1.Checked = True And modelCompare() <> "ALTO" And modelCompare() <> "NEMO" And modelCompare() <> "MAREUMMO" Then
|
||||||
If v1BeforeHifu() Then
|
If v1BeforeHifu() Then
|
||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
@ -837,7 +838,13 @@ Public Class mainForm
|
|||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Function v1BeforeRF() As Boolean
|
Private Function v1BeforeRF() As Boolean
|
||||||
DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR) FROM " & applyCartDB & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
|
Dim table As String
|
||||||
|
If LDMUseCompare Then
|
||||||
|
table = ApplyLdmDB
|
||||||
|
Else
|
||||||
|
table = applyCartDB
|
||||||
|
End If
|
||||||
|
DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR) FROM " & table & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
|
||||||
If DBQueryReader(DBCmd) Then
|
If DBQueryReader(DBCmd) Then
|
||||||
txbRDate_M1.Text = sqlDataQuery(0)
|
txbRDate_M1.Text = sqlDataQuery(0)
|
||||||
txbRTime_M1.Text = sqlDataQuery(1)
|
txbRTime_M1.Text = sqlDataQuery(1)
|
||||||
@ -1229,7 +1236,14 @@ FailData:
|
|||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Function v1BeforeHifu()
|
Private Function v1BeforeHifu()
|
||||||
DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR),P1_Frequency FROM " & applyCartDB & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
|
Dim table As String
|
||||||
|
If LDMUseCompare Then
|
||||||
|
table = ApplyLdmDB
|
||||||
|
Else
|
||||||
|
table = applyCartDB
|
||||||
|
End If
|
||||||
|
|
||||||
|
DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR),P1_Frequency FROM " & table & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
|
||||||
If DBQueryReader(DBCmd) Then
|
If DBQueryReader(DBCmd) Then
|
||||||
txbHDate_M1.Text = sqlDataQuery(0)
|
txbHDate_M1.Text = sqlDataQuery(0)
|
||||||
txbHTime_M1.Text = sqlDataQuery(1)
|
txbHTime_M1.Text = sqlDataQuery(1)
|
||||||
@ -1677,6 +1691,7 @@ DataFail:
|
|||||||
Else
|
Else
|
||||||
RfEpOnlyCompare = True
|
RfEpOnlyCompare = True
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If typeCompare() <> "FACE" And typeCompare() <> "EYE" And typeCompare() <> "BODY" Then
|
If typeCompare() <> "FACE" And typeCompare() <> "EYE" And typeCompare() <> "BODY" Then
|
||||||
@ -2434,7 +2449,7 @@ finishFunc:
|
|||||||
psData = Mid(readData, 1, InStr(readData, "^") - 1)
|
psData = Mid(readData, 1, InStr(readData, "^") - 1)
|
||||||
readData = Mid(readData, InStr(readData, "^") + 1, readData.Length)
|
readData = Mid(readData, InStr(readData, "^") + 1, readData.Length)
|
||||||
Else
|
Else
|
||||||
MsgBox("불량 데이터가 존재합니다.", vbCritical)
|
MsgBox("불량 데이터가 존재합니다." & vbCrLf & "합격기준 데이터 개수가 맞지 않습니다. 초기화 후 저장을 진행하여 주십시오.", vbCritical)
|
||||||
optionAllReset()
|
optionAllReset()
|
||||||
Exit For
|
Exit For
|
||||||
End If
|
End If
|
||||||
@ -2445,7 +2460,7 @@ finishFunc:
|
|||||||
dbCheckSetting(readData)
|
dbCheckSetting(readData)
|
||||||
|
|
||||||
Else
|
Else
|
||||||
MsgBox("불량 데이터가 존재합니다.", vbCritical)
|
MsgBox("불량 데이터가 존재합니다." & vbCrLf & "합격기준 데이터 개수가 맞지 않습니다. 초기화 후 저장을 진행하여 주십시오.", vbCritical)
|
||||||
optionAllReset()
|
optionAllReset()
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user