2020110201備份

Signed-off-by: B70340 <b70340@gmail.com>

TENDEN-MES-SYS/Module/SQL_量產訂單資料庫切換.vb

@@ -7,6 +7,7 @@
         訂單資料表(4) = "訂單流水號暫存"
         訂單資料表(5) = "訂單明細表"
         訂單資料表(6) = "訂單明細表"
+        訂單資料表(7) = "訂單價格利潤明細表"
     End Sub
     Friend Sub SQL_訂單資料表選擇_非VIONIC()
         訂單資料表(0) = "訂單明細表抬頭_非VIONIC"
@@ -16,5 +17,6 @@
         訂單資料表(4) = "訂單流水號暫存_非VIONIC"
         訂單資料表(5) = "訂單明細表_非VIONIC"
         訂單資料表(6) = "訂單明細表_非VIONIC"
+        訂單資料表(7) = "訂單價格利潤明細表_非VIONIC"
     End Sub
 End Module

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 = "2020102801"
+    Public 版本 As String = "2020110201"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
 

TENDEN-MES-SYS/TENDEN_MES_SYS.Designer.vb

@@ -109,6 +109,8 @@ Partial Class TENDEN_MES_SYS
         Me.測試報告控制表_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.訂單資料匯入_tsm = New System.Windows.Forms.ToolStripMenuItem()
+        Me.訂單資料匯入力威_tsm = New System.Windows.Forms.ToolStripMenuItem()
+        Me.訂單資料比對與修改力威_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.成本管理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.成本資料庫管理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator19 = New System.Windows.Forms.ToolStripSeparator()
@@ -137,7 +139,6 @@ Partial Class TENDEN_MES_SYS
         Me.FTP資料夾管理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.系統執行檔版本管理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator()
-        Me.訂單資料匯入力威_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.MenuStrip.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -152,13 +153,13 @@ Partial Class TENDEN_MES_SYS
         'ToolStripMenuItem1
         '
         Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(122, 22)
         Me.ToolStripMenuItem1.Text = "帳號管理"
         '
         'ExitToolStripMenuItem
         '
         Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem"
-        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(122, 22)
         Me.ExitToolStripMenuItem.Text = "結束(&X)"
         '
         'WindowsMenu
@@ -171,37 +172,37 @@ Partial Class TENDEN_MES_SYS
         'NewWindowToolStripMenuItem
         '
         Me.NewWindowToolStripMenuItem.Name = "NewWindowToolStripMenuItem"
-        Me.NewWindowToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.NewWindowToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
         Me.NewWindowToolStripMenuItem.Text = "開新視窗(&N)"
         '
         'CascadeToolStripMenuItem
         '
         Me.CascadeToolStripMenuItem.Name = "CascadeToolStripMenuItem"
-        Me.CascadeToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.CascadeToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
         Me.CascadeToolStripMenuItem.Text = "重疊顯示(&C)"
         '
         'TileVerticalToolStripMenuItem
         '
         Me.TileVerticalToolStripMenuItem.Name = "TileVerticalToolStripMenuItem"
-        Me.TileVerticalToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.TileVerticalToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
         Me.TileVerticalToolStripMenuItem.Text = "垂直並排(&V)"
         '
         'TileHorizontalToolStripMenuItem
         '
         Me.TileHorizontalToolStripMenuItem.Name = "TileHorizontalToolStripMenuItem"
-        Me.TileHorizontalToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.TileHorizontalToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
         Me.TileHorizontalToolStripMenuItem.Text = "水平並排(&H)"
         '
         'CloseAllToolStripMenuItem
         '
         Me.CloseAllToolStripMenuItem.Name = "CloseAllToolStripMenuItem"
-        Me.CloseAllToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.CloseAllToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
         Me.CloseAllToolStripMenuItem.Text = "全部關閉(&L)"
         '
         'ArrangeIconsToolStripMenuItem
         '
         Me.ArrangeIconsToolStripMenuItem.Name = "ArrangeIconsToolStripMenuItem"
-        Me.ArrangeIconsToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ArrangeIconsToolStripMenuItem.Size = New System.Drawing.Size(140, 22)
         Me.ArrangeIconsToolStripMenuItem.Text = "排列圖示(&A)"
         '
         'MenuStrip
@@ -525,7 +526,7 @@ Partial Class TENDEN_MES_SYS
         '
         '量產訂單管理_tsm
         '
-        Me.量產訂單管理_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.業務資料庫管理_tsm, Me.ToolStripSeparator5, Me.CXL清單_tsm, Me.訂單改量差異查詢_tsm, Me.出貨明細表_tsm, Me.周進度表_tsm, Me.周進度表T1_tsm, Me.生產進度表_tsm, Me.ToolStripSeparator1, Me.訂單控制表_tsm, Me.訂單明細表_tsm, Me.皮料資料紀錄表_tsm, Me.訂單執行資訊輸入_tsm, Me.ToolStripSeparator16, Me.鞋盒資料控制表_tsm, Me.現有訂單鞋盒資訊查詢_tsm, Me.鞋盒訂單紀錄表_tsm, Me.ToolStripSeparator3, Me.TENDENZASTYLE_tsm, Me.TENDENZASTYLE形體下單數量統計_tsm, Me.DELIVERYADDRESS_tsm, Me.Factory資料管理_tsm, Me.ToolStripSeparator8, Me.測試報告新配色管理_tsm, Me.測試報告_tsm, Me.測試報告控制表_tsm, Me.ToolStripSeparator4, Me.訂單資料匯入_tsm, Me.訂單資料匯入力威_tsm})
+        Me.量產訂單管理_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.業務資料庫管理_tsm, Me.ToolStripSeparator5, Me.CXL清單_tsm, Me.訂單改量差異查詢_tsm, Me.出貨明細表_tsm, Me.周進度表_tsm, Me.周進度表T1_tsm, Me.生產進度表_tsm, Me.ToolStripSeparator1, Me.訂單控制表_tsm, Me.訂單明細表_tsm, Me.皮料資料紀錄表_tsm, Me.訂單執行資訊輸入_tsm, Me.ToolStripSeparator16, Me.鞋盒資料控制表_tsm, Me.現有訂單鞋盒資訊查詢_tsm, Me.鞋盒訂單紀錄表_tsm, Me.ToolStripSeparator3, Me.TENDENZASTYLE_tsm, Me.TENDENZASTYLE形體下單數量統計_tsm, Me.DELIVERYADDRESS_tsm, Me.Factory資料管理_tsm, Me.ToolStripSeparator8, Me.測試報告新配色管理_tsm, Me.測試報告_tsm, Me.測試報告控制表_tsm, Me.ToolStripSeparator4, Me.訂單資料匯入_tsm, Me.訂單資料匯入力威_tsm, Me.訂單資料比對與修改力威_tsm})
         Me.量產訂單管理_tsm.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.量產訂單管理_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.Shipping5
         Me.量產訂單管理_tsm.Name = "量產訂單管理_tsm"
@@ -738,6 +739,22 @@ Partial Class TENDEN_MES_SYS
         Me.訂單資料匯入_tsm.Size = New System.Drawing.Size(275, 22)
         Me.訂單資料匯入_tsm.Text = "訂單資料匯入-Vionic"
         '
+        '訂單資料匯入力威_tsm
+        '
+        Me.訂單資料匯入力威_tsm.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.訂單資料匯入力威_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.import
+        Me.訂單資料匯入力威_tsm.Name = "訂單資料匯入力威_tsm"
+        Me.訂單資料匯入力威_tsm.Size = New System.Drawing.Size(275, 22)
+        Me.訂單資料匯入力威_tsm.Text = "訂單資料匯入-力威"
+        '
+        '訂單資料比對與修改力威_tsm
+        '
+        Me.訂單資料比對與修改力威_tsm.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.訂單資料比對與修改力威_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.import
+        Me.訂單資料比對與修改力威_tsm.Name = "訂單資料比對與修改力威_tsm"
+        Me.訂單資料比對與修改力威_tsm.Size = New System.Drawing.Size(275, 22)
+        Me.訂單資料比對與修改力威_tsm.Text = "訂單資料比對與修改-力威"
+        '
         '成本管理_tsm
         '
         Me.成本管理_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.成本資料庫管理_tsm, Me.ToolStripSeparator19, Me.訂單價格利潤明細表_tsm, Me.貨款匯入出款明細表_tsm})
@@ -866,20 +883,20 @@ Partial Class TENDEN_MES_SYS
         Me.帳務資料庫管理_tsm.ForeColor = System.Drawing.Color.Olive
         Me.帳務資料庫管理_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.Sys_Command
         Me.帳務資料庫管理_tsm.Name = "帳務資料庫管理_tsm"
-        Me.帳務資料庫管理_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.帳務資料庫管理_tsm.Size = New System.Drawing.Size(170, 22)
         Me.帳務資料庫管理_tsm.Text = "財務資料庫管理"
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(167, 6)
         '
         '收款報表_tsm
         '
         Me.收款報表_tsm.ForeColor = System.Drawing.Color.Olive
         Me.收款報表_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.tests
         Me.收款報表_tsm.Name = "收款報表_tsm"
-        Me.收款報表_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.收款報表_tsm.Size = New System.Drawing.Size(170, 22)
         Me.收款報表_tsm.Text = "收款報表"
         '
         '收款報表批量輸入_tsm
@@ -887,20 +904,20 @@ Partial Class TENDEN_MES_SYS
         Me.收款報表批量輸入_tsm.ForeColor = System.Drawing.Color.Olive
         Me.收款報表批量輸入_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.tests
         Me.收款報表批量輸入_tsm.Name = "收款報表批量輸入_tsm"
-        Me.收款報表批量輸入_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.收款報表批量輸入_tsm.Size = New System.Drawing.Size(170, 22)
         Me.收款報表批量輸入_tsm.Text = "收款報表批量輸入"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(167, 6)
         '
         '費用報表_tsm
         '
         Me.費用報表_tsm.ForeColor = System.Drawing.Color.Olive
         Me.費用報表_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.tests
         Me.費用報表_tsm.Name = "費用報表_tsm"
-        Me.費用報表_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.費用報表_tsm.Size = New System.Drawing.Size(170, 22)
         Me.費用報表_tsm.Text = "費用報表"
         '
         '系統管理_tsm
@@ -946,14 +963,6 @@ Partial Class TENDEN_MES_SYS
         Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
         Me.ToolStripSeparator23.Size = New System.Drawing.Size(179, 6)
         '
-        '訂單資料匯入力威_tsm
-        '
-        Me.訂單資料匯入力威_tsm.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.訂單資料匯入力威_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.import
-        Me.訂單資料匯入力威_tsm.Name = "訂單資料匯入力威_tsm"
-        Me.訂單資料匯入力威_tsm.Size = New System.Drawing.Size(275, 22)
-        Me.訂單資料匯入力威_tsm.Text = "訂單資料匯入-力威"
-        '
         'TENDEN_MES_SYS
         '
         Me.AllowDrop = True
@@ -1090,4 +1099,5 @@ Partial Class TENDEN_MES_SYS
     Friend WithEvents 訂單改量差異查詢_tsm As ToolStripMenuItem
     Friend WithEvents ProductSalesProfitAnalysisTable_tsm As ToolStripMenuItem
     Friend WithEvents 訂單資料匯入力威_tsm As ToolStripMenuItem
+    Friend WithEvents 訂單資料比對與修改力威_tsm As ToolStripMenuItem
 End Class

TENDEN-MES-SYS/TENDEN_MES_SYS.vb

@@ -292,4 +292,7 @@
     Private Sub 訂單資料匯入力威_tsm_Click(sender As Object, e As EventArgs) Handles 訂單資料匯入力威_tsm.Click
         PA = "" : 訂單資料匯入_力威.Show() : 訂單資料匯入_力威.BringToFront()
     End Sub
+    Private Sub 訂單資料比對與修改力威_tsm_Click(sender As Object, e As EventArgs) Handles 訂單資料比對與修改力威_tsm.Click
+        PA = "" : 訂單資料比對與修改_力威.Show() : 訂單資料比對與修改_力威.BringToFront()
+    End Sub
 End Class

TENDEN-MES-SYS/obj/Debug/天盾系統.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-558e57554a75f0158ef4fac2abce24af2465e6c7
+16185a3f75c474b333fac30eab4d1373e2459acf

TENDEN-MES-SYS/obj/Debug/天盾系統.vbproj.FileListAbsolute.txt

@@ -193,7 +193,6 @@ G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表六.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表四.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單列印選擇.resources
-G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單控制表.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單控制表修改紀錄.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單明細表.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單明細表修改紀錄.resources
@@ -225,3 +224,5 @@ G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_訂
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料匯入_力威.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料匯入_Vionic.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料庫選擇.resources
+G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單控制表.resources
+G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料比對與修改_力威.resources

TENDEN-MES-SYS/天盾系統.vbproj

@@ -664,6 +664,12 @@
     <Compile Include="量產訂單管理\訂單資料庫選擇.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="量產訂單管理\訂單資料比對與修改_力威.Designer.vb">
+      <DependentUpon>訂單資料比對與修改_力威.vb</DependentUpon>
+    </Compile>
+    <Compile Include="量產訂單管理\訂單資料比對與修改_力威.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="量產訂單管理\鞋盒訂單紀錄表.Designer.vb">
       <DependentUpon>鞋盒訂單紀錄表.vb</DependentUpon>
     </Compile>
@@ -981,6 +987,9 @@
     <EmbeddedResource Include="量產訂單管理\訂單資料庫選擇.resx">
       <DependentUpon>訂單資料庫選擇.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="量產訂單管理\訂單資料比對與修改_力威.resx">
+      <DependentUpon>訂單資料比對與修改_力威.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="量產訂單管理\鞋盒訂單紀錄表.resx">
       <DependentUpon>鞋盒訂單紀錄表.vb</DependentUpon>
     </EmbeddedResource>

TENDEN-MES-SYS/成本系統管理/訂單價格利潤明細表.Designer.vb

@@ -26,6 +26,7 @@ Partial Class 訂單價格利潤明細表
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
         Me.Button35 = New System.Windows.Forms.Button()
         Me.Button34 = New System.Windows.Forms.Button()
@@ -87,8 +88,18 @@ Partial Class 訂單價格利潤明細表
         Me.TextBox18 = New System.Windows.Forms.TextBox()
         Me.Label18 = New System.Windows.Forms.Label()
         Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.Label19 = New System.Windows.Forms.Label()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DataGridView2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GroupBox1.SuspendLayout()
+        Me.GroupBox2.SuspendLayout()
+        Me.GroupBox3.SuspendLayout()
         Me.SuspendLayout()
         '
         'DataGridView1
@@ -102,17 +113,19 @@ Partial Class 訂單價格利潤明細表
         DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.DataGridView1.Location = New System.Drawing.Point(6, 149)
+        Me.DataGridView1.Location = New System.Drawing.Point(114, 164)
         Me.DataGridView1.Name = "DataGridView1"
         Me.DataGridView1.RowHeadersWidth = 5
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.DataGridView1.RowsDefaultCellStyle = DataGridViewCellStyle2
         Me.DataGridView1.RowTemplate.Height = 24
-        Me.DataGridView1.Size = New System.Drawing.Size(1896, 830)
+        Me.DataGridView1.Size = New System.Drawing.Size(1792, 820)
         Me.DataGridView1.TabIndex = 2
         '
         'Button35
         '
         Me.Button35.ForeColor = System.Drawing.Color.Red
-        Me.Button35.Location = New System.Drawing.Point(228, 67)
+        Me.Button35.Location = New System.Drawing.Point(107, 79)
         Me.Button35.Name = "Button35"
         Me.Button35.Size = New System.Drawing.Size(95, 35)
         Me.Button35.TabIndex = 335
@@ -122,7 +135,7 @@ Partial Class 訂單價格利潤明細表
         'Button34
         '
         Me.Button34.ForeColor = System.Drawing.Color.Red
-        Me.Button34.Location = New System.Drawing.Point(127, 67)
+        Me.Button34.Location = New System.Drawing.Point(6, 79)
         Me.Button34.Name = "Button34"
         Me.Button34.Size = New System.Drawing.Size(95, 35)
         Me.Button34.TabIndex = 334
@@ -131,22 +144,22 @@ Partial Class 訂單價格利潤明細表
         '
         'DataGridView2
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.DataGridView2.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.DataGridView2.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView2.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.DataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView2.Location = New System.Drawing.Point(6, 24)
         Me.DataGridView2.Name = "DataGridView2"
         Me.DataGridView2.RowHeadersWidth = 5
         Me.DataGridView2.RowTemplate.Height = 24
-        Me.DataGridView2.Size = New System.Drawing.Size(115, 119)
+        Me.DataGridView2.Size = New System.Drawing.Size(102, 960)
         Me.DataGridView2.TabIndex = 336
         '
         'Label1
@@ -154,13 +167,13 @@ Partial Class 訂單價格利潤明細表
         Me.Label1.AutoSize = True
         Me.Label1.Location = New System.Drawing.Point(13, 5)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(104, 16)
+        Me.Label1.Size = New System.Drawing.Size(68, 16)
         Me.Label1.TabIndex = 337
-        Me.Label1.Text = "未完成流水號清單"
+        Me.Label1.Text = "未指定單價"
         '
         'TextBox1
         '
-        Me.TextBox1.Location = New System.Drawing.Point(1299, 31)
+        Me.TextBox1.Location = New System.Drawing.Point(80, 41)
         Me.TextBox1.Name = "TextBox1"
         Me.TextBox1.Size = New System.Drawing.Size(136, 23)
         Me.TextBox1.TabIndex = 338
@@ -168,7 +181,7 @@ Partial Class 訂單價格利潤明細表
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(1225, 34)
+        Me.Label2.Location = New System.Drawing.Point(6, 44)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(68, 16)
         Me.Label2.TabIndex = 339
@@ -176,7 +189,7 @@ Partial Class 訂單價格利潤明細表
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(430, 7)
+        Me.Button1.Location = New System.Drawing.Point(309, 19)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(95, 52)
         Me.Button1.TabIndex = 340
@@ -185,7 +198,7 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox2
         '
-        Me.TextBox2.Location = New System.Drawing.Point(599, 120)
+        Me.TextBox2.Location = New System.Drawing.Point(599, 138)
         Me.TextBox2.Name = "TextBox2"
         Me.TextBox2.Size = New System.Drawing.Size(107, 23)
         Me.TextBox2.TabIndex = 341
@@ -194,7 +207,7 @@ Partial Class 訂單價格利潤明細表
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(662, 101)
+        Me.Label3.Location = New System.Drawing.Point(662, 119)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(44, 16)
         Me.Label3.TabIndex = 342
@@ -203,7 +216,7 @@ Partial Class 訂單價格利潤明細表
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(1202, 85)
+        Me.Label4.Location = New System.Drawing.Point(1187, 104)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(37, 32)
         Me.Label4.TabIndex = 344
@@ -211,7 +224,7 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox3
         '
-        Me.TextBox3.Location = New System.Drawing.Point(1099, 120)
+        Me.TextBox3.Location = New System.Drawing.Point(1099, 138)
         Me.TextBox3.Name = "TextBox3"
         Me.TextBox3.Size = New System.Drawing.Size(140, 23)
         Me.TextBox3.TabIndex = 343
@@ -220,7 +233,7 @@ Partial Class 訂單價格利潤明細表
         'Label5
         '
         Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(1365, 85)
+        Me.Label5.Location = New System.Drawing.Point(1362, 104)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(46, 32)
         Me.Label5.TabIndex = 346
@@ -228,7 +241,7 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox4
         '
-        Me.TextBox4.Location = New System.Drawing.Point(1245, 120)
+        Me.TextBox4.Location = New System.Drawing.Point(1245, 138)
         Me.TextBox4.Name = "TextBox4"
         Me.TextBox4.Size = New System.Drawing.Size(166, 23)
         Me.TextBox4.TabIndex = 345
@@ -237,7 +250,7 @@ Partial Class 訂單價格利潤明細表
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(1529, 85)
+        Me.Label6.Location = New System.Drawing.Point(1525, 104)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(64, 32)
         Me.Label6.TabIndex = 348
@@ -245,7 +258,7 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox5
         '
-        Me.TextBox5.Location = New System.Drawing.Point(1417, 120)
+        Me.TextBox5.Location = New System.Drawing.Point(1417, 138)
         Me.TextBox5.Name = "TextBox5"
         Me.TextBox5.Size = New System.Drawing.Size(176, 23)
         Me.TextBox5.TabIndex = 347
@@ -253,29 +266,32 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox6
         '
-        Me.TextBox6.Location = New System.Drawing.Point(986, 36)
+        Me.TextBox6.Location = New System.Drawing.Point(852, 239)
         Me.TextBox6.Name = "TextBox6"
         Me.TextBox6.Size = New System.Drawing.Size(20, 23)
         Me.TextBox6.TabIndex = 349
+        Me.TextBox6.Visible = False
         '
         'TextBox7
         '
-        Me.TextBox7.Location = New System.Drawing.Point(1012, 36)
+        Me.TextBox7.Location = New System.Drawing.Point(878, 239)
         Me.TextBox7.Name = "TextBox7"
         Me.TextBox7.Size = New System.Drawing.Size(20, 23)
         Me.TextBox7.TabIndex = 350
+        Me.TextBox7.Visible = False
         '
         'TextBox8
         '
-        Me.TextBox8.Location = New System.Drawing.Point(986, 62)
+        Me.TextBox8.Location = New System.Drawing.Point(852, 265)
         Me.TextBox8.Name = "TextBox8"
         Me.TextBox8.Size = New System.Drawing.Size(20, 23)
         Me.TextBox8.TabIndex = 351
+        Me.TextBox8.Visible = False
         '
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(1729, 85)
+        Me.Label7.Location = New System.Drawing.Point(1729, 104)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(103, 32)
         Me.Label7.TabIndex = 353
@@ -283,7 +299,7 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox9
         '
-        Me.TextBox9.Location = New System.Drawing.Point(1725, 120)
+        Me.TextBox9.Location = New System.Drawing.Point(1725, 138)
         Me.TextBox9.Name = "TextBox9"
         Me.TextBox9.Size = New System.Drawing.Size(107, 23)
         Me.TextBox9.TabIndex = 352
@@ -291,15 +307,16 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox10
         '
-        Me.TextBox10.Location = New System.Drawing.Point(1012, 62)
+        Me.TextBox10.Location = New System.Drawing.Point(878, 265)
         Me.TextBox10.Name = "TextBox10"
         Me.TextBox10.Size = New System.Drawing.Size(20, 23)
         Me.TextBox10.TabIndex = 354
+        Me.TextBox10.Visible = False
         '
         'Button2
         '
         Me.Button2.ForeColor = System.Drawing.Color.Blue
-        Me.Button2.Location = New System.Drawing.Point(329, 67)
+        Me.Button2.Location = New System.Drawing.Point(208, 79)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(95, 35)
         Me.Button2.TabIndex = 355
@@ -315,7 +332,7 @@ Partial Class 訂單價格利潤明細表
         Me.Label47.AutoSize = True
         Me.Label47.Font = New System.Drawing.Font("微軟正黑體", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Label47.ForeColor = System.Drawing.Color.Red
-        Me.Label47.Location = New System.Drawing.Point(531, 35)
+        Me.Label47.Location = New System.Drawing.Point(816, 132)
         Me.Label47.Name = "Label47"
         Me.Label47.Size = New System.Drawing.Size(138, 26)
         Me.Label47.TabIndex = 452
@@ -324,7 +341,7 @@ Partial Class 訂單價格利潤明細表
         '
         'Button3
         '
-        Me.Button3.Location = New System.Drawing.Point(329, 7)
+        Me.Button3.Location = New System.Drawing.Point(208, 19)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(95, 52)
         Me.Button3.TabIndex = 453
@@ -334,7 +351,7 @@ Partial Class 訂單價格利潤明細表
         'CheckBox1
         '
         Me.CheckBox1.AutoSize = True
-        Me.CheckBox1.Location = New System.Drawing.Point(260, 11)
+        Me.CheckBox1.Location = New System.Drawing.Point(118, 27)
         Me.CheckBox1.Name = "CheckBox1"
         Me.CheckBox1.Size = New System.Drawing.Size(63, 20)
         Me.CheckBox1.TabIndex = 454
@@ -346,7 +363,7 @@ Partial Class 訂單價格利潤明細表
         Me.CheckBox2.AutoSize = True
         Me.CheckBox2.Checked = True
         Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox2.Location = New System.Drawing.Point(260, 35)
+        Me.CheckBox2.Location = New System.Drawing.Point(118, 51)
         Me.CheckBox2.Name = "CheckBox2"
         Me.CheckBox2.Size = New System.Drawing.Size(63, 20)
         Me.CheckBox2.TabIndex = 455
@@ -356,7 +373,7 @@ Partial Class 訂單價格利潤明細表
         'Label8
         '
         Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(1642, 82)
+        Me.Label8.Location = New System.Drawing.Point(1639, 104)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(72, 32)
         Me.Label8.TabIndex = 457
@@ -364,7 +381,7 @@ Partial Class 訂單價格利潤明細表
         '
         'TextBox11
         '
-        Me.TextBox11.Location = New System.Drawing.Point(1599, 120)
+        Me.TextBox11.Location = New System.Drawing.Point(1599, 138)
         Me.TextBox11.Name = "TextBox11"
         Me.TextBox11.Size = New System.Drawing.Size(115, 23)
         Me.TextBox11.TabIndex = 456
@@ -373,7 +390,7 @@ Partial Class 訂單價格利潤明細表
         'Button4
         '
         Me.Button4.ForeColor = System.Drawing.Color.Blue
-        Me.Button4.Location = New System.Drawing.Point(430, 67)
+        Me.Button4.Location = New System.Drawing.Point(309, 79)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(95, 35)
         Me.Button4.TabIndex = 460
@@ -383,7 +400,7 @@ Partial Class 訂單價格利潤明細表
         'Button5
         '
         Me.Button5.ForeColor = System.Drawing.Color.Green
-        Me.Button5.Location = New System.Drawing.Point(329, 108)
+        Me.Button5.Location = New System.Drawing.Point(208, 120)
         Me.Button5.Name = "Button5"
         Me.Button5.Size = New System.Drawing.Size(95, 35)
         Me.Button5.TabIndex = 459
@@ -393,7 +410,7 @@ Partial Class 訂單價格利潤明細表
         'Button6
         '
         Me.Button6.ForeColor = System.Drawing.Color.Green
-        Me.Button6.Location = New System.Drawing.Point(127, 108)
+        Me.Button6.Location = New System.Drawing.Point(6, 120)
         Me.Button6.Name = "Button6"
         Me.Button6.Size = New System.Drawing.Size(95, 35)
         Me.Button6.TabIndex = 458
@@ -402,7 +419,7 @@ Partial Class 訂單價格利潤明細表
         '
         'Button7
         '
-        Me.Button7.Location = New System.Drawing.Point(127, 10)
+        Me.Button7.Location = New System.Drawing.Point(6, 22)
         Me.Button7.Name = "Button7"
         Me.Button7.Size = New System.Drawing.Size(95, 52)
         Me.Button7.TabIndex = 461
@@ -412,7 +429,7 @@ Partial Class 訂單價格利潤明細表
         'Button8
         '
         Me.Button8.ForeColor = System.Drawing.Color.Green
-        Me.Button8.Location = New System.Drawing.Point(430, 108)
+        Me.Button8.Location = New System.Drawing.Point(309, 120)
         Me.Button8.Name = "Button8"
         Me.Button8.Size = New System.Drawing.Size(95, 35)
         Me.Button8.TabIndex = 462
@@ -422,7 +439,7 @@ Partial Class 訂單價格利潤明細表
         'Button9
         '
         Me.Button9.ForeColor = System.Drawing.Color.Green
-        Me.Button9.Location = New System.Drawing.Point(228, 108)
+        Me.Button9.Location = New System.Drawing.Point(107, 120)
         Me.Button9.Name = "Button9"
         Me.Button9.Size = New System.Drawing.Size(95, 35)
         Me.Button9.TabIndex = 463
@@ -432,57 +449,60 @@ Partial Class 訂單價格利潤明細表
         'Label9
         '
         Me.Label9.AutoSize = True
+        Me.Label9.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Label9.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.Label9.Location = New System.Drawing.Point(1612, 28)
+        Me.Label9.Location = New System.Drawing.Point(1554, 39)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(280, 16)
+        Me.Label9.Size = New System.Drawing.Size(350, 19)
         Me.Label9.TabIndex = 464
         Me.Label9.Text = "* 粉色底色欄位系手動輸入欄位，請輸入所需資料。"
         '
         'Label10
         '
         Me.Label10.AutoSize = True
+        Me.Label10.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Label10.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.Label10.Location = New System.Drawing.Point(1612, 47)
+        Me.Label10.Location = New System.Drawing.Point(1554, 69)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(280, 16)
+        Me.Label10.Size = New System.Drawing.Size(350, 19)
         Me.Label10.TabIndex = 465
         Me.Label10.Text = "* 沒有存檔之前資料無法列印出成本與利潤的資料。"
         '
         'Label11
         '
         Me.Label11.AutoSize = True
+        Me.Label11.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Label11.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.Label11.Location = New System.Drawing.Point(1612, 9)
+        Me.Label11.Location = New System.Drawing.Point(1554, 9)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(244, 16)
+        Me.Label11.Size = New System.Drawing.Size(305, 19)
         Me.Label11.TabIndex = 466
         Me.Label11.Text = "* 紅色字體系自動計算欄位，不需要去輸入。"
         '
         'TextBox12
         '
-        Me.TextBox12.Location = New System.Drawing.Point(1299, 6)
+        Me.TextBox12.Location = New System.Drawing.Point(80, 16)
         Me.TextBox12.Name = "TextBox12"
         Me.TextBox12.Size = New System.Drawing.Size(294, 23)
         Me.TextBox12.TabIndex = 467
         '
         'TextBox13
         '
-        Me.TextBox13.Location = New System.Drawing.Point(1299, 56)
+        Me.TextBox13.Location = New System.Drawing.Point(80, 66)
         Me.TextBox13.Name = "TextBox13"
         Me.TextBox13.Size = New System.Drawing.Size(136, 23)
         Me.TextBox13.TabIndex = 468
         '
         'TextBox14
         '
-        Me.TextBox14.Location = New System.Drawing.Point(1476, 31)
+        Me.TextBox14.Location = New System.Drawing.Point(257, 41)
         Me.TextBox14.Name = "TextBox14"
         Me.TextBox14.Size = New System.Drawing.Size(117, 23)
         Me.TextBox14.TabIndex = 469
         '
         'TextBox15
         '
-        Me.TextBox15.Location = New System.Drawing.Point(1476, 57)
+        Me.TextBox15.Location = New System.Drawing.Point(257, 67)
         Me.TextBox15.Name = "TextBox15"
         Me.TextBox15.Size = New System.Drawing.Size(117, 23)
         Me.TextBox15.TabIndex = 470
@@ -490,7 +510,7 @@ Partial Class 訂單價格利潤明細表
         'Label12
         '
         Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(1249, 59)
+        Me.Label12.Location = New System.Drawing.Point(30, 69)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(44, 16)
         Me.Label12.TabIndex = 471
@@ -499,7 +519,7 @@ Partial Class 訂單價格利潤明細表
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(1441, 34)
+        Me.Label13.Location = New System.Drawing.Point(222, 44)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(32, 16)
         Me.Label13.TabIndex = 472
@@ -508,7 +528,7 @@ Partial Class 訂單價格利潤明細表
         'Label14
         '
         Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(1441, 60)
+        Me.Label14.Location = New System.Drawing.Point(222, 70)
         Me.Label14.Name = "Label14"
         Me.Label14.Size = New System.Drawing.Size(32, 16)
         Me.Label14.TabIndex = 473
@@ -517,7 +537,7 @@ Partial Class 訂單價格利潤明細表
         'Label15
         '
         Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(1225, 9)
+        Me.Label15.Location = New System.Drawing.Point(6, 19)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(68, 16)
         Me.Label15.TabIndex = 474
@@ -525,9 +545,9 @@ Partial Class 訂單價格利潤明細表
         '
         'Button10
         '
-        Me.Button10.Location = New System.Drawing.Point(777, 67)
+        Me.Button10.Location = New System.Drawing.Point(6, 20)
         Me.Button10.Name = "Button10"
-        Me.Button10.Size = New System.Drawing.Size(95, 35)
+        Me.Button10.Size = New System.Drawing.Size(95, 40)
         Me.Button10.TabIndex = 475
         Me.Button10.Text = "拆分一筆資料"
         Me.Button10.UseVisualStyleBackColor = True
@@ -537,15 +557,15 @@ Partial Class 訂單價格利潤明細表
         Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox1.FormattingEnabled = True
         Me.ComboBox1.Items.AddRange(New Object() {"2023", "2022", "2021", "2020", "2019", "2018"})
-        Me.ComboBox1.Location = New System.Drawing.Point(1127, 7)
+        Me.ComboBox1.Location = New System.Drawing.Point(319, 53)
         Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(92, 24)
+        Me.ComboBox1.Size = New System.Drawing.Size(153, 24)
         Me.ComboBox1.TabIndex = 476
         '
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(1089, 10)
+        Me.Label16.Location = New System.Drawing.Point(285, 56)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(32, 16)
         Me.Label16.TabIndex = 477
@@ -554,7 +574,7 @@ Partial Class 訂單價格利潤明細表
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(1064, 35)
+        Me.Label17.Location = New System.Drawing.Point(260, 82)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(57, 16)
         Me.Label17.TabIndex = 479
@@ -565,129 +585,205 @@ Partial Class 訂單價格利潤明細表
         Me.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox2.FormattingEnabled = True
         Me.ComboBox2.Items.AddRange(New Object() {"USD", "RMB"})
-        Me.ComboBox2.Location = New System.Drawing.Point(1127, 32)
+        Me.ComboBox2.Location = New System.Drawing.Point(319, 79)
         Me.ComboBox2.Name = "ComboBox2"
-        Me.ComboBox2.Size = New System.Drawing.Size(92, 24)
+        Me.ComboBox2.Size = New System.Drawing.Size(153, 24)
         Me.ComboBox2.TabIndex = 478
         '
         'TextBox16
         '
-        Me.TextBox16.Location = New System.Drawing.Point(1038, 36)
+        Me.TextBox16.Location = New System.Drawing.Point(904, 239)
         Me.TextBox16.Name = "TextBox16"
         Me.TextBox16.Size = New System.Drawing.Size(20, 23)
         Me.TextBox16.TabIndex = 480
+        Me.TextBox16.Visible = False
         '
         'Button11
         '
-        Me.Button11.Location = New System.Drawing.Point(878, 108)
+        Me.Button11.Location = New System.Drawing.Point(104, 64)
         Me.Button11.Name = "Button11"
-        Me.Button11.Size = New System.Drawing.Size(77, 35)
+        Me.Button11.Size = New System.Drawing.Size(77, 40)
         Me.Button11.TabIndex = 481
         Me.Button11.Text = "等於訂單數" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
         Me.Button11.UseVisualStyleBackColor = True
         '
         'Button12
         '
-        Me.Button12.Location = New System.Drawing.Point(878, 67)
+        Me.Button12.Location = New System.Drawing.Point(104, 20)
         Me.Button12.Name = "Button12"
-        Me.Button12.Size = New System.Drawing.Size(77, 35)
+        Me.Button12.Size = New System.Drawing.Size(77, 40)
         Me.Button12.TabIndex = 482
         Me.Button12.Text = "等於零"
         Me.Button12.UseVisualStyleBackColor = True
         '
         'Button13
         '
-        Me.Button13.Location = New System.Drawing.Point(1020, 108)
+        Me.Button13.Location = New System.Drawing.Point(187, 22)
         Me.Button13.Name = "Button13"
-        Me.Button13.Size = New System.Drawing.Size(65, 35)
+        Me.Button13.Size = New System.Drawing.Size(65, 82)
         Me.Button13.TabIndex = 483
         Me.Button13.Text = "匯率為1"
         Me.Button13.UseVisualStyleBackColor = True
         '
         'Button15
         '
-        Me.Button15.Location = New System.Drawing.Point(777, 108)
+        Me.Button15.Location = New System.Drawing.Point(6, 64)
         Me.Button15.Name = "Button15"
-        Me.Button15.Size = New System.Drawing.Size(95, 35)
+        Me.Button15.Size = New System.Drawing.Size(95, 40)
         Me.Button15.TabIndex = 485
         Me.Button15.Text = "刪除拆分資料"
         Me.Button15.UseVisualStyleBackColor = True
         '
         'TextBox17
         '
-        Me.TextBox17.Location = New System.Drawing.Point(1038, 62)
+        Me.TextBox17.Location = New System.Drawing.Point(904, 265)
         Me.TextBox17.Name = "TextBox17"
         Me.TextBox17.Size = New System.Drawing.Size(20, 23)
         Me.TextBox17.TabIndex = 486
+        Me.TextBox17.Visible = False
         '
         'TextBox18
         '
-        Me.TextBox18.Location = New System.Drawing.Point(531, 120)
+        Me.TextBox18.Location = New System.Drawing.Point(476, 32)
         Me.TextBox18.Name = "TextBox18"
-        Me.TextBox18.Size = New System.Drawing.Size(64, 23)
+        Me.TextBox18.Size = New System.Drawing.Size(75, 23)
         Me.TextBox18.TabIndex = 487
-        Me.TextBox18.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        Me.TextBox18.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
         '
         'Label18
         '
         Me.Label18.AutoSize = True
-        Me.Label18.Location = New System.Drawing.Point(535, 101)
+        Me.Label18.Location = New System.Drawing.Point(480, 14)
         Me.Label18.Name = "Label18"
         Me.Label18.Size = New System.Drawing.Size(56, 16)
         Me.Label18.TabIndex = 488
-        Me.Label18.Text = "儲存進度"
+        Me.Label18.Text = "資料筆數"
         '
         'ProgressBar1
         '
-        Me.ProgressBar1.Location = New System.Drawing.Point(531, 5)
+        Me.ProgressBar1.Location = New System.Drawing.Point(476, 73)
         Me.ProgressBar1.Maximum = 10000
         Me.ProgressBar1.Name = "ProgressBar1"
-        Me.ProgressBar1.Size = New System.Drawing.Size(527, 23)
+        Me.ProgressBar1.Size = New System.Drawing.Size(150, 30)
         Me.ProgressBar1.TabIndex = 489
         '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.Label15)
+        Me.GroupBox1.Controls.Add(Me.TextBox1)
+        Me.GroupBox1.Controls.Add(Me.Label2)
+        Me.GroupBox1.Controls.Add(Me.TextBox12)
+        Me.GroupBox1.Controls.Add(Me.TextBox13)
+        Me.GroupBox1.Controls.Add(Me.TextBox14)
+        Me.GroupBox1.Controls.Add(Me.TextBox15)
+        Me.GroupBox1.Controls.Add(Me.Label12)
+        Me.GroupBox1.Controls.Add(Me.Label13)
+        Me.GroupBox1.Controls.Add(Me.Label14)
+        Me.GroupBox1.ForeColor = System.Drawing.Color.Green
+        Me.GroupBox1.Location = New System.Drawing.Point(1168, 3)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(382, 97)
+        Me.GroupBox1.TabIndex = 490
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "訂單選取資訊"
+        '
+        'GroupBox2
+        '
+        Me.GroupBox2.Controls.Add(Me.Label19)
+        Me.GroupBox2.Controls.Add(Me.資料庫選擇2_bt)
+        Me.GroupBox2.Controls.Add(Me.資料庫選擇1_bt)
+        Me.GroupBox2.Controls.Add(Me.Label20)
+        Me.GroupBox2.Controls.Add(Me.ProgressBar1)
+        Me.GroupBox2.Controls.Add(Me.Button10)
+        Me.GroupBox2.Controls.Add(Me.Label18)
+        Me.GroupBox2.Controls.Add(Me.Button11)
+        Me.GroupBox2.Controls.Add(Me.TextBox18)
+        Me.GroupBox2.Controls.Add(Me.Button12)
+        Me.GroupBox2.Controls.Add(Me.Button13)
+        Me.GroupBox2.Controls.Add(Me.Button15)
+        Me.GroupBox2.Controls.Add(Me.ComboBox2)
+        Me.GroupBox2.Controls.Add(Me.ComboBox1)
+        Me.GroupBox2.Controls.Add(Me.Label17)
+        Me.GroupBox2.Controls.Add(Me.Label16)
+        Me.GroupBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.GroupBox2.Location = New System.Drawing.Point(532, 3)
+        Me.GroupBox2.Name = "GroupBox2"
+        Me.GroupBox2.Size = New System.Drawing.Size(630, 110)
+        Me.GroupBox2.TabIndex = 491
+        Me.GroupBox2.TabStop = False
+        Me.GroupBox2.Text = "清單控制項"
+        '
+        'Label19
+        '
+        Me.Label19.AutoSize = True
+        Me.Label19.Location = New System.Drawing.Point(480, 57)
+        Me.Label19.Name = "Label19"
+        Me.Label19.Size = New System.Drawing.Size(56, 16)
+        Me.Label19.TabIndex = 563
+        Me.Label19.Text = "儲存進度"
+        '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(397, 20)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 562
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(319, 20)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 561
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(276, 19)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 560
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
+        'GroupBox3
+        '
+        Me.GroupBox3.Controls.Add(Me.Button7)
+        Me.GroupBox3.Controls.Add(Me.Button34)
+        Me.GroupBox3.Controls.Add(Me.Button35)
+        Me.GroupBox3.Controls.Add(Me.Button1)
+        Me.GroupBox3.Controls.Add(Me.Button2)
+        Me.GroupBox3.Controls.Add(Me.Button3)
+        Me.GroupBox3.Controls.Add(Me.CheckBox1)
+        Me.GroupBox3.Controls.Add(Me.CheckBox2)
+        Me.GroupBox3.Controls.Add(Me.Button6)
+        Me.GroupBox3.Controls.Add(Me.Button5)
+        Me.GroupBox3.Controls.Add(Me.Button4)
+        Me.GroupBox3.Controls.Add(Me.Button9)
+        Me.GroupBox3.Controls.Add(Me.Button8)
+        Me.GroupBox3.Location = New System.Drawing.Point(117, 3)
+        Me.GroupBox3.Name = "GroupBox3"
+        Me.GroupBox3.Size = New System.Drawing.Size(409, 158)
+        Me.GroupBox3.TabIndex = 492
+        Me.GroupBox3.TabStop = False
+        Me.GroupBox3.Text = "操作控制項"
+        '
         '訂單價格利潤明細表
         '
         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.ProgressBar1)
-        Me.Controls.Add(Me.Label18)
-        Me.Controls.Add(Me.TextBox18)
+        Me.Controls.Add(Me.GroupBox3)
+        Me.Controls.Add(Me.GroupBox2)
+        Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.TextBox17)
-        Me.Controls.Add(Me.Button15)
-        Me.Controls.Add(Me.Button13)
-        Me.Controls.Add(Me.Button12)
-        Me.Controls.Add(Me.Button11)
         Me.Controls.Add(Me.TextBox16)
-        Me.Controls.Add(Me.Label17)
-        Me.Controls.Add(Me.ComboBox2)
-        Me.Controls.Add(Me.Label16)
-        Me.Controls.Add(Me.ComboBox1)
-        Me.Controls.Add(Me.Button10)
-        Me.Controls.Add(Me.Label15)
-        Me.Controls.Add(Me.Label14)
-        Me.Controls.Add(Me.Label13)
-        Me.Controls.Add(Me.Label12)
-        Me.Controls.Add(Me.TextBox15)
-        Me.Controls.Add(Me.TextBox14)
-        Me.Controls.Add(Me.TextBox13)
-        Me.Controls.Add(Me.TextBox12)
-        Me.Controls.Add(Me.Label11)
-        Me.Controls.Add(Me.Label10)
-        Me.Controls.Add(Me.Label9)
-        Me.Controls.Add(Me.Button9)
-        Me.Controls.Add(Me.Button8)
-        Me.Controls.Add(Me.Button7)
-        Me.Controls.Add(Me.Button4)
-        Me.Controls.Add(Me.Button5)
-        Me.Controls.Add(Me.Button6)
         Me.Controls.Add(Me.Label8)
         Me.Controls.Add(Me.TextBox11)
-        Me.Controls.Add(Me.CheckBox2)
-        Me.Controls.Add(Me.CheckBox1)
-        Me.Controls.Add(Me.Button3)
         Me.Controls.Add(Me.Label47)
-        Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.TextBox10)
         Me.Controls.Add(Me.Label7)
         Me.Controls.Add(Me.TextBox9)
@@ -702,20 +798,24 @@ Partial Class 訂單價格利潤明細表
         Me.Controls.Add(Me.TextBox3)
         Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.TextBox2)
-        Me.Controls.Add(Me.Button1)
-        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.TextBox1)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.DataGridView2)
-        Me.Controls.Add(Me.Button35)
-        Me.Controls.Add(Me.Button34)
         Me.Controls.Add(Me.DataGridView1)
+        Me.Controls.Add(Me.Label11)
+        Me.Controls.Add(Me.Label10)
+        Me.Controls.Add(Me.Label9)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "訂單價格利潤明細表"
         Me.Text = "訂單價格利潤明細表"
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DataGridView2, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GroupBox1.ResumeLayout(False)
+        Me.GroupBox1.PerformLayout()
+        Me.GroupBox2.ResumeLayout(False)
+        Me.GroupBox2.PerformLayout()
+        Me.GroupBox3.ResumeLayout(False)
+        Me.GroupBox3.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -782,5 +882,12 @@ Partial Class 訂單價格利潤明細表
     Friend WithEvents TextBox18 As TextBox
     Friend WithEvents Label18 As Label
     Friend WithEvents ProgressBar1 As ProgressBar
+    Friend WithEvents GroupBox1 As GroupBox
+    Friend WithEvents GroupBox2 As GroupBox
+    Friend WithEvents GroupBox3 As GroupBox
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
+    Friend WithEvents Label19 As Label
 End Class
 

TENDEN-MES-SYS/成本系統管理/訂單價格利潤明細表.vb

@@ -1,5 +1,4 @@
 Option Strict Off
-Imports System.Data.SqlClient
 Public Class 訂單價格利潤明細表
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet
     ReadOnly BB(3) As Boolean : Dim WW As String : Public 平均數 As Integer : Public 最終數 As Integer = 0 : Public 資料數 As Integer = 0
@@ -19,38 +18,38 @@ Public Class 訂單價格利潤明細表
             Timer1.Enabled = True : Button6.Enabled = True : Button5.Enabled = False : Button9.Enabled = False
             Button11.Enabled = True : Button12.Enabled = True : Button13.Enabled = True
             If TextBox1.Text = "" Then
-                SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.資料流水號, 訂單控制表.年份季度, 訂單控制表.客戶訂單號, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型, " &
-                       "訂單控制表.訂單數量 AS 數量, 訂單控制表.客戶交期, " &
-                       "訂單控制表.單價, 訂單控制表.總金額, 訂單控制表.備註, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單價格利潤明細表.Quantity, 訂單價格利潤明細表.Currency, " &
-                       "訂單價格利潤明細表.Exchange, 訂單價格利潤明細表.FTYPrice, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity AS CommissionTTL, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionDarren, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionTendenza, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) AS Percentage, 訂單價格利潤明細表.BasicPrice, 訂單價格利潤明細表.Polybag, " &
-                       "訂單價格利潤明細表.FOOTformOrPETform AS FOOTorPET, " &
-                       "訂單價格利潤明細表.Tooling, 訂單價格利潤明細表.RubberBand, 訂單價格利潤明細表.JHOOK, 訂單價格利潤明細表.WaterResistant, 訂單價格利潤明細表.P16VAT, 訂單價格利潤明細表.EXWsaving, " &
-                       "訂單價格利潤明細表.Quantity * 訂單價格利潤明細表.Tooling AS CollectedToolng, " &
-                       "訂單價格利潤明細表.年份, 訂單價格利潤明細表.利潤表流水號, 訂單控制表.訂單數量 - 訂單價格利潤明細表.Quantity AS 驗證, STYLELIST.ItemNumber, 訂單價格利潤明細表.審核 " &
-                       "FROM 訂單控制表 LEFT OUTER JOIN STYLELIST ON 訂單控制表.形體號 = STYLELIST.ProductName RIGHT OUTER JOIN 訂單價格利潤明細表 ON 訂單控制表.資料流水號 = 訂單價格利潤明細表.資料流水號 " &
-                       "WHERE ((訂單控制表.訂單流水號 LIKE '%" & PA & "%') OR (訂單控制表.年份季度 LIKE '%" & PA & "%') OR (訂單控制表.客戶訂單號 LIKE '%" & PA & "%') OR (訂單控制表.形體號 LIKE '%" & PA & "%') OR " &
-                       "(訂單控制表.顏色 LIKE '%" & PA & "%') OR (訂單控制表.楦型 LIKE '%" & PA & "%') OR (訂單控制表.備註 LIKE '%" & PA & "%') OR (訂單控制表.備註 LIKE '%" & PA & "%') OR " &
-                       "(訂單控制表.生產工廠 LIKE '%" & PA & "%') OR (訂單控制表.訂單種類 LIKE '%" & PA & "%')) AND 訂單價格利潤明細表.天盾訂單號 IS NULL AND (訂單控制表.CXL IS NULL OR 訂單控制表.CXL = 0)" &
-                       "ORDER BY 訂單控制表.訂單流水號 DESC"
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                               " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
+                               " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
+                               " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
+                               " & 訂單資料表(7) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionDarren, 
+                              (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionTendenza, (" & 訂單資料表(1) & ".單價 - 
+                               " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
+                               " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
+                               " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                        FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN " & 訂單資料表(7) & " ON 
+                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
+                        WHERE ((" & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%') OR 
+                               (" & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".楦型 LIKE '%" & PA & "%') OR 
+                               (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%') OR 
+                               (" & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%')) AND " & 訂單資料表(7) & ".天盾訂單號 IS NULL AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                        ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
             Else
-                SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.資料流水號, 訂單控制表.年份季度, 訂單控制表.客戶訂單號, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型, " &
-                       "訂單控制表.訂單數量 AS 數量, 訂單控制表.客戶交期, " &
-                       "訂單控制表.單價, 訂單控制表.總金額, 訂單控制表.備註, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單價格利潤明細表.Quantity, 訂單價格利潤明細表.Currency, " &
-                       "訂單價格利潤明細表.Exchange, 訂單價格利潤明細表.FTYPrice, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity AS CommissionTTL, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionDarren, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionTendenza, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) AS Percentage, 訂單價格利潤明細表.BasicPrice, 訂單價格利潤明細表.Polybag, " &
-                       "訂單價格利潤明細表.FOOTformOrPETform AS FOOTorPET, " &
-                       "訂單價格利潤明細表.Tooling, 訂單價格利潤明細表.RubberBand, 訂單價格利潤明細表.JHOOK, 訂單價格利潤明細表.WaterResistant, 訂單價格利潤明細表.P16VAT, 訂單價格利潤明細表.EXWsaving, " &
-                       "訂單價格利潤明細表.Quantity * 訂單價格利潤明細表.Tooling AS CollectedToolng, " &
-                       "訂單價格利潤明細表.年份, 訂單價格利潤明細表.利潤表流水號, 訂單控制表.訂單數量 - 訂單價格利潤明細表.Quantity AS 驗證, STYLELIST.ItemNumber, 訂單價格利潤明細表.審核 " &
-                       "FROM 訂單控制表 LEFT OUTER JOIN STYLELIST ON 訂單控制表.形體號 = STYLELIST.ProductName LEFT OUTER JOIN 訂單價格利潤明細表 ON 訂單控制表.資料流水號 = 訂單價格利潤明細表.資料流水號 " &
-                       "WHERE (訂單控制表.訂單流水號 LIKE '" & TextBox1.Text & "') AND (訂單控制表.CXL IS NULL OR 訂單控制表.CXL = 0) ORDER BY 訂單控制表.訂單流水號 DESC"
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                               " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
+                               " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
+                               " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
+                               " & 訂單資料表(7) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionDarren, 
+                              (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionTendenza, (" & 訂單資料表(1) & ".單價 - 
+                               " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
+                               " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
+                               " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                        FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName LEFT OUTER JOIN " & 訂單資料表(7) & " ON 
+                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
+                        WHERE (" & 訂單資料表(1) & ".訂單流水號 LIKE '" & TextBox1.Text & "') AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                        ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
             End If
             Set_DGV1載入後設定() : Set_grid() : Set_自動彙總1()
             Set_暫存資料設定() : Set_編輯清單() : Set_grid() : Set_自動彙總1()
@@ -58,56 +57,60 @@ Public Class 訂單價格利潤明細表
             Timer1.Enabled = False : Label47.Visible = False : Button6.Enabled = False : Button5.Enabled = True : Button9.Enabled = True
             Button11.Enabled = False : Button12.Enabled = False : Button13.Enabled = False
             If PA = "" Then
-                SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.資料流水號, 訂單控制表.年份季度, 訂單控制表.客戶訂單號, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型, " &
-                       "訂單控制表.訂單數量 AS 數量, 訂單控制表.客戶交期, " &
-                       "訂單控制表.單價, 訂單控制表.總金額, 訂單控制表.備註, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單價格利潤明細表.Quantity, 訂單價格利潤明細表.Currency, " &
-                       "訂單價格利潤明細表.Exchange, 訂單價格利潤明細表.FTYPrice, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity AS CommissionTTL, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionDarren, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionTendenza, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) AS Percentage, 訂單價格利潤明細表.BasicPrice, 訂單價格利潤明細表.Polybag, " &
-                       "訂單價格利潤明細表.FOOTformOrPETform AS FOOTorPET, " &
-                       "訂單價格利潤明細表.Tooling, 訂單價格利潤明細表.RubberBand, 訂單價格利潤明細表.JHOOK, 訂單價格利潤明細表.WaterResistant, 訂單價格利潤明細表.P16VAT, 訂單價格利潤明細表.EXWsaving, " &
-                       "訂單價格利潤明細表.Quantity * 訂單價格利潤明細表.Tooling AS CollectedToolng, " &
-                       "訂單價格利潤明細表.年份, 訂單價格利潤明細表.利潤表流水號, 訂單控制表.訂單數量 - 訂單價格利潤明細表.Quantity AS 驗證, STYLELIST.ItemNumber, 訂單價格利潤明細表.審核 " &
-                       "FROM 訂單控制表 LEFT OUTER JOIN STYLELIST ON 訂單控制表.形體號 = STYLELIST.ProductName RIGHT OUTER JOIN 訂單價格利潤明細表 ON 訂單控制表.資料流水號 = 訂單價格利潤明細表.資料流水號 " &
-                       "WHERE 訂單價格利潤明細表.年份 LIKE '" & ComboBox1.Text & "' AND (訂單控制表.CXL IS NULL OR 訂單控制表.CXL = 0) ORDER BY 訂單控制表.訂單流水號 DESC"
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                               " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
+                               " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
+                               " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
+                               " & 訂單資料表(7) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionDarren, 
+                              (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionTendenza, (" & 訂單資料表(1) & ".單價 - 
+                               " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
+                               " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
+                               " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                        FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN " & 訂單資料表(7) & " ON 
+                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
+                        WHERE " & 訂單資料表(7) & ".年份 LIKE '" & ComboBox1.Text & "' AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                        ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
             Else
-                SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.資料流水號, 訂單控制表.年份季度, 訂單控制表.客戶訂單號, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型, " &
-                       "訂單控制表.訂單數量 AS 數量, 訂單控制表.客戶交期, " &
-                       "訂單控制表.單價, 訂單控制表.總金額, 訂單控制表.備註, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單價格利潤明細表.Quantity, 訂單價格利潤明細表.Currency, " &
-                       "訂單價格利潤明細表.Exchange, 訂單價格利潤明細表.FTYPrice, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity AS CommissionTTL, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionDarren, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionTendenza, " &
-                       "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) AS Percentage, 訂單價格利潤明細表.BasicPrice, 訂單價格利潤明細表.Polybag, " &
-                       "訂單價格利潤明細表.FOOTformOrPETform AS FOOTorPET, " &
-                       "訂單價格利潤明細表.Tooling, 訂單價格利潤明細表.RubberBand, 訂單價格利潤明細表.JHOOK, 訂單價格利潤明細表.WaterResistant, 訂單價格利潤明細表.P16VAT, 訂單價格利潤明細表.EXWsaving, " &
-                       "訂單價格利潤明細表.Quantity * 訂單價格利潤明細表.Tooling AS CollectedToolng, " &
-                       "訂單價格利潤明細表.年份, 訂單價格利潤明細表.利潤表流水號, 訂單控制表.訂單數量 - 訂單價格利潤明細表.Quantity AS 驗證, STYLELIST.ItemNumber, 訂單價格利潤明細表.審核 " &
-                       "FROM 訂單控制表 LEFT OUTER JOIN STYLELIST ON 訂單控制表.形體號 = STYLELIST.ProductName RIGHT OUTER JOIN 訂單價格利潤明細表 ON 訂單控制表.資料流水號 = 訂單價格利潤明細表.資料流水號 " &
-                       "WHERE ((訂單控制表.訂單流水號 LIKE '%" & PA & "%') OR (訂單控制表.年份季度 LIKE '%" & PA & "%') OR (訂單控制表.客戶訂單號 LIKE '%" & PA & "%') OR (訂單控制表.形體號 LIKE '%" & PA & "%') OR " &
-                       "(訂單控制表.顏色 LIKE '%" & PA & "%') OR (訂單控制表.楦型 LIKE '%" & PA & "%') OR (訂單控制表.備註 LIKE '%" & PA & "%') OR (訂單控制表.備註 LIKE '%" & PA & "%') OR " &
-                       "(訂單控制表.生產工廠 LIKE '%" & PA & "%') OR (訂單控制表.訂單種類 LIKE '%" & PA & "%')) AND 訂單價格利潤明細表.天盾訂單號 IS NOT NULL AND 訂單價格利潤明細表.年份 LIKE '" & ComboBox1.Text & "' " &
-                       "AND (訂單控制表.CXL IS NULL OR 訂單控制表.CXL = 0) ORDER BY 訂單控制表.訂單流水號 DESC"
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                               " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
+                               " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
+                               " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
+                               " & 訂單資料表(7) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionDarren, 
+                              (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionTendenza, (" & 訂單資料表(1) & ".單價 - 
+                               " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
+                               " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
+                               " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                        FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN " & 訂單資料表(7) & " ON 
+                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
+                        WHERE ((" & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%') OR 
+                               (" & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".楦型 LIKE '%" & PA & "%') OR 
+                               (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%') OR 
+                               (" & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%')) AND " & 訂單資料表(7) & ".天盾訂單號 IS NOT NULL AND " & 訂單資料表(7) & ".年份 LIKE '" & ComboBox1.Text & "' AND 
+                               (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                        ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
             End If
             列印用SQL = SQL1
             Set_DGV1載入後設定()
         End If
+        TextBox18.Text = Format(DataGridView1.Rows.Count, "#,##0")
     End Sub
     Private Sub Set_編輯清單()
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.資料流水號, 訂單控制表.年份季度, 訂單控制表.客戶訂單號, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型, 訂單控制表.訂單數量 AS 數量, " &
-               "訂單控制表.客戶交期, 訂單控制表.單價, 訂單控制表.總金額, 訂單控制表.備註, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單價格利潤明細表.Quantity, 訂單價格利潤明細表.Currency, " &
-               "訂單價格利潤明細表.Exchange, 訂單價格利潤明細表.FTYPrice, (訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity AS CommissionTTL, " &
-               "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionDarren, " &
-               "(訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice) * 訂單價格利潤明細表.Quantity / 2 AS CommissionTendenza, 訂單控制表.單價 - 訂單價格利潤明細表.FTYPrice AS Percentage, " &
-               "訂單價格利潤明細表.BasicPrice, 訂單價格利潤明細表.Polybag, 訂單價格利潤明細表.FOOTformOrPETform AS FOOTorPET, 訂單價格利潤明細表.Tooling, 訂單價格利潤明細表.RubberBand, " &
-               "訂單價格利潤明細表.JHOOK, 訂單價格利潤明細表.WaterResistant, 訂單價格利潤明細表.P16VAT, 訂單價格利潤明細表.EXWsaving,  " &
-               "訂單價格利潤明細表.Quantity * 訂單價格利潤明細表.Tooling AS CollectedToolng, 訂單價格利潤明細表.年份, 訂單價格利潤表暫存檔.利潤表流水號, 訂單控制表.訂單數量 - 訂單價格利潤明細表.Quantity AS 驗證, " &
-               "STYLELIST.ItemNumber, 訂單價格利潤明細表.審核 FROM STYLELIST RIGHT OUTER JOIN 訂單控制表 ON STYLELIST.ProductName = 訂單控制表.形體號 RIGHT OUTER JOIN 訂單價格利潤表暫存檔 ON 訂單控制表.資料流水號 = " &
-               "訂單價格利潤表暫存檔.資料流水號 LEFT OUTER JOIN 訂單價格利潤明細表 ON 訂單價格利潤表暫存檔.資料流水號 = 訂單價格利潤明細表.資料流水號 " &
-               "ORDER BY 訂單控制表.訂單流水號 DESC, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型"
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                       " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
+                       " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
+                       " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
+                       " & 訂單資料表(7) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionDarren, 
+                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionTendenza, " & 訂單資料表(1) & ".單價 - 
+                       " & 訂單資料表(7) & ".FTYPrice AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
+                       " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
+                       " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
+                       訂單價格利潤表暫存檔.利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                FROM   STYLELIST RIGHT OUTER JOIN " & 訂單資料表(1) & " ON STYLELIST.ProductName = " & 訂單資料表(1) & ".形體號 RIGHT OUTER JOIN 訂單價格利潤表暫存檔 ON 
+                       " & 訂單資料表(1) & ".資料流水號 = 訂單價格利潤表暫存檔.資料流水號 LEFT OUTER JOIN " & 訂單資料表(7) & " ON 訂單價格利潤表暫存檔.資料流水號 = " & 訂單資料表(7) & ".資料流水號 
+                ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC, " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型"
         Set_DGV1載入後設定()
     End Sub
     Private Sub Set_暫存資料設定()
@@ -117,7 +120,7 @@ Public Class 訂單價格利潤明細表
 
         Dim NUM2 As Integer
         ConnOpen()
-        SQL1 = "SELECT TOP (1) 利潤表流水號 FROM 訂單價格利潤明細表 ORDER BY 利潤表流水號 DESC"
+        SQL1 = "SELECT TOP (1) 利潤表流水號 FROM " & 訂單資料表(7) & " ORDER BY 利潤表流水號 DESC"
         CmdSet_For_dr()
         If dr.Read() Then : NUM2 = Strings.Right(dr("利潤表流水號").ToString, 8) : End If
         conn.Close()
@@ -144,11 +147,15 @@ Public Class 訂單價格利潤明細表
         DataGridView2.ColumnHeadersHeight = 25
         DataGridView2.AllowUserToAddRows = False
         ConnOpen()
-        SQL1 = "SELECT 訂單控制表.訂單流水號 FROM 訂單控制表 FULL OUTER JOIN 訂單價格利潤明細表 ON 訂單控制表.資料流水號 = 訂單價格利潤明細表.資料流水號 WHERE " &
-               "(訂單價格利潤明細表.天盾訂單號 IS NULL) AND (LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2009') AND (LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2010') AND " &
-               "(LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2011') AND (LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2012') AND (LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2013') AND " &
-               "(LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2014') AND (LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2015') AND (LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2016') AND " &
-               "(LEFT(訂單控制表.客戶交期, 4) NOT LIKE '2017') AND (訂單控制表.CXL IS NULL OR 訂單控制表.CXL = 0) GROUP BY   訂單控制表.訂單流水號 ORDER BY   訂單控制表.訂單流水號 DESC"
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號 
+                FROM   " & 訂單資料表(1) & " FULL OUTER JOIN " & 訂單資料表(7) & " ON " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
+                WHERE (" & 訂單資料表(7) & ".天盾訂單號 IS NULL) AND 
+                      (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2009') AND (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2010') AND 
+                      (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2011') AND (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2012') AND 
+                      (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2013') AND (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2014') AND 
+                      (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2015') AND (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2016') AND 
+                      (LEFT(" & 訂單資料表(1) & ".客戶交期, 4) NOT LIKE '2017') AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                GROUP BY   " & 訂單資料表(1) & ".訂單流水號 ORDER BY   " & 訂單資料表(1) & ".訂單流水號 DESC"
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds1) : DataGridView2.DataSource = ds1.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_grid()
@@ -167,7 +174,7 @@ Public Class 訂單價格利潤明細表
         DataGridView1.Columns(12).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter : DataGridView1.Columns(7).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         DataGridView1.Columns(9).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight : DataGridView1.Columns(10).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
 
-        DataGridView1.Columns(14).FillWeight = 65 : DataGridView1.Columns(15).FillWeight = 65 : DataGridView1.Columns(16).FillWeight = 65
+        DataGridView1.Columns(14).FillWeight = 65 : DataGridView1.Columns(15).FillWeight = 65 : DataGridView1.Columns(16).FillWeight = 70
         DataGridView1.Columns(14).DefaultCellStyle.Format = "#,##0"
         DataGridView1.Columns(16).DefaultCellStyle.Format = "#,##0.0000"
         DataGridView1.Columns(14).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : DataGridView1.Columns(15).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -324,6 +331,8 @@ 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()
+
         ComboBox1.Text = Year(Today)
         BB(0) = False : BB(1) = True : BB(2) = False : BB(3) = False
         Button34.Enabled = False
@@ -382,7 +391,7 @@ Public Class 訂單價格利潤明細表
         ElseIf CheckBox1.Checked = False Then
             Dim NUM2 As Integer
             ConnOpen()
-            SQL1 = "SELECT TOP (1) 利潤表流水號 FROM 訂單價格利潤明細表 ORDER BY 利潤表流水號 DESC"
+            SQL1 = "SELECT TOP (1) 利潤表流水號 FROM " & 訂單資料表(7) & " ORDER BY 利潤表流水號 DESC"
             CmdSet_For_dr()
             If dr.Read() Then : NUM2 = Strings.Right(dr("利潤表流水號").ToString, 8) : End If
             conn.Close()
@@ -397,10 +406,10 @@ Public Class 訂單價格利潤明細表
             ElseIf NUM2 > 9999999 Then : WW = "PR" & NUM2
             End If
             ConnOpen()
-            SQL1 = "INSERT INTO 訂單價格利潤明細表 (資料流水號, 天盾訂單號, 客戶流水號, FTYPrice, BasicPrice, Polybag, FOOTformOrPETform, Tooling, RubberBand, JHOOK, WaterResistant, P16VAT, EXWsaving, " &
-               "Currency, Exchange, 年份, Quantity, 利潤表流水號, 審核) " &
-               "VALUES ('" & TextBox16.Text & "', '" & TextBox1.Text & "', '" & TextBox12.Text & "', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '" & ComboBox2.Text & "', '0'," &
-                       "'" & ComboBox1.Text & "', '0', '" & WW & "', '0')"
+            SQL1 = "INSERT INTO " & 訂單資料表(7) & " (資料流水號, 天盾訂單號, 客戶流水號, FTYPrice, BasicPrice, Polybag, FOOTformOrPETform, Tooling, RubberBand, JHOOK, WaterResistant, P16VAT, 
+                                                       EXWsaving, Currency, Exchange, 年份, Quantity, 利潤表流水號, 審核) 
+                    VALUES ('" & TextBox16.Text & "', '" & TextBox1.Text & "', '" & TextBox12.Text & "', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '" & ComboBox2.Text & "', '0', 
+                            '" & ComboBox1.Text & "', '0', '" & WW & "', '0')"
             CmdSet_For_dr() : conn.Close()
             Set_訂單清單() : Set_grid() : Set_自動彙總1()
         End If
@@ -413,7 +422,7 @@ Public Class 訂單價格利潤明細表
             Set_編輯清單() : Set_grid() : Set_自動彙總1()
         ElseIf CheckBox1.Checked = False Then
             ConnOpen()
-            SQL1 = "DELETE FROM 訂單價格利潤明細表 WHERE 利潤表流水號 LIKE '" & TextBox17.Text & "'"
+            SQL1 = "DELETE FROM " & 訂單資料表(7) & " WHERE 利潤表流水號 LIKE '" & TextBox17.Text & "'"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             Set_訂單清單() : Set_grid() : Set_自動彙總1()
         End If
@@ -450,8 +459,8 @@ Public Class 訂單價格利潤明細表
     Private Sub Button35_Click(sender As Object, e As EventArgs) Handles Button35.Click
         Label4.Visible = True : Label5.Visible = True : Label6.Visible = True : Label7.Visible = False : Label8.Visible = True
         TextBox3.Visible = True : TextBox4.Visible = True : TextBox5.Visible = True : TextBox9.Visible = False : TextBox11.Visible = True
-        Label4.Location = New Point(1310, 85) : Label5.Location = New Point(1475, 85) : Label6.Location = New Point(1640, 85) : Label8.Location = New Point(1760, 85)
-        TextBox3.Location = New Point(1210, 120) : TextBox4.Location = New Point(1355, 120) : TextBox5.Location = New Point(1530, 120) : TextBox11.Location = New Point(1715, 120)
+        Label4.Location = New Point(1310, 104) : Label5.Location = New Point(1475, 104) : Label6.Location = New Point(1640, 104) : Label8.Location = New Point(1760, 104)
+        TextBox3.Location = New Point(1210, 138) : TextBox4.Location = New Point(1355, 138) : TextBox5.Location = New Point(1530, 138) : TextBox11.Location = New Point(1715, 138)
         Button34.Enabled = True : Button35.Enabled = False : Button2.Enabled = True : Button4.Enabled = True
         BB(0) = True : BB(1) = False : BB(2) = False : BB(3) = False
         Set_grid()
@@ -459,9 +468,10 @@ Public Class 訂單價格利潤明細表
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Label4.Visible = True : Label5.Visible = True : Label6.Visible = True : Label7.Visible = True : Label8.Visible = True
         TextBox3.Visible = True : TextBox4.Visible = True : TextBox5.Visible = True : TextBox9.Visible = True : TextBox11.Visible = True
-        Label4.Location = New Point(1195, 85) : Label5.Location = New Point(1360, 85) : Label6.Location = New Point(1525, 85) : Label8.Location = New Point(1640, 85) : Label7.Location = New Point(1720, 85)
-        TextBox3.Location = New Point(1095, 120) : TextBox4.Location = New Point(1240, 120) : TextBox5.Location = New Point(1415, 120) : TextBox11.Location = New Point(1597, 120)
-        TextBox9.Location = New Point(1715, 120)
+        Label4.Location = New Point(1195, 104) : Label5.Location = New Point(1360, 104) : Label6.Location = New Point(1525, 104) : Label8.Location = New Point(1640, 104)
+        Label7.Location = New Point(1720, 104)
+        TextBox3.Location = New Point(1095, 138) : TextBox4.Location = New Point(1240, 138) : TextBox5.Location = New Point(1415, 138) : TextBox11.Location = New Point(1597, 138)
+        TextBox9.Location = New Point(1715, 138)
         Button34.Enabled = True : Button35.Enabled = True : Button2.Enabled = False : Button4.Enabled = True
         BB(0) = False : BB(1) = False : BB(2) = True : BB(3) = False
         Set_grid()
@@ -494,7 +504,7 @@ Public Class 訂單價格利潤明細表
         Else
             For i As Integer = 0 To DataGridView1.Rows.Count - 1
                 ConnOpen()
-                SQL1 = "SELECT 利潤表流水號 FROM 訂單價格利潤明細表 WHERE (資料流水號 LIKE '" & DataGridView1.Rows(i).Cells("資料流水號").Value & "')"
+                SQL1 = "SELECT 利潤表流水號 FROM " & 訂單資料表(7) & " WHERE (資料流水號 LIKE '" & DataGridView1.Rows(i).Cells("資料流水號").Value & "')"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
@@ -512,19 +522,21 @@ Public Class 訂單價格利潤明細表
                     CmdSet_For_dr() : conn.Close()
 
                     ConnOpen()
-                    SQL1 = "UPDATE 訂單控制表 SET  單價 = '" & DataGridView1.Rows(i).Cells("單價").Value & "', 總金額 = '" & DataGridView1.Rows(i).Cells("總金額").Value & "' " &
+                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET  單價 = '" & DataGridView1.Rows(i).Cells("單價").Value & "', 總金額 = '" & DataGridView1.Rows(i).Cells("總金額").Value & "' " &
                        "WHERE (資料流水號 LIKE '" & DataGridView1.Rows(i).Cells("資料流水號").Value & "')"
                     CmdSet_For_dr() : conn.Close()
                     ConnOpen()
-                    SQL1 = "INSERT INTO 訂單價格利潤明細表 (資料流水號, 天盾訂單號, 客戶流水號, FTYPrice, BasicPrice, Polybag, FOOTformOrPETform, Tooling, RubberBand, JHOOK, WaterResistant, P16VAT, EXWsaving, " &
-                       "Currency, Exchange, 年份, Quantity, 利潤表流水號, 審核) " &
-                       "VALUES ('" & DataGridView1.Rows(i).Cells("資料流水號").Value & "', '" & DataGridView1.Rows(i).Cells("訂單流水號").Value & "', '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "'," &
-                               "'" & DataGridView1.Rows(i).Cells("FTYPrice").Value & "', '" & DataGridView1.Rows(i).Cells("BasicPrice").Value & "', '" & DataGridView1.Rows(i).Cells("Polybag").Value & "'," &
-                               "'" & DataGridView1.Rows(i).Cells("FOOTorPET").Value & "', '" & DataGridView1.Rows(i).Cells("Tooling").Value & "', '" & DataGridView1.Rows(i).Cells("RubberBand").Value & "'," &
-                               "'" & DataGridView1.Rows(i).Cells("JHOOK").Value & "', '" & DataGridView1.Rows(i).Cells("WaterResistant").Value & "', '" & DataGridView1.Rows(i).Cells("P16VAT").Value & "'," &
-                               "'" & DataGridView1.Rows(i).Cells("EXWsaving").Value & "', '" & ComboBox2.Text & "', '" & DataGridView1.Rows(i).Cells("Exchange").Value & "'," &
-                               "'" & DataGridView1.Rows(i).Cells("年份").Value & "', '" & DataGridView1.Rows(i).Cells("Quantity").Value & "', '" & DataGridView1.Rows(i).Cells("利潤表流水號").Value & "'," &
-                               "'" & DataGridView1.Rows(i).Cells("審核").Value & "')"
+                    SQL1 = "INSERT INTO " & 訂單資料表(7) & " (資料流水號, 天盾訂單號, 客戶流水號, FTYPrice, BasicPrice, Polybag, FOOTformOrPETform, Tooling, RubberBand, JHOOK, WaterResistant, 
+                                                               P16VAT, EXWsaving, Currency, Exchange, 年份, Quantity, 利潤表流水號, 審核) 
+                            VALUES ('" & DataGridView1.Rows(i).Cells("資料流水號").Value & "', '" & DataGridView1.Rows(i).Cells("訂單流水號").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "', '" & DataGridView1.Rows(i).Cells("FTYPrice").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("BasicPrice").Value & "', '" & DataGridView1.Rows(i).Cells("Polybag").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("FOOTorPET").Value & "', '" & DataGridView1.Rows(i).Cells("Tooling").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("RubberBand").Value & "', '" & DataGridView1.Rows(i).Cells("JHOOK").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("WaterResistant").Value & "', '" & DataGridView1.Rows(i).Cells("P16VAT").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("EXWsaving").Value & "', '" & ComboBox2.Text & "', '" & DataGridView1.Rows(i).Cells("Exchange").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("年份").Value & "', '" & DataGridView1.Rows(i).Cells("Quantity").Value & "', 
+                                    '" & DataGridView1.Rows(i).Cells("利潤表流水號").Value & "', '" & DataGridView1.Rows(i).Cells("審核").Value & "')"
                     CmdSet_For_dr() : conn.Close()
                 End If
             Next i
@@ -558,11 +570,11 @@ Public Class 訂單價格利潤明細表
                 CmdSet_For_dr() : conn.Close()
 
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET  單價 = '" & DataGridView1.Rows(i).Cells("單價").Value & "', 總金額 = '" & DataGridView1.Rows(i).Cells("總金額").Value & "' " &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET  單價 = '" & DataGridView1.Rows(i).Cells("單價").Value & "', 總金額 = '" & DataGridView1.Rows(i).Cells("總金額").Value & "' " &
                        "WHERE (資料流水號 LIKE '" & DataGridView1.Rows(i).Cells("資料流水號").Value & "')"
                 CmdSet_For_dr() : conn.Close()
                 ConnOpen()
-                SQL1 = "UPDATE 訂單價格利潤明細表 SET  FTYPrice = '" & DataGridView1.Rows(i).Cells("FTYPrice").Value & "', BasicPrice = '" & DataGridView1.Rows(i).Cells("BasicPrice").Value & "', " &
+                SQL1 = "UPDATE " & 訂單資料表(7) & " SET  FTYPrice = '" & DataGridView1.Rows(i).Cells("FTYPrice").Value & "', BasicPrice = '" & DataGridView1.Rows(i).Cells("BasicPrice").Value & "', " &
                                                       "Polybag = '" & DataGridView1.Rows(i).Cells("Polybag").Value & "', FOOTformOrPETform = '" & DataGridView1.Rows(i).Cells("FOOTorPET").Value & "', " &
                                                       "Tooling = '" & DataGridView1.Rows(i).Cells("Tooling").Value & "', RubberBand = '" & DataGridView1.Rows(i).Cells("RubberBand").Value & "', " &
                                                       "JHOOK = '" & DataGridView1.Rows(i).Cells("JHOOK").Value & "', WaterResistant = '" & DataGridView1.Rows(i).Cells("WaterResistant").Value & "', " &
@@ -572,7 +584,6 @@ Public Class 訂單價格利潤明細表
                                                       "審核 = '" & DataGridView1.Rows(i).Cells("審核").Value & "' " &
                        "WHERE (利潤表流水號 LIKE '" & DataGridView1.Rows(i).Cells("利潤表流水號").Value & "')"
                 CmdSet_For_dr() : conn.Close()
-                TextBox18.Text = Format(Val((i / (DataGridView1.Rows.Count - 1)) * 100), "#,##0.0") & "%"
             Next i : ProgressBar1.Value = 0 : 最終數 = 0
             MsgBox("修改完成")
             CheckBox1.Checked = False : CheckBox2.Checked = True
@@ -587,11 +598,11 @@ Public Class 訂單價格利潤明細表
             aa = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
             If aa = MsgBoxResult.Ok Then
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET  單價 = '0.00', 總金額 = '0.00' " &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET  單價 = '0.00', 總金額 = '0.00' " &
                        "WHERE (訂單流水號 LIKE '" & TextBox1.Text & "')"
                 CmdSet_For_dr() : conn.Close()
                 ConnOpen()
-                SQL1 = "DELETE FROM 訂單價格利潤明細表 WHERE (天盾訂單號 = '" & TextBox1.Text & "')"
+                SQL1 = "DELETE FROM " & 訂單資料表(7) & " WHERE (天盾訂單號 = '" & TextBox1.Text & "')"
                 cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
                 MsgBox("刪除完成")
             End If
@@ -616,4 +627,10 @@ Public Class 訂單價格利潤明細表
             DataGridView1.Rows(i).Cells(16).Value = 1
         Next i
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid() : Set_未建檔清單() : Set_grid1() : Set_自動彙總1() : Set_格式()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid() : Set_未建檔清單() : Set_grid1() : Set_自動彙總1() : Set_格式()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/CXL訂單紀錄表.Designer.vb

@@ -28,6 +28,9 @@ Partial Class CXL訂單紀錄表
         Me.開啟訂單明細表_bt = New System.Windows.Forms.Button()
         Me.明細是否建檔_ch = New System.Windows.Forms.CheckBox()
         Me.訂單流水號_tb = New System.Windows.Forms.TextBox()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.关闭表单_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -89,11 +92,41 @@ Partial Class CXL訂單紀錄表
         Me.訂單流水號_tb.Size = New System.Drawing.Size(100, 23)
         Me.訂單流水號_tb.TabIndex = 328
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(527, 6)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 522
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(452, 6)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 521
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(411, 7)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 520
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         'CXL訂單紀錄表
         '
         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.Label20)
         Me.Controls.Add(Me.開啟訂單明細表_bt)
         Me.Controls.Add(Me.明細是否建檔_ch)
         Me.Controls.Add(Me.訂單流水號_tb)
@@ -114,5 +147,8 @@ Partial Class CXL訂單紀錄表
     Friend WithEvents 開啟訂單明細表_bt As Button
     Friend WithEvents 明細是否建檔_ch As CheckBox
     Friend WithEvents 訂單流水號_tb As TextBox
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/CXL訂單紀錄表.vb

@@ -14,7 +14,7 @@ Public Class CXL訂單紀錄表
     Private Sub Set_訂單清單()
         Set_DGV1載入前設定()
         SQL1 = "SELECT TOP(500) 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, GOODBOX, LEATHER, LEA_Note, " &
-                "CXL, CXLTime, 明細建檔 FROM 訂單控制表 WHERE (CXL = 1) ORDER BY 訂單流水號 DESC"
+                "CXL, CXLTime, 明細建檔 FROM " & 訂單資料表(1) & " WHERE (CXL = 1) ORDER BY 訂單流水號 DESC"
         Set_DGV1載入後設定()
     End Sub
     Private Sub Set_grid()
@@ -38,13 +38,15 @@ Public Class CXL訂單紀錄表
         PA = InputBox("請輸入要查詢的資料")
         SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, GOODBOX, LEATHER, LEA_Note, 
                        CXL, CXLTime, 明細建檔 " &
-               "FROM 訂單控制表 WHERE (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' " &
+               "FROM " & 訂單資料表(1) & " WHERE (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' " &
                               "OR 顏色 LIKE '%" & PA & "%' OR 楦型 LIKE '%" & PA & "%' OR 備註 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%' OR 訂單種類 LIKE '%" & PA & "%') " &
                               "AND (CXL = 1) ORDER BY 訂單流水號 DESC"
         PA = ""
     End Sub
     Private Sub CXL訂單紀錄表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+        訂單資料庫選擇.ShowDialog()
+
         訂單流水號_tb.Enabled = False : 明細是否建檔_ch.Enabled = False : 開啟訂單明細表_bt.Enabled = False
         Set_訂單清單() : Set_grid()
     End Sub
@@ -76,4 +78,10 @@ Public Class CXL訂單紀錄表
         PA = 訂單流水號_tb.Text
         訂單明細表.Show()
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/TENDENZA_STYLE_資料管理.Designer.vb

@@ -22,14 +22,14 @@ Partial Class TENDENZA_STYLE_資料管理
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.产品名称清单_dgv = New System.Windows.Forms.DataGridView()
         Me.Label1 = New System.Windows.Forms.Label()
-        Me.产品名称_tb = New System.Windows.Forms.TextBox()
+        Me.形體名稱_tb = New System.Windows.Forms.TextBox()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.项目编号_tb = New System.Windows.Forms.TextBox()
         Me.Label3 = New System.Windows.Forms.Label()
@@ -69,8 +69,8 @@ Partial Class TENDENZA_STYLE_資料管理
         '
         '产品名称清单_dgv
         '
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.产品名称清单_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        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(12, 12)
@@ -89,12 +89,12 @@ Partial Class TENDENZA_STYLE_資料管理
         Me.Label1.TabIndex = 331
         Me.Label1.Text = "Product Name"
         '
-        '产品名称_tb
+        '形體名稱_tb
         '
-        Me.产品名称_tb.Location = New System.Drawing.Point(974, 41)
-        Me.产品名称_tb.Name = "产品名称_tb"
-        Me.产品名称_tb.Size = New System.Drawing.Size(227, 23)
-        Me.产品名称_tb.TabIndex = 332
+        Me.形體名稱_tb.Location = New System.Drawing.Point(974, 41)
+        Me.形體名稱_tb.Name = "形體名稱_tb"
+        Me.形體名稱_tb.Size = New System.Drawing.Size(227, 23)
+        Me.形體名稱_tb.TabIndex = 332
         '
         'Label2
         '
@@ -237,17 +237,17 @@ Partial Class TENDENZA_STYLE_資料管理
         '
         '订单形體號清单_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.订单形體號清单_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.订单形體號清单_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.订单形體號清单_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.订单形體號清单_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.订单形體號清单_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.订单形體號清单_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.订单形體號清单_dgv.Location = New System.Drawing.Point(1207, 30)
         Me.订单形體號清单_dgv.Name = "订单形體號清单_dgv"
@@ -270,8 +270,8 @@ Partial Class TENDENZA_STYLE_資料管理
         '
         '订单形體號清单1_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.订单形體號清单1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.订单形體號清单1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.订单形體號清单1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.订单形體號清单1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.订单形體號清单1_dgv.Location = New System.Drawing.Point(1207, 357)
@@ -283,8 +283,8 @@ Partial Class TENDENZA_STYLE_資料管理
         '
         '订单形體號清单2_dgv
         '
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.订单形體號清单2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.订单形體號清单2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.订单形體號清单2_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.订单形體號清单2_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.订单形體號清单2_dgv.Location = New System.Drawing.Point(1207, 684)
@@ -428,7 +428,7 @@ Partial Class TENDENZA_STYLE_資料管理
         Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.项目编号_tb)
         Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.产品名称_tb)
+        Me.Controls.Add(Me.形體名稱_tb)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.产品名称清单_dgv)
         Me.Controls.Add(Me.项目编号清单_dgv)
@@ -448,7 +448,7 @@ Partial Class TENDENZA_STYLE_資料管理
 
     Friend WithEvents 产品名称清单_dgv As DataGridView
     Friend WithEvents Label1 As Label
-    Friend WithEvents 产品名称_tb As TextBox
+    Friend WithEvents 形體名稱_tb As TextBox
     Friend WithEvents Label2 As Label
     Friend WithEvents 项目编号_tb As TextBox
     Friend WithEvents Label3 As Label

TENDEN-MES-SYS/量產訂單管理/TENDENZA_STYLE_資料管理.vb

@@ -213,7 +213,7 @@ Public Class TENDENZA_STYLE_資料管理
         CmdSet_For_dr() : conn.Close()
     End Sub
     Private Sub DataGridView1_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 产品名称清单_dgv.CellClick
-        产品名称_tb.Text = 产品名称清单_dgv(1, e.RowIndex).Value.ToString : 项目编号_tb.Text = 产品名称清单_dgv(3, e.RowIndex).Value.ToString
+        形體名稱_tb.Text = 产品名称清单_dgv(1, e.RowIndex).Value.ToString : 项目编号_tb.Text = 产品名称清单_dgv(3, e.RowIndex).Value.ToString
         形體號_bt.Text = 产品名称清单_dgv(4, e.RowIndex).Value.ToString : 描述_tb.Text = 产品名称清单_dgv(5, e.RowIndex).Value.ToString
         季節_bt.Text = 产品名称清单_dgv(0, e.RowIndex).Value.ToString
         Set_DGV2載入前設定()
@@ -268,9 +268,9 @@ Public Class TENDENZA_STYLE_資料管理
         End If
     End Sub
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 新增_bt.Click
-        If 产品名称_tb.Text <> "" And 形體號_bt.Text <> "" And 季節_bt.Text <> "" Then
+        If 形體名稱_tb.Text <> "" And 形體號_bt.Text <> "" And 季節_bt.Text <> "" Then
             ConnOpen()
-            SQL1 = "SELECT 形體號 FROM 訂單控制表形體號清單 WHERE 形體號 LIKE '" & 产品名称_tb.Text & "'"
+            SQL1 = "SELECT 形體號 FROM 訂單控制表形體號清單 WHERE 形體號 LIKE '" & 形體名稱_tb.Text & "'"
             CmdSet_For_dr()
             If dr.Read() Then
                 OO = True : MsgBox("資料重複") : conn.Close() : Exit Sub
@@ -280,12 +280,12 @@ Public Class TENDENZA_STYLE_資料管理
 
             If OO = False Then
                 ConnOpen()
-                SQL1 = "INSERT INTO 訂單控制表形體號清單 (形體號) VALUES ('" & 产品名称_tb.Text & "')"
+                SQL1 = "INSERT INTO 訂單控制表形體號清單 (形體號) VALUES ('" & 形體名稱_tb.Text & "')"
                 CmdSet_For_dr() : conn.Close()
             End If
 
             ConnOpen()
-            SQL1 = "SELECT ProductName FROM STYLELIST WHERE ProductName LIKE '" & 产品名称_tb.Text & "'"
+            SQL1 = "SELECT ProductName FROM STYLELIST WHERE ProductName LIKE '" & 形體名稱_tb.Text & "'"
             CmdSet_For_dr()
             If dr.Read() Then
                 OO = True
@@ -296,7 +296,7 @@ Public Class TENDENZA_STYLE_資料管理
             If OO = False Then
                 ConnOpen()
                 SQL1 = "INSERT INTO STYLELIST ( ItemNumber, ProductName, Style, Description, 建立季節) " &
-                       "VALUES ('" & 项目编号_tb.Text & "', '" & 产品名称_tb.Text & "', '" & 形體號_bt.Text & "', '" & 描述_tb.Text & "', '" & 季節_bt.Text & "')"
+                       "VALUES ('" & 项目编号_tb.Text & "', '" & 形體名稱_tb.Text & "', '" & 形體號_bt.Text & "', '" & 描述_tb.Text & "', '" & 季節_bt.Text & "')"
                 CmdSet_For_dr() : conn.Close()
             End If
             If 形體號_bt.Text = "" Then
@@ -325,14 +325,14 @@ Public Class TENDENZA_STYLE_資料管理
         新增_bt.Enabled = False
     End Sub
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles 修改_bt.Click
-        If 产品名称_tb.Text <> "" Then
+        If 形體名稱_tb.Text <> "" Then
             conn.Close()
             ConnOpen()
-            SQL1 = "UPDATE 訂單控制表形體號清單 SET 形體號 = '" & 产品名称_tb.Text & "' WHERE (形體號 = '" & 产品名称_tb.Text & "')"
+            SQL1 = "UPDATE 訂單控制表形體號清單 SET 形體號 = '" & 形體名稱_tb.Text & "' WHERE (形體號 = '" & 形體名稱_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.ExecuteNonQuery() : conn.Close()
 
             ConnOpen()
-            SQL1 = "SELECT ProductName FROM STYLELIST WHERE ProductName LIKE '" & 产品名称_tb.Text & "'"
+            SQL1 = "SELECT ProductName FROM STYLELIST WHERE ProductName LIKE '" & 形體名稱_tb.Text & "'"
             CmdSet_For_dr()
             If dr.Read() Then
                 OO = True
@@ -343,12 +343,12 @@ Public Class TENDENZA_STYLE_資料管理
             If OO = True Then
                 ConnOpen()
                 SQL1 = "UPDATE STYLELIST SET ItemNumber = '" & 项目编号_tb.Text & "', Style = '" & 形體號_bt.Text & "', Description = '" & 描述_tb.Text & "', 建立季節 = '" & 季節_bt.Text & "' " &
-                       "WHERE (ProductName = '" & 产品名称_tb.Text & "')"
+                       "WHERE (ProductName = '" & 形體名稱_tb.Text & "')"
                 cmd.CommandText = SQL1 : cmd.ExecuteNonQuery() : conn.Close()
             ElseIf OO = False Then
                 ConnOpen()
                 SQL1 = "INSERT INTO STYLELIST ( ItemNumber, ProductName, Style, Description, 建立季節) " &
-                       "VALUES ('" & 项目编号_tb.Text & "', '" & 产品名称_tb.Text & "', '" & 形體號_bt.Text & "', '" & 描述_tb.Text & "', '" & 季節_bt.Text & "')"
+                       "VALUES ('" & 项目编号_tb.Text & "', '" & 形體名稱_tb.Text & "', '" & 形體號_bt.Text & "', '" & 描述_tb.Text & "', '" & 季節_bt.Text & "')"
                 CmdSet_For_dr() : conn.Close()
             End If
             If 形體號_bt.Text = "" Then
@@ -380,18 +380,18 @@ Public Class TENDENZA_STYLE_資料管理
         aa = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
             ConnOpen()
-            SQL1 = "DELETE FROM 訂單控制表形體號清單 WHERE (形體號 = '" & 产品名称_tb.Text & "')"
+            SQL1 = "DELETE FROM 訂單控制表形體號清單 WHERE (形體號 = '" & 形體名稱_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
 
             ConnOpen()
-            SQL1 = "DELETE FROM STYLELIST WHERE (ProductName = '" & 产品名称_tb.Text & "')"
+            SQL1 = "DELETE FROM STYLELIST WHERE (ProductName = '" & 形體名稱_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             Set_TENDENZASTYLE清單() : Set_grid1()
             MsgBox("刪除完成")
         End If
     End Sub
     Private Sub Button4_Click(sender As Object, e As EventArgs) Handles 關閉_bt.Click
-        PP1 = 产品名称_tb.Text : PP2 = 形體號_bt.Text
+        PP1 = 形體名稱_tb.Text : PP2 = 形體號_bt.Text
         鞋型圖片導入資料庫.Button23_Click()
         Me.Close()
     End Sub
@@ -407,11 +407,11 @@ Public Class TENDENZA_STYLE_資料管理
         Set_DGV1載入後設定() : Set_grid1()
     End Sub
     Private Sub Button7_Click(sender As Object, e As EventArgs) Handles 清空資料_bt.Click
-        产品名称_tb.Text = "" : 项目编号_tb.Text = "" : 形體號_bt.Text = "" : 描述_tb.Text = "" : 季節_bt.Text = "" : 新增_bt.Enabled = True
+        形體名稱_tb.Text = "" : 项目编号_tb.Text = "" : 形體號_bt.Text = "" : 描述_tb.Text = "" : 季節_bt.Text = "" : 新增_bt.Enabled = True
     End Sub
     Private Sub TextBox5_TextChanged(sender As Object, e As EventArgs) Handles 季節_bt.TextChanged
         If CC(68) = True Then
-            If 产品名称_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
+            If 形體名稱_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
                 If CC(70) = True Then : 修改_bt.Enabled = True : Else : 修改_bt.Enabled = False : End If
             Else
                 修改_bt.Enabled = True
@@ -420,9 +420,9 @@ Public Class TENDENZA_STYLE_資料管理
             修改_bt.Enabled = False
         End If
     End Sub
-    Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles 产品名称_tb.TextChanged
+    Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles 形體名稱_tb.TextChanged
         If CC(68) = True Then
-            If 产品名称_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
+            If 形體名稱_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
                 If CC(70) = True Then : 修改_bt.Enabled = True : Else : 修改_bt.Enabled = False : End If
             Else
                 修改_bt.Enabled = True
@@ -433,7 +433,7 @@ Public Class TENDENZA_STYLE_資料管理
     End Sub
     Private Sub TextBox2_TextChanged(sender As Object, e As EventArgs) Handles 项目编号_tb.TextChanged
         If CC(68) = True Then
-            If 产品名称_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
+            If 形體名稱_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
                 If CC(70) = True Then : 修改_bt.Enabled = True : Else : 修改_bt.Enabled = False : End If
             Else
                 修改_bt.Enabled = True
@@ -444,7 +444,7 @@ Public Class TENDENZA_STYLE_資料管理
     End Sub
     Private Sub TextBox3_TextChanged(sender As Object, e As EventArgs) Handles 形體號_bt.TextChanged
         If CC(68) = True Then
-            If 产品名称_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
+            If 形體名稱_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
                 If CC(70) = True Then : 修改_bt.Enabled = True : Else : 修改_bt.Enabled = False : End If
             Else
                 修改_bt.Enabled = True
@@ -455,7 +455,7 @@ Public Class TENDENZA_STYLE_資料管理
     End Sub
     Private Sub TextBox4_TextChanged(sender As Object, e As EventArgs) Handles 描述_tb.TextChanged
         If CC(68) = True Then
-            If 产品名称_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
+            If 形體名稱_tb.Text <> "" And 项目编号_tb.Text <> "" And 形體號_bt.Text <> "" And 描述_tb.Text <> "" And 季節_bt.Text <> "" Then
                 If CC(70) = True Then : 修改_bt.Enabled = True : Else : 修改_bt.Enabled = False : End If
             Else
                 修改_bt.Enabled = True

TENDEN-MES-SYS/量產訂單管理/出貨明細表.Designer.vb

@@ -58,6 +58,9 @@ Partial Class 出貨明細表
         Me.日期4_dtp = New System.Windows.Forms.DateTimePicker()
         Me.日期5_dtp = New System.Windows.Forms.DateTimePicker()
         Me.列印成EXCEL_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.訂單明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.驗貨報告圖庫_pb, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -80,9 +83,9 @@ Partial Class 出貨明細表
         '
         Me.搜尋_bt.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.搜尋_bt.ForeColor = System.Drawing.Color.Red
-        Me.搜尋_bt.Location = New System.Drawing.Point(1094, 7)
+        Me.搜尋_bt.Location = New System.Drawing.Point(1094, 6)
         Me.搜尋_bt.Name = "搜尋_bt"
-        Me.搜尋_bt.Size = New System.Drawing.Size(115, 83)
+        Me.搜尋_bt.Size = New System.Drawing.Size(115, 53)
         Me.搜尋_bt.TabIndex = 303
         Me.搜尋_bt.Text = "搜尋"
         Me.搜尋_bt.UseVisualStyleBackColor = True
@@ -386,18 +389,48 @@ Partial Class 出貨明細表
         '
         Me.列印成EXCEL_bt.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.列印成EXCEL_bt.ForeColor = System.Drawing.Color.Black
-        Me.列印成EXCEL_bt.Location = New System.Drawing.Point(1215, 7)
+        Me.列印成EXCEL_bt.Location = New System.Drawing.Point(1215, 6)
         Me.列印成EXCEL_bt.Name = "列印成EXCEL_bt"
-        Me.列印成EXCEL_bt.Size = New System.Drawing.Size(115, 83)
+        Me.列印成EXCEL_bt.Size = New System.Drawing.Size(115, 53)
         Me.列印成EXCEL_bt.TabIndex = 544
         Me.列印成EXCEL_bt.Text = "列印成EXCEL"
         Me.列印成EXCEL_bt.UseVisualStyleBackColor = True
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(1219, 62)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 547
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(1141, 62)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 546
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(1098, 61)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 545
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         '出貨明細表
         '
         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.Label20)
         Me.Controls.Add(Me.列印成EXCEL_bt)
         Me.Controls.Add(Me.RLF1_cb)
         Me.Controls.Add(Me.Label4)
@@ -480,5 +513,8 @@ Partial Class 出貨明細表
     Friend WithEvents 日期4_dtp As DateTimePicker
     Friend WithEvents 日期5_dtp As DateTimePicker
     Friend WithEvents 列印成EXCEL_bt As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/出貨明細表.vb

@@ -16,21 +16,35 @@ Public Class 出貨明細表
     Private Sub Set_訂單清單()
         Set_DGV1載入前設定()
         If PA = "" Then
-            SQL1 = "SELECT 貨款匯入出款明細表.貨款流水號, 貨款匯入出款明細表.訂單流水號, 貨款匯入出款明細表.年份季度, 貨款匯入出款明細表.客戶訂單號, 貨款匯入出款明細表.形體號, " &
-                   "貨款匯入出款明細表.顏色, " &
-                   "貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 訂單控制表.備註, 訂單控制表.生產工廠, 訂單控制表.訂單種類, 訂單控制表.客戶交期, " &
-                   "訂單控制表.工廠回復交期, 貨款匯入出款明細表.實際離廠日, 訂單控制表.明細建檔, 訂單控制表.驗貨報告圖片 FROM 貨款匯入出款明細表 LEFT OUTER JOIN 訂單控制表 ON " &
-                   "貨款匯入出款明細表.資料流水號 = 訂單控制表.資料流水號 " & kkk1 & kkk2 & kkk3 & kkk4 & kkk5 & kkk6 & "  " &
-                   "ORDER BY 貨款匯入出款明細表.訂單流水號 DESC, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 貨款匯入出款明細表.楦型"
+            SQL1 = "SELECT  貨款匯入出款明細表.貨款流水號, 貨款匯入出款明細表.訂單流水號, 貨款匯入出款明細表.年份季度, 
+                            貨款匯入出款明細表.客戶訂單號, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
+                            貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 
+                            " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, 
+                            " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 貨款匯入出款明細表.實際離廠日, 
+                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片
+                    FROM    貨款匯入出款明細表 INNER JOIN
+                            " & 訂單資料表(1) & " ON 貨款匯入出款明細表.顏色 = " & 訂單資料表(1) & ".顏色 AND 
+                            貨款匯入出款明細表.楦型 = " & 訂單資料表(1) & ".楦型 AND 
+                            貨款匯入出款明細表.形體號 = " & 訂單資料表(1) & ".形體號 AND 
+                            貨款匯入出款明細表.訂單流水號 = " & 訂單資料表(1) & ".訂單流水號 " & kkk1 & kkk2 & kkk3 & kkk4 & kkk5 & kkk6 & "
+                    ORDER BY   貨款匯入出款明細表.訂單流水號 DESC, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
+                            貨款匯入出款明細表.楦型"
         Else
-            SQL1 = "SELECT 貨款匯入出款明細表.貨款流水號, 貨款匯入出款明細表.訂單流水號, 貨款匯入出款明細表.年份季度, 貨款匯入出款明細表.客戶訂單號, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, " &
-                   "貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 訂單控制表.備註, 訂單控制表.生產工廠, 訂單控制表.訂單種類, 訂單控制表.客戶交期, " &
-                   "訂單控制表.工廠回復交期, 貨款匯入出款明細表.實際離廠日, 訂單控制表.明細建檔, 訂單控制表.驗貨報告圖片 " &
-                   "FROM 貨款匯入出款明細表 LEFT OUTER JOIN 訂單控制表 ON 貨款匯入出款明細表.資料流水號 = 訂單控制表.資料流水號 " &
-                   "" & kkk1 & kkk2 & kkk3 & kkk4 & kkk5 & kkk6 & "AND (貨款匯入出款明細表.訂單流水號 LIKE '%" & PA & "%' OR 貨款匯入出款明細表.客戶訂單號 LIKE '%" & PA & "%' OR " &
-                   "貨款匯入出款明細表.形體號 LIKE '%" & PA & "%' OR 貨款匯入出款明細表.顏色 LIKE '%" & PA & "%' OR 貨款匯入出款明細表.楦型 LIKE '%" & PA & "%' OR " &
-                   "訂單控制表.備註 LIKE '%" & PA & "%') " &
-                   "ORDER BY 貨款匯入出款明細表.訂單流水號 DESC, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 貨款匯入出款明細表.楦型"
+            SQL1 = "SELECT  貨款匯入出款明細表.貨款流水號, 貨款匯入出款明細表.訂單流水號, 貨款匯入出款明細表.年份季度, 
+                            貨款匯入出款明細表.客戶訂單號, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
+                            貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 
+                            " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, 
+                            " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 貨款匯入出款明細表.實際離廠日, 
+                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片
+                    FROM    貨款匯入出款明細表 INNER JOIN
+                            " & 訂單資料表(1) & " ON 貨款匯入出款明細表.顏色 = " & 訂單資料表(1) & ".顏色 AND 
+                            貨款匯入出款明細表.楦型 = " & 訂單資料表(1) & ".楦型 AND 
+                            貨款匯入出款明細表.形體號 = " & 訂單資料表(1) & ".形體號 AND 
+                            貨款匯入出款明細表.訂單流水號 = " & 訂單資料表(1) & ".訂單流水號 " & kkk1 & kkk2 & kkk3 & kkk4 & kkk5 & kkk6 & " AND 
+                           (貨款匯入出款明細表.訂單流水號 LIKE '%" & PA & "%' OR 貨款匯入出款明細表.客戶訂單號 LIKE '%" & PA & "%' OR 貨款匯入出款明細表.形體號 LIKE '%" & PA & "%' OR 
+                            貨款匯入出款明細表.顏色 LIKE '%" & PA & "%' OR 貨款匯入出款明細表.楦型 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') 
+                    ORDER BY   貨款匯入出款明細表.訂單流水號 DESC, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
+                            貨款匯入出款明細表.楦型"
         End If
         列印用SQL = SQL1
         Set_DGV1載入後設定()
@@ -86,9 +100,11 @@ 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()
+
         驗貨報告編號_tb.Enabled = False : 明細是否建檔_cb.Enabled = False : 開啟訂單明細表_bt.Enabled = False
         ComboBox1下拉表單資料載入() : ComboBox5下拉表單資料載入() : ComboBox6下拉表單資料載入()
-        kkk1 = "WHERE (訂單控制表.CXL IS NULL or 訂單控制表.CXL = 0)"
+        kkk1 = "WHERE (" & 訂單資料表(1) & ".CXL IS NULL or " & 訂單資料表(1) & ".CXL = 0)"
         Set_訂單清單()
     End Sub
     Private Sub DataGridView1_CellClick(ByVal sender As Object, ByVal e As DataGridViewCellEventArgs) Handles 訂單明細表_dgv.CellClick
@@ -186,42 +202,42 @@ Public Class 出貨明細表
     End Sub
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 下拉选择_cb.SelectedIndexChanged
         If SEASON_cb.Checked = True Then
-            kkk1 = "WHERE (訂單控制表.CXL IS NULL or 訂單控制表.CXL = 0) AND 貨款匯入出款明細表.年份季度 LIKE '" & 下拉选择_cb.Text & "' "
-        Else : kkk1 = "WHERE ((訂單控制表.CXL IS NULL or 訂單控制表.CXL = 0)) " : End If
+            kkk1 = "WHERE (" & 訂單資料表(1) & ".CXL IS NULL or " & 訂單資料表(1) & ".CXL = 0) AND 貨款匯入出款明細表.年份季度 LIKE '" & 下拉选择_cb.Text & "' "
+        Else : kkk1 = "WHERE ((" & 訂單資料表(1) & ".CXL IS NULL or " & 訂單資料表(1) & ".CXL = 0)) " : End If
     End Sub
     Private Sub ComboBox6_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 下拉选择1_cb.SelectedIndexChanged
         If DIV_cb.Checked = True Then
-            kkk2 = "AND 訂單控制表.訂單種類 LIKE '" & 下拉选择1_cb.Text & "' "
+            kkk2 = "AND " & 訂單資料表(1) & ".訂單種類 LIKE '" & 下拉选择1_cb.Text & "' "
         Else : kkk2 = "" : End If
     End Sub
     Private Sub ComboBox5_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 下拉选择2_cb.SelectedIndexChanged
         If FTY_cb.Checked = True Then
-            kkk3 = " AND 訂單控制表.生產工廠 LIKE '" & 下拉选择2_cb.Text & "' "
+            kkk3 = " AND " & 訂單資料表(1) & ".生產工廠 LIKE '" & 下拉选择2_cb.Text & "' "
         Else : kkk3 = "" : End If
     End Sub
     Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles SEASON_cb.Click
         If SEASON_cb.Checked = True Then
-            kkk1 = "WHERE (訂單控制表.CXL IS NULL or 訂單控制表.CXL = 0) AND 貨款匯入出款明細表.年份季度 LIKE '" & 下拉选择_cb.Text & "' "
-        Else : kkk1 = "WHERE ((訂單控制表.CXL IS NULL or 訂單控制表.CXL = 0)) " : End If
+            kkk1 = "WHERE (" & 訂單資料表(1) & ".CXL IS NULL or " & 訂單資料表(1) & ".CXL = 0) AND 貨款匯入出款明細表.年份季度 LIKE '" & 下拉选择_cb.Text & "' "
+        Else : kkk1 = "WHERE ((" & 訂單資料表(1) & ".CXL IS NULL or " & 訂單資料表(1) & ".CXL = 0)) " : End If
     End Sub
     Private Sub CheckBox8_CheckedChanged(sender As Object, e As EventArgs) Handles DIV_cb.Click
         If DIV_cb.Checked = True Then
-            kkk2 = "AND 訂單控制表.訂單種類 LIKE '" & 下拉选择1_cb.Text & "' "
+            kkk2 = "AND " & 訂單資料表(1) & ".訂單種類 LIKE '" & 下拉选择1_cb.Text & "' "
         Else : kkk2 = "" : End If
     End Sub
     Private Sub CheckBox7_CheckedChanged(sender As Object, e As EventArgs) Handles FTY_cb.Click
         If FTY_cb.Checked = True Then
-            kkk3 = " AND 訂單控制表.生產工廠 LIKE '" & 下拉选择2_cb.Text & "' "
+            kkk3 = " AND " & 訂單資料表(1) & ".生產工廠 LIKE '" & 下拉选择2_cb.Text & "' "
         Else : kkk3 = "" : End If
     End Sub
     Private Sub CheckBox6_CheckedChanged(sender As Object, e As EventArgs) Handles CUST_cb.Click
         If CUST_cb.Checked = True Then
-            kkk4 = " AND 訂單控制表.客戶交期 BETWEEN '" & Format(日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期1_dtp.Value, "yyyy/MM/dd") & "' "
+            kkk4 = " AND " & 訂單資料表(1) & ".客戶交期 BETWEEN '" & Format(日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期1_dtp.Value, "yyyy/MM/dd") & "' "
         Else : kkk4 = "" : End If
     End Sub
     Private Sub CheckBox3_CheckedChanged(sender As Object, e As EventArgs) Handles FTY1_cb.Click
         If FTY1_cb.Checked = True Then
-            kkk5 = " AND 訂單控制表.工廠回復交期 BETWEEN '" & Format(日期2_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期3_dtp.Value, "yyyy/MM/dd") & "' "
+            kkk5 = " AND " & 訂單資料表(1) & ".工廠回復交期 BETWEEN '" & Format(日期2_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期3_dtp.Value, "yyyy/MM/dd") & "' "
         Else : kkk5 = "" : End If
     End Sub
     Private Sub CheckBox4_CheckedChanged(sender As Object, e As EventArgs) Handles RLF1_cb.Click
@@ -231,22 +247,22 @@ Public Class 出貨明細表
     End Sub
     Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles 日期_dtp.ValueChanged
         If CUST_cb.Checked = True Then
-            kkk4 = " AND 訂單控制表.客戶交期 BETWEEN '" & Format(日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期1_dtp.Value, "yyyy/MM/dd") & "' "
+            kkk4 = " AND " & 訂單資料表(1) & ".客戶交期 BETWEEN '" & Format(日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期1_dtp.Value, "yyyy/MM/dd") & "' "
         Else : kkk4 = "" : End If
     End Sub
     Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles 日期1_dtp.ValueChanged
         If CUST_cb.Checked = True Then
-            kkk4 = " AND 訂單控制表.客戶交期 BETWEEN '" & Format(日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期1_dtp.Value, "yyyy/MM/dd") & "' "
+            kkk4 = " AND " & 訂單資料表(1) & ".客戶交期 BETWEEN '" & Format(日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期1_dtp.Value, "yyyy/MM/dd") & "' "
         Else : kkk4 = "" : End If
     End Sub
     Private Sub DateTimePicker3_ValueChanged(sender As Object, e As EventArgs) Handles 日期2_dtp.ValueChanged
         If FTY1_cb.Checked = True Then
-            kkk5 = " AND 訂單控制表.工廠回復交期 BETWEEN '" & Format(日期2_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期3_dtp.Value, "yyyy/MM/dd") & "' "
+            kkk5 = " AND " & 訂單資料表(1) & ".工廠回復交期 BETWEEN '" & Format(日期2_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期3_dtp.Value, "yyyy/MM/dd") & "' "
         Else : kkk5 = "" : End If
     End Sub
     Private Sub DateTimePicker4_ValueChanged(sender As Object, e As EventArgs) Handles 日期3_dtp.ValueChanged
         If FTY1_cb.Checked = True Then
-            kkk5 = " AND 訂單控制表.工廠回復交期 BETWEEN '" & Format(日期2_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期3_dtp.Value, "yyyy/MM/dd") & "' "
+            kkk5 = " AND " & 訂單資料表(1) & ".工廠回復交期 BETWEEN '" & Format(日期2_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(日期3_dtp.Value, "yyyy/MM/dd") & "' "
         Else : kkk5 = "" : End If
     End Sub
     Private Sub DateTimePicker5_ValueChanged(sender As Object, e As EventArgs) Handles 日期4_dtp.ValueChanged
@@ -262,4 +278,12 @@ Public Class 出貨明細表
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 列印成EXCEL_bt.Click
         列印_出貨明細表.ShowDialog()
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : kkk1 = "WHERE (" & 訂單資料表(1) & ".CXL IS NULL or " & 訂單資料表(1) & ".CXL = 0)"
+        Set_訂單清單()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : kkk1 = "WHERE (" & 訂單資料表(1) & ".CXL IS NULL or " & 訂單資料表(1) & ".CXL = 0)"
+        Set_訂單清單()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/列印_周進度表.vb

@@ -31,20 +31,23 @@ Public Class 列印_周進度表
         Set_DGV1載入前設定()
         If OPEXC(0) = True Then
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, Requested_XF, " &
-                   "Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 FROM 訂單控制表 " &
+                   "Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 FROM " & 訂單資料表(1) & " " &
                    "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 = 0) AND ((LEFT(客戶交期, 4) LIKE '" & Year(Today) & "') or (LEFT(客戶交期, 4) LIKE '" & Year(Today) + 1 & "')) " &
                    "ORDER BY   訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
         ElseIf OPEXC(1) = True Then
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date , 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, " &
-               "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 FROM 訂單控制表 " &
+               "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 
+                FROM " & 訂單資料表(1) & " " &
                "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'JH') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "
         ElseIf OPEXC(2) = True Then
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date , 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, " &
-               "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 FROM 訂單控制表 " &
+               "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 
+                FROM " & 訂單資料表(1) & " " &
                "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'SK') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "
         ElseIf OPEXC(3) = True Then
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date , 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, " &
-               "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 FROM 訂單控制表 " &
+               "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號 
+                FROM " & 訂單資料表(1) & " " &
                "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'NJ') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "
         End If
         Set_DGV1載入後設定()

TENDEN-MES-SYS/量產訂單管理/列印_周進度表T1_T4.vb

@@ -17,42 +17,36 @@ Public Class 列印_周進度表T1_T4
     Public Property ThisWorkbook As Object
     Public Property ActiveWorkbook As Object
     Dim N1 As Integer = 0
-    Private Sub Set_DGV1載入前設定()
+    Private Sub Set_訂單清單()
         DataGridView1.DataSource = Nothing : ds.Clear()
         DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         DataGridView1.ColumnHeadersHeight = 25
         DataGridView1.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()
-    End Sub
-    Private Sub Set_訂單清單()
-        Set_DGV1載入前設定()
         If OPEXC(0) = True Then
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片 FROM 訂單控制表 " &
+                   "訂單流水號, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                    "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 = 0) AND ((LEFT(客戶交期, 4) LIKE '" & Year(Today) & "') OR (LEFT(客戶交期, 4) LIKE '" & Year(Today) - 1 & "') OR 
                    (LEFT(客戶交期, 4) LIKE '" & Year(Today) - 2 & "')) " &
                    "ORDER BY   訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
         ElseIf OPEXC(1) = True Then
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片 FROM 訂單控制表 " &
+                   "訂單流水號, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                   "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'JH') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "
         ElseIf OPEXC(2) = True Then
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片 FROM 訂單控制表 " &
+                   "訂單流水號, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                   "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'SK') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "
         ElseIf OPEXC(3) = True Then
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片 FROM 訂單控制表 " &
+                   "訂單流水號, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                   "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'NJ') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "
         End If
-        Set_DGV1載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_格式設定()
         DataGridView1.Visible = False

TENDEN-MES-SYS/量產訂單管理/列印_生產進度表.vb

@@ -16,70 +16,74 @@ Public Class 列印_生產進度表
     Public Property ThisWorkbook As Object
     Public Property ActiveWorkbook As Object
     Dim N1 As Integer = 0
-    Private Sub Set_DGV1載入前設定()
+    Private Sub Set_訂單清單()
         DataGridView1.DataSource = Nothing : ds.Clear()
         DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         DataGridView1.ColumnHeadersHeight = 25
         DataGridView1.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()
-    End Sub
-    Private Sub Set_訂單清單()
-        Set_DGV1載入前設定()
         If CheckBox7.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf NJ_cb.Checked = True And CheckBox6.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'NJ') ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf SK_cb.Checked = True And CheckBox5.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'SK')  ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf JH_cb.Checked = True And CheckBox4.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期,
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'JH')  ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf NJ_cb.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'NJ') AND 訂單種類 NOT LIKE '%QVC%' ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf SK_cb.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'SK') AND 訂單種類 NOT LIKE '%QVC%'  ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf JH_cb.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'JH') AND 訂單種類 NOT LIKE '%QVC%'  ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf CheckBox6.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'NJ') AND 訂單種類 LIKE '%QVC%' ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf CheckBox5.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'SK') AND 訂單種類 LIKE '%QVC%'  ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         ElseIf CheckBox4.Checked = True Then
-            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
+            SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 
+                    七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'JH') AND 訂單種類 LIKE '%QVC%'  ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         End If
-        Set_DGV1載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_格式設定()
         DataGridView1.Visible = False

TENDEN-MES-SYS/量產訂單管理/列印_訂單明細.vb

@@ -14,19 +14,17 @@ Public Class 列印_訂單明細
     Dim xlApp As Microsoft.Office.Interop.Excel.Application
     Dim xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
-    Private Sub Set_DGV1載入前設定()
+    Private Sub Set_訂單清單()
         DataGridView1.DataSource = Nothing : ds.Clear()
         DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         DataGridView1.ColumnHeadersHeight = 25
         DataGridView1.AllowUserToAddRows = False
         ConnOpen()
-    End Sub
-    Private Sub Set_DGV1載入後設定()
+
+        SQL1 = 列印用SQL
+
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
     End Sub
-    Private Sub Set_訂單清單()
-        Set_DGV1載入前設定() : SQL1 = 列印用SQL : Set_DGV1載入後設定()
-    End Sub
     Private Sub Set_格式設定()
         DataGridView1.Visible = False
     End Sub
@@ -34,7 +32,6 @@ Public Class 列印_訂單明細
         FormBorderStyle = FormBorderStyle.SizableToolWindow : ControlBox = False
         Set_訂單清單() : Set_格式設定()
     End Sub
-
     Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click
         xlApp = CType(CreateObject("Excel.Application"), Microsoft.Office.Interop.Excel.Application)
         xlBook = xlApp.Workbooks.Add

TENDEN-MES-SYS/量產訂單管理/列印_訂單明細表.vb

@@ -14,35 +14,32 @@ Public Class 列印_訂單明細表
     Dim xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
     ReadOnly 位置1 As String
-    Private Sub Set_格式設定()
-
-    End Sub
     Private Sub Set_訂單清單1()
         清單_dgv.DataSource = Nothing : ds.Clear()
         清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         清單_dgv.ColumnHeadersHeight = 25
         清單_dgv.AllowUserToAddRows = False
         ConnOpen()
-        SQL1 = "SELECT      dbo.訂單控制表.訂單流水號, dbo.訂單控制表.客戶訂單號, dbo.訂單明細表.ItemNumber, 
-                            dbo.訂單明細表.ProductName, dbo.訂單明細表.Color, dbo.訂單明細表.DM, dbo.訂單明細表.[5], 
-                            dbo.訂單明細表.[5.5], dbo.訂單明細表.[6], dbo.訂單明細表.[6.5], dbo.訂單明細表.[7], dbo.訂單明細表.[7.5], 
-                            dbo.訂單明細表.[8], dbo.訂單明細表.[8.5], dbo.訂單明細表.[9], dbo.訂單明細表.[9.5], dbo.訂單明細表.[10], 
-                            dbo.訂單明細表.[10.5], dbo.訂單明細表.[11], dbo.訂單明細表.[11.5], dbo.訂單明細表.[12], 
-                            dbo.訂單明細表.[12.5], dbo.訂單明細表.[13], dbo.訂單明細表.[14], 
-                            dbo.訂單明細表.[5] + dbo.訂單明細表.[5.5] + dbo.訂單明細表.[6] + dbo.訂單明細表.[6.5] + dbo.訂單明細表.[7] +
-                             dbo.訂單明細表.[7.5] + dbo.訂單明細表.[8] + dbo.訂單明細表.[8.5] + dbo.訂單明細表.[9] + dbo.訂單明細表.[9.5]
-                             + dbo.訂單明細表.[10] + dbo.訂單明細表.[10.5] + dbo.訂單明細表.[11] + dbo.訂單明細表.[11.5] + dbo.訂單明細表.[12]
-                             + dbo.訂單明細表.[12.5] + dbo.訂單明細表.[13] + dbo.訂單明細表.[14] AS Total, dbo.訂單控制表.客戶交期, 
-                            dbo.訂單控制表.訂單種類, dbo.訂單控制表.備註, dbo.訂單控制表.Confirm_XF
-                 FROM       dbo.訂單控制表 LEFT OUTER JOIN
-                            dbo.訂單明細表 ON dbo.訂單控制表.訂單流水號 = dbo.訂單明細表.天盾流水號 AND 
-                            dbo.訂單控制表.客戶訂單號 = dbo.訂單明細表.客戶訂單號 AND 
-                            dbo.訂單控制表.形體號 = dbo.訂單明細表.ProductName AND 
-                            dbo.訂單控制表.顏色 = dbo.訂單明細表.Color AND dbo.訂單控制表.楦型 = dbo.訂單明細表.DM
-                 WHERE     (dbo.訂單控制表.CXL = 0 OR
-                            dbo.訂單控制表.CXL IS NULL) AND (dbo.訂單控制表.訂單數量 - dbo.訂單控制表.出貨數量 <> 0)
-                 ORDER BY   dbo.訂單控制表.客戶訂單號, dbo.訂單明細表.ItemNumber, dbo.訂單明細表.ProductName, 
-                            dbo.訂單明細表.Color, dbo.訂單明細表.DM"
+        SQL1 = "SELECT      " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, 
+                            " & 訂單資料表(5) & ".ProductName, " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM, " & 訂單資料表(5) & ".[5], 
+                            " & 訂單資料表(5) & ".[5.5], " & 訂單資料表(5) & ".[6], " & 訂單資料表(5) & ".[6.5], " & 訂單資料表(5) & ".[7], " & 訂單資料表(5) & ".[7.5], 
+                            " & 訂單資料表(5) & ".[8], " & 訂單資料表(5) & ".[8.5], " & 訂單資料表(5) & ".[9], " & 訂單資料表(5) & ".[9.5], " & 訂單資料表(5) & ".[10], 
+                            " & 訂單資料表(5) & ".[10.5], " & 訂單資料表(5) & ".[11], " & 訂單資料表(5) & ".[11.5], " & 訂單資料表(5) & ".[12], 
+                            " & 訂單資料表(5) & ".[12.5], " & 訂單資料表(5) & ".[13], " & 訂單資料表(5) & ".[14], 
+                            " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + " & 訂單資料表(5) & ".[6] + " & 訂單資料表(5) & ".[6.5] + " & 訂單資料表(5) & ".[7] +
+                             " & 訂單資料表(5) & ".[7.5] + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + " & 訂單資料表(5) & ".[9] + " & 訂單資料表(5) & ".[9.5]
+                             + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5] + " & 訂單資料表(5) & ".[11] + " & 訂單資料表(5) & ".[11.5] + " & 訂單資料表(5) & ".[12]
+                             + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] + " & 訂單資料表(5) & ".[14] AS Total, " & 訂單資料表(1) & ".客戶交期, 
+                            " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".Confirm_XF
+                 FROM       " & 訂單資料表(1) & " LEFT OUTER JOIN
+                            " & 訂單資料表(5) & " ON " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(5) & ".天盾流水號 AND 
+                            " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(5) & ".客戶訂單號 AND 
+                            " & 訂單資料表(1) & ".形體號 = " & 訂單資料表(5) & ".ProductName AND 
+                            " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(5) & ".Color AND " & 訂單資料表(1) & ".楦型 = " & 訂單資料表(5) & ".DM
+                 WHERE     (" & 訂單資料表(1) & ".CXL = 0 OR
+                            " & 訂單資料表(1) & ".CXL IS NULL) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0)
+                 ORDER BY   " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, " & 訂單資料表(5) & ".ProductName, 
+                            " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM"
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 清單_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub 列印_訂單明細表_Load(sender As Object, e As EventArgs) Handles MyBase.Load

TENDEN-MES-SYS/量產訂單管理/周進度表.Designer.vb

@@ -52,6 +52,9 @@ Partial Class 周進度表
         Me.Button6 = New System.Windows.Forms.Button()
         Me.Button7 = New System.Windows.Forms.Button()
         Me.Button8 = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.訂單種類_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.驗貨報告圖片_pb, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -186,11 +189,11 @@ Partial Class 周進度表
         '注释_lb
         '
         Me.注释_lb.AutoSize = True
-        Me.注释_lb.Font = New System.Drawing.Font("微軟正黑體", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.注释_lb.Font = New System.Drawing.Font("微軟正黑體", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.注释_lb.ForeColor = System.Drawing.Color.Red
         Me.注释_lb.Location = New System.Drawing.Point(12, 93)
         Me.注释_lb.Name = "注释_lb"
-        Me.注释_lb.Size = New System.Drawing.Size(158, 31)
+        Me.注释_lb.Size = New System.Drawing.Size(124, 24)
         Me.注释_lb.TabIndex = 462
         Me.注释_lb.Text = "資料尚未存檔"
         Me.注释_lb.Visible = False
@@ -208,7 +211,7 @@ Partial Class 周進度表
         '存檔_bt
         '
         Me.存檔_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.存檔_bt.Location = New System.Drawing.Point(12, 66)
+        Me.存檔_bt.Location = New System.Drawing.Point(12, 61)
         Me.存檔_bt.Name = "存檔_bt"
         Me.存檔_bt.Size = New System.Drawing.Size(321, 24)
         Me.存檔_bt.TabIndex = 463
@@ -311,11 +314,41 @@ Partial Class 周進度表
         Me.Button8.Text = "順時鐘90度旋轉"
         Me.Button8.UseVisualStyleBackColor = True
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(258, 91)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 556
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(180, 91)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 555
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(137, 90)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 554
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         '周進度表
         '
         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.Label20)
         Me.Controls.Add(Me.驗貨報告圖片_pb)
         Me.Controls.Add(Me.Button5)
         Me.Controls.Add(Me.Button6)
@@ -384,5 +417,8 @@ Partial Class 周進度表
     Friend WithEvents Button6 As Button
     Friend WithEvents Button7 As Button
     Friend WithEvents Button8 As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/周進度表.vb

@@ -6,26 +6,20 @@ Public Class 周進度表
     ReadOnly xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
     Dim file_name As String = ""
-    Private Sub Set_DGV1載入前設定()
+    Private Sub Set_訂單清單()
         訂單種類_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) : 訂單種類_dgv.DataSource = ds.Tables(0) : conn.Close()
-    End Sub
-    Private Sub Set_訂單清單()
-        Set_DGV1載入前設定()
         If PA = "" Then
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date , 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, " &
                    "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號, 驗貨報告圖片 
-                    FROM 訂單控制表 " &
+                    FROM " & 訂單資料表(1) & " " &
                    "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) ORDER BY   訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH "
         Else
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, Requested_XF, Confirm_XF, " &
-                   "Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號, 驗貨報告圖片 FROM 訂單控制表 " &
+                   "Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                    "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單流水號 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (年份季度 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (客戶訂單號 LIKE '%" & PA & "%') OR " &
@@ -38,7 +32,7 @@ Public Class 周進度表
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單種類 LIKE '%" & PA & "%') " &
                          "ORDER BY   訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
         End If
-        Set_DGV1載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單種類_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_grid()
         訂單種類_dgv.Columns(0).FillWeight = 80 : 訂單種類_dgv.Columns(1).FillWeight = 80 : 訂單種類_dgv.Columns(2).FillWeight = 50 : 訂單種類_dgv.Columns(3).FillWeight = 110
@@ -68,7 +62,7 @@ Public Class 周進度表
             If 生產工廠_tb.Text <> "" Then
                 If gUserName = "李協叡" Then
                     ConnOpen()
-                    SQL1 = "UPDATE 訂單控制表 SET PO_S_Date = '" & 客戶訂單號_tb.Text & "', Requested_XF = '" & 形體號_tb.Text & "', Confirm_XF = '" & 顏色_tb.Text & "', 
+                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET PO_S_Date = '" & 客戶訂單號_tb.Text & "', Requested_XF = '" & 形體號_tb.Text & "', Confirm_XF = '" & 顏色_tb.Text & "', 
                             Revised_XF = '" & Revised_XF_tb.Text & "'," &
                            "裁斷時間 = '" & xlSheet.Cells(i, 12).value & "', 針車時間 = '" & xlSheet.Cells(i, 13).value & "', " &
                            "成型時間 = '" & xlSheet.Cells(i, 14).value & "', Special_Packaging = '" & xlSheet.Cells(i, 15).value & "', Remarks = '" & xlSheet.Cells(i, 16).value & "' " &
@@ -77,7 +71,7 @@ Public Class 周進度表
                     CmdSet_For_dr() : conn.Close()
                 Else
                     ConnOpen()
-                    SQL1 = "UPDATE 訂單控制表 SET " &
+                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET " &
                            "裁斷時間 = '" & xlSheet.Cells(i, 12).value & "', 針車時間 = '" & xlSheet.Cells(i, 13).value & "', " &
                            "成型時間 = '" & xlSheet.Cells(i, 14).value & "', Special_Packaging = '" & xlSheet.Cells(i, 15).value & "', Remarks = '" & xlSheet.Cells(i, 16).value & "' " &
                            "WHERE (客戶訂單號 LIKE '" & xlSheet.Cells(i, 4).value & "') AND (形體號 LIKE '" & xlSheet.Cells(i, 5).value & "') AND (顏色 LIKE '" & xlSheet.Cells(i, 6).value & "') " &
@@ -92,6 +86,8 @@ 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()
+
         生產工廠_tb.Enabled = False : 客戶訂單號_tb.Enabled = False : 形體號_tb.Enabled = False : 顏色_tb.Enabled = False : Revised_XF_tb.Enabled = False : 楦型_tb.Enabled = False
         日期1_dtp.Visible = False : 日期2_dtp.Visible = False : 日期3_dtp.Visible = False : 日期4_dtp.Visible = False
         日期存檔_bt.Enabled = False : 存檔_bt.Enabled = False
@@ -244,7 +240,7 @@ Public Class 周進度表
 
             ConnOpen()
             If Revised_XF1_tb.Text = "" Then
-                SQL1 = "UPDATE 訂單控制表 SET PO_S_Date = '" & 訂單種類_dgv.Rows(i).Cells("PO_S_Date").Value & "', " &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET PO_S_Date = '" & 訂單種類_dgv.Rows(i).Cells("PO_S_Date").Value & "', " &
                                           "Requested_XF = '" & 訂單種類_dgv.Rows(i).Cells("Requested_XF").Value & "', " &
                                             "Confirm_XF = '" & 訂單種類_dgv.Rows(i).Cells("Confirm_XF").Value & "', " &
                                             "Revised_XF = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "', " &
@@ -253,7 +249,7 @@ Public Class 周進度表
                        "AND (顏色 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Color").Value & "') AND (楦型 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Width").Value & "') " &
                        "AND (訂單數量 = " & 訂單種類_dgv.Rows(i).Cells("QTY").Value & ")"
             Else
-                SQL1 = "UPDATE 訂單控制表 SET PO_S_Date = '" & 訂單種類_dgv.Rows(i).Cells("PO_S_Date").Value & "', " &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET PO_S_Date = '" & 訂單種類_dgv.Rows(i).Cells("PO_S_Date").Value & "', " &
                                           "Requested_XF = '" & 訂單種類_dgv.Rows(i).Cells("Requested_XF").Value & "', " &
                                             "Confirm_XF = '" & 訂單種類_dgv.Rows(i).Cells("Confirm_XF").Value & "', " &
                                             "Revised_XF = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "', " &
@@ -272,7 +268,7 @@ Public Class 周進度表
     Private Sub Button4_Click(sender As Object, e As EventArgs) Handles 存檔_bt.Click
         For i As Integer = 0 To 訂單種類_dgv.Rows.Count - 1
             ConnOpen()
-            SQL1 = "UPDATE 訂單控制表 SET Special_Packaging = '" & 訂單種類_dgv.Rows(i).Cells("Special_Packaging").Value & "', " &
+            SQL1 = "UPDATE " & 訂單資料表(1) & " SET Special_Packaging = '" & 訂單種類_dgv.Rows(i).Cells("Special_Packaging").Value & "', " &
                                                        "Remarks = '" & 訂單種類_dgv.Rows(i).Cells("Remarks").Value & "' " &
                              "WHERE (客戶訂單號 LIKE '" & 訂單種類_dgv.Rows(i).Cells("PO#").Value & "') AND (形體號 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Style_Name").Value & "') " &
                        "AND (顏色 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Color").Value & "') AND (楦型 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Width").Value & "') " &
@@ -299,4 +295,10 @@ Public Class 周進度表
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
         驗貨報告圖片_pb.Image.RotateFlip(RotateFlipType.Rotate180FlipX) : 驗貨報告圖片_pb.Refresh() : 驗貨報告圖片_pb.SizeMode = 4
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/周進度表T1_T4.Designer.vb

@@ -39,6 +39,9 @@ Partial Class 周進度表T1_T4
         Me.列印_bt = New System.Windows.Forms.Button()
         Me.訂單清單_dgv = New System.Windows.Forms.DataGridView()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.驗貨報告圖片_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片庫一_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -198,11 +201,41 @@ Partial Class 周進度表T1_T4
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(258, 302)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 559
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(180, 302)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 558
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(137, 301)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 557
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         '周進度表T1_T4
         '
         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.Label20)
         Me.Controls.Add(Me.驗貨報告圖片_pb)
         Me.Controls.Add(Me.垂直翻轉_bt)
         Me.Controls.Add(Me.水平翻轉_bt)
@@ -248,5 +281,8 @@ Partial Class 周進度表T1_T4
     Friend WithEvents 列印_bt As Button
     Friend WithEvents 訂單清單_dgv As DataGridView
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/周進度表T1_T4.vb

@@ -2,26 +2,20 @@
 Imports System.IO
 Public Class 周進度表T1_T4
     ReadOnly ds As New DataSet
-    Private Sub Set_DGV1載入前設定()
+    Private Sub Set_訂單清單()
         訂單清單_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) : 訂單清單_dgv.DataSource = ds.Tables(0) : conn.Close()
-    End Sub
-    Private Sub Set_訂單清單()
-        Set_DGV1載入前設定()
         If PA = "" Then
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片 FROM 訂單控制表 WHERE (CXL IS NULL OR CXL = 0) AND (訂單數量 - 出貨數量 <> 0) ORDER BY 訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
+                   "訂單流水號, 驗貨報告圖片 FROM " & 訂單資料表(1) & " WHERE (CXL IS NULL OR CXL = 0) AND (訂單數量 - 出貨數量 <> 0) ORDER BY 訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
         Else
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片 FROM 訂單控制表 WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單流水號 LIKE '%" & PA & "%') OR " &
+                   "訂單流水號, 驗貨報告圖片 FROM " & 訂單資料表(1) & " WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單流水號 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (年份季度 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (客戶訂單號 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (形體號 LIKE '%" & PA & "%') OR " &
@@ -32,7 +26,7 @@ Public Class 周進度表T1_T4
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單種類 LIKE '%" & PA & "%') ORDER BY 訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
         End If
-        Set_DGV1載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單清單_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_grid()
         訂單清單_dgv.Columns(0).FillWeight = 60 : 訂單清單_dgv.Columns(1).FillWeight = 80 : 訂單清單_dgv.Columns(2).FillWeight = 80 : 訂單清單_dgv.Columns(3).FillWeight = 50
@@ -50,6 +44,8 @@ Public Class 周進度表T1_T4
     End Sub
     Private Sub 周進度表T1_T4_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+        訂單資料庫選擇.ShowDialog()
+
         日期1_dtp.Visible = False : 日期2_dtp.Visible = False : 日期3_dtp.Visible = False : 日期4_dtp.Visible = False
         Set_訂單清單() : Set_grid()
     End Sub
@@ -169,4 +165,10 @@ Public Class 周進度表T1_T4
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles 垂直翻轉_bt.Click
         驗貨報告圖片_pb.Image.RotateFlip(RotateFlipType.Rotate180FlipX) : 驗貨報告圖片_pb.Refresh() : 驗貨報告圖片_pb.SizeMode = 4
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/業務資料庫管理.Designer.vb

@@ -29,9 +29,10 @@ Partial Class 業務資料庫管理
         Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.訂單控制表暫存檔_dgv = New System.Windows.Forms.DataGridView()
         Me.訂單明細表暫存檔_dgv = New System.Windows.Forms.DataGridView()
-        Me.訂單流水號暫存檔_dgv = New System.Windows.Forms.DataGridView()
+        Me.訂單流水號暫存檔1_dgv = New System.Windows.Forms.DataGridView()
         Me.訂單控制表比對訂單明細表差異資料_dgv = New System.Windows.Forms.DataGridView()
         Me.已使用的天盾流水號_dgv = New System.Windows.Forms.DataGridView()
         Me.知道天盾流水號與客戶訂單號_cb = New System.Windows.Forms.CheckBox()
@@ -70,13 +71,16 @@ Partial Class 業務資料庫管理
         Me.Label17 = New System.Windows.Forms.Label()
         Me.訂單導入流水號初始數_tb = New System.Windows.Forms.TextBox()
         Me.修改_bt = New System.Windows.Forms.Button()
+        Me.Label18 = New System.Windows.Forms.Label()
+        Me.訂單流水號暫存檔2_dgv = New System.Windows.Forms.DataGridView()
         CType(Me.訂單控制表暫存檔_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單明細表暫存檔_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.訂單流水號暫存檔_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.訂單流水號暫存檔1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單控制表比對訂單明細表差異資料_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.已使用的天盾流水號_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單明細表修改紀錄_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單控制表修改紀錄_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.訂單流水號暫存檔2_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '訂單控制表暫存檔_dgv
@@ -105,18 +109,18 @@ Partial Class 業務資料庫管理
         Me.訂單明細表暫存檔_dgv.Size = New System.Drawing.Size(1155, 378)
         Me.訂單明細表暫存檔_dgv.TabIndex = 70
         '
-        '訂單流水號暫存檔_dgv
+        '訂單流水號暫存檔1_dgv
         '
         DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.訂單流水號暫存檔_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
-        Me.訂單流水號暫存檔_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.訂單流水號暫存檔_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.訂單流水號暫存檔_dgv.Location = New System.Drawing.Point(4, 25)
-        Me.訂單流水號暫存檔_dgv.Name = "訂單流水號暫存檔_dgv"
-        Me.訂單流水號暫存檔_dgv.RowHeadersWidth = 5
-        Me.訂單流水號暫存檔_dgv.RowTemplate.Height = 24
-        Me.訂單流水號暫存檔_dgv.Size = New System.Drawing.Size(145, 109)
-        Me.訂單流水號暫存檔_dgv.TabIndex = 71
+        Me.訂單流水號暫存檔1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.訂單流水號暫存檔1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.訂單流水號暫存檔1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.訂單流水號暫存檔1_dgv.Location = New System.Drawing.Point(4, 22)
+        Me.訂單流水號暫存檔1_dgv.Name = "訂單流水號暫存檔1_dgv"
+        Me.訂單流水號暫存檔1_dgv.RowHeadersWidth = 5
+        Me.訂單流水號暫存檔1_dgv.RowTemplate.Height = 24
+        Me.訂單流水號暫存檔1_dgv.Size = New System.Drawing.Size(145, 127)
+        Me.訂單流水號暫存檔1_dgv.TabIndex = 71
         '
         '訂單控制表比對訂單明細表差異資料_dgv
         '
@@ -124,7 +128,7 @@ Partial Class 業務資料庫管理
         Me.訂單控制表比對訂單明細表差異資料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.訂單控制表比對訂單明細表差異資料_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.訂單控制表比對訂單明細表差異資料_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.訂單控制表比對訂單明細表差異資料_dgv.Location = New System.Drawing.Point(155, 25)
+        Me.訂單控制表比對訂單明細表差異資料_dgv.Location = New System.Drawing.Point(385, 25)
         Me.訂單控制表比對訂單明細表差異資料_dgv.Name = "訂單控制表比對訂單明細表差異資料_dgv"
         Me.訂單控制表比對訂單明細表差異資料_dgv.RowHeadersWidth = 5
         Me.訂單控制表比對訂單明細表差異資料_dgv.RowTemplate.Height = 24
@@ -137,11 +141,11 @@ Partial Class 業務資料庫管理
         Me.已使用的天盾流水號_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.已使用的天盾流水號_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.已使用的天盾流水號_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.已使用的天盾流水號_dgv.Location = New System.Drawing.Point(4, 183)
+        Me.已使用的天盾流水號_dgv.Location = New System.Drawing.Point(4, 227)
         Me.已使用的天盾流水號_dgv.Name = "已使用的天盾流水號_dgv"
         Me.已使用的天盾流水號_dgv.RowHeadersWidth = 5
         Me.已使用的天盾流水號_dgv.RowTemplate.Height = 24
-        Me.已使用的天盾流水號_dgv.Size = New System.Drawing.Size(145, 802)
+        Me.已使用的天盾流水號_dgv.Size = New System.Drawing.Size(145, 758)
         Me.已使用的天盾流水號_dgv.TabIndex = 73
         '
         '知道天盾流水號與客戶訂單號_cb
@@ -168,9 +172,9 @@ Partial Class 業務資料庫管理
         '
         '確定清除_bt
         '
-        Me.確定清除_bt.Location = New System.Drawing.Point(898, 118)
+        Me.確定清除_bt.Location = New System.Drawing.Point(4, 150)
         Me.確定清除_bt.Name = "確定清除_bt"
-        Me.確定清除_bt.Size = New System.Drawing.Size(195, 50)
+        Me.確定清除_bt.Size = New System.Drawing.Size(296, 24)
         Me.確定清除_bt.TabIndex = 76
         Me.確定清除_bt.Text = "確定清除"
         Me.確定清除_bt.UseVisualStyleBackColor = True
@@ -229,7 +233,7 @@ Partial Class 業務資料庫管理
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(1, 6)
+        Me.Label1.Location = New System.Drawing.Point(1, 3)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(104, 16)
         Me.Label1.TabIndex = 84
@@ -238,7 +242,7 @@ Partial Class 業務資料庫管理
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(1, 140)
+        Me.Label2.Location = New System.Drawing.Point(1, 179)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(116, 16)
         Me.Label2.TabIndex = 85
@@ -301,7 +305,7 @@ Partial Class 業務資料庫管理
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(155, 175)
+        Me.Label9.Location = New System.Drawing.Point(155, 179)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(104, 16)
         Me.Label9.TabIndex = 92
@@ -319,7 +323,7 @@ Partial Class 業務資料庫管理
         'Label11
         '
         Me.Label11.AutoSize = True
-        Me.Label11.Location = New System.Drawing.Point(152, 6)
+        Me.Label11.Location = New System.Drawing.Point(382, 6)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(200, 16)
         Me.Label11.TabIndex = 94
@@ -328,7 +332,7 @@ Partial Class 業務資料庫管理
         'Label12
         '
         Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(43, 162)
+        Me.Label12.Location = New System.Drawing.Point(43, 201)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(56, 16)
         Me.Label12.TabIndex = 96
@@ -336,7 +340,7 @@ Partial Class 業務資料庫管理
         '
         '資料筆數_tb
         '
-        Me.資料筆數_tb.Location = New System.Drawing.Point(98, 159)
+        Me.資料筆數_tb.Location = New System.Drawing.Point(98, 198)
         Me.資料筆數_tb.Name = "資料筆數_tb"
         Me.資料筆數_tb.Size = New System.Drawing.Size(51, 23)
         Me.資料筆數_tb.TabIndex = 95
@@ -441,7 +445,7 @@ Partial Class 業務資料庫管理
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(660, 28)
+        Me.Label17.Location = New System.Drawing.Point(895, 123)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(128, 16)
         Me.Label17.TabIndex = 108
@@ -449,25 +453,49 @@ Partial Class 業務資料庫管理
         '
         '訂單導入流水號初始數_tb
         '
-        Me.訂單導入流水號初始數_tb.Location = New System.Drawing.Point(666, 47)
+        Me.訂單導入流水號初始數_tb.Location = New System.Drawing.Point(901, 142)
         Me.訂單導入流水號初始數_tb.Name = "訂單導入流水號初始數_tb"
         Me.訂單導入流水號初始數_tb.Size = New System.Drawing.Size(122, 23)
         Me.訂單導入流水號初始數_tb.TabIndex = 107
         '
         '修改_bt
         '
-        Me.修改_bt.Location = New System.Drawing.Point(663, 76)
+        Me.修改_bt.Location = New System.Drawing.Point(1029, 118)
         Me.修改_bt.Name = "修改_bt"
-        Me.修改_bt.Size = New System.Drawing.Size(125, 50)
+        Me.修改_bt.Size = New System.Drawing.Size(61, 50)
         Me.修改_bt.TabIndex = 109
         Me.修改_bt.Text = "修改"
         Me.修改_bt.UseVisualStyleBackColor = True
         '
+        'Label18
+        '
+        Me.Label18.AutoSize = True
+        Me.Label18.Location = New System.Drawing.Point(152, 3)
+        Me.Label18.Name = "Label18"
+        Me.Label18.Size = New System.Drawing.Size(133, 16)
+        Me.Label18.TabIndex = 111
+        Me.Label18.Text = "訂單流水號暫存檔-力威"
+        '
+        '訂單流水號暫存檔2_dgv
+        '
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.訂單流水號暫存檔2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        Me.訂單流水號暫存檔2_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.訂單流水號暫存檔2_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.訂單流水號暫存檔2_dgv.Location = New System.Drawing.Point(155, 22)
+        Me.訂單流水號暫存檔2_dgv.Name = "訂單流水號暫存檔2_dgv"
+        Me.訂單流水號暫存檔2_dgv.RowHeadersWidth = 5
+        Me.訂單流水號暫存檔2_dgv.RowTemplate.Height = 24
+        Me.訂單流水號暫存檔2_dgv.Size = New System.Drawing.Size(145, 127)
+        Me.訂單流水號暫存檔2_dgv.TabIndex = 110
+        '
         '業務資料庫管理
         '
         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.Label18)
+        Me.Controls.Add(Me.訂單流水號暫存檔2_dgv)
         Me.Controls.Add(Me.修改_bt)
         Me.Controls.Add(Me.Label17)
         Me.Controls.Add(Me.訂單導入流水號初始數_tb)
@@ -505,7 +533,7 @@ Partial Class 業務資料庫管理
         Me.Controls.Add(Me.知道天盾流水號與客戶訂單號_cb)
         Me.Controls.Add(Me.已使用的天盾流水號_dgv)
         Me.Controls.Add(Me.訂單控制表比對訂單明細表差異資料_dgv)
-        Me.Controls.Add(Me.訂單流水號暫存檔_dgv)
+        Me.Controls.Add(Me.訂單流水號暫存檔1_dgv)
         Me.Controls.Add(Me.訂單明細表暫存檔_dgv)
         Me.Controls.Add(Me.Label12)
         Me.Controls.Add(Me.訂單控制表暫存檔_dgv)
@@ -515,11 +543,12 @@ Partial Class 業務資料庫管理
         Me.Text = "業務資料庫管理"
         CType(Me.訂單控制表暫存檔_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.訂單明細表暫存檔_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.訂單流水號暫存檔_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.訂單流水號暫存檔1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.訂單控制表比對訂單明細表差異資料_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.已使用的天盾流水號_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.訂單明細表修改紀錄_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.訂單控制表修改紀錄_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.訂單流水號暫存檔2_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -527,7 +556,7 @@ Partial Class 業務資料庫管理
 
     Friend WithEvents 訂單控制表暫存檔_dgv As DataGridView
     Friend WithEvents 訂單明細表暫存檔_dgv As DataGridView
-    Friend WithEvents 訂單流水號暫存檔_dgv As DataGridView
+    Friend WithEvents 訂單流水號暫存檔1_dgv As DataGridView
     Friend WithEvents 訂單控制表比對訂單明細表差異資料_dgv As DataGridView
     Friend WithEvents 已使用的天盾流水號_dgv As DataGridView
     Friend WithEvents 知道天盾流水號與客戶訂單號_cb As CheckBox
@@ -566,5 +595,7 @@ Partial Class 業務資料庫管理
     Friend WithEvents 訂單導入流水號初始數_tb As TextBox
     Friend WithEvents 修改_bt As Button
     Friend WithEvents 訂單明細表修改紀錄查詢_bt As Button
+    Friend WithEvents Label18 As Label
+    Friend WithEvents 訂單流水號暫存檔2_dgv As DataGridView
 End Class
 

TENDEN-MES-SYS/量產訂單管理/業務資料庫管理.vb

@@ -1,7 +1,7 @@
 Option Strict Off
 Public Class 業務資料庫管理
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet : ReadOnly ds4 As New DataSet
-    ReadOnly ds5 As New DataSet : ReadOnly ds6 As New DataSet
+    ReadOnly ds5 As New DataSet : ReadOnly ds6 As New DataSet : ReadOnly ds7 As New DataSet
     Private Sub Set_DGV1載入前設定()
         訂單控制表暫存檔_dgv.DataSource = Nothing : ds.Clear()
         訂單控制表暫存檔_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -36,34 +36,30 @@ Public Class 業務資料庫管理
                "[12.5] + [13] + [14] AS TOTAL FROM 訂單明細表暫存檔 ORDER BY ProductName, Color, DM"
         Set_DGV2載入後設定()
     End Sub
-    Private Sub Set_DGV3載入前設定()
-        訂單流水號暫存檔_dgv.DataSource = Nothing : ds2.Clear()
-        訂單流水號暫存檔_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        訂單流水號暫存檔_dgv.ColumnHeadersHeight = 25
-        訂單流水號暫存檔_dgv.AllowUserToAddRows = False
-        ConnOpen()
-    End Sub
-    Private Sub Set_DGV3載入後設定()
-        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds2) : 訂單流水號暫存檔_dgv.DataSource = ds2.Tables(0) : conn.Close()
-    End Sub
     Private Sub Set_訂單流水號清單()
-        Set_DGV3載入前設定()
+        訂單流水號暫存檔1_dgv.DataSource = Nothing : ds2.Clear()
+        訂單流水號暫存檔1_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        訂單流水號暫存檔1_dgv.ColumnHeadersHeight = 25
+        訂單流水號暫存檔1_dgv.AllowUserToAddRows = False
+        ConnOpen()
         SQL1 = "SELECT 訂單流水號 FROM 訂單流水號暫存"
-        Set_DGV3載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds2) : 訂單流水號暫存檔1_dgv.DataSource = ds2.Tables(0) : conn.Close()
+    End Sub
+    Private Sub Set_訂單流水號清單1()
+        訂單流水號暫存檔2_dgv.DataSource = Nothing : ds7.Clear()
+        訂單流水號暫存檔2_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        訂單流水號暫存檔2_dgv.ColumnHeadersHeight = 25
+        訂單流水號暫存檔2_dgv.AllowUserToAddRows = False
+        ConnOpen()
+        SQL1 = "SELECT 訂單流水號 FROM 訂單流水號暫存_非VIONIC"
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds7) : 訂單流水號暫存檔2_dgv.DataSource = ds7.Tables(0) : conn.Close()
     End Sub
-    Private Sub Set_DGV4載入前設定()
+    Private Sub Set_控制與明細比對()
         訂單控制表比對訂單明細表差異資料_dgv.DataSource = Nothing : ds3.Clear()
         訂單控制表比對訂單明細表差異資料_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         訂單控制表比對訂單明細表差異資料_dgv.ColumnHeadersHeight = 25
         訂單控制表比對訂單明細表差異資料_dgv.AllowUserToAddRows = False
         ConnOpen()
-    End Sub
-    Private Sub Set_DGV4載入後設定()
-        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds3)
-        訂單控制表比對訂單明細表差異資料_dgv.DataSource = ds3.Tables(0) : conn.Close()
-    End Sub
-    Private Sub Set_控制與明細比對()
-        Set_DGV4載入前設定()
         SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.客戶訂單號, SUM(訂單控制表.訂單數量) AS 訂單數量, SUM(訂單明細表.[5]) + SUM(訂單明細表.[5.5]) + SUM(訂單明細表.[6]) + SUM(訂單明細表.[6.5]) + " &
                "SUM(訂單明細表.[7]) + SUM(訂單明細表.[7.5]) + SUM(訂單明細表.[8]) + SUM(訂單明細表.[8.5]) + SUM(訂單明細表.[9]) + SUM(訂單明細表.[9.5]) + SUM(訂單明細表.[10]) + SUM(訂單明細表.[10.5]) + " &
                "SUM(訂單明細表.[11]) + SUM(訂單明細表.[11.5]) + SUM(訂單明細表.[12]) + SUM(訂單明細表.[12.5]) + SUM(訂單明細表.[13]) + SUM(訂單明細表.[14]) AS 明細數量, " &
@@ -76,54 +72,37 @@ Public Class 業務資料庫管理
                "SUM(訂單明細表.[6]) + SUM(訂單明細表.[6.5]) + SUM(訂單明細表.[7]) + SUM(訂單明細表.[7.5]) + SUM(訂單明細表.[8]) + SUM(訂單明細表.[8.5]) + SUM(訂單明細表.[9]) + SUM(訂單明細表.[9.5]) + " &
                "SUM(訂單明細表.[10]) + SUM(訂單明細表.[10.5]) + SUM(訂單明細表.[11]) + SUM(訂單明細表.[11.5]) + SUM(訂單明細表.[12]) + SUM(訂單明細表.[12.5]) + SUM(訂單明細表.[13]) + " &
                "SUM(訂單明細表.[14])) NOT LIKE '0') ORDER BY   訂單控制表.訂單流水號 DESC"
-        Set_DGV4載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds3)
+        訂單控制表比對訂單明細表差異資料_dgv.DataSource = ds3.Tables(0) : conn.Close()
     End Sub
-    Private Sub Set_DGV5載入前設定()
+    Private Sub Set_已使用天盾流水號()
         已使用的天盾流水號_dgv.DataSource = Nothing : ds4.Clear()
         已使用的天盾流水號_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         已使用的天盾流水號_dgv.ColumnHeadersHeight = 25
         已使用的天盾流水號_dgv.AllowUserToAddRows = False
         ConnOpen()
-    End Sub
-    Private Sub Set_DGV5載入後設定()
-        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds4) : 已使用的天盾流水號_dgv.DataSource = ds4.Tables(0) : conn.Close()
-    End Sub
-    Private Sub Set_已使用天盾流水號()
-        Set_DGV5載入前設定()
         SQL1 = "SELECT 訂單流水號 FROM 訂單控制表 GROUP BY 訂單流水號 ORDER BY 訂單流水號 DESC"
-        Set_DGV5載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds4) : 已使用的天盾流水號_dgv.DataSource = ds4.Tables(0) : conn.Close()
         資料筆數_tb.Text = Format(已使用的天盾流水號_dgv.Rows.Count, "#,##0")
     End Sub
-    Private Sub Set_DGV6載入前設定()
+    Private Sub Set_訂單明細表修改紀錄()
         訂單明細表修改紀錄_dgv.DataSource = Nothing : ds5.Clear()
         訂單明細表修改紀錄_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         訂單明細表修改紀錄_dgv.ColumnHeadersHeight = 25
         訂單明細表修改紀錄_dgv.AllowUserToAddRows = False
         ConnOpen()
-    End Sub
-    Private Sub Set_DGV6載入後設定()
-        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds5) : 訂單明細表修改紀錄_dgv.DataSource = ds5.Tables(0) : conn.Close()
-    End Sub
-    Private Sub Set_訂單明細表修改紀錄()
-        Set_DGV6載入前設定()
         SQL1 = "SELECT 流水號, 編輯者, 編輯時間, 編輯次數 AS 次數 FROM 訂單明細表修改紀錄 ORDER BY   編輯時間 DESC"
-        Set_DGV6載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds5) : 訂單明細表修改紀錄_dgv.DataSource = ds5.Tables(0) : conn.Close()
         資料筆數2_tb.Text = Format(訂單明細表修改紀錄_dgv.Rows.Count, "#,##0")
     End Sub
-    Private Sub Set_DGV7載入前設定()
+    Private Sub Set_訂單控制表修改紀錄()
         訂單控制表修改紀錄_dgv.DataSource = Nothing : ds6.Clear()
         訂單控制表修改紀錄_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         訂單控制表修改紀錄_dgv.ColumnHeadersHeight = 25
         訂單控制表修改紀錄_dgv.AllowUserToAddRows = False
         ConnOpen()
-    End Sub
-    Private Sub Set_DGV7載入後設定()
-        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds6) : 訂單控制表修改紀錄_dgv.DataSource = ds6.Tables(0) : conn.Close()
-    End Sub
-    Private Sub Set_訂單控制表修改紀錄()
-        Set_DGV7載入前設定()
         SQL1 = "SELECT 流水號, 編輯者, 編輯時間, 編輯次數 AS 次數 FROM 訂單控制表修改紀錄 ORDER BY   編輯時間 DESC"
-        Set_DGV7載入後設定()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds6) : 訂單控制表修改紀錄_dgv.DataSource = ds6.Tables(0) : conn.Close()
         資料筆數1_tb.Text = Format(訂單控制表修改紀錄_dgv.Rows.Count, "#,##0")
     End Sub
     Private Sub Set_grid1()
@@ -225,11 +204,14 @@ 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
-        Set_訂單控制表清單() : Set_訂單明細表清單() : Set_訂單流水號清單() : Set_grid1() : Set_grid2()
+        Set_訂單控制表清單() : Set_訂單明細表清單() : Set_訂單流水號清單() : Set_訂單流水號清單1() : Set_grid1() : Set_grid2()
         Set_控制與明細比對() : Set_grid3() : Set_已使用天盾流水號()
-        訂單流水號暫存檔_dgv.Columns(0).FillWeight = 120
+
+        訂單流水號暫存檔1_dgv.Columns(0).FillWeight = 120
         已使用的天盾流水號_dgv.Columns(0).FillWeight = 120
+
         Set_訂單明細表修改紀錄() : Set_grid4() : Set_訂單控制表修改紀錄() : Set_grid5()
+
         ConnOpen()
         SQL1 = "SELECT 編號生成初始數  FROM 系統流水編號初始設定 WHERE 使用頁面 LIKE '量產訂單導入'"
         CmdSet_For_dr()
@@ -255,6 +237,9 @@ Public Class 業務資料庫管理
             SQL1 = "DELETE FROM 訂單流水號暫存 WHERE (訂單流水號 = '" & Strings.Right(天盾流水號_tb.Text, 6) & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
+            SQL1 = "DELETE FROM 訂單流水號暫存_非VIONIC WHERE (訂單流水號 = '" & Strings.Right(天盾流水號_tb.Text, 6) & "')"
+            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
+            ConnOpen()
             SQL1 = "DELETE FROM 訂單控制表暫存檔 WHERE (客戶訂單號 LIKE '" & 客戶訂單耗_tb.Text & "') AND (訂單流水號 LIKE '" & 天盾流水號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
@@ -265,6 +250,9 @@ Public Class 業務資料庫管理
             SQL1 = "DELETE FROM 訂單流水號暫存"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
+            SQL1 = "DELETE FROM 訂單流水號暫存_非VIONIC"
+            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
+            ConnOpen()
             SQL1 = "DELETE FROM 訂單控制表暫存檔"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
@@ -287,7 +275,6 @@ Public Class 業務資料庫管理
         Set_DGV2載入後設定()
         Set_grid1() : Set_grid2() : 自動加總()
     End Sub
-
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles 修改_bt.Click
         ConnOpen()
         SQL1 = "UPDATE 系統流水編號初始設定 SET 編號生成初始數 = N'" & 訂單導入流水號初始數_tb.Text & "' WHERE 使用頁面 LIKE N'量產訂單導入'"

TENDEN-MES-SYS/量產訂單管理/生產進度表.Designer.vb

@@ -44,6 +44,9 @@ Partial Class 生產進度表
         Me.水平翻轉_bt = New System.Windows.Forms.Button()
         Me.逆時鐘90度旋轉_bt = New System.Windows.Forms.Button()
         Me.順時鐘90度旋轉_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.驗貨報告圖庫_pb, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -63,7 +66,7 @@ Partial Class 生產進度表
         '列印_bt
         '
         Me.列印_bt.ForeColor = System.Drawing.Color.Black
-        Me.列印_bt.Location = New System.Drawing.Point(12, 26)
+        Me.列印_bt.Location = New System.Drawing.Point(12, 57)
         Me.列印_bt.Name = "列印_bt"
         Me.列印_bt.Size = New System.Drawing.Size(64, 24)
         Me.列印_bt.TabIndex = 326
@@ -73,7 +76,7 @@ Partial Class 生產進度表
         '導入Excel_bt
         '
         Me.導入Excel_bt.ForeColor = System.Drawing.Color.Black
-        Me.導入Excel_bt.Location = New System.Drawing.Point(12, 381)
+        Me.導入Excel_bt.Location = New System.Drawing.Point(12, 412)
         Me.導入Excel_bt.Name = "導入Excel_bt"
         Me.導入Excel_bt.Size = New System.Drawing.Size(366, 38)
         Me.導入Excel_bt.TabIndex = 327
@@ -86,28 +89,28 @@ Partial Class 生產進度表
         '
         '顏色_bt
         '
-        Me.顏色_bt.Location = New System.Drawing.Point(237, 356)
+        Me.顏色_bt.Location = New System.Drawing.Point(237, 387)
         Me.顏色_bt.Name = "顏色_bt"
         Me.顏色_bt.Size = New System.Drawing.Size(84, 23)
         Me.顏色_bt.TabIndex = 332
         '
         '形體號_tb
         '
-        Me.形體號_tb.Location = New System.Drawing.Point(147, 356)
+        Me.形體號_tb.Location = New System.Drawing.Point(147, 387)
         Me.形體號_tb.Name = "形體號_tb"
         Me.形體號_tb.Size = New System.Drawing.Size(84, 23)
         Me.形體號_tb.TabIndex = 331
         '
         '客戶訂單號_tb
         '
-        Me.客戶訂單號_tb.Location = New System.Drawing.Point(12, 356)
+        Me.客戶訂單號_tb.Location = New System.Drawing.Point(12, 387)
         Me.客戶訂單號_tb.Name = "客戶訂單號_tb"
         Me.客戶訂單號_tb.Size = New System.Drawing.Size(129, 23)
         Me.客戶訂單號_tb.TabIndex = 330
         '
         '楦型_bt
         '
-        Me.楦型_bt.Location = New System.Drawing.Point(327, 356)
+        Me.楦型_bt.Location = New System.Drawing.Point(327, 387)
         Me.楦型_bt.Name = "楦型_bt"
         Me.楦型_bt.Size = New System.Drawing.Size(52, 23)
         Me.楦型_bt.TabIndex = 333
@@ -115,7 +118,7 @@ Partial Class 生產進度表
         'PRODUCTION30天分頁二_bt
         '
         Me.PRODUCTION30天分頁二_bt.ForeColor = System.Drawing.Color.Red
-        Me.PRODUCTION30天分頁二_bt.Location = New System.Drawing.Point(198, 52)
+        Me.PRODUCTION30天分頁二_bt.Location = New System.Drawing.Point(198, 83)
         Me.PRODUCTION30天分頁二_bt.Name = "PRODUCTION30天分頁二_bt"
         Me.PRODUCTION30天分頁二_bt.Size = New System.Drawing.Size(180, 24)
         Me.PRODUCTION30天分頁二_bt.TabIndex = 339
@@ -125,7 +128,7 @@ Partial Class 生產進度表
         'PRODUCTION30天分頁一_bt
         '
         Me.PRODUCTION30天分頁一_bt.ForeColor = System.Drawing.Color.Red
-        Me.PRODUCTION30天分頁一_bt.Location = New System.Drawing.Point(12, 52)
+        Me.PRODUCTION30天分頁一_bt.Location = New System.Drawing.Point(12, 83)
         Me.PRODUCTION30天分頁一_bt.Name = "PRODUCTION30天分頁一_bt"
         Me.PRODUCTION30天分頁一_bt.Size = New System.Drawing.Size(180, 24)
         Me.PRODUCTION30天分頁一_bt.TabIndex = 338
@@ -135,7 +138,7 @@ Partial Class 生產進度表
         '全套SIZE45天_bt
         '
         Me.全套SIZE45天_bt.ForeColor = System.Drawing.Color.Red
-        Me.全套SIZE45天_bt.Location = New System.Drawing.Point(188, 27)
+        Me.全套SIZE45天_bt.Location = New System.Drawing.Point(188, 58)
         Me.全套SIZE45天_bt.Name = "全套SIZE45天_bt"
         Me.全套SIZE45天_bt.Size = New System.Drawing.Size(100, 24)
         Me.全套SIZE45天_bt.TabIndex = 337
@@ -145,7 +148,7 @@ Partial Class 生產進度表
         '樣品SIZE60天_bt
         '
         Me.樣品SIZE60天_bt.ForeColor = System.Drawing.Color.Red
-        Me.樣品SIZE60天_bt.Location = New System.Drawing.Point(82, 27)
+        Me.樣品SIZE60天_bt.Location = New System.Drawing.Point(82, 58)
         Me.樣品SIZE60天_bt.Name = "樣品SIZE60天_bt"
         Me.樣品SIZE60天_bt.Size = New System.Drawing.Size(100, 24)
         Me.樣品SIZE60天_bt.TabIndex = 336
@@ -154,7 +157,7 @@ Partial Class 生產進度表
         '
         '關鍵字查詢_bt
         '
-        Me.關鍵字查詢_bt.Location = New System.Drawing.Point(294, 27)
+        Me.關鍵字查詢_bt.Location = New System.Drawing.Point(294, 58)
         Me.關鍵字查詢_bt.Name = "關鍵字查詢_bt"
         Me.關鍵字查詢_bt.Size = New System.Drawing.Size(84, 24)
         Me.關鍵字查詢_bt.TabIndex = 458
@@ -165,7 +168,7 @@ Partial Class 生產進度表
         '
         Me.驗貨報告_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.驗貨報告_pb.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.驗貨報告_pb.Location = New System.Drawing.Point(12, 78)
+        Me.驗貨報告_pb.Location = New System.Drawing.Point(12, 109)
         Me.驗貨報告_pb.Name = "驗貨報告_pb"
         Me.驗貨報告_pb.Size = New System.Drawing.Size(366, 252)
         Me.驗貨報告_pb.TabIndex = 500
@@ -187,7 +190,7 @@ Partial Class 生產進度表
         Me.备注_lb.AutoSize = True
         Me.备注_lb.Font = New System.Drawing.Font("微軟正黑體", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.备注_lb.ForeColor = System.Drawing.Color.Black
-        Me.备注_lb.Location = New System.Drawing.Point(12, 331)
+        Me.备注_lb.Location = New System.Drawing.Point(12, 362)
         Me.备注_lb.Name = "备注_lb"
         Me.备注_lb.Size = New System.Drawing.Size(217, 24)
         Me.备注_lb.TabIndex = 504
@@ -208,9 +211,9 @@ Partial Class 生產進度表
         '
         Me.驗貨報告圖庫_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.驗貨報告圖庫_pb.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.驗貨報告圖庫_pb.Location = New System.Drawing.Point(12, 421)
+        Me.驗貨報告圖庫_pb.Location = New System.Drawing.Point(12, 456)
         Me.驗貨報告圖庫_pb.Name = "驗貨報告圖庫_pb"
-        Me.驗貨報告圖庫_pb.Size = New System.Drawing.Size(366, 487)
+        Me.驗貨報告圖庫_pb.Size = New System.Drawing.Size(366, 452)
         Me.驗貨報告圖庫_pb.TabIndex = 511
         Me.驗貨報告圖庫_pb.TabStop = False
         '
@@ -250,11 +253,41 @@ Partial Class 生產進度表
         Me.順時鐘90度旋轉_bt.Text = "順時鐘90度旋轉"
         Me.順時鐘90度旋轉_bt.UseVisualStyleBackColor = True
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(304, 12)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 550
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(226, 12)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 549
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(183, 11)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 548
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         '生產進度表
         '
         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.Label20)
         Me.Controls.Add(Me.垂直翻轉_bt)
         Me.Controls.Add(Me.水平翻轉_bt)
         Me.Controls.Add(Me.逆時鐘90度旋轉_bt)
@@ -310,5 +343,8 @@ Partial Class 生產進度表
     Friend WithEvents 水平翻轉_bt As Button
     Friend WithEvents 逆時鐘90度旋轉_bt As Button
     Friend WithEvents 順時鐘90度旋轉_bt As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/生產進度表.vb

@@ -22,12 +22,12 @@ Public Class 生產進度表
         If PA = "" Then
             SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, 驗貨報告圖片 FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         Else
             SQL1 = "SELECT PO_S_Date AS 接單日, 出貨地, 訂單流水號 AS 天盾PO, 客戶訂單號 AS 客戶PO, 形體號, TVW, 楦頭號, 楦型, 材質, 顏色, 訂單數量 AS 訂單數, 工廠回復交期 AS 工廠交期, 七號模具, TRIAL1, TRIAL2, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, 驗貨報告圖片 FROM 訂單控制表 " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (訂單流水號 LIKE '%" & PA & "%') OR " &
                          "((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (年份季度 LIKE '%" & PA & "%') OR " &
                          "((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (客戶訂單號 LIKE '%" & PA & "%') OR " &
@@ -113,7 +113,7 @@ Public Class 生產進度表
             顏色_bt.Text = xlSheet.Cells(i, 12).value : If 顏色_bt.Text = "" Then : Else : 顏色_bt.Text = Format(xlSheet.Cells(i, 12).value, "yyyy/MM/dd") : End If
             If 客戶訂單號_tb.Text <> "" Then
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET 出貨地 = N'" & xlSheet.Cells(i, 2).value & "',  " &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET 出貨地 = N'" & xlSheet.Cells(i, 2).value & "',  " &
                                              "楦頭號 = N'" & xlSheet.Cells(i, 7).value & "',  " &
                                                "材質 = N'" & xlSheet.Cells(i, 9).value & "',  " &
                                        "工廠回復交期 = N'" & 顏色_bt.Text & "',  " &
@@ -152,6 +152,8 @@ 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()
+
         BB(0) = False : BB(1) = True : BB(2) = True : BB(3) = True
         樣品SIZE60天_bt.Enabled = False
         Set_訂單清單() : Set_grid()
@@ -278,4 +280,10 @@ Public Class 生產進度表
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles 垂直翻轉_bt.Click
         驗貨報告圖庫_pb.Image.RotateFlip(RotateFlipType.Rotate180FlipX) : 驗貨報告圖庫_pb.Refresh() : 驗貨報告圖庫_pb.SizeMode = 4
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/皮料資料紀錄表.Designer.vb

@@ -33,6 +33,9 @@ Partial Class 皮料資料紀錄表
         Me.圖片庫_pb = New System.Windows.Forms.PictureBox()
         Me.皮料資料紀錄表_lb = New System.Windows.Forms.Label()
         Me.备注_lb = New System.Windows.Forms.Label()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.皮料清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片庫_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -126,18 +129,48 @@ Partial Class 皮料資料紀錄表
         Me.备注_lb.AutoSize = True
         Me.备注_lb.Font = New System.Drawing.Font("微軟正黑體", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.备注_lb.ForeColor = System.Drawing.Color.Black
-        Me.备注_lb.Location = New System.Drawing.Point(12, 353)
+        Me.备注_lb.Location = New System.Drawing.Point(121, 389)
         Me.备注_lb.Name = "备注_lb"
         Me.备注_lb.Size = New System.Drawing.Size(217, 24)
         Me.备注_lb.TabIndex = 504
         Me.备注_lb.Text = "PS : 查詢後編輯才可存檔"
         Me.备注_lb.Visible = False
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(263, 356)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 553
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(185, 356)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 552
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(142, 355)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 551
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         '皮料資料紀錄表
         '
         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.Label20)
         Me.Controls.Add(Me.备注_lb)
         Me.Controls.Add(Me.皮料資料紀錄表_lb)
         Me.Controls.Add(Me.圖片庫_pb)
@@ -168,5 +201,8 @@ Partial Class 皮料資料紀錄表
     Friend WithEvents 圖片庫_pb As PictureBox
     Friend WithEvents 皮料資料紀錄表_lb As Label
     Friend WithEvents 备注_lb As Label
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/皮料資料紀錄表.vb

@@ -16,11 +16,11 @@ Public Class 皮料資料紀錄表
     Private Sub Set_皮料清單()
         Set_DGV1載入前設定()
         If PA = "" Then
-            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號 FROM 訂單控制表 " &
+            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號 FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)  " &
                    "ORDER BY   資料流水號 DESC, 形體號, 顏色, 楦型"
         Else
-            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號 FROM 訂單控制表 " &
+            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號 FROM " & 訂單資料表(1) & " " &
                    "WHERE ((年份季度 NOT LIKE '%10%') AND (年份季度 NOT LIKE '%11%') AND (年份季度 NOT LIKE '%12%') AND (年份季度 NOT LIKE '%13%') AND " &
                    "(年份季度 NOT LIKE '%14%') AND (年份季度 NOT LIKE '%15%') AND (年份季度 NOT LIKE '%16%') AND (年份季度 NOT LIKE '%17%')) AND " &
                    "(訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR " &
@@ -43,6 +43,8 @@ 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()
+
         PA = ""
         Set_皮料清單() : Set_grid()
         QQ(0) = True : QQ(1) = False
@@ -143,11 +145,17 @@ Public Class 皮料資料紀錄表
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles 存檔_bt.Click
         For i As Integer = 0 To 皮料清單_dgv.Rows.Count - 1
             ConnOpen()
-            SQL1 = "UPDATE 訂單控制表 SET  LEATHER = '" & 皮料清單_dgv.Rows(i).Cells("LEATHER").Value & "', LEA_Note = '" & 皮料清單_dgv.Rows(i).Cells("LEA_Note").Value & "' " &
+            SQL1 = "UPDATE " & 訂單資料表(1) & " SET  LEATHER = '" & 皮料清單_dgv.Rows(i).Cells("LEATHER").Value & "', LEA_Note = '" & 皮料清單_dgv.Rows(i).Cells("LEA_Note").Value & "' " &
                    "WHERE (資料流水號 LIKE '" & 皮料清單_dgv.Rows(i).Cells("資料流水號").Value & "')"
             CmdSet_For_dr() : conn.Close()
         Next i
         MsgBox("存檔完成")
         Set_皮料清單() : Set_grid() : Timer1.Enabled = False : 注释_lb.Visible = False : 存檔_bt.Enabled = False
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : PA = "" : Set_皮料清單() : Set_grid()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : PA = "" : Set_皮料清單() : Set_grid()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/訂單列印選擇.vb

@@ -21,7 +21,7 @@ Public Class 訂單列印選擇
                    "TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, 資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, 出貨數量, PO_S_Date AS 接單日, " &
                    "Requested_XF AS 需求日期, Confirm_XF AS 確認日期, Revised_XF AS 修訂日期, 工廠回復交期 AS 工廠交期, Special_Packaging, Remarks, 出貨地, TVW, 楦頭號, 材質, 七號模具, TRIAL1 AS T1, " &
                    "TRIAL2 AS T2, 長期試穿 AS WEAR_TEST, CFMSAMPLE AS CFM, TRIAL3 AS T3, TRIAL4 AS T4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, " &
-                   "針車時間 AS 針車, 成型時間 AS 成型, 驗貨時間 AS 驗貨, 工廠進度表備註1, 工廠進度表備註2, 客戶包裝確認, 東莞業務備註, 工廠確認, 利威確認, 結關日 FROM 訂單控制表"
+                   "針車時間 AS 針車, 成型時間 AS 成型, 驗貨時間 AS 驗貨, 工廠進度表備註1, 工廠進度表備註2, 客戶包裝確認, 東莞業務備註, 工廠確認, 利威確認, 結關日 FROM " & 訂單資料表(1) & ""
     ReadOnly SQL字串2 As String = " ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC"
     Private Sub Set_DGV1載入前設定()
         DataGridView1.DataSource = Nothing : ds.Clear()

TENDEN-MES-SYS/量產訂單管理/訂單執行資訊輸入.Designer.vb

@@ -46,6 +46,9 @@ Partial Class 訂單執行資訊輸入
         Me.EXCEL檔案導入_bt = New System.Windows.Forms.Button()
         Me.ProgressBar2 = New System.Windows.Forms.ProgressBar()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片庫_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -252,11 +255,41 @@ Partial Class 訂單執行資訊輸入
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(870, 97)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 562
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(792, 97)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 561
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(749, 96)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 560
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         '訂單執行資訊輸入
         '
         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.Label20)
         Me.Controls.Add(Me.ProgressBar2)
         Me.Controls.Add(Me.EXCEL檔案導入_bt)
         Me.Controls.Add(Me.ProgressBar1)
@@ -312,5 +345,8 @@ Partial Class 訂單執行資訊輸入
     Friend WithEvents EXCEL檔案導入_bt As Button
     Friend WithEvents ProgressBar2 As ProgressBar
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/訂單執行資訊輸入.vb

@@ -16,22 +16,28 @@ Public Class 訂單執行資訊輸入
         控制表_dgv.AllowUserToAddRows = False
         ConnOpen()
         If PA = "" Then
-            SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型, 訂單控制表.訂單數量, 訂單控制表.客戶交期, 
-                           訂單控制表.工廠回復交期, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, STYLELIST.APMA確認, 訂單控制表.客戶包裝確認, 訂單控制表.工廠確認 AS 工廠包裝, 
-                           訂單控制表.利威確認 AS 利威驗貨, 訂單控制表.結關日, 訂單控制表.東莞業務備註, 訂單控制表.資料流水號, 訂單控制表.SMS簽回, 訂單控制表.FRS簽回, 訂單控制表.MASTER_SWATCH 
-                    FROM 訂單控制表 LEFT OUTER JOIN STYLELIST ON 訂單控制表.形體號 = STYLELIST.ProductName 
-                    WHERE (訂單控制表.CXL = 0 OR 訂單控制表.CXL IS NULL) AND (訂單控制表.訂單數量 - 訂單控制表.出貨數量 <> 0) 
-                    ORDER BY   SUBSTRING(訂單控制表.訂單流水號, 4, 6) DESC"
+            SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                           " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 
+                           " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
+                           " & 訂單資料表(1) & ".利威確認 AS 利威驗貨, " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".資料流水號, 
+                           " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH 
+                    FROM " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName 
+                    WHERE (" & 訂單資料表(1) & ".CXL = 0 OR " & 訂單資料表(1) & ".CXL IS NULL) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) 
+                    ORDER BY   SUBSTRING(" & 訂單資料表(1) & ".訂單流水號, 4, 6) DESC"
         Else
-            SQL1 = "SELECT 訂單控制表.訂單流水號, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.形體號, 訂單控制表.顏色, 訂單控制表.楦型, 訂單控制表.訂單數量, 訂單控制表.客戶交期, 
-                           訂單控制表.工廠回復交期, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, STYLELIST.APMA確認, 訂單控制表.客戶包裝確認, 訂單控制表.工廠確認 AS 工廠包裝, 
-                           訂單控制表.利威確認 AS 利威驗貨, 訂單控制表.結關日, 訂單控制表.東莞業務備註, 訂單控制表.資料流水號, 訂單控制表.SMS簽回, 訂單控制表.FRS簽回, 訂單控制表.MASTER_SWATCH 
-                    FROM 訂單控制表 LEFT OUTER JOIN STYLELIST ON 訂單控制表.形體號 = STYLELIST.ProductName 
-                    WHERE (訂單控制表.CXL = 0 OR 訂單控制表.CXL IS NULL) AND (訂單控制表.訂單數量 - 訂單控制表.出貨數量 <> 0) AND (訂單控制表.訂單流水號 LIKE '%" & PA & "%' OR 
-                           訂單控制表.年份季度 LIKE '%" & PA & "%' 
-                        OR 訂單控制表.客戶訂單號 LIKE '%" & PA & "%' OR 訂單控制表.形體號 LIKE '%" & PA & "%' OR 訂單控制表.顏色 LIKE '%" & PA & "%' OR 訂單控制表.楦型 LIKE '%" & PA & "%' 
-                        OR 訂單控制表.訂單數量 LIKE '%" & PA & "%' OR 訂單控制表.備註 LIKE '%" & PA & "%' OR 訂單控制表.生產工廠 LIKE '%" & PA & "%' OR 訂單控制表.訂單種類 LIKE '%" & PA & "%') 
-                    ORDER BY   SUBSTRING(訂單控制表.訂單流水號, 4, 6) DESC"
+            SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                           " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 
+                           " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
+                           " & 訂單資料表(1) & ".利威確認 AS 利威驗貨, " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".資料流水號, 
+                           " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH 
+                    FROM " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName 
+                    WHERE (" & 訂單資料表(1) & ".CXL = 0 OR " & 訂單資料表(1) & ".CXL IS NULL) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) 
+                           AND (" & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%' OR 
+                           " & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%' 
+                            OR " & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%' 
+                            OR " & 訂單資料表(1) & ".楦型 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".訂單數量 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%' 
+                            OR " & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%') 
+                    ORDER BY   SUBSTRING(" & 訂單資料表(1) & ".訂單流水號, 4, 6) DESC"
         End If
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 控制表_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
@@ -75,8 +81,10 @@ 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
-        分頁一_bt.Enabled = False : 分頁二_bt.Enabled = True
         PA = "" : 日期1_dtp.Visible = False : 日期2_dtp.Visible = False : 日期3_dtp.Visible = False : 日期4_dtp.Visible = False
+        訂單資料庫選擇.ShowDialog()
+
+        分頁一_bt.Enabled = False : 分頁二_bt.Enabled = True
         Set_清單() : Set_grid()
     End Sub
     Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
@@ -203,7 +211,7 @@ Public Class 訂單執行資訊輸入
         For i As Integer = 0 To 控制表_dgv.Rows.Count - 1
             資料數 = 控制表_dgv.Rows.Count : 進度條()
             ConnOpen()
-            SQL1 = "UPDATE 訂單控制表 SET  客戶包裝確認 = '" & 控制表_dgv.Rows(i).Cells("客戶包裝確認").Value & "', APMA確認 = '" & 控制表_dgv.Rows(i).Cells("APMA確認").Value &
+            SQL1 = "UPDATE " & 訂單資料表(1) & " SET  客戶包裝確認 = '" & 控制表_dgv.Rows(i).Cells("客戶包裝確認").Value & "', APMA確認 = '" & 控制表_dgv.Rows(i).Cells("APMA確認").Value &
                                        "', 東莞業務備註 = '" & 控制表_dgv.Rows(i).Cells("東莞業務備註").Value & "', 工廠確認 = '" & 控制表_dgv.Rows(i).Cells("工廠包裝").Value &
                                        "', 利威確認 = '" & 控制表_dgv.Rows(i).Cells("利威驗貨").Value & "', 結關日 = '" & 控制表_dgv.Rows(i).Cells("結關日").Value &
                                        "', SMS簽回 = '" & 控制表_dgv.Rows(i).Cells("SMS簽回").Value & "', FRS簽回 = '" & 控制表_dgv.Rows(i).Cells("FRS簽回").Value &
@@ -245,12 +253,12 @@ Public Class 訂單執行資訊輸入
                     If Not IsNumeric(xlSheet.Cells(YY, 2).value) And Not IsNothing(xlSheet.Cells(YY, 2).value) Then
                         conn.Close()
                         ConnOpen()
-                        SQL1 = "SELECT 客戶訂單號 FROM 訂單控制表 WHERE 客戶訂單號 LIKE 'PO" & Strings.Right(xlSheet.Cells(YY, 2).value, 11) & "'"
+                        SQL1 = "SELECT 客戶訂單號 FROM " & 訂單資料表(1) & " WHERE 客戶訂單號 LIKE 'PO" & Strings.Right(xlSheet.Cells(YY, 2).value, 11) & "'"
                         CmdSet_For_dr()
                         If dr.Read() Then
                             conn.Close()
                             ConnOpen()
-                            SQL1 = "UPDATE 訂單控制表 SET 力威訂單號 = '" & xlSheet.Cells(YY, 1).value & "'  WHERE 客戶訂單號 LIKE 'PO" & Strings.Right(xlSheet.Cells(YY, 2).value, 11) & "'"
+                            SQL1 = "UPDATE " & 訂單資料表(1) & " SET 力威訂單號 = '" & xlSheet.Cells(YY, 1).value & "'  WHERE 客戶訂單號 LIKE 'PO" & Strings.Right(xlSheet.Cells(YY, 2).value, 11) & "'"
                             CmdSet_For_dr() : conn.Close() : 次數 += 1
                         End If : conn.Close()
                     End If
@@ -261,4 +269,10 @@ Public Class 訂單執行資訊輸入
         ElseIf OpenFileDialog1.ShowDialog = Windows.Forms.DialogResult.No Then
         End If
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_清單() : Set_grid()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_清單() : Set_grid()
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/訂單控制表.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Label21.Text" xml:space="preserve">
+    <value>--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</value>
+  </data>
 </root>

TENDEN-MES-SYS/量產訂單管理/訂單控制表.vb

@@ -1,7 +1,7 @@
 Option Strict Off
 Imports System.IO
 Public Class 訂單控制表
-    ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet
+    ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet : ReadOnly ds4 As New DataSet
     Dim 訂單數量 As Double : Dim 單價 As Double : Dim 總金額 As Double
     '-----------------------------------------0-----------------------1-------------------------2------------------3-----------------4----------------------5-------------------------6
     '                                訂單流水號,               年份季度,               客戶訂單號,            形體號,             顏色,                  楦型,                 訂單數量
@@ -40,7 +40,7 @@ Public Class 訂單控制表
     Private ReadOnly BB(9) As Boolean
     Dim aa As MsgBoxResult
     Private Sub SQL宣告()
-        SQL字串1 = "SELECT 訂單流水號,      年份季度,               客戶訂單號,            形體號,             顏色,                  楦型,                 訂單數量, " &
+        SQL字串1 = "SELECT                訂單流水號,               年份季度,               客戶訂單號,            形體號,             顏色,                  楦型,                 訂單數量, " &
                                            "客戶交期,                   單價,                   總金額,              備註,         生產工廠,              訂單種類,             工廠回復交期, " &
                                             "CFMSPEC,              CFMSAMPLE,                   TRIAL1,            TRIAL2,           TRIAL3,                TRIAL4,             包裝確認時間, " &
                                            "貼標時間,               裁斷時間,                 針車時間,          成型時間,         驗貨時間,            實際離廠日,               資料流水號, " &
@@ -73,8 +73,8 @@ Public Class 訂單控制表
         控制表_dgv.Columns(58).FillWeight = 137 : 控制表_dgv.Columns(59).FillWeight = 137 : 控制表_dgv.Columns(60).FillWeight = 137 : 控制表_dgv.Columns(61).FillWeight = 137
         控制表_dgv.Columns(62).FillWeight = 137 : 控制表_dgv.Columns(63).FillWeight = 120 : 控制表_dgv.Columns(64).FillWeight = 120 : 控制表_dgv.Columns(65).FillWeight = 90
         控制表_dgv.Columns(66).FillWeight = 355 : 控制表_dgv.Columns(67).FillWeight = 172 : 控制表_dgv.Columns(68).FillWeight = 171 : 控制表_dgv.Columns(69).FillWeight = 171
-        控制表_dgv.Columns(70).FillWeight = 171 : 控制表_dgv.Columns(71).FillWeight = 100 : 控制表_dgv.Columns(72).FillWeight = 100 : 控制表_dgv.Columns(73).FillWeight = 245
-        控制表_dgv.Columns(74).FillWeight = 100 : 控制表_dgv.Columns(75).FillWeight = 80 : 控制表_dgv.Columns(76).FillWeight = 60
+        控制表_dgv.Columns(70).FillWeight = 171 : 控制表_dgv.Columns(71).FillWeight = 100 : 控制表_dgv.Columns(72).FillWeight = 100 : 控制表_dgv.Columns(73).FillWeight = 205
+        控制表_dgv.Columns(74).FillWeight = 100 : 控制表_dgv.Columns(75).FillWeight = 120 : 控制表_dgv.Columns(76).FillWeight = 60
 
         控制表_dgv.Columns(6).DefaultCellStyle.Format = "#,##0" : 控制表_dgv.Columns(32).DefaultCellStyle.Format = "#,##0"
         控制表_dgv.Columns(8).DefaultCellStyle.Format = "#,##0.00" : 控制表_dgv.Columns(9).DefaultCellStyle.Format = "#,##0.00"
@@ -159,7 +159,7 @@ Public Class 訂單控制表
         ConnOpen()
     End Sub
     Private Sub Set_DGV1載入後設定()
-        cmd.Connection = conn : cmd.CommandText = SQL1 : da.SelectCommand = cmd : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 控制表_dgv.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_訂單清單()
         Set_DGV1載入前設定()
@@ -175,9 +175,9 @@ Public Class 訂單控制表
         End If
         If CheckBox23.Checked = True Then
             PA = InputBox("請輸入要查詢的資料")
-            列印用SQL = " WHERE (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' " &
-                              "OR 顏色 LIKE '%" & PA & "%' OR 楦型 LIKE '%" & PA & "%' OR 備註 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%' OR 訂單種類 LIKE '%" & PA & "%') " &
-                              "AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0) "
+            列印用SQL = " WHERE (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR 顏色 LIKE '%" & PA & "%' OR 
+                                 楦型 LIKE '%" & PA & "%' OR 備註 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%' OR 訂單種類 LIKE '%" & PA & "%' OR 力威訂單號 LIKE '%" & PA & "%' OR 
+                                 ProductID LIKE '%" & PA & "%' OR UoM LIKE '%" & PA & "%') AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0) "
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
             PA = ""
             '-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -221,7 +221,7 @@ Public Class 訂單控制表
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And
                CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' " &
                         "AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
@@ -233,37 +233,37 @@ Public Class 訂單控制表
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And
                CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' " &
                         "AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And
                CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' " &
                         "AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And
                CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' " &
                         "AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True And
                CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' " &
                         "AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And
                CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' " &
                         "AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And
                CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
@@ -292,63 +292,63 @@ Public Class 訂單控制表
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
@@ -412,83 +412,83 @@ Public Class 訂單控制表
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox5.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 楦型 LIKE '" & ComboBox4.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND" &
                         " 顏色 LIKE '" & ComboBox3.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox5.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
@@ -572,63 +572,63 @@ Public Class 訂單控制表
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox7.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox5.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox5.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND 楦型 LIKE '" & ComboBox4.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 楦型 LIKE '" & ComboBox4.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True And CheckBox4.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND 顏色 LIKE '" & ComboBox3.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox4.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True And CheckBox3.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text &
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text &
                         "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox7.Checked = True And CheckBox8.Checked = True Then
@@ -677,22 +677,22 @@ Public Class 訂單控制表
             列印用SQL = " WHERE 年份季度 LIKE '" & ComboBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox8.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox7.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 生產工廠 LIKE '" & ComboBox5.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox5.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 楦型 LIKE '" & ComboBox4.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox4.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 顏色 LIKE '" & ComboBox3.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox3.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 形體號 LIKE '" & ComboBox2.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True And CheckBox2.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND 年份季度 LIKE '" & ComboBox1.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox8.Checked = True Then
             列印用SQL = " WHERE 訂單種類 LIKE '" & ComboBox6.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
@@ -713,7 +713,7 @@ Public Class 訂單控制表
             列印用SQL = " WHERE 年份季度 LIKE '" & ComboBox1.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         ElseIf CheckBox1.Checked = True Then
-            列印用SQL = " WHERE 訂單流水號 LIKE '" & TextBox1.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
+            列印用SQL = " WHERE 訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "' AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)"
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         Else
             MsgBox("沒有選擇篩選條件")
@@ -725,7 +725,7 @@ Public Class 訂單控制表
         End If
     End Sub
     Private Sub Set_格式設定()
-        TextBox1.Enabled = False : TextBox5.Enabled = False : TextBox7.Visible = False
+        天盾訂單號_tb.Enabled = False : TextBox5.Enabled = False : TextBox7.Visible = False
         CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox7.Checked = False
         CheckBox8.Checked = False
         CheckBox6.Checked = False : CheckBox9.Checked = False : CheckBox17.Checked = False
@@ -754,6 +754,97 @@ Public Class 訂單控制表
         TextBox9.Text = Format(Val(金額加總), "#,##0.00")
         TextBox10.Text = Format(Val(金額加總 / 數量加總), "#,##0.00")
     End Sub
+    Private Sub Set_訂單明細()
+        明細表_dgv.DataSource = Nothing : ds2.Clear()
+        明細表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        明細表_dgv.ColumnHeadersHeight = 25
+        明細表_dgv.AllowUserToAddRows = False
+        ConnOpen()
+        SQL1 = "SELECT      " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, " & 訂單資料表(5) & ".ProductName, 
+                            " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM, " & 訂單資料表(5) & ".[5], " & 訂單資料表(5) & ".[5.5], 
+                            " & 訂單資料表(5) & ".[6], " & 訂單資料表(5) & ".[6.5], " & 訂單資料表(5) & ".[7], " & 訂單資料表(5) & ".[7.5], " & 訂單資料表(5) & ".[8], " & 訂單資料表(5) & ".[8.5], 
+                            " & 訂單資料表(5) & ".[9], " & 訂單資料表(5) & ".[9.5], " & 訂單資料表(5) & ".[10], " & 訂單資料表(5) & ".[10.5], " & 訂單資料表(5) & ".[11], " & 訂單資料表(5) & ".[11.5], 
+                            " & 訂單資料表(5) & ".[12], " & 訂單資料表(5) & ".[12.5], " & 訂單資料表(5) & ".[13], " & 訂單資料表(5) & ".[14], " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + 
+                            " & 訂單資料表(5) & ".[6] + " & 訂單資料表(5) & ".[6.5] + " & 訂單資料表(5) & ".[7] + " & 訂單資料表(5) & ".[7.5] + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + 
+                            " & 訂單資料表(5) & ".[9] + " & 訂單資料表(5) & ".[9.5] + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5] + " & 訂單資料表(5) & ".[11] + " & 訂單資料表(5) & ".[11.5]
+                            + " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] + " & 訂單資料表(5) & ".[14] AS TOTAL
+                FROM        " & 訂單資料表(5) & " INNER JOIN
+                            (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
+                             FROM     " & 訂單資料表(1) & "
+                             WHERE   (客戶訂單號 LIKE '" & 客戶訂單號_tb.Text & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "')) AS WWEE ON 
+                             " & 訂單資料表(5) & ".天盾流水號 = WWEE.訂單流水號 AND " & 訂單資料表(5) & ".客戶訂單號 = WWEE.客戶訂單號 AND " & 訂單資料表(5) & ".ProductName = WWEE.形體號 AND 
+                             " & 訂單資料表(5) & ".Color = WWEE.顏色 AND  " & 訂單資料表(5) & ".DM = WWEE.楦型 AND " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + " & 訂單資料表(5) & ".[6] + 
+                             " & 訂單資料表(5) & ".[6.5] + " & 訂單資料表(5) & ".[7] + " & 訂單資料表(5) & ".[7.5] + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + " & 訂單資料表(5) & ".[9] + 
+                             " & 訂單資料表(5) & ".[9.5] + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5] + " & 訂單資料表(5) & ".[11] + " & 訂單資料表(5) & ".[11.5] + 
+                             " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] + " & 訂單資料表(5) & ".[14] = WWEE.訂單數量
+                WHERE      (" & 訂單資料表(5) & ".客戶訂單號 LIKE '" & 客戶訂單號_tb.Text & "') AND (" & 訂單資料表(5) & ".天盾流水號 LIKE '" & 天盾訂單號_tb.Text & "') AND (WWEE.CXL = 0 OR WWEE.CXL IS NULL)
+                ORDER BY   " & 訂單資料表(5) & ".ProductName, " & 訂單資料表(5) & ".Color"
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds2) : 明細表_dgv.DataSource = ds2.Tables(0) : conn.Close()
+
+        明細表_dgv.Columns(0).Visible = False : 明細表_dgv.Columns(1).Visible = False
+        明細表_dgv.Columns(2).FillWeight = 90 : 明細表_dgv.Columns(3).FillWeight = 90 : 明細表_dgv.Columns(4).FillWeight = 190 : 明細表_dgv.Columns(5).FillWeight = 80
+        明細表_dgv.Columns(6).FillWeight = 70 : 明細表_dgv.Columns(7).FillWeight = 40 : 明細表_dgv.Columns(8).FillWeight = 40 : 明細表_dgv.Columns(9).FillWeight = 40
+        明細表_dgv.Columns(10).FillWeight = 40 : 明細表_dgv.Columns(11).FillWeight = 40 : 明細表_dgv.Columns(12).FillWeight = 40 : 明細表_dgv.Columns(13).FillWeight = 40
+        明細表_dgv.Columns(14).FillWeight = 40 : 明細表_dgv.Columns(15).FillWeight = 40 : 明細表_dgv.Columns(16).FillWeight = 40 : 明細表_dgv.Columns(17).FillWeight = 40
+        明細表_dgv.Columns(18).FillWeight = 40 : 明細表_dgv.Columns(19).FillWeight = 40 : 明細表_dgv.Columns(20).FillWeight = 40 : 明細表_dgv.Columns(21).FillWeight = 40
+        明細表_dgv.Columns(22).FillWeight = 40 : 明細表_dgv.Columns(23).FillWeight = 40 : 明細表_dgv.Columns(24).FillWeight = 40 : 明細表_dgv.Columns(25).FillWeight = 60
+        明細表_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(8).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(9).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(10).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(11).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(12).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(13).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(14).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(15).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(16).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(17).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(18).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(19).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(20).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(21).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(22).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(23).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(24).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(25).DefaultCellStyle.Format = "#,##0"
+    End Sub
+    Private Sub Set_裝箱控制表()
+        裝箱控制表_dgv.DataSource = Nothing : ds3.Clear()
+        裝箱控制表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        裝箱控制表_dgv.ColumnHeadersHeight = 25
+        裝箱控制表_dgv.AllowUserToAddRows = False
+        ConnOpen()
+        SQL1 = "SELECT      天盾流水號, 客戶訂單號, 力威訂單號, Item, Material, MaterialDescription, Qty, UoM, IncoTerms, CustomerData, Size, HS, Units1, DtyRate, AddOnDty, UnitsCtn, NoCtn, CtnNo, Units2, 
+                            PLMSeason, ProductID, Stock, StkName, CustStk, CustStkName, CasePack, Colorway, OrderColor, Logo, POItemText, FinalCustomerShipTo, 
+                            ProductDescription
+                FROM        " & 訂單資料表(2) & "
+                WHERE       天盾流水號 LIKE '" & 天盾訂單號_tb.Text & "' ORDER BY Item"
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds3) : 裝箱控制表_dgv.DataSource = ds3.Tables(0) : conn.Close()
+
+        裝箱控制表_dgv.Columns(0).Visible = False : 裝箱控制表_dgv.Columns(1).Visible = False : 裝箱控制表_dgv.Columns(2).Visible = False
+        裝箱控制表_dgv.Columns(3).FillWeight = 50 : 裝箱控制表_dgv.Columns(4).FillWeight = 70 : 裝箱控制表_dgv.Columns(5).FillWeight = 200 : 裝箱控制表_dgv.Columns(6).FillWeight = 50
+        裝箱控制表_dgv.Columns(7).FillWeight = 50 : 裝箱控制表_dgv.Columns(8).Visible = False : 裝箱控制表_dgv.Columns(9).Visible = False : 裝箱控制表_dgv.Columns(10).Visible = False
+        裝箱控制表_dgv.Columns(11).Visible = False : 裝箱控制表_dgv.Columns(12).Visible = False : 裝箱控制表_dgv.Columns(13).Visible = False : 裝箱控制表_dgv.Columns(14).Visible = False
+        裝箱控制表_dgv.Columns(15).Visible = False : 裝箱控制表_dgv.Columns(16).Visible = False : 裝箱控制表_dgv.Columns(17).Visible = False : 裝箱控制表_dgv.Columns(18).Visible = False
+        裝箱控制表_dgv.Columns(19).Visible = False : 裝箱控制表_dgv.Columns(20).Visible = False : 裝箱控制表_dgv.Columns(21).Visible = False : 裝箱控制表_dgv.Columns(22).Visible = False
+        裝箱控制表_dgv.Columns(23).Visible = False : 裝箱控制表_dgv.Columns(24).Visible = False : 裝箱控制表_dgv.Columns(25).Visible = False : 裝箱控制表_dgv.Columns(26).Visible = False
+        裝箱控制表_dgv.Columns(27).Visible = False : 裝箱控制表_dgv.Columns(28).Visible = False : 裝箱控制表_dgv.Columns(29).Visible = False : 裝箱控制表_dgv.Columns(30).Visible = False
+        裝箱控制表_dgv.Columns(31).Visible = False
+        裝箱控制表_dgv.Columns(6).DefaultCellStyle.Format = "#,##0"
+    End Sub
+    Private Sub Set_裝箱明細()
+        裝箱明細_dgv.DataSource = Nothing : ds4.Clear()
+        裝箱明細_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        裝箱明細_dgv.ColumnHeadersHeight = 25
+        裝箱明細_dgv.AllowUserToAddRows = False
+        ConnOpen()
+        SQL1 = "SELECT    天盾流水號, 客戶訂單號, 力威訂單號, Item, Material, DM, [5], [5.5], [6], [6.5], [7], [7.5], [8], [8.5], [9], [9.5], [10], [10.5], [11], [11.5], [12], [12.5], [13], [14]
+                FROM      " & 訂單資料表(3) & "
+                WHERE     天盾流水號 LIKE '" & 天盾訂單號_tb.Text & "' ORDER BY Item"
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds4) : 裝箱明細_dgv.DataSource = ds4.Tables(0) : conn.Close()
+
+        裝箱明細_dgv.Columns(0).Visible = False : 裝箱明細_dgv.Columns(1).Visible = False : 裝箱明細_dgv.Columns(2).Visible = False
+        裝箱明細_dgv.Columns(3).FillWeight = 90 : 裝箱明細_dgv.Columns(4).FillWeight = 190 : 裝箱明細_dgv.Columns(5).FillWeight = 80
+        裝箱明細_dgv.Columns(6).FillWeight = 40 : 裝箱明細_dgv.Columns(7).FillWeight = 40 : 裝箱明細_dgv.Columns(8).FillWeight = 40 : 裝箱明細_dgv.Columns(9).FillWeight = 40
+        裝箱明細_dgv.Columns(10).FillWeight = 40 : 裝箱明細_dgv.Columns(11).FillWeight = 40 : 裝箱明細_dgv.Columns(12).FillWeight = 40 : 裝箱明細_dgv.Columns(13).FillWeight = 40
+        裝箱明細_dgv.Columns(14).FillWeight = 40 : 裝箱明細_dgv.Columns(15).FillWeight = 40 : 裝箱明細_dgv.Columns(16).FillWeight = 40 : 裝箱明細_dgv.Columns(17).FillWeight = 40
+        裝箱明細_dgv.Columns(18).FillWeight = 40 : 裝箱明細_dgv.Columns(19).FillWeight = 40 : 裝箱明細_dgv.Columns(20).FillWeight = 40 : 裝箱明細_dgv.Columns(21).FillWeight = 40
+        裝箱明細_dgv.Columns(22).FillWeight = 40 : 裝箱明細_dgv.Columns(23).FillWeight = 40
+        裝箱明細_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(8).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(9).DefaultCellStyle.Format = "#,##0"
+        裝箱明細_dgv.Columns(10).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(11).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(12).DefaultCellStyle.Format = "#,##0"
+        裝箱明細_dgv.Columns(13).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(14).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(15).DefaultCellStyle.Format = "#,##0"
+        裝箱明細_dgv.Columns(16).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(17).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(18).DefaultCellStyle.Format = "#,##0"
+        裝箱明細_dgv.Columns(19).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(20).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(21).DefaultCellStyle.Format = "#,##0"
+        裝箱明細_dgv.Columns(22).DefaultCellStyle.Format = "#,##0" : 裝箱明細_dgv.Columns(23).DefaultCellStyle.Format = "#,##0"
+    End Sub
     Private Sub ComboBox1下拉表單資料載入()
         conn1.Close()
         If conn1.State = ConnectionState.Closed Then : conn1.ConnectionString = ConString : conn1.Open() : End If
@@ -843,6 +934,12 @@ 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
+
+        AA1_lb.Text = "Purchasing Group" : AA2_lb.Text = "PO Type" : AA3_lb.Text = "Inco Terms" : AA4_lb.Text = "CALERES PO#" : AA5_lb.Text = "SERVICED"
+        AA6_lb.Text = "Version" : AA7_lb.Text = "Vendor" : AA8_lb.Text = "Company Code" : AA9_lb.Text = "Shipping Method" : AA10_lb.Text = "Ship To"
+        AA11_lb.Text = "Factory No" : AA12_lb.Text = "Final Customer Ship To"
+        明細表_dgv.Visible = True : 裝箱明細_dgv.Visible = False : 資訊_gb.Visible = False
+
         訂單資料庫選擇.ShowDialog()
 
         SQL宣告()
@@ -899,19 +996,35 @@ Public Class 訂單控制表
     Private Sub 訂單控制表_Unload(sender As Object, e As EventArgs) Handles MyBase.Closing
         frmOpenFlag = False
         ConnOpen()
-        SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(TextBox1.Text, 6) & "')"
+        SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(天盾訂單號_tb.Text, 6) & "')"
         cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : conn.Close()
     End Sub
+    Private Sub 裝箱控制表_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 裝箱控制表_dgv.CellClick
+        If e.RowIndex = -1 Then : Else
+            TT01_lb.Text = 裝箱控制表_dgv("IncoTerms", e.RowIndex).Value.ToString : TT02_lb.Text = 裝箱控制表_dgv("CustomerData", e.RowIndex).Value.ToString
+            TT03_lb.Text = 裝箱控制表_dgv("Size", e.RowIndex).Value.ToString : TT04_lb.Text = 裝箱控制表_dgv("HS", e.RowIndex).Value.ToString
+            TT05_lb.Text = 裝箱控制表_dgv("Units1", e.RowIndex).Value.ToString : TT06_lb.Text = 裝箱控制表_dgv("DtyRate", e.RowIndex).Value.ToString
+            TT07_lb.Text = 裝箱控制表_dgv("AddOnDty", e.RowIndex).Value.ToString : TT08_lb.Text = 裝箱控制表_dgv("UnitsCtn", e.RowIndex).Value.ToString
+            TT09_lb.Text = 裝箱控制表_dgv("NoCtn", e.RowIndex).Value.ToString : TT10_lb.Text = 裝箱控制表_dgv("CtnNo", e.RowIndex).Value.ToString
+            TT11_lb.Text = 裝箱控制表_dgv("Units2", e.RowIndex).Value.ToString : TT12_lb.Text = 裝箱控制表_dgv("PLMSeason", e.RowIndex).Value.ToString
+            TT13_lb.Text = 裝箱控制表_dgv("ProductID", e.RowIndex).Value.ToString : TT14_lb.Text = 裝箱控制表_dgv("Stock", e.RowIndex).Value.ToString
+            TT15_lb.Text = 裝箱控制表_dgv("StkName", e.RowIndex).Value.ToString : TT16_lb.Text = 裝箱控制表_dgv("CustStk", e.RowIndex).Value.ToString
+            TT17_lb.Text = 裝箱控制表_dgv("CustStkName", e.RowIndex).Value.ToString : TT18_lb.Text = 裝箱控制表_dgv("CasePack", e.RowIndex).Value.ToString
+            TT19_lb.Text = 裝箱控制表_dgv("Colorway", e.RowIndex).Value.ToString : TT20_lb.Text = 裝箱控制表_dgv("OrderColor", e.RowIndex).Value.ToString
+            TT21_lb.Text = 裝箱控制表_dgv("Logo", e.RowIndex).Value.ToString : TT22_lb.Text = 裝箱控制表_dgv("POItemText", e.RowIndex).Value.ToString
+            TT23_lb.Text = 裝箱控制表_dgv("FinalCustomerShipTo", e.RowIndex).Value.ToString : TT24_lb.Text = 裝箱控制表_dgv("ProductDescription", e.RowIndex).Value.ToString
+        End If
+    End Sub
     Private Sub DataGridView1_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 控制表_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             ConnOpen()
-            SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(TextBox1.Text, 6) & "')"
+            SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(天盾訂單號_tb.Text, 6) & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
 
             PP1 = 控制表_dgv(3, e.RowIndex).Value.ToString : PP2 = 控制表_dgv(4, e.RowIndex).Value.ToString
             ComboBox2下拉表單資料載入() : ComboBox3下拉表單資料載入()
-            TextBox1.Text = 控制表_dgv(0, e.RowIndex).Value.ToString : ComboBox1.Text = 控制表_dgv(1, e.RowIndex).Value.ToString
-            TextBox2.Text = 控制表_dgv(2, e.RowIndex).Value.ToString : ComboBox2.Text = 控制表_dgv(3, e.RowIndex).Value.ToString
+            天盾訂單號_tb.Text = 控制表_dgv(0, e.RowIndex).Value.ToString : ComboBox1.Text = 控制表_dgv(1, e.RowIndex).Value.ToString
+            客戶訂單號_tb.Text = 控制表_dgv(2, e.RowIndex).Value.ToString : ComboBox2.Text = 控制表_dgv(3, e.RowIndex).Value.ToString
             ComboBox3.Text = 控制表_dgv(4, e.RowIndex).Value.ToString : ComboBox4.Text = 控制表_dgv(5, e.RowIndex).Value.ToString
             訂單數量 = 控制表_dgv(6, e.RowIndex).Value.ToString : TextBox3.Text = Format(Val(訂單數量), "#,##0")
 
@@ -937,6 +1050,43 @@ Public Class 訂單控制表
 
             TextBox7.Text = 控制表_dgv(27, e.RowIndex).Value.ToString
 
+            ConnOpen()
+            SQL1 = "SELECT 客戶訂單號, 天盾流水號, ModeOfDelivery, DeliveryTerms, OrgShipDate, FromPort, ToPort, ShippingCarrier, VendorReference, ModifiedDate, CustomerName, ShipDate, 
+                           SalesOrder, DeliveryAddress, 下單日, 交期, ETADate, CreatedDate, Brand, CustomerRequisition, 工廠編號, 工廠地址, 代理編號, 訂貨代理, 總雙數, 總案件數, 公司, 
+                           工廠簡稱, 最終運送, 入單型態 
+                    FROM " & 訂單資料表(0) & " WHERE (天盾流水號 LIKE '" & 天盾訂單號_tb.Text & "')"
+            CmdSet_For_dr()
+            If dr.Read() Then
+                If dr("入單型態").ToString = "2" Then
+                    AA1_lb.Text = "Purchasing Group" : AA2_lb.Text = "PO Type" : AA3_lb.Text = "Inco Terms" : AA4_lb.Text = "CALERES PO#" : AA5_lb.Text = "SERVICED"
+                    AA6_lb.Text = "Version" : AA7_lb.Text = "Vendor" : AA8_lb.Text = "Company Code" : AA9_lb.Text = "Shipping Method" : AA10_lb.Text = "Ship To"
+                    AA11_lb.Text = "Factory No" : AA12_lb.Text = "Final Customer Ship To"
+
+                    Brand_tb.Text = dr("Brand").ToString : 訂單類別_tb.Text = dr("ModeOfDelivery").ToString : 英科條款_tb.Text = dr("DeliveryTerms").ToString
+                    力威訂單號_tb.Text = dr("CustomerRequisition").ToString : 服務_tb.Text = dr("公司").ToString : 版本_tb.Text = dr("ModifiedDate").ToString
+                    供應商編號_tb.Text = dr("VendorReference").ToString : 公司編號_tb.Text = dr("CustomerName").ToString : 郵寄方式_tb.Text = dr("SalesOrder").ToString
+                    地址1_tb.Text = dr("工廠地址").ToString : 工廠編號_tb.Text = dr("工廠編號").ToString : 地址二_tb.Text = dr("DeliveryAddress").ToString
+                    最終運送_tb.Text = dr("最終運送").ToString : 代理編號_cb.Text = dr("代理編號").ToString : 訂貨代理_tb.Text = dr("訂貨代理").ToString
+                    總雙數_tb.Text = Format(Val(dr("總雙數").ToString), "#,##0") : 總案件_tb.Text = Format(Val(dr("總案件數").ToString), "#,##0")
+                Else
+                    AA1_lb.Text = "Brand" : AA2_lb.Text = "Mode Of Delivery" : AA3_lb.Text = "Delivery Terms" : AA4_lb.Text = "Customer Requisition" : AA5_lb.Text = "Shipping Carrier"
+                    AA6_lb.Text = "Modified Date" : AA7_lb.Text = "Vendor Reference" : AA8_lb.Text = "Customer Name" : AA9_lb.Text = "Sales Order" : AA10_lb.Text = "Delivery Address"
+                    AA11_lb.Text = "From Port" : AA12_lb.Text = "To Port"
+
+                    Brand_tb.Text = dr("Brand").ToString : 訂單類別_tb.Text = dr("ModeOfDelivery").ToString : 英科條款_tb.Text = dr("DeliveryTerms").ToString
+                    力威訂單號_tb.Text = dr("CustomerRequisition").ToString : 服務_tb.Text = dr("ShippingCarrier").ToString : 版本_tb.Text = dr("ModifiedDate").ToString
+                    供應商編號_tb.Text = dr("VendorReference").ToString : 公司編號_tb.Text = dr("CustomerName").ToString : 郵寄方式_tb.Text = dr("SalesOrder").ToString
+                    地址1_tb.Text = dr("FromPort").ToString : 工廠編號_tb.Text = dr("工廠編號").ToString : 地址二_tb.Text = dr("DeliveryAddress").ToString
+                    最終運送_tb.Text = dr("ToPort").ToString : 代理編號_cb.Text = dr("代理編號").ToString : 訂貨代理_tb.Text = dr("訂貨代理").ToString
+                    總雙數_tb.Text = Format(Val(dr("總雙數").ToString), "#,##0") : 總案件_tb.Text = Format(Val(dr("總案件數").ToString), "#,##0")
+                End If
+            End If : conn.Close()
+
+            Set_訂單明細() : Set_裝箱控制表() : Set_裝箱明細()
+            TT01_lb.Text = "" : TT02_lb.Text = "" : TT03_lb.Text = "" : TT04_lb.Text = "" : TT05_lb.Text = "" : TT06_lb.Text = "" : TT07_lb.Text = "" : TT08_lb.Text = "" : TT09_lb.Text = ""
+            TT10_lb.Text = "" : TT11_lb.Text = "" : TT12_lb.Text = "" : TT13_lb.Text = "" : TT14_lb.Text = "" : TT15_lb.Text = "" : TT16_lb.Text = "" : TT17_lb.Text = "" : TT18_lb.Text = ""
+            TT19_lb.Text = "" : TT20_lb.Text = "" : TT21_lb.Text = "" : TT22_lb.Text = "" : TT23_lb.Text = "" : TT24_lb.Text = ""
+
             ConnOpen()
             SQL1 = "SELECT Style FROM STYLELIST WHERE (ProductName LIKE '" & ComboBox2.Text & "')"
             CmdSet_For_dr()
@@ -1119,33 +1269,27 @@ Public Class 訂單控制表
     End Sub
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles ADD1_bt.Click
         清單修改.Close() : 修改清單(0) = True : 修改清單(1) = False : 修改清單(2) = False : 修改清單(3) = False : 修改清單(4) = False : 修改清單(5) = False : 修改清單(6) = False
-        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False
-        清單修改.Show() : ComboBox1下拉表單資料載入()
+        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False : 清單修改.Show() : ComboBox1下拉表單資料載入()
     End Sub
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles ADD2_bt.Click
         TENDENZA_STYLE_資料管理.Close() : 修改清單(0) = False : 修改清單(1) = True : 修改清單(2) = False : 修改清單(3) = False : 修改清單(4) = False : 修改清單(5) = False : 修改清單(6) = False
-        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False
-        TENDENZA_STYLE_資料管理.Show() : ComboBox2下拉表單資料載入()
+        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False : TENDENZA_STYLE_資料管理.Show() : ComboBox2下拉表單資料載入()
     End Sub
     Private Sub Button4_Click(sender As Object, e As EventArgs) Handles ADD3_bt.Click
         清單修改.Close() : 修改清單(0) = False : 修改清單(1) = False : 修改清單(2) = True : 修改清單(3) = False : 修改清單(4) = False : 修改清單(5) = False : 修改清單(6) = False
-        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False
-        清單修改.Show() : ComboBox3下拉表單資料載入()
+        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False : 清單修改.Show() : ComboBox3下拉表單資料載入()
     End Sub
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles ADD4_bt.Click
         清單修改.Close() : 修改清單(0) = False : 修改清單(1) = False : 修改清單(2) = False : 修改清單(3) = True : 修改清單(4) = False : 修改清單(5) = False : 修改清單(6) = False
-        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False
-        清單修改.Show() : ComboBox4下拉表單資料載入()
+        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False : 清單修改.Show() : ComboBox4下拉表單資料載入()
     End Sub
     Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
         FACTORY_資料管理.Close() : 修改清單(0) = False : 修改清單(1) = False : 修改清單(2) = False : 修改清單(3) = False : 修改清單(4) = True : 修改清單(5) = False : 修改清單(6) = False
-        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False
-        FACTORY_資料管理.Show() : ComboBox5下拉表單資料載入()
+        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False : FACTORY_資料管理.Show() : ComboBox5下拉表單資料載入()
     End Sub
     Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
         清單修改.Close() : 修改清單(0) = False : 修改清單(1) = False : 修改清單(2) = False : 修改清單(3) = False : 修改清單(4) = False : 修改清單(5) = True : 修改清單(6) = False
-        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False
-        清單修改.Show() : ComboBox6下拉表單資料載入()
+        修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = False : 修改清單(11) = False : 清單修改.Show() : ComboBox6下拉表單資料載入()
     End Sub
     Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click
         Set_搜尋()
@@ -1155,7 +1299,7 @@ Public Class 訂單控制表
     End Sub
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 新增訂單號_bt.Click
         ConnOpen()
-        SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(TextBox1.Text, 6) & "')"
+        SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(天盾訂單號_tb.Text, 6) & "')"
         cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
         訂單流水號.Show()
     End Sub
@@ -1182,13 +1326,13 @@ Public Class 訂單控制表
             ElseIf NUM1 > 9999999 Then : TextBox7.Text = "PO" & NUM1
             End If
             If IsNumeric(TextBox3.Text) = True And IsNumeric(TextBox4.Text) = True And IsNumeric(TextBox5.Text) = True Then
-                If TextBox1.Text = "" Or ComboBox1.Text = "" Or ComboBox2.Text = "" Or ComboBox3.Text = "" Or ComboBox4.Text = "" Or ComboBox5.Text = "" Or
-            ComboBox6.Text = "" Or TextBox2.Text = "" Or TextBox7.Text = "" Then
+                If 天盾訂單號_tb.Text = "" Or ComboBox1.Text = "" Or ComboBox2.Text = "" Or ComboBox3.Text = "" Or ComboBox4.Text = "" Or ComboBox5.Text = "" Or
+            ComboBox6.Text = "" Or 客戶訂單號_tb.Text = "" Or TextBox7.Text = "" Then
                     MsgBox("資料內容不可空白")
                 Else
 
                     ConnOpen()
-                    SQL1 = "SELECT 明細建檔 FROM " & 訂單資料表(1) & " WHERE (訂單流水號 LIKE '" & TextBox1.Text & "') GROUP BY   明細建檔"
+                    SQL1 = "SELECT 明細建檔 FROM " & 訂單資料表(1) & " WHERE (訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "') GROUP BY   明細建檔"
                     CmdSet_For_dr()
                     If dr.Read() Then : QQ = dr("明細建檔").ToString : Else : QQ = False : End If : conn.Close()
 
@@ -1198,7 +1342,7 @@ Public Class 訂單控制表
                         SQL1 = "INSERT INTO " & 訂單資料表(1) & " (訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, " &
                                "CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, " &
                                "資料流水號, 明細建檔) " &
-                               "VALUES ('" & TextBox1.Text & "','" & ComboBox1.Text & "','" & TextBox2.Text & "','" & ComboBox2.Text & "','" & ComboBox3.Text & "','" & ComboBox4.Text &
+                               "VALUES ('" & 天盾訂單號_tb.Text & "','" & ComboBox1.Text & "','" & 客戶訂單號_tb.Text & "','" & ComboBox2.Text & "','" & ComboBox3.Text & "','" & ComboBox4.Text &
                                "','" & TextBox3.Text & "','" & DTP(0) & "','" & TextBox4.Text & "','" & TextBox5.Text & "','" & TextBox6.Text & "','" & ComboBox5.Text & "','" & ComboBox6.Text &
                                "','" & DTP(1) & "','" & DTP(2) & "','" & DTP(3) & "','" & DTP(4) & "','" & DTP(5) & "','" & DTP(6) & "','" & DTP(7) & "','" & DTP(8) & "','" & DTP(9) & "','" & DTP(10) &
                                "','" & DTP(11) & "','" & DTP(12) & "','" & DTP(13) & "','" & DTP(14) & "','" & TextBox7.Text & "', '0')"
@@ -1206,7 +1350,7 @@ Public Class 訂單控制表
                         SQL1 = "INSERT INTO " & 訂單資料表(1) & " (訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, " &
                                "CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, " &
                                "資料流水號, 明細建檔) " &
-                               "VALUES ('" & TextBox1.Text & "','" & ComboBox1.Text & "','" & TextBox2.Text & "','" & ComboBox2.Text & "','" & ComboBox3.Text & "','" & ComboBox4.Text &
+                               "VALUES ('" & 天盾訂單號_tb.Text & "','" & ComboBox1.Text & "','" & 客戶訂單號_tb.Text & "','" & ComboBox2.Text & "','" & ComboBox3.Text & "','" & ComboBox4.Text &
                                "','" & TextBox3.Text & "','" & DTP(0) & "','" & TextBox4.Text & "','" & TextBox5.Text & "','" & TextBox6.Text & "','" & ComboBox5.Text & "','" & ComboBox6.Text &
                                "','" & DTP(1) & "','" & DTP(2) & "','" & DTP(3) & "','" & DTP(4) & "','" & DTP(5) & "','" & DTP(6) & "','" & DTP(7) & "','" & DTP(8) & "','" & DTP(9) & "','" & DTP(10) &
                                "','" & DTP(11) & "','" & DTP(12) & "','" & DTP(13) & "','" & DTP(14) & "','" & TextBox7.Text & "', '1')"
@@ -1227,7 +1371,7 @@ Public Class 訂單控制表
         End If
 
         ConnOpen()
-        SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(TextBox1.Text, 6) & "')"
+        SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(天盾訂單號_tb.Text, 6) & "')"
         cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
 
         Set_搜尋() : Button11.Enabled = False : 新增_bt.Enabled = True
@@ -1290,11 +1434,11 @@ Public Class 訂單控制表
         If 列印用SQL = "" Then : MsgBox("請先搜尋資料後再行列印") : Else : 訂單列印選擇.Show() : End If
     End Sub
     Private Sub Button30_Click(sender As Object, e As EventArgs) Handles Button30.Click
-        If TextBox1.Text = "" Then
+        If 天盾訂單號_tb.Text = "" Then
             MsgBox("請先選擇訂單資料")
         Else
             If 訂單資料表(1) = "訂單控制表" Then
-                PA = TextBox1.Text
+                PA = 天盾訂單號_tb.Text
                 訂單明細表.Show() : 訂單明細表.WindowState = 2
             Else
                 MsgBox("開發中")
@@ -1312,7 +1456,7 @@ Public Class 訂單控制表
     Private Sub Button32_Click(sender As Object, e As EventArgs) Handles 返回_bt.Click
         Set_訂單清單() : Set_自動彙總1() : Set_grid()
     End Sub
-    Private Sub DataGridView1_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 控制表_dgv.RowPostPaint
+    Private Sub 控制表_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 控制表_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
         If e.RowIndex = 控制表_dgv.Rows.Count - 1 Then
             Exit Sub
@@ -1326,6 +1470,20 @@ Public Class 訂單控制表
             End If
         End If
     End Sub
+    Private Sub 裝箱明細_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 裝箱明細_dgv.RowPostPaint
+        Dim linePen As New Pen(Color.Blue, 2)
+        If e.RowIndex = 裝箱明細_dgv.Rows.Count - 1 Then
+            Exit Sub
+        Else
+            If 裝箱明細_dgv(3, e.RowIndex).Value.ToString <> 裝箱明細_dgv(3, e.RowIndex + 1).Value.ToString Then
+                Dim startX As Integer = IIf(裝箱明細_dgv.RowHeadersVisible, 裝箱明細_dgv.RowHeadersWidth, 0)
+                Dim startY As Integer = e.RowBounds.Top + e.RowBounds.Height - 1
+                Dim endX As Integer = startX + 裝箱明細_dgv.Columns.GetColumnsWidth(DataGridViewElementStates.Visible) - 裝箱明細_dgv.HorizontalScrollingOffset
+                e.Graphics.DrawLine(linePen, startX, startY, endX, startY)
+                Exit Sub
+            End If
+        End If
+    End Sub
     Private Sub 第一頁_bt_Click(sender As Object, e As EventArgs) Handles 第一頁_bt.Click
         第一頁_bt.Enabled = False : 第二頁_bt.Enabled = True : 第三頁_bt.Enabled = True : 第四頁_bt.Enabled = True : 第五頁_bt.Enabled = True : 第六頁_bt.Enabled = True
         第七頁_bt.Enabled = True : 第八頁_bt.Enabled = True : 第九頁_bt.Enabled = True : 第十頁_bt.Enabled = True
@@ -1395,14 +1553,14 @@ Public Class 訂單控制表
     Private Sub Button38_Click(sender As Object, e As EventArgs) Handles Button38.Click
         aa = MsgBox("確定要CXL訂單?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
-            If TextBox7.Text = "" Or TextBox1.Text = "" Then
+            If TextBox7.Text = "" Or 天盾訂單號_tb.Text = "" Then
                 MsgBox("沒有正確選擇要修改的資料")
             Else
                 ConnOpen()
                 If CheckBox24.Checked = False Then
                     SQL1 = "UPDATE " & 訂單資料表(1) & " SET CXL = '1', CXLTime = '" & Format(Today, "yyyy/MM/dd") & "' WHERE (資料流水號 = '" & TextBox7.Text & "')"
                 ElseIf CheckBox24.Checked = True Then
-                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET CXL = '1', CXLTime = '" & Format(Today, "yyyy/MM/dd") & "' WHERE (訂單流水號 = '" & TextBox1.Text & "')"
+                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET CXL = '1', CXLTime = '" & Format(Today, "yyyy/MM/dd") & "' WHERE (訂單流水號 = '" & 天盾訂單號_tb.Text & "')"
                 End If
                 cmd.CommandText = SQL1 : cmd.ExecuteNonQuery() : conn.Close()
             End If
@@ -1410,20 +1568,20 @@ Public Class 訂單控制表
         Set_搜尋()
     End Sub
     Private Sub Button39_Click(sender As Object, e As EventArgs) Handles 修改PO_bt.Click
-        If TextBox1.Text = "" Then
+        If 天盾訂單號_tb.Text = "" Then
             MsgBox("沒有正確選擇要修改的資料")
         Else
             ConnOpen()
-            SQL1 = "UPDATE " & 訂單資料表(1) & " SET 客戶訂單號 = '" & TextBox2.Text & "' WHERE (訂單流水號 LIKE '" & TextBox1.Text & "')"
+            SQL1 = "UPDATE " & 訂單資料表(1) & " SET 客戶訂單號 = '" & 客戶訂單號_tb.Text & "' WHERE (訂單流水號 LIKE '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
-            SQL1 = "UPDATE " & 訂單資料表(0) & " SET 客戶訂單號 = '" & TextBox2.Text & "' WHERE (天盾流水號 LIKE '" & TextBox1.Text & "')"
+            SQL1 = "UPDATE " & 訂單資料表(0) & " SET 客戶訂單號 = '" & 客戶訂單號_tb.Text & "' WHERE (天盾流水號 LIKE '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
-            SQL1 = "UPDATE " & 訂單資料表(5) & " SET 客戶訂單號 = '" & TextBox2.Text & "' WHERE (天盾流水號 LIKE '" & TextBox1.Text & "')"
+            SQL1 = "UPDATE " & 訂單資料表(5) & " SET 客戶訂單號 = '" & 客戶訂單號_tb.Text & "' WHERE (天盾流水號 LIKE '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
-            SQL1 = "UPDATE " & 訂單資料表(6) & " SET 客戶流水號 = '" & TextBox2.Text & "' WHERE (天盾訂單號 LIKE '" & TextBox1.Text & "')"
+            SQL1 = "UPDATE " & 訂單資料表(6) & " SET 客戶流水號 = '" & 客戶訂單號_tb.Text & "' WHERE (天盾訂單號 LIKE '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             MsgBox("修改完成")
         End If
@@ -1438,9 +1596,9 @@ Public Class 訂單控制表
     Private Sub Button15_Click(sender As Object, e As EventArgs) Handles Button15.Click
         aa = MsgBox("確定要將此產品訂單移到出貨?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
-            If TextBox7.Text = "" Or TextBox1.Text = "" Then : MsgBox("沒有正確選擇要修改的資料")
+            If TextBox7.Text = "" Or 天盾訂單號_tb.Text = "" Then : MsgBox("沒有正確選擇要修改的資料")
             Else : If ComboBox1.Text = "" Then : MsgBox("SEASON不能空白")
-                Else : If TextBox2.Text = "" Then : MsgBox("VIONIC PO#不能空白")
+                Else : If 客戶訂單號_tb.Text = "" Then : MsgBox("VIONIC PO#不能空白")
                     Else : If ComboBox2.Text = "" Then : MsgBox("STYLE不能空白")
                         Else : If ComboBox3.Text = "" Then : MsgBox("COLOR不能空白")
                             Else : If ComboBox4.Text = "" Then : MsgBox("DM不能空白")
@@ -1470,7 +1628,7 @@ Public Class 訂單控制表
                                                         GHJK = DataGridView2(35, i).Value.ToString
                                                         If GHJK = "" Then
                                                             MsgBox("驗貨報告不齊全，請重新確認。")
-                                                            Set_搜尋() : TextBox1.Text = "" : TextBox7.Text = ""
+                                                            Set_搜尋() : 天盾訂單號_tb.Text = "" : TextBox7.Text = ""
                                                             Exit Sub
                                                         End If
                                                     Next
@@ -1520,7 +1678,7 @@ Public Class 訂單控制表
                                                                CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, 
                                                                資料流水號,
                                                                明細建檔, GOODBOX, LEATHER, LEA_Note, CXL, CXLTime, 出貨數量, 驗貨報告圖片 FROM " & 訂單資料表(1) & " 
-                                                        WHERE (訂單流水號 = '" & TextBox1.Text & "') AND (CXL = 0 OR CXL IS NULL)"
+                                                        WHERE (訂單流水號 = '" & 天盾訂單號_tb.Text & "') AND (CXL = 0 OR CXL IS NULL)"
                                                 cmd.Connection = conn : cmd.CommandText = SQL1 : da.SelectCommand = cmd : da.SelectCommand.CommandTimeout = 900
                                                 da.Fill(ds1) : DataGridView2.DataSource = ds1.Tables(0) : conn.Close()
 
@@ -1528,7 +1686,7 @@ Public Class 訂單控制表
                                                     GHJK = DataGridView2(35, i).Value.ToString
                                                     If GHJK = "" Then
                                                         MsgBox("驗貨報告不齊全，請重新確認。")
-                                                        Set_搜尋() : TextBox1.Text = "" : TextBox7.Text = ""
+                                                        Set_搜尋() : 天盾訂單號_tb.Text = "" : TextBox7.Text = ""
                                                         Exit Sub
                                                     End If
                                                 Next
@@ -1568,13 +1726,13 @@ Public Class 訂單控制表
 
                                                 ConnOpen()
                                                 SQL1 = "UPDATE " & 訂單資料表(1) & " SET 實際離廠日 = '" & Format(DateTimePicker30.Value, "yyyy/MM/dd") & "', 出貨數量 = 訂單數量 " &
-                                                   "WHERE (訂單流水號 = '" & TextBox1.Text & "')"
+                                                   "WHERE (訂單流水號 = '" & 天盾訂單號_tb.Text & "')"
                                                 cmd.CommandText = SQL1 : cmd.ExecuteNonQuery() : conn.Close()
                                             End If
                                             MsgBox("出貨資料作業完成")
                                         End If : End If : End If : End If : End If : End If : End If : End If
         End If
-        Set_搜尋() : TextBox1.Text = "" : TextBox7.Text = ""
+        Set_搜尋() : 天盾訂單號_tb.Text = "" : TextBox7.Text = ""
     End Sub
     Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click
         驗貨報告大圖.ShowDialog()
@@ -1605,4 +1763,17 @@ Public Class 訂單控制表
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
         SQL_訂單資料表選擇_非VIONIC() : SQL宣告() : 返回_bt.PerformClick()
     End Sub
+    Private Sub 訂單明細_bt_Click(sender As Object, e As EventArgs) Handles 訂單明細_bt.Click
+        訂單明細_bt.Enabled = False : 裝箱資訊_bt.Enabled = True : 裝箱明細_bt.Enabled = True : 明細表_dgv.Visible = True : 裝箱明細_dgv.Visible = False : 資訊_gb.Visible = False
+    End Sub
+    Private Sub 裝箱資訊_bt_Click(sender As Object, e As EventArgs) Handles 裝箱資訊_bt.Click
+        訂單明細_bt.Enabled = True : 裝箱資訊_bt.Enabled = False : 裝箱明細_bt.Enabled = True : 明細表_dgv.Visible = False : 裝箱明細_dgv.Visible = False : 資訊_gb.Visible = True
+    End Sub
+    Private Sub 裝箱明細_bt_Click(sender As Object, e As EventArgs) Handles 裝箱明細_bt.Click
+        訂單明細_bt.Enabled = True : 裝箱資訊_bt.Enabled = True : 裝箱明細_bt.Enabled = False : 明細表_dgv.Visible = False : 裝箱明細_dgv.Visible = True : 資訊_gb.Visible = False
+    End Sub
+
+    Private Sub Label20_Click(sender As Object, e As EventArgs) Handles Label20.Click
+
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/訂單明細表.vb

@@ -29,18 +29,12 @@ Public Class 訂單明細表
             生產工廠_tb.Text = dr("生產工廠").ToString : 訂單數量_tb.Text = Format(Val(dr("訂單數量").ToString), "#,##0")
         Else : 客戶訂單號_tb.Text = "" : End If : conn.Close()
     End Sub
-    Private Sub Set_DGV1載入前設定()
+    Private Sub Set_訂單清單()
         訂單明細表_gdv.DataSource = Nothing : ds.Clear()
         訂單明細表_gdv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         訂單明細表_gdv.ColumnHeadersHeight = 25
         訂單明細表_gdv.AllowUserToAddRows = False
         ConnOpen()
-    End Sub
-    Private Sub Set_DGV1載入後設定()
-        cmd.Connection = conn : cmd.CommandText = SQL1 : da.SelectCommand = cmd : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單明細表_gdv.DataSource = ds.Tables(0) : conn.Close()
-    End Sub
-    Private Sub Set_訂單清單()
-        Set_DGV1載入前設定()
         If 明細判斷 = True Then
             If WS = False Then
                 SQL1 = "SELECT      訂單明細表.天盾流水號, 訂單明細表.客戶訂單號, 訂單明細表.ItemNumber, 訂單明細表.ProductName, 
@@ -91,7 +85,7 @@ Public Class 訂單明細表
                    " FROM 訂單明細表暫存檔 WHERE (客戶訂單號 LIKE '" & 客戶訂單號_tb.Text & "') AND (天盾流水號 LIKE '" & 訂單號_tb.Text & "') ORDER BY ProductName, Color"
         End If
         列印用SQL = SQL1
-        Set_DGV1載入後設定()
+        cmd.Connection = conn : cmd.CommandText = SQL1 : da.SelectCommand = cmd : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單明細表_gdv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_grid()
         訂單明細表_gdv.Columns(0).Visible = False : 訂單明細表_gdv.Columns(1).Visible = False

TENDEN-MES-SYS/量產訂單管理/訂單流水號.vb

@@ -5,7 +5,12 @@ Public Class 訂單流水號
     Private Sub 訂單流水號_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormBorderStyle = FormBorderStyle.SizableToolWindow
         流水暫存_tb.Visible = False
-        If 訂單資料表(1) = "訂單控制表" Then : Else : LW_ch.Checked = True : End If
+        If 訂單資料表(1) = "訂單控制表" Then
+            LW_ch.Enabled = False : VT_ch.Enabled = True : CT_ch.Enabled = True
+        Else
+            LW_ch.Enabled = True : VT_ch.Enabled = False : CT_ch.Enabled = False
+            LW_ch.Checked = True
+        End If
 
         ConnOpen()
         SQL1 = "SELECT  TOP (1) 訂單流水號 FROM " & 訂單資料表(1) & " WHERE (RIGHT(訂單流水號, 2) NOT LIKE '-%') ORDER BY RIGHT(訂單流水號, 6) DESC"
@@ -22,9 +27,9 @@ Public Class 訂單流水號
             MsgBox("請選擇其中一種資料生成方式")
         ElseIf (VT_ch.Checked = True Or CT_ch.Checked = True Or LW_ch.Checked = True) And 手動_ch.Checked = False Then
 
-            If VT_ch.Checked = True Or CT_ch.Checked = False Or LW_ch.Checked = False Then : 令頭 = "VT-"
-            ElseIf VT_ch.Checked = False Or CT_ch.Checked = True Or LW_ch.Checked = False Then : 令頭 = "CT-"
-            ElseIf VT_ch.Checked = False Or CT_ch.Checked = False Or LW_ch.Checked = True Then : 令頭 = "LW-" : End If
+            If VT_ch.Checked = True And CT_ch.Checked = False And LW_ch.Checked = False Then : 令頭 = "VT-"
+            ElseIf VT_ch.Checked = False And CT_ch.Checked = True And LW_ch.Checked = False Then : 令頭 = "CT-"
+            ElseIf VT_ch.Checked = False And CT_ch.Checked = False And LW_ch.Checked = True Then : 令頭 = "LW-" : End If
 
             For NUM1 = WWSDE To 999999
                 If NUM1 < 10 Then : 流水號_tb.Text = 令頭 & "00000" & NUM1
@@ -56,6 +61,12 @@ Public Class 訂單流水號
                 SQL1 = "INSERT INTO " & 訂單資料表(4) & " (訂單流水號) VALUES ('" & Strings.Right(流水號_tb.Text, 6) & "')"
                 CmdSet_For_dr() : conn.Close()
             Else
+                ConnOpen()
+                SQL1 = "SELECT TOP(1) 訂單流水號 FROM " & 訂單資料表(4) & " ORDER BY 訂單流水號 DESC"
+                CmdSet_For_dr()
+                If dr.Read() Then : 流水暫存_tb.Text = dr("訂單流水號").ToString : Else : 流水暫存_tb.Text = "" : End If
+                conn.Close()
+
                 NUM1 = Strings.Right(流水暫存_tb.Text, 6) + 1
                 If NUM1 < 10 Then : 流水號_tb.Text = 令頭 & "00000" & NUM1
                 ElseIf NUM1 > 9 And NUM1 < 100 Then : 流水號_tb.Text = 令頭 & "0000" & NUM1
@@ -77,7 +88,7 @@ Public Class 訂單流水號
                         訂單資料匯入_力威.Number_tb.Text = 流水號_tb.Text
                     End If
                 Else
-                    訂單控制表.TextBox1.Text = 流水號_tb.Text
+                    訂單控制表.天盾訂單號_tb.Text = 流水號_tb.Text
                 End If
                 Me.Close()
             End If
@@ -94,7 +105,7 @@ Public Class 訂單流水號
                             訂單資料匯入_力威.Number_tb.Text = 流水號_tb.Text
                         End If
                     Else
-                        訂單控制表.TextBox1.Text = 流水號_tb.Text
+                        訂單控制表.天盾訂單號_tb.Text = 流水號_tb.Text
                     End If
                     Me.Close()
                 End If

TENDEN-MES-SYS/量產訂單管理/訂單資料匯入-力威.Designer.vb

@@ -98,12 +98,17 @@ Partial Class 訂單資料匯入_力威
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
         Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
+        Me.日期_tb = New System.Windows.Forms.TextBox()
+        Me.資料流水號_tb = New System.Windows.Forms.TextBox()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.裝箱明細_dgv = New System.Windows.Forms.DataGridView()
         Me.ProgressBar3 = New System.Windows.Forms.ProgressBar()
         Me.ProgressBar4 = New System.Windows.Forms.ProgressBar()
         Me.訂單存檔_bt = New System.Windows.Forms.Button()
-        Me.TextBox42 = New System.Windows.Forms.TextBox()
+        Me.Label28 = New System.Windows.Forms.Label()
+        Me.國標測試報告_ch = New System.Windows.Forms.CheckBox()
+        Me.最終運送_tb = New System.Windows.Forms.TextBox()
+        Me.Label26 = New System.Windows.Forms.Label()
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.裝箱控制_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -127,7 +132,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.Label34.AutoSize = True
         Me.Label34.ForeColor = System.Drawing.Color.Blue
-        Me.Label34.Location = New System.Drawing.Point(1684, 8)
+        Me.Label34.Location = New System.Drawing.Point(1690, 8)
         Me.Label34.Name = "Label34"
         Me.Label34.Size = New System.Drawing.Size(18, 16)
         Me.Label34.TabIndex = 568
@@ -136,7 +141,7 @@ Partial Class 訂單資料匯入_力威
         '新增訂單號_bt
         '
         Me.新增訂單號_bt.ForeColor = System.Drawing.Color.Blue
-        Me.新增訂單號_bt.Location = New System.Drawing.Point(1814, 6)
+        Me.新增訂單號_bt.Location = New System.Drawing.Point(1820, 6)
         Me.新增訂單號_bt.Name = "新增訂單號_bt"
         Me.新增訂單號_bt.Size = New System.Drawing.Size(87, 42)
         Me.新增訂單號_bt.TabIndex = 567
@@ -147,7 +152,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.天盾流水號_tb.Enabled = False
         Me.天盾流水號_tb.ForeColor = System.Drawing.Color.Black
-        Me.天盾流水號_tb.Location = New System.Drawing.Point(1681, 26)
+        Me.天盾流水號_tb.Location = New System.Drawing.Point(1687, 26)
         Me.天盾流水號_tb.Name = "天盾流水號_tb"
         Me.天盾流水號_tb.Size = New System.Drawing.Size(130, 23)
         Me.天盾流水號_tb.TabIndex = 565
@@ -155,7 +160,7 @@ Partial Class 訂單資料匯入_力威
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(1699, 8)
+        Me.Label19.Location = New System.Drawing.Point(1705, 8)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(90, 16)
         Me.Label19.TabIndex = 566
@@ -164,7 +169,7 @@ Partial Class 訂單資料匯入_力威
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(45, 12)
+        Me.Label1.Location = New System.Drawing.Point(17, 12)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(55, 16)
         Me.Label1.TabIndex = 564
@@ -173,7 +178,7 @@ Partial Class 訂單資料匯入_力威
         'Number_tb
         '
         Me.Number_tb.Enabled = False
-        Me.Number_tb.Location = New System.Drawing.Point(102, 9)
+        Me.Number_tb.Location = New System.Drawing.Point(74, 9)
         Me.Number_tb.Name = "Number_tb"
         Me.Number_tb.Size = New System.Drawing.Size(173, 23)
         Me.Number_tb.TabIndex = 563
@@ -182,7 +187,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.Label36.AutoSize = True
         Me.Label36.ForeColor = System.Drawing.Color.Blue
-        Me.Label36.Location = New System.Drawing.Point(1684, 108)
+        Me.Label36.Location = New System.Drawing.Point(1690, 108)
         Me.Label36.Name = "Label36"
         Me.Label36.Size = New System.Drawing.Size(18, 16)
         Me.Label36.TabIndex = 574
@@ -192,7 +197,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.Label35.AutoSize = True
         Me.Label35.ForeColor = System.Drawing.Color.Blue
-        Me.Label35.Location = New System.Drawing.Point(1684, 58)
+        Me.Label35.Location = New System.Drawing.Point(1690, 58)
         Me.Label35.Name = "Label35"
         Me.Label35.Size = New System.Drawing.Size(18, 16)
         Me.Label35.TabIndex = 573
@@ -202,7 +207,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.DIV_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.DIV_cb.FormattingEnabled = True
-        Me.DIV_cb.Location = New System.Drawing.Point(1681, 126)
+        Me.DIV_cb.Location = New System.Drawing.Point(1687, 126)
         Me.DIV_cb.Name = "DIV_cb"
         Me.DIV_cb.Size = New System.Drawing.Size(130, 24)
         Me.DIV_cb.TabIndex = 572
@@ -210,7 +215,7 @@ Partial Class 訂單資料匯入_力威
         'Label22
         '
         Me.Label22.AutoSize = True
-        Me.Label22.Location = New System.Drawing.Point(1699, 108)
+        Me.Label22.Location = New System.Drawing.Point(1705, 108)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(28, 16)
         Me.Label22.TabIndex = 571
@@ -220,7 +225,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.SEASON_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.SEASON_cb.FormattingEnabled = True
-        Me.SEASON_cb.Location = New System.Drawing.Point(1681, 76)
+        Me.SEASON_cb.Location = New System.Drawing.Point(1687, 76)
         Me.SEASON_cb.Name = "SEASON_cb"
         Me.SEASON_cb.Size = New System.Drawing.Size(130, 24)
         Me.SEASON_cb.TabIndex = 570
@@ -228,7 +233,7 @@ Partial Class 訂單資料匯入_力威
         'Label21
         '
         Me.Label21.AutoSize = True
-        Me.Label21.Location = New System.Drawing.Point(1699, 58)
+        Me.Label21.Location = New System.Drawing.Point(1705, 58)
         Me.Label21.Name = "Label21"
         Me.Label21.Size = New System.Drawing.Size(57, 16)
         Me.Label21.TabIndex = 569
@@ -238,7 +243,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.Label20.AutoSize = True
         Me.Label20.ForeColor = System.Drawing.Color.Blue
-        Me.Label20.Location = New System.Drawing.Point(1683, 152)
+        Me.Label20.Location = New System.Drawing.Point(1689, 152)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(18, 16)
         Me.Label20.TabIndex = 587
@@ -246,10 +251,10 @@ Partial Class 訂單資料匯入_力威
         '
         '清空_bt
         '
-        Me.清空_bt.ForeColor = System.Drawing.Color.Black
-        Me.清空_bt.Location = New System.Drawing.Point(1814, 170)
+        Me.清空_bt.ForeColor = System.Drawing.Color.Red
+        Me.清空_bt.Location = New System.Drawing.Point(1820, 130)
         Me.清空_bt.Name = "清空_bt"
-        Me.清空_bt.Size = New System.Drawing.Size(88, 24)
+        Me.清空_bt.Size = New System.Drawing.Size(87, 24)
         Me.清空_bt.TabIndex = 586
         Me.清空_bt.Text = "清空"
         Me.清空_bt.UseVisualStyleBackColor = True
@@ -257,7 +262,7 @@ Partial Class 訂單資料匯入_力威
         'Label25
         '
         Me.Label25.AutoSize = True
-        Me.Label25.Location = New System.Drawing.Point(1698, 152)
+        Me.Label25.Location = New System.Drawing.Point(1704, 152)
         Me.Label25.Name = "Label25"
         Me.Label25.Size = New System.Drawing.Size(56, 16)
         Me.Label25.TabIndex = 585
@@ -266,7 +271,7 @@ Partial Class 訂單資料匯入_力威
         '下單日_dtp
         '
         Me.下單日_dtp.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.下單日_dtp.Location = New System.Drawing.Point(1681, 170)
+        Me.下單日_dtp.Location = New System.Drawing.Point(1687, 170)
         Me.下單日_dtp.Name = "下單日_dtp"
         Me.下單日_dtp.Size = New System.Drawing.Size(130, 23)
         Me.下單日_dtp.TabIndex = 584
@@ -274,7 +279,7 @@ Partial Class 訂單資料匯入_力威
         '新增清單2_bt
         '
         Me.新增清單2_bt.ForeColor = System.Drawing.Color.Olive
-        Me.新增清單2_bt.Location = New System.Drawing.Point(1760, 101)
+        Me.新增清單2_bt.Location = New System.Drawing.Point(1766, 101)
         Me.新增清單2_bt.Name = "新增清單2_bt"
         Me.新增清單2_bt.Size = New System.Drawing.Size(51, 23)
         Me.新增清單2_bt.TabIndex = 589
@@ -284,7 +289,7 @@ Partial Class 訂單資料匯入_力威
         '新增清單1_bt
         '
         Me.新增清單1_bt.ForeColor = System.Drawing.Color.Olive
-        Me.新增清單1_bt.Location = New System.Drawing.Point(1760, 51)
+        Me.新增清單1_bt.Location = New System.Drawing.Point(1766, 51)
         Me.新增清單1_bt.Name = "新增清單1_bt"
         Me.新增清單1_bt.Size = New System.Drawing.Size(51, 23)
         Me.新增清單1_bt.TabIndex = 588
@@ -295,7 +300,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.Label40.AutoSize = True
         Me.Label40.ForeColor = System.Drawing.Color.Blue
-        Me.Label40.Location = New System.Drawing.Point(837, 6)
+        Me.Label40.Location = New System.Drawing.Point(803, 6)
         Me.Label40.Name = "Label40"
         Me.Label40.Size = New System.Drawing.Size(18, 16)
         Me.Label40.TabIndex = 600
@@ -305,7 +310,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.FTY_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.FTY_cb.FormattingEnabled = True
-        Me.FTY_cb.Location = New System.Drawing.Point(834, 23)
+        Me.FTY_cb.Location = New System.Drawing.Point(800, 23)
         Me.FTY_cb.Name = "FTY_cb"
         Me.FTY_cb.Size = New System.Drawing.Size(130, 24)
         Me.FTY_cb.TabIndex = 598
@@ -313,7 +318,7 @@ Partial Class 訂單資料匯入_力威
         'Label24
         '
         Me.Label24.AutoSize = True
-        Me.Label24.Location = New System.Drawing.Point(852, 6)
+        Me.Label24.Location = New System.Drawing.Point(818, 6)
         Me.Label24.Name = "Label24"
         Me.Label24.Size = New System.Drawing.Size(28, 16)
         Me.Label24.TabIndex = 597
@@ -322,7 +327,7 @@ Partial Class 訂單資料匯入_力威
         'Label48
         '
         Me.Label48.AutoSize = True
-        Me.Label48.Location = New System.Drawing.Point(1129, 8)
+        Me.Label48.Location = New System.Drawing.Point(991, 8)
         Me.Label48.Name = "Label48"
         Me.Label48.Size = New System.Drawing.Size(51, 16)
         Me.Label48.TabIndex = 596
@@ -332,7 +337,7 @@ Partial Class 訂單資料匯入_力威
         '
         Me.Remark_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.Remark_cb.FormattingEnabled = True
-        Me.Remark_cb.Location = New System.Drawing.Point(1183, 4)
+        Me.Remark_cb.Location = New System.Drawing.Point(1045, 4)
         Me.Remark_cb.Name = "Remark_cb"
         Me.Remark_cb.Size = New System.Drawing.Size(137, 24)
         Me.Remark_cb.TabIndex = 595
@@ -340,7 +345,7 @@ Partial Class 訂單資料匯入_力威
         'Label18
         '
         Me.Label18.AutoSize = True
-        Me.Label18.Location = New System.Drawing.Point(972, 12)
+        Me.Label18.Location = New System.Drawing.Point(934, 12)
         Me.Label18.Name = "Label18"
         Me.Label18.Size = New System.Drawing.Size(51, 16)
         Me.Label18.TabIndex = 594
@@ -349,16 +354,16 @@ Partial Class 訂單資料匯入_力威
         '地址二_tb
         '
         Me.地址二_tb.ForeColor = System.Drawing.Color.Black
-        Me.地址二_tb.Location = New System.Drawing.Point(970, 30)
+        Me.地址二_tb.Location = New System.Drawing.Point(932, 30)
         Me.地址二_tb.Multiline = True
         Me.地址二_tb.Name = "地址二_tb"
-        Me.地址二_tb.Size = New System.Drawing.Size(350, 118)
+        Me.地址二_tb.Size = New System.Drawing.Size(250, 118)
         Me.地址二_tb.TabIndex = 593
         '
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(729, 75)
+        Me.Label7.Location = New System.Drawing.Point(695, 75)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(113, 16)
         Me.Label7.TabIndex = 592
@@ -367,7 +372,7 @@ Partial Class 訂單資料匯入_力威
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(617, 75)
+        Me.Label6.Location = New System.Drawing.Point(583, 75)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(106, 16)
         Me.Label6.TabIndex = 591
@@ -376,7 +381,7 @@ Partial Class 訂單資料匯入_力威
         '地址1_tb
         '
         Me.地址1_tb.ForeColor = System.Drawing.Color.Black
-        Me.地址1_tb.Location = New System.Drawing.Point(614, 93)
+        Me.地址1_tb.Location = New System.Drawing.Point(580, 93)
         Me.地址1_tb.Multiline = True
         Me.地址1_tb.Name = "地址1_tb"
         Me.地址1_tb.Size = New System.Drawing.Size(350, 100)
@@ -389,11 +394,12 @@ Partial Class 訂單資料匯入_力威
         Me.生產工廠_tb.Name = "生產工廠_tb"
         Me.生產工廠_tb.Size = New System.Drawing.Size(87, 23)
         Me.生產工廠_tb.TabIndex = 601
+        Me.生產工廠_tb.Visible = False
         '
         'Label8
         '
         Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(617, 5)
+        Me.Label8.Location = New System.Drawing.Point(583, 5)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(88, 16)
         Me.Label8.TabIndex = 603
@@ -402,7 +408,7 @@ Partial Class 訂單資料匯入_力威
         'VendorName_tb
         '
         Me.VendorName_tb.ForeColor = System.Drawing.Color.Black
-        Me.VendorName_tb.Location = New System.Drawing.Point(614, 23)
+        Me.VendorName_tb.Location = New System.Drawing.Point(580, 23)
         Me.VendorName_tb.Multiline = True
         Me.VendorName_tb.Name = "VendorName_tb"
         Me.VendorName_tb.Size = New System.Drawing.Size(212, 50)
@@ -411,7 +417,7 @@ Partial Class 訂單資料匯入_力威
         '新增清單5_bt
         '
         Me.新增清單5_bt.ForeColor = System.Drawing.Color.Olive
-        Me.新增清單5_bt.Location = New System.Drawing.Point(234, 34)
+        Me.新增清單5_bt.Location = New System.Drawing.Point(206, 34)
         Me.新增清單5_bt.Name = "新增清單5_bt"
         Me.新增清單5_bt.Size = New System.Drawing.Size(41, 24)
         Me.新增清單5_bt.TabIndex = 606
@@ -421,7 +427,7 @@ Partial Class 訂單資料匯入_力威
         'Brand_cb
         '
         Me.Brand_cb.FormattingEnabled = True
-        Me.Brand_cb.Location = New System.Drawing.Point(102, 34)
+        Me.Brand_cb.Location = New System.Drawing.Point(74, 34)
         Me.Brand_cb.Name = "Brand_cb"
         Me.Brand_cb.Size = New System.Drawing.Size(130, 24)
         Me.Brand_cb.TabIndex = 605
@@ -429,7 +435,7 @@ Partial Class 訂單資料匯入_力威
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(59, 38)
+        Me.Label3.Location = New System.Drawing.Point(31, 38)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(41, 16)
         Me.Label3.TabIndex = 604
@@ -438,7 +444,7 @@ Partial Class 訂單資料匯入_力威
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(283, 42)
+        Me.Label2.Location = New System.Drawing.Point(255, 42)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(126, 16)
         Me.Label2.TabIndex = 608
@@ -446,7 +452,7 @@ Partial Class 訂單資料匯入_力威
         '
         '客戶訂單號_tb
         '
-        Me.客戶訂單號_tb.Location = New System.Drawing.Point(281, 60)
+        Me.客戶訂單號_tb.Location = New System.Drawing.Point(253, 60)
         Me.客戶訂單號_tb.Name = "客戶訂單號_tb"
         Me.客戶訂單號_tb.Size = New System.Drawing.Size(130, 23)
         Me.客戶訂單號_tb.TabIndex = 607
@@ -454,7 +460,7 @@ Partial Class 訂單資料匯入_力威
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(44, 63)
+        Me.Label4.Location = New System.Drawing.Point(16, 63)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(56, 16)
         Me.Label4.TabIndex = 610
@@ -462,7 +468,7 @@ Partial Class 訂單資料匯入_力威
         '
         '訂單類別_tb
         '
-        Me.訂單類別_tb.Location = New System.Drawing.Point(102, 60)
+        Me.訂單類別_tb.Location = New System.Drawing.Point(74, 60)
         Me.訂單類別_tb.Name = "訂單類別_tb"
         Me.訂單類別_tb.Size = New System.Drawing.Size(173, 23)
         Me.訂單類別_tb.TabIndex = 609
@@ -470,7 +476,7 @@ Partial Class 訂單資料匯入_力威
         'Label5
         '
         Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(31, 88)
+        Me.Label5.Location = New System.Drawing.Point(3, 88)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(69, 16)
         Me.Label5.TabIndex = 612
@@ -478,7 +484,7 @@ Partial Class 訂單資料匯入_力威
         '
         '英科條款_tb
         '
-        Me.英科條款_tb.Location = New System.Drawing.Point(102, 85)
+        Me.英科條款_tb.Location = New System.Drawing.Point(74, 85)
         Me.英科條款_tb.Name = "英科條款_tb"
         Me.英科條款_tb.Size = New System.Drawing.Size(173, 23)
         Me.英科條款_tb.TabIndex = 611
@@ -486,7 +492,7 @@ Partial Class 訂單資料匯入_力威
         '客戶交期_dtp
         '
         Me.客戶交期_dtp.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.客戶交期_dtp.Location = New System.Drawing.Point(281, 110)
+        Me.客戶交期_dtp.Location = New System.Drawing.Point(253, 110)
         Me.客戶交期_dtp.Name = "客戶交期_dtp"
         Me.客戶交期_dtp.Size = New System.Drawing.Size(130, 23)
         Me.客戶交期_dtp.TabIndex = 613
@@ -494,7 +500,7 @@ Partial Class 訂單資料匯入_力威
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(282, 92)
+        Me.Label9.Location = New System.Drawing.Point(254, 92)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(137, 16)
         Me.Label9.TabIndex = 614
@@ -503,7 +509,7 @@ Partial Class 訂單資料匯入_力威
         'Label10
         '
         Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(283, 12)
+        Me.Label10.Location = New System.Drawing.Point(255, 12)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(50, 16)
         Me.Label10.TabIndex = 616
@@ -511,7 +517,7 @@ Partial Class 訂單資料匯入_力威
         '
         '版本_tb
         '
-        Me.版本_tb.Location = New System.Drawing.Point(335, 9)
+        Me.版本_tb.Location = New System.Drawing.Point(307, 9)
         Me.版本_tb.Name = "版本_tb"
         Me.版本_tb.Size = New System.Drawing.Size(76, 23)
         Me.版本_tb.TabIndex = 615
@@ -519,15 +525,15 @@ Partial Class 訂單資料匯入_力威
         'Label11
         '
         Me.Label11.AutoSize = True
-        Me.Label11.Location = New System.Drawing.Point(3, 113)
+        Me.Label11.Location = New System.Drawing.Point(11, 113)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(97, 16)
+        Me.Label11.Size = New System.Drawing.Size(66, 32)
         Me.Label11.TabIndex = 618
-        Me.Label11.Text = "Company Code"
+        Me.Label11.Text = "Company " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Code"
         '
         '公司編號_tb
         '
-        Me.公司編號_tb.Location = New System.Drawing.Point(102, 110)
+        Me.公司編號_tb.Location = New System.Drawing.Point(74, 110)
         Me.公司編號_tb.Name = "公司編號_tb"
         Me.公司編號_tb.Size = New System.Drawing.Size(173, 23)
         Me.公司編號_tb.TabIndex = 617
@@ -535,7 +541,7 @@ Partial Class 訂單資料匯入_力威
         'Label12
         '
         Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(44, 138)
+        Me.Label12.Location = New System.Drawing.Point(16, 148)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(56, 16)
         Me.Label12.TabIndex = 620
@@ -544,7 +550,7 @@ Partial Class 訂單資料匯入_力威
         '服務_tb
         '
         Me.服務_tb.ForeColor = System.Drawing.Color.Black
-        Me.服務_tb.Location = New System.Drawing.Point(102, 135)
+        Me.服務_tb.Location = New System.Drawing.Point(74, 135)
         Me.服務_tb.Multiline = True
         Me.服務_tb.Name = "服務_tb"
         Me.服務_tb.Size = New System.Drawing.Size(309, 58)
@@ -553,7 +559,7 @@ Partial Class 訂單資料匯入_力威
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(417, 12)
+        Me.Label13.Location = New System.Drawing.Point(386, 12)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(50, 16)
         Me.Label13.TabIndex = 622
@@ -561,7 +567,7 @@ Partial Class 訂單資料匯入_力威
         '
         '供應商編號_tb
         '
-        Me.供應商編號_tb.Location = New System.Drawing.Point(469, 9)
+        Me.供應商編號_tb.Location = New System.Drawing.Point(438, 9)
         Me.供應商編號_tb.Name = "供應商編號_tb"
         Me.供應商編號_tb.Size = New System.Drawing.Size(139, 23)
         Me.供應商編號_tb.TabIndex = 621
@@ -569,7 +575,7 @@ Partial Class 訂單資料匯入_力威
         'Label14
         '
         Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(420, 42)
+        Me.Label14.Location = New System.Drawing.Point(389, 42)
         Me.Label14.Name = "Label14"
         Me.Label14.Size = New System.Drawing.Size(108, 16)
         Me.Label14.TabIndex = 624
@@ -577,7 +583,7 @@ Partial Class 訂單資料匯入_力威
         '
         '郵寄方式_tb
         '
-        Me.郵寄方式_tb.Location = New System.Drawing.Point(417, 60)
+        Me.郵寄方式_tb.Location = New System.Drawing.Point(386, 60)
         Me.郵寄方式_tb.Name = "郵寄方式_tb"
         Me.郵寄方式_tb.Size = New System.Drawing.Size(191, 23)
         Me.郵寄方式_tb.TabIndex = 623
@@ -585,7 +591,7 @@ Partial Class 訂單資料匯入_力威
         'Label15
         '
         Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(420, 93)
+        Me.Label15.Location = New System.Drawing.Point(389, 93)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(60, 16)
         Me.Label15.TabIndex = 626
@@ -593,7 +599,7 @@ Partial Class 訂單資料匯入_力威
         '
         '力威訂單號_tb
         '
-        Me.力威訂單號_tb.Location = New System.Drawing.Point(417, 111)
+        Me.力威訂單號_tb.Location = New System.Drawing.Point(386, 111)
         Me.力威訂單號_tb.Name = "力威訂單號_tb"
         Me.力威訂單號_tb.Size = New System.Drawing.Size(191, 23)
         Me.力威訂單號_tb.TabIndex = 625
@@ -601,7 +607,7 @@ Partial Class 訂單資料匯入_力威
         '代理編號_cb
         '
         Me.代理編號_cb.FormattingEnabled = True
-        Me.代理編號_cb.Location = New System.Drawing.Point(1539, 3)
+        Me.代理編號_cb.Location = New System.Drawing.Point(1547, 3)
         Me.代理編號_cb.Name = "代理編號_cb"
         Me.代理編號_cb.Size = New System.Drawing.Size(137, 24)
         Me.代理編號_cb.TabIndex = 629
@@ -609,7 +615,7 @@ Partial Class 訂單資料匯入_力威
         'Label23
         '
         Me.Label23.AutoSize = True
-        Me.Label23.Location = New System.Drawing.Point(1328, 12)
+        Me.Label23.Location = New System.Drawing.Point(1435, 8)
         Me.Label23.Name = "Label23"
         Me.Label23.Size = New System.Drawing.Size(106, 16)
         Me.Label23.TabIndex = 628
@@ -618,16 +624,16 @@ Partial Class 訂單資料匯入_力威
         '訂貨代理_tb
         '
         Me.訂貨代理_tb.ForeColor = System.Drawing.Color.Black
-        Me.訂貨代理_tb.Location = New System.Drawing.Point(1326, 30)
+        Me.訂貨代理_tb.Location = New System.Drawing.Point(1438, 30)
         Me.訂貨代理_tb.Multiline = True
         Me.訂貨代理_tb.Name = "訂貨代理_tb"
-        Me.訂貨代理_tb.Size = New System.Drawing.Size(350, 118)
+        Me.訂貨代理_tb.Size = New System.Drawing.Size(246, 118)
         Me.訂貨代理_tb.TabIndex = 627
         '
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(425, 143)
+        Me.Label16.Location = New System.Drawing.Point(394, 143)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(68, 16)
         Me.Label16.TabIndex = 631
@@ -635,7 +641,7 @@ Partial Class 訂單資料匯入_力威
         '
         '總雙數_tb
         '
-        Me.總雙數_tb.Location = New System.Drawing.Point(495, 140)
+        Me.總雙數_tb.Location = New System.Drawing.Point(464, 140)
         Me.總雙數_tb.Name = "總雙數_tb"
         Me.總雙數_tb.Size = New System.Drawing.Size(113, 23)
         Me.總雙數_tb.TabIndex = 630
@@ -643,7 +649,7 @@ Partial Class 訂單資料匯入_力威
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(421, 172)
+        Me.Label17.Location = New System.Drawing.Point(390, 172)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(72, 16)
         Me.Label17.TabIndex = 633
@@ -651,15 +657,15 @@ Partial Class 訂單資料匯入_力威
         '
         '總案件_tb
         '
-        Me.總案件_tb.Location = New System.Drawing.Point(495, 169)
+        Me.總案件_tb.Location = New System.Drawing.Point(464, 169)
         Me.總案件_tb.Name = "總案件_tb"
         Me.總案件_tb.Size = New System.Drawing.Size(113, 23)
         Me.總案件_tb.TabIndex = 632
         '
         '訂單讀取_bt
         '
-        Me.訂單讀取_bt.ForeColor = System.Drawing.Color.Blue
-        Me.訂單讀取_bt.Location = New System.Drawing.Point(1814, 50)
+        Me.訂單讀取_bt.ForeColor = System.Drawing.Color.Green
+        Me.訂單讀取_bt.Location = New System.Drawing.Point(1820, 47)
         Me.訂單讀取_bt.Name = "訂單讀取_bt"
         Me.訂單讀取_bt.Size = New System.Drawing.Size(87, 42)
         Me.訂單讀取_bt.TabIndex = 634
@@ -672,18 +678,18 @@ Partial Class 訂單資料匯入_力威
         '
         'ProgressBar1
         '
-        Me.ProgressBar1.Location = New System.Drawing.Point(970, 149)
+        Me.ProgressBar1.Location = New System.Drawing.Point(935, 150)
         Me.ProgressBar1.Maximum = 10000
         Me.ProgressBar1.Name = "ProgressBar1"
-        Me.ProgressBar1.Size = New System.Drawing.Size(705, 10)
+        Me.ProgressBar1.Size = New System.Drawing.Size(745, 10)
         Me.ProgressBar1.TabIndex = 635
         '
         'ProgressBar2
         '
-        Me.ProgressBar2.Location = New System.Drawing.Point(970, 160)
+        Me.ProgressBar2.Location = New System.Drawing.Point(935, 161)
         Me.ProgressBar2.Maximum = 10000
         Me.ProgressBar2.Name = "ProgressBar2"
-        Me.ProgressBar2.Size = New System.Drawing.Size(705, 10)
+        Me.ProgressBar2.Size = New System.Drawing.Size(745, 10)
         Me.ProgressBar2.TabIndex = 636
         '
         '控制表_dgv
@@ -736,7 +742,7 @@ Partial Class 訂單資料匯入_力威
         '工廠編號_tb
         '
         Me.工廠編號_tb.ForeColor = System.Drawing.Color.Black
-        Me.工廠編號_tb.Location = New System.Drawing.Point(834, 50)
+        Me.工廠編號_tb.Location = New System.Drawing.Point(800, 50)
         Me.工廠編號_tb.Name = "工廠編號_tb"
         Me.工廠編號_tb.Size = New System.Drawing.Size(130, 23)
         Me.工廠編號_tb.TabIndex = 640
@@ -787,7 +793,8 @@ Partial Class 訂單資料匯入_力威
         'SplitContainer2.Panel1
         '
         Me.SplitContainer2.Panel1.AutoScroll = True
-        Me.SplitContainer2.Panel1.Controls.Add(Me.TextBox42)
+        Me.SplitContainer2.Panel1.Controls.Add(Me.日期_tb)
+        Me.SplitContainer2.Panel1.Controls.Add(Me.資料流水號_tb)
         Me.SplitContainer2.Panel1.Controls.Add(Me.生產工廠_tb)
         Me.SplitContainer2.Panel1.Controls.Add(Me.控制表_dgv)
         '
@@ -799,6 +806,23 @@ Partial Class 訂單資料匯入_力威
         Me.SplitContainer2.SplitterDistance = 190
         Me.SplitContainer2.TabIndex = 643
         '
+        '日期_tb
+        '
+        Me.日期_tb.ForeColor = System.Drawing.Color.Black
+        Me.日期_tb.Location = New System.Drawing.Point(1666, 87)
+        Me.日期_tb.Name = "日期_tb"
+        Me.日期_tb.Size = New System.Drawing.Size(87, 23)
+        Me.日期_tb.TabIndex = 646
+        Me.日期_tb.Visible = False
+        '
+        '資料流水號_tb
+        '
+        Me.資料流水號_tb.Location = New System.Drawing.Point(1666, 29)
+        Me.資料流水號_tb.Name = "資料流水號_tb"
+        Me.資料流水號_tb.Size = New System.Drawing.Size(87, 23)
+        Me.資料流水號_tb.TabIndex = 645
+        Me.資料流水號_tb.Visible = False
+        '
         'SplitContainer1
         '
         Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -839,42 +863,77 @@ Partial Class 訂單資料匯入_力威
         '
         'ProgressBar3
         '
-        Me.ProgressBar3.Location = New System.Drawing.Point(970, 171)
+        Me.ProgressBar3.Location = New System.Drawing.Point(935, 172)
         Me.ProgressBar3.Maximum = 10000
         Me.ProgressBar3.Name = "ProgressBar3"
-        Me.ProgressBar3.Size = New System.Drawing.Size(705, 10)
+        Me.ProgressBar3.Size = New System.Drawing.Size(745, 10)
         Me.ProgressBar3.TabIndex = 642
         '
         'ProgressBar4
         '
-        Me.ProgressBar4.Location = New System.Drawing.Point(970, 182)
+        Me.ProgressBar4.Location = New System.Drawing.Point(935, 183)
         Me.ProgressBar4.Maximum = 10000
         Me.ProgressBar4.Name = "ProgressBar4"
-        Me.ProgressBar4.Size = New System.Drawing.Size(705, 10)
+        Me.ProgressBar4.Size = New System.Drawing.Size(745, 10)
         Me.ProgressBar4.TabIndex = 643
         '
         '訂單存檔_bt
         '
+        Me.訂單存檔_bt.Enabled = False
         Me.訂單存檔_bt.ForeColor = System.Drawing.Color.Blue
-        Me.訂單存檔_bt.Location = New System.Drawing.Point(1814, 95)
+        Me.訂單存檔_bt.Location = New System.Drawing.Point(1820, 89)
         Me.訂單存檔_bt.Name = "訂單存檔_bt"
         Me.訂單存檔_bt.Size = New System.Drawing.Size(87, 42)
         Me.訂單存檔_bt.TabIndex = 644
         Me.訂單存檔_bt.Text = "訂單存檔"
         Me.訂單存檔_bt.UseVisualStyleBackColor = True
         '
-        'TextBox42
+        'Label28
+        '
+        Me.Label28.AutoSize = True
+        Me.Label28.ForeColor = System.Drawing.Color.Blue
+        Me.Label28.Location = New System.Drawing.Point(1821, 166)
+        Me.Label28.Name = "Label28"
+        Me.Label28.Size = New System.Drawing.Size(18, 16)
+        Me.Label28.TabIndex = 707
+        Me.Label28.Text = "★"
+        '
+        '國標測試報告_ch
         '
-        Me.TextBox42.Location = New System.Drawing.Point(1666, 29)
-        Me.TextBox42.Name = "TextBox42"
-        Me.TextBox42.Size = New System.Drawing.Size(87, 23)
-        Me.TextBox42.TabIndex = 645
+        Me.國標測試報告_ch.AutoSize = True
+        Me.國標測試報告_ch.Location = New System.Drawing.Point(1845, 157)
+        Me.國標測試報告_ch.Name = "國標測試報告_ch"
+        Me.國標測試報告_ch.Size = New System.Drawing.Size(63, 36)
+        Me.國標測試報告_ch.TabIndex = 706
+        Me.國標測試報告_ch.Text = "國標測" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "試報告"
+        Me.國標測試報告_ch.UseVisualStyleBackColor = True
+        '
+        '最終運送_tb
+        '
+        Me.最終運送_tb.ForeColor = System.Drawing.Color.Black
+        Me.最終運送_tb.Location = New System.Drawing.Point(1185, 30)
+        Me.最終運送_tb.Multiline = True
+        Me.最終運送_tb.Name = "最終運送_tb"
+        Me.最終運送_tb.Size = New System.Drawing.Size(250, 118)
+        Me.最終運送_tb.TabIndex = 708
+        '
+        'Label26
+        '
+        Me.Label26.AutoSize = True
+        Me.Label26.Location = New System.Drawing.Point(1188, 11)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(137, 16)
+        Me.Label26.TabIndex = 709
+        Me.Label26.Text = "Final Customer Ship To"
         '
         '訂單資料匯入_力威
         '
         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.Label26)
+        Me.Controls.Add(Me.最終運送_tb)
+        Me.Controls.Add(Me.Label28)
         Me.Controls.Add(Me.訂單存檔_bt)
         Me.Controls.Add(Me.ProgressBar4)
         Me.Controls.Add(Me.ProgressBar3)
@@ -898,7 +957,6 @@ Partial Class 訂單資料匯入_力威
         Me.Controls.Add(Me.供應商編號_tb)
         Me.Controls.Add(Me.Label12)
         Me.Controls.Add(Me.服務_tb)
-        Me.Controls.Add(Me.Label11)
         Me.Controls.Add(Me.公司編號_tb)
         Me.Controls.Add(Me.Label10)
         Me.Controls.Add(Me.版本_tb)
@@ -943,10 +1001,12 @@ Partial Class 訂單資料匯入_力威
         Me.Controls.Add(Me.Label19)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.Number_tb)
+        Me.Controls.Add(Me.國標測試報告_ch)
+        Me.Controls.Add(Me.Label11)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "訂單資料匯入_力威"
-        Me.Text = "Total Units"
+        Me.Text = "訂單資料匯入-力威"
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.裝箱控制_dgv, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1047,5 +1107,10 @@ Partial Class 訂單資料匯入_力威
     Friend WithEvents ProgressBar3 As ProgressBar
     Friend WithEvents ProgressBar4 As ProgressBar
     Friend WithEvents 訂單存檔_bt As Button
-    Friend WithEvents TextBox42 As TextBox
+    Friend WithEvents 資料流水號_tb As TextBox
+    Friend WithEvents Label28 As Label
+    Friend WithEvents 國標測試報告_ch As CheckBox
+    Friend WithEvents 最終運送_tb As TextBox
+    Friend WithEvents Label26 As Label
+    Friend WithEvents 日期_tb As TextBox
 End Class

TENDEN-MES-SYS/量產訂單管理/訂單資料匯入-力威.vb

@@ -3,7 +3,7 @@ Public Class 訂單資料匯入_力威
     Dim xlApp As Microsoft.Office.Interop.Excel.Application
     ReadOnly xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
-    Dim file_name As String = "" : Dim 形體名稱 As String : Dim 型體描述 As String : Dim 項目 As String : Dim 型體資料 As String
+    Dim file_name As String = "" : Dim 形體名稱 As String : Dim 型體描述 As String : Dim 項目 As String : Dim 型體資料 As String : Dim STR1 As String
     Public 平均數 As Integer : Public 最終數 As Integer = 0 : Public 資料數 As Integer = 0
     Public 平均數1 As Integer : Public 最終數1 As Integer = 0 : Public 資料數1 As Integer = 0
     Public 平均數2 As Integer : Public 最終數2 As Integer = 0 : Public 資料數2 As Integer = 0
@@ -49,14 +49,38 @@ Public Class 訂單資料匯入_力威
         明細表_dgv.Rows(0).Cells("7").Value = 0 : 明細表_dgv.Rows(0).Cells("7.5").Value = 0 : 明細表_dgv.Rows(0).Cells("8").Value = 0 : 明細表_dgv.Rows(0).Cells("8.5").Value = 0
         明細表_dgv.Rows(0).Cells("9").Value = 0 : 明細表_dgv.Rows(0).Cells("9.5").Value = 0 : 明細表_dgv.Rows(0).Cells("10").Value = 0 : 明細表_dgv.Rows(0).Cells("10.5").Value = 0
         明細表_dgv.Rows(0).Cells("11").Value = 0 : 明細表_dgv.Rows(0).Cells("11.5").Value = 0 : 明細表_dgv.Rows(0).Cells("12").Value = 0 : 明細表_dgv.Rows(0).Cells("12.5").Value = 0
-        明細表_dgv.Rows(0).Cells("13").Value = 0 : 明細表_dgv.Rows(0).Cells("14").Value = 0
+        明細表_dgv.Rows(0).Cells("13").Value = 0 : 明細表_dgv.Rows(0).Cells("14").Value = 0 : 明細表_dgv.Rows(0).Cells("天盾流水號").Value = ""
+        明細表_dgv.Rows(0).Cells("客戶訂單號").Value = "" : 明細表_dgv.Rows(0).Cells("ItemNumber").Value = "" : 明細表_dgv.Rows(0).Cells("ProductName").Value = ""
+        明細表_dgv.Rows(0).Cells("ProductDescription").Value = "" : 明細表_dgv.Rows(0).Cells("Color").Value = "" : 明細表_dgv.Rows(0).Cells("DM").Value = ""
     End Sub
     Private Sub 填入0值2()
         裝箱明細_dgv.Rows(0).Cells("5").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("5.5").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("6").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("6.5").Value = 0
         裝箱明細_dgv.Rows(0).Cells("7").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("7.5").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("8").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("8.5").Value = 0
         裝箱明細_dgv.Rows(0).Cells("9").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("9.5").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("10").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("10.5").Value = 0
         裝箱明細_dgv.Rows(0).Cells("11").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("11.5").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("12").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("12.5").Value = 0
-        裝箱明細_dgv.Rows(0).Cells("13").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("14").Value = 0
+        裝箱明細_dgv.Rows(0).Cells("13").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("14").Value = 0 : 裝箱明細_dgv.Rows(0).Cells("天盾流水號").Value = ""
+        裝箱明細_dgv.Rows(0).Cells("客戶訂單號").Value = "" : 裝箱明細_dgv.Rows(0).Cells("力威訂單號").Value = "" : 裝箱明細_dgv.Rows(0).Cells("Item").Value = ""
+        裝箱明細_dgv.Rows(0).Cells("Material").Value = "" : 裝箱明細_dgv.Rows(0).Cells("DM").Value = ""
+    End Sub
+    Private Sub 填入0值3()
+        控制表_dgv.Rows(0).Cells("訂單流水號").Value = "" : 控制表_dgv.Rows(0).Cells("年份季度").Value = "" : 控制表_dgv.Rows(0).Cells("客戶訂單號").Value = ""
+        控制表_dgv.Rows(0).Cells("形體號").Value = "" : 控制表_dgv.Rows(0).Cells("顏色").Value = "" : 控制表_dgv.Rows(0).Cells("楦型").Value = ""
+        控制表_dgv.Rows(0).Cells("訂單數量").Value = "" : 控制表_dgv.Rows(0).Cells("客戶交期").Value = "" : 控制表_dgv.Rows(0).Cells("生產工廠").Value = ""
+        控制表_dgv.Rows(0).Cells("訂單種類").Value = "" : 控制表_dgv.Rows(0).Cells("工廠回復交期").Value = "" : 控制表_dgv.Rows(0).Cells("ProductID").Value = ""
+        控制表_dgv.Rows(0).Cells("UoM").Value = ""
+    End Sub
+    Private Sub 填入0值4()
+        裝箱控制_dgv.Rows(0).Cells("天盾流水號").Value = "" : 裝箱控制_dgv.Rows(0).Cells("客戶訂單號").Value = "" : 裝箱控制_dgv.Rows(0).Cells("力威訂單號").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("Item").Value = "" : 裝箱控制_dgv.Rows(0).Cells("Material").Value = "" : 裝箱控制_dgv.Rows(0).Cells("MaterialDescription").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("Qty").Value = "" : 裝箱控制_dgv.Rows(0).Cells("UoM").Value = "" : 裝箱控制_dgv.Rows(0).Cells("ProductDescription").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("IncoTerms").Value = "" : 裝箱控制_dgv.Rows(0).Cells("CustomerData").Value = "" : 裝箱控制_dgv.Rows(0).Cells("Size").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("HS").Value = "" : 裝箱控制_dgv.Rows(0).Cells("Units1").Value = "" : 裝箱控制_dgv.Rows(0).Cells("DtyRate").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("AddOnDty").Value = "" : 裝箱控制_dgv.Rows(0).Cells("UnitsCtn").Value = "" : 裝箱控制_dgv.Rows(0).Cells("NoCtn").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("CtnNo").Value = "" : 裝箱控制_dgv.Rows(0).Cells("Units2").Value = "" : 裝箱控制_dgv.Rows(0).Cells("PLMSeason").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("ProductID").Value = "" : 裝箱控制_dgv.Rows(0).Cells("Stock").Value = "" : 裝箱控制_dgv.Rows(0).Cells("StkName").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("CustStk").Value = "" : 裝箱控制_dgv.Rows(0).Cells("CustStkName").Value = "" : 裝箱控制_dgv.Rows(0).Cells("CasePack").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("Colorway").Value = "" : 裝箱控制_dgv.Rows(0).Cells("OrderColor").Value = "" : 裝箱控制_dgv.Rows(0).Cells("Logo").Value = ""
+        裝箱控制_dgv.Rows(0).Cells("POItemText").Value = ""
     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
@@ -130,7 +154,7 @@ Public Class 訂單資料匯入_力威
         Dim DC17 As New DataGridViewTextBoxColumn : Dim DC18 As New DataGridViewTextBoxColumn : Dim DC19 As New DataGridViewTextBoxColumn : Dim DC20 As New DataGridViewTextBoxColumn
         Dim DC21 As New DataGridViewTextBoxColumn : Dim DC22 As New DataGridViewTextBoxColumn : Dim DC23 As New DataGridViewTextBoxColumn : Dim DC24 As New DataGridViewTextBoxColumn
         Dim DC25 As New DataGridViewTextBoxColumn : Dim DC26 As New DataGridViewTextBoxColumn : Dim DC27 As New DataGridViewTextBoxColumn : Dim DC28 As New DataGridViewTextBoxColumn
-        Dim DC29 As New DataGridViewTextBoxColumn : Dim DC30 As New DataGridViewTextBoxColumn : Dim DC31 As New DataGridViewTextBoxColumn
+        Dim DC29 As New DataGridViewTextBoxColumn : Dim DC30 As New DataGridViewTextBoxColumn : Dim DC31 As New DataGridViewTextBoxColumn : Dim DC32 As New DataGridViewTextBoxColumn
 
         DC01.HeaderText = "天盾流水號" : DC01.Name = "天盾流水號" : 裝箱控制_dgv.Columns.Insert(0, DC01)
         DC02.HeaderText = "客戶訂單號" : DC02.Name = "客戶訂單號" : 裝箱控制_dgv.Columns.Insert(1, DC02)
@@ -163,6 +187,7 @@ Public Class 訂單資料匯入_力威
         DC29.HeaderText = "OrderColor" : DC29.Name = "OrderColor" : 裝箱控制_dgv.Columns.Insert(28, DC29)
         DC30.HeaderText = "Logo" : DC30.Name = "Logo" : 裝箱控制_dgv.Columns.Insert(29, DC30)
         DC31.HeaderText = "POItemText" : DC31.Name = "POItemText" : 裝箱控制_dgv.Columns.Insert(30, DC31)
+        DC32.HeaderText = "FinalCustomerShipTo" : DC32.Name = "FinalCustomerShipTo" : 裝箱控制_dgv.Columns.Insert(31, DC32)
 
         裝箱控制_dgv.Columns(0).FillWeight = 100 : 裝箱控制_dgv.Columns(1).FillWeight = 100 : 裝箱控制_dgv.Columns(2).FillWeight = 100 : 裝箱控制_dgv.Columns(3).FillWeight = 100
         裝箱控制_dgv.Columns(4).FillWeight = 100 : 裝箱控制_dgv.Columns(5).FillWeight = 100 : 裝箱控制_dgv.Columns(6).FillWeight = 100 : 裝箱控制_dgv.Columns(7).FillWeight = 100
@@ -171,7 +196,7 @@ Public Class 訂單資料匯入_力威
         裝箱控制_dgv.Columns(16).FillWeight = 100 : 裝箱控制_dgv.Columns(17).FillWeight = 100 : 裝箱控制_dgv.Columns(18).FillWeight = 100 : 裝箱控制_dgv.Columns(19).FillWeight = 100
         裝箱控制_dgv.Columns(20).FillWeight = 100 : 裝箱控制_dgv.Columns(21).FillWeight = 100 : 裝箱控制_dgv.Columns(22).FillWeight = 100 : 裝箱控制_dgv.Columns(23).FillWeight = 100
         裝箱控制_dgv.Columns(24).FillWeight = 100 : 裝箱控制_dgv.Columns(25).FillWeight = 100 : 裝箱控制_dgv.Columns(26).FillWeight = 100 : 裝箱控制_dgv.Columns(27).FillWeight = 100
-        裝箱控制_dgv.Columns(28).FillWeight = 100 : 裝箱控制_dgv.Columns(29).FillWeight = 100 : 裝箱控制_dgv.Columns(30).FillWeight = 100
+        裝箱控制_dgv.Columns(28).FillWeight = 100 : 裝箱控制_dgv.Columns(29).FillWeight = 100 : 裝箱控制_dgv.Columns(30).FillWeight = 100 : 裝箱控制_dgv.Columns(31).FillWeight = 100
 
         Dim DR01 As New DataGridViewTextBoxColumn : Dim DR02 As New DataGridViewTextBoxColumn : Dim DR03 As New DataGridViewTextBoxColumn : Dim DR04 As New DataGridViewTextBoxColumn
         Dim DR05 As New DataGridViewTextBoxColumn : Dim DR06 As New DataGridViewTextBoxColumn : Dim DR07 As New DataGridViewTextBoxColumn : Dim DR08 As New DataGridViewTextBoxColumn
@@ -221,8 +246,29 @@ Public Class 訂單資料匯入_力威
         End If
         Number_tb.Text = 天盾流水號_tb.Text
     End Sub
-    Private Sub Button9_Click(sender As Object, e As EventArgs) Handles 清空_bt.Click
-        下單日_dtp.Format = DateTimePickerFormat.Custom : 下單日_dtp.CustomFormat = " "
+    Private Sub 清空_bt_Click(sender As Object, e As EventArgs) Handles 清空_bt.Click
+        '-------清空------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        ConnOpen()
+        SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(天盾流水號_tb.Text, 6) & "')"
+        cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
+
+        SEASON_cb_下拉表單資料載入() : DIV_cb_下拉表單資料載入() : Remark_cb_下拉表單資料載入() : FTY_cb_下拉表單資料載入()
+
+        Number_tb.Text = "" : Brand_cb.Text = "" : 訂單類別_tb.Text = "" : 英科條款_tb.Text = "" : 公司編號_tb.Text = "" : 服務_tb.Text = "" : 版本_tb.Text = "" : 供應商編號_tb.Text = ""
+        客戶訂單號_tb.Text = "" : 郵寄方式_tb.Text = "" : 客戶交期_dtp.Value = Today() : 客戶交期_dtp.Text = "" : 總雙數_tb.Text = "" : 總案件_tb.Text = "" : VendorName_tb.Text = ""
+        工廠編號_tb.Text = "" : 地址1_tb.Text = "" : 地址二_tb.Text = "" : 代理編號_cb.Text = "" : 訂貨代理_tb.Text = "" : 天盾流水號_tb.Text = "" : 最終運送_tb.Text = ""
+
+        Dim 數量 As Integer
+        數量 = 控制表_dgv.Rows.Count
+        If 數量 > 1 Then : For i As Integer = 0 To 數量 - 2 : 控制表_dgv.EndEdit(0) : 控制表_dgv.Rows.RemoveAt(0) : Next : End If : 填入0值3()
+        數量 = 明細表_dgv.Rows.Count
+        If 數量 > 1 Then : For i As Integer = 0 To 數量 - 2 : 明細表_dgv.EndEdit(0) : 明細表_dgv.Rows.RemoveAt(0) : Next : End If : 填入0值1()
+        數量 = 裝箱控制_dgv.Rows.Count
+        If 數量 > 1 Then : For i As Integer = 0 To 數量 - 2 : 裝箱控制_dgv.EndEdit(0) : 裝箱控制_dgv.Rows.RemoveAt(0) : Next : End If : 填入0值4()
+        數量 = 裝箱明細_dgv.Rows.Count
+        If 數量 > 1 Then : For i As Integer = 0 To 數量 - 2 : 裝箱明細_dgv.EndEdit(0) : 裝箱明細_dgv.Rows.RemoveAt(0) : Next : End If : 填入0值2()
+
+        訂單讀取_bt.Enabled = True : 訂單存檔_bt.Enabled = False
     End Sub
     Private Sub 新增清單1_bt_Click(sender As Object, e As EventArgs) Handles 新增清單1_bt.Click
         清單修改.Close() : 修改清單(0) = True : 修改清單(1) = False : 修改清單(2) = False : 修改清單(3) = False : 修改清單(4) = False : 修改清單(5) = False
@@ -280,10 +326,10 @@ Public Class 訂單資料匯入_力威
                 xlSheet.Activate()
                 xlApp.Visible = False
                 '-------表頭-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-                For XX As Integer = 1 To 60
-                    資料數 = 60 : 進度條()
-                    For YY As Integer = 1 To 35
-                        資料數1 = 35 : 進度條1()
+                For YY As Integer = 1 To 35
+                    資料數 = 35 : 進度條()
+                    For XX As Integer = 1 To 60
+                        資料數1 = 60 : 進度條1()
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 16) = "Purchasing Group" Then : Brand_cb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 22, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 7) = "PO Type" Then : 訂單類別_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 6) = "Vendor" Then : 供應商編號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
@@ -329,6 +375,9 @@ Public Class 訂單資料匯入_力威
                             For I As Integer = 1 To 3 : If xlSheet.Cells(YY + I, XX).value <> "" Then : 訂貨代理_tb.Text = xlSheet.Cells(YY + I, XX).value : Exit For : End If : Next
                         End If
 
+                        If Strings.Left(xlSheet.Cells(YY, XX).value, 22) = "Final Customer Ship To" Then
+                            For I As Integer = 1 To 3 : If xlSheet.Cells(YY + I, XX).value <> "" Then : 最終運送_tb.Text = xlSheet.Cells(YY + I, XX).value : Exit For : End If : Next
+                        End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 10) = "Inco Terms" Then
                             For I As Integer = 1 To 3 : If xlSheet.Cells(YY + I, XX).value <> "" Then : 英科條款_tb.Text = xlSheet.Cells(YY + I, XX).value : Exit For : End If : Next
                         End If
@@ -339,7 +388,13 @@ Public Class 訂單資料匯入_力威
                             For I As Integer = 1 To 3 : If xlSheet.Cells(YY + I, XX).value <> "" Then : 地址二_tb.Text = xlSheet.Cells(YY + I, XX).value : Exit For : End If : Next
                         End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 23) = "NLT - Ex - Factory Date" Then
-                            For I As Integer = 1 To 3 : If IsDate(xlSheet.Cells(YY + I, XX).value) Then : 客戶交期_dtp.Value = xlSheet.Cells(YY + I, XX).value : Exit For : End If : Next
+                            For I As Integer = 1 To 3
+                                日期_tb.Text = xlSheet.Cells(YY + I, XX).value
+                                客戶交期_dtp.Text = 日期_tb.Text
+                                If 日期_tb.Text <> "" Then
+                                    Exit For
+                                End If
+                            Next
                         End If
                         If Number_tb.Text <> "" And 英科條款_tb.Text <> "" And 供應商編號_tb.Text <> "" And 郵寄方式_tb.Text <> "" And 總案件_tb.Text <> "" And 訂貨代理_tb.Text <> "" And
                             Brand_cb.Text <> "" And 公司編號_tb.Text <> "" And 版本_tb.Text <> "" And 力威訂單號_tb.Text <> "" And 地址1_tb.Text <> "" And 代理編號_cb.Text <> "" And
@@ -353,6 +408,9 @@ Public Class 訂單資料匯入_力威
                         ProgressBar1.Value = 0 : 最終數 = 0 : Exit For
                     End If
                 Next : ProgressBar1.Value = 0 : 最終數 = 0
+                If 客戶訂單號_tb.Text = "" Then
+                    客戶訂單號_tb.Text = 力威訂單號_tb.Text
+                End If
                 '-------控制表與明細表------------------------------------------------------------------------------------------------------------------------------------------------------------
                 Dim W As Integer = 0 : Dim XX1 As Integer = 1
                 For YY As Integer = 25 To 100
@@ -625,6 +683,14 @@ Public Class 訂單資料匯入_力威
 
                                 For II As Integer = 0 To 50 : 資料數2 = 50 : 進度條2()
                                     For III As Integer = 20 To 50 : 資料數3 = 50 : 進度條3()
+                                        If Strings.Left(xlSheet.Cells(YY + I + II, XX2 + III).value, 22) = "Final Customer Ship To" Then
+                                            For FF As Integer = 1 To 3
+                                                If xlSheet.Cells(YY + I + II + FF, XX2 + III).value <> "" Then
+                                                    裝箱控制_dgv.Rows(0).Cells("FinalCustomerShipTo").Value = xlSheet.Cells(YY + I + II + FF, XX2 + III).value : Exit For
+                                                End If
+                                            Next
+                                        End If
+
                                         If Strings.Left(xlSheet.Cells(YY + I + II, XX2 + III).value, 12) = "Customs Info" Then
                                             For UU As Integer = 1 To 5
                                                 For IIII As Integer = 0 To 30
@@ -665,8 +731,17 @@ Public Class 訂單資料匯入_力威
 
                                     If Strings.Left(xlSheet.Cells(YY + I + II, XX2).value, 11) = "PLM Season:" Then
                                         For III As Integer = 2 To 19 : 資料數3 = 19 : 進度條3()
-                                            裝箱控制_dgv.Rows(0).Cells("PLMSeason").Value = xlSheet.Cells(YY + I + II, XX2 + III).value
-                                            If Not IsNothing(裝箱控制_dgv.Rows(0).Cells("PLMSeason").Value) Then : Exit For : ProgressBar4.Value = 0 : 最終數3 = 0 : End If
+                                            '---------------找出'並換成-號
+                                            STR1 = ""
+                                            For ZZ As Integer = 1 To 300
+                                                If Strings.Mid(xlSheet.Cells(YY + I + II, XX2 + III).value, ZZ, 1) = "'" Then
+                                                    STR1 &= "-"
+                                                ElseIf Strings.Mid(xlSheet.Cells(YY + I + II, XX2 + III).value, ZZ, 1) <> "'" Then
+                                                    STR1 &= Strings.Mid(xlSheet.Cells(YY + I + II, XX2 + III).value, ZZ, 1)
+                                                End If
+                                            Next
+                                            裝箱控制_dgv.Rows(0).Cells("PLMSeason").Value = STR1
+                                            If 裝箱控制_dgv.Rows(0).Cells("PLMSeason").Value <> "" Then : Exit For : ProgressBar4.Value = 0 : 最終數3 = 0 : End If
                                         Next : ProgressBar4.Value = 0 : 最終數3 = 0
                                     End If
                                     If Strings.Left(xlSheet.Cells(YY + I + II, XX2).value, 11) = "Product ID:" Then
@@ -713,8 +788,16 @@ Public Class 訂單資料匯入_力威
                                     End If
                                     If Strings.Left(xlSheet.Cells(YY + I + II, XX2).value, 5) = "Logo:" Then
                                         For III As Integer = 2 To 19 : 資料數3 = 19 : 進度條3()
-                                            裝箱控制_dgv.Rows(0).Cells("Logo").Value = xlSheet.Cells(YY + I + II, XX2 + III).value
-                                            If Not IsNothing(裝箱控制_dgv.Rows(0).Cells("Logo").Value) Then : Exit For : ProgressBar4.Value = 0 : 最終數3 = 0 : End If
+                                            STR1 = ""
+                                            For ZZ As Integer = 1 To 100
+                                                If Strings.Mid(xlSheet.Cells(YY + I + II, XX2 + III).value, ZZ, 1) = "'" Then
+                                                    STR1 &= "-"
+                                                ElseIf Strings.Mid(xlSheet.Cells(YY + I + II, XX2 + III).value, ZZ, 1) <> "'" Then
+                                                    STR1 &= Strings.Mid(xlSheet.Cells(YY + I + II, XX2 + III).value, ZZ, 1)
+                                                End If
+                                            Next
+                                            裝箱控制_dgv.Rows(0).Cells("Logo").Value = STR1
+                                            If 裝箱控制_dgv.Rows(0).Cells("Logo").Value <> "" Then : Exit For : ProgressBar4.Value = 0 : 最終數3 = 0 : End If
                                         Next : ProgressBar4.Value = 0 : 最終數3 = 0
                                         Exit For : ProgressBar3.Value = 0 : 最終數2 = 0
                                     End If
@@ -726,6 +809,7 @@ Public Class 訂單資料匯入_力威
                 Next : ProgressBar1.Value = 0 : 最終數 = 0
                 裝箱控制_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
                 xlApp.Visible = True : xlApp.Quit() : xlApp = Nothing
+                訂單讀取_bt.Enabled = False : 訂單存檔_bt.Enabled = True
                 MsgBox("讀取EXCEL完成")
             ElseIf OpenFileDialog1.ShowDialog = DialogResult.No Then
             End If
@@ -740,7 +824,7 @@ Public Class 訂單資料匯入_力威
             MsgBox("打藍色星號處的資料不可以空白。")
         Else
             If Brand_cb.Text = "" Or 訂單類別_tb.Text = "" Or 英科條款_tb.Text = "" Or 公司編號_tb.Text = "" Or 服務_tb.Text = "" Or 力威訂單號_tb.Text = "" Or 客戶訂單號_tb.Text = "" Or
-                供應商編號_tb.Text = "" Or 工廠編號_tb.Text = "" Or 地址1_tb.Text = "" Or 地址二_tb.Text = "" Or 訂貨代理_tb.Text = "" Then
+                供應商編號_tb.Text = "" Or 工廠編號_tb.Text = "" Or 地址1_tb.Text = "" Or 地址二_tb.Text = "" Then
                 MsgBox("打藍色星號處的資料不可以空白。")
             Else
                 Set_日期格式轉換()
@@ -757,49 +841,133 @@ Public Class 訂單資料匯入_力威
                 ConnOpen()
                 SQL1 = "INSERT INTO " & 訂單資料表(0) & " (客戶訂單號, 天盾流水號, ModeOfDelivery, DeliveryTerms, OrgShipDate, FromPort, ToPort, ShippingCarrier, VendorReference, ModifiedDate, 
                                                     CustomerName, ShipDate, SalesOrder, DeliveryAddress, 下單日, 交期, ETADate, CreatedDate, Brand, CustomerRequisition, 工廠編號, 工廠地址, 
-                                                    代理編號, 訂貨代理, 總雙數, 總案件數, 公司, 工廠簡稱) 
+                                                    代理編號, 訂貨代理, 總雙數, 總案件數, 公司, 工廠簡稱, 最終運送, 入單型態) 
                          VALUES ('" & 客戶訂單號_tb.Text & "','" & Number_tb.Text & "','" & 訂單類別_tb.Text & "','" & 英科條款_tb.Text & "','" & DTP & "','','','','" & 供應商編號_tb.Text &
                               "','" & 版本_tb.Text & "','" & 公司編號_tb.Text & "','" & DTP & "','" & 郵寄方式_tb.Text & "','" & 地址二_tb.Text & "','" & DTP & "','" & DTP & "','" & DTP &
                               "','" & DTP1 & "','" & Brand_cb.Text & "','" & 力威訂單號_tb.Text & "','" & 工廠編號_tb.Text & "','" & 地址1_tb.Text & "','" & 代理編號_cb.Text &
-                              "','" & 訂貨代理_tb.Text & "','" & 總雙數_tb.Text & "','" & 總案件_tb.Text & "','" & 總案件_tb.Text & "','" & FTY_cb.Text & "')"
+                              "','" & 訂貨代理_tb.Text & "','" & 總雙數_tb.Text & "','" & 總案件_tb.Text & "','" & 服務_tb.Text & "','" & FTY_cb.Text & "','" & 最終運送_tb.Text & "', '2')"
                 CmdSet_For_dr() : conn.Close()
                 '-------訂單控制表------------------------------------------------------------------------------------------------------------------------------------------------------------------
-                For i As Integer = 0 To 控制表_dgv.Rows.Count - 1
+                For i As Integer = 0 To 控制表_dgv.Rows.Count - 1 : 資料數 = 控制表_dgv.Rows.Count : 進度條()
                     ConnOpen()
                     SQL1 = "SELECT TOP (1) 資料流水號 FROM " & 訂單資料表(1) & " GROUP BY 資料流水號 ORDER BY 資料流水號 DESC"
                     CmdSet_For_dr()
-                    If dr.Read() Then : TextBox42.Text = dr("資料流水號").ToString : Else : TextBox42.Text = "" : End If
+                    If dr.Read() Then : 資料流水號_tb.Text = dr("資料流水號").ToString : Else : 資料流水號_tb.Text = "00000000" : End If
                     conn.Close()
                     Dim NUM1 As Integer
-                    NUM1 = Double.Parse(Strings.Right(TextBox42.Text, 8)) + 1
-                    If NUM1 < 10 Then : TextBox42.Text = "PO" & "0000000" & NUM1
-                    ElseIf NUM1 > 9 And NUM1 < 100 Then : TextBox42.Text = "PO" & "000000" & NUM1
-                    ElseIf NUM1 > 99 And NUM1 < 1000 Then : TextBox42.Text = "PO" & "00000" & NUM1
-                    ElseIf NUM1 > 999 And NUM1 < 10000 Then : TextBox42.Text = "PO" & "0000" & NUM1
-                    ElseIf NUM1 > 9999 And NUM1 < 100000 Then : TextBox42.Text = "PO" & "000" & NUM1
-                    ElseIf NUM1 > 99999 And NUM1 < 100000 Then : TextBox42.Text = "PO" & "00" & NUM1
-                    ElseIf NUM1 > 999999 And NUM1 < 1000000 Then : TextBox42.Text = "PO" & "0" & NUM1
-                    ElseIf NUM1 > 9999999 Then : TextBox42.Text = "PO" & NUM1 + 1
+                    NUM1 = Double.Parse(Strings.Right(資料流水號_tb.Text, 8)) + 1
+                    If NUM1 < 10 Then : 資料流水號_tb.Text = "PO" & "0000000" & NUM1
+                    ElseIf NUM1 > 9 And NUM1 < 100 Then : 資料流水號_tb.Text = "PO" & "000000" & NUM1
+                    ElseIf NUM1 > 99 And NUM1 < 1000 Then : 資料流水號_tb.Text = "PO" & "00000" & NUM1
+                    ElseIf NUM1 > 999 And NUM1 < 10000 Then : 資料流水號_tb.Text = "PO" & "0000" & NUM1
+                    ElseIf NUM1 > 9999 And NUM1 < 100000 Then : 資料流水號_tb.Text = "PO" & "000" & NUM1
+                    ElseIf NUM1 > 99999 And NUM1 < 100000 Then : 資料流水號_tb.Text = "PO" & "00" & NUM1
+                    ElseIf NUM1 > 999999 And NUM1 < 1000000 Then : 資料流水號_tb.Text = "PO" & "0" & NUM1
+                    ElseIf NUM1 > 9999999 Then : 資料流水號_tb.Text = "PO" & NUM1 + 1
                     End If
 
-                    'ConnOpen()
-                    '             SQL1 = "INSERT INTO 訂單控制表 (訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, CFMSPEC, 
-                    '                                             CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, 資料流水號, 明細建檔, 
-                    '                                             PO_S_Date, Requested_XF, Confirm_XF, Revised_XF, Special_Packaging, Remarks, 國標測試) " &
-                    '"VALUES ('" & 控制表_dgv.Rows(i).Cells("訂單流水號").Value & "','" & 控制表_dgv.Rows(i).Cells("年份季度").Value & "','" & 控制表_dgv.Rows(i).Cells("客戶訂單號").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("形體號").Value & "','" & 控制表_dgv.Rows(i).Cells("顏色").Value & "','" & 控制表_dgv.Rows(i).Cells("楦型").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("訂單數量").Value & "','" & 控制表_dgv.Rows(i).Cells("客戶交期").Value & "','" & 控制表_dgv.Rows(i).Cells("單價").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("總金額").Value & "','" & TextBox45.Text & "','" & 控制表_dgv.Rows(i).Cells("生產工廠").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("訂單種類").Value & "','" & 控制表_dgv.Rows(i).Cells("工廠回復交期").Value & "','" & 控制表_dgv.Rows(i).Cells("CFMSPEC").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("CFMSAMPLE").Value & "','" & 控制表_dgv.Rows(i).Cells("TRIAL1").Value & "','" & 控制表_dgv.Rows(i).Cells("TRIAL2").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("TRIAL3").Value & "','" & 控制表_dgv.Rows(i).Cells("TRIAL4").Value & "','" & 控制表_dgv.Rows(i).Cells("包裝確認時間").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("貼標時間").Value & "','" & 控制表_dgv.Rows(i).Cells("裁斷時間").Value & "','" & 控制表_dgv.Rows(i).Cells("針車時間").Value &
-                    '      "','" & 控制表_dgv.Rows(i).Cells("成型時間").Value & "','" & 控制表_dgv.Rows(i).Cells("驗貨時間").Value & "','" & 控制表_dgv.Rows(i).Cells("實際離廠日").Value &
-                    '      "','" & TextBox42.Text & "','1','" & Format(DateTimePicker3.Value, "yyyy/MM/dd") & "','" & Format(DateTimePicker2.Value, "yyyy/MM/dd") &
-                    '      "','" & Format(DateTimePicker2.Value, "yyyy/MM/dd") & "','','','', '" & CheckBox3.Checked & "')"
-                    '             CmdSet_For_dr() : conn.Close()
-                Next
+                    ConnOpen()
+                    SQL1 = "INSERT INTO " & 訂單資料表(1) & " (訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, CFMSPEC, 
+                                                    CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, 資料流水號, 明細建檔, 
+                                                    PO_S_Date, Requested_XF, Confirm_XF, Revised_XF, Special_Packaging, Remarks, 國標測試, 力威訂單號, ProductID, UoM) 
+                            VALUES ('" & 控制表_dgv.Rows(i).Cells("訂單流水號").Value & "','" & 控制表_dgv.Rows(i).Cells("年份季度").Value & "','" & 控制表_dgv.Rows(i).Cells("客戶訂單號").Value & "',
+                                    '" & 控制表_dgv.Rows(i).Cells("形體號").Value & "','" & 控制表_dgv.Rows(i).Cells("顏色").Value & "','" & 控制表_dgv.Rows(i).Cells("楦型").Value & "',
+                                    '" & 控制表_dgv.Rows(i).Cells("訂單數量").Value & "','" & 控制表_dgv.Rows(i).Cells("客戶交期").Value & "','0','0','','" & 控制表_dgv.Rows(i).Cells("生產工廠").Value & "',
+                                    '" & 控制表_dgv.Rows(i).Cells("訂單種類").Value & "','" & 控制表_dgv.Rows(i).Cells("工廠回復交期").Value & "','','','','','','','','','','','','','',
+                                    '" & 資料流水號_tb.Text & "','1','" & 控制表_dgv.Rows(i).Cells("客戶交期").Value & "','" & 控制表_dgv.Rows(i).Cells("客戶交期").Value & "',
+                                    '" & 控制表_dgv.Rows(i).Cells("客戶交期").Value & "','','','','" & 國標測試報告_ch.Checked & "','" & 力威訂單號_tb.Text & "',
+                                    '" & 控制表_dgv.Rows(i).Cells("ProductID").Value & "','" & 控制表_dgv.Rows(i).Cells("UoM").Value & "')"
+                    CmdSet_For_dr() : conn.Close()
+                Next : ProgressBar1.Value = 0 : 最終數 = 0
+                '-------訂單明細表------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                For i As Integer = 0 To 明細表_dgv.Rows.Count - 1 : 資料數1 = 明細表_dgv.Rows.Count : 進度條1()
+                    '-------判斷是否需要新增顏色------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                    ConnOpen()
+                    SQL1 = "SELECT 顏色 FROM 訂單控制表顏色清單 WHERE 顏色 LIKE N'" & 明細表_dgv.Rows(i).Cells("Color").Value & "'"
+                    CmdSet_For_dr()
+                    If dr.Read() Then
+                        conn.Close() : dr.Close()
+                    Else
+                        conn.Close() : dr.Close() : ConnOpen()
+                        SQL1 = "INSERT INTO 訂單控制表顏色清單 (顏色) VALUES (N'" & 明細表_dgv.Rows(i).Cells("Color").Value & "')"
+                        CmdSet_For_dr() : conn.Close() : dr.Close()
+                    End If
+                    '-------判斷是否需要新增形體------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                    ConnOpen()
+                    SQL1 = "SELECT 形體號 FROM 訂單控制表形體號清單 WHERE 形體號 LIKE '" & 明細表_dgv.Rows(i).Cells("ProductName").Value & "'"
+                    CmdSet_For_dr()
+                    If dr.Read() Then
+                        conn.Close() : dr.Close()
+                    Else
+                        conn.Close() : dr.Close() : ConnOpen()
+                        SQL1 = "INSERT INTO 訂單控制表形體號清單 (形體號) VALUES ('" & 明細表_dgv.Rows(i).Cells("ProductName").Value & "')"
+                        CmdSet_For_dr() : conn.Close() : dr.Close()
+                    End If
+                    ConnOpen()
+                    SQL1 = "SELECT ProductName FROM STYLELIST WHERE ProductName LIKE '" & 明細表_dgv.Rows(i).Cells("ProductName").Value & "'"
+                    CmdSet_For_dr()
+                    If dr.Read() Then
+                        conn.Close() : dr.Close()
+                    Else
+                        ConnOpen()
+                        SQL1 = "INSERT INTO STYLELIST ( ItemNumber, ProductName, Style, Description, 建立季節) 
+                                VALUES ('" & 明細表_dgv.Rows(i).Cells("ItemNumber").Value & "', '" & 明細表_dgv.Rows(i).Cells("ProductName").Value & "', '', 
+                                        '" & 明細表_dgv.Rows(i).Cells("ProductDescription").Value & "', '" & SEASON_cb.Text & "')"
+                        CmdSet_For_dr() : conn.Close()
+                    End If
+                    '-------明細表寫入------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                    ConnOpen()
+                    SQL1 = "INSERT INTO " & 訂單資料表(5) & " (天盾流水號, 客戶訂單號, ItemNumber, ProductName, ProductDescription, Color, DM, [5], [5.5], [6], [6.5], [7], [7.5], [8], [8.5], [9], 
+                                                                [9.5], [10], [10.5], [11], [11.5], [12], [12.5], [13], [14]) 
+                            VALUES ('" & 明細表_dgv.Rows(i).Cells("天盾流水號").Value & "','" & 明細表_dgv.Rows(i).Cells("客戶訂單號").Value & "','" & 明細表_dgv.Rows(i).Cells("ItemNumber").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("ProductName").Value & "','" & 明細表_dgv.Rows(i).Cells("ProductDescription").Value & "','" & 明細表_dgv.Rows(i).Cells("Color").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("DM").Value & "','" & 明細表_dgv.Rows(i).Cells("5").Value & "','" & 明細表_dgv.Rows(i).Cells("5.5").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("6").Value & "','" & 明細表_dgv.Rows(i).Cells("6.5").Value & "','" & 明細表_dgv.Rows(i).Cells("7").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("7.5").Value & "','" & 明細表_dgv.Rows(i).Cells("8").Value & "','" & 明細表_dgv.Rows(i).Cells("8.5").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("9").Value & "','" & 明細表_dgv.Rows(i).Cells("9.5").Value & "','" & 明細表_dgv.Rows(i).Cells("10").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("10.5").Value & "','" & 明細表_dgv.Rows(i).Cells("11").Value & "','" & 明細表_dgv.Rows(i).Cells("11.5").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("12").Value & "','" & 明細表_dgv.Rows(i).Cells("12.5").Value & "','" & 明細表_dgv.Rows(i).Cells("13").Value & "',
+                                    '" & 明細表_dgv.Rows(i).Cells("14").Value & "')"
+                    CmdSet_For_dr() : conn.Close()
+                Next : ProgressBar2.Value = 0 : 最終數1 = 0
+                '-------裝箱控制------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                For i As Integer = 0 To 裝箱控制_dgv.Rows.Count - 1 : 資料數2 = 裝箱控制_dgv.Rows.Count : 進度條2()
+                    ConnOpen()
+                    SQL1 = "INSERT INTO " & 訂單資料表(2) & " (天盾流水號, 客戶訂單號, 力威訂單號, Item, Material, MaterialDescription, Qty, UoM, ProductDescription, IncoTerms, CustomerData, Size, HS, Units1, 
+                                                                 DtyRate, AddOnDty, UnitsCtn, NoCtn, CtnNo, Units2, PLMSeason, ProductID, Stock, StkName, CustStk, CustStkName, CasePack, Colorway, OrderColor, 
+                                                                 Logo, POItemText, FinalCustomerShipTo) 
+                            VALUES ('" & 裝箱控制_dgv.Rows(i).Cells("天盾流水號").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("客戶訂單號").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("力威訂單號").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("Item").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("Material").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("MaterialDescription").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("Qty").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("UoM").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("ProductDescription").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("IncoTerms").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("CustomerData").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("Size").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("HS").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("Units1").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("DtyRate").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("AddOnDty").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("UnitsCtn").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("NoCtn").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("CtnNo").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("Units2").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("PLMSeason").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("ProductID").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("Stock").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("StkName").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("CustStk").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("CustStkName").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("CasePack").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("Colorway").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("OrderColor").Value & "','" & 裝箱控制_dgv.Rows(i).Cells("Logo").Value & "',
+                                    '" & 裝箱控制_dgv.Rows(i).Cells("POItemText").Value & "', '" & 裝箱控制_dgv.Rows(i).Cells("FinalCustomerShipTo").Value & "')"
+                    CmdSet_For_dr() : conn.Close()
+                Next : ProgressBar3.Value = 0 : 最終數2 = 0
+                '-------裝箱明細------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                For i As Integer = 0 To 裝箱明細_dgv.Rows.Count - 1 : 資料數3 = 裝箱明細_dgv.Rows.Count : 進度條3()
+                    ConnOpen()
+                    SQL1 = "INSERT INTO " & 訂單資料表(3) & " (天盾流水號, 客戶訂單號, 力威訂單號, Item, Material, DM, [5], [5.5], [6], [6.5], [7], [7.5], [8], [8.5], [9], [9.5], 
+                                                                 [10], [10.5], [11], [11.5], [12], [12.5], [13], [14]) 
+                            VALUES ('" & 裝箱明細_dgv.Rows(i).Cells("天盾流水號").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("客戶訂單號").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("力威訂單號").Value & "',
+                                    '" & 裝箱明細_dgv.Rows(i).Cells("Item").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("Material").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("DM").Value & "',
+                                    '" & 裝箱明細_dgv.Rows(i).Cells("5").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("5.5").Value & "', '" & 裝箱明細_dgv.Rows(i).Cells("6").Value & "', 
+                                    '" & 裝箱明細_dgv.Rows(i).Cells("6.5").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("7").Value & "', '" & 裝箱明細_dgv.Rows(i).Cells("7.5").Value & "',
+                                    '" & 裝箱明細_dgv.Rows(i).Cells("8").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("8.5").Value & "', '" & 裝箱明細_dgv.Rows(i).Cells("9").Value & "',
+                                    '" & 裝箱明細_dgv.Rows(i).Cells("9.5").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("10").Value & "', '" & 裝箱明細_dgv.Rows(i).Cells("10.5").Value & "',
+                                    '" & 裝箱明細_dgv.Rows(i).Cells("11").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("11.5").Value & "', '" & 裝箱明細_dgv.Rows(i).Cells("12").Value & "',
+                                    '" & 裝箱明細_dgv.Rows(i).Cells("12.5").Value & "','" & 裝箱明細_dgv.Rows(i).Cells("13").Value & "', '" & 裝箱明細_dgv.Rows(i).Cells("14").Value & "')"
+                    CmdSet_For_dr() : conn.Close()
+                Next : ProgressBar4.Value = 0 : 最終數3 = 0
+                '-------清空------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                清空_bt.PerformClick()
+                MsgBox("訂單資料存檔完成")
+                End If
             End If
-        End If
     End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/訂單資料匯入_Vionic.Designer.vb

@@ -142,7 +142,7 @@ Partial Class 訂單資料匯入_Vionic
         Me.TextBox43 = New System.Windows.Forms.TextBox()
         Me.Label27 = New System.Windows.Forms.Label()
         Me.TextBox45 = New System.Windows.Forms.TextBox()
-        Me.CheckBox3 = New System.Windows.Forms.CheckBox()
+        Me.國標測試報告_ch = New System.Windows.Forms.CheckBox()
         Me.Label28 = New System.Windows.Forms.Label()
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1155,15 +1155,15 @@ Partial Class 訂單資料匯入_Vionic
         Me.TextBox45.Size = New System.Drawing.Size(137, 23)
         Me.TextBox45.TabIndex = 702
         '
-        'CheckBox3
+        '國標測試報告_ch
         '
-        Me.CheckBox3.AutoSize = True
-        Me.CheckBox3.Location = New System.Drawing.Point(1534, 135)
-        Me.CheckBox3.Name = "CheckBox3"
-        Me.CheckBox3.Size = New System.Drawing.Size(99, 20)
-        Me.CheckBox3.TabIndex = 704
-        Me.CheckBox3.Text = "國標測試報告"
-        Me.CheckBox3.UseVisualStyleBackColor = True
+        Me.國標測試報告_ch.AutoSize = True
+        Me.國標測試報告_ch.Location = New System.Drawing.Point(1534, 135)
+        Me.國標測試報告_ch.Name = "國標測試報告_ch"
+        Me.國標測試報告_ch.Size = New System.Drawing.Size(99, 20)
+        Me.國標測試報告_ch.TabIndex = 704
+        Me.國標測試報告_ch.Text = "國標測試報告"
+        Me.國標測試報告_ch.UseVisualStyleBackColor = True
         '
         'Label28
         '
@@ -1182,7 +1182,7 @@ Partial Class 訂單資料匯入_Vionic
         Me.AutoScroll = True
         Me.ClientSize = New System.Drawing.Size(1914, 991)
         Me.Controls.Add(Me.Label28)
-        Me.Controls.Add(Me.CheckBox3)
+        Me.Controls.Add(Me.國標測試報告_ch)
         Me.Controls.Add(Me.Label27)
         Me.Controls.Add(Me.TextBox44)
         Me.Controls.Add(Me.TextBox43)
@@ -1429,7 +1429,7 @@ Partial Class 訂單資料匯入_Vionic
     Friend WithEvents TextBox43 As TextBox
     Friend WithEvents Label27 As Label
     Friend WithEvents TextBox45 As TextBox
-    Friend WithEvents CheckBox3 As CheckBox
+    Friend WithEvents 國標測試報告_ch As CheckBox
     Friend WithEvents Label28 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/訂單資料匯入_Vionic.vb

@@ -498,7 +498,7 @@ Public Class 訂單資料匯入_Vionic
                                  "','" & 控制表_dgv.Rows(i).Cells("貼標時間").Value & "','" & 控制表_dgv.Rows(i).Cells("裁斷時間").Value & "','" & 控制表_dgv.Rows(i).Cells("針車時間").Value &
                                  "','" & 控制表_dgv.Rows(i).Cells("成型時間").Value & "','" & 控制表_dgv.Rows(i).Cells("驗貨時間").Value & "','" & 控制表_dgv.Rows(i).Cells("實際離廠日").Value &
                                  "','" & TextBox42.Text & "','1','" & Format(DateTimePicker3.Value, "yyyy/MM/dd") & "','" & Format(DateTimePicker2.Value, "yyyy/MM/dd") &
-                                 "','" & Format(DateTimePicker2.Value, "yyyy/MM/dd") & "','','','', '" & CheckBox3.Checked & "')"
+                                 "','" & Format(DateTimePicker2.Value, "yyyy/MM/dd") & "','','','', '" & 國標測試報告_ch.Checked & "')"
                     CmdSet_For_dr() : conn.Close()
 
                     ConnOpen()
@@ -526,11 +526,11 @@ Public Class 訂單資料匯入_Vionic
 
                 ConnOpen()
                 SQL1 = "INSERT INTO 訂單明細表抬頭 (客戶訂單號, 天盾流水號, ModeOfDelivery, DeliveryTerms, OrgShipDate, FromPort, ToPort, ShippingCarrier, VendorReference, ModifiedDate, " &
-                       "CustomerName, ShipDate, SalesOrder, DeliveryAddress, 下單日, 交期, ETADate, CreatedDate, Brand, CustomerRequisition) " &
+                       "CustomerName, ShipDate, SalesOrder, DeliveryAddress, 下單日, 交期, ETADate, CreatedDate, Brand, CustomerRequisition, 入單型態) " &
                        "VALUES ('" & Number_tb.Text & "','" & 天盾流水號_tb.Text & "','" & ComboBox4.Text & "','" & ComboBox5.Text & "','" & DTP(3) &
                              "','" & ComboBox6.Text & "','" & ComboBox7.Text & "','" & TextBox8.Text & "','" & TextBox9.Text & "','" & DTP(4) &
                              "','" & TextBox10.Text & "','" & DTP(1) & "','" & TextBox11.Text & "','" & TextBox12.Text & "','" & DTP(2) & "','" & DTP(1) &
-                             "','" & DTP(5) & "','" & DTP(6) & "','" & Brand_cb.Text & "','" & TextBox19.Text & "')"
+                             "','" & DTP(5) & "','" & DTP(6) & "','" & Brand_cb.Text & "','" & TextBox19.Text & "', '1')"
                 CmdSet_For_dr() : conn.Close()
 
                 ConnOpen()

TENDEN-MES-SYS/量產訂單管理/訂單資料比對與修改_力威.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>14, 7</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>44</value>
+  </metadata>
+</root>