20210205更新

TENDEN-MES-SYS/Module/全域變數.vb

@@ -4,7 +4,7 @@
     Public Target As String : Public Target1 As String : Public Target2 As String : Public FTP帳號 As String : Public FTP密碼 As String : Public 登入人IP As String
     Public CC(99) As Boolean : Public AA(99) As String : Public 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2021011901"
+    Public 版本 As String = "2021012901"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
 

TENDEN-MES-SYS/圖片資料庫管理/驗貨報告圖片導入資料庫.Designer.vb

@@ -24,7 +24,7 @@ Partial Class 驗貨報告圖片導入資料庫
     Private  Sub InitializeComponent()
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.WebBrowser1 = New System.Windows.Forms.WebBrowser()
-        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
+        Me.訂單清單_dgv = New System.Windows.Forms.DataGridView()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
@@ -47,7 +47,9 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.Label8 = New System.Windows.Forms.Label()
         Me.TextBox5 = New System.Windows.Forms.TextBox()
         Me.Label10 = New System.Windows.Forms.Label()
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'WebBrowser1
@@ -59,18 +61,18 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.WebBrowser1.TabIndex = 521
         Me.WebBrowser1.Url = New System.Uri("", System.UriKind.Relative)
         '
-        'DataGridView1
+        '訂單清單_dgv
         '
         DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
-        Me.DataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.DataGridView1.Location = New System.Drawing.Point(990, 6)
-        Me.DataGridView1.Name = "DataGridView1"
-        Me.DataGridView1.RowHeadersWidth = 5
-        Me.DataGridView1.RowTemplate.Height = 24
-        Me.DataGridView1.Size = New System.Drawing.Size(915, 973)
-        Me.DataGridView1.TabIndex = 522
+        Me.訂單清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.訂單清單_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.訂單清單_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.訂單清單_dgv.Location = New System.Drawing.Point(990, 6)
+        Me.訂單清單_dgv.Name = "訂單清單_dgv"
+        Me.訂單清單_dgv.RowHeadersWidth = 5
+        Me.訂單清單_dgv.RowTemplate.Height = 24
+        Me.訂單清單_dgv.Size = New System.Drawing.Size(915, 973)
+        Me.訂單清單_dgv.TabIndex = 522
         '
         'Label3
         '
@@ -109,9 +111,9 @@ Partial Class 驗貨報告圖片導入資料庫
         'Button31
         '
         Me.Button31.ForeColor = System.Drawing.Color.Black
-        Me.Button31.Location = New System.Drawing.Point(884, 6)
+        Me.Button31.Location = New System.Drawing.Point(835, 47)
         Me.Button31.Name = "Button31"
-        Me.Button31.Size = New System.Drawing.Size(100, 78)
+        Me.Button31.Size = New System.Drawing.Size(149, 35)
         Me.Button31.TabIndex = 532
         Me.Button31.Text = "查詢"
         Me.Button31.UseVisualStyleBackColor = True
@@ -139,7 +141,7 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         Me.Button11.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Button11.ForeColor = System.Drawing.Color.Blue
-        Me.Button11.Location = New System.Drawing.Point(616, 6)
+        Me.Button11.Location = New System.Drawing.Point(458, 6)
         Me.Button11.Name = "Button11"
         Me.Button11.Size = New System.Drawing.Size(107, 52)
         Me.Button11.TabIndex = 535
@@ -149,7 +151,7 @@ Partial Class 驗貨報告圖片導入資料庫
         'DateTimePicker1
         '
         Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.DateTimePicker1.Location = New System.Drawing.Point(520, 6)
+        Me.DateTimePicker1.Location = New System.Drawing.Point(362, 34)
         Me.DateTimePicker1.Name = "DateTimePicker1"
         Me.DateTimePicker1.Size = New System.Drawing.Size(90, 23)
         Me.DateTimePicker1.TabIndex = 536
