From fdd57976055346b9f5e581fe268c14715408e9a1 Mon Sep 17 00:00:00 2001 From: KwakJooYoung Date: Thu, 25 Sep 2025 17:08:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B7=9C=20=EA=B5=AC=EC=84=B1?= =?UTF-8?q?=ED=92=88=20=EC=B6=94=EA=B0=80=20:=20L004-0089,=20L004-0090,=20?= =?UTF-8?q?P001-0171,=20L004-0091?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SalesPacking_MES_API_Project/mainForm.vb | 221 ++++++++++--------- SalesPacking_MES_API_Project/mySQLAddress.vb | 16 ++ 2 files changed, 137 insertions(+), 100 deletions(-) diff --git a/SalesPacking_MES_API_Project/mainForm.vb b/SalesPacking_MES_API_Project/mainForm.vb index 25d3c07..9330ba4 100644 --- a/SalesPacking_MES_API_Project/mainForm.vb +++ b/SalesPacking_MES_API_Project/mainForm.vb @@ -1603,103 +1603,107 @@ 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 - ,FabricBagcnt - ,Goldshopbagcnt - ,MorNigshotsetcnt - ,CTBoxcnt - ,ElesqLiftingTonercnt - ,ElesqLiftingCeamcnt - ,ElesqLiftingECreamcnt - ,ElesqLiftingAmpcnt - ,ElesqAquaTonercnt - ,ElesqAquaCeamcnt - ,ElesqAquaECreamcnt - ,ElesqAquaAmpcnt - ,Carton8_Cnt - ,KeyringCnt - ,DoenaLiftingTonercnt - ,DoenaLiftingAmpcnt - ,DoenaLiftingCreamcnt - ,FirmingCollagenGelcnt - ,KeyringSallyCnt - ,BeautykitHairbandCnt - ,BeautykitMirrorSCnt - ,BeautykitMirrorLCnt + , 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 + , FabricBagcnt + , Goldshopbagcnt + , MorNigshotsetcnt + , CTBoxcnt + , ElesqLiftingTonercnt + , ElesqLiftingCeamcnt + , ElesqLiftingECreamcnt + , ElesqLiftingAmpcnt + , ElesqAquaTonercnt + , ElesqAquaCeamcnt + , ElesqAquaECreamcnt + , ElesqAquaAmpcnt + , Carton8_Cnt + , KeyringCnt + , DoenaLiftingTonercnt + , DoenaLiftingAmpcnt + , DoenaLiftingCreamcnt + , FirmingCollagenGelcnt + , KeyringSallyCnt + , BeautykitHairbandCnt + , BeautykitMirrorSCnt + , BeautykitMirrorLCnt + , BloomingMoistureGel150Cnt + , FirmingCollagenGel150Cnt + , TweedCaseCnt + , BloomingMoistureGel250Cnt FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'" '신규구성품추가 : 자동화동작(무게측정)에서 포장 구성품 수량 조회 추가 If DBQueryReader(DBCmd) Then @@ -2701,6 +2705,7 @@ Public Class mainForm txbPacking.Text = packingCode + ' 무게측정 If weightRun() = False Then Return False End If @@ -2925,8 +2930,12 @@ Public Class mainForm ", KeyringSallyCnt = '" & comInCount(comDB.keyringSally) & "'" & ", BeautykitHairbandCnt = '" & comInCount(comDB.beautykitHairband) & "'" & ", BeautykitMirrorSCnt = '" & comInCount(comDB.beautykitMirrorS) & "'" & - ", BeautykitMirrorLCnt = '" & comInCount(comDB.beautykitMirrorL) & "'" & '신규구성품추가/신규제품추가 : 추가한 품목 수량 업데이트 추가 - " WHERE PackingCode = '" & packingCode & "'" + ", BeautykitMirrorLCnt = '" & comInCount(comDB.beautykitMirrorL) & "'" & + ", BloomingMoistureGel150Cnt = '" & comInCount(comDB.bloomingMoistureGel150) & "'" & + ", FirmingCollagenGel150Cnt = '" & comInCount(comDB.firmingCollagenGel150) & "'" & + ", TweedCaseCnt = '" & comInCount(comDB.tweedCase) & "'" & + ", BloomingMoistureGel250Cnt = '" & comInCount(comDB.bloomingMoistureGel250) & "'" & + " WHERE PackingCode = '" & packingCode & "'" '신규구성품추가/신규제품추가 : 추가한 품목 수량 업데이트 추가 If DBCommand(DBCmd) = False Then errorOut("등록오류") @@ -3379,7 +3388,11 @@ Public Class mainForm , KeyringSallyCnt , BeautykitHairbandCnt , BeautykitMirrorSCnt - , BeautykitMirrorLCnt + , BeautykitMirrorLCnt + , BloomingMoistureGel150Cnt + , FirmingCollagenGel150Cnt + , TweedCaseCnt + , BloomingMoistureGel250Cnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가/신규제품추가 : 추가한 품목 일반동작 수량 조회 추가 countCommandFunc(countSaveList.normal) Else @@ -3504,6 +3517,10 @@ Public Class mainForm , APBeautykitHairbandCnt , APBeautykitMirrorSCnt , APBeautykitMirrorLCnt + , APBloomingMoistureGel150Cnt + , APFirmingCollagenGel150Cnt + , APTweedCaseCnt + , APBloomingMoistureGel250Cnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가/신규제품추가 : 추가한 품목 자동화동작(포장) 수량 조회 추가 countCommandFunc(countSaveList.autopack) Else @@ -3627,6 +3644,10 @@ Public Class mainForm , AWBeautykitHairbandCnt , AWBeautykitMirrorSCnt , AWBeautykitMirrorLCnt + , AWBloomingMoistureGel150Cnt + , AWFirmingCollagenGel150Cnt + , AWTweedCaseCnt + , AWBloomingMoistureGel250Cnt FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가/신규제품추가 : 추가한 품목 자동화동작(무게측정) 수량 조회 추가 countCommandFunc(countSaveList.autoWeight) End If diff --git a/SalesPacking_MES_API_Project/mySQLAddress.vb b/SalesPacking_MES_API_Project/mySQLAddress.vb index 21ded80..90873e2 100644 --- a/SalesPacking_MES_API_Project/mySQLAddress.vb +++ b/SalesPacking_MES_API_Project/mySQLAddress.vb @@ -187,6 +187,10 @@ beautykitHairband beautykitMirrorS beautykitMirrorL + bloomingMoistureGel150 + firmingCollagenGel150 + tweedCase + bloomingMoistureGel250 '신규구성품추가 : 추가하는 품목의 변수 추가 End Enum Public comDB_max_index As Integer = [Enum].GetNames(GetType(comDB)).Length - 1 @@ -344,6 +348,10 @@ countCommand(prodInCount.Length + comDB.beautykitHairband) = "BeautykitHairbandCnt" countCommand(prodInCount.Length + comDB.beautykitMirrorS) = "BeautykitMirrorSCnt" countCommand(prodInCount.Length + comDB.beautykitMirrorL) = "BeautykitMirrorLCnt" + countCommand(prodInCount.Length + comDB.bloomingMoistureGel150) = "BloomingMoistureGel150Cnt" + countCommand(prodInCount.Length + comDB.firmingCollagenGel150) = "FirmingCollagenGel150Cnt" + countCommand(prodInCount.Length + comDB.tweedCase) = "TweedCaseCnt" + countCommand(prodInCount.Length + comDB.bloomingMoistureGel250) = "BloomingMoistureGel250Cnt" '신규구성품추가 : 추가한 comDB 수량을 DB에 저장하기 위해 jomtPackingCount 에 생성한 일반동작 컬럼명 추가 Case countSaveList.autopack @@ -466,6 +474,10 @@ countCommand(prodInCount.Length + comDB.beautykitHairband) = "APBeautykitHairbandCnt" countCommand(prodInCount.Length + comDB.beautykitMirrorS) = "APBeautykitMirrorSCnt" countCommand(prodInCount.Length + comDB.beautykitMirrorL) = "APBeautykitMirrorLCnt" + countCommand(prodInCount.Length + comDB.bloomingMoistureGel150) = "APBloomingMoistureGel150Cnt" + countCommand(prodInCount.Length + comDB.firmingCollagenGel150) = "APFirmingCollagenGel150Cnt" + countCommand(prodInCount.Length + comDB.tweedCase) = "APTweedCaseCnt" + countCommand(prodInCount.Length + comDB.bloomingMoistureGel250) = "APBloomingMoistureGel250Cnt" '신규구성품추가 : 추가한 comDB 수량을 DB에 저장하기 위해 jomtPackingCount 에 생성한 자동화동작(포장) 컬럼명 추가 Case countSaveList.autoWeight @@ -588,6 +600,10 @@ countCommand(prodInCount.Length + comDB.beautykitHairband) = "AWBeautykitHairbandCnt" countCommand(prodInCount.Length + comDB.beautykitMirrorS) = "AWBeautykitMirrorSCnt" countCommand(prodInCount.Length + comDB.beautykitMirrorL) = "AWBeautykitMirrorLCnt" + countCommand(prodInCount.Length + comDB.bloomingMoistureGel150) = "AWBloomingMoistureGel150Cnt" + countCommand(prodInCount.Length + comDB.firmingCollagenGel150) = "AWFirmingCollagenGel150Cnt" + countCommand(prodInCount.Length + comDB.tweedCase) = "AWTweedCaseCnt" + countCommand(prodInCount.Length + comDB.bloomingMoistureGel250) = "AWBloomingMoistureGel250Cnt" '신규구성품추가 : 추가한 comDB 수량을 DB에 저장하기 위해 jomtPackingCount 에 생성한 자동화동작(무게측정) 컬럼명 추가 End Select