1、周進度表、周進度表T1_T4新增力威訂單號顯示。

2、生產進度表取消備註2，改成力威訂單號。
3、訂單控制表新增批量出貨功能。
4、其餘系統運算BUG。

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

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

@@ -28,7 +28,9 @@ Public Class 驗貨報告資料庫修正
     End Sub
     Private Sub DataGridView1_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles DataGridView1.CellClick
         If e.RowIndex = -1 Then : Else
-            TextBox2.Text = DataGridView1(1, e.RowIndex).Value.ToString : TextBox3.Text = DataGridView1(2, e.RowIndex).Value.ToString
+            TextBox2.Text = DataGridView1(1, e.RowIndex).Value.ToString
+            TextBox3.Text = DataGridView1(2, e.RowIndex).Value.ToString
+            TextBox1.Text = DataGridView1(0, e.RowIndex).Value.ToString
             Set_清單2()
         End If
     End Sub

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

@@ -86,7 +86,6 @@ Public Class 列印_訂單價格利潤表
         xlApp.Visible = True
         xlApp.Application.WindowState = xlMaximized
 
-
         xlSheet.Cells(3, 1) = "Tendenza Po#"
         xlSheet.Cells(3, 2) = "Season"
         xlSheet.Cells(3, 3) = "力威 Po#"

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

@@ -30,22 +30,22 @@ Public Class 列印_周進度表
     Private Sub Set_訂單清單()
         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, " &
+            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 " & 訂單資料表(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, " &
+            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 " & 訂單資料表(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, " &
+            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 " & 訂單資料表(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, " &
+            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 " & 訂單資料表(1) & " " &
                "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'NJ') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "

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

@@ -24,24 +24,24 @@ Public Class 列印_周進度表T1_T4
         DataGridView1.AllowUserToAddRows = False
         ConnOpen()
         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, " &
+            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 " & 訂單資料表(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, " &
+            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 " & 訂單資料表(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, " &
+            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 " & 訂單資料表(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, " &
+            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 " & 訂單資料表(1) & " " &
                   "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (生產工廠 LIKE 'NJ') ORDER BY  PO_S_Date, 訂單流水號, STYLE_NAME, COLOR, WIDTH "

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

@@ -14,12 +14,13 @@ Public Class 周進度表
         ConnOpen()
         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, 訂單流水號, 驗貨報告圖片 
+                   "訂單數量 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) 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 " & 訂單資料表(1) & " " &
+                   "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 " &
@@ -66,7 +67,7 @@ Public Class 周進度表
                             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 & "' " &
-                           "WHERE (客戶訂單號 LIKE '" & xlSheet.Cells(i, 4).value & "') AND (形體號 LIKE '" & xlSheet.Cells(i, 5).value & "') AND (顏色 LIKE '" & xlSheet.Cells(i, 6).value & "') " &
+                           "WHERE (力威訂單號 LIKE '" & xlSheet.Cells(i, 4).value & "') AND (形體號 LIKE '" & xlSheet.Cells(i, 5).value & "') AND (顏色 LIKE '" & xlSheet.Cells(i, 6).value & "') " &
                            "AND (楦型 LIKE '" & xlSheet.Cells(i, 7).value & "') AND (訂單數量 = " & xlSheet.Cells(i, 8).value & ".0000" & ")"
                     CmdSet_For_dr() : conn.Close()
                 Else
@@ -74,7 +75,7 @@ Public Class 周進度表
                     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 & "') " &
+                           "WHERE (力威訂單號 LIKE '" & xlSheet.Cells(i, 4).value & "') AND (形體號 LIKE '" & xlSheet.Cells(i, 5).value & "') AND (顏色 LIKE '" & xlSheet.Cells(i, 6).value & "') " &
                            "AND (楦型 LIKE '" & xlSheet.Cells(i, 7).value & "') AND (訂單數量 = " & xlSheet.Cells(i, 8).value & ".0000" & ")"
                     CmdSet_For_dr() : conn.Close()
                 End If

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

@@ -11,11 +11,11 @@ Public Class 周進度表T1_T4
         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 " & 訂單資料表(1) & " 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 " & 訂單資料表(1) & " 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 " &

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 " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號 AS 力威單號, 驗貨報告圖片 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 " & 訂單資料表(1) & " " &
+                   "驗貨時間 AS 驗貨, 工廠進度表備註1 AS 備註1, 力威訂單號 AS 力威單號, 驗貨報告圖片 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 " &
@@ -130,7 +130,6 @@ Public Class 生產進度表
                                            "針車時間 = N'" & xlSheet.Cells(i, 29).value & "', " &
                                            "成型時間 = N'" & xlSheet.Cells(i, 30).value & "', " &
                                     "工廠進度表備註1 = N'" & xlSheet.Cells(i, 32).value & "', " &
-                                    "工廠進度表備註2 = N'" & xlSheet.Cells(i, 33).value & "', " &
                                   "Special_Packaging = N'" & xlSheet.Cells(i, 34).value & "', " &
                                             "Remarks = N'" & xlSheet.Cells(i, 35).value & "' " &
                        "WHERE (客戶訂單號 LIKE '%" & xlSheet.Cells(i, 4).value & "%') AND (形體號 LIKE '" & xlSheet.Cells(i, 5).value & "') AND (顏色 LIKE '" & xlSheet.Cells(i, 10).value & "') " &
@@ -144,6 +143,7 @@ Public Class 生產進度表
                 '"CFMSPEC = N'" & xlSheet.Cells(i, 20).value & "', " &
                 '"CFMSAMPLE = N'" & xlSheet.Cells(i, 17).value & "', " &
                 '"TVW = N'" & xlSheet.Cells(i, 6).value & "', " &
+                '"工廠進度表備註2 = N'" & xlSheet.Cells(i, 33).value & "', " &
             Else
                 i = 99999
             End If

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

@@ -125,6 +125,8 @@ Partial Class 訂單控制表
         Me.CheckBox10 = New System.Windows.Forms.CheckBox()
         Me.CheckBox11 = New System.Windows.Forms.CheckBox()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.啟用批量出貨_ch = New System.Windows.Forms.CheckBox()
+        Me.批量出貨_bt = New System.Windows.Forms.Button()
         Me.TextBox13 = New System.Windows.Forms.TextBox()
         Me.Label19 = New System.Windows.Forms.Label()
         Me.Button15 = New System.Windows.Forms.Button()
