版本號 : 2021052701

更新內容如下
1、出貨明細表介面新增SIZRUN清單，並取消進入訂單明細表的按鈕。

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

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

@@ -580,3 +580,6 @@ D:\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.xml
 D:\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.pdb
 D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.模具控制表.resources
 D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表八.resources
+C:\Users\user\Desktop\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表八.resources
+C:\Users\user\Desktop\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.模具控制表.resources
+D:\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表八.resources

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

@@ -23,6 +23,7 @@ Partial Class 出貨明細表
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.訂單明細表_dgv = New System.Windows.Forms.DataGridView()
         Me.搜尋_bt = New System.Windows.Forms.Button()
         Me.驗貨報告編號_tb = New System.Windows.Forms.TextBox()
@@ -61,9 +62,15 @@ Partial Class 出貨明細表
         Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
         Me.Label20 = New System.Windows.Forms.Label()
+        Me.明細表_dgv = New System.Windows.Forms.DataGridView()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.客戶訂單號_tb = New System.Windows.Forms.TextBox()
+        Me.天盾訂單號_tb = New System.Windows.Forms.TextBox()
+        Me.Label7 = 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()
+        CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '訂單明細表_dgv
@@ -76,14 +83,14 @@ Partial Class 出貨明細表
         Me.訂單明細表_dgv.Name = "訂單明細表_dgv"
         Me.訂單明細表_dgv.RowHeadersWidth = 5
         Me.訂單明細表_dgv.RowTemplate.Height = 24
-        Me.訂單明細表_dgv.Size = New System.Drawing.Size(1558, 883)
+        Me.訂單明細表_dgv.Size = New System.Drawing.Size(1558, 657)
         Me.訂單明細表_dgv.TabIndex = 2
         '
         '搜尋_bt
         '
         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, 6)
+        Me.搜尋_bt.Location = New System.Drawing.Point(892, 5)
         Me.搜尋_bt.Name = "搜尋_bt"
         Me.搜尋_bt.Size = New System.Drawing.Size(115, 53)
         Me.搜尋_bt.TabIndex = 303
@@ -111,12 +118,13 @@ 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.Black
-        Me.開啟訂單明細表_bt.Location = New System.Drawing.Point(892, 6)
+        Me.開啟訂單明細表_bt.Location = New System.Drawing.Point(1706, 36)
         Me.開啟訂單明細表_bt.Name = "開啟訂單明細表_bt"
         Me.開啟訂單明細表_bt.Size = New System.Drawing.Size(196, 54)
         Me.開啟訂單明細表_bt.TabIndex = 327
         Me.開啟訂單明細表_bt.Text = "開啟訂單明細表"
         Me.開啟訂單明細表_bt.UseVisualStyleBackColor = True
+        Me.開啟訂單明細表_bt.Visible = False
         '
         '驗貨報告_pb
         '
@@ -389,7 +397,7 @@ 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, 6)
+        Me.列印成EXCEL_bt.Location = New System.Drawing.Point(1010, 5)
         Me.列印成EXCEL_bt.Name = "列印成EXCEL_bt"
         Me.列印成EXCEL_bt.Size = New System.Drawing.Size(115, 53)
         Me.列印成EXCEL_bt.TabIndex = 544
@@ -398,7 +406,7 @@ Partial Class 出貨明細表
         '
         '資料庫選擇2_bt
         '
-        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(1219, 62)
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(263, 62)
         Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
         Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
         Me.資料庫選擇2_bt.TabIndex = 547
@@ -407,7 +415,7 @@ Partial Class 出貨明細表
         '
         '資料庫選擇1_bt
         '
-        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(1141, 62)
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(185, 62)
         Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
         Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
         Me.資料庫選擇1_bt.TabIndex = 546
@@ -417,17 +425,71 @@ Partial Class 出貨明細表
         'Label20
         '
         Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(1098, 61)
+        Me.Label20.Location = New System.Drawing.Point(142, 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) & "單品牌"
         '
