1. packing count 오류 수정 : count 초기화 코드 누락으로 인해 발생한 문제로 초기화 코드 추가

2. 주문정보-주소에 ' 특수문자가 포함되어 주문테이블에 추가 중 DB 오류 발생 : ' 문자에 \를 추가하여 ('\) 수정
3. 사용하지 않는 제품 (PRO_S)의 prodCode 삭제
4. 구성품, 제품의 prodCode 처리 로직 정리
This commit is contained in:
KwakJooYoung 2025-09-19 14:46:33 +09:00
parent cc87d3f17c
commit a41f9f56b1
4 changed files with 623 additions and 1226 deletions

View File

@ -145,19 +145,6 @@ Partial Class countForm
Me.txbProFace = New System.Windows.Forms.TextBox() Me.txbProFace = New System.Windows.Forms.TextBox()
Me.lbProFace = New System.Windows.Forms.Label() Me.lbProFace = New System.Windows.Forms.Label()
Me.gbCDual = New System.Windows.Forms.GroupBox() Me.gbCDual = New System.Windows.Forms.GroupBox()
Me.gbDualProS = New System.Windows.Forms.GroupBox()
Me.pnProSBody = New System.Windows.Forms.Panel()
Me.txbProSBody = New System.Windows.Forms.TextBox()
Me.lbProSBody = New System.Windows.Forms.Label()
Me.pnProSEye = New System.Windows.Forms.Panel()
Me.txbProSEye = New System.Windows.Forms.TextBox()
Me.lbProSEye = New System.Windows.Forms.Label()
Me.pnProSSet = New System.Windows.Forms.Panel()
Me.txbProSSet = New System.Windows.Forms.TextBox()
Me.lbProSSet = New System.Windows.Forms.Label()
Me.pnProSFace = New System.Windows.Forms.Panel()
Me.txbProSFace = New System.Windows.Forms.TextBox()
Me.lbProSFace = New System.Windows.Forms.Label()
Me.pnMaximumAlpha = New System.Windows.Forms.Panel() Me.pnMaximumAlpha = New System.Windows.Forms.Panel()
Me.txbMaximumAlpha = New System.Windows.Forms.TextBox() Me.txbMaximumAlpha = New System.Windows.Forms.TextBox()
Me.lbMaximumAlpha = New System.Windows.Forms.Label() Me.lbMaximumAlpha = New System.Windows.Forms.Label()
@ -201,6 +188,9 @@ Partial Class countForm
Me.lbLuxFace = New System.Windows.Forms.Label() Me.lbLuxFace = New System.Windows.Forms.Label()
Me.gbEtc = New System.Windows.Forms.GroupBox() Me.gbEtc = New System.Windows.Forms.GroupBox()
Me.gbProd = New System.Windows.Forms.GroupBox() Me.gbProd = New System.Windows.Forms.GroupBox()
Me.pnkeyringSally = New System.Windows.Forms.Panel()
Me.txbkeyringSally = New System.Windows.Forms.TextBox()
Me.lbkeyringSally = New System.Windows.Forms.Label()
Me.pnfirmingcollagengel = New System.Windows.Forms.Panel() Me.pnfirmingcollagengel = New System.Windows.Forms.Panel()
Me.txbfirmingcollagengel = New System.Windows.Forms.TextBox() Me.txbfirmingcollagengel = New System.Windows.Forms.TextBox()
Me.lbfirmingcollagengel = New System.Windows.Forms.Label() Me.lbfirmingcollagengel = New System.Windows.Forms.Label()
@ -363,9 +353,6 @@ Partial Class countForm
Me.pnMask5 = New System.Windows.Forms.Panel() Me.pnMask5 = New System.Windows.Forms.Panel()
Me.txbMask5 = New System.Windows.Forms.TextBox() Me.txbMask5 = New System.Windows.Forms.TextBox()
Me.lbMask5 = New System.Windows.Forms.Label() Me.lbMask5 = New System.Windows.Forms.Label()
Me.pnkeyringSally = New System.Windows.Forms.Panel()
Me.txbkeyringSally = New System.Windows.Forms.TextBox()
Me.lbkeyringSally = New System.Windows.Forms.Label()
Me.gbCount.SuspendLayout() Me.gbCount.SuspendLayout()
Me.gbCase.SuspendLayout() Me.gbCase.SuspendLayout()
Me.gbAlto.SuspendLayout() Me.gbAlto.SuspendLayout()
@ -413,11 +400,6 @@ Partial Class countForm
Me.pnProSet.SuspendLayout() Me.pnProSet.SuspendLayout()
Me.pnProFace.SuspendLayout() Me.pnProFace.SuspendLayout()
Me.gbCDual.SuspendLayout() Me.gbCDual.SuspendLayout()
Me.gbDualProS.SuspendLayout()
Me.pnProSBody.SuspendLayout()
Me.pnProSEye.SuspendLayout()
Me.pnProSSet.SuspendLayout()
Me.pnProSFace.SuspendLayout()
Me.pnMaximumAlpha.SuspendLayout() Me.pnMaximumAlpha.SuspendLayout()
Me.pneffectV3.SuspendLayout() Me.pneffectV3.SuspendLayout()
Me.pneffect.SuspendLayout() Me.pneffect.SuspendLayout()
@ -435,6 +417,7 @@ Partial Class countForm
Me.pnLuxFace.SuspendLayout() Me.pnLuxFace.SuspendLayout()
Me.gbEtc.SuspendLayout() Me.gbEtc.SuspendLayout()
Me.gbProd.SuspendLayout() Me.gbProd.SuspendLayout()
Me.pnkeyringSally.SuspendLayout()
Me.pnfirmingcollagengel.SuspendLayout() Me.pnfirmingcollagengel.SuspendLayout()
Me.pndoenaliftingcream.SuspendLayout() Me.pndoenaliftingcream.SuspendLayout()
Me.pndoenaliftingamp.SuspendLayout() Me.pndoenaliftingamp.SuspendLayout()
@ -489,7 +472,6 @@ Partial Class countForm
Me.pnHair.SuspendLayout() Me.pnHair.SuspendLayout()
Me.pnMask10.SuspendLayout() Me.pnMask10.SuspendLayout()
Me.pnMask5.SuspendLayout() Me.pnMask5.SuspendLayout()
Me.pnkeyringSally.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'Label1 'Label1
@ -1722,7 +1704,6 @@ Partial Class countForm
' '
'gbCDual 'gbCDual
' '
Me.gbCDual.Controls.Add(Me.gbDualProS)
Me.gbCDual.Controls.Add(Me.pnMaximumAlpha) Me.gbCDual.Controls.Add(Me.pnMaximumAlpha)
Me.gbCDual.Controls.Add(Me.pneffectV3) Me.gbCDual.Controls.Add(Me.pneffectV3)
Me.gbCDual.Controls.Add(Me.pneffect) Me.gbCDual.Controls.Add(Me.pneffect)
@ -1739,136 +1720,6 @@ Partial Class countForm
Me.gbCDual.TabStop = False Me.gbCDual.TabStop = False
Me.gbCDual.Text = "DUALSONIC" Me.gbCDual.Text = "DUALSONIC"
' '
'gbDualProS
'
Me.gbDualProS.Controls.Add(Me.pnProSBody)
Me.gbDualProS.Controls.Add(Me.pnProSEye)
Me.gbDualProS.Controls.Add(Me.pnProSSet)
Me.gbDualProS.Controls.Add(Me.pnProSFace)
Me.gbDualProS.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
Me.gbDualProS.Location = New System.Drawing.Point(3, 418)
Me.gbDualProS.Name = "gbDualProS"
Me.gbDualProS.Size = New System.Drawing.Size(165, 188)
Me.gbDualProS.TabIndex = 4
Me.gbDualProS.TabStop = False
Me.gbDualProS.Text = "PROS"
'
'pnProSBody
'
Me.pnProSBody.Controls.Add(Me.txbProSBody)
Me.pnProSBody.Controls.Add(Me.lbProSBody)
Me.pnProSBody.Location = New System.Drawing.Point(6, 145)
Me.pnProSBody.Name = "pnProSBody"
Me.pnProSBody.Size = New System.Drawing.Size(149, 34)
Me.pnProSBody.TabIndex = 3
'
'txbProSBody
'
Me.txbProSBody.BackColor = System.Drawing.SystemColors.Window
Me.txbProSBody.Location = New System.Drawing.Point(68, 0)
Me.txbProSBody.MaxLength = 10
Me.txbProSBody.Name = "txbProSBody"
Me.txbProSBody.ReadOnly = True
Me.txbProSBody.Size = New System.Drawing.Size(77, 32)
Me.txbProSBody.TabIndex = 1
Me.txbProSBody.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'lbProSBody
'
Me.lbProSBody.AutoSize = True
Me.lbProSBody.Location = New System.Drawing.Point(3, 3)
Me.lbProSBody.Name = "lbProSBody"
Me.lbProSBody.Size = New System.Drawing.Size(63, 24)
Me.lbProSBody.TabIndex = 0
Me.lbProSBody.Text = "BODY"
'
'pnProSEye
'
Me.pnProSEye.Controls.Add(Me.txbProSEye)
Me.pnProSEye.Controls.Add(Me.lbProSEye)
Me.pnProSEye.Location = New System.Drawing.Point(6, 107)
Me.pnProSEye.Name = "pnProSEye"
Me.pnProSEye.Size = New System.Drawing.Size(149, 34)
Me.pnProSEye.TabIndex = 2
'
'txbProSEye
'
Me.txbProSEye.BackColor = System.Drawing.SystemColors.Window
Me.txbProSEye.Location = New System.Drawing.Point(68, 0)
Me.txbProSEye.MaxLength = 10
Me.txbProSEye.Name = "txbProSEye"
Me.txbProSEye.ReadOnly = True
Me.txbProSEye.Size = New System.Drawing.Size(77, 32)
Me.txbProSEye.TabIndex = 1
Me.txbProSEye.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'lbProSEye
'
Me.lbProSEye.AutoSize = True
Me.lbProSEye.Location = New System.Drawing.Point(15, 3)
Me.lbProSEye.Name = "lbProSEye"
Me.lbProSEye.Size = New System.Drawing.Size(47, 24)
Me.lbProSEye.TabIndex = 0
Me.lbProSEye.Text = "EYE"
'
'pnProSSet
'
Me.pnProSSet.Controls.Add(Me.txbProSSet)
Me.pnProSSet.Controls.Add(Me.lbProSSet)
Me.pnProSSet.Location = New System.Drawing.Point(6, 31)
Me.pnProSSet.Name = "pnProSSet"
Me.pnProSSet.Size = New System.Drawing.Size(149, 34)
Me.pnProSSet.TabIndex = 1
'
'txbProSSet
'
Me.txbProSSet.BackColor = System.Drawing.SystemColors.Window
Me.txbProSSet.Location = New System.Drawing.Point(68, 0)
Me.txbProSSet.MaxLength = 10
Me.txbProSSet.Name = "txbProSSet"
Me.txbProSSet.ReadOnly = True
Me.txbProSSet.Size = New System.Drawing.Size(77, 32)
Me.txbProSSet.TabIndex = 1
Me.txbProSSet.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'lbProSSet
'
Me.lbProSSet.AutoSize = True
Me.lbProSSet.Location = New System.Drawing.Point(15, 3)
Me.lbProSSet.Name = "lbProSSet"
Me.lbProSSet.Size = New System.Drawing.Size(47, 24)
Me.lbProSSet.TabIndex = 0
Me.lbProSSet.Text = "SET"
'
'pnProSFace
'
Me.pnProSFace.Controls.Add(Me.txbProSFace)
Me.pnProSFace.Controls.Add(Me.lbProSFace)
Me.pnProSFace.Location = New System.Drawing.Point(6, 69)
Me.pnProSFace.Name = "pnProSFace"
Me.pnProSFace.Size = New System.Drawing.Size(149, 34)
Me.pnProSFace.TabIndex = 0
'
'txbProSFace
'
Me.txbProSFace.BackColor = System.Drawing.SystemColors.Window
Me.txbProSFace.Location = New System.Drawing.Point(68, 0)
Me.txbProSFace.MaxLength = 10
Me.txbProSFace.Name = "txbProSFace"
Me.txbProSFace.ReadOnly = True
Me.txbProSFace.Size = New System.Drawing.Size(77, 32)
Me.txbProSFace.TabIndex = 1
Me.txbProSFace.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'lbProSFace
'
Me.lbProSFace.AutoSize = True
Me.lbProSFace.Location = New System.Drawing.Point(3, 3)
Me.lbProSFace.Name = "lbProSFace"
Me.lbProSFace.Size = New System.Drawing.Size(59, 24)
Me.lbProSFace.TabIndex = 0
Me.lbProSFace.Text = "FACE"
'
'pnMaximumAlpha 'pnMaximumAlpha
' '
Me.pnMaximumAlpha.Controls.Add(Me.txbMaximumAlpha) Me.pnMaximumAlpha.Controls.Add(Me.txbMaximumAlpha)
@ -2360,6 +2211,36 @@ Partial Class countForm
Me.gbProd.TabStop = False Me.gbProd.TabStop = False
Me.gbProd.Text = "구성품" Me.gbProd.Text = "구성품"
' '
'pnkeyringSally
'
Me.pnkeyringSally.Controls.Add(Me.txbkeyringSally)
Me.pnkeyringSally.Controls.Add(Me.lbkeyringSally)
Me.pnkeyringSally.Location = New System.Drawing.Point(418, 538)
Me.pnkeyringSally.Name = "pnkeyringSally"
Me.pnkeyringSally.Size = New System.Drawing.Size(204, 34)
Me.pnkeyringSally.TabIndex = 37
'
'txbkeyringSally
'
Me.txbkeyringSally.BackColor = System.Drawing.SystemColors.Window
Me.txbkeyringSally.Location = New System.Drawing.Point(121, 0)
Me.txbkeyringSally.MaxLength = 10
Me.txbkeyringSally.Name = "txbkeyringSally"
Me.txbkeyringSally.ReadOnly = True
Me.txbkeyringSally.Size = New System.Drawing.Size(77, 32)
Me.txbkeyringSally.TabIndex = 1
Me.txbkeyringSally.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'lbkeyringSally
'
Me.lbkeyringSally.AutoSize = True
Me.lbkeyringSally.Location = New System.Drawing.Point(3, 2)
Me.lbkeyringSally.Name = "lbkeyringSally"
Me.lbkeyringSally.Size = New System.Drawing.Size(95, 31)
Me.lbkeyringSally.TabIndex = 0
Me.lbkeyringSally.Text = "키링(샐리)"
Me.lbkeyringSally.UseCompatibleTextRendering = True
'
'pnfirmingcollagengel 'pnfirmingcollagengel
' '
Me.pnfirmingcollagengel.Controls.Add(Me.txbfirmingcollagengel) Me.pnfirmingcollagengel.Controls.Add(Me.txbfirmingcollagengel)
@ -3938,36 +3819,6 @@ Partial Class countForm
Me.lbMask5.TabIndex = 0 Me.lbMask5.TabIndex = 0
Me.lbMask5.Text = "아쿠아 마스크" Me.lbMask5.Text = "아쿠아 마스크"
' '
'pnkeyringSally
'
Me.pnkeyringSally.Controls.Add(Me.txbkeyringSally)
Me.pnkeyringSally.Controls.Add(Me.lbkeyringSally)
Me.pnkeyringSally.Location = New System.Drawing.Point(418, 538)
Me.pnkeyringSally.Name = "pnkeyringSally"
Me.pnkeyringSally.Size = New System.Drawing.Size(204, 34)
Me.pnkeyringSally.TabIndex = 37
'
'txbkeyringSally
'
Me.txbkeyringSally.BackColor = System.Drawing.SystemColors.Window
Me.txbkeyringSally.Location = New System.Drawing.Point(121, 0)
Me.txbkeyringSally.MaxLength = 10
Me.txbkeyringSally.Name = "txbkeyringSally"
Me.txbkeyringSally.ReadOnly = True
Me.txbkeyringSally.Size = New System.Drawing.Size(77, 32)
Me.txbkeyringSally.TabIndex = 1
Me.txbkeyringSally.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'lbkeyringSally
'
Me.lbkeyringSally.AutoSize = True
Me.lbkeyringSally.Location = New System.Drawing.Point(3, 2)
Me.lbkeyringSally.Name = "lbkeyringSally"
Me.lbkeyringSally.Size = New System.Drawing.Size(95, 31)
Me.lbkeyringSally.TabIndex = 0
Me.lbkeyringSally.Text = "키링(샐리)"
Me.lbkeyringSally.UseCompatibleTextRendering = True
'
'countForm 'countForm
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 12.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 12.0!)
@ -4071,15 +3922,6 @@ Partial Class countForm
Me.pnProFace.ResumeLayout(False) Me.pnProFace.ResumeLayout(False)
Me.pnProFace.PerformLayout() Me.pnProFace.PerformLayout()
Me.gbCDual.ResumeLayout(False) Me.gbCDual.ResumeLayout(False)
Me.gbDualProS.ResumeLayout(False)
Me.pnProSBody.ResumeLayout(False)
Me.pnProSBody.PerformLayout()
Me.pnProSEye.ResumeLayout(False)
Me.pnProSEye.PerformLayout()
Me.pnProSSet.ResumeLayout(False)
Me.pnProSSet.PerformLayout()
Me.pnProSFace.ResumeLayout(False)
Me.pnProSFace.PerformLayout()
Me.pnMaximumAlpha.ResumeLayout(False) Me.pnMaximumAlpha.ResumeLayout(False)
Me.pnMaximumAlpha.PerformLayout() Me.pnMaximumAlpha.PerformLayout()
Me.pneffectV3.ResumeLayout(False) Me.pneffectV3.ResumeLayout(False)
@ -4110,6 +3952,8 @@ Partial Class countForm
Me.pnLuxFace.PerformLayout() Me.pnLuxFace.PerformLayout()
Me.gbEtc.ResumeLayout(False) Me.gbEtc.ResumeLayout(False)
Me.gbProd.ResumeLayout(False) Me.gbProd.ResumeLayout(False)
Me.pnkeyringSally.ResumeLayout(False)
Me.pnkeyringSally.PerformLayout()
Me.pnfirmingcollagengel.ResumeLayout(False) Me.pnfirmingcollagengel.ResumeLayout(False)
Me.pnfirmingcollagengel.PerformLayout() Me.pnfirmingcollagengel.PerformLayout()
Me.pndoenaliftingcream.ResumeLayout(False) Me.pndoenaliftingcream.ResumeLayout(False)
@ -4218,8 +4062,6 @@ Partial Class countForm
Me.pnMask10.PerformLayout() Me.pnMask10.PerformLayout()
Me.pnMask5.ResumeLayout(False) Me.pnMask5.ResumeLayout(False)
Me.pnMask5.PerformLayout() Me.pnMask5.PerformLayout()
Me.pnkeyringSally.ResumeLayout(False)
Me.pnkeyringSally.PerformLayout()
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()
@ -4539,19 +4381,6 @@ Partial Class countForm
Friend WithEvents pnMaximumAlpha As Panel Friend WithEvents pnMaximumAlpha As Panel
Friend WithEvents txbMaximumAlpha As TextBox Friend WithEvents txbMaximumAlpha As TextBox
Friend WithEvents lbMaximumAlpha As Label Friend WithEvents lbMaximumAlpha As Label
Friend WithEvents gbDualProS As GroupBox
Friend WithEvents pnProSBody As Panel
Friend WithEvents txbProSBody As TextBox
Friend WithEvents lbProSBody As Label
Friend WithEvents pnProSEye As Panel
Friend WithEvents txbProSEye As TextBox
Friend WithEvents lbProSEye As Label
Friend WithEvents pnProSSet As Panel
Friend WithEvents txbProSSet As TextBox
Friend WithEvents lbProSSet As Label
Friend WithEvents pnProSFace As Panel
Friend WithEvents txbProSFace As TextBox
Friend WithEvents lbProSFace As Label
Friend WithEvents pndoenaliftingtoner As Panel Friend WithEvents pndoenaliftingtoner As Panel
Friend WithEvents txbdoenaliftingtoner As TextBox Friend WithEvents txbdoenaliftingtoner As TextBox
Friend WithEvents lbdoenaliftingtoner As Label Friend WithEvents lbdoenaliftingtoner As Label