@@ -243,6 +245,9 @@ Partial Class 訂單控制表
         Me.訂單明細_bt = New System.Windows.Forms.Button()
         Me.裝箱明細_bt = New System.Windows.Forms.Button()
         Me.裝箱資訊_bt = New System.Windows.Forms.Button()
+        Me.Label50 = New System.Windows.Forms.Label()
+        Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
+        Me.清單全選_bt = New System.Windows.Forms.Button()
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
@@ -678,7 +683,7 @@ Partial Class 訂單控制表
         'Label56
         '
         Me.Label56.AutoSize = True
-        Me.Label56.Location = New System.Drawing.Point(110, 18)
+        Me.Label56.Location = New System.Drawing.Point(87, 35)
         Me.Label56.Name = "Label56"
         Me.Label56.Size = New System.Drawing.Size(18, 15)
         Me.Label56.TabIndex = 271
@@ -687,15 +692,15 @@ Partial Class 訂單控制表
         'DateTimePicker30
         '
         Me.DateTimePicker30.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.DateTimePicker30.Location = New System.Drawing.Point(130, 15)
+        Me.DateTimePicker30.Location = New System.Drawing.Point(107, 32)
         Me.DateTimePicker30.Name = "DateTimePicker30"
-        Me.DateTimePicker30.Size = New System.Drawing.Size(90, 22)
+        Me.DateTimePicker30.Size = New System.Drawing.Size(80, 22)
         Me.DateTimePicker30.TabIndex = 268
         '
         'Label57
         '
         Me.Label57.AutoSize = True
-        Me.Label57.Location = New System.Drawing.Point(23, 18)
+        Me.Label57.Location = New System.Drawing.Point(6, 35)
         Me.Label57.Name = "Label57"
         Me.Label57.Size = New System.Drawing.Size(83, 15)
         Me.Label57.TabIndex = 269
@@ -1081,7 +1086,7 @@ Partial Class 訂單控制表
         'Button38
         '
         Me.Button38.ForeColor = System.Drawing.Color.Black
-        Me.Button38.Location = New System.Drawing.Point(275, 14)
+        Me.Button38.Location = New System.Drawing.Point(275, 10)
         Me.Button38.Name = "Button38"
         Me.Button38.Size = New System.Drawing.Size(66, 25)
         Me.Button38.TabIndex = 336
@@ -1093,7 +1098,7 @@ Partial Class 訂單控制表
         Me.CheckBox24.AutoSize = True
         Me.CheckBox24.Checked = True
         Me.CheckBox24.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox24.Location = New System.Drawing.Point(35, 21)
+        Me.CheckBox24.Location = New System.Drawing.Point(35, 16)
         Me.CheckBox24.Name = "CheckBox24"
         Me.CheckBox24.Size = New System.Drawing.Size(90, 19)
         Me.CheckBox24.TabIndex = 337
@@ -1103,7 +1108,7 @@ Partial Class 訂單控制表
         'CheckBox25
         '
         Me.CheckBox25.AutoSize = True
-        Me.CheckBox25.Location = New System.Drawing.Point(138, 21)
+        Me.CheckBox25.Location = New System.Drawing.Point(138, 16)
         Me.CheckBox25.Name = "CheckBox25"
         Me.CheckBox25.Size = New System.Drawing.Size(90, 19)
         Me.CheckBox25.TabIndex = 338
@@ -1124,7 +1129,7 @@ Partial Class 訂單控制表
         'CheckBox10
         '
         Me.CheckBox10.AutoSize = True
-        Me.CheckBox10.Location = New System.Drawing.Point(35, 67)
+        Me.CheckBox10.Location = New System.Drawing.Point(11, 80)
         Me.CheckBox10.Name = "CheckBox10"
         Me.CheckBox10.Size = New System.Drawing.Size(126, 19)
         Me.CheckBox10.TabIndex = 341
@@ -1136,7 +1141,7 @@ Partial Class 訂單控制表
         Me.CheckBox11.AutoSize = True
         Me.CheckBox11.Checked = True
         Me.CheckBox11.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox11.Location = New System.Drawing.Point(35, 45)
+        Me.CheckBox11.Location = New System.Drawing.Point(11, 58)
         Me.CheckBox11.Name = "CheckBox11"
         Me.CheckBox11.Size = New System.Drawing.Size(70, 19)
         Me.CheckBox11.TabIndex = 340
@@ -1145,6 +1150,8 @@ Partial Class 訂單控制表
         '
         'GroupBox1
         '
+        Me.GroupBox1.Controls.Add(Me.啟用批量出貨_ch)
+        Me.GroupBox1.Controls.Add(Me.批量出貨_bt)
         Me.GroupBox1.Controls.Add(Me.TextBox13)
         Me.GroupBox1.Controls.Add(Me.Label19)
         Me.GroupBox1.Controls.Add(Me.Button15)
@@ -1155,17 +1162,38 @@ Partial Class 訂單控制表
         Me.GroupBox1.Controls.Add(Me.DateTimePicker30)
         Me.GroupBox1.Controls.Add(Me.CheckBox11)
         Me.GroupBox1.Controls.Add(Me.Label56)
-        Me.GroupBox1.Location = New System.Drawing.Point(1056, 3)
+        Me.GroupBox1.Controls.Add(Me.Label50)
+        Me.GroupBox1.Location = New System.Drawing.Point(1056, 1)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(347, 94)
+        Me.GroupBox1.Size = New System.Drawing.Size(347, 105)
         Me.GroupBox1.TabIndex = 342
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "出貨操作"
         '
+        '啟用批量出貨_ch
+        '
+        Me.啟用批量出貨_ch.AutoSize = True
+        Me.啟用批量出貨_ch.Location = New System.Drawing.Point(249, 35)
+        Me.啟用批量出貨_ch.Name = "啟用批量出貨_ch"
+        Me.啟用批量出貨_ch.Size = New System.Drawing.Size(92, 19)
+        Me.啟用批量出貨_ch.TabIndex = 347
+        Me.啟用批量出貨_ch.Text = "啟用批量出貨"
+        Me.啟用批量出貨_ch.UseVisualStyleBackColor = True
+        '
+        '批量出貨_bt
+        '
+        Me.批量出貨_bt.ForeColor = System.Drawing.Color.Black
+        Me.批量出貨_bt.Location = New System.Drawing.Point(290, 55)
+        Me.批量出貨_bt.Name = "批量出貨_bt"
+        Me.批量出貨_bt.Size = New System.Drawing.Size(50, 45)
+        Me.批量出貨_bt.TabIndex = 346
+        Me.批量出貨_bt.Text = "批量出貨"
+        Me.批量出貨_bt.UseVisualStyleBackColor = True
+        '
         'TextBox13
         '
         Me.TextBox13.ForeColor = System.Drawing.Color.Red