+        '明細表_dgv
+        '
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.明細表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.明細表_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.明細表_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.明細表_dgv.Location = New System.Drawing.Point(344, 782)
+        Me.明細表_dgv.Name = "明細表_dgv"
+        Me.明細表_dgv.RowHeadersWidth = 5
+        Me.明細表_dgv.RowTemplate.Height = 24
+        Me.明細表_dgv.Size = New System.Drawing.Size(1558, 204)
+        Me.明細表_dgv.TabIndex = 548
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(344, 759)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(77, 16)
+        Me.Label6.TabIndex = 550
+        Me.Label6.Text = "CLIENT PO#"
+        '
+        '客戶訂單號_tb
+        '
+        Me.客戶訂單號_tb.Location = New System.Drawing.Point(428, 756)
+        Me.客戶訂單號_tb.Name = "客戶訂單號_tb"
+        Me.客戶訂單號_tb.Size = New System.Drawing.Size(130, 23)
+        Me.客戶訂單號_tb.TabIndex = 549
+        '
+        '天盾訂單號_tb
+        '
+        Me.天盾訂單號_tb.ForeColor = System.Drawing.Color.Black
+        Me.天盾訂單號_tb.Location = New System.Drawing.Point(656, 756)
+        Me.天盾訂單號_tb.Name = "天盾訂單號_tb"
+        Me.天盾訂單號_tb.Size = New System.Drawing.Size(130, 23)
+        Me.天盾訂單號_tb.TabIndex = 551
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(564, 759)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(90, 16)
+        Me.Label7.TabIndex = 552
+        Me.Label7.Text = "Tendenza Po#"
+        '
         '出貨明細表
         '
         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.天盾訂單號_tb)
+        Me.Controls.Add(Me.Label7)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.客戶訂單號_tb)
+        Me.Controls.Add(Me.明細表_dgv)
         Me.Controls.Add(Me.資料庫選擇2_bt)
         Me.Controls.Add(Me.資料庫選擇1_bt)
         Me.Controls.Add(Me.Label20)
