fix: PRO_S & MAXIMUM_ALPHA packingSerial, serialPackCompare

SalesPacking_MES_API_Project/mainForm.vb

@@ -1641,7 +1641,7 @@ Public Class mainForm
         Const colorNum As Int16 = 11
         Const countNum As Int16 = 1
 
-        DBCmd = "SELECT Main_Product_SN,Pro_Face_Serial,Lux_Face_Serial,Pro_Eye_Serial,Lux_Eye_Serial,Pro_Body_Serial,Lux_Body_Serial,MAXIMUM_SN,Alpha_Set_Serial,Alpha_Face_Serial,Alpha_Eye_Serial,Alpha_Body_Serial,Alto_Serial,Effect_Serial,EffectV3_Serial,MAXIMUM_ALPHA_SN,Pro_S_Serial FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'"
+        DBCmd = "SELECT Main_Product_SN,Pro_Face_Serial,Lux_Face_Serial,Pro_Eye_Serial,Lux_Eye_Serial,Pro_Body_Serial,Lux_Body_Serial,MAXIMUM_SN,Alpha_Set_Serial,Alpha_Face_Serial,Alpha_Eye_Serial,Alpha_Body_Serial,Alto_Serial,Effect_Serial,EffectV3_Serial,MAXIMUM_ALPHA_SN,Pro_S_Set_Serial,Pro_S_Face_Serial,Pro_S_Eye_Serial,Pro_S_Body_Serial FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'"
         If DBQueryReader(DBCmd) Then
             For i = prodDB.luxset To prodDB.proSbody
                 prodSerial(i - prodDB.luxset) = sqlDataQuery(i - prodDB.luxset)
@@ -2069,6 +2069,36 @@ Public Class mainForm
                             Return False
                     End Select
 
+                Case modelList.MAXIMUM_ALPHA
+                    TDUseCompare = False
+
+                    Select Case typeNum
+                        Case typeList.prodset_V1
+                            commandStr = "MAXIMUM_ALPHA_SN"
+                        Case Else
+                            errorOut("등록오류")
+                            errorGen("존재하지 않는 타입 번호입니다.")
+                            Return False
+                    End Select
+
+                Case modelList.PRO_S
+                    TDUseCompare = True
+
+                    Select Case typeNum
+                        Case typeList.prodset_V1
+                            commandStr = "Pro_S_Set_Serial"
+                        Case typeList.prodface_V2
+                            commandStr = "Pro_S_Face_Serial"
+                        Case typeList.prodeye
+                            commandStr = "Pro_S_Eye_Serial"
+                        Case typeList.prodbody
+                            commandStr = "Pro_S_Body_Serial"
+                        Case Else
+                            errorOut("등록오류")
+                            errorGen("존재하지 않는 타입 번호입니다.")
+                            Return False
+                    End Select
+
                 Case Else
                     TDUseCompare = False
 