-        Me.TextBox13.Location = New System.Drawing.Point(187, 42)
+        Me.TextBox13.Location = New System.Drawing.Point(152, 55)
         Me.TextBox13.Name = "TextBox13"
         Me.TextBox13.Size = New System.Drawing.Size(79, 22)
         Me.TextBox13.TabIndex = 345
@@ -1174,7 +1202,7 @@ Partial Class 訂單控制表
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(116, 46)
+        Me.Label19.Location = New System.Drawing.Point(82, 59)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(62, 15)
         Me.Label19.TabIndex = 344
@@ -1183,9 +1211,9 @@ Partial Class 訂單控制表
         'Button15
         '
         Me.Button15.ForeColor = System.Drawing.Color.Black
-        Me.Button15.Location = New System.Drawing.Point(275, 40)
+        Me.Button15.Location = New System.Drawing.Point(237, 55)
         Me.Button15.Name = "Button15"
-        Me.Button15.Size = New System.Drawing.Size(66, 47)
+        Me.Button15.Size = New System.Drawing.Size(50, 45)
         Me.Button15.TabIndex = 343
         Me.Button15.Text = "確定出貨"
         Me.Button15.UseVisualStyleBackColor = True
@@ -1193,7 +1221,7 @@ Partial Class 訂單控制表
         'TextBox12
         '
         Me.TextBox12.ForeColor = System.Drawing.Color.Red
-        Me.TextBox12.Location = New System.Drawing.Point(187, 65)
+        Me.TextBox12.Location = New System.Drawing.Point(152, 78)
         Me.TextBox12.Name = "TextBox12"
         Me.TextBox12.Size = New System.Drawing.Size(79, 22)
         Me.TextBox12.TabIndex = 342
@@ -1203,7 +1231,7 @@ Partial Class 訂單控制表
         'Button27
         '
         Me.Button27.ForeColor = System.Drawing.Color.Black
-        Me.Button27.Location = New System.Drawing.Point(226, 15)
+        Me.Button27.Location = New System.Drawing.Point(189, 32)
         Me.Button27.Name = "Button27"
         Me.Button27.Size = New System.Drawing.Size(41, 22)
         Me.Button27.TabIndex = 323
@@ -1215,9 +1243,9 @@ Partial Class 訂單控制表
         Me.GroupBox2.Controls.Add(Me.CheckBox24)
         Me.GroupBox2.Controls.Add(Me.CheckBox25)
         Me.GroupBox2.Controls.Add(Me.Button38)
-        Me.GroupBox2.Location = New System.Drawing.Point(1056, 99)
+        Me.GroupBox2.Location = New System.Drawing.Point(1056, 108)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(347, 47)
+        Me.GroupBox2.Size = New System.Drawing.Size(347, 40)
         Me.GroupBox2.TabIndex = 343
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "CXL訂單操作"
@@ -2316,12 +2344,42 @@ Partial Class 訂單控制表
         Me.裝箱資訊_bt.Text = "裝箱資訊"
         Me.裝箱資訊_bt.UseVisualStyleBackColor = True
         '
+        'Label50
+        '
+        Me.Label50.AutoSize = True
+        Me.Label50.ForeColor = System.Drawing.Color.Red
+        Me.Label50.Location = New System.Drawing.Point(5, 14)
+        Me.Label50.Name = "Label50"
+        Me.Label50.Size = New System.Drawing.Size(338, 15)
+        Me.Label50.TabIndex = 348
+        Me.Label50.Text = "注意 : 先打勾 [啟用量出貨] 按鈕在選資料，系統讀取速度會比較快。"
+        '
+        'ProgressBar1
+        '
+        Me.ProgressBar1.Location = New System.Drawing.Point(1109, 149)
+        Me.ProgressBar1.Maximum = 10000
+        Me.ProgressBar1.Name = "ProgressBar1"
+        Me.ProgressBar1.Size = New System.Drawing.Size(294, 20)
+        Me.ProgressBar1.TabIndex = 757
+        '
+        '清單全選_bt
+        '
+        Me.清單全選_bt.ForeColor = System.Drawing.Color.Black
+        Me.清單全選_bt.Location = New System.Drawing.Point(5, 285)
+        Me.清單全選_bt.Name = "清單全選_bt"
+        Me.清單全選_bt.Size = New System.Drawing.Size(70, 26)
+        Me.清單全選_bt.TabIndex = 758
+        Me.清單全選_bt.Text = "清單全選"
+        Me.清單全選_bt.UseVisualStyleBackColor = True
+        '
         '訂單控制表
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoScroll = True
         Me.ClientSize = New System.Drawing.Size(1914, 1011)
+        Me.Controls.Add(Me.清單全選_bt)
+        Me.Controls.Add(Me.ProgressBar1)
         Me.Controls.Add(Me.裝箱資訊_bt)
         Me.Controls.Add(Me.裝箱明細_bt)
         Me.Controls.Add(Me.訂單明細_bt)
@@ -2706,5 +2764,10 @@ Partial Class 訂單控制表
     Friend WithEvents TT23_lb As TextBox
     Friend WithEvents Label49 As Label
     Friend WithEvents 除錯_dgv As DataGridView
+    Friend WithEvents 批量出貨_bt As Button
+    Friend WithEvents 啟用批量出貨_ch As CheckBox
+    Friend WithEvents Label50 As Label
+    Friend WithEvents ProgressBar1 As ProgressBar
+    Friend WithEvents 清單全選_bt As Button
 End Class
 

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

@@ -2,7 +2,7 @@
 Imports System.IO
 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