@@ -473,6 +535,7 @@ Partial Class 出貨明細表
         CType(Me.訂單明細表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.驗貨報告圖庫_pb, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -516,5 +579,10 @@ Partial Class 出貨明細表
     Friend WithEvents 資料庫選擇2_bt As Button
     Friend WithEvents 資料庫選擇1_bt As Button
     Friend WithEvents Label20 As Label
+    Friend WithEvents 明細表_dgv As DataGridView
+    Friend WithEvents Label6 As Label
+    Friend WithEvents 客戶訂單號_tb As TextBox
+    Friend WithEvents 天盾訂單號_tb As TextBox
+    Friend WithEvents Label7 As Label
 End Class
 

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

@@ -1,7 +1,7 @@
 Option Strict Off
 Imports System.IO
 Public Class 出貨明細表
-    ReadOnly ds As New DataSet
+    ReadOnly ds, ds2 As New DataSet
     Dim kkk1 As String : Dim kkk2 As String : Dim kkk3 As String : Dim kkk4 As String : Dim kkk5 As String : Dim kkk6 As String
     Private Sub Set_DGV1載入前設定()
         訂單明細表_dgv.DataSource = Nothing : ds.Clear()
@@ -27,6 +27,12 @@ Public Class 出貨明細表
                             貨款匯入出款明細表.楦型 = " & 訂單資料表(1) & ".楦型 AND 
                             貨款匯入出款明細表.形體號 = " & 訂單資料表(1) & ".形體號 AND 
                             貨款匯入出款明細表.訂單流水號 = " & 訂單資料表(1) & ".訂單流水號 " & kkk1 & kkk2 & kkk3 & kkk4 & kkk5 & kkk6 & "
+                   GROUP BY 貨款匯入出款明細表.貨款流水號, 貨款匯入出款明細表.訂單流水號, 貨款匯入出款明細表.年份季度, 
+                            貨款匯入出款明細表.客戶訂單號, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
+                            貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 
+                            " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, 
+                            " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 貨款匯入出款明細表.實際離廠日, 
+                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片, " & 訂單資料表(1) & ".TVW
                     ORDER BY   貨款匯入出款明細表.訂單流水號 DESC, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
                             貨款匯入出款明細表.楦型"
         Else
@@ -43,6 +49,12 @@ Public Class 出貨明細表
                             貨款匯入出款明細表.訂單流水號 = " & 訂單資料表(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 & "%') 
+                   GROUP BY 貨款匯入出款明細表.貨款流水號, 貨款匯入出款明細表.訂單流水號, 貨款匯入出款明細表.年份季度, 
+                            貨款匯入出款明細表.客戶訂單號, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
+                            貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 
+                            " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, 
+                            " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 貨款匯入出款明細表.實際離廠日, 
+                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片, " & 訂單資料表(1) & ".TVW
                     ORDER BY   貨款匯入出款明細表.訂單流水號 DESC, 貨款匯入出款明細表.形體號, 貨款匯入出款明細表.顏色, 
                             貨款匯入出款明細表.楦型"
         End If
@@ -65,6 +77,49 @@ Public Class 出貨明細表
         訂單明細表_dgv.Columns(13).FillWeight = 80 : 訂單明細表_dgv.Columns(14).FillWeight = 80 : 訂單明細表_dgv.Columns(15).FillWeight = 90
         訂單明細表_dgv.Columns(16).Visible = False : 訂單明細表_dgv.Columns(17).Visible = False
     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 ComboBox1下拉表單資料載入()
         conn1.Close()
         If conn1.State = ConnectionState.Closed Then : conn1.ConnectionString = ConString : conn1.Open() : End If
@@ -111,6 +166,8 @@ Public Class 出貨明細表
         If e.RowIndex = -1 Then : Else
             驗貨報告編號_tb.Text = 訂單明細表_dgv(1, e.RowIndex).Value.ToString
             明細是否建檔_cb.Checked = 訂單明細表_dgv(15, e.RowIndex).Value.ToString
+            天盾訂單號_tb.Text = 訂單明細表_dgv("訂單流水號", e.RowIndex).Value.ToString
+            客戶訂單號_tb.Text = 訂單明細表_dgv("客戶訂單號", e.RowIndex).Value.ToString
             If 明細是否建檔_cb.Checked = False Then : 開啟訂單明細表_bt.Enabled = False : Else : 開啟訂單明細表_bt.Enabled = True : End If
 
             If 訂單明細表_dgv(5, e.RowIndex).Value = "" Then
@@ -163,6 +220,7 @@ Public Class 出貨明細表
             conn.Close() : 驗貨報告圖庫_pb.SizeMode = 4
 
             驗貨報告 = 訂單明細表_dgv(16, e.RowIndex).Value.ToString
+            Set_訂單明細()
         End If
     End Sub
     Private Sub DataGridView1_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 訂單明細表_dgv.RowPostPaint

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

@@ -14,6 +14,7 @@ Public Class 列印_周進度表
     Dim xlApp As Application
     Dim xlBook As Workbook
     Dim xlSheet As Worksheet
+    Dim PID As String
     Public Property ThisWorkbook As Object
     Public Property ActiveWorkbook As Object
     Dim N1 As Integer = 0
@@ -79,6 +80,7 @@ Public Class 列印_周進度表
             xlSheet.Cells(i + 4, 14) = DataGridView1.Rows(i).Cells("Lasting").Value
             xlSheet.Cells(i + 4, 15) = DataGridView1.Rows(i).Cells("Special_Packaging").Value
             xlSheet.Cells(i + 4, 16) = DataGridView1.Rows(i).Cells("Remarks").Value
+
             With xlApp.Selection
                 .Font.Bold = True
             End With
@@ -92,6 +94,16 @@ Public Class 列印_周進度表
         Set_格式設定()
     End Sub
     Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click
+        If 訂單資料庫選擇.品牌V_R判斷 = "V" Then
+            PID = "VIONIC and VOLIN'L"
+        ElseIf 訂單資料庫選擇.品牌V_R判斷 = "R" Then
+            PID = "DRS / LIF"
+        End If
+        If 周進度表.品牌V_R判斷 = "V" Then
+            PID = "VIONIC and VOLIN'L"
+        ElseIf 周進度表.品牌V_R判斷 = "R" Then
+            PID = "DRS / LIF"
+        End If
         xlApp = CType(CreateObject("Excel.Application"), Application)
         xlApp.Visible = True
         xlApp.DisplayAlerts = True
@@ -110,7 +122,7 @@ Public Class 列印_周進度表
         xlSheet.Activate()
         OPEXC(0) = True : OPEXC(1) = False : OPEXC(2) = False : OPEXC(3) = False
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         xlSheet = NewMethod(xlBook)
@@ -125,7 +137,7 @@ Public Class 列印_周進度表
         xlSheet.Activate()
         OPEXC(0) = False : OPEXC(1) = True : OPEXC(2) = False : OPEXC(3) = False
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 1) = "JH" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 1) = "JH" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         xlSheet = NewMethod(xlBook)
@@ -140,7 +152,7 @@ Public Class 列印_周進度表
         xlSheet.Activate()
         OPEXC(0) = False : OPEXC(1) = False : OPEXC(2) = True : OPEXC(3) = False
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 1) = "SK" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 1) = "SK" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         xlSheet = NewMethod(xlBook)
@@ -155,7 +167,7 @@ Public Class 列印_周進度表
         xlSheet.Activate()
         OPEXC(0) = False : OPEXC(1) = False : OPEXC(2) = False : OPEXC(3) = True
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 1) = "NJ" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 1) = "NJ" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         If xlApp.Sheets(5).Name = "工作表1" Then

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