View File

@ -26,10 +26,7 @@ Public Class countForm
txbeffect.Text = prodComCount(prodDB.effect) txbeffect.Text = prodComCount(prodDB.effect)
txbeffectV3.Text = prodComCount(prodDB.effectV3) txbeffectV3.Text = prodComCount(prodDB.effectV3)
txbMaximumAlpha.Text = prodComCount(prodDB.maximumAlpha) txbMaximumAlpha.Text = prodComCount(prodDB.maximumAlpha)
txbProSSet.Text = prodComCount(prodDB.proSset) '신규제품추가 : 추가한 품목 수량 출력하도록 추가
txbProSFace.Text = prodComCount(prodDB.proSface)
txbProSEye.Text = prodComCount(prodDB.proSeye)
txbProSBody.Text = prodComCount(prodDB.proSbody)
txbMask5.Text = comComCount(comDB.mask5) txbMask5.Text = comComCount(comDB.mask5)
txbMask10.Text = comComCount(comDB.mask10) txbMask10.Text = comComCount(comDB.mask10)

View File

@ -7,7 +7,7 @@ Imports Newtonsoft.Json.Linq
Public Class mainForm Public Class mainForm
Public projectName As String = "DUALSONIC SalesPacking MES Program Ver." Public projectName As String = "DUALSONIC SalesPacking MES Program Ver."
Public projectVer As String = "1.1.0" Public projectVer As String = "1.1.1"
Private apiItemOutURL As String = "item-outflows/page" Private apiItemOutURL As String = "item-outflows/page"
@ -81,6 +81,7 @@ Public Class mainForm
prodface_V2 prodface_V2
prodeye prodeye
prodbody prodbody
'신규제품추가 : 제품 시리얼 번호 두번째 자리와 동일하도록 업데이트
End Enum End Enum
Private Enum modelList Private Enum modelList
@ -91,7 +92,7 @@ Public Class mainForm
ALTO ALTO
EFFECT EFFECT
MAXIMUM_ALPHA MAXIMUM_ALPHA
PRO_S '신규제품추가 : 제품 시리얼 번호 첫번째 자리와 동일하도록 업데이트
End Enum End Enum
Private Enum setInfoList Private Enum setInfoList
@ -360,7 +361,7 @@ Public Class mainForm
textCount = Mid(textCount, InStr(textCount, ",") + 1, textCount.Length) textCount = Mid(textCount, InStr(textCount, ",") + 1, textCount.Length)
If UBound(Split(textCount, ",")) = countCommand.Length - 1 Then If UBound(Split(textCount, ",")) = countCommand.Length - 1 Then
For i = 0 To prodDB.proSbody For i = 0 To prodDB_max_index
If UBound(Split(textCount, ",")) > 0 Then If UBound(Split(textCount, ",")) > 0 Then
prodComCount(i) = Mid(textCount, 1, InStr(textCount, ",") - 1) prodComCount(i) = Mid(textCount, 1, InStr(textCount, ",") - 1)
textCount = Mid(textCount, InStr(textCount, ",") + 1, textCount.Length) textCount = Mid(textCount, InStr(textCount, ",") + 1, textCount.Length)
@ -369,8 +370,7 @@ Public Class mainForm
End If End If
Next Next
'신규구성품추가 : comDB에 변경된 마지막 품목 변수로 변경 For i = 0 To comDB_max_index
For i = 0 To comDB.beautykitMirrorL
If UBound(Split(textCount, ",")) > 0 Then If UBound(Split(textCount, ",")) > 0 Then
comComCount(i) = Mid(textCount, 1, InStr(textCount, ",") - 1) comComCount(i) = Mid(textCount, 1, InStr(textCount, ",") - 1)
textCount = Mid(textCount, InStr(textCount, ",") + 1, textCount.Length) textCount = Mid(textCount, InStr(textCount, ",") + 1, textCount.Length)
@ -1703,9 +1703,8 @@ Public Class mainForm
FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'" '신규구성품추가 : 자동화동작(무게측정)에서 포장 구성품 수량 조회 추가 FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'" '신규구성품추가 : 자동화동작(무게측정)에서 포장 구성품 수량 조회 추가
If DBQueryReader(DBCmd) Then If DBQueryReader(DBCmd) Then
'신규구성품추가 : comDB에 변경된 마지막 품목 변수로 변경 If sqlDataQuery.Length - 1 = comDB_max_index Then
If sqlDataQuery.Length - 1 = comDB.beautykitMirrorL Then For i = 0 To comDB_max_index
For i = 0 To comDB.beautykitMirrorL
If sqlDataQuery(i) <> 0 Then If sqlDataQuery(i) <> 0 Then
tgtFullCount += sqlDataQuery(i) tgtFullCount += sqlDataQuery(i)
For arr = 0 To prodArray.GetLength(1) - 1 For arr = 0 To prodArray.GetLength(1) - 1
@ -1735,16 +1734,32 @@ Public Class mainForm
End Function End Function
Private Function packingSerial() As Boolean Private Function packingSerial() As Boolean
Dim prodSerial(prodDB.proSbody - prodDB.luxset) As String Dim prodSerial(prodDB_max_index - prodDB.luxset) As String
Const modelNum As Int16 = 1 Const modelNum As Int16 = 1
Const typeNum As Int16 = 2 Const typeNum As Int16 = 2
Const colorNum As Int16 = 11 Const colorNum As Int16 = 11
Const countNum As Int16 = 1 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_Set_Serial,Pro_S_Face_Serial,Pro_S_Eye_Serial,Pro_S_Body_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
FROM " & applySalesDB & " WHERE PackingCode = '" & playCode & "'" '신규제품추가 : 추가하는 품목의 시리얼번호 조회 추가
If DBQueryReader(DBCmd) Then If DBQueryReader(DBCmd) Then
For i = prodDB.luxset To prodDB.proSbody For i = prodDB.luxset To prodDB_max_index
prodSerial(i - prodDB.luxset) = sqlDataQuery(i - prodDB.luxset) prodSerial(i - prodDB.luxset) = sqlDataQuery(i - prodDB.luxset)
Next Next
Else Else
@ -2046,24 +2061,7 @@ Public Class mainForm
errorGen("존재하지 않는 타입 번호입니다.") errorGen("존재하지 않는 타입 번호입니다.")
Return False Return False
End Select End Select
'신규제품추가 : 추가한 제품의 case 업데이트
Case modelList.PRO_S
TDUseCompare = True
Select Case typeNum
Case typeList.prodset_V1
commandStr = prodPackCommand(prodDB.proSset)
Case typeList.prodface_V2
commandStr = prodPackCommand(prodDB.proSface)
Case typeList.prodeye
commandStr = prodPackCommand(prodDB.proSeye)
Case typeList.prodbody
commandStr = prodPackCommand(prodDB.proSbody)
Case Else
errorOut("등록오류")
errorGen("존재하지 않는 타입 번호입니다.")
Return False
End Select
Case Else Case Else
@ -2181,24 +2179,7 @@ Public Class mainForm
errorGen("존재하지 않는 타입 번호입니다.") errorGen("존재하지 않는 타입 번호입니다.")
Return False Return False
End Select End Select
'신규제품추가 : 추가한 제품의 case 업데이트
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 Case Else
TDUseCompare = False TDUseCompare = False
@ -2670,24 +2651,6 @@ Public Class mainForm
Return -1 Return -1
End Select End Select
Case modelList.PRO_S
Select Case typeNum
Case typeList.prodset_V1
faceShot = 0
eyeShot = 0
Case typeList.prodface_V2
faceShot = 0
eyeShot = 0
Case typeList.prodeye
faceShot = 0
eyeShot = 0
Case typeList.prodbody
faceShot = 0
eyeShot = 0
Case Else
Return -1
End Select
Case Else Case Else
Return -1 Return -1
End Select End Select
@ -2962,7 +2925,7 @@ Public Class mainForm
", KeyringSallyCnt = '" & comInCount(comDB.keyringSally) & "'" & ", KeyringSallyCnt = '" & comInCount(comDB.keyringSally) & "'" &
", BeautykitHairbandCnt = '" & comInCount(comDB.beautykitHairband) & "'" & ", BeautykitHairbandCnt = '" & comInCount(comDB.beautykitHairband) & "'" &
", BeautykitMirrorSCnt = '" & comInCount(comDB.beautykitMirrorS) & "'" & ", BeautykitMirrorSCnt = '" & comInCount(comDB.beautykitMirrorS) & "'" &
",BeautykitMirrorLCnt = '" & comInCount(comDB.beautykitMirrorL) & "'" & '신규구성품추가 : 추가한 품목 수량 업데이트 추가 ", BeautykitMirrorLCnt = '" & comInCount(comDB.beautykitMirrorL) & "'" & '신규구성품추가/신규제품추가 : 추가한 품목 수량 업데이트 추가
" WHERE PackingCode = '" & packingCode & "'" " WHERE PackingCode = '" & packingCode & "'"
If DBCommand(DBCmd) = False Then If DBCommand(DBCmd) = False Then
@ -3023,7 +2986,27 @@ Public Class mainForm
Next Next
End If End If
DBCmd = "UPDATE " & applySalesDB & " SET `Data` = NOW(), Main_Product_SN = '" & setSerial & "',Main_FACE_SN = '" & faceSerial & "',Main_EYE_SN = '" & eyeSerial & "',Pro_Face_Serial = '" & prodInSerial(prodDB.proface) & "',Pro_Eye_Serial = '" & prodInSerial(prodDB.proeye) & "',Pro_Body_Serial = '" & prodInSerial(prodDB.probody) & "',Lux_Face_Serial = '" & prodInSerial(prodDB.luxface) & "',Lux_Eye_Serial = '" & prodInSerial(prodDB.luxeye) & "',Lux_Body_Serial = '" & prodInSerial(prodDB.luxbody) & "',MAXIMUM_SN = '" & prodInSerial(prodDB.maximum) & "',Alpha_Set_Serial = '" & prodInSerial(prodDB.alphaSet) & "',Alpha_Face_Serial = '" & prodInSerial(prodDB.alphaFace) & "',Alpha_Eye_Serial = '" & prodInSerial(prodDB.alphaEye) & "',Alpha_Body_Serial = '" & prodInSerial(prodDB.alphaBody) & "',Alto_Serial = '" & prodInSerial(prodDB.alto) & "',Effect_Serial = '" & prodInSerial(prodDB.effect) & "',EffectV3_Serial = '" & prodInSerial(prodDB.effectV3) & "',MAXIMUM_ALPHA_SN = '" & prodInSerial(prodDB.maximumAlpha) & "',Pro_S_Set_Serial = '" & prodInSerial(prodDB.proSset) & "',Pro_S_Face_Serial = '" & prodInSerial(prodDB.proSface) & "',Pro_S_Eye_Serial = '" & prodInSerial(prodDB.proSeye) & "',Pro_S_Body_Serial = '" & prodInSerial(prodDB.proSbody) & "' WHERE PackingCode = '" & packingCode & "'" DBCmd = "UPDATE " & applySalesDB &
" SET `Data` = NOW()" &
", Main_Product_SN = '" & setSerial & "'" &
", Main_FACE_SN = '" & faceSerial & "'" &
", Main_EYE_SN = '" & eyeSerial & "'" &
", Pro_Face_Serial = '" & prodInSerial(prodDB.proface) & "'" &
", Pro_Eye_Serial = '" & prodInSerial(prodDB.proeye) & "'" &
", Pro_Body_Serial = '" & prodInSerial(prodDB.probody) & "'" &
", Lux_Face_Serial = '" & prodInSerial(prodDB.luxface) & "'" &
", Lux_Eye_Serial = '" & prodInSerial(prodDB.luxeye) & "'" &
", Lux_Body_Serial = '" & prodInSerial(prodDB.luxbody) & "'" &
", MAXIMUM_SN = '" & prodInSerial(prodDB.maximum) & "'" &
", Alpha_Set_Serial = '" & prodInSerial(prodDB.alphaSet) & "'" &
", Alpha_Face_Serial = '" & prodInSerial(prodDB.alphaFace) & "'" &
", Alpha_Eye_Serial = '" & prodInSerial(prodDB.alphaEye) & "'" &
", Alpha_Body_Serial = '" & prodInSerial(prodDB.alphaBody) & "'" &
", Alto_Serial = '" & prodInSerial(prodDB.alto) & "'" &
", Effect_Serial = '" & prodInSerial(prodDB.effect) & "'" &
", EffectV3_Serial = '" & prodInSerial(prodDB.effectV3) & "'" &
", MAXIMUM_ALPHA_SN = '" & prodInSerial(prodDB.maximumAlpha) & "'" &
" WHERE PackingCode = '" & packingCode & "'" '신규제품추가 : 추가한 제품의 시리얼번호 업데이트 쿼리 추가
If DBCommand(DBCmd) Then If DBCommand(DBCmd) Then
Return False Return False
@ -3095,7 +3078,7 @@ Public Class mainForm
Try Try
Dim commandDB As String = "UPDATE " & applySalesDB & " SET " Dim commandDB As String = "UPDATE " & applySalesDB & " SET "
For i = prodDB.proset To prodDB.proSbody For i = prodDB.proset To prodDB_max_index
If prodInSerial(i) = "" Then If prodInSerial(i) = "" Then
prodInSerial(i) = "null" prodInSerial(i) = "null"
@ -3103,7 +3086,7 @@ Public Class mainForm
prodInSerial(i) = "'" & prodInSerial(i) & "'" prodInSerial(i) = "'" & prodInSerial(i) & "'"
End If End If
If i <> prodDB.proSbody Then If i <> prodDB_max_index Then
commandDB = commandDB & prodPackCommand(i) & "=" & prodInSerial(i) & ", " commandDB = commandDB & prodPackCommand(i) & "=" & prodInSerial(i) & ", "
Else Else
commandDB = commandDB & prodPackCommand(i) & "=" & prodInSerial(i) commandDB = commandDB & prodPackCommand(i) & "=" & prodInSerial(i)
@ -3158,7 +3141,7 @@ Public Class mainForm
Dim prodCount As Integer = 0 Dim prodCount As Integer = 0
For i = 1 To countCommand.Length - 1 For i = 1 To countCommand.Length - 1
If i <= prodDB.proSbody Then If i <= prodDB_max_index Then
prodCount = countSet(i, saveType, True) prodCount = countSet(i, saveType, True)
@ -3244,12 +3227,11 @@ Public Class mainForm
'End Function 'End Function
Private Sub saveDBCount() Private Sub saveDBCount()
For i = 0 To prodDB.proSbody For i = 0 To prodDB_max_index
prodDBCount(i) += prodInCount(i) prodDBCount(i) += prodInCount(i)
Next Next
'신규구성품추가 : comDB에 변경된 마지막 품목 변수로 변경 For i = 0 To comDB_max_index
For i = 0 To comDB.beautykitMirrorL
comDBCount(i) += comInCount(i) comDBCount(i) += comInCount(i)
Next Next
End Sub End Sub
@ -3398,7 +3380,7 @@ Public Class mainForm
, BeautykitHairbandCnt , BeautykitHairbandCnt
, BeautykitMirrorSCnt , BeautykitMirrorSCnt
, BeautykitMirrorLCnt , BeautykitMirrorLCnt
FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가 : 추가한 품목 일반동작 수량 조회 추가 FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가/신규제품추가 : 추가한 품목 일반동작 수량 조회 추가
countCommandFunc(countSaveList.normal) countCommandFunc(countSaveList.normal)
Else Else
If rdbAuto1.Checked = True Then If rdbAuto1.Checked = True Then
@ -3522,7 +3504,7 @@ Public Class mainForm
, APBeautykitHairbandCnt , APBeautykitHairbandCnt
, APBeautykitMirrorSCnt , APBeautykitMirrorSCnt
, APBeautykitMirrorLCnt , APBeautykitMirrorLCnt
FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가 : 추가한 품목 자동화동작(포장) 수량 조회 추가 FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가/신규제품추가 : 추가한 품목 자동화동작(포장) 수량 조회 추가
countCommandFunc(countSaveList.autopack) countCommandFunc(countSaveList.autopack)
Else Else
DBCmd = "SELECT AutoWeightCnt DBCmd = "SELECT AutoWeightCnt
@ -3645,7 +3627,7 @@ Public Class mainForm
, AWBeautykitHairbandCnt , AWBeautykitHairbandCnt
, AWBeautykitMirrorSCnt , AWBeautykitMirrorSCnt
, AWBeautykitMirrorLCnt , AWBeautykitMirrorLCnt
FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가 : 추가한 품목 자동화동작(무게측정) 수량 조회 추가 FROM " & applyCountDB & " WHERE DATETIME = '" & nowToday & "'" '신규구성품추가/신규제품추가 : 추가한 품목 자동화동작(무게측정) 수량 조회 추가
countCommandFunc(countSaveList.autoWeight) countCommandFunc(countSaveList.autoWeight)
End If End If
End If End If
@ -3653,7 +3635,7 @@ Public Class mainForm
If DBQueryReader(DBCmd) Then If DBQueryReader(DBCmd) Then
For i = 0 To countCommand.Length - 1 For i = 0 To countCommand.Length - 1
If i <= prodDB.proSbody Then If i <= prodDB_max_index Then
prodDBCount(i) = sqlDataQuery(i) prodDBCount(i) = sqlDataQuery(i)
Else Else
enumCount = i - prodDBCount.Length enumCount = i - prodDBCount.Length
@ -3761,14 +3743,6 @@ Public Class mainForm
sb.Append(",EffectV3_Serial") sb.Append(",EffectV3_Serial")
sb.Append(",MAXIMUM_ALPHA_Cnt") sb.Append(",MAXIMUM_ALPHA_Cnt")
sb.Append(",MAXIMUM_ALPHA_SN") sb.Append(",MAXIMUM_ALPHA_SN")
sb.Append(",Pro_S_Set_Cnt")
sb.Append(",Pro_S_Set_Serial")
sb.Append(",Pro_S_Face_Cnt")
sb.Append(",Pro_S_Face_Serial")
sb.Append(",Pro_S_Eye_Cnt")
sb.Append(",Pro_S_Eye_Serial")
sb.Append(",Pro_S_Body_Cnt")
sb.Append(",Pro_S_Body_Serial")
ElseIf target = saveCountName Then ElseIf target = saveCountName Then
sb.Append("TestDate") sb.Append("TestDate")
sb.Append(",Packing_Count") sb.Append(",Packing_Count")
@ -3789,111 +3763,20 @@ Public Class mainForm
sb.Append(",Effect_Cnt") sb.Append(",Effect_Cnt")
sb.Append(",EffectV3_Cnt") sb.Append(",EffectV3_Cnt")
sb.Append(",MAXIMUM_ALPHA_Cnt") sb.Append(",MAXIMUM_ALPHA_Cnt")
sb.Append(",Pro_S_Set_Cnt")
sb.Append(",Pro_S_Face_Cnt")
sb.Append(",Pro_S_Eye_Cnt")
sb.Append(",Pro_S_Body_Cnt")
End If End If
sb.Append(",아쿠아 마스크") For i = 0 To comDB_max_index
sb.Append(",리프팅 마스크") Dim item_name As String = "N/A"
sb.Append(",헤어밴드") DBCmd = "SELECT ItemName FROM " & applyClistDB & " WHERE ProdCode = '" & i & "' LIMIT 1"
sb.Append(",블루밍_젤")
sb.Append(",미니젤") If DBQueryReader(DBCmd) Then
sb.Append(",앰플") item_name = sqlDataQuery(0)
sb.Append(",크림") End If
sb.Append(",우산")
sb.Append(",손풍기") item_name = "," & Replace(item_name, ",", "_")
sb.Append(",충전기") sb.Append(item_name)
sb.Append(",충전_케이블") Next
sb.Append(",토너")
sb.Append(",가죽케이스(P_Black)")
sb.Append(",가죽케이스(P_Beige)")
sb.Append(",가죽케이스(P_Red)")
sb.Append(",가죽케이스(P_Pink)")
sb.Append(",가죽케이스(M_Black)")
sb.Append(",가죽케이스(M_Apr)")
sb.Append(",가죽케이스(M_Mint)")
sb.Append(",가죽케이스(M_Beige)")
sb.Append(",수딩젤")
sb.Append(",카톤박스_0호")
sb.Append(",카톤박스_1호")
sb.Append(",카톤박스_2호")
sb.Append(",카톤박스_3호")
sb.Append(",카톤박스_4호")
sb.Append(",카톤박스_5호")
sb.Append(",카톤박스_6호")
sb.Append(",쇼핑백")
sb.Append(",코스메틱_쇼핑백")
sb.Append(",더스트백")
sb.Append(",가죽케이스(M_Purple)")
sb.Append(",가죽케이스(P_SnakeBlack)")
sb.Append(",콜라겐단품")
sb.Append(",콜라겐세트")
sb.Append(",콜라겐_퍼플_단품")
sb.Append(",콜라겐_퍼플_세트")
sb.Append(",클렌징워터")
sb.Append(",토너패드")
sb.Append(",MAX_사피아노블랙")
sb.Append(",홀로그램_1매")
sb.Append(",홀로그램_3매")
sb.Append(",홀로그램_5매")
sb.Append(",MAX_사피아노퍼플")
sb.Append(",가죽케이스(M_Yellow)")
sb.Append(",콜라겐_젤(Pe_1)")
sb.Append(",콜라겐_젤(Pe_3)")
sb.Append(",콜라겐_젤(Pe_5)")
sb.Append(",AT_Circle_Case")
sb.Append(",AP_Square_Case")
sb.Append(",가죽케이스(M_Peach)")
sb.Append(",마사지수딩젤")
sb.Append(",MAX_샤인민트")
sb.Append(",MeshPouch")
sb.Append(",Firming_Ampoule")
sb.Append(",Hyaluronic_Ampoule")
sb.Append(",나이트샷")
sb.Append(",모닝샷")
sb.Append(",우디")
sb.Append(",엘릭시르_콜라겐_토너")
sb.Append(",엘릭시르_콜라겐_앰플")
sb.Append(",엘릭시르_콜라겐_크림")
sb.Append(",엘릭시르_하이알_토너")
sb.Append(",엘릭시르_하이알_앰플")
sb.Append(",엘릭시르_하이알_크림")
sb.Append(",데이샷14키트")
sb.Append(",뷰티루틴 쇼핑백")
sb.Append(",구미_젤리(10BAG)")
sb.Append(",스틱_젤리")
sb.Append(",신년_쇼핑백")
sb.Append(",EMS벨트")
sb.Append(",핏업벨트 쇼핑백")
sb.Append(",데이샷(14개입) 6")
sb.Append(",엘릭시르 마스크 10")
sb.Append(",엘릭시르 프리미엄 1세트")
sb.Append(",EMS벨트 controll 세트")
sb.Append(",듀얼소닉 쇼핑백(부직포) 대")
sb.Append(",골드 쇼퍼백 소")
sb.Append(",모닝샷_나이트샷")
sb.Append(",CT택배박스")
sb.Append(",Elesq_Lifting_Control_Toner")
sb.Append(",Elesq Lifting Control Ceam")
sb.Append(",Elesq Lifting Control Eye Cream")
sb.Append(",Elesq Lifting Control Capsule Ampoule")
sb.Append(",Elesq Aqua Balancing Toner")
sb.Append(",Elesq Aqua Balancing Ceam")
sb.Append(",Elesq Aqua Balancing Eye Serum")
sb.Append(",Elesq Aqua Balancing Capsule Ampoule")
sb.Append(",카톤박스_8호")
sb.Append(",가죽키링 (브라운)")
sb.Append(",Doena Lifting Collagen Toner")
sb.Append(",Doena Lifting Collagen Ampoule")
sb.Append(",Doena Lifting Collagen Cream")
sb.Append(",Firming Collagen Gel")
sb.Append(",가죽키링 (샐리)")
sb.Append(",뷰티3종키트 헤어밴드")
sb.Append(",뷰티3종키트 거울S")
sb.Append(",뷰티3종키트 거울L")
'신규구성품추가 : 추가한 품목 품목명 추가
Return sb.ToString() Return sb.ToString()
End Function End Function
@ -3943,7 +3826,7 @@ Public Class mainForm
Try Try
Dim saveData As String = Nothing Dim saveData As String = Nothing
For i = 0 To prodDB.proSbody For i = 0 To prodDB_max_index
saveData = saveLocalData(saveData, prodInCount(i)) saveData = saveLocalData(saveData, prodInCount(i))
@ -3953,8 +3836,7 @@ Public Class mainForm
Next Next
'신규구성품추가 : comDB에 변경된 마지막 품목 변수로 변경 For i = 0 To comDB_max_index
For i = 0 To comDB.beautykitMirrorL
saveData = saveLocalData(saveData, comInCount(i)) saveData = saveLocalData(saveData, comInCount(i))
Next Next
@ -4025,13 +3907,12 @@ Public Class mainForm
Private Function saveLocalCount() As String Private Function saveLocalCount() As String
Try Try
Dim strData As String = Nothing Dim strData As String = Nothing
For i = 0 To prodDB.proSbody For i = 0 To prodDB_max_index
prodComCount(i) += prodInCount(i) prodComCount(i) += prodInCount(i)
strData = saveLocalData(strData, prodComCount(i)) strData = saveLocalData(strData, prodComCount(i))
Next Next
'신규구성품추가 : comDB에 변경된 마지막 품목 변수로 변경 For i = 0 To comDB_max_index
For i = 0 To comDB.beautykitMirrorL
comComCount(i) += comInCount(i) comComCount(i) += comInCount(i)
strData = saveLocalData(strData, comComCount(i)) strData = saveLocalData(strData, comComCount(i))
Next Next
@ -4067,12 +3948,12 @@ Public Class mainForm
End Function End Function
Private Sub clearNowCount() Private Sub clearNowCount()
For i = 0 To prodDB.proSbody For i = 0 To prodDB_max_index
prodInCount(i) = "0"
prodInSerial(i) = Nothing prodInSerial(i) = Nothing
Next Next
'신규구성품추가 : comDB에 변경된 마지막 품목 변수로 변경 For i = 0 To comDB_max_index
For i = 0 To comDB.beautykitMirrorL
comInCount(i) = "0" comInCount(i) = "0"
Next Next
End Sub End Sub
@ -5209,7 +5090,7 @@ Public Class mainForm
apiData(apiDataList.ordererName) = jQuery.SelectToken(apiCommand(parsingCode.ordererName)).ToString apiData(apiDataList.ordererName) = jQuery.SelectToken(apiCommand(parsingCode.ordererName)).ToString
apiData(apiDataList.phone) = jQuery.SelectToken(apiCommand(parsingCode.phone)).ToString apiData(apiDataList.phone) = jQuery.SelectToken(apiCommand(parsingCode.phone)).ToString
apiData(apiDataList.zip) = jQuery.SelectToken(apiCommand(parsingCode.zip)).ToString apiData(apiDataList.zip) = jQuery.SelectToken(apiCommand(parsingCode.zip)).ToString
apiData(apiDataList.address) = jQuery.SelectToken(apiCommand(parsingCode.address)).ToString apiData(apiDataList.address) = Replace(jQuery.SelectToken(apiCommand(parsingCode.address)).ToString, "'", "\'")
prodArray(itemCode.count, dataCount) = jsArray(cnt)(apiCommand(parsingCode.itemcount)).ToString prodArray(itemCode.count, dataCount) = jsArray(cnt)(apiCommand(parsingCode.itemcount)).ToString
apiData(apiDataList.regData) = jsArray(cnt)(apiCommand(parsingCode.regDate)).ToString apiData(apiDataList.regData) = jsArray(cnt)(apiCommand(parsingCode.regDate)).ToString

