版本號 : 2021030501

更新內容如下
1、驗貨報告入系統新增51訂單號可查詢
2、形體號管理介面的新增按鈕修正成詢問是否新增資料，不再使用清除按鈕後再新增。
3、生產進度表列印後無51訂單號BUG修正。
4、力威訂單比對修改的介面優化可以用51訂單號查詢。
5、周進度表優化可以用51訂單號查詢。
6、訂單控制表列印新增Company Code

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

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

@@ -16,7 +16,7 @@ Public Class 驗貨報告圖片導入資料庫
     End Sub
     Private  Sub Set_清單1()
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片 FROM " & 訂單資料表(1) & " 
+        SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片, 力威訂單號 FROM " & 訂單資料表(1) & " 
                 WHERE (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (驗貨時間 LIKE '') ORDER BY   SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
         Set_DGV1載入後設定()
     End Sub
@@ -47,7 +47,8 @@ Public Class 驗貨報告圖片導入資料庫
         Set_DGV1載入前設定()
         SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片 FROM " & 訂單資料表(1) & " " &
                "WHERE (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (驗貨時間 LIKE '') AND (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR " &
-               "客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%') ORDER BY   SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
+               "客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%' OR 力威訂單號 LIKE '%" & PA & "%') 
+               ORDER BY   SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
         Set_DGV1載入後設定() : Set_grid1()
         PA = ""
     End Sub

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

@@ -159,7 +159,6 @@ Public Class TENDENZA_STYLE_資料管理
         Set_TENDENZASTYLE清單() : Set_grid1()
         Set_清單1() : Set_grid3() : Set_清單2() : Set_grid4() : Set_清單3() : Set_grid5()
         型體數1_tb.Text = 订单形體號清单_dgv.Rows.Count : 型體數2_tb.Text = 订单形體號清单1_dgv.Rows.Count : 型體數3_tb.Text = 订单形體號清单2_dgv.Rows.Count
-        新增_bt.Enabled = False
         If CC(69) = True Then : 刪除_bt.Enabled = True : Else : 刪除_bt.Enabled = False : End If
     End Sub
     Private Sub Button6_Click(sender As Object, e As EventArgs) Handles 更新分析資料_bt.Click
@@ -268,61 +267,63 @@ 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
-            ConnOpen()
-            SQL1 = "SELECT 形體號 FROM 訂單控制表形體號清單 WHERE 形體號 LIKE '" & 形體名稱_tb.Text & "'"
-            CmdSet_For_dr()
-            If dr.Read() Then
-                OO = True : MsgBox("資料重複") : conn.Close() : Exit Sub
-            Else
-                OO = False
-            End If : conn.Close()
-
-            If OO = False Then
+        Dim AA = MsgBox("確定要新增資料?", MsgBoxStyle.OkCancel)
+        If AA = MsgBoxResult.Ok Then
+            If 形體名稱_tb.Text <> "" And 形體號_bt.Text <> "" And 季節_bt.Text <> "" Then
                 ConnOpen()
-                SQL1 = "INSERT INTO 訂單控制表形體號清單 (形體號) VALUES ('" & 形體名稱_tb.Text & "')"
-                CmdSet_For_dr() : conn.Close()
-            End If
+                SQL1 = "SELECT 形體號 FROM 訂單控制表形體號清單 WHERE 形體號 LIKE '" & 形體名稱_tb.Text & "'"
+                CmdSet_For_dr()
+                If dr.Read() Then
+                    OO = True : MsgBox("資料重複") : conn.Close() : Exit Sub
+                Else
+                    OO = False
+                End If : conn.Close()
 
-            ConnOpen()
-            SQL1 = "SELECT ProductName FROM STYLELIST WHERE ProductName LIKE '" & 形體名稱_tb.Text & "'"
-            CmdSet_For_dr()
-            If dr.Read() Then
-                OO = True
-            Else
-                OO = False
-            End If : conn.Close()
+                If OO = False Then
+                    ConnOpen()
+                    SQL1 = "INSERT INTO 訂單控制表形體號清單 (形體號) VALUES ('" & 形體名稱_tb.Text & "')"
+                    CmdSet_For_dr() : conn.Close()
+                End If
 
-            If OO = False Then
-                ConnOpen()
-                SQL1 = "INSERT INTO STYLELIST ( ItemNumber, ProductName, Style, Description, 建立季節) " &
-                       "VALUES ('" & 项目编号_tb.Text & "', '" & 形體名稱_tb.Text & "', '" & 形體號_bt.Text & "', '" & 描述_tb.Text & "', '" & 季節_bt.Text & "')"
-                CmdSet_For_dr() : conn.Close()
-            End If
-            If 形體號_bt.Text = "" Then
-            Else
                 ConnOpen()
-                SQL1 = "SELECT 形體號 FROM 訂單控制表TVW清單 WHERE 形體號 LIKE '" & 形體號_bt.Text & "'"
+                SQL1 = "SELECT ProductName FROM STYLELIST WHERE ProductName LIKE '" & 形體名稱_tb.Text & "'"
                 CmdSet_For_dr()
                 If dr.Read() Then
-                    OO = True : MsgBox("新增完成") : Set_TENDENZASTYLE清單() : Set_grid1() : conn.Close() : Exit Sub
+                    OO = True
                 Else
                     OO = False
                 End If : conn.Close()
 
                 If OO = False Then
                     ConnOpen()
-                    SQL1 = "INSERT INTO 訂單控制表TVW清單 (形體號) VALUES ('" & 形體號_bt.Text & "')"
+                    SQL1 = "INSERT INTO STYLELIST ( ItemNumber, ProductName, Style, Description, 建立季節) " &
+                           "VALUES ('" & 项目编号_tb.Text & "', '" & 形體名稱_tb.Text & "', '" & 形體號_bt.Text & "', '" & 描述_tb.Text & "', '" & 季節_bt.Text & "')"
                     CmdSet_For_dr() : conn.Close()
                 End If
-            End If
+                If 形體號_bt.Text = "" Then
+                Else
+                    ConnOpen()
+                    SQL1 = "SELECT 形體號 FROM 訂單控制表TVW清單 WHERE 形體號 LIKE '" & 形體號_bt.Text & "'"
+                    CmdSet_For_dr()
+                    If dr.Read() Then
+                        OO = True : MsgBox("新增完成") : Set_TENDENZASTYLE清單() : Set_grid1() : conn.Close() : Exit Sub
+                    Else
+                        OO = False
+                    End If : conn.Close()
 
-            Set_TENDENZASTYLE清單() : Set_grid1()
-            MsgBox("新增完成")
-        Else
-            MsgBox("型體建立季節/Product Name/型體號碼 不可空白")
+                    If OO = False Then
+                        ConnOpen()
+                        SQL1 = "INSERT INTO 訂單控制表TVW清單 (形體號) VALUES ('" & 形體號_bt.Text & "')"
+                        CmdSet_For_dr() : conn.Close()
+                    End If
+                End If
+
+                Set_TENDENZASTYLE清單() : Set_grid1()
+                MsgBox("新增完成")
+            Else
+                MsgBox("型體建立季節/Product Name/型體號碼 不可空白")
+            End If
         End If
-        新增_bt.Enabled = False
     End Sub
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles 修改_bt.Click
         If 形體名稱_tb.Text <> "" Then
@@ -407,7 +408,7 @@ 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 = ""
     End Sub
     Private Sub TextBox5_TextChanged(sender As Object, e As EventArgs) Handles 季節_bt.TextChanged
         If CC(68) = True Then

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

@@ -26,61 +26,61 @@ Public Class 列印_生產進度表
             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 " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, 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, " &
                    "長期試穿, CFMSAMPLE AS CFM, TRIAL3, TRIAL4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, 針車時間 AS 針車, 成型時間 AS 成型, " &
-                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 工廠進度表備註2 AS 備註2, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號, Special_Packaging, Remarks FROM " & 訂單資料表(1) & " " &
                    "WHERE ((CXL = 0) OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'JH') AND 訂單種類 LIKE '%QVC%'  ORDER BY   訂單流水號, 客戶交期, 形體號, 顏色, 楦型"
         End If
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
@@ -145,7 +145,7 @@ Public Class 列印_生產進度表
         xlSheet.Cells(3, 16) = "WEAR TEST" : xlSheet.Cells(3, 17) = "CFM" : xlSheet.Cells(3, 18) = "T3" : xlSheet.Cells(3, 19) = "T4" : xlSheet.Cells(3, 20) = "TEST"
         xlSheet.Cells(3, 21) = "面料" : xlSheet.Cells(3, 22) = "副料" : xlSheet.Cells(3, 23) = "中底" : xlSheet.Cells(3, 24) = "鞋墊" : xlSheet.Cells(3, 25) = "大底"
         xlSheet.Cells(3, 26) = "跟" : xlSheet.Cells(3, 27) = "包裝" : xlSheet.Cells(3, 28) = "裁斷" : xlSheet.Cells(3, 29) = "針車" : xlSheet.Cells(3, 30) = "成型"
-        xlSheet.Cells(3, 31) = "驗貨" : xlSheet.Cells(3, 32) = "備註1" : xlSheet.Cells(3, 33) = "備註2" : xlSheet.Cells(3, 34) = "Special_Packaging" : xlSheet.Cells(3, 35) = "Remarks"
+        xlSheet.Cells(3, 31) = "驗貨" : xlSheet.Cells(3, 32) = "備註1" : xlSheet.Cells(3, 33) = "力威訂單號" : xlSheet.Cells(3, 34) = "Special_Packaging" : xlSheet.Cells(3, 35) = "Remarks"
         Set_訂單清單()
         For i As Integer = 0 To DataGridView1.Rows.Count - 1
             xlSheet.Cells(i + 4, 1) = DataGridView1.Rows(i).Cells("接單日").Value : xlSheet.Cells(i + 4, 2) = DataGridView1.Rows(i).Cells("出貨地").Value
@@ -164,7 +164,7 @@ Public Class 列印_生產進度表
             xlSheet.Cells(i + 4, 27) = DataGridView1.Rows(i).Cells("包裝").Value : xlSheet.Cells(i + 4, 28) = DataGridView1.Rows(i).Cells("裁斷").Value
             xlSheet.Cells(i + 4, 29) = DataGridView1.Rows(i).Cells("針車").Value : xlSheet.Cells(i + 4, 30) = DataGridView1.Rows(i).Cells("成型").Value
             xlSheet.Cells(i + 4, 31) = DataGridView1.Rows(i).Cells("驗貨").Value : xlSheet.Cells(i + 4, 32) = DataGridView1.Rows(i).Cells("備註1").Value
-            xlSheet.Cells(i + 4, 33) = DataGridView1.Rows(i).Cells("備註2").Value : xlSheet.Cells(i + 4, 34) = DataGridView1.Rows(i).Cells("Special_Packaging").Value
+            xlSheet.Cells(i + 4, 33) = DataGridView1.Rows(i).Cells("力威訂單號").Value : xlSheet.Cells(i + 4, 34) = DataGridView1.Rows(i).Cells("Special_Packaging").Value
             xlSheet.Cells(i + 4, 35) = DataGridView1.Rows(i).Cells("Remarks").Value
             With xlApp.Selection
                 .Font.Bold = True

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

@@ -30,7 +30,8 @@ Public Class 周進度表
                          "(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 & "%') " &
+                         "(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
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單種類_dgv.DataSource = ds.Tables(0) : conn.Close()

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

@@ -24,7 +24,8 @@ 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 & "%') OR " &
                          "(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"
+                         "(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
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 訂單清單_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub

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

@@ -230,16 +230,16 @@ Public Class 生產進度表
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 導入Excel_bt.Click
         If OpenFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then
             file_name = OpenFileDialog1.FileName
+            xlApp = CreateObject("Excel.Application")
+            xlApp.DisplayAlerts = True
+            xlApp.Visible = True
+            xlApp.Workbooks.Open(file_name)
+            xlSheet = xlApp.Worksheets(1) : xlSheet.Activate() : Set_excel導入()
+            xlApp.Visible = True : xlApp.Quit() : xlApp = Nothing
+            楦型_bt.Text = ""
+            MsgBox("資料導入完成")
+            Set_訂單清單() : Set_grid()
         End If
-        xlApp = CreateObject("Excel.Application")
-        xlApp.DisplayAlerts = True
-        xlApp.Visible = True
-        xlApp.Workbooks.Open(file_name)
-        xlSheet = xlApp.Worksheets(1) : xlSheet.Activate() : Set_excel導入()
-        xlApp.Visible = True : xlApp.Quit() : xlApp = Nothing
-        楦型_bt.Text = ""
-        MsgBox("資料導入完成")
-        Set_訂單清單() : Set_grid()
     End Sub
     Private Sub Button34_Click(sender As Object, e As EventArgs) Handles 樣品SIZE60天_bt.Click
         樣品SIZE60天_bt.Enabled = False : 全套SIZE45天_bt.Enabled = True : PRODUCTION30天分頁一_bt.Enabled = True : PRODUCTION30天分頁二_bt.Enabled = True

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

@@ -166,6 +166,7 @@ Partial Class 訂單列印選擇
         Me.CheckBox57 = New System.Windows.Forms.CheckBox()
         Me.CheckBox58 = New System.Windows.Forms.CheckBox()
         Me.CheckBox59 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox60 = New System.Windows.Forms.CheckBox()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.月份選擇_gb.SuspendLayout()
         Me.週數選擇_gb.SuspendLayout()
@@ -1540,11 +1541,22 @@ Partial Class 訂單列印選擇
         Me.CheckBox59.Text = "  HS#"
         Me.CheckBox59.UseVisualStyleBackColor = True
         '
+        'CheckBox60
+        '
+        Me.CheckBox60.AutoSize = True
+        Me.CheckBox60.Location = New System.Drawing.Point(547, 69)
+        Me.CheckBox60.Name = "CheckBox60"
+        Me.CheckBox60.Size = New System.Drawing.Size(71, 20)
+        Me.CheckBox60.TabIndex = 444
+        Me.CheckBox60.Text = "C_Code"
+        Me.CheckBox60.UseVisualStyleBackColor = True
+        '
         '訂單列印選擇
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1159, 296)
+        Me.Controls.Add(Me.CheckBox60)
         Me.Controls.Add(Me.CheckBox59)
         Me.Controls.Add(Me.CheckBox58)
         Me.Controls.Add(Me.CheckBox56)