@@ -14,6 +14,7 @@ Public Class 列印_周進度表T1_T4
     Dim xlApp As Application
     Dim xlBook As Workbook
     Dim xlSheet As Worksheet
+    Dim PID As String
     Public Property ThisWorkbook As Object
     Public Property ActiveWorkbook As Object
     Dim N1 As Integer = 0
@@ -104,6 +105,16 @@ Public Class 列印_周進度表T1_T4
         Set_格式設定()
     End Sub
     Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click
+        If 訂單資料庫選擇.品牌V_R判斷 = "V" Then
+            PID = "VIONIC and VOLIN'L"
+        ElseIf 訂單資料庫選擇.品牌V_R判斷 = "R" Then
+            PID = "DRS / LIF"
+        End If
+        If 周進度表T1_T4.品牌V_R判斷 = "V" Then
+            PID = "VIONIC and VOLIN'L"
+        ElseIf 周進度表T1_T4.品牌V_R判斷 = "R" Then
+            PID = "DRS / LIF"
+        End If
         xlApp = CType(CreateObject("Excel.Application"), Application)
         xlApp.Visible = True
         xlApp.DisplayAlerts = True
@@ -116,7 +127,7 @@ Public Class 列印_周進度表T1_T4
         xlSheet.Activate()
         OPEXC(0) = True : OPEXC(1) = False : OPEXC(2) = False : OPEXC(3) = False
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 15) = "Date : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         xlSheet = NewMethod(xlBook)
@@ -125,7 +136,7 @@ Public Class 列印_周進度表T1_T4
         xlSheet.Activate()
         OPEXC(0) = False : OPEXC(1) = True : OPEXC(2) = False : OPEXC(3) = False
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 1) = "JH" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 1) = "JH" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         xlSheet = NewMethod(xlBook)
@@ -134,7 +145,7 @@ Public Class 列印_周進度表T1_T4
         xlSheet.Activate()
         OPEXC(0) = False : OPEXC(1) = False : OPEXC(2) = True : OPEXC(3) = False
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 1) = "SK" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 1) = "SK" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         xlSheet = NewMethod(xlBook)
@@ -143,7 +154,7 @@ Public Class 列印_周進度表T1_T4
         xlSheet.Activate()
         OPEXC(0) = False : OPEXC(1) = False : OPEXC(2) = False : OPEXC(3) = True
         xlSheet.Range("A1").Select()