@@ -157,7 +159,7 @@ Partial Class 驗貨報告圖片導入資料庫
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(458, 9)
+        Me.Label1.Location = New System.Drawing.Point(300, 37)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(56, 16)
         Me.Label1.TabIndex = 537
@@ -246,11 +248,11 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         Me.Label8.AutoSize = True
         Me.Label8.ForeColor = System.Drawing.Color.Red
-        Me.Label8.Location = New System.Drawing.Point(729, 6)
+        Me.Label8.Location = New System.Drawing.Point(571, 9)
         Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(140, 80)
+        Me.Label8.Size = New System.Drawing.Size(224, 48)
         Me.Label8.TabIndex = 570
-        Me.Label8.Text = "驗貨報告圖庫不提供修改" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "圖片功能，入圖時請小心" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "謹慎，如有需要修改驗貨" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "報告圖片請向單位主管提" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "出申請"
+        Me.Label8.Text = "驗貨報告圖庫不提供修改圖片功能，入圖" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "時請小心謹慎，如有需要修改驗貨報告圖" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "片請向單位主管提出申請"
         '
         'TextBox5
         '
@@ -269,11 +271,32 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.Label10.TabIndex = 571
         Me.Label10.Text = "天盾訂單號"
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(910, 6)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 35)
+        Me.資料庫選擇2_bt.TabIndex = 574
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(835, 6)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 35)
+        Me.資料庫選擇1_bt.TabIndex = 573
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
         '驗貨報告圖片導入資料庫
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1914, 991)
+        Me.Controls.Add(Me.資料庫選擇2_bt)
+        Me.Controls.Add(Me.資料庫選擇1_bt)
+        Me.Controls.Add(Me.Button31)
         Me.Controls.Add(Me.TextBox5)
         Me.Controls.Add(Me.Label10)
         Me.Controls.Add(Me.Label8)
@@ -288,12 +311,11 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.Controls.Add(Me.DateTimePicker1)
         Me.Controls.Add(Me.Button11)
         Me.Controls.Add(Me.TextBox4)
-        Me.Controls.Add(Me.Button31)
         Me.Controls.Add(Me.TextBox2)
         Me.Controls.Add(Me.TextBox1)
         Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.DataGridView1)
+        Me.Controls.Add(Me.訂單清單_dgv)
         Me.Controls.Add(Me.WebBrowser1)
         Me.Controls.Add(Me.Label7)
         Me.Controls.Add(Me.Label9)
@@ -301,14 +323,14 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "驗貨報告圖片導入資料庫"
         Me.Text = "驗貨報告圖片導入資料庫"
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents WebBrowser1 As WebBrowser
-    Friend WithEvents DataGridView1 As DataGridView
+    Friend WithEvents 訂單清單_dgv As DataGridView
     Friend WithEvents Label3 As Label
     Friend WithEvents Label2 As Label
     Friend WithEvents TextBox1 As TextBox
@@ -331,5 +353,7 @@ Partial Class 驗貨報告圖片導入資料庫
     Friend WithEvents Label8 As Label
     Friend WithEvents TextBox5 As TextBox
     Friend WithEvents Label10 As Label
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
 End Class
 

TENDEN-MES-SYS/圖片資料庫管理/驗貨報告圖片導入資料庫.vb

@@ -5,28 +5,29 @@ Public Class 驗貨報告圖片導入資料庫
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet
     Dim DTP As String
     Private  Sub Set_DGV1載入前設定()
-        DataGridView1.DataSource = Nothing : ds.Clear()
-        DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        DataGridView1.ColumnHeadersHeight = 25
-        DataGridView1.AllowUserToAddRows = False
+        訂單清單_dgv.DataSource = Nothing : ds.Clear()
+        訂單清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        訂單清單_dgv.ColumnHeadersHeight = 25
+        訂單清單_dgv.AllowUserToAddRows = False
         ConnOpen()
     End Sub
     Private  Sub Set_DGV1載入後設定()