-    Dim 訂單數量 As Double : Dim 單價 As Double : Dim 總金額 As Double
+    Dim 訂單數量 As Double : Dim 單價 As Double : Dim 總金額 As Double : Public 平均數 As Integer : Public 最終數 As Integer = 0 : Public 資料數 As Integer = 0
     '-----------------------------------------0-----------------------1-------------------------2------------------3-----------------4----------------------5-------------------------6
     '                                訂單流水號,               年份季度,               客戶訂單號,            形體號,             顏色,                  楦型,                 訂單數量
 
@@ -53,103 +53,122 @@ Public Class 訂單控制表
                                               結關日,                SMS簽回,                  FRS簽回,     MASTER_SWATCH,       客戶訂單號,             ProductID,                      UoM
                     FROM " & 訂單資料表(1) & ""
     End Sub
+    Private Sub Set_控制表_dgv_插入勾選控件清單()
+        Dim Col As New DataGridViewCheckBoxColumn With {
+            .FillWeight = 40,
+            .DataPropertyName = "選擇"
+        }
+        Col.HeaderText = "選擇" : Col.Name = "選擇"
+        控制表_dgv.Columns.Insert(0, Col)
+    End Sub
     Private Sub Set_grid()
         '--變動格攔框總和  685
-        控制表_dgv.Columns(0).FillWeight = 120 : 控制表_dgv.Columns(1).FillWeight = 100 : 控制表_dgv.Columns(2).FillWeight = 150 : 控制表_dgv.Columns(3).FillWeight = 200
-        控制表_dgv.Columns(4).FillWeight = 150 : 控制表_dgv.Columns(5).FillWeight = 100 : 控制表_dgv.Columns(6).FillWeight = 100 : 控制表_dgv.Columns(8).FillWeight = 70
-        控制表_dgv.Columns(9).FillWeight = 100
-        控制表_dgv.Columns(10).FillWeight = 175 : 控制表_dgv.Columns(11).FillWeight = 80 : 控制表_dgv.Columns(12).FillWeight = 100 : 控制表_dgv.Columns(13).FillWeight = 97
-        控制表_dgv.Columns(14).FillWeight = 97 : 控制表_dgv.Columns(15).FillWeight = 97 : 控制表_dgv.Columns(16).FillWeight = 97 : 控制表_dgv.Columns(17).FillWeight = 97
-        控制表_dgv.Columns(18).FillWeight = 97 : 控制表_dgv.Columns(19).FillWeight = 97 : 控制表_dgv.Columns(20).FillWeight = 100 : 控制表_dgv.Columns(21).FillWeight = 80
-        控制表_dgv.Columns(22).FillWeight = 80 : 控制表_dgv.Columns(23).FillWeight = 80 : 控制表_dgv.Columns(24).FillWeight = 80 : 控制表_dgv.Columns(25).FillWeight = 85
-        控制表_dgv.Columns(26).FillWeight = 90 : 控制表_dgv.Columns(27).FillWeight = 100 : 控制表_dgv.Columns(28).FillWeight = 70 : 控制表_dgv.Columns(29).FillWeight = 195
-        控制表_dgv.Columns(30).FillWeight = 100 : 控制表_dgv.Columns(31).FillWeight = 190 : 控制表_dgv.Columns(32).FillWeight = 100 : 控制表_dgv.Columns(33).FillWeight = 80
-        控制表_dgv.Columns(34).FillWeight = 80 : 控制表_dgv.Columns(35).FillWeight = 80 : 控制表_dgv.Columns(36).FillWeight = 80 : 控制表_dgv.Columns(37).FillWeight = 80
-        控制表_dgv.Columns(38).FillWeight = 140 : 控制表_dgv.Columns(39).FillWeight = 145 : 控制表_dgv.Columns(40).FillWeight = 175 : 控制表_dgv.Columns(41).FillWeight = 170
-        控制表_dgv.Columns(42).FillWeight = 170 : 控制表_dgv.Columns(43).FillWeight = 170 : 控制表_dgv.Columns(44).FillWeight = 90 : 控制表_dgv.Columns(45).FillWeight = 85
-        控制表_dgv.Columns(46).FillWeight = 85 : 控制表_dgv.Columns(47).FillWeight = 85 : 控制表_dgv.Columns(48).FillWeight = 85 : 控制表_dgv.Columns(49).FillWeight = 85
-        控制表_dgv.Columns(50).FillWeight = 85 : 控制表_dgv.Columns(51).FillWeight = 85 : 控制表_dgv.Columns(52).FillWeight = 115 : 控制表_dgv.Columns(53).FillWeight = 114
-        控制表_dgv.Columns(54).FillWeight = 114 : 控制表_dgv.Columns(55).FillWeight = 114 : 控制表_dgv.Columns(56).FillWeight = 114 : 控制表_dgv.Columns(57).FillWeight = 114
-        控制表_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 = 205
-        控制表_dgv.Columns(74).FillWeight = 100 : 控制表_dgv.Columns(75).FillWeight = 120 : 控制表_dgv.Columns(76).FillWeight = 60
+        If 控制表_dgv.Columns.Count.ToString > 77 Then
+            控制表_dgv.Columns.Remove("選擇")
+        End If
+        Set_控制表_dgv_插入勾選控件清單()
+        控制表_dgv.Columns(0).FillWeight = 40 : 控制表_dgv.Columns(1).FillWeight = 120 : 控制表_dgv.Columns(2).FillWeight = 100 : 控制表_dgv.Columns(3).FillWeight = 150
+        控制表_dgv.Columns(4).FillWeight = 200 : 控制表_dgv.Columns(5).FillWeight = 150 : 控制表_dgv.Columns(6).FillWeight = 100 : 控制表_dgv.Columns(7).FillWeight = 100
+
+        控制表_dgv.Columns(9).FillWeight = 70 : 控制表_dgv.Columns(10).FillWeight = 100 : 控制表_dgv.Columns(11).FillWeight = 175 : 控制表_dgv.Columns(12).FillWeight = 80
+        控制表_dgv.Columns(13).FillWeight = 100 : 控制表_dgv.Columns(14).FillWeight = 97 : 控制表_dgv.Columns(15).FillWeight = 97 : 控制表_dgv.Columns(16).FillWeight = 97
+        控制表_dgv.Columns(17).FillWeight = 97 : 控制表_dgv.Columns(18).FillWeight = 97 : 控制表_dgv.Columns(19).FillWeight = 97 : 控制表_dgv.Columns(20).FillWeight = 97
+        控制表_dgv.Columns(21).FillWeight = 100 : 控制表_dgv.Columns(22).FillWeight = 80 : 控制表_dgv.Columns(23).FillWeight = 80 : 控制表_dgv.Columns(24).FillWeight = 80
+        控制表_dgv.Columns(25).FillWeight = 80 : 控制表_dgv.Columns(26).FillWeight = 85 : 控制表_dgv.Columns(27).FillWeight = 90 : 控制表_dgv.Columns(28).FillWeight = 100
+        控制表_dgv.Columns(29).FillWeight = 70 : 控制表_dgv.Columns(30).FillWeight = 195 : 控制表_dgv.Columns(31).FillWeight = 100 : 控制表_dgv.Columns(32).FillWeight = 190
+        控制表_dgv.Columns(33).FillWeight = 100 : 控制表_dgv.Columns(34).FillWeight = 80 : 控制表_dgv.Columns(35).FillWeight = 80 : 控制表_dgv.Columns(36).FillWeight = 80
+        控制表_dgv.Columns(37).FillWeight = 80 : 控制表_dgv.Columns(38).FillWeight = 80 : 控制表_dgv.Columns(39).FillWeight = 140 : 控制表_dgv.Columns(40).FillWeight = 145
+        控制表_dgv.Columns(41).FillWeight = 175 : 控制表_dgv.Columns(42).FillWeight = 170 : 控制表_dgv.Columns(43).FillWeight = 170 : 控制表_dgv.Columns(44).FillWeight = 170
+        控制表_dgv.Columns(45).FillWeight = 90 : 控制表_dgv.Columns(46).FillWeight = 85 : 控制表_dgv.Columns(47).FillWeight = 85 : 控制表_dgv.Columns(48).FillWeight = 85
+        控制表_dgv.Columns(49).FillWeight = 85 : 控制表_dgv.Columns(50).FillWeight = 85 : 控制表_dgv.Columns(51).FillWeight = 85 : 控制表_dgv.Columns(52).FillWeight = 85
+        控制表_dgv.Columns(53).FillWeight = 115 : 控制表_dgv.Columns(54).FillWeight = 114 : 控制表_dgv.Columns(55).FillWeight = 114 : 控制表_dgv.Columns(56).FillWeight = 114
+        控制表_dgv.Columns(57).FillWeight = 114 : 控制表_dgv.Columns(58).FillWeight = 114 : 控制表_dgv.Columns(59).FillWeight = 137 : 控制表_dgv.Columns(60).FillWeight = 137
+        控制表_dgv.Columns(61).FillWeight = 137 : 控制表_dgv.Columns(62).FillWeight = 137 : 控制表_dgv.Columns(63).FillWeight = 137 : 控制表_dgv.Columns(64).FillWeight = 120
+        控制表_dgv.Columns(65).FillWeight = 120 : 控制表_dgv.Columns(66).FillWeight = 90 : 控制表_dgv.Columns(67).FillWeight = 355 : 控制表_dgv.Columns(68).FillWeight = 172
+        控制表_dgv.Columns(69).FillWeight = 171 : 控制表_dgv.Columns(70).FillWeight = 171 : 控制表_dgv.Columns(71).FillWeight = 171 : 控制表_dgv.Columns(72).FillWeight = 100
+        控制表_dgv.Columns(73).FillWeight = 100 : 控制表_dgv.Columns(74).FillWeight = 205 : 控制表_dgv.Columns(75).FillWeight = 100 : 控制表_dgv.Columns(76).FillWeight = 120
+        控制表_dgv.Columns(77).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"
-        控制表_dgv.Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 控制表_dgv.Columns(8).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        控制表_dgv.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 控制表_dgv.Columns(9).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        控制表_dgv.Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 控制表_dgv.Columns(6).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        控制表_dgv.Columns(32).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 控制表_dgv.Columns(32).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 控制表_dgv.Columns(33).DefaultCellStyle.Format = "#,##0"
+        控制表_dgv.Columns(9).DefaultCellStyle.Format = "#,##0.00" : 控制表_dgv.Columns(10).DefaultCellStyle.Format = "#,##0.00"
+        控制表_dgv.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(9).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(10).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(7).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(33).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        控制表_dgv.Columns(33).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
 
         If BB(0) = False And BB(1) = True And BB(2) = True And BB(3) = True And BB(4) = True And BB(5) = True And BB(6) = True And BB(7) = True And BB(8) = True And BB(9) = True Then
             '-----------第1頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 12 : 控制表_dgv.Columns(i).Visible = True : Next