-        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for VIONIC and VOLINT'L" : xlSheet.Cells(2, 1) = "NJ" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
+        xlSheet.Cells(1, 1) = "Weekly Prod Schedule for " & PID & "" : xlSheet.Cells(2, 1) = "NJ" : xlSheet.Cells(2, 15) = "DATE : " : xlSheet.Cells(2, 16) = "=Today()"
         Set_循環列印()
         '----------------------------------------------------------------------------------------------------------------------
         xlApp.Sheets(5).Delete

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

@@ -13,6 +13,8 @@ Public Class 列印_生產進度表
     Dim xlApp As Application
     Dim xlBook As Workbook
     Dim xlSheet As Worksheet
+    Dim PID As String
+    Public 品牌V_R判斷 As String = ""
     Public Property ThisWorkbook As Object
     Public Property ActiveWorkbook As Object
     Dim N1 As Integer = 0
@@ -91,11 +93,24 @@ Public Class 列印_生產進度表
             CheckBox7.Visible = True
         Else
             CheckBox7.Visible = False
+
         End If
     End Sub
     Private Sub 列印_生產進度表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormBorderStyle = FormBorderStyle.SizableToolWindow : ControlBox = False
         Set_格式設定()
+        If 訂單資料庫選擇.品牌V_R判斷 = "V" Then
+            PID = "VIONIC and VOLIN'L"
+        ElseIf 訂單資料庫選擇.品牌V_R判斷 = "R" Then
+            PID = "DRS / LIF"
+        End If
+        If 生產進度表.品牌V_R判斷 = "V" Then
+            PID = "VIONIC and VOLIN'L"
+        ElseIf 生產進度表.品牌V_R判斷 = "R" Then
+            PID = "DRS / LIF"
+        End If
+
+
     End Sub
     Private Sub Button11_Click(sender As Object, e As EventArgs) Handles 確認列印_bt.Click
         xlApp = CType(CreateObject("Excel.Application"), Application)
@@ -129,13 +144,13 @@ Public Class 列印_生產進度表
         xlBook.Activate()
         xlSheet.Activate()
         xlSheet.Range("A1").Select()
-        If CheckBox7.Checked = True Then : xlSheet.Cells(1, 1) = "VIONIC W'S大貨進度表"
-        ElseIf NJ_cb.Checked = True Then : xlSheet.Cells(1, 1) = "VIONIC W'S大貨進度表(楠晋)"
-        ElseIf SK_cb.Checked = True Then : xlSheet.Cells(1, 1) = "VIONIC W'S大貨進度表(森康)"
-        ElseIf JH_cb.Checked = True Then : xlSheet.Cells(1, 1) = "VIONIC W'S大貨進度表(玖弘)"
-        ElseIf CheckBox4.Checked = True Then : xlSheet.Cells(1, 1) = "VIONIC W'S大貨進度表(玖弘-QVC)"
-        ElseIf CheckBox5.Checked = True Then : xlSheet.Cells(1, 1) = "VIONIC W'S大貨進度表(森康-QVC)"
-        ElseIf CheckBox6.Checked = True Then : xlSheet.Cells(1, 1) = "VIONIC W'S大貨進度表(楠晋-QVC)"
+        If CheckBox7.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & "  大貨進度表"
+        ElseIf NJ_cb.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(楠晋)"
+        ElseIf SK_cb.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(森康)"
+        ElseIf JH_cb.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(玖弘)"
+        ElseIf CheckBox4.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(玖弘-QVC)"
+        ElseIf CheckBox5.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(森康-QVC)"
+        ElseIf CheckBox6.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(楠晋-QVC)"
         End If
         xlSheet.Cells(1, 30) = "淺藍色欄位為系統輸出，請勿做任何更改"
         xlSheet.Cells(2, 13) = "樣品SIZE(60天)" : xlSheet.Cells(2, 17) = "全套SIZE(45天)" : xlSheet.Cells(2, 21) = "PRODUCTION(30天)"

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

