diff --git a/Product_Manager/FormSetting.vb b/Product_Manager/FormSetting.vb
index 27cb662..67ff115 100644
--- a/Product_Manager/FormSetting.vb
+++ b/Product_Manager/FormSetting.vb
@@ -5,6 +5,8 @@
MAXIMUM '카트리지 일체형, HIFU + RF + EP + MC 기능 제공 모델
ALTO '카트리지 일체형, RF + EP 기능 제공 모델
EFFECT '카트리지 일체형, HIFU 기능 제공 모델
+ LOW_PROD '카트리지 일체형, 저가형 모델
+ LDM '카트리지 일체형, LDM 기능 제공 모델
MAX_Mode
End Enum
Public SelectModeType As Int16
@@ -111,6 +113,23 @@
MAXSetting()
End Sub
+ Public Sub LOW_PRODForm_Setting()
+ AuthSetting("플래쉬 설정값 초기화", "초기화")
+ DefaultSetting()
+ ModeSetting(SelectModeType)
+ MAXSetting()
+ MainForm.gbMotor.Visible = False
+ End Sub
+
+ Public Sub LDMForm_Setting()
+ AuthSetting("플래쉬 설정값 초기화", "초기화")
+ DefaultSetting()
+ ModeSetting(SelectModeType)
+ MAXSetting()
+ MainForm.gbMotor.Visible = False
+ LDMFreqPwrSetting()
+ End Sub
+
Private Sub MAXSetting()
With MainForm
@@ -137,11 +156,43 @@
With .gbTD
.Enabled = True
+ .Visible = True
End With
End With
End Sub
+ Private Sub LDMFreqPwrSetting()
+ ' LDM: 전체 패널에 세 개 주파수/파워 패널을 넣고, 전체 패널에만 읽기/쓰기 한 세트
+ With MainForm
+ .pnlLDMFreqPwrContainer.Visible = True
+ .pnlLDMFreqPwrContainer.Location = New Point(400, 170)
+ .pnlLDMFreqPwrContainer.Size = New Size(380, 580)
+ .pnlLDMFreqPwrContainer.BringToFront()
+
+ .gbFreqPwr.Parent = .pnlLDMFreqPwrContainer
+ .gbFreqPwr.Location = New Point(0, 0)
+ .gbFreqPwr.Size = New Size(380, 170)
+ .gbFreqPwr.Visible = True
+ .pnFPResult.Visible = False
+
+ .gbFreqPwr2.Parent = .pnlLDMFreqPwrContainer
+ .gbFreqPwr2.Location = New Point(0, 175)
+ .gbFreqPwr2.Size = New Size(380, 170)
+ .gbFreqPwr2.Visible = True
+ .pnFPResult2.Visible = False
+
+ .gbFreqPwr3.Parent = .pnlLDMFreqPwrContainer
+ .gbFreqPwr3.Location = New Point(0, 350)
+ .gbFreqPwr3.Size = New Size(380, 170)
+ .gbFreqPwr3.Visible = True
+ .pnFPResult3.Visible = False
+
+ .pnLDMFPResult.Visible = True
+ .pnLDMFPResult.BringToFront()
+ End With
+ End Sub
+
Private Sub ModeSetting(ModelNum As Int16)
ShotCountSetting(ModelNum)
MotorOpSetting(ModelNum)
@@ -149,6 +200,14 @@
End Sub
Private Sub DefaultSetting()
+ MainForm.pnlLDMFreqPwrContainer.Visible = False
+ MainForm.gbFreqPwr.Parent = MainForm.gbSetting
+ MainForm.gbFreqPwr2.Parent = MainForm.gbSetting
+ MainForm.gbFreqPwr3.Parent = MainForm.gbSetting
+ MainForm.pnFPResult.Visible = True
+ MainForm.gbFreqPwr2.Visible = False
+ MainForm.gbFreqPwr3.Visible = False
+ MainForm.gbMotor.Visible = True
InfoSetting()
TDSetting()
FreqPowerSetting()
@@ -448,6 +507,31 @@
End With
End With
+ Case ModeList.LOW_PROD
+ With MainForm
+ With .pnMaxShot
+ .Visible = False
+ End With
+ With .pnShResult
+ .Location = New Point(10, 70)
+ End With
+ With .gbShot
+ .Enabled = True
+ End With
+ End With
+ Case ModeList.LDM
+ With MainForm
+ With .pnMaxShot
+ .Visible = False
+ End With
+ With .pnShResult
+ .Location = New Point(10, 70)
+ End With
+ With .gbShot
+ .Location = New Point(9, 658)
+ .Enabled = True
+ End With
+ End With
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
@@ -528,6 +612,16 @@
.Enabled = True
End With
End With
+ Case ModeList.LOW_PROD, ModeList.LDM
+ With MainForm
+ With .lbMotor
+ .Location = New Point(23, 7)
+ .Text = "모터이동"
+ End With
+ With .gbMotor
+ .Enabled = False
+ End With
+ End With
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
@@ -568,6 +662,12 @@
End With
End With
+ Case ModeList.LOW_PROD, ModeList.LDM
+ With MainForm
+ With .gbFreqPwr
+ .Enabled = True
+ End With
+ End With
Case Else
MsgBox("잘못된 경로입니다.", vbCritical)
End Select
diff --git a/Product_Manager/MainForm.Designer.vb b/Product_Manager/MainForm.Designer.vb
index 2af6ef8..e70a43c 100644
--- a/Product_Manager/MainForm.Designer.vb
+++ b/Product_Manager/MainForm.Designer.vb
@@ -58,6 +58,33 @@ Partial Class MainForm
Me.pnShot = New System.Windows.Forms.Panel()
Me.txbShot = New System.Windows.Forms.TextBox()
Me.lbShot = New System.Windows.Forms.Label()
+ Me.pnlLDMFreqPwrContainer = New System.Windows.Forms.Panel()
+ Me.pnLDMFPResult = New System.Windows.Forms.Panel()
+ Me.btnLDMFPWrite = New System.Windows.Forms.Button()
+ Me.btnLDMFPRead = New System.Windows.Forms.Button()
+ Me.txbLDMFPBox = New System.Windows.Forms.TextBox()
+ Me.gbFreqPwr3 = New System.Windows.Forms.GroupBox()
+ Me.pnFPResult3 = New System.Windows.Forms.Panel()
+ Me.btnFPWrite3 = New System.Windows.Forms.Button()
+ Me.btnFPRead3 = New System.Windows.Forms.Button()
+ Me.txbFPBox3 = New System.Windows.Forms.TextBox()
+ Me.pnPower3 = New System.Windows.Forms.Panel()
+ Me.txbPower3 = New System.Windows.Forms.TextBox()
+ Me.lbPower3 = New System.Windows.Forms.Label()
+ Me.pnFreq3 = New System.Windows.Forms.Panel()
+ Me.txbFreq3 = New System.Windows.Forms.TextBox()
+ Me.lbFreq3 = New System.Windows.Forms.Label()
+ Me.gbFreqPwr2 = New System.Windows.Forms.GroupBox()
+ Me.pnFPResult2 = New System.Windows.Forms.Panel()
+ Me.btnFPWrite2 = New System.Windows.Forms.Button()
+ Me.btnFPRead2 = New System.Windows.Forms.Button()
+ Me.txbFPBox2 = New System.Windows.Forms.TextBox()
+ Me.pnPower2 = New System.Windows.Forms.Panel()
+ Me.txbPower2 = New System.Windows.Forms.TextBox()
+ Me.lbPower2 = New System.Windows.Forms.Label()
+ Me.pnFreq2 = New System.Windows.Forms.Panel()
+ Me.txbFreq2 = New System.Windows.Forms.TextBox()
+ Me.lbFreq2 = New System.Windows.Forms.Label()
Me.gbFreqPwr = New System.Windows.Forms.GroupBox()
Me.pnFPResult = New System.Windows.Forms.Panel()
Me.btnFPWrite = New System.Windows.Forms.Button()
@@ -387,6 +414,14 @@ Partial Class MainForm
Me.lbMesFreq = New System.Windows.Forms.Label()
Me.txbMesPw = New System.Windows.Forms.TextBox()
Me.lbMesPw = New System.Windows.Forms.Label()
+ Me.txbMesFreq2 = New System.Windows.Forms.TextBox()
+ Me.lbMesFreq2 = New System.Windows.Forms.Label()
+ Me.txbMesPw2 = New System.Windows.Forms.TextBox()
+ Me.lbMesPw2 = New System.Windows.Forms.Label()
+ Me.txbMesFreq3 = New System.Windows.Forms.TextBox()
+ Me.lbMesFreq3 = New System.Windows.Forms.Label()
+ Me.txbMesPw3 = New System.Windows.Forms.TextBox()
+ Me.lbMesPw3 = New System.Windows.Forms.Label()
Me.pnLoadTop = New System.Windows.Forms.Panel()
Me.btnLoadNum = New System.Windows.Forms.Button()
Me.txbLoadNum = New System.Windows.Forms.TextBox()
@@ -405,6 +440,16 @@ Partial Class MainForm
Me.pnShResult.SuspendLayout()
Me.pnMaxShot.SuspendLayout()
Me.pnShot.SuspendLayout()
+ Me.pnlLDMFreqPwrContainer.SuspendLayout()
+ Me.pnLDMFPResult.SuspendLayout()
+ Me.gbFreqPwr3.SuspendLayout()
+ Me.pnFPResult3.SuspendLayout()
+ Me.pnPower3.SuspendLayout()
+ Me.pnFreq3.SuspendLayout()
+ Me.gbFreqPwr2.SuspendLayout()
+ Me.pnFPResult2.SuspendLayout()
+ Me.pnPower2.SuspendLayout()
+ Me.pnFreq2.SuspendLayout()
Me.gbFreqPwr.SuspendLayout()
Me.pnFPResult.SuspendLayout()
Me.pnPower.SuspendLayout()
@@ -625,7 +670,7 @@ Partial Class MainForm
Me.pnBottom.Controls.Add(Me.gbDevice)
Me.pnBottom.Location = New System.Drawing.Point(0, 90)
Me.pnBottom.Name = "pnBottom"
- Me.pnBottom.Size = New System.Drawing.Size(1223, 667)
+ Me.pnBottom.Size = New System.Drawing.Size(1223, 872)
Me.pnBottom.TabIndex = 3
'
'btnwrite
@@ -642,6 +687,9 @@ Partial Class MainForm
'
Me.gbSetting.Controls.Add(Me.gbMotor)
Me.gbSetting.Controls.Add(Me.gbShot)
+ Me.gbSetting.Controls.Add(Me.pnlLDMFreqPwrContainer)
+ Me.gbSetting.Controls.Add(Me.gbFreqPwr3)
+ Me.gbSetting.Controls.Add(Me.gbFreqPwr2)
Me.gbSetting.Controls.Add(Me.gbFreqPwr)
Me.gbSetting.Controls.Add(Me.gbTD)
Me.gbSetting.Controls.Add(Me.gbArea)
@@ -650,7 +698,7 @@ Partial Class MainForm
Me.gbSetting.Font = New System.Drawing.Font("함초롬바탕", 15.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(129, Byte))
Me.gbSetting.Location = New System.Drawing.Point(10, 5)
Me.gbSetting.Name = "gbSetting"
- Me.gbSetting.Size = New System.Drawing.Size(795, 655)
+ Me.gbSetting.Size = New System.Drawing.Size(795, 860)
Me.gbSetting.TabIndex = 0
Me.gbSetting.TabStop = False
Me.gbSetting.Text = "카트리지 설정"
@@ -847,6 +895,326 @@ Partial Class MainForm
Me.lbShot.TabIndex = 0
Me.lbShot.Text = "남은샷수"
'
+ 'pnlLDMFreqPwrContainer
+ '
+ Me.pnlLDMFreqPwrContainer.Controls.Add(Me.pnLDMFPResult)
+ Me.pnlLDMFreqPwrContainer.Location = New System.Drawing.Point(400, 170)
+ Me.pnlLDMFreqPwrContainer.Name = "pnlLDMFreqPwrContainer"
+ Me.pnlLDMFreqPwrContainer.Size = New System.Drawing.Size(380, 560)
+ Me.pnlLDMFreqPwrContainer.TabIndex = 61
+ Me.pnlLDMFreqPwrContainer.Visible = False
+ '
+ 'pnLDMFPResult
+ '
+ Me.pnLDMFPResult.Controls.Add(Me.btnLDMFPWrite)
+ Me.pnLDMFPResult.Controls.Add(Me.btnLDMFPRead)
+ Me.pnLDMFPResult.Controls.Add(Me.txbLDMFPBox)
+ Me.pnLDMFPResult.Location = New System.Drawing.Point(10, 525)
+ Me.pnLDMFPResult.Name = "pnLDMFPResult"
+ Me.pnLDMFPResult.Size = New System.Drawing.Size(360, 50)
+ Me.pnLDMFPResult.TabIndex = 0
+ '
+ 'btnLDMFPWrite
+ '
+ Me.btnLDMFPWrite.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.btnLDMFPWrite.Location = New System.Drawing.Point(250, 5)
+ Me.btnLDMFPWrite.Name = "btnLDMFPWrite"
+ Me.btnLDMFPWrite.Size = New System.Drawing.Size(105, 40)
+ Me.btnLDMFPWrite.TabIndex = 47
+ Me.btnLDMFPWrite.Text = "쓰기"
+ Me.btnLDMFPWrite.UseVisualStyleBackColor = True
+ '
+ 'btnLDMFPRead
+ '
+ Me.btnLDMFPRead.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.btnLDMFPRead.Location = New System.Drawing.Point(145, 5)
+ Me.btnLDMFPRead.Name = "btnLDMFPRead"
+ Me.btnLDMFPRead.Size = New System.Drawing.Size(105, 40)
+ Me.btnLDMFPRead.TabIndex = 46
+ Me.btnLDMFPRead.Text = "읽기"
+ Me.btnLDMFPRead.UseVisualStyleBackColor = True
+ '
+ 'txbLDMFPBox
+ '
+ Me.txbLDMFPBox.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer))
+ Me.txbLDMFPBox.Font = New System.Drawing.Font("굴림", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbLDMFPBox.ForeColor = System.Drawing.Color.White
+ Me.txbLDMFPBox.Location = New System.Drawing.Point(10, 12)
+ Me.txbLDMFPBox.Name = "txbLDMFPBox"
+ Me.txbLDMFPBox.Size = New System.Drawing.Size(130, 29)
+ Me.txbLDMFPBox.TabIndex = 45
+ Me.txbLDMFPBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ Me.txbLDMFPBox.Visible = False
+ '
+ 'gbFreqPwr3
+ '
+ Me.gbFreqPwr3.Controls.Add(Me.pnFPResult3)
+ Me.gbFreqPwr3.Controls.Add(Me.pnPower3)
+ Me.gbFreqPwr3.Controls.Add(Me.pnFreq3)
+ Me.gbFreqPwr3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.gbFreqPwr3.ForeColor = System.Drawing.Color.Black
+ Me.gbFreqPwr3.Location = New System.Drawing.Point(400, 385)
+ Me.gbFreqPwr3.Name = "gbFreqPwr3"
+ Me.gbFreqPwr3.Size = New System.Drawing.Size(380, 170)
+ Me.gbFreqPwr3.TabIndex = 60
+ Me.gbFreqPwr3.TabStop = False
+ Me.gbFreqPwr3.Text = "주파수 및 파워 설정 3"
+ Me.gbFreqPwr3.Visible = False
+ '
+ 'pnFPResult3
+ '
+ Me.pnFPResult3.Controls.Add(Me.btnFPWrite3)
+ Me.pnFPResult3.Controls.Add(Me.btnFPRead3)
+ Me.pnFPResult3.Controls.Add(Me.txbFPBox3)
+ Me.pnFPResult3.Location = New System.Drawing.Point(10, 110)
+ Me.pnFPResult3.Name = "pnFPResult3"
+ Me.pnFPResult3.Size = New System.Drawing.Size(360, 50)
+ Me.pnFPResult3.TabIndex = 47
+ '
+ 'btnFPWrite3
+ '
+ Me.btnFPWrite3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.btnFPWrite3.Location = New System.Drawing.Point(250, 5)
+ Me.btnFPWrite3.Name = "btnFPWrite3"
+ Me.btnFPWrite3.Size = New System.Drawing.Size(105, 40)
+ Me.btnFPWrite3.TabIndex = 47
+ Me.btnFPWrite3.Text = "쓰기"
+ Me.btnFPWrite3.UseVisualStyleBackColor = True
+ '
+ 'btnFPRead3
+ '
+ Me.btnFPRead3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.btnFPRead3.Location = New System.Drawing.Point(145, 5)
+ Me.btnFPRead3.Name = "btnFPRead3"
+ Me.btnFPRead3.Size = New System.Drawing.Size(105, 40)
+ Me.btnFPRead3.TabIndex = 46
+ Me.btnFPRead3.Text = "읽기"
+ Me.btnFPRead3.UseVisualStyleBackColor = True
+ '
+ 'txbFPBox3
+ '
+ Me.txbFPBox3.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer))
+ Me.txbFPBox3.Font = New System.Drawing.Font("굴림", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbFPBox3.ForeColor = System.Drawing.Color.White
+ Me.txbFPBox3.Location = New System.Drawing.Point(10, 12)
+ Me.txbFPBox3.Name = "txbFPBox3"
+ Me.txbFPBox3.Size = New System.Drawing.Size(130, 29)
+ Me.txbFPBox3.TabIndex = 45
+ Me.txbFPBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ Me.txbFPBox3.Visible = False
+ '
+ 'pnPower3
+ '
+ Me.pnPower3.Controls.Add(Me.txbPower3)
+ Me.pnPower3.Controls.Add(Me.lbPower3)
+ Me.pnPower3.Location = New System.Drawing.Point(10, 70)
+ Me.pnPower3.Name = "pnPower3"
+ Me.pnPower3.Size = New System.Drawing.Size(360, 40)
+ Me.pnPower3.TabIndex = 46
+ '
+ 'txbPower3
+ '
+ Me.txbPower3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbPower3.Location = New System.Drawing.Point(145, 5)
+ Me.txbPower3.Name = "txbPower3"
+ Me.txbPower3.Size = New System.Drawing.Size(205, 32)
+ Me.txbPower3.TabIndex = 1
+ Me.txbPower3.Text = 0
+ Me.txbPower3.TextAlign = HorizontalAlignment.Center
+ '
+ 'lbPower3
+ '
+ Me.lbPower3.AutoSize = True
+ Me.lbPower3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.lbPower3.Location = New System.Drawing.Point(59, 7)
+ Me.lbPower3.Name = "lbPower3"
+ Me.lbPower3.Size = New System.Drawing.Size(46, 24)
+ Me.lbPower3.TabIndex = 0
+ Me.lbPower3.Text = "파워"
+ '
+ 'pnFreq3
+ '
+ Me.pnFreq3.Controls.Add(Me.txbFreq3)
+ Me.pnFreq3.Controls.Add(Me.lbFreq3)
+ Me.pnFreq3.Location = New System.Drawing.Point(10, 30)
+ Me.pnFreq3.Name = "pnFreq3"
+ Me.pnFreq3.Size = New System.Drawing.Size(360, 40)
+ Me.pnFreq3.TabIndex = 45
+
+ '
+ 'pnPower3
+ '
+ Me.pnPower3.Controls.Add(Me.txbPower3)
+ Me.pnPower3.Controls.Add(Me.lbPower3)
+ Me.pnPower3.Location = New System.Drawing.Point(10, 70)
+ Me.pnPower3.Name = "pnPower3"
+ Me.pnPower3.Size = New System.Drawing.Size(360, 40)
+ Me.pnPower3.TabIndex = 46
+ '
+ 'txbPower3
+ '
+ Me.txbPower3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbPower3.Location = New System.Drawing.Point(145, 5)
+ Me.txbPower3.Name = "txbPower3"
+ Me.txbPower3.Size = New System.Drawing.Size(205, 32)
+ Me.txbPower3.TabIndex = 1
+ Me.txbPower3.Text = 0
+ Me.txbPower3.TextAlign = HorizontalAlignment.Center
+ '
+ 'lbPower3
+ '
+ Me.lbPower3.AutoSize = True
+ Me.lbPower3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.lbPower3.Location = New System.Drawing.Point(59, 7)
+ Me.lbPower3.Name = "lbPower3"
+ Me.lbPower3.Size = New System.Drawing.Size(46, 24)
+ Me.lbPower3.TabIndex = 0
+ Me.lbPower3.Text = "파워"
+ '
+ 'pnFreq3
+ '
+ Me.pnFreq3.Controls.Add(Me.txbFreq3)
+ Me.pnFreq3.Controls.Add(Me.lbFreq3)
+ Me.pnFreq3.Location = New System.Drawing.Point(10, 30)
+ Me.pnFreq3.Name = "pnFreq3"
+ Me.pnFreq3.Size = New System.Drawing.Size(360, 40)
+ Me.pnFreq3.TabIndex = 45
+ '
+ 'txbFreq3
+ '
+ Me.txbFreq3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbFreq3.Location = New System.Drawing.Point(145, 5)
+ Me.txbFreq3.Name = "txbFreq3"
+ Me.txbFreq3.Size = New System.Drawing.Size(205, 32)
+ Me.txbFreq3.TabIndex = 1
+ Me.txbFreq3.Text = 7000
+ Me.txbFreq3.TextAlign = HorizontalAlignment.Center
+ '
+ 'lbFreq3
+ '
+ Me.lbFreq3.AutoSize = True
+ Me.lbFreq3.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.lbFreq3.Location = New System.Drawing.Point(41, 7)
+ Me.lbFreq3.Name = "lbFreq3"
+ Me.lbFreq3.Size = New System.Drawing.Size(64, 24)
+ Me.lbFreq3.TabIndex = 0
+ Me.lbFreq3.Text = "주파수"
+ '
+ 'gbFreqPwr2
+ '
+ Me.gbFreqPwr2.Controls.Add(Me.pnFPResult2)
+ Me.gbFreqPwr2.Controls.Add(Me.pnPower2)
+ Me.gbFreqPwr2.Controls.Add(Me.pnFreq2)
+ Me.gbFreqPwr2.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.gbFreqPwr2.ForeColor = System.Drawing.Color.Black
+ Me.gbFreqPwr2.Location = New System.Drawing.Point(400, 210)
+ Me.gbFreqPwr2.Name = "gbFreqPwr2"
+ Me.gbFreqPwr2.Size = New System.Drawing.Size(380, 170)
+ Me.gbFreqPwr2.TabIndex = 59
+ Me.gbFreqPwr2.TabStop = False
+ Me.gbFreqPwr2.Text = "주파수 및 파워 설정 2"
+ Me.gbFreqPwr2.Visible = False
+ '
+ 'pnFPResult2
+ '
+ Me.pnFPResult2.Controls.Add(Me.btnFPWrite2)
+ Me.pnFPResult2.Controls.Add(Me.btnFPRead2)
+ Me.pnFPResult2.Controls.Add(Me.txbFPBox2)
+ Me.pnFPResult2.Location = New System.Drawing.Point(10, 110)
+ Me.pnFPResult2.Name = "pnFPResult2"
+ Me.pnFPResult2.Size = New System.Drawing.Size(360, 50)
+ Me.pnFPResult2.TabIndex = 47
+ '
+ 'btnFPWrite2
+ '
+ Me.btnFPWrite2.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.btnFPWrite2.Location = New System.Drawing.Point(250, 5)
+ Me.btnFPWrite2.Name = "btnFPWrite2"
+ Me.btnFPWrite2.Size = New System.Drawing.Size(105, 40)
+ Me.btnFPWrite2.TabIndex = 47
+ Me.btnFPWrite2.Text = "쓰기"
+ Me.btnFPWrite2.UseVisualStyleBackColor = True
+ '
+ 'btnFPRead2
+ '
+ Me.btnFPRead2.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.btnFPRead2.Location = New System.Drawing.Point(145, 5)
+ Me.btnFPRead2.Name = "btnFPRead2"
+ Me.btnFPRead2.Size = New System.Drawing.Size(105, 40)
+ Me.btnFPRead2.TabIndex = 46
+ Me.btnFPRead2.Text = "읽기"
+ Me.btnFPRead2.UseVisualStyleBackColor = True
+ '
+ 'txbFPBox2
+ '
+ Me.txbFPBox2.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer))
+ Me.txbFPBox2.Font = New System.Drawing.Font("굴림", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbFPBox2.ForeColor = System.Drawing.Color.White
+ Me.txbFPBox2.Location = New System.Drawing.Point(10, 12)
+ Me.txbFPBox2.Name = "txbFPBox2"
+ Me.txbFPBox2.Size = New System.Drawing.Size(130, 29)
+ Me.txbFPBox2.TabIndex = 45
+ Me.txbFPBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ Me.txbFPBox2.Visible = False
+ '
+ 'pnPower2
+ '
+ Me.pnPower2.Controls.Add(Me.txbPower2)
+ Me.pnPower2.Controls.Add(Me.lbPower2)
+ Me.pnPower2.Location = New System.Drawing.Point(10, 70)
+ Me.pnPower2.Name = "pnPower2"
+ Me.pnPower2.Size = New System.Drawing.Size(360, 40)
+ Me.pnPower2.TabIndex = 46
+ '
+ 'txbPower2
+ '
+ Me.txbPower2.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbPower2.Location = New System.Drawing.Point(145, 5)
+ Me.txbPower2.Name = "txbPower2"
+ Me.txbPower2.Size = New System.Drawing.Size(205, 32)
+ Me.txbPower2.TabIndex = 1
+ Me.txbPower2.Text = 0
+ Me.txbPower2.TextAlign = HorizontalAlignment.Center
+ '
+ 'lbPower2
+ '
+ Me.lbPower2.AutoSize = True
+ Me.lbPower2.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.lbPower2.Location = New System.Drawing.Point(59, 7)
+ Me.lbPower2.Name = "lbPower2"
+ Me.lbPower2.Size = New System.Drawing.Size(46, 24)
+ Me.lbPower2.TabIndex = 0
+ Me.lbPower2.Text = "파워"
+ '
+ 'pnFreq2
+ '
+ Me.pnFreq2.Controls.Add(Me.txbFreq2)
+ Me.pnFreq2.Controls.Add(Me.lbFreq2)
+ Me.pnFreq2.Location = New System.Drawing.Point(10, 30)
+ Me.pnFreq2.Name = "pnFreq2"
+ Me.pnFreq2.Size = New System.Drawing.Size(360, 40)
+ Me.pnFreq2.TabIndex = 45
+ '
+ 'txbFreq2
+ '
+ Me.txbFreq2.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.txbFreq2.Location = New System.Drawing.Point(145, 5)
+ Me.txbFreq2.Name = "txbFreq2"
+ Me.txbFreq2.Size = New System.Drawing.Size(205, 32)
+ Me.txbFreq2.TabIndex = 1
+ Me.txbFreq2.Text = 7000
+ Me.txbFreq2.TextAlign = HorizontalAlignment.Center
+ '
+ 'lbFreq2
+ '
+ Me.lbFreq2.AutoSize = True
+ Me.lbFreq2.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
+ Me.lbFreq2.Location = New System.Drawing.Point(41, 7)
+ Me.lbFreq2.Name = "lbFreq2"
+ Me.lbFreq2.Size = New System.Drawing.Size(64, 24)
+ Me.lbFreq2.TabIndex = 0
+ Me.lbFreq2.Text = "주파수"
+ '
'gbFreqPwr
'
Me.gbFreqPwr.Controls.Add(Me.pnFPResult)
@@ -4221,9 +4589,17 @@ Partial Class MainForm
Me.gbTDSearch.Controls.Add(Me.lbMesFreq)
Me.gbTDSearch.Controls.Add(Me.txbMesPw)
Me.gbTDSearch.Controls.Add(Me.lbMesPw)
+ Me.gbTDSearch.Controls.Add(Me.txbMesFreq2)
+ Me.gbTDSearch.Controls.Add(Me.lbMesFreq2)
+ Me.gbTDSearch.Controls.Add(Me.txbMesPw2)
+ Me.gbTDSearch.Controls.Add(Me.lbMesPw2)
+ Me.gbTDSearch.Controls.Add(Me.txbMesFreq3)
+ Me.gbTDSearch.Controls.Add(Me.lbMesFreq3)
+ Me.gbTDSearch.Controls.Add(Me.txbMesPw3)
+ Me.gbTDSearch.Controls.Add(Me.lbMesPw3)
Me.gbTDSearch.Location = New System.Drawing.Point(6, 35)
Me.gbTDSearch.Name = "gbTDSearch"
- Me.gbTDSearch.Size = New System.Drawing.Size(657, 180)
+ Me.gbTDSearch.Size = New System.Drawing.Size(657, 225)
Me.gbTDSearch.TabIndex = 24
Me.gbTDSearch.TabStop = False
Me.gbTDSearch.Text = "TD Data"
@@ -4301,6 +4677,88 @@ Partial Class MainForm
Me.lbMesPw.TabIndex = 3
Me.lbMesPw.Text = "Power : "
'
+ 'txbMesFreq2
+ '
+ Me.txbMesFreq2.Location = New System.Drawing.Point(165, 172)
+ Me.txbMesFreq2.Name = "txbMesFreq2"
+ Me.txbMesFreq2.Size = New System.Drawing.Size(180, 35)
+ Me.txbMesFreq2.TabIndex = 15
+ Me.txbMesFreq2.Text = "-"
+ Me.txbMesFreq2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ Me.txbMesFreq2.Visible = False
+ '
+ 'lbMesFreq2
+ '
+ Me.lbMesFreq2.AutoSize = True
+ Me.lbMesFreq2.Location = New System.Drawing.Point(26, 175)
+ Me.lbMesFreq2.Name = "lbMesFreq2"
+ Me.lbMesFreq2.Size = New System.Drawing.Size(138, 27)
+ Me.lbMesFreq2.TabIndex = 4
+ Me.lbMesFreq2.Text = "Frequency2 : "
+ Me.lbMesFreq2.Visible = False
+ '
+ 'txbMesPw2
+ '
+ Me.txbMesPw2.Location = New System.Drawing.Point(450, 172)
+ Me.txbMesPw2.Name = "txbMesPw2"
+ Me.txbMesPw2.Size = New System.Drawing.Size(180, 35)
+ Me.txbMesPw2.TabIndex = 17
+ Me.txbMesPw2.Text = "-"
+ Me.txbMesPw2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ Me.txbMesPw2.Visible = False
+ '
+ 'lbMesPw2
+ '
+ Me.lbMesPw2.AutoSize = True
+ Me.lbMesPw2.Location = New System.Drawing.Point(352, 175)
+ Me.lbMesPw2.Name = "lbMesPw2"
+ Me.lbMesPw2.Size = New System.Drawing.Size(92, 27)
+ Me.lbMesPw2.TabIndex = 5
+ Me.lbMesPw2.Text = "Power2 : "
+ Me.lbMesPw2.Visible = False
+
+ '
+ 'txbMesFreq3
+ '
+ Me.txbMesFreq3.Location = New System.Drawing.Point(165, 212)
+ Me.txbMesFreq3.Name = "txbMesFreq3"
+ Me.txbMesFreq3.Size = New System.Drawing.Size(180, 35)
+ Me.txbMesFreq3.TabIndex = 16
+ Me.txbMesFreq3.Text = "-"
+ Me.txbMesFreq3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ Me.txbMesFreq3.Visible = False
+
+ '
+ 'lbMesFreq3
+ '
+ Me.lbMesFreq3.AutoSize = True
+ Me.lbMesFreq3.Location = New System.Drawing.Point(26, 215)
+ Me.lbMesFreq3.Name = "lbMesFreq3"
+ Me.lbMesFreq3.Size = New System.Drawing.Size(138, 27)
+ Me.lbMesFreq3.TabIndex = 6
+ Me.lbMesFreq3.Text = "Frequency3 : "
+ Me.lbMesFreq3.Visible = False
+ '
+ 'txbMesPw3
+ '
+ Me.txbMesPw3.Location = New System.Drawing.Point(450, 212)
+ Me.txbMesPw3.Name = "txbMesPw3"
+ Me.txbMesPw3.Size = New System.Drawing.Size(180, 35)
+ Me.txbMesPw3.TabIndex = 17
+ Me.txbMesPw3.Text = "-"
+ Me.txbMesPw3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ Me.txbMesPw3.Visible = False
+ '
+ 'lbMesPw3
+ '
+ Me.lbMesPw3.AutoSize = True
+ Me.lbMesPw3.Location = New System.Drawing.Point(352, 215)
+ Me.lbMesPw3.Name = "lbMesPw3"
+ Me.lbMesPw3.Size = New System.Drawing.Size(92, 27)
+ Me.lbMesPw3.TabIndex = 7
+ Me.lbMesPw3.Text = "Power3 : "
+ Me.lbMesPw3.Visible = False
+ '
'pnLoadTop
'
Me.pnLoadTop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -4374,6 +4832,23 @@ Partial Class MainForm
Me.pnMaxShot.PerformLayout()
Me.pnShot.ResumeLayout(False)
Me.pnShot.PerformLayout()
+ Me.pnlLDMFreqPwrContainer.ResumeLayout(False)
+ Me.pnLDMFPResult.ResumeLayout(False)
+ Me.pnLDMFPResult.PerformLayout()
+ Me.gbFreqPwr3.ResumeLayout(False)
+ Me.pnFPResult3.ResumeLayout(False)
+ Me.pnFPResult3.PerformLayout()
+ Me.pnPower3.ResumeLayout(False)
+ Me.pnPower3.PerformLayout()
+ Me.pnFreq3.ResumeLayout(False)
+ Me.pnFreq3.PerformLayout()
+ Me.gbFreqPwr2.ResumeLayout(False)
+ Me.pnFPResult2.ResumeLayout(False)
+ Me.pnFPResult2.PerformLayout()
+ Me.pnPower2.ResumeLayout(False)
+ Me.pnPower2.PerformLayout()
+ Me.pnFreq2.ResumeLayout(False)
+ Me.pnFreq2.PerformLayout()
Me.gbFreqPwr.ResumeLayout(False)
Me.pnFPResult.ResumeLayout(False)
Me.pnFPResult.PerformLayout()
@@ -4588,6 +5063,33 @@ Partial Class MainForm
Friend WithEvents pnFreq As Panel
Friend WithEvents txbFreq As TextBox
Friend WithEvents lbFreq As Label
+ Friend WithEvents gbFreqPwr2 As GroupBox
+ Friend WithEvents pnFPResult2 As Panel
+ Friend WithEvents btnFPWrite2 As Button
+ Friend WithEvents btnFPRead2 As Button
+ Friend WithEvents txbFPBox2 As TextBox
+ Friend WithEvents pnPower2 As Panel
+ Friend WithEvents txbPower2 As TextBox
+ Friend WithEvents lbPower2 As Label
+ Friend WithEvents pnFreq2 As Panel
+ Friend WithEvents txbFreq2 As TextBox
+ Friend WithEvents lbFreq2 As Label
+ Friend WithEvents gbFreqPwr3 As GroupBox
+ Friend WithEvents pnFPResult3 As Panel
+ Friend WithEvents btnFPWrite3 As Button
+ Friend WithEvents btnFPRead3 As Button
+ Friend WithEvents txbFPBox3 As TextBox
+ Friend WithEvents pnPower3 As Panel
+ Friend WithEvents txbPower3 As TextBox
+ Friend WithEvents lbPower3 As Label
+ Friend WithEvents pnFreq3 As Panel
+ Friend WithEvents txbFreq3 As TextBox
+ Friend WithEvents lbFreq3 As Label
+ Friend WithEvents pnlLDMFreqPwrContainer As Panel
+ Friend WithEvents pnLDMFPResult As Panel
+ Friend WithEvents btnLDMFPWrite As Button
+ Friend WithEvents btnLDMFPRead As Button
+ Friend WithEvents txbLDMFPBox As TextBox
Friend WithEvents gbTD As GroupBox
Friend WithEvents pnTdResult As Panel
Friend WithEvents btnTdWrite As Button
@@ -4866,6 +5368,14 @@ Partial Class MainForm
Friend WithEvents lbMesFreq As Label
Friend WithEvents txbMesPw As TextBox
Friend WithEvents lbMesPw As Label
+ Friend WithEvents txbMesFreq2 As TextBox
+ Friend WithEvents lbMesFreq2 As Label
+ Friend WithEvents txbMesPw2 As TextBox
+ Friend WithEvents lbMesPw2 As Label
+ Friend WithEvents txbMesFreq3 As TextBox
+ Friend WithEvents lbMesFreq3 As Label
+ Friend WithEvents txbMesPw3 As TextBox
+ Friend WithEvents lbMesPw3 As Label
Friend WithEvents btnwrite As Button
Friend WithEvents btnReset As Button
Friend WithEvents btnDuWrite As Button
diff --git a/Product_Manager/MainForm.vb b/Product_Manager/MainForm.vb
index 5df05d0..33be8e9 100644
--- a/Product_Manager/MainForm.vb
+++ b/Product_Manager/MainForm.vb
@@ -10,7 +10,7 @@ Imports Mysqlx
Imports Mysqlx.XDevAPI
Public Class MainForm
- Public Const FormVersion As String = "3.0.0"
+ Public Const FormVersion As String = "3.0.1"
Private Const FormName As String = "DUALSONIC Product Manager Ver " & FormVersion
Private Const TDNameSize As Int16 = 10
@@ -50,6 +50,8 @@ Public Class MainForm
Public HifuUseYn As String
Public RfUseYn As String
Public EpUseYn As String
+ Public LowProdUseYn As String
+ Public LdmUseYn As String
End Structure
Public SelectedModelInfo As ModelInfo
@@ -205,9 +207,11 @@ Public Class MainForm
.HifuUseYn = False
.RfUseYn = False
.EpUseYn = False
+ .LdmUseYn = False
+ .LowProdUseYn = False
End With
- DBCmd = "SELECT DeviceTypeCode, TDUseYn, HifuUseYn, RfUseYn, EpUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & SelectedModelInfo.Code & "' LIMIT 1"
+ DBCmd = "SELECT DeviceTypeCode, TDUseYn, HifuUseYn, RfUseYn, EpUseYn, LdmUseYn, LowPriceUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & SelectedModelInfo.Code & "' LIMIT 1"
If DBQueryReader(DBCmd) Then
With SelectedModelInfo
.DeviceTypeCode = sqlDataQuery(0)
@@ -215,6 +219,8 @@ Public Class MainForm
.HifuUseYn = sqlDataQuery(2)
.RfUseYn = sqlDataQuery(3)
.EpUseYn = sqlDataQuery(4)
+ .LdmUseYn = sqlDataQuery(5)
+ .LowProdUseYn = sqlDataQuery(6)
End With
End If
@@ -229,7 +235,19 @@ Public Class MainForm
btnALFuncReset1.Enabled = True
ElseIf SelectedModelInfo.DeviceTypeCode = "A" Then
- If SelectedModelInfo.HifuUseYn = "Y" And SelectedModelInfo.RfUseYn = "Y" And SelectedModelInfo.EpUseYn = "Y" Then
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ SelectModeType = ModeList.LDM
+ LDMForm_Setting()
+ LDM_UseOn()
+ btnALFuncReset1.Enabled = False
+
+ ElseIf SelectedModelInfo.LowProdUseYn = "Y" Then
+ SelectModeType = ModeList.LOW_PROD
+ LOW_PRODForm_Setting()
+ LOW_PROD_UseOn()
+ btnALFuncReset1.Enabled = False
+
+ ElseIf SelectedModelInfo.HifuUseYn = "Y" And SelectedModelInfo.RfUseYn = "Y" And SelectedModelInfo.EpUseYn = "Y" Then
SelectModeType = ModeList.MAXIMUM
MAXForm_Setting()
MAXIMUM_UseOn()
@@ -251,10 +269,48 @@ Public Class MainForm
End If
TypeCboSetting()
+ SetTDSearchLdmRowVisible()
End If
End Sub
+ ''' LdmUseYn일 때만 검색 결과 TD Data의 Frequency2/Power2 행 표시, 레이아웃 높이 동적 조정
+ Private Sub SetTDSearchLdmRowVisible()
+ Dim visible As Boolean = (SelectedModelInfo.LdmUseYn = "Y")
+ lbMesFreq2.Visible = visible
+ txbMesFreq2.Visible = visible
+ lbMesPw2.Visible = visible
+ txbMesPw2.Visible = visible
+ lbMesFreq3.Visible = visible
+ txbMesFreq3.Visible = visible
+ lbMesPw3.Visible = visible
+ txbMesPw3.Visible = visible
+
+ ' LDM 행 표시 시 gbTDSearch 확대, gbPDSearch/버튼 아래로 밀고, 패널·폼 높이 증가 (버튼은 항상 일렬 유지)
+ Const LdmRowHeight As Integer = 45
+ If visible Then
+ gbTDSearch.Height = 270
+ gbPDSearch.Top = 218 + (LdmRowHeight * 2)
+ gbDBLoad.Height = 505 + (LdmRowHeight * 2)
+ btnReset.Top = 515 + (LdmRowHeight * 2)
+ btnEnd.Top = 514 + (LdmRowHeight * 2)
+ btnwrite.Top = 515 + (LdmRowHeight * 2)
+ pnLoadBot.Height = 667 + (LdmRowHeight * 2)
+ pnDBLoad.Height = 757 + (LdmRowHeight * 2)
+ Me.Height = 800 + (LdmRowHeight * 2)
+ Else
+ gbTDSearch.Height = 180
+ gbPDSearch.Top = 218
+ gbDBLoad.Height = 505
+ btnReset.Top = 515
+ btnEnd.Top = 514
+ btnwrite.Top = 515
+ pnLoadBot.Height = 667
+ pnDBLoad.Height = 757
+ Me.Height = 800
+ End If
+ End Sub
+
Private Sub comboBoxType_SelectedIndexChanged(sender As Object, e As EventArgs) Handles comboBoxType.SelectedIndexChanged
If comboBoxType.SelectedIndex <> -1 Then
ColorCboSetting()
@@ -277,6 +333,10 @@ Public Class MainForm
ALTO_UseOn()
Case ModeList.EFFECT
EFFECT_UseOn()
+ Case ModeList.LOW_PROD
+ LOW_PROD_UseOn()
+ Case ModeList.LDM
+ LDM_UseOn()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
End Select
@@ -326,6 +386,22 @@ Public Class MainForm
tcAltoUse.Visible = False
End Sub
+ Private Sub LOW_PROD_UseOn()
+ gbDevice.Visible = False
+ gbRunTime.Visible = False
+ tcMAXUse.Visible = True
+ gbDUALUse.Visible = False
+ tcAltoUse.Visible = False
+ End Sub
+
+ Private Sub LDM_UseOn()
+ gbDevice.Visible = False
+ gbRunTime.Visible = False
+ tcMAXUse.Visible = True
+ gbDUALUse.Visible = False
+ tcAltoUse.Visible = False
+ End Sub
+
Private Sub btnComport_Click(sender As Object, e As EventArgs) Handles btnComport.Click
ResetClear()
ResultReset()
@@ -375,7 +451,7 @@ Public Class MainForm
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_AuthFunc()
- Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT, ModeList.LOW_PROD, ModeList.LDM
FlashDataReset()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -513,7 +589,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_WriteFunc()
- Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT, ModeList.LOW_PROD, ModeList.LDM
MAXIMUM_WriteFunc()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -763,7 +839,9 @@ End_Finish:
If ckbDBUse.Checked = True Then
Dim QueryTable As String = UseCartridgeTbl
- If SelectedModelInfo.TDUseYn <> "Y" Then
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ QueryTable = UseLDMCartridgeTbl
+ ElseIf SelectedModelInfo.TDUseYn <> "Y" Then
QueryTable = NonCartridgeTbl
End If
@@ -860,7 +938,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_ReadFunc()
- Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT, ModeList.LOW_PROD, ModeList.LDM
MAXIMUM_ReadFunc()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -1220,7 +1298,9 @@ End_Finish:
End Sub
Private Function TDNameDBLoad(TDName As String) As Boolean
- If SelectedModelInfo.TDUseYn = "Y" Then
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ DBCmd = "SELECT EXISTS (SELECT 1 FROM " & UseLDMCartridgeTbl & " WHERE PV_SN = '" & TDName & "')"
+ ElseIf SelectedModelInfo.TDUseYn = "Y" Then
DBCmd = "SELECT EXISTS (SELECT 1 FROM " & UseCartridgeTbl & " WHERE PV_SN = '" & TDName & "')"
Else
DBCmd = "SELECT EXISTS (SELECT 1 FROM " & NonCartridgeTbl & " WHERE PV_SN = '" & TDName & "')"
@@ -1233,6 +1313,11 @@ End_Finish:
Dim retVal As String
tmpCmdMessage = "settdsn"
+
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ tmpCmdMessage = "setldmsn"
+ End If
+
cmdMessage = "[" & tmpCmdMessage & "]" + vbCrLf
If SendData(cmdMessage) Then
@@ -1253,7 +1338,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_AreaReadFunc()
- Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT, ModeList.LOW_PROD, ModeList.LDM
MAXIMUM_AreaReadFunc()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -1383,7 +1468,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_AreaWriteFunc()
- Case ModeList.MAXIMUM, ModeList.EFFECT, ModeList.ALTO
+ Case ModeList.MAXIMUM, ModeList.EFFECT, ModeList.ALTO, ModeList.LOW_PROD, ModeList.LDM
MAXIMUM_AreaWriteFunc()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -1512,6 +1597,8 @@ End_Finish:
Dim QueryTable As String = UseCartridgeTbl
If SelectedModelInfo.TDUseYn <> "Y" Then
QueryTable = NonCartridgeTbl
+ ElseIf SelectedModelInfo.LdmUseYn = "Y" Then
+ QueryTable = UseLDMCartridgeTbl
End If
DBCmd = "UPDATE " & QueryTable & " SET " &
@@ -1542,7 +1629,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_TDReadFunc()
- Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT, ModeList.LOW_PROD, ModeList.LDM
MAXIMUM_TDReadFunc()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -1635,7 +1722,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_TDWrtieFunc()
- Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.ALTO, ModeList.EFFECT, ModeList.LOW_PROD, ModeList.LDM
MAXIMUM_TDWrtieFunc()
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -1703,6 +1790,9 @@ End_Finish:
Private Function TDDataWrtie(SaveData As String) As String
tmpCmdMessage = "settdsn"
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ tmpCmdMessage = "setldmsn"
+ End If
cmdMessage = "[" & tmpCmdMessage & " " & SaveData & "]" + vbCrLf
If SendData(cmdMessage) Then
@@ -1718,12 +1808,14 @@ End_Finish:
End If
End Function
- Private Sub btnFPRead_Click(sender As Object, e As EventArgs) Handles btnFPRead.Click
+ Private Sub btnFPRead_Click(sender As Object, e As EventArgs) Handles btnFPRead.Click, btnLDMFPRead.Click
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_FPReadFunc()
- Case ModeList.MAXIMUM, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.EFFECT, ModeList.LOW_PROD
MAXIMUM_FPReadFunc()
+ Case ModeList.LDM
+ LDM_FPReadFunc()
Case ModeList.ALTO
txbFPBox.Text = "ERROR"
txbFPBox.BackColor = Color.Red
@@ -1734,10 +1826,17 @@ End_Finish:
End Sub
Private Sub FPReadStart()
- txbFPBox.Visible = True
- txbFPBox.Text = "RUNNING"
- txbFPBox.BackColor = Color.GreenYellow
- txbFPBox.Refresh()
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ txbLDMFPBox.Visible = True
+ txbLDMFPBox.Text = "RUNNING"
+ txbLDMFPBox.BackColor = Color.GreenYellow
+ txbLDMFPBox.Refresh()
+ Else
+ txbFPBox.Visible = True
+ txbFPBox.Text = "RUNNING"
+ txbFPBox.BackColor = Color.GreenYellow
+ txbFPBox.Refresh()
+ End If
End Sub
Private Sub DUALSONIC_FPReadFunc()
@@ -1810,6 +1909,12 @@ End_Finish:
Try
FPReadStart()
+ If SelectedModelInfo.HifuUseYn <> "Y" Then
+ txbFPBox.Text = "해당안됨"
+ txbFPBox.BackColor = Color.Green
+ GoTo End_Finish
+ End If
+
Dim ResultData As String = FPDataRead()
If ResultData = Str(ErrorList.SendError) Or ResultData = Str(ErrorList.ReceiveError) Then
@@ -1836,6 +1941,43 @@ End_Finish:
txbFPBox.Refresh()
End Sub
+
+ Private Sub LDM_FPReadFunc()
+ Dim StageCnt As Int16 = ErrorList.NonError
+
+ Try
+ FPReadStart()
+
+ Dim ResultData As String = LDMFPDataRead()
+
+ If ResultData = Str(ErrorList.SendError) Or ResultData = Str(ErrorList.ReceiveError) Then
+ StageCnt = ResultData
+ GoTo FAIL_Finish
+ End If
+ Dim dataArray() As String = ResultData.Split(",")
+ Dim freqBoxes() As System.Windows.Forms.TextBox = {txbFreq, txbFreq2, txbFreq3}
+ Dim powerBoxes() As System.Windows.Forms.TextBox = {txbPower, txbPower2, txbPower3}
+ For i = 0 To Math.Min(dataArray.Length - 4, freqBoxes.Length - 1)
+ freqBoxes(i).Text = dataArray(i)
+ powerBoxes(i).Text = (Val(dataArray(i + 3)) / 100).ToString()
+ Next
+
+ txbLDMFPBox.Text = "SUCCESS"
+ txbLDMFPBox.BackColor = Color.Green
+ GoTo End_Finish
+
+ Catch ex As Exception
+ MsgBox("출력 진행 도중 에러 발생!" & vbCrLf & ex.Message, vbCritical, FormName)
+ GoTo FAIL_Finish
+ End Try
+
+FAIL_Finish:
+ txbLDMFPBox.Text = "ERROR" + Str(StageCnt)
+ txbLDMFPBox.BackColor = Color.Red
+End_Finish:
+ txbLDMFPBox.Refresh()
+ End Sub
+
Private Function FPDataRead() As String
tmpCmdMessage = "settdcnf"
cmdMessage = "[" & tmpCmdMessage & "]" + vbCrLf
@@ -1853,12 +1995,31 @@ End_Finish:
End If
End Function
- Private Sub btnFPWrite_Click(sender As Object, e As EventArgs) Handles btnFPWrite.Click
+ Private Function LDMFPDataRead() As String
+ tmpCmdMessage = "setldmcnf"
+ cmdMessage = "[" & tmpCmdMessage & "]" + vbCrLf
+
+ If SendData(cmdMessage) Then
+ Return Str(ErrorList.SendError)
+ End If
+
+ Dim retVal As String = PollingReceiveData(500)
+
+ If InStr(1, retVal, ",") > 0 Then
+ Return retVal
+ Else
+ Return Str(ErrorList.ReceiveError)
+ End If
+ End Function
+
+ Private Sub btnFPWrite_Click(sender As Object, e As EventArgs) Handles btnFPWrite.Click, btnLDMFPWrite.Click
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_FPWriteFunc()
- Case ModeList.MAXIMUM, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.EFFECT, ModeList.LOW_PROD
MAXIMUM_FPWriteFunc()
+ Case ModeList.LDM
+ LDM_FPWriteFunc()
Case ModeList.ALTO
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
@@ -1964,6 +2125,12 @@ End_Finish:
Try
FPWrtieStart()
+ If SelectedModelInfo.HifuUseYn <> "Y" Then
+ txbFPBox.Text = "해당안됨"
+ txbFPBox.BackColor = Color.Green
+ GoTo End_Finish
+ End If
+
Dim ResultData As Byte = FPWrtieSetting(Val(txbFreq.Text), CSng(txbPower.Text))
If ResultData = ErrorList.SendError Or ResultData = ErrorList.ReceiveError Then
@@ -2015,6 +2182,75 @@ End_Finish:
txbFPBox.Refresh()
End Sub
+ Private Sub LDM_FPWriteFunc() 'LDM 주파수 및 전력 쓰기 함수
+ Dim stagecnt As Int16 = ErrorList.NonError
+ Try
+ If FPWrtieStart() Then
+ stagecnt = ErrorList.DataError
+ GoTo FAIL_Finish
+ End If
+
+ Dim resultdata As String = ldmfpwriteSetting(Val(txbFreq.Text), CSng(txbPower.Text), Val(txbFreq2.Text), CSng(txbPower2.Text), Val(txbFreq3.Text), CSng(txbPower3.Text))
+ If resultdata = ErrorList.SendError Or resultdata = ErrorList.ReceiveError Then
+ stagecnt = resultdata
+ GoTo FAIL_Finish
+ End If
+
+
+ If ckbDBUse.Checked = True Then
+ Dim TDNameStr = TDNameLoad()
+
+ If TDNameStr = Str(ErrorList.SendError) Or TDNameStr = Str(ErrorList.ReceiveError) Then
+ MsgBox("LDM 시리얼 번호를 확인할 수 없습니다. 저장하고자 하는 Serial 번호를 먼저 입력하여 주십시오.", vbExclamation, FormName)
+ stagecnt = TDNameStr
+ GoTo FAIL_Finish
+ End If
+
+ Dim DBExist As Boolean = TDNameDBLoad(TDNameStr)
+
+ If DBExist = False Then
+ MsgBox("LDM 시리얼 번호가 데이터베이스에 등록되어 있지 않습니다.", vbCritical, FormName)
+ stagecnt = ErrorList.ReceiveError
+ GoTo FAIL_Finish
+ End If
+
+ Dim freq = txbFreq.Text
+ Dim power = txbPower.Text
+ Dim freq2 = txbFreq2.Text
+ Dim power2 = txbPower2.Text
+ Dim freq3 = txbFreq3.Text
+ Dim power3 = txbPower3.Text
+
+ DBCmd = "UPDATE " & UseLDMCartridgeTbl & " SET " &
+ "Ct_Frequency = " & freq & ", " &
+ "Ct_Power = " & power & ", " &
+ "Ct_Frequency2 = " & freq2 & ", " &
+ "Ct_Power2 = " & power2 & ", " &
+ "Ct_Frequency3 = " & freq3 & ", " &
+ "Ct_Power3 = " & power3 & " " &
+ "WHERE PV_SN = '" & TDNameStr & "'"
+
+ DBCommand(DBCmd)
+ End If
+
+ txbLDMFPBox.Text = "SUCCESS"
+ txbLDMFPBox.BackColor = Color.Green
+ GoTo End_Finish
+
+ Catch ex As Exception
+ MsgBox("출력 진행 도중 에러 발생!" & vbCrLf & ex.Message, vbCritical, FormName)
+ GoTo FAIL_Finish
+ End Try
+
+
+FAIL_Finish:
+ txbLDMFPBox.Text = "ERROR" + Str(stagecnt)
+ txbLDMFPBox.BackColor = Color.Red
+End_Finish:
+ txbLDMFPBox.Refresh()
+ End Sub
+
+
Private Function FPWrtieSetting(Frequency As Integer, Power As Single) As SByte
Power = Power * 100
@@ -2034,6 +2270,26 @@ End_Finish:
End If
End Function
+ Private Function ldmfpwriteSetting(Frequency1 As Integer, Power1 As Single, Frequency2 As Integer, Power2 As Single, Frequency3 As Integer, Power3 As Single) As SByte
+ Power1 = Power1 * 100
+ Power2 = Power2 * 100
+ Power3 = Power3 * 100
+
+ tmpCmdMessage = "setldmcnf"
+ cmdMessage = "[" & tmpCmdMessage & " " & Frequency1 & "," & Frequency2 & "," & Frequency3 & "," & Power1 & "," & Power2 & "," & Power3 & "]" + vbCrLf
+ If SendData(cmdMessage) Then
+ Return Str(ErrorList.SendError)
+ End If
+ Dim retval As String = PollingReceiveData(2500)
+ If retval <> Frequency1 & "," & Frequency2 & "," & Frequency3 & "," & Power1 & "," & Power2 & "," & Power3 Then
+ Return ErrorList.ReceiveError
+ Else
+ Return ErrorList.NonError
+ End If
+ End Function
+
+
+
Private Sub btnMtRead_Click(sender As Object, e As EventArgs) Handles btnMtRead.Click
Select Case SelectModeType
Case ModeList.DUALSONIC
@@ -2044,6 +2300,7 @@ End_Finish:
txbFPBox.Text = "ERROR"
txbFPBox.BackColor = Color.Red
txbFPBox.Refresh()
+ Case ModeList.LDM, ModeList.LOW_PROD
Case Else
MsgBox("잘못된 경로입니다.", vbCritical, FormName)
End Select
@@ -2296,7 +2553,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_ShotRead()
- Case ModeList.MAXIMUM, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.EFFECT, ModeList.LDM, ModeList.LOW_PROD
MAXIMUM_ShotRead()
Case ModeList.ALTO
txbFPBox.Text = "ERROR"
@@ -2383,6 +2640,12 @@ End_Finish:
Try
ShotReadStart()
+ If SelectedModelInfo.HifuUseYn <> "Y" And SelectedModelInfo.LdmUseYn <> "Y" Then
+ txbShotBox.Text = "해당안됨"
+ txbShotBox.BackColor = Color.Green
+ GoTo End_Finish
+ End If
+
Dim ResultData As String = ShotReadFunc()
If ResultData = ErrorList.SendError Or ResultData = ErrorList.ReceiveError Then
@@ -2429,7 +2692,7 @@ End_Finish:
Select Case SelectModeType
Case ModeList.DUALSONIC
DUALSONIC_ShotWrite()
- Case ModeList.MAXIMUM, ModeList.EFFECT
+ Case ModeList.MAXIMUM, ModeList.EFFECT, ModeList.LDM, ModeList.LOW_PROD
MAXIMUM_ShotWrtie()
Case ModeList.ALTO
Case Else
@@ -2526,10 +2789,23 @@ End_Finish:
Private Sub MAXIMUM_ShotWrtie()
Dim StageCnt As Int16 = ErrorList.NonError
+ Dim table As String
+
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ table = UseLDMCartridgeTbl
+ Else
+ table = UseCartridgeTbl
+ End If
Try
ShotWriteStart()
+ If SelectedModelInfo.HifuUseYn <> "Y" And SelectedModelInfo.LdmUseYn <> "Y" Then
+ txbShotBox.Text = "해당안됨"
+ txbShotBox.BackColor = Color.Green
+ GoTo End_Finish
+ End If
+
Dim ResultData As String = ShotWriteFunc(Val(txbShot.Text))
If ResultData = Str(ErrorList.SendError) Or ResultData = Str(ErrorList.ReceiveError) Then
@@ -2554,7 +2830,7 @@ End_Finish:
GoTo FAIL_Finish
End If
- DBCmd = "UPDATE " & UseCartridgeTbl & " SET " &
+ DBCmd = "UPDATE " & table & " SET " &
"Ct_Remain_ShotCnt = '" & txbShot.Text & "' " &
"WHERE PV_SN = '" & TDNameStr & "'"
@@ -3243,6 +3519,8 @@ End_Finish:
Dim StageCnt As Int16 = ErrorList.NonError
Try
+ MAXIMUM_All_ReadStart()
+
If MsgBox("전체 항목에 대해 초기화 진행하시겠습니까?" & vbCrLf & "초기화된 데이터는 복구가 불가능 합니다.", vbCritical + vbOKCancel, FormName) = MsgBoxResult.Ok Then
Dim ResultData As String = RunTimeWrtie(0, 0, 0, 0, 0, 0, 0)
@@ -3834,6 +4112,10 @@ End_Finish:
txbFPBox.BackColor = Color.FromArgb(0, 192, 0)
txbFPBox.Visible = False
+ txbLDMFPBox.Text = String.Empty
+ txbLDMFPBox.BackColor = Color.FromArgb(0, 192, 0)
+ txbLDMFPBox.Visible = False
+
txbMtBox.Text = String.Empty
txbMtBox.BackColor = Color.FromArgb(0, 192, 0)
txbMtBox.Visible = False
@@ -3861,6 +4143,36 @@ End_Finish:
txbALAllBox.Text = String.Empty
txbALAllBox.BackColor = Color.FromArgb(0, 192, 0)
txbALAllBox.Visible = False
+
+ txbMxAllBox.Text = String.Empty
+ txbMxAllBox.BackColor = Color.FromArgb(0, 192, 0)
+ txbMxAllBox.Visible = False
+
+ txbMxHfBox.Text = String.Empty
+ txbMxHfBox.BackColor = Color.FromArgb(0, 192, 0)
+ txbMxHfBox.Visible = False
+
+ txbMxEtBox.Text = String.Empty
+ txbMxEtBox.BackColor = Color.FromArgb(0, 192, 0)
+ txbMxEtBox.Visible = False
+ End Sub
+
+ ''' MAX 사용 탭 선택 시 해당 탭의 결과 txb 초기화 및 숨김
+ Private Sub tcMAXUse_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tcMAXUse.SelectedIndexChanged
+ Select Case tcMAXUse.SelectedIndex
+ Case 0
+ txbMxAllBox.Text = String.Empty
+ txbMxAllBox.BackColor = Color.FromArgb(0, 192, 0)
+ txbMxAllBox.Visible = False
+ Case 1
+ txbMxHfBox.Text = String.Empty
+ txbMxHfBox.BackColor = Color.FromArgb(0, 192, 0)
+ txbMxHfBox.Visible = False
+ Case 2
+ txbMxEtBox.Text = String.Empty
+ txbMxEtBox.BackColor = Color.FromArgb(0, 192, 0)
+ txbMxEtBox.Visible = False
+ End Select
End Sub
Private Sub btnEnd_Click(sender As Object, e As EventArgs) Handles btnEnd.Click
@@ -3905,27 +4217,60 @@ End_Finish:
End Sub
Private Function TD_Search() As Boolean
- Dim DBCmd As String = "Select Product_SN,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Power,Ct_Max_ShotCnt,Ct_Motor_Lv,PV_SN,Ct_Frequency,IFNULL(Manufacture_Date,'') as Manufacture_Date FROM " & UseCartridgeTbl & " WHERE PV_SN = '" & txbLoadNum.Text & "' Limit 1"
+ Dim DBCmd As String
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ DBCmd = "Select Product_SN,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Power,Ct_Power2,Ct_Power3,Ct_Max_ShotCnt,Ct_Motor_Lv,PV_SN,Ct_Frequency,Ct_Frequency2,Ct_Frequency3,IFNULL(Manufacture_Date,'') as Manufacture_Date FROM " & UseLDMCartridgeTbl & " WHERE PV_SN = '" & txbLoadNum.Text & "' Limit 1"
+ If DBQueryReader(DBCmd) Then
+ txbPDSN.Text = sqlDataQuery(0)
+ txbPDCP.Text = sqlDataQuery(1)
+ txbPDSerial.Text = sqlDataQuery(2)
+ txbPDModel.Text = sqlDataQuery(3)
+ txbPDType.Text = sqlDataQuery(4)
+ txbPDCC.Text = sqlDataQuery(5)
+ txbPDAC.Text = sqlDataQuery(6)
+ txbMesPw.Text = sqlDataQuery(7)
+ txbMesPw2.Text = sqlDataQuery(8)
+ txbMesPw3.Text = sqlDataQuery(9)
- If DBQueryReader(DBCmd) Then
- txbPDSN.Text = sqlDataQuery(0)
- txbPDCP.Text = sqlDataQuery(1)
- txbPDSerial.Text = sqlDataQuery(2)
- txbPDModel.Text = sqlDataQuery(3)
- txbPDType.Text = sqlDataQuery(4)
- txbPDCC.Text = sqlDataQuery(5)
- txbPDAC.Text = sqlDataQuery(6)
- txbMesPw.Text = sqlDataQuery(7)
- txbPDSC.Text = sqlDataQuery(8)
- txbPDMotor.Text = sqlDataQuery(9)
- txbTDSN.Text = sqlDataQuery(10)
- txbMesFreq.Text = sqlDataQuery(11)
- txbMesDate.Text = sqlDataQuery(12)
+ txbPDSC.Text = sqlDataQuery(10)
+ txbPDMotor.Text = sqlDataQuery(11)
+ txbTDSN.Text = sqlDataQuery(12)
- Return True
+ txbMesFreq.Text = sqlDataQuery(13)
+ txbMesFreq2.Text = sqlDataQuery(14)
+ txbMesFreq3.Text = sqlDataQuery(15)
+ txbMesDate.Text = sqlDataQuery(16)
+
+ Return True
+ Else
+ Return False
+ End If
Else
- Return False
+ DBCmd = "Select Product_SN,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Power,Ct_Max_ShotCnt,Ct_Motor_Lv,PV_SN,Ct_Frequency,IFNULL(Manufacture_Date,'') as Manufacture_Date FROM " & UseCartridgeTbl & " WHERE PV_SN = '" & txbLoadNum.Text & "' Limit 1"
+ If DBQueryReader(DBCmd) Then
+ txbPDSN.Text = sqlDataQuery(0)
+ txbPDCP.Text = sqlDataQuery(1)
+ txbPDSerial.Text = sqlDataQuery(2)
+ txbPDModel.Text = sqlDataQuery(3)
+ txbPDType.Text = sqlDataQuery(4)
+ txbPDCC.Text = sqlDataQuery(5)
+ txbPDAC.Text = sqlDataQuery(6)
+ txbMesPw.Text = sqlDataQuery(7)
+ txbPDSC.Text = sqlDataQuery(8)
+ txbPDMotor.Text = sqlDataQuery(9)
+ txbTDSN.Text = sqlDataQuery(10)
+ txbMesFreq.Text = sqlDataQuery(11)
+ txbMesDate.Text = sqlDataQuery(12)
+ txbMesFreq2.Text = "-"
+ txbMesFreq3.Text = "-"
+ txbMesPw2.Text = "-"
+ txbMesPw3.Text = "-"
+ Return True
+ Else
+ Return False
+ End If
End If
+
End Function
Private Sub NonTD_Search()
@@ -3944,6 +4289,10 @@ End_Finish:
txbPDMotor.Text = ""
txbTDSN.Text = sqlDataQuery(7)
txbMesFreq.Text = ""
+ txbMesFreq2.Text = ""
+ txbMesFreq3.Text = ""
+ txbMesPw2.Text = ""
+ txbMesPw3.Text = ""
txbMesDate.Text = sqlDataQuery(8)
Else
@@ -3952,26 +4301,61 @@ End_Finish:
End Sub
Private Function Product_Search() As Boolean
- Dim DBCmd As String = "SELECT Product_SN,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Power,Ct_Remain_ShotCnt,Ct_Motor_Lv,PV_SN,Ct_Frequency,IFNULL(Manufacture_Date,'') as Manufacture_Date FROM " & UseCartridgeTbl & " WHERE Product_SN = '" & txbLoadNum.Text & "' Limit 1"
+ If SelectedModelInfo.LdmUseYn = "Y" Then
+ DBCmd = "Select Product_SN,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Power,Ct_Power2,Ct_Power3,Ct_Max_ShotCnt,Ct_Motor_Lv,PV_SN,Ct_Frequency,Ct_Frequency2,Ct_Frequency3,IFNULL(Manufacture_Date,'') as Manufacture_Date FROM " & UseLDMCartridgeTbl & " WHERE Product_SN = '" & txbLoadNum.Text & "' Limit 1"
+ If DBQueryReader(DBCmd) Then
+ txbPDSN.Text = sqlDataQuery(0)
+ txbPDCP.Text = sqlDataQuery(1)
+ txbPDSerial.Text = sqlDataQuery(2)
+ txbPDModel.Text = sqlDataQuery(3)
+ txbPDType.Text = sqlDataQuery(4)
+ txbPDCC.Text = sqlDataQuery(5)
+ txbPDAC.Text = sqlDataQuery(6)
+ txbMesPw.Text = sqlDataQuery(7)
+ txbMesPw2.Text = sqlDataQuery(8)
+ txbMesPw3.Text = sqlDataQuery(9)
- If DBQueryReader(DBCmd) Then
- txbPDSN.Text = sqlDataQuery(0)
- txbPDCP.Text = sqlDataQuery(1)
- txbPDSerial.Text = sqlDataQuery(2)
- txbPDModel.Text = sqlDataQuery(3)
- txbPDType.Text = sqlDataQuery(4)
- txbPDCC.Text = sqlDataQuery(5)
- txbPDAC.Text = sqlDataQuery(6)
- txbMesPw.Text = sqlDataQuery(7)
- txbPDSC.Text = sqlDataQuery(8)
- txbPDMotor.Text = sqlDataQuery(9)
- txbTDSN.Text = sqlDataQuery(10)
- txbMesFreq.Text = sqlDataQuery(11)
- txbMesDate.Text = sqlDataQuery(12)
+ txbPDSC.Text = sqlDataQuery(10)
+ txbPDMotor.Text = sqlDataQuery(11)
+ txbTDSN.Text = sqlDataQuery(12)
- Return True
+ txbMesFreq.Text = sqlDataQuery(13)
+ txbMesFreq2.Text = sqlDataQuery(14)
+ txbMesFreq3.Text = sqlDataQuery(15)
+
+ txbMesDate.Text = sqlDataQuery(16)
+
+ Return True
+ Else
+ Return False
+ End If
Else
- Return False
+
+ DBCmd = "SELECT Product_SN,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Power,Ct_Remain_ShotCnt,Ct_Motor_Lv,PV_SN,Ct_Frequency,IFNULL(Manufacture_Date,'') as Manufacture_Date FROM " & UseCartridgeTbl & " WHERE Product_SN = '" & txbLoadNum.Text & "' Limit 1"
+
+ If DBQueryReader(DBCmd) Then
+ txbPDSN.Text = sqlDataQuery(0)
+ txbPDCP.Text = sqlDataQuery(1)
+ txbPDSerial.Text = sqlDataQuery(2)
+ txbPDModel.Text = sqlDataQuery(3)
+ txbPDType.Text = sqlDataQuery(4)
+ txbPDCC.Text = sqlDataQuery(5)
+ txbPDAC.Text = sqlDataQuery(6)
+ txbMesPw.Text = sqlDataQuery(7)
+ txbPDSC.Text = sqlDataQuery(8)
+ txbPDMotor.Text = sqlDataQuery(9)
+ txbTDSN.Text = sqlDataQuery(10)
+ txbMesFreq.Text = sqlDataQuery(11)
+ txbMesDate.Text = sqlDataQuery(12)
+ txbMesFreq2.Text = "-"
+ txbMesPw2.Text = "-"
+ txbMesFreq3.Text = "-"
+ txbMesPw3.Text = "-"
+
+ Return True
+ Else
+ Return False
+ End If
End If
End Function
@@ -3991,6 +4375,10 @@ End_Finish:
txbPDMotor.Text = ""
txbTDSN.Text = sqlDataQuery(7)
txbMesFreq.Text = ""
+ txbMesFreq2.Text = ""
+ txbMesFreq3.Text = ""
+ txbMesPw2.Text = ""
+ txbMesPw3.Text = ""
txbMesDate.Text = sqlDataQuery(8)
Else
@@ -4011,6 +4399,12 @@ End_Finish:
txbPDMotor.Text = "-"
txbTDSN.Text = "-"
txbMesFreq.Text = "-"
+ txbMesFreq2.Text = "-"
+ txbMesFreq3.Text = "-"
+ txbMesPw.Text = "-"
+ txbMesPw2.Text = "-"
+ txbMesPw3.Text = "-"
+ txbMesDate.Text = "-"
txbMesDate.Text = "-"
End Sub
diff --git a/Product_Manager/MySqlMoudule.vb b/Product_Manager/MySqlMoudule.vb
index 7a4d97a..2633a4e 100644
--- a/Product_Manager/MySqlMoudule.vb
+++ b/Product_Manager/MySqlMoudule.vb
@@ -3,12 +3,14 @@
Module MySqlMoudule
Private Const CartridgeTbl As String = "jomtTesterDB.jomtCartridgeTbl"
Private Const CartridgeTblTest As String = "jomtTesterServerDB.jomtCartridgeTbl"
-
+ Private Const LdmCartridgeTbl As String = "jomtTesterDB.jomtLDMTbl"
+ Private Const LdmCartridgeTblTest As String = "jomtTesterServerDB.jomtLDMTbl"
Private Const mainModelInfoDB As String = "jomtTesterDB.jomtModelInfoTbl"
Private Const testModelInfoDB As String = "jomtTesterServerDB.jomtModelInfoTbl"
Public UseCartridgeTbl As String = CartridgeTbl
Public ApplyModelInfoDB As String = mainModelInfoDB
+ Public UseLDMCartridgeTbl As String = LdmCartridgeTbl
Public Const NonCartridgeTbl As String = "jomtTesterDB.jomtNonTDTbl"
@@ -26,7 +28,7 @@ Module MySqlMoudule
Public sqlDataQuery() As Object
- Public Const CartDB As String = "jomtTesterDB.jomtCartridgeTbl"
+ ''Public Const CartDB As String = "jomtTesterDB.jomtCartridgeTbl"
Private Function DBOpen() As Boolean
Try
diff --git a/Product_Manager/SerialPortMoudule.vb b/Product_Manager/SerialPortMoudule.vb
index 4bf707d..edc6ce0 100644
--- a/Product_Manager/SerialPortMoudule.vb
+++ b/Product_Manager/SerialPortMoudule.vb
@@ -262,6 +262,13 @@ Module SerialPortMoudule
cmdStr = cmdVal(1) & "," & cmdVal(2) & "," & cmdVal(3) & "," & cmdVal(4) & "," & cmdVal(5)
Return cmdStr
+ ''ldm
+ Case "setldmsn"
+ cmdStr = cmdVal(1)
+ Return cmdStr
+ Case "setldmcnf"
+ cmdStr = cmdVal(1) & "," & cmdVal(2) & "," & cmdVal(3) & "," & cmdVal(4) & "," & cmdVal(5) & "," & cmdVal(6)
+ Return cmdStr
End Select
End If