@@ -1820,5 +1832,6 @@ Partial Class 訂單列印選擇
     Friend WithEvents CheckBox57 As CheckBox
     Friend WithEvents CheckBox58 As CheckBox
     Friend WithEvents CheckBox59 As CheckBox
+    Friend WithEvents CheckBox60 As CheckBox
 End Class
 

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

@@ -34,8 +34,9 @@ Public Class 訂單列印選擇
                                            " & 訂單資料表(1) & ".成型時間 AS 成型, " & 訂單資料表(1) & ".驗貨時間 AS 驗貨, " & 訂單資料表(1) & ".工廠進度表備註1, " & 訂單資料表(1) & ".工廠進度表備註2, 
                                            " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".工廠確認, " & 訂單資料表(1) & ".利威確認, 
                                            " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH, " & 訂單資料表(1) & ".力威訂單號, 
-                                           " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS
-                                     FROM  " & 訂單資料表(1) & " LEFT OUTER JOIN " & 訂單資料表(2) & " ON " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(2) & ".Colorway AND 
+                                           " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS, " & 訂單資料表(0) & ".CustomerName
+                                     FROM  " & 訂單資料表(1) & " LEFT OUTER JOIN " & 訂單資料表(0) & " ON " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(0) & ".天盾流水號 LEFT OUTER JOIN
+                                           " & 訂單資料表(2) & " ON " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(2) & ".Colorway AND 
                                            " & 訂單資料表(1) & ".ProductID = " & 訂單資料表(2) & ".ProductID AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(2) & ".天盾流水號 AND 
                                            " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(2) & ".客戶訂單號"
 