-            If CC(17) = True Then : 控制表_dgv.Columns(7).FillWeight = 90 : Else : 控制表_dgv.Columns(7).Visible = False : End If
+            For i As Integer = 8 To 13 : 控制表_dgv.Columns(i).Visible = True : Next
+            If CC(17) = True Then : 控制表_dgv.Columns(8).FillWeight = 90 : Else : 控制表_dgv.Columns(8).Visible = False : End If
             If CC(7) = True Then
-                For i As Integer = 63 To 66 : 控制表_dgv.Columns(i).Visible = False : Next
+                For i As Integer = 64 To 67 : 控制表_dgv.Columns(i).Visible = False : Next
             Else
-                控制表_dgv.Columns(10).FillWeight = 97
-                控制表_dgv.Columns(8).Visible = False : 控制表_dgv.Columns(9).Visible = False
-                控制表_dgv.Columns(63).Visible = True : 控制表_dgv.Columns(64).Visible = True
-                控制表_dgv.Columns(65).Visible = False : 控制表_dgv.Columns(66).Visible = False
+                控制表_dgv.Columns(11).FillWeight = 97
+                控制表_dgv.Columns(9).Visible = False : 控制表_dgv.Columns(10).Visible = False
+                控制表_dgv.Columns(64).Visible = True : 控制表_dgv.Columns(65).Visible = True
+                控制表_dgv.Columns(66).Visible = False : 控制表_dgv.Columns(67).Visible = False
             End If
 
-            For i As Integer = 13 To 27 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 14 To 28 : 控制表_dgv.Columns(i).Visible = False : Next
 
-            控制表_dgv.Columns(28).Visible = True
+            控制表_dgv.Columns(29).Visible = True
 