-        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單清單_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private  Sub Set_清單1()
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片 FROM 訂單控制表 
+        SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片 FROM " & 訂單資料表(1) & " 
                 WHERE (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (驗貨時間 LIKE '') ORDER BY   SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
         Set_DGV1載入後設定()
     End Sub
     Private  Sub Set_grid1()
-        DataGridView1.Columns(0).FillWeight = 80 : DataGridView1.Columns(1).FillWeight = 70 : DataGridView1.Columns(2).FillWeight = 120 : DataGridView1.Columns(3).FillWeight = 140
-        DataGridView1.Columns(4).FillWeight = 100 : DataGridView1.Columns(5).FillWeight = 80 : DataGridView1.Columns(6).FillWeight = 100 : DataGridView1.Columns(7).FillWeight = 100
-        DataGridView1.Columns(8).FillWeight = 100 : DataGridView1.Columns(9).Visible = False : DataGridView1.Columns(10).Visible = False
+        訂單清單_dgv.Columns(0).FillWeight = 80 : 訂單清單_dgv.Columns(1).FillWeight = 70 : 訂單清單_dgv.Columns(2).FillWeight = 120 : 訂單清單_dgv.Columns(3).FillWeight = 140
+        訂單清單_dgv.Columns(4).FillWeight = 100 : 訂單清單_dgv.Columns(5).FillWeight = 80 : 訂單清單_dgv.Columns(6).FillWeight = 100 : 訂單清單_dgv.Columns(7).FillWeight = 100
+        訂單清單_dgv.Columns(8).FillWeight = 100 : 訂單清單_dgv.Columns(9).Visible = False : 訂單清單_dgv.Columns(10).Visible = False
     End Sub
-    Private  Sub 驗貨報告圖片導入資料庫_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+    Private Sub 驗貨報告圖片導入資料庫_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+        訂單資料庫選擇.ShowDialog()
         Target1 = Target & AA(3) & "/"
         WebBrowser1.Url = New Uri(Target1)
         Set_清單1() : Set_grid1()
@@ -35,16 +36,16 @@ Public Class 驗貨報告圖片導入資料庫
             WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath)
         End If
     End Sub
-    Private  Sub DataGridView1_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles DataGridView1.CellClick
+    Private  Sub DataGridView1_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 訂單清單_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            TextBox1.Text = DataGridView1("客戶訂單號", e.RowIndex).Value.ToString : TextBox2.Text = DataGridView1("形體號", e.RowIndex).Value.ToString
-            TextBox5.Text = DataGridView1("訂單流水號", e.RowIndex).Value.ToString
+            TextBox1.Text = 訂單清單_dgv("客戶訂單號", e.RowIndex).Value.ToString : TextBox2.Text = 訂單清單_dgv("形體號", e.RowIndex).Value.ToString
+            TextBox5.Text = 訂單清單_dgv("訂單流水號", e.RowIndex).Value.ToString
         End If
     End Sub
     Private  Sub Button31_Click(sender As Object, e As EventArgs) Handles Button31.Click
         PA = InputBox("請輸入要查詢的資料")
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片 FROM 訂單控制表 " &
+        SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                "WHERE (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (驗貨時間 LIKE '') AND (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR " &
                "客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%') ORDER BY   SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
         Set_DGV1載入後設定() : Set_grid1()
@@ -73,13 +74,19 @@ Public Class 驗貨報告圖片導入資料庫
             End If
 
             ConnOpen()
-            SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 驗貨報告) SELECT '" & TextBox1.Text & "','" & TextBox2.Text & "','" & TextBox3.Text & "','" & gUserName & "', " &
+            If Strings.Left(Target1, 18) = "ftp://106.1.50.79/" Then
+                SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 驗貨報告) SELECT '" & TextBox1.Text & "','" & TextBox2.Text & "','" & TextBox3.Text & "','" & gUserName & "', " &
+                       "BULKCOLUMN FROM OPENROWSET ( BULK 'C:\FTP\TENDENZA\0004\" & TextBox4.Text & "', SINGLE_BLOB) AS EMPLOYEEPICTURE"
+            Else
+                SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 驗貨報告) SELECT '" & TextBox1.Text & "','" & TextBox2.Text & "','" & TextBox3.Text & "','" & gUserName & "', " &
                        "BULKCOLUMN FROM OPENROWSET ( BULK 'E:\TENDENZA\0004\" & TextBox4.Text & "', SINGLE_BLOB) AS EMPLOYEEPICTURE"
