From e5e95092176a317a989e16aa704beb13e0f23148 Mon Sep 17 00:00:00 2001
From: jiwonRepair <ahrns1@naver.com>
Date: Thu, 17 Jul 2025 16:34:47 +0900
Subject: [PATCH] feat: EFFECT model split cartridge color code V2 & V3

---
 MAXIMUM_Product_Program/MainForm.vb | 35 ++++++++++++++++++++++++-----
 업데이트 내역.txt             | 10 +++------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/MAXIMUM_Product_Program/MainForm.vb b/MAXIMUM_Product_Program/MainForm.vb
index ba1f5c4..2288145 100644
--- a/MAXIMUM_Product_Program/MainForm.vb
+++ b/MAXIMUM_Product_Program/MainForm.vb
@@ -230,7 +230,8 @@ Public Class MainForm
                 Case "ALTO"
                     cboRegType.Items.Add("SET")
                 Case "EFFECT"
-                    cboRegType.Items.Add("SET")
+                    cboRegType.Items.Add("V2")
+                    cboRegType.Items.Add("V3")
                 Case "MAXIMUM ALPHA"
                     cboRegType.Items.Add("SET")
                 Case Else
@@ -282,10 +283,16 @@ Public Class MainForm
 
                 Case "EFFECT"
                     Select Case cboRegType.SelectedItem
-                        Case "SET"
+                        Case "V2"
                             cboRegColor.Items.Add("White_Brown")
                             cboRegColor.Items.Add("White_Pink")
                             cboRegColor.Items.Add("White_Sky")
+                        Case "V3"
+                            cboRegColor.Items.Add("White_Brown")
+                            cboRegColor.Items.Add("White_Pink")
+                            cboRegColor.Items.Add("White_Sky")
+                            cboRegColor.Items.Add("LineFrends_Brown")
+                            cboRegColor.Items.Add("LineFrends_Sally")
                         Case Else
                             MsgBox("잘못된 경로입니다.", vbCritical)
                     End Select
@@ -395,8 +402,8 @@ Public Class MainForm
                 TDUseCompare = True
 
                 Select Case dgvDataSet.Rows(cboSelect).Cells(2).Value
-                    Case "SET"
-                        TypeCode = "0"
+                    Case "V2"
+                        TypeCode = "0" 'SET 였을 때 0 으로 고정
 
                         Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
                             Case "White_Pink"
@@ -408,6 +415,24 @@ Public Class MainForm
                             Case Else
                                 Return True
                         End Select
+
+                    Case "V3"
+                        TypeCode = "3" 'V3 혼란스럽지 않게 3으로 고정
+
+                        Select Case dgvDataSet.Rows(cboSelect).Cells(5).Value
+                            Case "White_Pink"
+                                ColorCode = "1"
+                            Case "White_Sky"
+                                ColorCode = "2"
+                            Case "White_Brown"
+                                ColorCode = "3"
+                            Case "LineFrends_Brown"
+                                ColorCode = "4"
+                            Case "LineFrends_Sally"
+                                ColorCode = "5"
+                            Case Else
+                                Return True
+                        End Select
                 End Select
 
             Case "MAXIMUM ALPHA"
@@ -543,7 +568,7 @@ Public Class MainForm
 
     Private Sub FormSetting()
         Const ProgramName As String = "Product Program Ver_"
-        Const VersionNum As String = "1.1.3"
+        Const VersionNum As String = "1.1.4"
 
         Me.Text = ProgramName & VersionNum
         Me.Size = New Size(1920, 1050)
diff --git a/업데이트 내역.txt b/업데이트 내역.txt
index 638094b..5384c87 100644
--- a/업데이트 내역.txt	
+++ b/업데이트 내역.txt	
@@ -1,7 +1,3 @@
-1. 맥시멈 알파 제품군, 색상 추가
-2. 모델 이름(MAXIMUM ALPHA)에 따른 변수 길이 수정
-- DB : jomtTesterDB > jomtCartidgeTbl ]
-- Ct_Model VARCHAR 10 >> 13
-- P0_Model VARCHAR 10 >> 13
-- P1_Model VARCHAR 10 >> 13
-- P2_Model VARCHAR 5 >> 13
\ No newline at end of file
+1. EFFECT cartridge color code를 SET에서 V2, V3로 분기 처리
+	1) V2 : 0
+	2) V3 : 3
\ No newline at end of file