-            For i As Integer = 29 To 62 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 67 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 30 To 63 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 68 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = False And BB(2) = True And BB(3) = True And BB(4) = True And BB(5) = True And BB(6) = True And BB(7) = True And BB(8) = True And BB(9) = True Then
             '-----------第2頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            控制表_dgv.Columns(27).Visible = True : 控制表_dgv.Columns(28).Visible = False
-            For i As Integer = 7 To 26 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 29 To 32 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 33 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            控制表_dgv.Columns(28).Visible = True : 控制表_dgv.Columns(29).Visible = False
+            For i As Integer = 8 To 27 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 30 To 33 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 34 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = False And BB(3) = True And BB(4) = True And BB(5) = True And BB(6) = True And BB(7) = True And BB(8) = True And BB(9) = True Then
             '-----------第3頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 32 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 33 To 39 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 40 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 8 To 33 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 34 To 40 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 41 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = True And BB(3) = False And BB(4) = True And BB(5) = True And BB(6) = True And BB(7) = True And BB(8) = True And BB(9) = True Then
             '-----------第4頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 39 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 40 To 43 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 44 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 8 To 40 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 41 To 44 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 45 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = True And BB(3) = True And BB(4) = False And BB(5) = True And BB(6) = True And BB(7) = True And BB(8) = True And BB(9) = True Then
             '-----------第5頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 43 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 44 To 51 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 52 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 8 To 44 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 45 To 52 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 53 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = True And BB(3) = True And BB(4) = True And BB(5) = False And BB(6) = True And BB(7) = True And BB(8) = True And BB(9) = True Then
             '-----------第6頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 51 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 52 To 57 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 58 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 8 To 52 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 53 To 58 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 59 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = True And BB(3) = True And BB(4) = True And BB(5) = True And BB(6) = False And BB(7) = True And BB(8) = True And BB(9) = True Then
             '-----------第7頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 57 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 58 To 62 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 63 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 8 To 58 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 59 To 63 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 64 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = True And BB(3) = True And BB(4) = True And BB(5) = True And BB(6) = True And BB(7) = False And BB(8) = True And BB(9) = True Then
             '-----------第8頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-            For i As Integer = 7 To 62 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 63 To 66 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 67 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 8 To 63 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 64 To 67 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 68 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = True And BB(3) = True And BB(4) = True And BB(5) = True And BB(6) = True And BB(7) = True And BB(8) = False And BB(9) = True Then
             '-----------第9頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 66 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 67 To 70 : 控制表_dgv.Columns(i).Visible = True : Next
-            For i As Integer = 71 To 76 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 8 To 67 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 68 To 71 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 72 To 77 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf BB(0) = True And BB(1) = True And BB(2) = True And BB(3) = True And BB(4) = True And BB(5) = True And BB(6) = True And BB(7) = True And BB(8) = True And BB(9) = False Then
             '-----------第10頁-------------------------------------------------------------------------------------------------------------------------------------------------------------
-            For i As Integer = 7 To 70 : 控制表_dgv.Columns(i).Visible = False : Next
-            For i As Integer = 71 To 76 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 8 To 71 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 72 To 77 : 控制表_dgv.Columns(i).Visible = True : Next
         End If
         控制表_dgv.CellBorderStyle = DataGridViewCellBorderStyle.None
+        For i As Integer = 0 To 控制表_dgv.Rows.Count - 1
+            控制表_dgv("選擇", i).Value = False
+        Next
     End Sub
     Private Sub Set_DGV1載入前設定()
         控制表_dgv.DataSource = Nothing : ds.Clear()
@@ -951,7 +970,7 @@ Public Class 訂單控制表
         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 : 開啟訂單明細表_bt.Visible = False
+        明細表_dgv.Visible = True : 裝箱明細_dgv.Visible = False : 資訊_gb.Visible = False : 開啟訂單明細表_bt.Visible = False : 批量出貨_bt.Enabled = False
 
         訂單資料庫選擇.ShowDialog()
 
@@ -1048,137 +1067,141 @@ Public Class 訂單控制表
         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(天盾訂單號_tb.Text, 6) & "')"
