diff --git a/OrderPackingProcessor/mainForm.Designer.vb b/OrderPackingProcessor/mainForm.Designer.vb index 65415a5..dcdf17e 100644 --- a/OrderPackingProcessor/mainForm.Designer.vb +++ b/OrderPackingProcessor/mainForm.Designer.vb @@ -2065,8 +2065,7 @@ Partial Class mainForm Me.ckbInv.UseVisualStyleBackColor = True ' 'pnOption - ' - Me.pnOption.Controls.Add(Me.oyGroupBox) + ' Me.pnOption.Controls.Add(Me.gbMass) Me.pnOption.Controls.Add(Me.gbMesDb) Me.pnOption.Controls.Add(Me.gbAutoCount) diff --git a/OrderPackingProcessor/mainForm.vb b/OrderPackingProcessor/mainForm.vb index 6612809..a3dcdb7 100644 --- a/OrderPackingProcessor/mainForm.vb +++ b/OrderPackingProcessor/mainForm.vb @@ -8,7 +8,7 @@ Imports Newtonsoft.Json.Linq Public Class mainForm Public projectName As String = "OrderPackingProcessor Ver." - Public projectVer As String = "3.0.7" + Public projectVer As String = "3.0.8" Private apiItemOutURL As String = "item-outflows/page" @@ -211,6 +211,7 @@ Public Class mainForm Private typeNum As String Private modelNum As String Private TDUseCompare As Boolean + Private LdmUseCompare As Boolean Private mesDate As DateTime @@ -249,8 +250,7 @@ Public Class mainForm ''보급형 88코드 Private lowProdList As New Dictionary(Of String, String) ''key: itemcode value: 88_Code - ''보급형 기기 포함 - Private lowProdContain As Boolean = False + '' 세트코드 Private setCodeUse As Boolean = False ''세트 코드 번호를 사용했냐 안했냐 구분 Private Const setCodeSort As String = "PK" @@ -489,7 +489,7 @@ Public Class mainForm Return "NONORDER" End If Else - If oybtn.Checked Then + If lowProdList.ContainsValue(playCode) Then Return "CHECKERROR" End If If playCode.Length = oldProdCodeLength Or playCode.Length = newProdCodeLength Then @@ -778,7 +778,7 @@ Public Class mainForm Return False Case "CHECKERROR" errorOut("등록오류") - errorGen("보급형 상품이 아닙니다. 보급형 사용 여부를 해제해 주십시오.") + errorGen("보급형 상품입니다.") Return False Case Else errorOut("동작불량") @@ -1553,14 +1553,6 @@ Public Class mainForm errorOut("등록오류") errorGen("코드를 파싱하는 도중 오류가 발생하였습니다.") Return False - Case "CHECKERROR" - errorOut("등록오류") - errorGen("보급형 상품이 아닙니다. 보급형 사용을 해제해 주십시오.") - Return False - Case "UNCHECKERROR" - errorOut("등록오류") - errorGen("보급형 상품입니다. 보급형 사용 여부를 확인해 주십시오.") - Return False Case Else errorOut("등록오류") errorGen("잘못된 접근입니다. 관리자에게 문의하여 주십시오.") @@ -1871,7 +1863,7 @@ Public Class mainForm End Function Private Function serialDupCheck() As Boolean - If oybtn.Checked And playCode.Length = lowProdCodeLength Then + If playCode.Length = lowProdCodeLength Then Return False End If For i = 0 To prodArray.GetLength(1) - 1 @@ -1887,7 +1879,7 @@ Public Class mainForm Private Function serialPackCompare() As Boolean Dim commandStr As String - If oybtn.Checked And playCode.Length = lowProdCodeLength Then + If playCode.Length = lowProdCodeLength Then Return True End If @@ -1903,9 +1895,11 @@ Public Class mainForm Return False End If - DBCmd = "SELECT TDUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & modelNum & "' LIMIT 1" + DBCmd = "SELECT TDUseYn, LdmUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & modelNum & "' LIMIT 1" If DBQueryReader(DBCmd) Then - If sqlDataQuery(0) = "Y" Then + If sqlDataQuery(1) = "Y" Then + LdmUseCompare = True + ElseIf sqlDataQuery(0) = "Y" Then TDUseCompare = True Else TDUseCompare = False @@ -3689,7 +3683,7 @@ Public Class mainForm If prodArray(itemCode.serialNum, i) = Nothing Then prodArray(itemCode.serialNum, i) = playCode Else - If Not (oybtn.Checked And playCode.Length = lowProdCodeLength) Then + If Not playCode.Length = lowProdCodeLength Then prodArray(itemCode.serialNum, i) = prodArray(itemCode.serialNum, i) & "/" & playCode End If End If @@ -3756,17 +3750,8 @@ Public Class mainForm End If Else If orderSwitch = True Then - If lowProdList.ContainsValue(playCode) Then - If oybtn.Checked Then - Return "PRODSCAN" - Else - Return "UNCHECKERROR" - End If - ElseIf oybtn.Checked And lowProdContain = False Then - Return "CHECKERROR" - End If - If playCode.Length = oldProdCodeLength Or playCode.Length = newProdCodeLength Then + If playCode.Length = oldProdCodeLength Or playCode.Length = newProdCodeLength Or lowProdList.ContainsValue(playCode) Then Return "PRODSCAN" ElseIf playCode.Length > comCodeLength Then Return "COMSCAN" @@ -3788,7 +3773,7 @@ Public Class mainForm End Function Private Function searchData() As Boolean - If oybtn.Checked And playCode.Length = lowProdCodeLength Then + If playCode.Length = lowProdCodeLength Then For i = 0 To setInfoList.prodCode setInfo(i) = "NULL" Next @@ -3860,6 +3845,8 @@ Public Class mainForm Else If TDUseCompare = True Then DBCmd = "SELECT Ct_Model,Ct_Abroad,Ct_Agency FROM " & applyCartDB & " WHERE Product_SN = '" & setInfo(type) & "'" + ElseIf LdmUseCompare = True Then + DBCmd = "SELECT Ct_Model,Ct_Abroad,Ct_Agency FROM " & ApplyLdmDB & " WHERE Product_SN = '" & setInfo(type) & "'" Else DBCmd = "SELECT Ct_Model,Ct_Abroad,Ct_Agency FROM " & applyNonTDDB & " WHERE Product_SN = '" & setInfo(type) & "'" End If @@ -3959,6 +3946,8 @@ Public Class mainForm If TDUseCompare = True Then DBCmd = "SELECT Ct_Max_ShotCnt FROM " & applyCartDB & " WHERE Product_SN = '" & setInfo(type) & "'" + ElseIf LdmUseCompare = True Then + DBCmd = "SELECT Ct_Max_ShotCnt FROM " & ApplyLdmDB & " WHERE Product_SN = '" & setInfo(type) & "'" Else DBCmd = "SELECT COUNT(Number) FROM " & applyNonTDDB & " WHERE Product_SN = '" & setInfo(type) & "'" End If @@ -3973,7 +3962,7 @@ Public Class mainForm Return False End If - If TDUseCompare = False Then + If TDUseCompare = False And LdmUseCompare = False Then If shotcnt > 0 Then shotcnt = 0 Else @@ -4001,7 +3990,7 @@ Public Class mainForm Private Function prodCodeSearch() As Boolean Try - If Not (oybtn.Checked And playCode.Length = lowProdCodeLength) Then + If playCode.Length <> lowProdCodeLength Then If modelNum = Nothing Or typeNum = Nothing Then errorOut("등록오류") errorGen("해당 시리얼 번호의 모델과 타입을 알 수 없습니다.") @@ -4017,7 +4006,7 @@ Public Class mainForm ElseIf playCode.Length = newProdCodeLength Then '16자리 제품시리얼번호 codeColor = Mid(playCode, 3, 1) End If - If oybtn.Checked And playCode.Length = lowProdCodeLength Then + If playCode.Length = lowProdCodeLength Then DBCmd = "SELECT ItemCode,ProdCode,FaceShot,EyeShot FROM " & applyPlistDB & " WHERE 88_Code = '" & playCode & "'" Else DBCmd = "SELECT ItemCode,ProdCode,FaceShot,EyeShot FROM " & applyPlistDB & " WHERE ModelNum = '" & modelNum & "' AND TypeNum = '" & typeNum & "' AND ColorNum = '" & codeColor & "'" @@ -4102,7 +4091,6 @@ Public Class mainForm Try Dim dataCount As Int16 = 0 Dim codeExist As Boolean = False - lowProdContain = False ReDim prodArray(itemCode.id, 0) ReDim apiData(apiDataList.address) @@ -4173,9 +4161,6 @@ Public Class mainForm errorGen("등록 데이터 중 제품이 등록되어 있지 않는 항목이 존재합니다.") Return False End If - If lowProdList.ContainsKey(prodArray(itemCode.code, dataCount)) And lowProdContain = False Then - lowProdContain = True - End If prodArray(itemCode.chkCount, dataCount) = 0 prodArray(itemCode.serialNum, dataCount) = Nothing @@ -5020,7 +5005,6 @@ Public Class mainForm Dim weightNum As Int16 Dim apiDBNum As Int16 Dim MassNum As Int16 - Dim oyNum As Int16 If rdbMode1.Checked = True Then modeNum = 0 @@ -5060,13 +5044,7 @@ Public Class mainForm MassNum = 1 End If - If oybtn.Checked = True Then - oyNum = 1 - Else - oyNum = 0 - End If - - saveStr = cboComPort.SelectedItem & "^" & modeNum & "^" & autoNum & "^" & weightNum & "^" & apiDBNum & "^" & MassNum & "^" & oyNum + saveStr = cboComPort.SelectedItem & "^" & modeNum & "^" & autoNum & "^" & weightNum & "^" & apiDBNum & "^" & MassNum Case saveList.ckbData saveStr = optionCkb(optionCkbList.weight).Checked & "^" & optionCkb(optionCkbList.barcode).Checked & "^" & optionCkb(optionCkbList.printer).Checked & "^" & optionCkb(optionCkbList.api).Checked @@ -5263,13 +5241,6 @@ Public Class mainForm rdbNew.Checked = False rdbBef.Checked = True End If - ElseIf i = 6 Then - If parsingCk = 0 Then - oybtn.Checked = False - Else - oybtn.Checked = True - End If - Else errorOut("설정오류") errorGen("Config 파일을 불러오는 과정에서 오류가 발생하였습니다.") @@ -5348,7 +5319,7 @@ Public Class mainForm End Sub - Private Sub ckbWeight_Click(sender As Object, e As EventArgs) Handles ckbWeight.Click, chbUseBarcode.Click, ckbPrinter.Click, ckbAPIuse.Click, rdbMode1.Click, rdbMode2.Click, rdbAuto1.Click, rdbAuto2.Click, rdbWeightAuto.Click, rdbWeightCAS.Click, rdbWeightQW.Click, rdbMesDbAPI.Click, rdbMesDbPg.Click, rdbNew.Click, rdbBef.Click, oybtn.Click + Private Sub ckbWeight_Click(sender As Object, e As EventArgs) Handles ckbWeight.Click, chbUseBarcode.Click, ckbPrinter.Click, ckbAPIuse.Click, rdbMode1.Click, rdbMode2.Click, rdbAuto1.Click, rdbAuto2.Click, rdbWeightAuto.Click, rdbWeightCAS.Click, rdbWeightQW.Click, rdbMesDbAPI.Click, rdbMesDbPg.Click, rdbNew.Click, rdbBef.Click ckbChange = True ' 중량 관련 라디오 버튼이 변경된 경우 시리얼 포트 재연결 diff --git a/OrderPackingProcessor/mySQLAddress.vb b/OrderPackingProcessor/mySQLAddress.vb index b0ae162..d6fb102 100644 --- a/OrderPackingProcessor/mySQLAddress.vb +++ b/OrderPackingProcessor/mySQLAddress.vb @@ -7,6 +7,8 @@ Module mySQLAddress Private Const mainSalesDB As String = "jomtTesterDB.jomtSalesPackingTbl" Private Const testSalesDB As String = "jomtTesterServerDB.jomtSalesPackingTbl" + Private Const mainLdmDB As String = "jomtTesterDB.jomtLDMTbl" + Private Const mainCountDB As String = "jomtTesterDB.jomtPackingCount" Private Const testCountDB As String = "jomtTesterServerDB.jomtPackingCount" @@ -51,6 +53,7 @@ Module mySQLAddress Public applyPKCodeDB As String = mainPKCodeDB Public applyNonTDDB As String = MainNonTDDB Public ApplyModelInfoDB As String = mainModelInfoDB + Public ApplyLdmDB As String = mainLdmDB Public applyPackDB As String = testPackDB Public applyHistoryDB As String = testHistoryDB