feat: 실제 제조년월일이 출력되는 기능 추가

This commit is contained in:
kje97 2025-07-02 17:04:34 +09:00
parent 1e56b4cdae
commit 90caa7e014
2 changed files with 1660 additions and 1137 deletions

File diff suppressed because it is too large Load Diff

View File

@ -81,6 +81,7 @@ Public Class mainForm
Private Enum pd2DataList
pd2DateTime
prodDate
pd2Serial
pd2Factory
pd2Model
@ -1393,9 +1394,9 @@ DataFail:
Private Function prodSerialPD2(prodSerial As String) As Boolean
If TDUseCompare = True Then
DBCmd = "SELECT CONVERT(P3_DateTime,CHAR),Ct_SN,Ct_Manufacture_Name,Ct_Model,Ct_Type,Ct_Max_ShotCnt,Ct_Remain_ShotCnt,Ct_Abroad,Ct_Agency FROM " & applyCartDB & " WHERE Product_SN = '" & prodSerial & "'"
DBCmd = "SELECT CONVERT(P3_DateTime,CHAR), IFNULL(Manufacture_Date,'') as Manufacture_Date, Ct_SN,Ct_Manufacture_Name,Ct_Model,Ct_Type,Ct_Max_ShotCnt,Ct_Remain_ShotCnt,Ct_Abroad,Ct_Agency FROM " & applyCartDB & " WHERE Product_SN = '" & prodSerial & "'"
Else
DBCmd = "SELECT CONVERT(P3_DateTime,CHAR),Ct_SN,Ct_Manufacture_Name,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency FROM " & applyNonTDDB & " WHERE Product_SN = '" & prodSerial & "'"
DBCmd = "SELECT CONVERT(P3_DateTime,CHAR), IFNULL(Manufacture_Date,'') as Manufacture_Date, Ct_SN,Ct_Manufacture_Name,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency FROM " & applyNonTDDB & " WHERE Product_SN = '" & prodSerial & "'"
End If
If DBQueryReader(DBCmd) Then
@ -1405,11 +1406,18 @@ DataFail:
pd2ReadData(i) = sqlDataQuery(i)
pd2ReadTxb(i).Text = pd2ReadData(i)
pd2ReadTxb(i).BackColor = Color.Green
Else
If i = pd2DataList.prodDate Then
pd2ReadData(i) = "NULL"
pd2ReadTxb(i).Text = pd2ReadData(i)
pd2ReadTxb(i).BackColor = Color.Yellow ' 노란색으로 표시
' dataOkNg는 False로 설정하지 않음
Else
pd2ReadData(i) = "NULL"
pd2ReadTxb(i).Text = pd2ReadData(i)
pd2ReadTxb(i).BackColor = Color.Red
dataOkNg(dbRegList.dbInfo) = False
dataOkNg(dbRegList.dbInfo) = False ' 다른 필드는 False로 설정
End If
End If
Next
@ -1428,9 +1436,15 @@ DataFail:
Return False
Else
For i = 0 To pd2DataList.pd2Max - 1
If i = pd2DataList.prodDate Then
pd2ReadData(i) = "NULL"
pd2ReadTxb(i).Text = pd2ReadData(i)
pd2ReadTxb(i).BackColor = Color.Yellow ' 노란색
Else
pd2ReadData(i) = "NULL"
pd2ReadTxb(i).Text = pd2ReadData(i)
pd2ReadTxb(i).BackColor = Color.Red
End If
Next
Return True
@ -2619,6 +2633,7 @@ WR_File_Error:
txbRTime_M1.BackColor = SystemColors.Window
txbDate_M1.BackColor = SystemColors.Window
txbDate.BackColor = SystemColors.Window
txbSerial_M1.BackColor = SystemColors.Window
txbFactory_M1.BackColor = SystemColors.Window
txbModel_M1.BackColor = SystemColors.Window
@ -2661,6 +2676,7 @@ WR_File_Error:
txbRTime_M1.Text = String.Empty
txbDate_M1.Text = String.Empty
txbDate.Text = String.Empty
txbSerial_M1.Text = String.Empty
txbFactory_M1.Text = String.Empty
txbModel_M1.Text = String.Empty
@ -2703,6 +2719,7 @@ WR_File_Error:
txbRTime_M1.ForeColor = Color.Black
txbDate_M1.ForeColor = Color.Black
txbDate.ForeColor = Color.Black
txbSerial_M1.ForeColor = Color.Black
txbFactory_M1.ForeColor = Color.Black
txbModel_M1.ForeColor = Color.Black
@ -2745,6 +2762,7 @@ WR_File_Error:
txbRTime_M1.Refresh()
txbDate_M1.Refresh()
txbDate.Refresh()
txbSerial_M1.Refresh()
txbFactory_M1.Refresh()
txbModel_M1.Refresh()
@ -2787,6 +2805,7 @@ WR_File_Error:
rfReadTxb(rfDataList.rfR2Vrms_txb3) = txbREP_M1
pd2ReadTxb(pd2DataList.pd2DateTime) = txbDate_M1
pd2ReadTxb(pd2DataList.prodDate) = txbDate
pd2ReadTxb(pd2DataList.pd2Serial) = txbSerial_M1
pd2ReadTxb(pd2DataList.pd2Factory) = txbFactory_M1
pd2ReadTxb(pd2DataList.pd2Model) = txbModel_M1
@ -3119,7 +3138,7 @@ finishFunc:
txbProdSerial.Select(txbProdSerial.MaxLength, 0)
End Sub
Private Sub txbTDSN_GotFocus(sender As Object, e As EventArgs) Handles txbTDSN.GotFocus, txbTDDate.GotFocus, txbTDGrade.GotFocus, txbTDTDate.GotFocus, txbTDTTime.GotFocus, txbDotDate_M1.GotFocus, txbDotDepth_M1.GotFocus, txbDotPower_M1.GotFocus, txbDotTime_M1.GotFocus, txbHBettery_M1.GotFocus, txbHCtemp_M1.GotFocus, txbHDate_M1.GotFocus, txbHDtemp_M1.GotFocus, txbHFreq_M1.GotFocus, txbHFW_M1.GotFocus, txbHHifu_M1.GotFocus, txbHTime_M1.GotFocus, txbRDate_M1.GotFocus, txbREP_M1.GotFocus, txbRMC_M1.GotFocus, txbRRF_M1.GotFocus, txbRTime_M1.GotFocus, txbDate_M1.GotFocus, txbSerial_M1.GotFocus, txbFactory_M1.GotFocus, txbModel_M1.GotFocus, txbType_M1.GotFocus, txbFace_M1.GotFocus, txbEye_M1.GotFocus, txbAgency_M1.GotFocus, txbCountry_M1.GotFocus
Private Sub txbTDSN_GotFocus(sender As Object, e As EventArgs) Handles txbTDSN.GotFocus, txbTDDate.GotFocus, txbTDGrade.GotFocus, txbTDTDate.GotFocus, txbTDTTime.GotFocus, txbDotDate_M1.GotFocus, txbDotDepth_M1.GotFocus, txbDotPower_M1.GotFocus, txbDotTime_M1.GotFocus, txbHBettery_M1.GotFocus, txbHCtemp_M1.GotFocus, txbHDate_M1.GotFocus, txbHDtemp_M1.GotFocus, txbHFreq_M1.GotFocus, txbHFW_M1.GotFocus, txbHHifu_M1.GotFocus, txbHTime_M1.GotFocus, txbRDate_M1.GotFocus, txbREP_M1.GotFocus, txbRMC_M1.GotFocus, txbRRF_M1.GotFocus, txbRTime_M1.GotFocus, txbDate_M1.GotFocus, txbDate.GotFocus, txbSerial_M1.GotFocus, txbFactory_M1.GotFocus, txbModel_M1.GotFocus, txbType_M1.GotFocus, txbFace_M1.GotFocus, txbEye_M1.GotFocus, txbAgency_M1.GotFocus, txbCountry_M1.GotFocus
txbProdSerial.Focus()
End Sub
End Class