-            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
+        If 啟用批量出貨_ch.Checked = True Then
+            控制表_dgv("選擇", e.RowIndex).Value = True
+        Else
+            If e.RowIndex = -1 Then : Else
+                ConnOpen()
+                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下拉表單資料載入()
-            天盾訂單號_tb.Text = 控制表_dgv(0, e.RowIndex).Value.ToString : ComboBox1.Text = 控制表_dgv(1, e.RowIndex).Value.ToString
-            客戶訂單號_tb.Text = 控制表_dgv("客戶訂單號", 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")
+                PP1 = 控制表_dgv("形體號", e.RowIndex).Value.ToString : PP2 = 控制表_dgv("顏色", e.RowIndex).Value.ToString
+                ComboBox2下拉表單資料載入() : ComboBox3下拉表單資料載入()
+                天盾訂單號_tb.Text = 控制表_dgv("訂單流水號", e.RowIndex).Value.ToString : ComboBox1.Text = 控制表_dgv("年份季度", e.RowIndex).Value.ToString
+                客戶訂單號_tb.Text = 控制表_dgv("客戶訂單號", e.RowIndex).Value.ToString : ComboBox2.Text = 控制表_dgv("形體號", e.RowIndex).Value.ToString
+                ComboBox3.Text = 控制表_dgv("顏色", e.RowIndex).Value.ToString : ComboBox4.Text = 控制表_dgv("楦型", e.RowIndex).Value.ToString
+                訂單數量 = 控制表_dgv("訂單數量", e.RowIndex).Value.ToString : TextBox3.Text = Format(Val(訂單數量), "#,##0")
 
-            TextBox13.Text = 控制表_dgv.Rows(e.RowIndex).Cells("訂單數量").Value - 控制表_dgv.Rows(e.RowIndex).Cells("出貨數量").Value
-            TextBox13.Text = Format(Val(TextBox13.Text), "###0")
+                TextBox13.Text = 控制表_dgv.Rows(e.RowIndex).Cells("訂單數量").Value - 控制表_dgv.Rows(e.RowIndex).Cells("出貨數量").Value
+                TextBox13.Text = Format(Val(TextBox13.Text), "###0")
 
-            DTP(0) = 控制表_dgv(7, e.RowIndex).Value.ToString
-            If DTP(0) = "" Then : DateTimePicker2.Format = DateTimePickerFormat.Custom : DateTimePicker2.CustomFormat = " "
-            Else : DateTimePicker2.Format = DateTimePickerFormat.Short : DateTimePicker2.Text = DTP(0) : DateTimePicker1.Text = DateTimePicker2.Text : End If
+                DTP(0) = 控制表_dgv("客戶交期", e.RowIndex).Value.ToString
+                If DTP(0) = "" Then : DateTimePicker2.Format = DateTimePickerFormat.Custom : DateTimePicker2.CustomFormat = " "
+                Else : DateTimePicker2.Format = DateTimePickerFormat.Short : DateTimePicker2.Text = DTP(0) : DateTimePicker1.Text = DateTimePicker2.Text : End If
 
-            單價 = 控制表_dgv(8, e.RowIndex).Value.ToString : TextBox4.Text = Format(Val(單價), "#,##0.00")
-            總金額 = 控制表_dgv(9, e.RowIndex).Value.ToString : TextBox5.Text = Format(Val(總金額), "#,##0.00")
-            TextBox6.Text = 控制表_dgv(10, e.RowIndex).Value.ToString : ComboBox5.Text = 控制表_dgv(11, e.RowIndex).Value.ToString
-            ComboBox6.Text = 控制表_dgv(12, e.RowIndex).Value.ToString
+                單價 = 控制表_dgv("單價", e.RowIndex).Value.ToString : TextBox4.Text = Format(Val(單價), "#,##0.00")
+                總金額 = 控制表_dgv("總金額", e.RowIndex).Value.ToString : TextBox5.Text = Format(Val(總金額), "#,##0.00")
+                TextBox6.Text = 控制表_dgv("備註", e.RowIndex).Value.ToString : ComboBox5.Text = 控制表_dgv("生產工廠", e.RowIndex).Value.ToString
+                ComboBox6.Text = 控制表_dgv("訂單種類", e.RowIndex).Value.ToString
 
-            DTP(1) = 控制表_dgv(13, e.RowIndex).Value.ToString
-            If DTP(1) = "" Then : DateTimePicker4.Format = DateTimePickerFormat.Custom : DateTimePicker4.CustomFormat = " "
-            Else : DateTimePicker4.Format = DateTimePickerFormat.Short : DateTimePicker4.Text = DTP(1) : DateTimePicker3.Text = DateTimePicker4.Text : End If
+                DTP(1) = 控制表_dgv("工廠回復交期", e.RowIndex).Value.ToString
+                If DTP(1) = "" Then : DateTimePicker4.Format = DateTimePickerFormat.Custom : DateTimePicker4.CustomFormat = " "
+                Else : DateTimePicker4.Format = DateTimePickerFormat.Short : DateTimePicker4.Text = DTP(1) : DateTimePicker3.Text = DateTimePicker4.Text : End If
 
-            DTP(9) = 控制表_dgv(21, e.RowIndex).Value.ToString
-            If DTP(9) = "" Then : DateTimePicker20.Format = DateTimePickerFormat.Custom : DateTimePicker20.CustomFormat = " "
-            Else : DateTimePicker20.Format = DateTimePickerFormat.Short : DateTimePicker20.Text = DTP(9) : DateTimePicker19.Text = DateTimePicker20.Text : End If
+                DTP(9) = 控制表_dgv("貼標時間", e.RowIndex).Value.ToString
+                If DTP(9) = "" Then : DateTimePicker20.Format = DateTimePickerFormat.Custom : DateTimePicker20.CustomFormat = " "
+                Else : DateTimePicker20.Format = DateTimePickerFormat.Short : DateTimePicker20.Text = DTP(9) : DateTimePicker19.Text = DateTimePicker20.Text : End If
 
-            TextBox7.Text = 控制表_dgv(27, e.RowIndex).Value.ToString
+                TextBox7.Text = 控制表_dgv("資料流水號", e.RowIndex).Value.ToString
 
-            ConnOpen()
-            SQL1 = "SELECT 客戶訂單號, 天盾流水號, ModeOfDelivery, DeliveryTerms, OrgShipDate, FromPort, ToPort, ShippingCarrier, VendorReference, ModifiedDate, CustomerName, ShipDate, 
+                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"
+                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("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()
+                        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"
 
-            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 = ""
+                        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()
 
-            ConnOpen()
-            SQL1 = "SELECT Style FROM STYLELIST WHERE (ProductName LIKE '" & ComboBox2.Text & "')"
-            CmdSet_For_dr()
-            If dr.Read() Then
-                TextBox11.Text = dr("Style").ToString
-            Else
-                TextBox11.Text = ""
-            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 = ""
 
-            If 控制表_dgv(4, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
-                CmdSet_For_dr()
-                PictureBox1.Image = Nothing
-                While dr.Read() = True
-                    Dim unused2 As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
-                    Dim oStream As New MemoryStream(bytes) : PictureBox1.Image = Bitmap.FromStream(oStream)
-                End While
-            Else
-                ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 控制表_dgv(4, e.RowIndex).Value.ToString &
-                    "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT Style FROM STYLELIST WHERE (ProductName LIKE '" & ComboBox2.Text & "')"
                 CmdSet_For_dr()
                 If dr.Read() Then
-                    conn.Close()
+                    TextBox11.Text = dr("Style").ToString
+                Else
+                    TextBox11.Text = ""
+                End If
+                conn.Close()
+
+                If 控制表_dgv("顏色", e.RowIndex).Value = "" Then
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 控制表_dgv(4, e.RowIndex).Value.ToString &
-                        "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     PictureBox1.Image = Nothing
                     While dr.Read() = True
-                        Dim unused3 As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
+                        Dim unused2 As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
                         Dim oStream As New MemoryStream(bytes) : PictureBox1.Image = Bitmap.FromStream(oStream)
                     End While
                 Else
-                    conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 
+                            顏色 LIKE '" & 控制表_dgv("顏色", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
-                    PictureBox1.Image = Nothing
-                    While dr.Read() = True
-                        Dim unused1 As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
-                        Dim oStream As New MemoryStream(bytes) : PictureBox1.Image = Bitmap.FromStream(oStream)
-                    End While
+                    If dr.Read() Then
+                        conn.Close()
+                        ConnOpen()
+                        SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 
+                                顏色 LIKE '" & 控制表_dgv("顏色", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                        CmdSet_For_dr()
+                        PictureBox1.Image = Nothing
+                        While dr.Read() = True
+                            Dim unused3 As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
+                            Dim oStream As New MemoryStream(bytes) : PictureBox1.Image = Bitmap.FromStream(oStream)
+                        End While
+                    Else
+                        conn.Close()
+                        ConnOpen()
+                        SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                        CmdSet_For_dr()
+                        PictureBox1.Image = Nothing
+                        While dr.Read() = True
+                            Dim unused1 As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
+                            Dim oStream As New MemoryStream(bytes) : PictureBox1.Image = Bitmap.FromStream(oStream)
+                        End While
+                    End If
                 End If
-            End If
-            conn.Close() : PictureBox1.SizeMode = 4
+                conn.Close() : PictureBox1.SizeMode = 4
 
-            ConnOpen()
-            SQL1 = "SELECT TOP(1) 驗貨報告 FROM 驗貨報告圖庫 WHERE 驗貨報告編號 LIKE '" & 控制表_dgv(67, e.RowIndex).Value.ToString & "'"
-            CmdSet_For_dr()
-            PictureBox2.Image = Nothing
-            While dr.Read() = True
-                Dim unused As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("驗貨報告"), Byte())
-                Dim oStream As New MemoryStream(bytes) : PictureBox2.Image = Bitmap.FromStream(oStream)
-            End While
-            conn.Close() : PictureBox2.SizeMode = 4
+                ConnOpen()
+                SQL1 = "SELECT TOP(1) 驗貨報告 FROM 驗貨報告圖庫 WHERE 驗貨報告編號 LIKE '" & 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString & "'"
+                CmdSet_For_dr()
+                PictureBox2.Image = Nothing
+                While dr.Read() = True
+                    Dim unused As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("驗貨報告"), Byte())
+                    Dim oStream As New MemoryStream(bytes) : PictureBox2.Image = Bitmap.FromStream(oStream)
+                End While
+                conn.Close() : PictureBox2.SizeMode = 4
 
-            驗貨報告 = 控制表_dgv(67, e.RowIndex).Value.ToString
+                驗貨報告 = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString
+            End If
         End If
     End Sub
     Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker2.MouseDown
@@ -1499,7 +1522,7 @@ Public Class 訂單控制表
         If e.RowIndex = 控制表_dgv.Rows.Count - 1 Then
             Exit Sub
         Else
-            If 控制表_dgv(0, e.RowIndex).Value.ToString <> 控制表_dgv(0, e.RowIndex + 1).Value.ToString Then
+            If 控制表_dgv("訂單流水號", e.RowIndex).Value.ToString <> 控制表_dgv("訂單流水號", 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
@@ -1810,8 +1833,62 @@ Public Class 訂單控制表
     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
-
+    Private Sub 啟用批量出貨_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 啟用批量出貨_ch.Click
+        If 啟用批量出貨_ch.Checked = False Then
+            批量出貨_bt.Enabled = False
+        Else
+            批量出貨_bt.Enabled = True
+        End If
+    End Sub
+    Private Sub 進度條()
+        平均數 = 10000 / 資料數
+        最終數 += 平均數
+        If 最終數 > 10000 Then : 最終數 = 10000 : End If
+        ProgressBar1.Value = 最終數
+    End Sub
+    Private Sub 批量出貨_bt_Click(sender As Object, e As EventArgs) Handles 批量出貨_bt.Click
+        aa = MsgBox("執行批量出貨之前需要在訂單控制表清單中先勾選要出貨的資料，請確定你已完成出貨資料選擇?", MsgBoxStyle.OkCancel)
+        If aa = MsgBoxResult.Ok Then
+            Dim EDR As Integer
+            For I As Integer = 0 To 控制表_dgv.Rows.Count - 1
+                資料數 = 控制表_dgv.Rows.Count : 進度條()
+                If 控制表_dgv("選擇", I).Value = True And 控制表_dgv("驗貨報告圖片", I).Value.ToString <> "" Then
+                    ConnOpen()
+                    SQL1 = "SELECT TOP (1) 貨款流水號 FROM 貨款匯入出款明細表 ORDER BY 貨款流水號 DESC"
+                    CmdSet_For_dr()
+                    If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("貨款流水號").ToString, 8)) : Else : EDR = 0 : End If
+                    conn.Close()
+                    EDR += 1
+                    If EDR < 10 Then : ESTR = "PG" & "0000000" & EDR
+                    ElseIf EDR > 9 And EDR < 100 Then : ESTR = "PG" & "000000" & EDR
+                    ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "PG" & "00000" & EDR
+                    ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "PG" & "0000" & EDR
+                    ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "PG" & "000" & EDR
+                    ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "PG" & "00" & EDR
+                    ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "PG" & "0" & EDR
+                    ElseIf EDR > 9999999 Then : ESTR = "PG" & EDR
+                    End If
+                    ConnOpen()
+                    SQL1 = "INSERT INTO 貨款匯入出款明細表 (貨款流水號, 資料流水號, 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 出貨數量, 工廠價格, 實際離廠日, 
+                                                            匯款時間, 入帳時間, 貨款備註) 
+                            VALUES ('" & ESTR & "','" & 控制表_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 & "', '', '', '')"
+                    CmdSet_For_dr()
+                    '--------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                    ConnOpen()
+                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET 實際離廠日 = '" & 控制表_dgv.Rows(I).Cells("工廠回復交期").Value & "', 出貨數量 = 訂單數量 " &
+                                                   "WHERE (訂單流水號 = '" & 控制表_dgv.Rows(I).Cells("訂單流水號").Value & "')"
+                    CmdSet_For_dr() : conn.Close()
+                End If
+            Next : ProgressBar1.Value = 0 : 最終數 = 0
+        End If : MsgBox("出貨資料作業完成") : Set_搜尋()
+    End Sub
+    Private Sub 清單全選_bt_Click(sender As Object, e As EventArgs) Handles 清單全選_bt.Click
+        For I As Integer = 0 To 控制表_dgv.Rows.Count - 1
+            控制表_dgv("選擇", I).Value = True
+        Next
     End Sub
 End Class