@@ -55,15 +56,9 @@ Public Class 訂單列印選擇
                                              " & 訂單資料表(1) & ".成型時間, " & 訂單資料表(1) & ".驗貨時間, " & 訂單資料表(1) & ".工廠進度表備註1, " & 訂單資料表(1) & ".工廠進度表備註2, 
                                              " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".工廠確認, " & 訂單資料表(1) & ".利威確認, 
                                              " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH, 
-                                             " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS
+                                             " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS, 
+                                             " & 訂單資料表(0) & ".CustomerName
                                     ORDER BY SUBSTRING(" & 訂單資料表(1) & ".訂單流水號, 4, 6) DESC"
-
-    'ReadOnly SQL字串1 As String = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, " &
-    '               "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 " & 訂單資料表(1) & ""
-    'ReadOnly SQL字串2 As String = " ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC"
     Private Sub Set_DGV1載入前設定()
         DataGridView1.DataSource = Nothing : ds.Clear()
         DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -151,6 +146,7 @@ Public Class 訂單列印選擇
         If CheckBox57.Checked = True Then : xlSheet.Cells(3, W) = "ProductID" : Q = W : W += 1 : End If
         If CheckBox58.Checked = True Then : xlSheet.Cells(3, W) = "UoM" : Q = W : W += 1 : End If
         If CheckBox59.Checked = True Then : xlSheet.Cells(3, W) = "HS#" : Q = W : W += 1 : End If
