diff --git a/SalesPacking_MES_API_Project/mainForm.vb b/SalesPacking_MES_API_Project/mainForm.vb index d8e7bc5..544dba7 100644 --- a/SalesPacking_MES_API_Project/mainForm.vb +++ b/SalesPacking_MES_API_Project/mainForm.vb @@ -368,7 +368,7 @@ Public Class mainForm End If Next - For i = 0 To comDB.Emsbeltcontrollset + For i = 0 To comDB.Elixirpremium If UBound(Split(textCount, ",")) > 0 Then comComCount(i) = Mid(textCount, 1, InStr(textCount, ",") - 1) textCount = Mid(textCount, InStr(textCount, ",") + 1, textCount.Length) @@ -1600,10 +1600,10 @@ Public Class mainForm Private Function comCountSet() As Boolean - DBCmd = "SELECT Mask5Cnt,Mask10Cnt,HairBandCnt,GelCnt,MiniGelCnt,AmpleCnt,CreamCnt,UmbrellaCnt,FenCnt,ChargerCnt,CableCnt,TonerCnt,Case_PRO_Black,Case_PRO_Beige,Case_PRO_Red,Case_PRO_Pink,Case_MAX_Black,Case_MAX_Apr,Case_MAX_Mint,Case_MAX_Beige,SoothingGelCnt,Carton0_Cnt,Carton1_Cnt,Carton2_Cnt,Carton3_Cnt,Carton4_Cnt,Carton5_Cnt,Carton6_Cnt,Shopbag_Cnt,CosShopbag_Cnt,DustBagCnt,Case_MAX_Purple,Case_PRO_SnakeBlakc,KollagenCnt,KollagenSetCnt,Kollagen_PCnt,KollagenSet_PCnt,CleansingWaterCnt,TonerPadCnt,Case_MAX_SafBK_Cnt,Hologram_1Cnt,Hologram_3Cnt,Hologram_5Cnt,Case_MAX_SafPp_Cnt,Case_MAX_Yellow,Kollagen_Pe1Cnt,Kollagen_Pe3Cnt,Kollagen_Pe5Cnt,ATCircleCaseCnt,APSquareCaseCnt,Case_MAX_Peach,MasSoothingCnt,Case_MAX_SMintCnt,MeshPouchCnt,FirmingAmpCnt,HyaluronicAmpCnt,nightshotcnt,morningshotcnt,casemaxwoodicnt,Elicolltonercnt,Elicollampcnt,Elicollcreamcnt,Elihyaltonercnt,Elihyalampcnt,Elihyalcreamcnt,Dayshotcnt,Beautyshopbagcnt,Gummycnt,Stickjellycnt,Newyearbagcnt,Emsbeltcnt,Beltbagcnt,Dayshot2cnt,Elixircnt,Elixirpremiumcnt, Emsbeltcontrollsetcnt FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'" + DBCmd = "SELECT Mask5Cnt,Mask10Cnt,HairBandCnt,GelCnt,MiniGelCnt,AmpleCnt,CreamCnt,UmbrellaCnt,FenCnt,ChargerCnt,CableCnt,TonerCnt,Case_PRO_Black,Case_PRO_Beige,Case_PRO_Red,Case_PRO_Pink,Case_MAX_Black,Case_MAX_Apr,Case_MAX_Mint,Case_MAX_Beige,SoothingGelCnt,Carton0_Cnt,Carton1_Cnt,Carton2_Cnt,Carton3_Cnt,Carton4_Cnt,Carton5_Cnt,Carton6_Cnt,Shopbag_Cnt,CosShopbag_Cnt,DustBagCnt,Case_MAX_Purple,Case_PRO_SnakeBlakc,KollagenCnt,KollagenSetCnt,Kollagen_PCnt,KollagenSet_PCnt,CleansingWaterCnt,TonerPadCnt,Case_MAX_SafBK_Cnt,Hologram_1Cnt,Hologram_3Cnt,Hologram_5Cnt,Case_MAX_SafPp_Cnt,Case_MAX_Yellow,Kollagen_Pe1Cnt,Kollagen_Pe3Cnt,Kollagen_Pe5Cnt,ATCircleCaseCnt,APSquareCaseCnt,Case_MAX_Peach,MasSoothingCnt,Case_MAX_SMintCnt,MeshPouchCnt,FirmingAmpCnt,HyaluronicAmpCnt,nightshotcnt,morningshotcnt,casemaxwoodicnt,Elicolltonercnt,Elicollampcnt,Elicollcreamcnt,Elihyaltonercnt,Elihyalampcnt,Elihyalcreamcnt,Dayshotcnt,Beautyshopbagcnt,Gummycnt,Stickjellycnt,Newyearbagcnt,Emsbeltcnt,Beltbagcnt,Dayshot2cnt,Elixircnt,Elixirpremiumcnt FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'" If DBQueryReader(DBCmd) Then - If sqlDataQuery.Length - 1 = comDB.Emsbeltcontrollset Then - For i = 0 To comDB.Emsbeltcontrollset + If sqlDataQuery.Length - 1 = comDB.Elixirpremium Then + For i = 0 To comDB.Elixirpremium If sqlDataQuery(i) <> 0 Then tgtFullCount += sqlDataQuery(i) For arr = 0 To prodArray.GetLength(1) - 1 @@ -2653,7 +2653,7 @@ Public Class mainForm End Function Private Function packingDBSaveOld(packingCode As String) As Boolean - DBCmd = "UPDATE " & applySalesDB & " SET Set_Cnt = '" & prodInCount(prodDB.proset) + prodInCount(prodDB.luxset) & "',Mask5Cnt = '" & comInCount(comDB.mask5) & "',Mask10Cnt = '" & comInCount(comDB.mask10) & "',HairBandCnt = '" & comInCount(comDB.hairband) & "',GelCnt = '" & comInCount(comDB.gel) & "',MiniGelCnt = '" & comInCount(comDB.minigel) & "',AmpleCnt = '" & comInCount(comDB.ample) & "',CreamCnt = '" & comInCount(comDB.cream) & "',UmbrellaCnt = '" & comInCount(comDB.umb) & "',FenCnt = '" & comInCount(comDB.fen) & "',ChargerCnt = '" & comInCount(comDB.charger) & "',CableCnt = '" & comInCount(comDB.cable) & "',TonerCnt = '" & comInCount(comDB.toner) & "',Case_PRO_Black = '" & comInCount(comDB.problack) & "',Case_PRO_Beige = '" & comInCount(comDB.probeige) & "',Case_PRO_Red = '" & comInCount(comDB.prored) & "',Case_PRO_Pink = '" & comInCount(comDB.propink) & "',Case_MAX_Black = '" & comInCount(comDB.maxblack) & "',Case_MAX_Apr = '" & comInCount(comDB.maxapr) & "',Case_MAX_Mint = '" & comInCount(comDB.maxmint) & "',Case_MAX_Beige = '" & comInCount(comDB.maxbeige) & "',Case_MAX_Purple = '" & comInCount(comDB.maxPurple) & "',Case_PRO_SnakeBlakc = '" & comInCount(comDB.proSnakeBlack) & "',DustBagCnt = '" & comInCount(comDB.dustbag) & "',SoothingGelCnt = '" & comInCount(comDB.soothing) & "',Carton0_Cnt = '" & comInCount(comDB.car0) & "',Carton1_Cnt = '" & comInCount(comDB.car1) & "',Carton2_Cnt = '" & comInCount(comDB.car2) & "',Carton3_Cnt = '" & comInCount(comDB.car3) & "',Carton4_Cnt = '" & comInCount(comDB.car4) & "',Carton5_Cnt = '" & comInCount(comDB.car5) & "',Carton6_Cnt = '" & comInCount(comDB.car6) & "',Shopbag_Cnt = '" & comInCount(comDB.bag) & "',CosShopbag_Cnt = '" & comInCount(comDB.cosbag) & "',KollagenCnt = '" & comInCount(comDB.kollagen) & "',KollagenSetCnt = '" & comInCount(comDB.kollagenset) & "',Kollagen_PCnt = '" & comInCount(comDB.kollagen_P) & "',KollagenSet_PCnt = '" & comInCount(comDB.kollagenset_P) & "',CleansingWaterCnt = '" & comInCount(comDB.cleansingWater) & "',TonerPadCnt = '" & comInCount(comDB.tonerPad) & "',Case_MAX_SafBK_Cnt = '" & comInCount(comDB.maxSaffianoBK) & "',Hologram_1Cnt = '" & comInCount(comDB.hologram1) & "',Hologram_3Cnt = '" & comInCount(comDB.hologram3) & "',Hologram_5Cnt = '" & comInCount(comDB.hologram5) & "',Case_MAX_SafPp_Cnt = '" & comInCount(comDB.caseSaffianoPp) & "',Case_MAX_Yellow = '" & comInCount(comDB.maxYellow) & "',Kollagen_Pe1Cnt = '" & comInCount(comDB.Kollagen_Pe1) & "',Kollagen_Pe3Cnt = '" & comInCount(comDB.Kollagen_Pe3) & "',Kollagen_Pe5Cnt = '" & comInCount(comDB.Kollagen_Pe5) & "',ATCircleCaseCnt = '" & comInCount(comDB.ATCircleCase) & "',APSquareCaseCnt = '" & comInCount(comDB.APSquareCase) & "',Case_MAX_Peach = '" & comInCount(comDB.maxPeach) & "',MasSoothingCnt = '" & comInCount(comDB.massageSoothing) & "',Case_MAX_SMintCnt = '" & comInCount(comDB.maxSMint) & "',MeshPouchCnt = '" & comInCount(comDB.meshpouch) & "',FirmingAmpCnt = '" & comInCount(comDB.firmingAmp) & "',HyaluronicAmpCnt = '" & comInCount(comDB.hyaluronicAmp) & "',nightshotcnt = '" & comInCount(comDB.nightshot) & "',morningshotcnt = '" & comInCount(comDB.morningshot) & "',casemaxwoodicnt = '" & comInCount(comDB.casemaxwoodi) & "',Elicolltonercnt = '" & comInCount(comDB.Elicolltoner) & "',Elicollampcnt = '" & comInCount(comDB.Elicollamp) & "',Elicollcreamcnt = '" & comInCount(comDB.Elicollcream) & "',Elihyaltonercnt = '" & comInCount(comDB.Elihyaltoner) & "',Elihyalampcnt = '" & comInCount(comDB.Elihyalamp) & "',Elihyalcreamcnt = '" & comInCount(comDB.Elihyalcream) & "',Dayshotcnt = '" & comInCount(comDB.Dayshot) & "',Beautyshopbagcnt = '" & comInCount(comDB.Beautyshopbag) & "',Gummycnt = '" & comInCount(comDB.Gummy) & "',stickjellycnt = '" & comInCount(comDB.Stickjelly) & "',Newyearbagcnt = '" & comInCount(comDB.Newyearbag) & "',Emsbeltcnt = '" & comInCount(comDB.Emsbelt) & "',Beltbagcnt = '" & comInCount(comDB.Beltbag) & "',Dayshot2cnt = '" & comInCount(comDB.Dayshot2) & "',Elixircnt = '" & comInCount(comDB.Elixir) & "',Elixirpremiumcnt = '" & comInCount(comDB.Elixirpremium) & "',Emsbeltcontrollsetcnt = '" & comInCount(comDB.Emsbeltcontrollset) & "',Pro_CT_FaceCnt = '" & prodInCount(prodDB.proface) & "',Pro_CT_EYE_Cnt = '" & prodInCount(prodDB.proeye) & "',Pro_CT_BodyCnt = '" & prodInCount(prodDB.probody) & "',Lux_CT_FaceCnt = '" & prodInCount(prodDB.luxface) & "',Lux_CT_EYE_Cnt = '" & prodInCount(prodDB.luxeye) & "',Lux_CT_BodyCnt = '" & prodInCount(prodDB.luxbody) & "',MAXIMUM_Cnt = '" & prodInCount(prodDB.maximum) & "',Alpha_Set_Cnt = '" & prodInCount(prodDB.alphaSet) & "',Alpha_Face_Cnt = '" & prodInCount(prodDB.alphaFace) & "',Alpha_Eye_Cnt = '" & prodInCount(prodDB.alphaEye) & "',Alpha_Body_Cnt = '" & prodInCount(prodDB.alphaBody) & "',Alto_Cnt = '" & prodInCount(prodDB.alto) & "',Effect_Cnt = '" & prodInCount(prodDB.effect) & "' WHERE PackingCode = '" & packingCode & "'" + DBCmd = "UPDATE " & applySalesDB & " SET Set_Cnt = '" & prodInCount(prodDB.proset) + prodInCount(prodDB.luxset) & "',Mask5Cnt = '" & comInCount(comDB.mask5) & "',Mask10Cnt = '" & comInCount(comDB.mask10) & "',HairBandCnt = '" & comInCount(comDB.hairband) & "',GelCnt = '" & comInCount(comDB.gel) & "',MiniGelCnt = '" & comInCount(comDB.minigel) & "',AmpleCnt = '" & comInCount(comDB.ample) & "',CreamCnt = '" & comInCount(comDB.cream) & "',UmbrellaCnt = '" & comInCount(comDB.umb) & "',FenCnt = '" & comInCount(comDB.fen) & "',ChargerCnt = '" & comInCount(comDB.charger) & "',CableCnt = '" & comInCount(comDB.cable) & "',TonerCnt = '" & comInCount(comDB.toner) & "',Case_PRO_Black = '" & comInCount(comDB.problack) & "',Case_PRO_Beige = '" & comInCount(comDB.probeige) & "',Case_PRO_Red = '" & comInCount(comDB.prored) & "',Case_PRO_Pink = '" & comInCount(comDB.propink) & "',Case_MAX_Black = '" & comInCount(comDB.maxblack) & "',Case_MAX_Apr = '" & comInCount(comDB.maxapr) & "',Case_MAX_Mint = '" & comInCount(comDB.maxmint) & "',Case_MAX_Beige = '" & comInCount(comDB.maxbeige) & "',Case_MAX_Purple = '" & comInCount(comDB.maxPurple) & "',Case_PRO_SnakeBlakc = '" & comInCount(comDB.proSnakeBlack) & "',DustBagCnt = '" & comInCount(comDB.dustbag) & "',SoothingGelCnt = '" & comInCount(comDB.soothing) & "',Carton0_Cnt = '" & comInCount(comDB.car0) & "',Carton1_Cnt = '" & comInCount(comDB.car1) & "',Carton2_Cnt = '" & comInCount(comDB.car2) & "',Carton3_Cnt = '" & comInCount(comDB.car3) & "',Carton4_Cnt = '" & comInCount(comDB.car4) & "',Carton5_Cnt = '" & comInCount(comDB.car5) & "',Carton6_Cnt = '" & comInCount(comDB.car6) & "',Shopbag_Cnt = '" & comInCount(comDB.bag) & "',CosShopbag_Cnt = '" & comInCount(comDB.cosbag) & "',KollagenCnt = '" & comInCount(comDB.kollagen) & "',KollagenSetCnt = '" & comInCount(comDB.kollagenset) & "',Kollagen_PCnt = '" & comInCount(comDB.kollagen_P) & "',KollagenSet_PCnt = '" & comInCount(comDB.kollagenset_P) & "',CleansingWaterCnt = '" & comInCount(comDB.cleansingWater) & "',TonerPadCnt = '" & comInCount(comDB.tonerPad) & "',Case_MAX_SafBK_Cnt = '" & comInCount(comDB.maxSaffianoBK) & "',Hologram_1Cnt = '" & comInCount(comDB.hologram1) & "',Hologram_3Cnt = '" & comInCount(comDB.hologram3) & "',Hologram_5Cnt = '" & comInCount(comDB.hologram5) & "',Case_MAX_SafPp_Cnt = '" & comInCount(comDB.caseSaffianoPp) & "',Case_MAX_Yellow = '" & comInCount(comDB.maxYellow) & "',Kollagen_Pe1Cnt = '" & comInCount(comDB.Kollagen_Pe1) & "',Kollagen_Pe3Cnt = '" & comInCount(comDB.Kollagen_Pe3) & "',Kollagen_Pe5Cnt = '" & comInCount(comDB.Kollagen_Pe5) & "',ATCircleCaseCnt = '" & comInCount(comDB.ATCircleCase) & "',APSquareCaseCnt = '" & comInCount(comDB.APSquareCase) & "',Case_MAX_Peach = '" & comInCount(comDB.maxPeach) & "',MasSoothingCnt = '" & comInCount(comDB.massageSoothing) & "',Case_MAX_SMintCnt = '" & comInCount(comDB.maxSMint) & "',MeshPouchCnt = '" & comInCount(comDB.meshpouch) & "',FirmingAmpCnt = '" & comInCount(comDB.firmingAmp) & "',HyaluronicAmpCnt = '" & comInCount(comDB.hyaluronicAmp) & "',nightshotcnt = '" & comInCount(comDB.nightshot) & "',morningshotcnt = '" & comInCount(comDB.morningshot) & "',casemaxwoodicnt = '" & comInCount(comDB.casemaxwoodi) & "',Elicolltonercnt = '" & comInCount(comDB.Elicolltoner) & "',Elicollampcnt = '" & comInCount(comDB.Elicollamp) & "',Elicollcreamcnt = '" & comInCount(comDB.Elicollcream) & "',Elihyaltonercnt = '" & comInCount(comDB.Elihyaltoner) & "',Elihyalampcnt = '" & comInCount(comDB.Elihyalamp) & "',Elihyalcreamcnt = '" & comInCount(comDB.Elihyalcream) & "',Dayshotcnt = '" & comInCount(comDB.Dayshot) & "',Beautyshopbagcnt = '" & comInCount(comDB.Beautyshopbag) & "',Gummycnt = '" & comInCount(comDB.Gummy) & "',stickjellycnt = '" & comInCount(comDB.Stickjelly) & "',Newyearbagcnt = '" & comInCount(comDB.Newyearbag) & "',Emsbeltcnt = '" & comInCount(comDB.Emsbelt) & "',Beltbagcnt = '" & comInCount(comDB.Beltbag) & "',Dayshot2cnt = '" & comInCount(comDB.Dayshot2) & "',Elixircnt = '" & comInCount(comDB.Elixir) & "',Elixirpremiumcnt = '" & comInCount(comDB.Elixirpremium) & "',Pro_CT_FaceCnt = '" & prodInCount(prodDB.proface) & "',Pro_CT_EYE_Cnt = '" & prodInCount(prodDB.proeye) & "',Pro_CT_BodyCnt = '" & prodInCount(prodDB.probody) & "',Lux_CT_FaceCnt = '" & prodInCount(prodDB.luxface) & "',Lux_CT_EYE_Cnt = '" & prodInCount(prodDB.luxeye) & "',Lux_CT_BodyCnt = '" & prodInCount(prodDB.luxbody) & "',MAXIMUM_Cnt = '" & prodInCount(prodDB.maximum) & "',Alpha_Set_Cnt = '" & prodInCount(prodDB.alphaSet) & "',Alpha_Face_Cnt = '" & prodInCount(prodDB.alphaFace) & "',Alpha_Eye_Cnt = '" & prodInCount(prodDB.alphaEye) & "',Alpha_Body_Cnt = '" & prodInCount(prodDB.alphaBody) & "',Alto_Cnt = '" & prodInCount(prodDB.alto) & "',Effect_Cnt = '" & prodInCount(prodDB.effect) & "' WHERE PackingCode = '" & packingCode & "'" If DBCommand(DBCmd) = False Then errorOut("등록오류") @@ -2938,7 +2938,7 @@ Public Class mainForm prodDBCount(i) += prodInCount(i) Next - For i = 0 To comDB.Emsbeltcontrollset + For i = 0 To comDB.Elixirpremium comDBCount(i) += comInCount(i) Next End Sub @@ -2967,14 +2967,14 @@ Public Class mainForm End If If rdbMode1.Checked = True Then - DBCmd = "SELECT PackingCount,ProSetCnt,LuxSetCnt,ProFaceCnt,LuxFaceCnt,ProEyeCnt,LuxEyeCnt,ProBodyCnt,LuxBodyCnt,MAXIMUMCnt,AlphaSetCnt,AlphaFaceCnt,AlphaEyeCnt,AlphaBodyCnt,AltoCnt,EffectCnt,Mask5Cnt,Mask10Cnt,HairBandCnt,GelCnt,MiniGel,AmpleCnt,CreamCnt,UmbrellaCnt,FenCnt,ChargerCnt,CableCnt,TonerCnt,CasePROBlack,CasePROBeige,CasePRORed,CasePROPink,CaseMAXBlack,CaseMAXApr,CaseMAXMint,CaseMAXBeige,SoothingGelCnt,Carton0Cnt,Carton1Cnt,Carton2Cnt,Carton3Cnt,Carton4Cnt,Carton5Cnt,Carton6Cnt,BagCnt,CosBagCnt,DustBagCnt,CaseMAXPurple,CasePROSnakeBlack,KollagenCnt,KollagenSetCnt,Kollagen_PCnt,KollagenSet_PCnt,CleansingWaterCnt,TonerPadCnt,CaseMaxSafBK,Hologram_1Cnt,Hologram_3Cnt,Hologram_5Cnt,CaseMaxSafPp,CaseMaxYellow,Kollagen_Pe1Cnt,Kollagen_Pe3Cnt,Kollagen_Pe5Cnt,ATCircleCaseCnt,APSquareCaseCnt,CaseMAXPeach,MasSoothingCnt,CaseMAXSMint,MeshPouchCnt,FirmingAmpCnt,HyaluronicAmpCnt,nightshotcnt,morningshotcnt,casemaxwoodicnt,Elicolltonercnt,Elicollampcnt,Elicollcreamcnt,Elihyaltonercnt,Elihyalampcnt,Elihyalcreamcnt,Dayshotcnt,Beautyshopbagcnt,Gummycnt,Stickjellycnt,Newyearbagcnt,Emsbeltcnt,Beltbagcnt,Dayshot2cnt,Elixircnt,Elixirpremiumcnt,Emsbeltcontrollsetcnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" + DBCmd = "SELECT PackingCount,ProSetCnt,LuxSetCnt,ProFaceCnt,LuxFaceCnt,ProEyeCnt,LuxEyeCnt,ProBodyCnt,LuxBodyCnt,MAXIMUMCnt,AlphaSetCnt,AlphaFaceCnt,AlphaEyeCnt,AlphaBodyCnt,AltoCnt,EffectCnt,Mask5Cnt,Mask10Cnt,HairBandCnt,GelCnt,MiniGel,AmpleCnt,CreamCnt,UmbrellaCnt,FenCnt,ChargerCnt,CableCnt,TonerCnt,CasePROBlack,CasePROBeige,CasePRORed,CasePROPink,CaseMAXBlack,CaseMAXApr,CaseMAXMint,CaseMAXBeige,SoothingGelCnt,Carton0Cnt,Carton1Cnt,Carton2Cnt,Carton3Cnt,Carton4Cnt,Carton5Cnt,Carton6Cnt,BagCnt,CosBagCnt,DustBagCnt,CaseMAXPurple,CasePROSnakeBlack,KollagenCnt,KollagenSetCnt,Kollagen_PCnt,KollagenSet_PCnt,CleansingWaterCnt,TonerPadCnt,CaseMaxSafBK,Hologram_1Cnt,Hologram_3Cnt,Hologram_5Cnt,CaseMaxSafPp,CaseMaxYellow,Kollagen_Pe1Cnt,Kollagen_Pe3Cnt,Kollagen_Pe5Cnt,ATCircleCaseCnt,APSquareCaseCnt,CaseMAXPeach,MasSoothingCnt,CaseMAXSMint,MeshPouchCnt,FirmingAmpCnt,HyaluronicAmpCnt,nightshotcnt,morningshotcnt,casemaxwoodicnt,Elicolltonercnt,Elicollampcnt,Elicollcreamcnt,Elihyaltonercnt,Elihyalampcnt,Elihyalcreamcnt,Dayshotcnt,Beautyshopbagcnt,Gummycnt,Stickjellycnt,Newyearbagcnt,Emsbeltcnt,Beltbagcnt,Dayshot2cnt,Elixircnt,Elixirpremiumcnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" countCommandFunc(countSaveList.normal) Else If rdbAuto1.Checked = True Then - DBCmd = "SELECT AutoPackCnt,APProSetCnt,APLuxSetCnt,APProFaceCnt,APLuxFaceCnt,APProEyeCnt,APLuxEyeCnt,APProBodyCnt,APLuxBodyCnt,APMAXIMUMCnt,APAlphaSetCnt,APAlphaFaceCnt,APAlphaEyeCnt,APAlphaBodyCnt,APAltoCnt,APEffectcnt,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 FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" + DBCmd = "SELECT AutoPackCnt,APProSetCnt,APLuxSetCnt,APProFaceCnt,APLuxFaceCnt,APProEyeCnt,APLuxEyeCnt,APProBodyCnt,APLuxBodyCnt,APMAXIMUMCnt,APAlphaSetCnt,APAlphaFaceCnt,APAlphaEyeCnt,APAlphaBodyCnt,APAltoCnt,APEffectcnt,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 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,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 FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" + DBCmd = "SELECT AutoWeightCnt,AWProSetCnt,AWLuxSetCnt,AWProFaceCnt,AWLuxFaceCnt,AWProEyeCnt,AWLuxEyeCnt,AWProBodyCnt,AWLuxBodyCnt,AWMAXIMUMCnt,AWAlphaSetCnt,AWAlphaFaceCnt,AWAlphaEyeCnt,AWAlphaBodyCnt,AWAltoCnt,AWEffectcnt,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 FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" countCommandFunc(countSaveList.autoWeight) End If End If @@ -3055,7 +3055,7 @@ Public Class mainForm Dim filePath, fileName, strData As String Dim saveDate As String = DateAndTime.Year(Now) & "-" & DateAndTime.Month(Now) & "-" & DateAndTime.Day(Now) Dim saveTime As String = DateAndTime.Hour(Now) & ":" & DateAndTime.Minute(Now) & ":" & DateAndTime.Second(Now) - Dim startForm As String = "PackingTime,PackingCode,Packing_Count,PRO_SET,PRO_SET_Serial,LUX_SET,LUX_SET_Serial,PRO_FACE,PRO_FACE_Serial,LUX_FACE,LUX_FACE_Serial,PRO_EYE,PRO_EYE_Serial,LUX_EYE,LUX_EYE_Serial,PRO_BODY,PRO_BODY_Serial,LUX_BODY,LUX_BODY_Serial,MAXIMUM,MAXIMUM_Serial,ALPHA_SET_Cnt,ALPHA_SET_Serial,ALPHA_FACE_Cnt,ALPHA_FACE_Serial,ALPHA_EYE_Cnt,ALPHA_EYE_Serial,ALPHA_Body_Cnt,ALPHA_Body_Serial,ALTO_Cnt,ALTO_Serial,Effect_Cnt,Effect_Serial,아쿠아 마스크,리프팅 마스크,헤어밴드,블루밍_젤,미니젤,앰플,크림,우산,손풍기,충전기,충전_케이블,토너,가죽케이스(P_Black),가죽케이스(P_Beige),가죽케이스(P_Red),가죽케이스(P_Pink),가죽케이스(M_Black),가죽케이스(M_Apr),가죽케이스(M_Mint),가죽케이스(M_Beige),수딩젤,카톤박스_0호,카톤박스_1호,카톤박스_2호,카톤박스_3호,카톤박스_4호,카톤박스_5호,카톤박스_6호,쇼핑백,코스메틱_쇼핑백,더스트백,가죽케이스(M_Purple),가죽케이스(P_SnakeBlack),콜라겐단품,콜라겐세트,콜라겐_퍼플_단품,콜라겐_퍼플_세트,클렌징워터,토너패드,MAX_사피아노블랙,홀로그램_1매,홀로그램_3매,홀로그램_5매,MAX_사피아노퍼플,가죽케이스(M_Yellow),콜라겐_젤(Pe_1),콜라겐_젤(Pe_3),콜라겐_젤(Pe_5),AT_Circle_Case,AP_Square_Case,가죽케이스(M_Peach),마사지수딩젤,MAX_샤인민트,MeshPouch,Firming_Ampoule,Hyaluronic_Ampoule,모닝샷,나이트샷,우디,신년쇼핑백,데이샷14키트,신년쇼핑백,EMS벨트,핏업벨트 쇼핑백,데이샷(14개입) 6, 엘릭시르 마스크 10, 엘릭시르 프리미엄 1세트, EMS벨트 controllerset" + Dim startForm As String = "PackingTime,PackingCode,Packing_Count,PRO_SET,PRO_SET_Serial,LUX_SET,LUX_SET_Serial,PRO_FACE,PRO_FACE_Serial,LUX_FACE,LUX_FACE_Serial,PRO_EYE,PRO_EYE_Serial,LUX_EYE,LUX_EYE_Serial,PRO_BODY,PRO_BODY_Serial,LUX_BODY,LUX_BODY_Serial,MAXIMUM,MAXIMUM_Serial,ALPHA_SET_Cnt,ALPHA_SET_Serial,ALPHA_FACE_Cnt,ALPHA_FACE_Serial,ALPHA_EYE_Cnt,ALPHA_EYE_Serial,ALPHA_Body_Cnt,ALPHA_Body_Serial,ALTO_Cnt,ALTO_Serial,Effect_Cnt,Effect_Serial,아쿠아 마스크,리프팅 마스크,헤어밴드,블루밍_젤,미니젤,앰플,크림,우산,손풍기,충전기,충전_케이블,토너,가죽케이스(P_Black),가죽케이스(P_Beige),가죽케이스(P_Red),가죽케이스(P_Pink),가죽케이스(M_Black),가죽케이스(M_Apr),가죽케이스(M_Mint),가죽케이스(M_Beige),수딩젤,카톤박스_0호,카톤박스_1호,카톤박스_2호,카톤박스_3호,카톤박스_4호,카톤박스_5호,카톤박스_6호,쇼핑백,코스메틱_쇼핑백,더스트백,가죽케이스(M_Purple),가죽케이스(P_SnakeBlack),콜라겐단품,콜라겐세트,콜라겐_퍼플_단품,콜라겐_퍼플_세트,클렌징워터,토너패드,MAX_사피아노블랙,홀로그램_1매,홀로그램_3매,홀로그램_5매,MAX_사피아노퍼플,가죽케이스(M_Yellow),콜라겐_젤(Pe_1),콜라겐_젤(Pe_3),콜라겐_젤(Pe_5),AT_Circle_Case,AP_Square_Case,가죽케이스(M_Peach),마사지수딩젤,MAX_샤인민트,MeshPouch,Firming_Ampoule,Hyaluronic_Ampoule,모닝샷,나이트샷,우디,신년쇼핑백,데이샷14키트,신년쇼핑백,EMS벨트,핏업벨트 쇼핑백,데이샷(14개입) 6, 엘릭시르 마스크 10, 엘릭시르 프리미엄 1세트" filePath = System.AppDomain.CurrentDomain.BaseDirectory & "\" & saveLogNamePack dirUse(filePath) @@ -3106,7 +3106,7 @@ Public Class mainForm Next - For i = 0 To comDB.Emsbeltcontrollset + For i = 0 To comDB.Elixirpremium saveData = saveLocalData(saveData, comInCount(i)) Next @@ -3128,7 +3128,7 @@ Public Class mainForm Dim saveMonth As String = Format(Now, "MM") Dim saveDay As String = Format(Now, "dd") Dim saveDate As String = saveYear & "-" & saveMonth & "-" & saveDay - Dim startForm As String = "TestDate,Packing_Count,PRO_SET,LUX_SET,PRO_FACE,LUX_FACE,PRO_EYE,LUX_EYE,PRO_BODY,LUX_BODY,MAXIMUM,ALPHA_SET,ALPHA_FACE,ALPHA_EYE,ALPHA_BODY,ALTO,Effect,아쿠아 마스크,리프팅 마스크,헤어밴드,블루밍_젤,미니젤,앰플,크림,우산,손풍기,충전기,케이블,토너,가죽케이스(PRO_Black),가죽케이스(PRO_Beige),가죽케이스(PRO_Red),가죽케이스(PRO_Pink),가죽케이스(MAX_Black),가죽케이스(MAX_Apr),가죽케이스(MAX_Mint),가죽케이스(MAX_Beige),수딩젤,카톤박스_0호,카톤박스_1호,카톤박스_2호,카톤박스_3호,카톤박스_4호,카톤박스_5호,카톤박스_6호,쇼핑백,코스메틱_쇼핑백,더스트백,가죽케이스(MAX_Purple),가죽케이스(PRO_SnakeBlack),콜라겐단품,콜라겐세트,콜라겐_퍼플_단품,콜라겐_퍼플_세트,클렌징워터,토너패드,MAX_사피아노블랙,홀로그램_1매,홀로그램_3매,홀로그램_5매,MAX_사피아노퍼플,가죽케이스(M_Yellow),콜라겐_젤(Pe_1),콜라겐_젤(Pe_3),콜라겐_젤(Pe_5),AT_Circle_Case,AP_Square_Case,가죽케이스(M_Peach),마사지수딩젤,MAX_샤인민트,MeshPouch,Firming_Ampoule,Hyaluronic_Ampoule,나이트샷,모닝샷,우디,데이샷14키트,신년쇼핑백,EMS벨트,핏업벨트 쇼핑백,데이샷(14개입) 6, 엘릭시르 마스크 10, 엘릭시르 프리미엄 1세트,EMS벨트 controllerset " + Dim startForm As String = "TestDate,Packing_Count,PRO_SET,LUX_SET,PRO_FACE,LUX_FACE,PRO_EYE,LUX_EYE,PRO_BODY,LUX_BODY,MAXIMUM,ALPHA_SET,ALPHA_FACE,ALPHA_EYE,ALPHA_BODY,ALTO,Effect,아쿠아 마스크,리프팅 마스크,헤어밴드,블루밍_젤,미니젤,앰플,크림,우산,손풍기,충전기,케이블,토너,가죽케이스(PRO_Black),가죽케이스(PRO_Beige),가죽케이스(PRO_Red),가죽케이스(PRO_Pink),가죽케이스(MAX_Black),가죽케이스(MAX_Apr),가죽케이스(MAX_Mint),가죽케이스(MAX_Beige),수딩젤,카톤박스_0호,카톤박스_1호,카톤박스_2호,카톤박스_3호,카톤박스_4호,카톤박스_5호,카톤박스_6호,쇼핑백,코스메틱_쇼핑백,더스트백,가죽케이스(MAX_Purple),가죽케이스(PRO_SnakeBlack),콜라겐단품,콜라겐세트,콜라겐_퍼플_단품,콜라겐_퍼플_세트,클렌징워터,토너패드,MAX_사피아노블랙,홀로그램_1매,홀로그램_3매,홀로그램_5매,MAX_사피아노퍼플,가죽케이스(M_Yellow),콜라겐_젤(Pe_1),콜라겐_젤(Pe_3),콜라겐_젤(Pe_5),AT_Circle_Case,AP_Square_Case,가죽케이스(M_Peach),마사지수딩젤,MAX_샤인민트,MeshPouch,Firming_Ampoule,Hyaluronic_Ampoule,나이트샷,모닝샷,우디,데이샷14키트,신년쇼핑백,EMS벨트,핏업벨트 쇼핑백,데이샷(14개입) 6, 엘릭시르 마스크 10, 엘릭시르 프리미엄 1세트" filePath = System.AppDomain.CurrentDomain.BaseDirectory & "\" & saveCountName dirUse(filePath) @@ -3182,7 +3182,7 @@ Public Class mainForm strData = saveLocalData(strData, prodComCount(i)) Next - For i = 0 To comDB.Emsbeltcontrollset + For i = 0 To comDB.Elixirpremium comComCount(i) += comInCount(i) strData = saveLocalData(strData, comComCount(i)) Next @@ -3223,7 +3223,7 @@ Public Class mainForm prodInSerial(i) = Nothing Next - For i = 0 To comDB.Emsbeltcontrollset + For i = 0 To comDB.Elixirpremium comInCount(i) = "0" Next End Sub diff --git a/SalesPacking_MES_API_Project/mySQLAddress.vb b/SalesPacking_MES_API_Project/mySQLAddress.vb index b2d153a..38acc90 100644 --- a/SalesPacking_MES_API_Project/mySQLAddress.vb +++ b/SalesPacking_MES_API_Project/mySQLAddress.vb @@ -161,11 +161,10 @@ Dayshot2 Elixir Elixirpremium - Emsbeltcontrollset End Enum - Public comDBCount(comDB.Emsbeltcontrollset) As Integer ''DB 저장 - Public comInCount(comDB.Emsbeltcontrollset) As Integer '' 패킹 저장 32 + 10 = 42 - 1 = 41 - Public comComCount(comDB.Emsbeltcontrollset) As Integer '' 로컬 저장 + Public comDBCount(comDB.Elixirpremium) As Integer ''DB 저장 + Public comInCount(comDB.Elixirpremium) As Integer '' 패킹 저장 32 + 10 = 42 - 1 = 41 + Public comComCount(comDB.Elixirpremium) As Integer '' 로컬 저장 Public countCommand(prodInCount.Length + comInCount.Length - 1) As String @@ -401,8 +400,6 @@ comInCount(comDB.Elixir) = ckCount Case comDB.Elixirpremium comInCount(comDB.Elixirpremium) = ckCount - Case comDB.Emsbeltcontrollset - comInCount(comDB.Emsbeltcontrollset) = ckCount Case Else MsgBox("잘못된 데이터가 개입되었습니다", vbCritical) @@ -517,7 +514,6 @@ countCommand(prodInCount.Length + comDB.Dayshot2) = "Dayshot2cnt" countCommand(prodInCount.Length + comDB.Elixir) = "Elixircnt" countCommand(prodInCount.Length + comDB.Elixirpremium) = "Elixirpremiumcnt" - countCommand(prodInCount.Length + comDB.Emsbeltcontrollset) = "Emsbeltcontrollsetcnt" Case countSaveList.autopack @@ -619,7 +615,6 @@ countCommand(prodInCount.Length + comDB.Dayshot2) = "APDayshot2cnt" countCommand(prodInCount.Length + comDB.Elixir) = "APElixircnt" countCommand(prodInCount.Length + comDB.Elixirpremium) = "APElixirpremiumcnt" - countCommand(prodInCount.Length + comDB.Emsbeltcontrollset) = "APEmsbeltcontrollsetcnt" Case countSaveList.autoWeight @@ -723,8 +718,6 @@ countCommand(prodInCount.Length + comDB.Dayshot2) = "AWDayshot2cnt" countCommand(prodInCount.Length + comDB.Elixir) = "AWElixircnt" countCommand(prodInCount.Length + comDB.Elixirpremium) = "AWElixirpremiumcnt" - countCommand(prodInCount.Length + comDB.Emsbeltcontrollset) = "AWEmsbeltcontrollsetcnt" - End Select End Sub