+            End If
             CmdSet_For_dr() : conn.Close()
 
             DTP = Format(DateTimePicker1.Value, "yyyy/MM/dd")
+
             ConnOpen()
-            SQL1 = "UPDATE 訂單控制表 SET 驗貨時間 = '" & DTP & "', 驗貨報告圖片 = '" & TextBox3.Text & "' 
+            SQL1 = "UPDATE " & 訂單資料表(1) & " SET 驗貨時間 = '" & DTP & "', 驗貨報告圖片 = '" & TextBox3.Text & "' 
                         WHERE (訂單流水號 LIKE '" & TextBox5.Text & "' AND 客戶訂單號 = '" & TextBox1.Text & "' AND 形體號 = '" & TextBox2.Text & "')"
             cmd.CommandText = SQL1 : cmd.ExecuteNonQuery() : conn.Close()
             '---FTP方式刪除檔案----------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -139,9 +146,15 @@ Public Class 驗貨報告圖片導入資料庫
             TextBox4.AppendText(file + Environment.NewLine)
         Next
     End Sub
-    Private  Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
         If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then
             WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath)
         End If
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_清單1()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_清單1()
+    End Sub
 End Class

TENDEN-MES-SYS/圖片資料庫管理/驗貨報告資料庫.Designer.vb

@@ -51,6 +51,8 @@ Partial Class 驗貨報告資料庫
         Me.Button24 = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -59,12 +61,12 @@ Partial Class 驗貨報告資料庫
         '
         Me.DataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.DataGridView1.Location = New System.Drawing.Point(12, 13)
+        Me.DataGridView1.Location = New System.Drawing.Point(12, 42)
         Me.DataGridView1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.DataGridView1.Name = "DataGridView1"
         Me.DataGridView1.RowHeadersWidth = 5
         Me.DataGridView1.RowTemplate.Height = 24
-        Me.DataGridView1.Size = New System.Drawing.Size(615, 965)
+        Me.DataGridView1.Size = New System.Drawing.Size(615, 936)
         Me.DataGridView1.TabIndex = 4
         '
         'PictureBox1
@@ -323,11 +325,31 @@ Partial Class 驗貨報告資料庫
         Me.Label7.TabIndex = 584
         Me.Label7.Text = "↓"
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(552, 5)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 35)
+        Me.資料庫選擇2_bt.TabIndex = 587
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(477, 5)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 35)
+        Me.資料庫選擇1_bt.TabIndex = 586
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
         '驗貨報告資料庫
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1914, 991)
+        Me.Controls.Add(Me.資料庫選擇2_bt)
+        Me.Controls.Add(Me.資料庫選擇1_bt)
         Me.Controls.Add(Me.Label10)
         Me.Controls.Add(Me.Label6)
         Me.Controls.Add(Me.TextBox7)
@@ -395,4 +417,6 @@ Partial Class 驗貨報告資料庫
     Friend WithEvents Button24 As Button
     Friend WithEvents Label7 As Label
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
 End Class

TENDEN-MES-SYS/圖片資料庫管理/驗貨報告資料庫.vb