+        If CheckBox60.Checked = True Then : xlSheet.Cells(3, W) = "Company Code" : Q = W : W += 1 : End If
         If CheckBox49.Checked = True Then : xlSheet.Cells(3, W) = "東莞業務備註" : Q = W : W += 1 : End If
         Set_訂單清單()
 
@@ -214,6 +210,7 @@ Public Class 訂單列印選擇
             If CheckBox57.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("ProductID").Value : W += 1 : End If
             If CheckBox58.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("UoM").Value : W += 1 : End If
             If CheckBox59.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("HS").Value : W += 1 : End If
+            If CheckBox59.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("CustomerName").Value : W += 1 : End If
             If CheckBox49.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("東莞業務備註").Value : W += 1 : End If
             With xlApp.Selection
                 .Font.Bold = True
@@ -362,10 +359,7 @@ Public Class 訂單列印選擇
         週選_週數_tb.Text = 週選_週數_cb.Text
     End Sub
     Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click
-        Dim j As Integer = 1 ' j 用來計算有幾個 EXCEL 工作表
-        'SaveFileDialog1.Filter = "All Files (*.*)|*.*|Excel files (*.xlsx)|*.xlsx|CSV Files (*.csv)|*.csv|XLS Files (*.xls)|*xls"
-        'SaveFileDialog1.FilterIndex = 2
-        'If SaveFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then
+        Dim j As Integer = 1
         xlApp = CType(CreateObject("Excel.Application"), Microsoft.Office.Interop.Excel.Application)
         xlApp.Visible = True
         xlApp.DisplayAlerts = True