@@ -20,7 +20,7 @@ Public Class 列印_訂單明細表
         清單_dgv.ColumnHeadersHeight = 25
         清單_dgv.AllowUserToAddRows = False
         ConnOpen()
-        SQL1 = "SELECT      " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, 
+        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], 
@@ -95,7 +95,7 @@ Public Class 列印_訂單明細表
 
         For i As Integer = 0 To 清單_dgv.Rows.Count - 1
             xlSheet.Cells(i + 3, 1) = 清單_dgv.Rows(i).Cells("訂單流水號").Value
-            xlSheet.Cells(i + 3, 2) = 清單_dgv.Rows(i).Cells("客戶訂單號").Value
+            xlSheet.Cells(i + 3, 2) = 清單_dgv.Rows(i).Cells("力威訂單號").Value
             xlSheet.Cells(i + 3, 3) = 清單_dgv.Rows(i).Cells("ItemNumber").Value
             xlSheet.Cells(i + 3, 4) = 清單_dgv.Rows(i).Cells("ProductName").Value
             xlSheet.Cells(i + 3, 5) = 清單_dgv.Rows(i).Cells("Color").Value

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

@@ -6,6 +6,7 @@ Public Class 周進度表
     ReadOnly xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
     Dim file_name As String = "" : Public 平均數 As Integer : Public 最終數 As Integer = 0 : Public 資料數 As Integer = 0
+    Public 品牌V_R判斷 As String = ""
     Private Sub Set_訂單清單()
         訂單種類_dgv.DataSource = Nothing : ds.Clear()
         訂單種類_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -34,6 +35,7 @@ Public Class 周進度表
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (力威訂單號 LIKE '%" & PA & "%') " &
                          "ORDER BY   訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
         End If
+
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單種類_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_grid()
@@ -299,10 +301,10 @@ Public Class 周進度表
         驗貨報告圖片_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()
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid() : 品牌V_R判斷 = "V"
     End Sub
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
-        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid()
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid() : 品牌V_R判斷 = "R"
     End Sub
     Private Sub 進度條()
         平均數 = 10000 / 資料數

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

@@ -2,6 +2,7 @@
 Imports System.IO
 Public Class 周進度表T1_T4
     ReadOnly ds As New DataSet
+    Public 品牌V_R判斷 As String = ""
     Private Sub Set_訂單清單()
         訂單清單_dgv.DataSource = Nothing : ds.Clear()
         訂單清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -167,9 +168,9 @@ Public Class 周進度表T1_T4
         驗貨報告圖片_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()
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid() : 品牌V_R判斷 = "V"
     End Sub
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
-        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid()
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid() : 品牌V_R判斷 = "R"
     End Sub
 End Class

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

@@ -7,6 +7,7 @@ Public Class 生產進度表
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
     Dim file_name As String = ""
     ReadOnly BB(3) As Boolean
+    Public 品牌V_R判斷 As String = ""
     Private Sub Set_DGV1載入前設定()
         訂單清單_dgv.DataSource = Nothing : ds.Clear()
         訂單清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -281,9 +282,9 @@ Public Class 生產進度表
         驗貨報告圖庫_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()
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid() : 品牌V_R判斷 = "V"
     End Sub
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
-        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid()
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單() : Set_grid() : 品牌V_R判斷 = "R"
     End Sub
 End Class

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

@@ -1125,6 +1125,7 @@ Partial Class 訂單控制表
         Me.修改PO_bt.TabIndex = 339
         Me.修改PO_bt.Text = "修改PO#"
         Me.修改PO_bt.UseVisualStyleBackColor = True
+        Me.修改PO_bt.Visible = False
         '
         'CheckBox10
         '
@@ -1730,10 +1731,10 @@ Partial Class 訂單控制表
         'SplitContainer1.Panel2
         '
         Me.SplitContainer1.Panel2.AutoScroll = True