@@ -25,9 +25,10 @@ Public Class 驗貨報告資料庫
     End Sub
     Private  Sub Set_圖片清單()
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.年份季度, 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, 訂單控制表.顏色,  驗貨報告圖庫.驗貨報告編號 " &
-               "FROM 驗貨報告圖庫 LEFT OUTER JOIN 訂單控制表 ON 驗貨報告圖庫.客戶訂單號 = 訂單控制表.客戶訂單號 GROUP BY   訂單控制表.訂單流水號, 訂單控制表.年份季度, " &
-               "驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, 訂單控制表.顏色, 驗貨報告圖庫.驗貨報告編號 ORDER BY 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱"
+        SQL1 = "SELECT     " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, " & 訂單資料表(1) & ".顏色,  驗貨報告圖庫.驗貨報告編號 
+                FROM       驗貨報告圖庫 INNER JOIN " & 訂單資料表(1) & " ON 驗貨報告圖庫.客戶訂單號 = " & 訂單資料表(1) & ".客戶訂單號 
+                GROUP BY   " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, " & 訂單資料表(1) & ".顏色, 驗貨報告圖庫.驗貨報告編號 
+                ORDER BY   驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱"
         Set_DGV1載入後設定()
     End Sub
     Private  Sub Set_grid()
@@ -36,6 +37,7 @@ Public Class 驗貨報告資料庫
     End Sub
     Private  Sub 驗貨報告資料庫_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+        訂單資料庫選擇.ShowDialog()
         Target1 = Target & AA(3) & "/"
         WebBrowser1.Url = New Uri(Target1)
         TextBox1.Enabled = False : TextBox2.Enabled = False : TextBox3.Enabled = False : TextBox4.Enabled = False : TextBox5.Visible = False : TextBox7.Visible = False : Button24.Enabled = False
@@ -81,10 +83,12 @@ Public Class 驗貨報告資料庫
     Private  Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
         PA = InputBox("請輸入關鍵字")
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.年份季度, 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, 訂單控制表.顏色,  驗貨報告圖庫.驗貨報告編號 " &
-               "FROM 驗貨報告圖庫 LEFT OUTER JOIN 訂單控制表 ON 驗貨報告圖庫.客戶訂單號 = 訂單控制表.客戶訂單號 WHERE 訂單控制表.訂單流水號 LIKE '%" & PA & "%' OR " &
-               "訂單控制表.年份季度 LIKE '%" & PA & "%' OR 驗貨報告圖庫.客戶訂單號 LIKE '%" & PA & "%' OR 驗貨報告圖庫.型體名稱 LIKE '%" & PA & "%' GROUP BY 訂單控制表.訂單流水號, 訂單控制表.年份季度, " &
-               "驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, 訂單控制表.顏色, 驗貨報告圖庫.驗貨報告編號 ORDER BY 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱"
+        SQL1 = "SELECT   " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, " & 訂單資料表(1) & ".顏色,  驗貨報告圖庫.驗貨報告編號 
+                FROM     驗貨報告圖庫 LEFT OUTER JOIN " & 訂單資料表(1) & " ON 驗貨報告圖庫.客戶訂單號 = " & 訂單資料表(1) & ".客戶訂單號 
+                WHERE    " & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%' OR " &
+                         "" & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%' OR 驗貨報告圖庫.客戶訂單號 LIKE '%" & PA & "%' OR 驗貨報告圖庫.型體名稱 LIKE '%" & PA & "%' 
+                GROUP BY " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱, " & 訂單資料表(1) & ".顏色, 驗貨報告圖庫.驗貨報告編號 
+                ORDER BY 驗貨報告圖庫.客戶訂單號, 驗貨報告圖庫.型體名稱"
         Set_DGV1載入後設定() : Set_grid()
     End Sub
     Private  Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
@@ -204,7 +208,7 @@ Public Class 驗貨報告資料庫
             TextBox6.AppendText(file + Environment.NewLine)
         Next
     End Sub
-    Private  Sub Button24_Click(sender As Object, e As EventArgs) Handles Button24.Click
+    Private Sub Button24_Click(sender As Object, e As EventArgs) Handles Button24.Click
         conn.Close()
         If TextBox1.Text = "" Then
             MsgBox("請先選擇需要修改的圖片")
@@ -234,4 +238,10 @@ Public Class 驗貨報告資料庫
             End If
         End If
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_圖片清單()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_圖片清單()
+    End Sub
 End Class