diff --git a/MAXIMUM_Product_Program.sln b/MAXIMUM_Product_Program.sln index 99a4d1f..c5d545b 100644 --- a/MAXIMUM_Product_Program.sln +++ b/MAXIMUM_Product_Program.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 17.5.33627.172 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MAXIMUM_Product_Program", "MAXIMUM_Product_Program\MAXIMUM_Product_Program.vbproj", "{CA1C16A0-00FB-4EBD-AF29-5DBD46865EB7}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{EA60ADAC-C42F-49C8-8BBA-F7F436B5FD18}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,8 +15,6 @@ Global {CA1C16A0-00FB-4EBD-AF29-5DBD46865EB7}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA1C16A0-00FB-4EBD-AF29-5DBD46865EB7}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA1C16A0-00FB-4EBD-AF29-5DBD46865EB7}.Release|Any CPU.Build.0 = Release|Any CPU - {EA60ADAC-C42F-49C8-8BBA-F7F436B5FD18}.Debug|Any CPU.ActiveCfg = Debug - {EA60ADAC-C42F-49C8-8BBA-F7F436B5FD18}.Release|Any CPU.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MAXIMUM_Product_Program/MainForm.vb b/MAXIMUM_Product_Program/MainForm.vb index 7b512aa..ba1f5c4 100644 --- a/MAXIMUM_Product_Program/MainForm.vb +++ b/MAXIMUM_Product_Program/MainForm.vb @@ -217,6 +217,7 @@ Public Class MainForm 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 @@ -230,6 +231,8 @@ Public Class MainForm cboRegType.Items.Add("SET") Case "EFFECT" cboRegType.Items.Add("SET") + Case "MAXIMUM ALPHA" + cboRegType.Items.Add("SET") Case Else MsgBox("잘못된 경로입니다.", vbCritical) End Select @@ -287,6 +290,19 @@ Public Class MainForm 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("Sappaire_Blue") + cboRegColor.Items.Add("Topaz_Brown") + cboRegColor.Items.Add("Sitrin_Gold") + Case Else + MsgBox("잘못된 경로입니다.", vbCritical) + End Select + Case Else MsgBox("잘못된 경로입니다.", vbCritical) End Select @@ -394,6 +410,33 @@ Public Class MainForm 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 "Stirin_Gold" + ColorCode = "6" + Case Else + Return True + End Select + End Select + Case Else TDUseCompare = False Return True @@ -500,7 +543,7 @@ Public Class MainForm Private Sub FormSetting() Const ProgramName As String = "Product Program Ver_" - Const VersionNum As String = "1.1.2" + Const VersionNum As String = "1.1.3" Me.Text = ProgramName & VersionNum Me.Size = New Size(1920, 1050) @@ -2001,6 +2044,8 @@ FailFunc: 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 @@ -2031,6 +2076,8 @@ FailFunc: 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 diff --git a/README.md b/README.md index 2225452..16bcb12 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,15 @@ | EFFECT | 6 | True | SET | 0 | White_Pink | 1 | | | | | | | White_Sky | 2 | | | | | | | White_Brown | 3 | +| EFFECT | 7 | True | SET | 0 | Ruby_Red | 1 | +| | | | | | Topaz_Orange | 2 | +| | | | | | Emerald_Green | 3 | +| | | | | | Sapphire_Blue | 4 | +| | | | | | Topaz_Brown | 5 | +| | | | | | Stirin_Gold | 6 | + + + ## 5. DB 테이블 요약 diff --git a/업데이트 내역.txt b/업데이트 내역.txt index 00d5fa2..109c93b 100644 --- a/업데이트 내역.txt +++ b/업데이트 내역.txt @@ -1,3 +1 @@ -바코드 인쇄 내용 변경 -변경 전 : 년.월.일 -변경 후 : 년.월 \ No newline at end of file +맥시멈 알파 제품군, 색상 추가 \ No newline at end of file