View File

@ -79,16 +79,14 @@
effect effect
effectV3 effectV3
maximumAlpha maximumAlpha
proSset '신규제품추가 : 추가하는 품목의 변수 추가
proSface
proSeye
proSbody
End Enum End Enum
Public prodDBCount(prodDB.proSbody) As Integer '' DB 저장 Public prodDB_max_index As Integer = [Enum].GetNames(GetType(prodDB)).Length - 1
Public prodInCount(prodDB.proSbody) As Integer '' 패킹 저장 10 Public prodDBCount(prodDB_max_index) As Integer '' DB 저장
Public prodComCount(prodDB.proSbody) As Integer '' 로컬 저장 Public prodInCount(prodDB_max_index) As Integer '' 패킹 저장 10
Public prodInSerial(prodDB.proSbody) As String '' LogData 저장 Public prodComCount(prodDB_max_index) As Integer '' 로컬 저장
Public prodPackCommand(prodDB.proSbody) As String '' Public prodInSerial(prodDB_max_index) As String '' LogData 저장
Public prodPackCommand(prodDB_max_index) As String ''
Public Enum comDB Public Enum comDB
mask5 mask5
@ -191,323 +189,32 @@
beautykitMirrorL beautykitMirrorL
'신규구성품추가 : 추가하는 품목의 변수 추가 '신규구성품추가 : 추가하는 품목의 변수 추가
End Enum End Enum
'신규구성품추가 : comDBCount, comInCount, comComCount comDB 크기에 맞춰 배열 크기 조정 Public comDB_max_index As Integer = [Enum].GetNames(GetType(comDB)).Length - 1
Public comDBCount(comDB.beautykitMirrorL) As Integer ''DB 저장 Public comDBCount(comDB_max_index) As Integer ''DB 저장
Public comInCount(comDB.beautykitMirrorL) As Integer '' 패킹 저장 32 + 10 = 42 - 1 = 41 Public comInCount(comDB_max_index) As Integer '' 패킹 저장 32 + 10 = 42 - 1 = 41
Public comComCount(comDB.beautykitMirrorL) As Integer '' 로컬 저장 Public comComCount(comDB_max_index) As Integer '' 로컬 저장
Public countCommand(prodInCount.Length + comInCount.Length - 1) As String Public countCommand(prodInCount.Length + comInCount.Length - 1) As String
Public Function packingCountset(dbType As Int16, prodCode As Int16, ckCount As Int16, serial As String) Public Function packingCountset(dbType As Int16, prodCode As Int16, ckCount As Int16, serial As String)
If dbType = dbCode.prodDBcode Then If dbType = dbCode.prodDBcode Then
Select Case prodCode If prodCode >= prodDB.proset And prodCode <= prodDB_max_index Then
Case prodDB.proset prodInCount(prodCode) = ckCount
prodInCount(prodDB.proset) = ckCount prodInSerial(prodCode) = serial
prodInSerial(prodDB.proset) = serial
Case prodDB.luxset
prodInCount(prodDB.luxset) = ckCount
prodInSerial(prodDB.luxset) = serial
Case prodDB.proface
prodInCount(prodDB.proface) = ckCount
prodInSerial(prodDB.proface) = serial
Case prodDB.luxface
prodInCount(prodDB.luxface) = ckCount
prodInSerial(prodDB.luxface) = serial
Case prodDB.proeye
prodInCount(prodDB.proeye) = ckCount
prodInSerial(prodDB.proeye) = serial
Case prodDB.luxeye
prodInCount(prodDB.luxeye) = ckCount
prodInSerial(prodDB.luxeye) = serial
Case prodDB.probody
prodInCount(prodDB.probody) = ckCount
prodInSerial(prodDB.probody) = serial
Case prodDB.luxbody
prodInCount(prodDB.luxbody) = ckCount
prodInSerial(prodDB.luxbody) = serial
Case prodDB.maximum
prodInCount(prodDB.maximum) = ckCount
prodInSerial(prodDB.maximum) = serial
Case prodDB.alphaSet
prodInCount(prodDB.alphaSet) = ckCount
prodInSerial(prodDB.alphaSet) = serial
Case prodDB.alphaFace
prodInCount(prodDB.alphaFace) = ckCount
prodInSerial(prodDB.alphaFace) = serial
Case prodDB.alphaEye
prodInCount(prodDB.alphaEye) = ckCount
prodInSerial(prodDB.alphaEye) = serial
Case prodDB.alphaBody
prodInCount(prodDB.alphaBody) = ckCount
prodInSerial(prodDB.alphaBody) = serial
Case prodDB.alto
prodInCount(prodDB.alto) = ckCount
prodInSerial(prodDB.alto) = serial
Case prodDB.effect
prodInCount(prodDB.effect) = ckCount
prodInSerial(prodDB.effect) = serial
Case prodDB.effectV3
prodInCount(prodDB.effectV3) = ckCount
prodInSerial(prodDB.effectV3) = serial
Case prodDB.maximumAlpha
prodInCount(prodDB.maximumAlpha) = ckCount
prodInSerial(prodDB.maximumAlpha) = serial
Case prodDB.proSset
prodInCount(prodDB.proSset) = ckCount
prodInSerial(prodDB.proSset) = serial
Case prodDB.proSface
prodInCount(prodDB.proSface) = ckCount
prodInSerial(prodDB.proSface) = serial
Case prodDB.proSeye
prodInCount(prodDB.proSeye) = ckCount
prodInSerial(prodDB.proSeye) = serial
Case prodDB.proSbody
prodInCount(prodDB.proSbody) = ckCount
prodInSerial(prodDB.proSbody) = serial
Case Else
MsgBox("잘못된 데이터가 개입되었습니다", vbCritical)
Return True
End Select
Else Else
Select Case prodCode
Case comDB.mask5
comInCount(comDB.mask5) = ckCount
Case comDB.mask10
comInCount(comDB.mask10) = ckCount
Case comDB.hairband
comInCount(comDB.hairband) = ckCount
Case comDB.gel
comInCount(comDB.gel) = ckCount
Case comDB.minigel
comInCount(comDB.minigel) = ckCount
Case comDB.ample
comInCount(comDB.ample) = ckCount
Case comDB.cream
comInCount(comDB.cream) = ckCount
Case comDB.umb
comInCount(comDB.umb) = ckCount
Case comDB.fen
comInCount(comDB.fen) = ckCount
Case comDB.charger
comInCount(comDB.charger) = ckCount
Case comDB.cable
comInCount(comDB.cable) = ckCount
Case comDB.toner
comInCount(comDB.toner) = ckCount
Case comDB.problack
comInCount(comDB.problack) = ckCount
Case comDB.probeige
comInCount(comDB.probeige) = ckCount
Case comDB.prored
comInCount(comDB.prored) = ckCount
Case comDB.propink
comInCount(comDB.propink) = ckCount
Case comDB.maxblack
comInCount(comDB.maxblack) = ckCount
Case comDB.maxapr
comInCount(comDB.maxapr) = ckCount
Case comDB.maxmint
comInCount(comDB.maxmint) = ckCount
Case comDB.maxbeige
comInCount(comDB.maxbeige) = ckCount
Case comDB.maxPurple
comInCount(comDB.maxPurple) = ckCount
Case comDB.soothing
comInCount(comDB.soothing) = ckCount
Case comDB.car0
comInCount(comDB.car0) = ckCount
Case comDB.car1
comInCount(comDB.car1) = ckCount
Case comDB.car2
comInCount(comDB.car2) = ckCount
Case comDB.car3
comInCount(comDB.car3) = ckCount
Case comDB.car4
comInCount(comDB.car4) = ckCount
Case comDB.car5
comInCount(comDB.car5) = ckCount
Case comDB.car6
comInCount(comDB.car6) = ckCount
Case comDB.bag
comInCount(comDB.bag) = ckCount
Case comDB.cosbag
comInCount(comDB.cosbag) = ckCount
Case comDB.dustbag
comInCount(comDB.dustbag) = ckCount
Case comDB.proSnakeBlack
comInCount(comDB.proSnakeBlack) = ckCount
Case comDB.kollagen
comInCount(comDB.kollagen) = ckCount
Case comDB.kollagenset
comInCount(comDB.kollagenset) = ckCount
Case comDB.kollagen_P
comInCount(comDB.kollagen_P) = ckCount
Case comDB.kollagenset_P
comInCount(comDB.kollagenset_P) = ckCount
Case comDB.cleansingWater
comInCount(comDB.cleansingWater) = ckCount
Case comDB.tonerPad
comInCount(comDB.tonerPad) = ckCount
Case comDB.maxSaffianoBK
comInCount(comDB.maxSaffianoBK) = ckCount
Case comDB.hologram1
comInCount(comDB.hologram1) = ckCount
Case comDB.hologram3
comInCount(comDB.hologram3) = ckCount
Case comDB.hologram5
comInCount(comDB.hologram5) = ckCount
Case comDB.caseSaffianoPp
comInCount(comDB.caseSaffianoPp) = ckCount
Case comDB.maxYellow
comInCount(comDB.maxYellow) = ckCount
Case comDB.Kollagen_Pe1
comInCount(comDB.Kollagen_Pe1) = ckCount
Case comDB.Kollagen_Pe3
comInCount(comDB.Kollagen_Pe3) = ckCount
Case comDB.Kollagen_Pe5
comInCount(comDB.Kollagen_Pe5) = ckCount
Case comDB.ATCircleCase
comInCount(comDB.ATCircleCase) = ckCount
Case comDB.APSquareCase
comInCount(comDB.APSquareCase) = ckCount
Case comDB.maxPeach
comInCount(comDB.maxPeach) = ckCount
Case comDB.massageSoothing
comInCount(comDB.massageSoothing) = ckCount
Case comDB.maxSMint
comInCount(comDB.maxSMint) = ckCount
Case comDB.meshpouch
comInCount(comDB.meshpouch) = ckCount
Case comDB.firmingAmp
comInCount(comDB.firmingAmp) = ckCount
Case comDB.hyaluronicAmp
comInCount(comDB.hyaluronicAmp) = ckCount
Case comDB.nightshot
comInCount(comDB.nightshot) = ckCount
Case comDB.morningshot
comInCount(comDB.morningshot) = ckCount
Case comDB.casemaxwoodi
comInCount(comDB.casemaxwoodi) = ckCount
Case comDB.Elicolltoner
comInCount(comDB.Elicolltoner) = ckCount
Case comDB.Elicollamp
comInCount(comDB.Elicollamp) = ckCount
Case comDB.Elicollcream
comInCount(comDB.Elicollcream) = ckCount
Case comDB.Elihyaltoner
comInCount(comDB.Elihyaltoner) = ckCount
Case comDB.Elihyalamp
comInCount(comDB.Elihyalamp) = ckCount
Case comDB.Elihyalcream
comInCount(comDB.Elihyalcream) = ckCount
Case comDB.Dayshot
comInCount(comDB.Dayshot) = ckCount
Case comDB.Beautyshopbag
comInCount(comDB.Beautyshopbag) = ckCount
Case comDB.Gummy
comInCount(comDB.Gummy) = ckCount
Case comDB.Stickjelly
comInCount(comDB.Stickjelly) = ckCount
Case comDB.Newyearbag
comInCount(comDB.Newyearbag) = ckCount
Case comDB.Emsbelt
comInCount(comDB.Emsbelt) = ckCount
Case comDB.Beltbag
comInCount(comDB.Beltbag) = ckCount
Case comDB.Dayshot2
comInCount(comDB.Dayshot2) = ckCount
Case comDB.Elixir
comInCount(comDB.Elixir) = ckCount
Case comDB.Elixirpremium
comInCount(comDB.Elixirpremium) = ckCount
Case comDB.Emsbeltcontrollset
comInCount(comDB.Emsbeltcontrollset) = ckCount
Case comDB.FabricBag
comInCount(comDB.FabricBag) = ckCount
Case comDB.Goldshopbag
comInCount(comDB.Goldshopbag) = ckCount
Case comDB.MorNigshotset
comInCount(comDB.MorNigshotset) = ckCount
Case comDB.ElesqLiftingToner
comInCount(comDB.ElesqLiftingToner) = ckCount
Case comDB.ElesqLiftingCeam
comInCount(comDB.ElesqLiftingCeam) = ckCount
Case comDB.ElesqLiftingECream
comInCount(comDB.ElesqLiftingECream) = ckCount
Case comDB.ElesqLiftingAmp
comInCount(comDB.ElesqLiftingAmp) = ckCount
Case comDB.ElesqAquaToner
comInCount(comDB.ElesqAquaToner) = ckCount
Case comDB.ElesqAquaCeam
comInCount(comDB.ElesqAquaCeam) = ckCount
Case comDB.ElesqAquaECream
comInCount(comDB.ElesqAquaECream) = ckCount
Case comDB.ElesqAquaAmp
comInCount(comDB.ElesqAquaAmp) = ckCount
Case comDB.car8
comInCount(comDB.car8) = ckCount
Case comDB.keyring
comInCount(comDB.keyring) = ckCount
Case comDB.DoenaLiftingToner
comInCount(comDB.DoenaLiftingToner) = ckCount
Case comDB.DoenaLiftingAmp
comInCount(comDB.DoenaLiftingAmp) = ckCount
Case comDB.DoenaLiftingCream
comInCount(comDB.DoenaLiftingCream) = ckCount
Case comDB.FirmingCollagenGel
comInCount(comDB.FirmingCollagenGel) = ckCount
Case comDB.keyringSally
comInCount(comDB.keyringSally) = ckCount
Case comDB.beautykitHairband
comInCount(comDB.beautykitHairband) = ckCount
Case comDB.beautykitMirrorS
comInCount(comDB.beautykitMirrorS) = ckCount
Case comDB.beautykitMirrorL
comInCount(comDB.beautykitMirrorL) = ckCount
'신규구성품추가 : 추가한 comDB 수량 카운트를 위해 Case 추가
Case Else
MsgBox("잘못된 데이터가 개입되었습니다", vbCritical) MsgBox("잘못된 데이터가 개입되었습니다", vbCritical)
Return True Return True
End Select End If
Else
If prodCode >= comDB.mask5 And prodCode <= comDB_max_index Then
comInCount(prodCode) = ckCount
Else
MsgBox("잘못된 데이터가 개입되었습니다", vbCritical)
Return True
End If
End If End If
Return False Return False
End Function End Function
Public Sub countCommandFunc(saveType As Int16) Public Sub countCommandFunc(saveType As Int16)
@ -533,10 +240,7 @@
countCommand(prodDB.effect) = "EffectCnt" countCommand(prodDB.effect) = "EffectCnt"
countCommand(prodDB.effectV3) = "EffectV3Cnt" countCommand(prodDB.effectV3) = "EffectV3Cnt"
countCommand(prodDB.maximumAlpha) = "MAXIMUMALPHACnt" countCommand(prodDB.maximumAlpha) = "MAXIMUMALPHACnt"
countCommand(prodDB.proSset) = "ProSSetCnt" '신규제품추가 : 추가한 prodDB 수량을 DB에 저장하기 위해 jomtPackingCount 생성한 일반동작 컬럼명 추가
countCommand(prodDB.proSface) = "ProSFaceCnt"
countCommand(prodDB.proSeye) = "ProSEyeCnt"
countCommand(prodDB.proSbody) = "ProSBodyCnt"
countCommand(prodInCount.Length + comDB.mask5) = "Mask5Cnt" countCommand(prodInCount.Length + comDB.mask5) = "Mask5Cnt"
countCommand(prodInCount.Length + comDB.mask10) = "Mask10Cnt" countCommand(prodInCount.Length + comDB.mask10) = "Mask10Cnt"
@ -658,10 +362,7 @@
countCommand(prodDB.effect) = "APEffectCnt" countCommand(prodDB.effect) = "APEffectCnt"
countCommand(prodDB.effectV3) = "APEffectV3Cnt" countCommand(prodDB.effectV3) = "APEffectV3Cnt"
countCommand(prodDB.maximumAlpha) = "APMAXIMUMALPHACnt" countCommand(prodDB.maximumAlpha) = "APMAXIMUMALPHACnt"
countCommand(prodDB.proSset) = "APProSSetCnt" '신규제품추가 : 추가한 prodDB 수량을 DB에 저장하기 위해 jomtPackingCount 생성한 자동화동작(포장) 컬럼명 추가
countCommand(prodDB.proSface) = "APProSFaceCnt"
countCommand(prodDB.proSeye) = "APProSEyeCnt"
countCommand(prodDB.proSbody) = "APProSBodyCnt"
countCommand(prodInCount.Length + comDB.mask5) = "APMask5Cnt" countCommand(prodInCount.Length + comDB.mask5) = "APMask5Cnt"
countCommand(prodInCount.Length + comDB.mask10) = "APMask10Cnt" countCommand(prodInCount.Length + comDB.mask10) = "APMask10Cnt"
@ -783,10 +484,7 @@
countCommand(prodDB.effect) = "AWEffectCnt" countCommand(prodDB.effect) = "AWEffectCnt"
countCommand(prodDB.effectV3) = "AWEffectV3Cnt" countCommand(prodDB.effectV3) = "AWEffectV3Cnt"
countCommand(prodDB.maximumAlpha) = "AWMAXIMUMALPHACnt" countCommand(prodDB.maximumAlpha) = "AWMAXIMUMALPHACnt"
countCommand(prodDB.proSset) = "AWProSSetCnt" '신규제품추가 : 추가한 prodDB 수량을 DB에 저장하기 위해 jomtPackingCount 생성한 자동화동작(무게측정) 컬럼명 추가
countCommand(prodDB.proSface) = "AWProSFaceCnt"
countCommand(prodDB.proSeye) = "AWProSEyeCnt"
countCommand(prodDB.proSbody) = "AWProSBodyCnt"
countCommand(prodInCount.Length + comDB.mask5) = "AWMask5Cnt" countCommand(prodInCount.Length + comDB.mask5) = "AWMask5Cnt"
countCommand(prodInCount.Length + comDB.mask10) = "AWMask10Cnt" countCommand(prodInCount.Length + comDB.mask10) = "AWMask10Cnt"
@ -892,31 +590,23 @@
End Sub End Sub
Public Sub countDBCommand() Public Sub countDBCommand()
prodPackCommand(prodDB.proset) = "ProSetSerial" prodPackCommand(prodDB.proset) = "Main_Product_SN"
prodPackCommand(prodDB.luxset) = "LuxSetSerial" prodPackCommand(prodDB.luxset) = "Main_Product_SN"
prodPackCommand(prodDB.proface) = "ProFaceSerial" prodPackCommand(prodDB.proface) = "Pro_Face_Serial"
prodPackCommand(prodDB.luxface) = "LuxFaceSerial" prodPackCommand(prodDB.luxface) = "Lux_Face_Serial"
prodPackCommand(prodDB.proeye) = "ProEyeSerial" prodPackCommand(prodDB.proeye) = "Pro_Eye_Serial"
prodPackCommand(prodDB.luxeye) = "LuxEyeSerial" prodPackCommand(prodDB.luxeye) = "Lux_Eye_Serial"
prodPackCommand(prodDB.probody) = "ProBodySerial" prodPackCommand(prodDB.probody) = "Pro_Body_Serial"
prodPackCommand(prodDB.luxbody) = "LuxBodySerial" prodPackCommand(prodDB.luxbody) = "Lux_Body_Serial"
prodPackCommand(prodDB.maximum) = "MAXIMUM_SN" prodPackCommand(prodDB.maximum) = "MAXIMUM_SN"
prodPackCommand(prodDB.alphaSet) = "Alpha_Set_Serial" prodPackCommand(prodDB.alphaSet) = "Alpha_Set_Serial"
prodPackCommand(prodDB.alphaFace) = "Alpha_Face_Serial" prodPackCommand(prodDB.alphaFace) = "Alpha_Face_Serial"
prodPackCommand(prodDB.alphaEye) = "Alpha_Eye_Serial" prodPackCommand(prodDB.alphaEye) = "Alpha_Eye_Serial"
prodPackCommand(prodDB.alphaBody) = "Alpha_Body_Serial" prodPackCommand(prodDB.alphaBody) = "Alpha_Body_Serial"
prodPackCommand(prodDB.alto) = "Alto_Serial" prodPackCommand(prodDB.alto) = "Alto_Serial"
prodPackCommand(prodDB.effect) = "Effect_Serial" prodPackCommand(prodDB.effect) = "Effect_Serial"
prodPackCommand(prodDB.effectV3) = "EffectV3_Serial" prodPackCommand(prodDB.effectV3) = "EffectV3_Serial"
prodPackCommand(prodDB.maximumAlpha) = "MAXIMUM_ALPHA_SN" prodPackCommand(prodDB.maximumAlpha) = "MAXIMUM_ALPHA_SN"
'신규제품추가 : jomtSalesPackingTbl 추가한 품목의 시리얼번호 컬럼 추가
prodPackCommand(prodDB.proSset) = "Pro_S_Set_Serial"
prodPackCommand(prodDB.proSface) = "Pro_S_Face_Serial"
prodPackCommand(prodDB.proSeye) = "Pro_S_Eye_Serial"
prodPackCommand(prodDB.proSbody) = "Pro_S_Body_Serial"
End Sub End Sub
End Module End Module