diff --git a/MAXIMUM_Product_Program/MainForm.vb b/MAXIMUM_Product_Program/MainForm.vb index 8fda14e..6b91c4e 100644 --- a/MAXIMUM_Product_Program/MainForm.vb +++ b/MAXIMUM_Product_Program/MainForm.vb @@ -237,7 +237,7 @@ Public Class MainForm Private Sub ModelCboSetting() cboRegModel.Items.Clear() - DBCmd = "SELECT ModelName FROM " & ModelInfoDB & " WHERE DeviceTypeCode = 'A' GROUP BY ModelName" + 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)) @@ -249,7 +249,7 @@ Public Class MainForm If cboRegModel.SelectedIndex > -1 Then cboRegType.Items.Clear() - DBCmd = "SELECT CartTypeName FROM " & ModelInfoDB & " WHERE ModelName = '" & cboRegModel.SelectedItem & "' GROUP BY CartTypeCode ORDER BY CartTypeCode ASC" + 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)) @@ -266,7 +266,7 @@ Public Class MainForm If cboRegType.SelectedIndex > -1 Then cboRegColor.Items.Clear() - DBCmd = "SELECT ColorName FROM " & ModelInfoDB & " WHERE ModelName = '" & cboRegModel.SelectedItem & "' AND CartTypeName = '" & cboRegType.SelectedItem & "' ORDER BY ColorCode ASC" + 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)) @@ -284,7 +284,7 @@ Public Class MainForm 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 " & ModelInfoDB & " WHERE ModelName = '" & modelName & "' AND CartTypeName = '" & cartTypeName & "' AND ColorName = '" & colorName & "'" + DBCmd = "SELECT ModelCode, CartTypeCode, ColorCode, TDUseYn FROM " & ApplyModelInfoDB & " WHERE ModelName = '" & modelName & "' AND CartTypeName = '" & cartTypeName & "' AND ColorName = '" & colorName & "'" If DBQueryReader(DBCmd) Then ModelCode = sqlDataQuery(0) @@ -398,7 +398,7 @@ Public Class MainForm Private Sub FormSetting() Const ProgramName As String = "Product Program Ver_" - Const VersionNum As String = "1.1.13" + Const VersionNum As String = "2.0.0" Me.Text = ProgramName & VersionNum Me.Size = New Size(1920, 1050) @@ -1020,7 +1020,7 @@ FinishFunc: End Sub Private Function CheckRfUse() As Boolean - DBCmd = "SELECT RfUseYn FROM " & ModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' AND CartTypeCode = '" & TypeCode & "' AND ColorCode = '" & ColorCode & "'" + DBCmd = "SELECT RfUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' AND CartTypeCode = '" & TypeCode & "' AND ColorCode = '" & ColorCode & "'" If DBQueryReader(DBCmd) Then If sqlDataQuery(0) = "Y" Then @@ -1936,7 +1936,7 @@ FailFunc: Select Case NowMode Case ModeList.Prod_Input - DBCmd = "SELECT InfoRegOkCntColumnName, InfoRegNgCntColumnName FROM " & ModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1" + DBCmd = "SELECT InfoRegOkCntColumnName, InfoRegNgCntColumnName FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1" If DBQueryReader(DBCmd) Then Dim InfoRegOkCntColumnName As String = sqlDataQuery(0) @@ -1966,7 +1966,7 @@ FailFunc: Select Case NowMode Case ModeList.Prod_Input - DBCmd = "SELECT InfoRegOkCntColumnName, InfoRegNgCntColumnName FROM " & ModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1" + DBCmd = "SELECT InfoRegOkCntColumnName, InfoRegNgCntColumnName FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1" If DBQueryReader(DBCmd) Then Dim InfoRegOkCntColumnName As String = sqlDataQuery(0)