@@ -3038,7 +3068,7 @@ Public Class mainForm
                     DBCmd = "SELECT AutoPackCnt,APProSetCnt,APLuxSetCnt,APProFaceCnt,APLuxFaceCnt,APProEyeCnt,APLuxEyeCnt,APProBodyCnt,APLuxBodyCnt,APMAXIMUMCnt,APAlphaSetCnt,APAlphaFaceCnt,APAlphaEyeCnt,APAlphaBodyCnt,APAltoCnt,APEffectcnt,APEffectV3Cnt,APMAXIMUMALPHACnt,APProSSetCnt,APProSFaceCnt,APProSEyeCnt,APProSBodyCnt,APMask5Cnt,APMask10Cnt,APHairBandCnt,APGelCnt,APMiniGel,APAmpleCnt,APCreamCnt,APUmbrellaCnt,APFenCnt,APChargerCnt,APCableCnt,APTonerCnt,APCasePROBlack,APCasePROBeige,APCasePRORed,APCasePROPink,APCaseMAXBlack,APCaseMAXApr,APCaseMAXMint,APCaseMAXBeige,APSoothingGelCnt,APCarton0Cnt,APCarton1Cnt,APCarton2Cnt,APCarton3Cnt,APCarton4Cnt,APCarton5Cnt,APCarton6Cnt,APBagCnt,APCosBagCnt,APDustBagCnt,APCaseMAXPurple,APCasePROSnakeBlack,APKollagenCnt,APKollagenSetCnt,APKollagen_PCnt,APKollagenSet_PCnt,APCleansingWaterCnt,APTonerPadCnt,APCaseMaxSafBK,APHologram_1Cnt,APHologram_3Cnt,APHologram_5Cnt,APCaseMaxSafPp,APCaseMaxYellow,APKollagen_Pe1Cnt,APKollagen_Pe3Cnt,APKollagen_Pe5Cnt,APATCircleCaseCnt,APAPSquareCaseCnt,APCaseMAXPeach,APMasSoothingCnt,APCaseMAXSMint,APMeshPouchCnt,APFirmingAmpCnt,APHyaluronicAmpCnt,APnightshotcnt,APmorningshotcnt,APcasemaxwoodicnt,APElicolltonercnt,APElicollampcnt,APElicollcreamcnt,APElihyaltonercnt,APElihyalampcnt,APElihyalcreamcnt,APDayshotcnt,APBeautyshopbagcnt,APGummycnt,APStickjellycnt,APNewyearbagcnt,APEmsbeltcnt,APBeltbagcnt,APDayshot2cnt,APElixircnt,APElixirpremiumcnt, APEmsbeltcontrollsetcnt, APFabricBagcnt, APGoldshopbagcnt, APMorNigshotsetcnt, APCTBoxcnt, APElesqLiftingTonercnt, APElesqLiftingCeamcnt, APElesqLiftingECreamcnt, APElesqLiftingAmpcnt, APElesqAquaTonercnt, APElesqAquaCeamcnt, APElesqAquaECreamcnt, APElesqAquaAmpcnt, APCarton8Cnt, APKeyringCnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'"
                     countCommandFunc(countSaveList.autopack)
                 Else