@@ -496,16 +490,6 @@ Public Class 訂單列印選擇
         xlApp.Application.WindowState = xlMinimized
         MsgBox("列印完成")
         Me.Close()
-
-        'xlSheet.PageSetup.PrintArea = ""
-        'xlApp.Cells.Select()
-        'xlApp.Application.WindowState = xlMinimized
-        'xlSheet.SaveAs(SaveFileDialog1.FileName)
-        'xlBook.Close()
-        'xlApp.Quit()
-        'MsgBox("列印完成")
-        'End If
-        'Me.Close()
     End Sub
     Private Shared Function NewMethod(xlBook As Microsoft.Office.Interop.Excel.Workbook) As Microsoft.Office.Interop.Excel.Worksheet
         Return CType(xlBook.Worksheets.Add, Microsoft.Office.Interop.Excel.Worksheet)

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

@@ -15,23 +15,30 @@ Public Class 訂單資料比對與修改_力威
         抬頭清單_dgv.ColumnHeadersHeight = 25
         抬頭清單_dgv.AllowUserToAddRows = False
         ConnOpen()
-        SQL1 = "SELECT      客戶訂單號, 天盾流水號, ModeOfDelivery, DeliveryTerms, OrgShipDate, FromPort, ToPort, ShippingCarrier, 
-                            VendorReference, ModifiedDate, CustomerName, ShipDate, SalesOrder, DeliveryAddress, 下單日, 交期, ETADate, 
-                            CreatedDate, Brand, CustomerRequisition, 工廠編號, 工廠地址, 代理編號, 訂貨代理, 總雙數, 總案件數, 公司, 
-                            工廠簡稱, 最終運送, 入單型態
-                FROM        " & 訂單資料表(0) & "
-                WHERE       客戶訂單號 LIKE '%" & PA & "%' OR 天盾流水號 LIKE '%" & PA & "%' OR CustomerRequisition LIKE '%" & PA & "%' AND 入單型態 LIKE '2'
-                ORDER BY    天盾流水號 DESC"
+        SQL1 = "SELECT    " & 訂單資料表(0) & ".客戶訂單號, " & 訂單資料表(0) & ".天盾流水號, " & 訂單資料表(0) & ".ModeOfDelivery, " & 訂單資料表(0) & ".DeliveryTerms, 
+                          " & 訂單資料表(0) & ".OrgShipDate, " & 訂單資料表(0) & ".FromPort, " & 訂單資料表(0) & ".ToPort, " & 訂單資料表(0) & ".ShippingCarrier, 
+                          " & 訂單資料表(0) & ".VendorReference, " & 訂單資料表(0) & ".ModifiedDate, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".ShipDate, 
+                          " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".DeliveryAddress, " & 訂單資料表(0) & ".下單日, " & 訂單資料表(0) & ".交期, 
+                          " & 訂單資料表(0) & ".ETADate, " & 訂單資料表(0) & ".CreatedDate, " & 訂單資料表(0) & ".Brand, " & 訂單資料表(0) & ".CustomerRequisition, 
+                          " & 訂單資料表(0) & ".工廠編號, " & 訂單資料表(0) & ".工廠地址, " & 訂單資料表(0) & ".代理編號, " & 訂單資料表(0) & ".訂貨代理, 
+                          " & 訂單資料表(0) & ".總雙數, " & 訂單資料表(0) & ".總案件數, " & 訂單資料表(0) & ".公司, " & 訂單資料表(0) & ".工廠簡稱, " & 訂單資料表(0) & ".最終運送, 
+                          " & 訂單資料表(0) & ".入單型態, AAA.力威訂單號
+                 FROM     " & 訂單資料表(0) & " LEFT OUTER JOIN
+                                (SELECT 訂單流水號, 力威訂單號 FROM " & 訂單資料表(1) & " WHERE (力威訂單號 IS NOT NULL)
+                                 GROUP BY    訂單流水號, 力威訂單號) AS AAA ON " & 訂單資料表(0) & ".天盾流水號 = AAA.訂單流水號
+                 WHERE   (" & 訂單資料表(0) & ".客戶訂單號 LIKE '%" & PA & "%') OR (" & 訂單資料表(0) & ".天盾流水號 LIKE '%" & PA & "%') OR 
+                         (AAA.力威訂單號 LIKE '%" & PA & "%') OR (" & 訂單資料表(0) & ".CustomerRequisition LIKE '%" & PA & "%') AND (" & 訂單資料表(0) & ".入單型態 LIKE '2')
+                 ORDER BY " & 訂單資料表(0) & ".天盾流水號 DESC"
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 抬頭清單_dgv.DataSource = ds.Tables(0) : conn.Close()
 
-        抬頭清單_dgv.Columns(0).FillWeight = 80 : 抬頭清單_dgv.Columns(1).FillWeight = 80 : 抬頭清單_dgv.Columns(2).Visible = False : 抬頭清單_dgv.Columns(3).Visible = False
+        抬頭清單_dgv.Columns(0).Visible = False : 抬頭清單_dgv.Columns(1).FillWeight = 80 : 抬頭清單_dgv.Columns(2).Visible = False : 抬頭清單_dgv.Columns(3).Visible = False
         抬頭清單_dgv.Columns(4).Visible = False : 抬頭清單_dgv.Columns(5).Visible = False : 抬頭清單_dgv.Columns(6).Visible = False : 抬頭清單_dgv.Columns(7).Visible = False
         抬頭清單_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(28).Visible = False : 抬頭清單_dgv.Columns(29).Visible = False : 抬頭清單_dgv.Columns(30).FillWeight = 80
     End Sub
     Private Sub Set_訂單控制表()
         控制表1_dgv.DataSource = Nothing : ds1.Clear()