-        Me.SplitContainer1.Panel2.Controls.Add(Me.資訊_gb)
         Me.SplitContainer1.Panel2.Controls.Add(Me.裝箱控制表_dgv)
         Me.SplitContainer1.Panel2.Controls.Add(Me.明細表_dgv)
         Me.SplitContainer1.Panel2.Controls.Add(Me.裝箱明細_dgv)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.資訊_gb)
         Me.SplitContainer1.Size = New System.Drawing.Size(1900, 695)
         Me.SplitContainer1.SplitterDistance = 454
         Me.SplitContainer1.TabIndex = 753
@@ -1753,6 +1754,9 @@ Partial Class 訂單控制表
         '
         '資訊_gb
         '
+        Me.資訊_gb.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.資訊_gb.Controls.Add(Me.TT23_lb)
         Me.資訊_gb.Controls.Add(Me.Label49)
         Me.資訊_gb.Controls.Add(Me.Label48)
@@ -1807,7 +1811,7 @@ Partial Class 訂單控制表
         Me.資訊_gb.Controls.Add(Me.BB04_lb)
         Me.資訊_gb.Location = New System.Drawing.Point(475, 2)
         Me.資訊_gb.Name = "資訊_gb"
-        Me.資訊_gb.Size = New System.Drawing.Size(1394, 227)
+        Me.資訊_gb.Size = New System.Drawing.Size(1418, 227)
         Me.資訊_gb.TabIndex = 766
         Me.資訊_gb.TabStop = False
         Me.資訊_gb.Text = "裝箱資訊"

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

@@ -1622,7 +1622,7 @@ Public Class 訂單控制表
             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 客戶流水號 = '" & 客戶訂單號_tb.Text & "' WHERE (天盾訂單號 LIKE '" & 天盾訂單號_tb.Text & "')"
+            SQL1 = "UPDATE " & 訂單資料表(7) & " SET 客戶流水號 = '" & 客戶訂單號_tb.Text & "' WHERE (天盾訂單號 LIKE '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             MsgBox("修改完成")
         End If

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

@@ -1,13 +1,14 @@
 Public Class 訂單資料庫選擇
+    Public 品牌V_R判斷 As String = ""
     Private Sub 訂單資料庫選擇_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormBorderStyle = FormBorderStyle.SizableToolWindow
     End Sub
     Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
-        SQL_訂單資料表選擇_VIONIC()
+        SQL_訂單資料表選擇_VIONIC() : 品牌V_R判斷 = "V"
         Me.Close()
     End Sub
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
-        SQL_訂單資料表選擇_非VIONIC()
+        SQL_訂單資料表選擇_非VIONIC() : 品牌V_R判斷 = "R"
         Me.Close()
     End Sub
 End Class

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

@@ -569,7 +569,7 @@ Public Class 訂單資料比對與修改_力威
         DR19.HeaderText = "11" : DR19.Name = "11" : 裝箱明細_dgv.Columns.Insert(18, DR19) : DR20.HeaderText = "11.5" : DR20.Name = "11.5" : 裝箱明細_dgv.Columns.Insert(19, DR20)
         DR21.HeaderText = "12" : DR21.Name = "12" : 裝箱明細_dgv.Columns.Insert(20, DR21) : DR22.HeaderText = "12.5" : DR22.Name = "12.5" : 裝箱明細_dgv.Columns.Insert(21, DR22)
         DR23.HeaderText = "13" : DR23.Name = "13" : 裝箱明細_dgv.Columns.Insert(22, DR23) : DR24.HeaderText = "14" : DR24.Name = "14" : 裝箱明細_dgv.Columns.Insert(23, DR24)
-        DR25.HeaderText = "CustAssign" : DR25.Name = "CustAssign" : 裝箱明細_dgv.Columns.Insert(23, DR25)
+        DR25.HeaderText = "CustAssign" : DR25.Name = "CustAssign" : 裝箱明細_dgv.Columns.Insert(24, DR25)
         裝箱明細_dgv.Columns(0).FillWeight = 100 : 裝箱明細_dgv.Columns(1).FillWeight = 100 : 裝箱明細_dgv.Columns(2).FillWeight = 100 : 裝箱明細_dgv.Columns(3).FillWeight = 100
         裝箱明細_dgv.Columns(4).FillWeight = 80 : 裝箱明細_dgv.Columns(5).FillWeight = 60 : 裝箱明細_dgv.Columns(6).FillWeight = 50 : 裝箱明細_dgv.Columns(7).FillWeight = 50
         裝箱明細_dgv.Columns(8).FillWeight = 50 : 裝箱明細_dgv.Columns(9).FillWeight = 50 : 裝箱明細_dgv.Columns(10).FillWeight = 50 : 裝箱明細_dgv.Columns(11).FillWeight = 50