-                    DBCmd = "SELECT AutoWeightCnt,AWProSetCnt,AWLuxSetCnt,AWProFaceCnt,AWLuxFaceCnt,AWProEyeCnt,AWLuxEyeCnt,AWProBodyCnt,AWLuxBodyCnt,AWMAXIMUMCnt,AWAlphaSetCnt,AWAlphaFaceCnt,AWAlphaEyeCnt,AWAlphaBodyCnt,AWAltoCnt,AWEffectcnt,AWEffectV3Cnt,AWMAXIMUMALPHACnt,AWPro_S_Cnt,AWProSSetCnt,AWProSFaceCnt,AWProSEyeCnt,AWProSBodyCnt,AWMask5Cnt,AWMask10Cnt,AWHairBandCnt,AWGelCnt,AWMiniGel,AWAmpleCnt,AWCreamCnt,AWUmbrellaCnt,AWFenCnt,AWChargerCnt,AWCableCnt,AWTonerCnt,AWCasePROBlack,AWCasePROBeige,AWCasePRORed,AWCasePROPink,AWCaseMAXBlack,AWCaseMAXApr,AWCaseMAXMint,AWCaseMAXBeige,AWSoothingGelCnt,AWCarton0Cnt,AWCarton1Cnt,AWCarton2Cnt,AWCarton3Cnt,AWCarton4Cnt,AWCarton5Cnt,AWCarton6Cnt,AWBagCnt,AWCosBagCnt,AWDustBagCnt,AWCaseMAXPurple,AWCasePROSnakeBlack,AWKollagenCnt,AWKollagenSetCnt,AWKollagen_PCnt,AWKollagenSet_PCnt,AWCleansingWaterCnt,AWTonerPadCnt,AWCaseMaxSafBK,AWHologram_1Cnt,AWHologram_3Cnt,AWHologram_5Cnt,AWCaseMaxSafPp,AWCaseMaxYellow,AWKollagen_Pe1Cnt,AWKollagen_Pe3Cnt,AWKollagen_Pe5Cnt,AWATCircleCaseCnt,AWAPSquareCaseCnt,AWCaseMAXPeach,AWMasSoothingCnt,AWCaseMAXSMint,AWMeshPouchCnt,AWFirmingAmpCnt,AWHyaluronicAmpCnt,AWnightshotcnt,AWmorningshotcnt,AWcasemaxwoodicnt,AWElicolltonercnt,AWElicollampcnt,AWElicollcreamcnt,AWElihyaltonercnt,AWElihyalampcnt,AWElihyalcreamcnt,AWDayshotcnt,AWBeautyshopbagcnt,AWGummycnt,AWStickjellycnt,AWNewyearbagcnt,AWEmsbeltcnt,AWBeltbagcnt,AWDayshot2cnt,AWElixircnt,AWElixirpremiumcnt, AWEmsbeltcontrollsetcnt, AWFabricBagcnt, AWGoldshopbagcnt, AWMorNigshotsetcnt, AWCTBoxcnt,AWElesqLiftingTonercnt, AWElesqLiftingCeamcnt, AWElesqLiftingECreamcnt, AWElesqLiftingAmpcnt, AWElesqAquaTonercnt, AWElesqAquaCeamcnt, AWElesqAquaECreamcnt, AWElesqAquaAmpcnt, AWCarton8Cnt, AWKeyringCnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'"
+                    DBCmd = "SELECT AutoWeightCnt,AWProSetCnt,AWLuxSetCnt,AWProFaceCnt,AWLuxFaceCnt,AWProEyeCnt,AWLuxEyeCnt,AWProBodyCnt,AWLuxBodyCnt,AWMAXIMUMCnt,AWAlphaSetCnt,AWAlphaFaceCnt,AWAlphaEyeCnt,AWAlphaBodyCnt,AWAltoCnt,AWEffectcnt,AWEffectV3Cnt,AWMAXIMUMALPHACnt,AWProSSetCnt,AWProSFaceCnt,AWProSEyeCnt,AWProSBodyCnt,AWMask5Cnt,AWMask10Cnt,AWHairBandCnt,AWGelCnt,AWMiniGel,AWAmpleCnt,AWCreamCnt,AWUmbrellaCnt,AWFenCnt,AWChargerCnt,AWCableCnt,AWTonerCnt,AWCasePROBlack,AWCasePROBeige,AWCasePRORed,AWCasePROPink,AWCaseMAXBlack,AWCaseMAXApr,AWCaseMAXMint,AWCaseMAXBeige,AWSoothingGelCnt,AWCarton0Cnt,AWCarton1Cnt,AWCarton2Cnt,AWCarton3Cnt,AWCarton4Cnt,AWCarton5Cnt,AWCarton6Cnt,AWBagCnt,AWCosBagCnt,AWDustBagCnt,AWCaseMAXPurple,AWCasePROSnakeBlack,AWKollagenCnt,AWKollagenSetCnt,AWKollagen_PCnt,AWKollagenSet_PCnt,AWCleansingWaterCnt,AWTonerPadCnt,AWCaseMaxSafBK,AWHologram_1Cnt,AWHologram_3Cnt,AWHologram_5Cnt,AWCaseMaxSafPp,AWCaseMaxYellow,AWKollagen_Pe1Cnt,AWKollagen_Pe3Cnt,AWKollagen_Pe5Cnt,AWATCircleCaseCnt,AWAPSquareCaseCnt,AWCaseMAXPeach,AWMasSoothingCnt,AWCaseMAXSMint,AWMeshPouchCnt,AWFirmingAmpCnt,AWHyaluronicAmpCnt,AWnightshotcnt,AWmorningshotcnt,AWcasemaxwoodicnt,AWElicolltonercnt,AWElicollampcnt,AWElicollcreamcnt,AWElihyaltonercnt,AWElihyalampcnt,AWElihyalcreamcnt,AWDayshotcnt,AWBeautyshopbagcnt,AWGummycnt,AWStickjellycnt,AWNewyearbagcnt,AWEmsbeltcnt,AWBeltbagcnt,AWDayshot2cnt,AWElixircnt,AWElixirpremiumcnt, AWEmsbeltcontrollsetcnt, AWFabricBagcnt, AWGoldshopbagcnt, AWMorNigshotsetcnt, AWCTBoxcnt,AWElesqLiftingTonercnt, AWElesqLiftingCeamcnt, AWElesqLiftingECreamcnt, AWElesqLiftingAmpcnt, AWElesqAquaTonercnt, AWElesqAquaCeamcnt, AWElesqAquaECreamcnt, AWElesqAquaAmpcnt, AWCarton8Cnt, AWKeyringCnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'"
                     countCommandFunc(countSaveList.autoWeight)
                 End If
             End If