@@ -601,14 +601,14 @@ Public Class 訂單資料比對與修改_力威
         DK19.HeaderText = "11" : DK19.Name = "11" : 裝箱明細3_dgv.Columns.Insert(18, DK19) : DK20.HeaderText = "11.5" : DK20.Name = "11.5" : 裝箱明細3_dgv.Columns.Insert(19, DK20)
         DK21.HeaderText = "12" : DK21.Name = "12" : 裝箱明細3_dgv.Columns.Insert(20, DK21) : DK22.HeaderText = "12.5" : DK22.Name = "12.5" : 裝箱明細3_dgv.Columns.Insert(21, DK22)
         DK23.HeaderText = "13" : DK23.Name = "13" : 裝箱明細3_dgv.Columns.Insert(22, DK23) : DK24.HeaderText = "14" : DK24.Name = "14" : 裝箱明細3_dgv.Columns.Insert(23, DK24)
-        DK25.HeaderText = "CustAssign" : DK25.Name = "CustAssign" : 裝箱明細3_dgv.Columns.Insert(23, DK25)
+        DK25.HeaderText = "CustAssign" : DK25.Name = "CustAssign" : 裝箱明細3_dgv.Columns.Insert(24, DK25)
         裝箱明細3_dgv.Columns(0).FillWeight = 110 : 裝箱明細3_dgv.Columns(1).FillWeight = 110 : 裝箱明細3_dgv.Columns(2).FillWeight = 110
         裝箱明細3_dgv.Columns(3).FillWeight = 90 : 裝箱明細3_dgv.Columns(4).FillWeight = 190 : 裝箱明細3_dgv.Columns(5).FillWeight = 80
         裝箱明細3_dgv.Columns(6).FillWeight = 40 : 裝箱明細3_dgv.Columns(7).FillWeight = 40 : 裝箱明細3_dgv.Columns(8).FillWeight = 40 : 裝箱明細3_dgv.Columns(9).FillWeight = 40
         裝箱明細3_dgv.Columns(10).FillWeight = 40 : 裝箱明細3_dgv.Columns(11).FillWeight = 40 : 裝箱明細3_dgv.Columns(12).FillWeight = 40 : 裝箱明細3_dgv.Columns(13).FillWeight = 40
         裝箱明細3_dgv.Columns(14).FillWeight = 40 : 裝箱明細3_dgv.Columns(15).FillWeight = 40 : 裝箱明細3_dgv.Columns(16).FillWeight = 40 : 裝箱明細3_dgv.Columns(17).FillWeight = 40
         裝箱明細3_dgv.Columns(18).FillWeight = 40 : 裝箱明細3_dgv.Columns(19).FillWeight = 40 : 裝箱明細3_dgv.Columns(20).FillWeight = 40 : 裝箱明細3_dgv.Columns(21).FillWeight = 40
-        裝箱明細3_dgv.Columns(22).FillWeight = 40 : 裝箱明細3_dgv.Columns(23).FillWeight = 40 : 裝箱明細3_dgv.Columns(25).FillWeight = 80
+        裝箱明細3_dgv.Columns(22).FillWeight = 40 : 裝箱明細3_dgv.Columns(23).FillWeight = 40 : 裝箱明細3_dgv.Columns(24).FillWeight = 80
         填入0值2_1()
     End Sub
     Private Sub 抬頭清單_dgv_CellClick(ByVal sender As Object, ByVal e As DataGridViewCellEventArgs) Handles 抬頭清單_dgv.CellClick