20240120備份

TENDEN-MES-SYS/0、Module/SQL_圖片資料庫管理.vb

@@ -22,11 +22,13 @@
         ConnOpen() : SQL1 = "SELECT  TOP (1) 圖片資料庫  FROM  圖片資料庫管理  WHERE  (是否可用 = 0)  ORDER BY  圖片資料庫" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_訂單清單()
-        SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片, 力威訂單號 FROM " & 訂單資料表(1) & " 
-                WHERE (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (驗貨時間 LIKE '') ORDER BY   SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
+        SQL1 = "SELECT    訂單流水號, 年份季度, 力威訂單號 AS 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 訂單種類, 生產工廠, 裁斷時間, 針車時間, 
+                          成型時間, 驗貨時間, 驗貨報告圖片, 客戶訂單號 AS 力威訂單號, 資料流水號 FROM " & 訂單資料表(1) & " 
+                WHERE    (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) AND (驗貨報告圖片 LIKE '' OR 驗貨報告圖片 IS NULL OR 驗貨報告圖片2 LIKE '' OR 驗貨報告圖片2 IS NULL) 
+                ORDER BY  SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
     End Sub
     Friend Sub SQL_訂單清單查詢()
-        SQL1 = "SELECT   訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片 FROM " & 訂單資料表(1) & " 
+        SQL1 = "SELECT   訂單流水號, 年份季度, 力威訂單號 AS 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 訂單種類, 生產工廠, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 驗貨報告圖片, 客戶訂單號 AS 力威訂單號 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 & "%' OR 力威訂單號 LIKE '%" & PA & "%') 
                 ORDER BY SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
@@ -38,39 +40,41 @@
     End Sub
     Friend Sub SQL_新增驗貨報告編號_測試()
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫() : ConnOpen_工程圖庫SQL()
-        'SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 驗貨報告) 
-        '                SELECT '" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "','" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "','" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', 
-        '                BULKCOLUMN FROM OPENROWSET ( BULK 'D:\FTP\TENDENZA\0004\" & 驗貨報告圖片導入資料庫.檔案名稱_tb.Text & "', SINGLE_BLOB) AS EMPLOYEEPICTURE"
-        SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 驗貨報告) 
+        SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 副檔名, 驗貨報告) 
                 SELECT N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "','" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "',
-                        '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', @binary_file"
+                        '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', '" & 驗貨報告圖片導入資料庫.副檔名_bt.Text & "', @binary_file"
         CmdSet_For_dr_pic()
     End Sub
     Friend Sub SQL_新增驗貨報告圖庫_正式()
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫() : ConnOpen_工程圖庫SQL()
-        'SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 驗貨報告) 
-        '                SELECT '" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "','" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "','" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', 
-        '                BULKCOLUMN FROM OPENROWSET ( BULK 'D:\TENDENZA\0004\" & 驗貨報告圖片導入資料庫.檔案名稱_tb.Text & "', SINGLE_BLOB) AS EMPLOYEEPICTURE"
-        SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 驗貨報告) 
+        SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 副檔名, 驗貨報告) 
                 SELECT N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "','" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "',
-                        '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', @binary_file"
+                        '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', '" & 驗貨報告圖片導入資料庫.副檔名_bt.Text & "', @binary_file"
         CmdSet_For_dr_pic()
     End Sub
     Friend Sub SQL_修改驗貨報告圖庫()
         ConnOpen()
         SQL1 = "UPDATE " & 訂單資料表(1) & " SET 驗貨時間 = '" & DTP & "', 驗貨報告圖片 = '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "', 驗報圖庫 = '" & PA20 & "'
-                WHERE (訂單流水號 LIKE '" & 驗貨報告圖片導入資料庫.天盾訂單號_tb.Text & "' AND 客戶訂單號 = '" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "' AND 
-                       形體號 = '" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "')"
+                WHERE (訂單流水號 LIKE N'" & 驗貨報告圖片導入資料庫.天盾訂單號_tb.Text & "' AND 客戶訂單號 LIKE N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "' AND 
+                       形體號 LIKE N'" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "')"
+        CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_修改驗貨報告圖庫1()
+        ConnOpen()
+        SQL1 = "UPDATE " & 訂單資料表(1) & " SET 驗貨報告圖片2 = '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "', 驗報圖庫2 = '" & PA20 & "'
+                WHERE (訂單流水號 LIKE N'" & 驗貨報告圖片導入資料庫.天盾訂單號_tb.Text & "' AND 客戶訂單號 LIKE N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "' AND 
+                       形體號 LIKE N'" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "')"
         CmdSet_For_dr()
     End Sub
     '------------------------------------------------驗貨報告資料庫-------------------------------------
     Friend Sub SQL_驗貨報告圖庫清單()
-        SQL1 = "SELECT     " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, " & PA20 & ".dbo.驗貨報告圖庫.客戶訂單號, " & PA20 & ".dbo.驗貨報告圖庫.型體名稱, 
-                           " & 訂單資料表(1) & ".顏色,  " & PA20 & ".dbo.驗貨報告圖庫.驗貨報告編號 
-                FROM       " & PA20 & ".dbo.驗貨報告圖庫 INNER JOIN " & 訂單資料表(1) & " ON " & PA20 & ".dbo.驗貨報告圖庫.客戶訂單號 = " & 訂單資料表(1) & ".客戶訂單號 
-                GROUP BY   " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, " & PA20 & ".dbo.驗貨報告圖庫.客戶訂單號, " & PA20 & ".dbo.驗貨報告圖庫.型體名稱, 
-                           " & 訂單資料表(1) & ".顏色, " & PA20 & ".dbo.驗貨報告圖庫.驗貨報告編號 
-                ORDER BY   " & PA20 & ".dbo.驗貨報告圖庫.客戶訂單號, " & PA20 & ".dbo.驗貨報告圖庫.型體名稱"
+        SQL1 = "SELECT DISTINCT 
+                           訂單流水號, 年份季度, 力威訂單號 AS 客戶訂單號, 形體號 AS 型體名稱, 顏色, 驗貨報告圖片 AS 驗貨報告編號, 
+                           驗報圖庫, 驗貨報告圖片2 AS 驗貨報告編號2,  驗報圖庫2
+                FROM      " & 訂單資料表(1) & "
+                WHERE      驗貨報告圖片 NOT LIKE '' AND 驗貨報告圖片 IS NOT NULL
+                GROUP BY   訂單流水號, 年份季度, 形體號, 顏色, 形體號, 力威訂單號, 驗貨報告圖片, 驗報圖庫, 驗貨報告圖片2, 驗報圖庫2
+                ORDER BY   客戶訂單號, 型體名稱"
     End Sub
     Friend Sub SQL_驗貨報告圖庫查詢()
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫()
@@ -123,6 +127,10 @@
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫()
         ConnOpen_工程圖庫SQL() : SQL1 = "SELECT TOP(1) 驗貨報告 FROM 驗貨報告圖庫 WHERE 驗貨報告編號 LIKE '" & PA2 & "'" : CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_驗貨報告檔案確認()
+        圖片庫 = PA1 : SQL_連線字串_圖片資料庫()
+        ConnOpen_工程圖庫SQL() : SQL1 = "SELECT TOP(1) 副檔名 FROM 驗貨報告圖庫 WHERE 驗貨報告編號 LIKE '" & PA2 & "'" : CmdSet_For_dr()
+    End Sub
     '----------------------鞋型圖片導入資料庫---------------------------------------------------
     Friend Sub SQL_季節清單()
         SQL1 = "SELECT  年份季度  FROM  訂單控制表年份季度清單  ORDER BY  年份季度"

TENDEN-MES-SYS/0、Module/SQL_成本系統管理.vb

@@ -71,7 +71,8 @@
                             " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling AS CollectedToolng, " & 訂單資料表(6) & ".年份, 
                             " & 訂單資料表(6) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(6) & ".Quantity AS 驗證, 
                             STYLELIST.ItemNumber, " & 訂單資料表(6) & ".審核, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".ProductID, 
-                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送
+                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, " & 訂單資料表(1) & ".工廠回復交期, 
+                            " & 訂單資料表(1) & ".TVW
                 FROM        " & 訂單資料表(1) & " LEFT OUTER JOIN
                             " & 訂單資料表(0) & " ON " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(0) & ".天盾流水號 LEFT OUTER JOIN
                             " & 訂單資料表(2) & " ON " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(2) & ".Colorway AND 
@@ -92,7 +93,8 @@
                             " & 訂單資料表(6) & ".EXWsaving, " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling, 
                             " & 訂單資料表(6) & ".年份, " & 訂單資料表(6) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(6) & ".Quantity, 
                             STYLELIST.ItemNumber, " & 訂單資料表(6) & ".審核, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".ProductID, 
-                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, " & 訂單資料表(6) & ".FTY廠價
+                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, " & 訂單資料表(6) & ".FTY廠價, 
+                            " & 訂單資料表(1) & ".工廠回復交期, " & 訂單資料表(1) & ".TVW
                 ORDER BY    " & 訂單資料表(1) & ".訂單流水號 DESC"
     End Sub
     '----------------------------------訂單價格利潤明細表--------------------------------------------------------------
@@ -571,6 +573,9 @@
     Friend Sub SQL_季節_下拉()
         ConnOpen() : SQL1 = "SELECT 年份季度 FROM 訂單控制表年份季度清單 ORDER BY 年份季度 DESC" : CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_Vendor()
+        ConnOpen() : SQL1 = "SELECT  VendorReference  FROM  訂單明細表抬頭_HP  GROUP BY  VendorReference  ORDER BY  VendorReference" : CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_Shipto_下拉()
         ConnOpen()
         SQL1 = "SELECT  CustomerName, DeliveryAddress  FROM  訂單明細表抬頭_HP  GROUP BY  CustomerName, DeliveryAddress  ORDER BY  CustomerName"
@@ -578,7 +583,7 @@
     End Sub
     Friend Sub SQL_訂單明細表讀取()
         ConnOpen()
-        SQL1 = "SELECT     天盾流水號, 客戶訂單號, ItemNumber, ProductName, ProductDescription, Color, DM, [5], [5.5], [6], [6.5], [7], [7.5], [8], 
+        SQL1 = "SELECT     天盾流水號, 客戶訂單號, ItemNumber AS Item, 裝箱 AS Item2, ProductName, ProductDescription, Color, DM, [5], [5.5], [6], [6.5], [7], [7.5], [8], 
                            [8.5], [9], [9.5], [10], [10.5], [11], [11.5], [12], [12.5], [13], [14], 
                            [5] + [5.5] + [6] + [6.5] + [7] + [7.5] + [8] + [8.5] + [9] + [9.5] + [10] + [10.5] + [11] + [11.5] + [12] + [12.5] + [13] + [14] AS TOTAL
                 FROM       " & 訂單資料表(5) & "
@@ -593,7 +598,7 @@
                                          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, 
+                          Confirm_XF AS 確認日期, Revised_XF AS 修訂日期, 工廠回復交期 AS 工廠交期, Special_Packaging,          Remarks,                出貨地,         TVW AS [STYLE #], 
                                           楦頭號,                   材質,                 七號模具,      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 驗貨, 
@@ -654,22 +659,25 @@
         ConnOpen()
         SQL1 = "UPDATE " & 訂單資料表(1) & " SET 年份季度 = N'" & PA3 & "', 客戶訂單號 = N'" & PA1 & "', 形體號 = N'" & PA4 & "', 顏色 = N'" & PA5 & "', 楦型 = N'" & PA6 & "', 
                                                  訂單數量 = N'" & PA16 & "', 客戶交期 = N'" & PA7 & "', 生產工廠 = N'" & PA8 & "', 訂單種類 = N'" & PA9 & "', 工廠回復交期 = N'" & PA10 & "', 
-                                                 PO_S_Date = N'" & PA7 & "', Requested_XF = N'" & PA7 & "', Confirm_XF = N'" & PA7 & "', 力威訂單號 = N'" & PA11 & "' 
+                                                 PO_S_Date = N'" & PA7 & "', Requested_XF = N'" & PA7 & "', Confirm_XF = N'" & PA7 & "', 力威訂單號 = N'" & PA11 & "',TVW =  N'" & PA35 & "' 
                 WHERE 資料流水號 LIKE N'" & PA13 & "'"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_Item_下拉()
-        ConnOpen() : SQL1 = "SELECT  ItemNumber  FROM  訂單明細表_HP  GROUP BY   ItemNumber  ORDER BY  ItemNumber" : CmdSet_For_dr()
+        ConnOpen() : SQL1 = "SELECT  ItemNumber  FROM  " & 訂單資料表(5) & "  GROUP BY   ItemNumber  ORDER BY  ItemNumber" : CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_Item2_下拉()
+        ConnOpen() : SQL1 = "SELECT  裝箱  FROM  " & 訂單資料表(5) & "  GROUP BY   裝箱  ORDER BY  裝箱" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_ProductDescription_下拉()
-        ConnOpen() : SQL1 = "SELECT  ProductDescription  FROM  訂單明細表_HP  GROUP BY   ProductDescription  ORDER BY  ProductDescription" : CmdSet_For_dr()
+        ConnOpen() : SQL1 = "SELECT  ProductDescription  FROM  " & 訂單資料表(5) & "  GROUP BY   ProductDescription  ORDER BY  ProductDescription" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_訂單明細表新增()
         ConnOpen()
         SQL1 = "INSERT INTO " & 訂單資料表(5) & " (天盾流水號, 客戶訂單號, ItemNumber, ProductName, ProductDescription, Color, DM, [5], [5.5], [6], [6.5], [7], [7.5], [8], [8.5], [9], 
-                                                   [9.5], [10], [10.5], [11], [11.5], [12], [12.5], [13], [14], 資料流水號) 
+                                                   [9.5], [10], [10.5], [11], [11.5], [12], [12.5], [13], [14], 資料流水號, 裝箱) 
                 VALUES ('" & PA2 & "','" & PA1 & "','" & PA12 & "', '" & PA4 & "','" & PA14 & "','" & PA5 & "','" & PA6 & "','0','0','0','0','0','0','0','0','0','0','0',
-                        '0','0','0','0','0','0','0','" & PA13 & "')"
+                        '0','0','0','0','0','0','0','" & PA13 & "', '" & PA15 & "')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_訂單明細表修改()
@@ -677,7 +685,7 @@
         SQL1 = "UPDATE " & 訂單資料表(5) & " SET 客戶訂單號 = N'" & PA1 & "', ItemNumber = N'" & PA12 & "', ProductName = N'" & PA4 & "', ProductDescription = N'" & PA14 & "', 
                 Color = N'" & PA5 & "', DM = N'" & PA6 & "', [5] = N'" & PA17 & "', [5.5] = N'" & PA18 & "', [6] = N'" & PA19 & "', [6.5] = N'" & PA20 & "', [7] = N'" & PA21 & "', 
                 [7.5] = N'" & PA22 & "', [8] = N'" & PA23 & "', [8.5] = N'" & PA24 & "', [9] = N'" & PA25 & "', [9.5] = N'" & PA26 & "', [10] = N'" & PA27 & "', [10.5] = N'" & PA28 & "', 
-                [11] = N'" & PA29 & "', [11.5] = N'" & PA30 & "', [12] = N'" & PA31 & "', [12.5] = N'" & PA32 & "', [13] = N'" & PA33 & "', [14] = N'" & PA34 & "' 
+                [11] = N'" & PA29 & "', [11.5] = N'" & PA30 & "', [12] = N'" & PA31 & "', [12.5] = N'" & PA32 & "', [13] = N'" & PA33 & "', [14] = N'" & PA34 & "', 裝箱 = N'" & PA & "'
                 WHERE 資料流水號 LIKE N'" & PA13 & "'"
         CmdSet_For_dr()
     End Sub

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

@@ -3,7 +3,7 @@
     Public g_conn_type, gUserName, 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, 登入人IP, AA(99), 圖片庫, SQL密碼 As String
     Public CC(99), 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2023112601"
+    Public 版本 As String = "2024012001"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
     '----系統用全域變數----------------------------------------------------------------------------------------------------------------------------------------------------------------------

TENDEN-MES-SYS/2、成本系統管理/出貨銷帳明細表.Designer.vb

@@ -318,7 +318,7 @@ Partial Class 出貨銷帳明細表
         Me.視窗2_pl.Controls.Add(Me.新增資料_bt)
         Me.視窗2_pl.Controls.Add(Me.Label6)
         Me.視窗2_pl.Controls.Add(Me.CanceL2_bt)
-        Me.視窗2_pl.Location = New System.Drawing.Point(9, 335)
+        Me.視窗2_pl.Location = New System.Drawing.Point(19, 335)
         Me.視窗2_pl.Name = "視窗2_pl"
         Me.視窗2_pl.Size = New System.Drawing.Size(1545, 408)
         Me.視窗2_pl.TabIndex = 1403

TENDEN-MES-SYS/2、成本系統管理/出貨銷帳明細表.vb

@@ -858,9 +858,11 @@ Public Class 出貨銷帳明細表
         PA = PO號_tb.Text : SQL_訂單流水號查詢()
         If dr.Read Then : PO號1_tb.Text = dr("訂單流水號").ToString : Else : PO號1_tb.Text = "" : End If
         lastFoundRowIndex = -1 : lastFoundColIndex = -1 : 查詢DGV中的關鍵字(利潤表_dgv, PO號_tb)
-        形體_tb.Text = 利潤表_dgv.Rows(NU1).Cells("形體號").Value.ToString
-        顏色_tb.Text = 利潤表_dgv.Rows(NU1).Cells("顏色").Value.ToString
-        楦型_tb.Text = 利潤表_dgv.Rows(NU1).Cells("楦型").Value.ToString
+        If NU1 < 利潤表_dgv.Rows.Count Then
+            形體_tb.Text = 利潤表_dgv.Rows(NU1).Cells("形體號").Value.ToString
+            顏色_tb.Text = 利潤表_dgv.Rows(NU1).Cells("顏色").Value.ToString
+            楦型_tb.Text = 利潤表_dgv.Rows(NU1).Cells("楦型").Value.ToString
+        End If
         lastFoundRowIndex = -1 : lastFoundColIndex = -1 : 查詢DGV中的關鍵字(控制表_dgv, PO號_tb)
         If PO號1_tb.Text = "" Then
             lastFoundRowIndex = -1 : lastFoundColIndex = -1 : 查詢DGV中的關鍵字(訂單明細表_dgv, PO號_tb)
@@ -875,9 +877,11 @@ Public Class 出貨銷帳明細表
         PA = PO號_tb.Text : SQL_訂單流水號查詢()
         If dr.Read Then : PO號1_tb.Text = dr("訂單流水號").ToString : Else : PO號1_tb.Text = "" : End If
         lastFoundRowIndex = -1 : lastFoundColIndex = -1 : 查詢DGV中的關鍵字(利潤表_dgv, PO號_tb)
-        形體_tb.Text = 利潤表_dgv.Rows(NU1).Cells("形體號").Value.ToString
-        顏色_tb.Text = 利潤表_dgv.Rows(NU1).Cells("顏色").Value.ToString
-        楦型_tb.Text = 利潤表_dgv.Rows(NU1).Cells("楦型").Value.ToString
+        If NU1 < 利潤表_dgv.Rows.Count Then
+            形體_tb.Text = 利潤表_dgv.Rows(NU1).Cells("形體號").Value.ToString
+            顏色_tb.Text = 利潤表_dgv.Rows(NU1).Cells("顏色").Value.ToString
+            楦型_tb.Text = 利潤表_dgv.Rows(NU1).Cells("楦型").Value.ToString
+        End If
         lastFoundRowIndex = -1 : lastFoundColIndex = -1 : 查詢DGV中的關鍵字(控制表_dgv, PO號_tb)
         If PO號1_tb.Text = "" Then
             lastFoundRowIndex = -1 : lastFoundColIndex = -1 : 查詢DGV中的關鍵字(訂單明細表_dgv, PO號_tb)
@@ -1051,39 +1055,56 @@ Public Class 出貨銷帳明細表
                         控制表_dgv.Rows(0).Cells("FTY_Payment_Date").Value = xlSheet.Cells(I + 2, 12).value
                         控制表_dgv.Rows(0).Cells("Remark").Value = xlSheet.Cells(I + 2, 13).value
                     End If
-                    Dim 新資料 As Boolean = True : Dim SX1, SX2 As Integer
+                    Dim 新資料 As Boolean = True : Dim SX1, SX2 As Double
                     For II As Integer = 0 To 銷帳_dgv.Rows.Count - 1
-                        If 銷帳_dgv(40, I).Value = True Then : Else
+                        If 銷帳_dgv(40, II).Value = True Then : Else
                             If 控制表_dgv.Rows(0).Cells("INV").Value.ToString.Replace(" ", "") = 銷帳_dgv.Rows(II).Cells("INV").Value.ToString.Replace(" ", "") And
                             控制表_dgv.Rows(0).Cells("訂單號").Value.ToString.Replace(" ", "") = 銷帳_dgv.Rows(II).Cells("訂單號").Value.ToString.Replace(" ", "") Then
                                 If CInt(控制表_dgv.Rows(0).Cells("訂單數").Value.ToString) = CInt(銷帳_dgv.Rows(II).Cells("訂單數").Value.ToString) Then
                                     If CInt(控制表_dgv.Rows(0).Cells("出貨數量").Value.ToString) = CInt(銷帳_dgv.Rows(II).Cells("出貨數量").Value.ToString) Then
                                         '-------------舊資料比對差異--------------------------------------------------------------------------------------
-                                        新資料 = False : 銷帳_dgv(40, I).Value = True
-                                        SX1 = CInt(控制表_dgv.Rows(0).Cells("FTY_PRICE").Value.ToString) : SX2 = CInt(銷帳_dgv.Rows(II).Cells("FTY_PRICE").Value.ToString)
+                                        新資料 = False : 銷帳_dgv(40, II).Value = True
+                                        SX1 = CDbl(控制表_dgv.Rows(0).Cells("FTY_PRICE").Value.ToString) : SX2 = CDbl(銷帳_dgv.Rows(II).Cells("FTY_PRICE").Value.ToString)
                                         If SX1 <> SX2 Then
                                             銷帳_dgv(38, II).Value = True : 差異數 += 1
-                                            For III As Integer = 2 To 10 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 13 To 21 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 22 To 27 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 28 To 36 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                            If 銷帳_dgv.Rows(II).Cells("已確認").Value = True Then
+                                                For III As Integer = 2 To 10 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 13 To 21 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 22 To 27 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 28 To 36 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                            Else
+                                                銷帳_dgv.Rows(II).Cells("FTY_PRICE").Value = SX1
+                                            End If
                                         End If
-                                        SX1 = CInt(控制表_dgv.Rows(0).Cells("扣關稅or後廠價").Value.ToString) : SX2 = CInt(銷帳_dgv.Rows(II).Cells("扣關稅or後廠價").Value.ToString)
+                                        SX1 = CDbl(控制表_dgv.Rows(0).Cells("扣關稅or後廠價").Value.ToString) : SX2 = CDbl(銷帳_dgv.Rows(II).Cells("扣關稅or後廠價").Value.ToString)
                                         If SX1 <> SX2 Then
                                             銷帳_dgv(38, II).Value = True : 差異數 += 1
-                                            For III As Integer = 2 To 10 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 13 To 21 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 22 To 27 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 28 To 36 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                            If 銷帳_dgv.Rows(II).Cells("已確認").Value = True Then
+                                                For III As Integer = 2 To 10 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 13 To 21 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 22 To 27 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 28 To 36 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                            Else
+                                                銷帳_dgv.Rows(II).Cells("扣關稅or後廠價").Value = SX1
+                                            End If
                                         End If
-                                        SX1 = CInt(控制表_dgv.Rows(0).Cells("CUST_Price").Value.ToString) : SX2 = CInt(銷帳_dgv.Rows(II).Cells("CUST_Price").Value.ToString)
+                                        SX1 = CDbl(控制表_dgv.Rows(0).Cells("CUST_Price").Value.ToString) : SX2 = CDbl(銷帳_dgv.Rows(II).Cells("CUST_Price").Value.ToString)
                                         If SX1 <> SX2 Then
                                             銷帳_dgv(38, II).Value = True : 差異數 += 1
-                                            For III As Integer = 2 To 10 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 13 To 21 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 22 To 27 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                            For III As Integer = 28 To 36 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
-                                        End If : Exit For
+                                            If 銷帳_dgv.Rows(II).Cells("已確認").Value = True Then
+                                                For III As Integer = 2 To 10 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 13 To 21 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 22 To 27 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                                For III As Integer = 28 To 36 : 銷帳_dgv.Rows(II).Cells(III).Style.BackColor = Color.LightPink : Next
+                                            Else
+                                                銷帳_dgv.Rows(II).Cells("CUST_Price").Value = SX1
+                                            End If
+                                        End If
+                                        '銷帳_dgv.Rows(II).Cells("EX_FTY_DATE").Value = 控制表_dgv.Rows(0).Cells("EX_FTY_DATE").Value
+                                        銷帳_dgv.Rows(II).Cells("Maturity_Date").Value = 控制表_dgv.Rows(0).Cells("Maturity_Date").Value
+                                        銷帳_dgv.Rows(II).Cells("FTY_Payment_Date").Value = 控制表_dgv.Rows(0).Cells("FTY_Payment_Date").Value
+                                        銷帳_dgv.Rows(II).Cells("Remark").Value = 控制表_dgv.Rows(0).Cells("Remark").Value
+                                        Exit For
                                     End If
                                 End If
                             End If

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

@@ -22,10 +22,12 @@ Partial Class 列印_訂單價格利潤表
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.取消列印_bt = New System.Windows.Forms.Button()
         Me.確認列印_bt = New System.Windows.Forms.Button()
         Me.利潤表_dgv = New System.Windows.Forms.DataGridView()
+        Me.CB_1 = New System.Windows.Forms.CheckBox()
+        Me.CB_2 = New System.Windows.Forms.CheckBox()
         CType(Me.利潤表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -33,7 +35,7 @@ Partial Class 列印_訂單價格利潤表
         '
         Me.取消列印_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.取消列印_bt.ForeColor = System.Drawing.Color.Red
-        Me.取消列印_bt.Location = New System.Drawing.Point(128, 12)
+        Me.取消列印_bt.Location = New System.Drawing.Point(128, 36)
         Me.取消列印_bt.Name = "取消列印_bt"
         Me.取消列印_bt.Size = New System.Drawing.Size(110, 54)
         Me.取消列印_bt.TabIndex = 314
@@ -44,7 +46,7 @@ Partial Class 列印_訂單價格利潤表
         '
         Me.確認列印_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.確認列印_bt.ForeColor = System.Drawing.Color.Blue
-        Me.確認列印_bt.Location = New System.Drawing.Point(12, 12)
+        Me.確認列印_bt.Location = New System.Drawing.Point(12, 36)
         Me.確認列印_bt.Name = "確認列印_bt"
         Me.確認列印_bt.Size = New System.Drawing.Size(110, 54)
         Me.確認列印_bt.TabIndex = 313
@@ -53,36 +55,65 @@ Partial Class 列印_訂單價格利潤表
         '
         '利潤表_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.利潤表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.利潤表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.利潤表_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.利潤表_dgv.Location = New System.Drawing.Point(12, 12)
+        Me.利潤表_dgv.Location = New System.Drawing.Point(12, 114)
         Me.利潤表_dgv.Name = "利潤表_dgv"
         Me.利潤表_dgv.RowHeadersWidth = 5
         Me.利潤表_dgv.RowTemplate.Height = 24
         Me.利潤表_dgv.Size = New System.Drawing.Size(775, 143)
         Me.利潤表_dgv.TabIndex = 312
         '
+        'CB_1
+        '
+        Me.CB_1.AutoSize = True
+        Me.CB_1.Checked = True
+        Me.CB_1.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.CB_1.Location = New System.Drawing.Point(12, 10)
+        Me.CB_1.Name = "CB_1"
+        Me.CB_1.Size = New System.Drawing.Size(107, 20)
+        Me.CB_1.TabIndex = 315
+        Me.CB_1.Text = "顯示 FTY DATE"
+        Me.CB_1.UseVisualStyleBackColor = True
+        '
+        'CB_2
+        '
+        Me.CB_2.AutoSize = True
+        Me.CB_2.Location = New System.Drawing.Point(128, 10)
+        Me.CB_2.Name = "CB_2"
+        Me.CB_2.Size = New System.Drawing.Size(111, 20)
+        Me.CB_2.TabIndex = 316
+        Me.CB_2.Text = "顯示 Product Id"
+        Me.CB_2.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(250, 73)
+        Me.ClientSize = New System.Drawing.Size(250, 95)
+        Me.Controls.Add(Me.CB_2)
+        Me.Controls.Add(Me.CB_1)
         Me.Controls.Add(Me.取消列印_bt)
         Me.Controls.Add(Me.確認列印_bt)
         Me.Controls.Add(Me.利潤表_dgv)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
         Me.Name = "列印_訂單價格利潤表"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "訂單價格利潤表列印"
         CType(Me.利潤表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents 取消列印_bt As Button
     Friend WithEvents 確認列印_bt As Button
     Friend WithEvents 利潤表_dgv As DataGridView
+    Friend WithEvents CB_1 As CheckBox
+    Friend WithEvents CB_2 As CheckBox
 End Class
 

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

@@ -45,99 +45,102 @@ Public Class 列印_訂單價格利潤表
 
         xlSheet.Cells(3, 1) = "Tendenza Po#"
         xlSheet.Cells(3, 2) = "Season"
-        xlSheet.Cells(3, 3) = "力威 Po#"
+        xlSheet.Cells(3, 3) = "Po#"
         xlSheet.Cells(3, 4) = "Style"
-        xlSheet.Cells(3, 5) = "CLR"
-        xlSheet.Cells(3, 6) = "Product Id"
+        xlSheet.Cells(3, 5) = "Style #"
+        xlSheet.Cells(3, 6) = "CLR"
+        If CB_1.Checked = True Then : xlSheet.Cells(3, 7) = "FTY DATE" : Else : xlSheet.Cells(3, 7) = "Product Id" : End If
 
-        xlSheet.Cells(3, 7) = "DM"
-        xlSheet.Cells(3, 8) = "PRS"
-        xlSheet.Cells(3, 9) = "X/F Date"
-        xlSheet.Cells(3, 10) = "Price"
-        xlSheet.Cells(3, 11) = "Amount"
-        xlSheet.Cells(3, 12) = "Remark"
-        xlSheet.Cells(3, 13) = "Factory"
-        xlSheet.Cells(3, 14) = "DIV"
-        xlSheet.Cells(3, 15) = "FTY Price"
-        xlSheet.Cells(3, 16) = "Commission TTL"
-        xlSheet.Cells(3, 17) = "Commission Darren"
-        xlSheet.Cells(3, 18) = "Commission Tendenza"
-        xlSheet.Cells(3, 19) = "%"
-        xlSheet.Cells(3, 20) = "Basic Price(+)"
-        xlSheet.Cells(3, 21) = "PG/MOQ (+)"
-        xlSheet.Cells(3, 22) = "Foot form/ PET form(+)"
-        xlSheet.Cells(3, 23) = "Tooling (+)"
-        xlSheet.Cells(3, 24) = "Rubber Band(+)"
-        xlSheet.Cells(3, 25) = "J.HOOK (+)"
-        xlSheet.Cells(3, 26) = "Water Resistant(+)"
-        xlSheet.Cells(3, 27) = "16% VAT(+)"
-        xlSheet.Cells(3, 28) = "EXW Saving(-)"
-        xlSheet.Cells(3, 29) = "TTL Collected Toolng"
-        xlSheet.Cells(3, 30) = "Exchange"
-        xlSheet.Cells(1, 7) = "Total-PRS"
-        xlSheet.Cells(1, 11) = "Total-Amount"
-        xlSheet.Cells(1, 15) = "Total-Commission-TTL"
-        xlSheet.Cells(1, 17) = "Total-Commission-Darren"
-        xlSheet.Cells(1, 18) = "Total-Commission-Tendenza"
-        xlSheet.Cells(1, 29) = "Total-TTL Collected Toolng"
-        xlSheet.Cells(2, 7) = "=SUBTOTAL(9,H4:H$99999)"
-        xlSheet.Cells(2, 11) = "=SUBTOTAL(9,K4:K$99999)"
-        xlSheet.Cells(2, 15) = "=SUBTOTAL(9,P4:P$99999)"
-        xlSheet.Cells(2, 17) = "=SUBTOTAL(9,Q4:Q$99999)"
-        xlSheet.Cells(2, 18) = "=SUBTOTAL(9,R4:R$99999)"
-        xlSheet.Cells(2, 29) = "=SUBTOTAL(9,AC4:AC$99999)"
-        xlSheet.Cells(3, 31) = "ItemNumber"
-        xlSheet.Cells(3, 32) = "審核"
-        xlSheet.Cells(3, 33) = "Vionic Po#"
-        xlSheet.Cells(3, 34) = "Ship Mode"
-        xlSheet.Cells(3, 35) = "Company code"
-        xlSheet.Cells(3, 36) = "Final Customer Ship To"
+        xlSheet.Cells(3, 8) = "DM"
+        xlSheet.Cells(3, 9) = "PRS"
+        xlSheet.Cells(3, 10) = "X/F Date"
+        xlSheet.Cells(3, 11) = "Price"
+        xlSheet.Cells(3, 12) = "Amount"
+        xlSheet.Cells(3, 13) = "Remark"
+        xlSheet.Cells(3, 14) = "Factory"
+        xlSheet.Cells(3, 15) = "DIV"
+        xlSheet.Cells(3, 16) = "FTY Price"
+        xlSheet.Cells(3, 17) = "Commission TTL"
+        xlSheet.Cells(3, 18) = "Commission Darren"
+        xlSheet.Cells(3, 19) = "Commission Tendenza"
+        xlSheet.Cells(3, 20) = "%"
+        xlSheet.Cells(3, 21) = "Basic Price(+)"
+        xlSheet.Cells(3, 22) = "PG/MOQ (+)"
+        xlSheet.Cells(3, 23) = "Foot form/ PET form(+)"
+        xlSheet.Cells(3, 24) = "Tooling (+)"
+        xlSheet.Cells(3, 25) = "Rubber Band(+)"
+        xlSheet.Cells(3, 26) = "J.HOOK (+)"
+        xlSheet.Cells(3, 27) = "Water Resistant(+)"
+        xlSheet.Cells(3, 28) = "16% VAT(+)"
+        xlSheet.Cells(3, 29) = "EXW Saving(-)"
+        xlSheet.Cells(3, 30) = "TTL Collected Toolng"
+        xlSheet.Cells(3, 31) = "Exchange"
+        xlSheet.Cells(1, 8) = "Total-PRS"
+        xlSheet.Cells(1, 12) = "Total-Amount"
+        xlSheet.Cells(1, 16) = "Total-Commission-TTL"
+        xlSheet.Cells(1, 18) = "Total-Commission-Darren"
+        xlSheet.Cells(1, 19) = "Total-Commission-Tendenza"
+        xlSheet.Cells(1, 30) = "Total-TTL Collected Toolng"
+        xlSheet.Cells(2, 8) = "=SUBTOTAL(9,M4:H$99999)"
+        xlSheet.Cells(2, 12) = "=SUBTOTAL(9,L4:K$99999)"
+        xlSheet.Cells(2, 16) = "=SUBTOTAL(9,Q4:P$99999)"
+        xlSheet.Cells(2, 18) = "=SUBTOTAL(9,R4:Q$99999)"
+        xlSheet.Cells(2, 19) = "=SUBTOTAL(9,S4:R$99999)"
+        xlSheet.Cells(2, 30) = "=SUBTOTAL(9,AD4:AC$99999)"
+        xlSheet.Cells(3, 32) = "ItemNumber"
+        xlSheet.Cells(3, 33) = "審核"
+        xlSheet.Cells(3, 34) = "Vionic Po#"
+        xlSheet.Cells(3, 35) = "Ship Mode"
+        xlSheet.Cells(3, 36) = "Company code"
+        xlSheet.Cells(3, 37) = "Final Customer Ship To"
         AA(xlApp, xlSheet)
         For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1
             xlSheet.Cells(i + 4, 1) = 利潤表_dgv.Rows(i).Cells("訂單流水號").Value
             xlSheet.Cells(i + 4, 2) = 利潤表_dgv.Rows(i).Cells("年份季度").Value
             xlSheet.Cells(i + 4, 3) = 利潤表_dgv.Rows(i).Cells("力威訂單號").Value
             xlSheet.Cells(i + 4, 4) = 利潤表_dgv.Rows(i).Cells("形體號").Value
-            xlSheet.Cells(i + 4, 5) = 利潤表_dgv.Rows(i).Cells("顏色").Value
-            xlSheet.Cells(i + 4, 6) = 利潤表_dgv.Rows(i).Cells("ProductID").Value
+            xlSheet.Cells(i + 4, 5) = 利潤表_dgv.Rows(i).Cells("TVW").Value
+            xlSheet.Cells(i + 4, 6) = 利潤表_dgv.Rows(i).Cells("顏色").Value
+            If CB_1.Checked = True Then : xlSheet.Cells(i + 4, 7) = 利潤表_dgv.Rows(i).Cells("工廠回復交期").Value
+            Else : xlSheet.Cells(i + 4, 7) = 利潤表_dgv.Rows(i).Cells("ProductID").Value : End If
 
-            xlSheet.Cells(i + 4, 7) = 利潤表_dgv.Rows(i).Cells("楦型").Value
-            xlSheet.Cells(i + 4, 8) = 利潤表_dgv.Rows(i).Cells("數量").Value
-            xlSheet.Cells(i + 4, 9) = 利潤表_dgv.Rows(i).Cells("客戶交期").Value
-            xlSheet.Cells(i + 4, 10) = "=T" & i + 4 & "+U" & i + 4 & "+V" & i + 4 & "+W" & i + 4 & "+X" & i + 4 & "+Y" & i + 4 & "+Z" & i + 4 & "+AA" & i + 4 & "/AD" & i + 4 & "-AB" & i + 4
-            xlSheet.Cells(i + 4, 11) = "=H" & i + 4 & "*J" & i + 4 & ""
-            xlSheet.Cells(i + 4, 12) = 利潤表_dgv.Rows(i).Cells("備註").Value
-            xlSheet.Cells(i + 4, 13) = 利潤表_dgv.Rows(i).Cells("工廠").Value
-            xlSheet.Cells(i + 4, 14) = 利潤表_dgv.Rows(i).Cells("訂單種類").Value
+            xlSheet.Cells(i + 4, 8) = 利潤表_dgv.Rows(i).Cells("楦型").Value
+            xlSheet.Cells(i + 4, 9) = 利潤表_dgv.Rows(i).Cells("數量").Value
+            xlSheet.Cells(i + 4, 10) = 利潤表_dgv.Rows(i).Cells("客戶交期").Value
+            xlSheet.Cells(i + 4, 11) = "=U" & i + 4 & "+V" & i + 4 & "+W" & i + 4 & "+X" & i + 4 & "+Y" & i + 4 & "+Z" & i + 4 & "+AA" & i + 4 & "+AB" & i + 4 & "/AE" & i + 4 & "-AC" & i + 4
+            xlSheet.Cells(i + 4, 12) = "=I" & i + 4 & "*K" & i + 4 & ""
+            xlSheet.Cells(i + 4, 13) = 利潤表_dgv.Rows(i).Cells("備註").Value
+            xlSheet.Cells(i + 4, 14) = 利潤表_dgv.Rows(i).Cells("工廠").Value
+            xlSheet.Cells(i + 4, 15) = 利潤表_dgv.Rows(i).Cells("訂單種類").Value
             If BL1 = True Then
-                xlSheet.Cells(i + 4, 15) = 利潤表_dgv.Rows(i).Cells("FTY_2").Value
-                xlSheet.Cells(i + 4, 16) = "=K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & ")"
-                xlSheet.Cells(i + 4, 17) = "=(K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & "))/2"
-                xlSheet.Cells(i + 4, 18) = "=(K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & "))/2"
+                xlSheet.Cells(i + 4, 16) = 利潤表_dgv.Rows(i).Cells("FTY_2").Value
+                xlSheet.Cells(i + 4, 17) = "=L" & i + 4 & "-(I" & i + 4 & "*P" & i + 4 & ")"
+                xlSheet.Cells(i + 4, 18) = "=(L" & i + 4 & "-(I" & i + 4 & "*P" & i + 4 & "))/2"
+                xlSheet.Cells(i + 4, 19) = "=(L" & i + 4 & "-(I" & i + 4 & "*P" & i + 4 & "))/2"
             Else
-                xlSheet.Cells(i + 4, 15) = 利潤表_dgv.Rows(i).Cells("FTY_1").Value
-                xlSheet.Cells(i + 4, 16) = "=K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & ")"
-                xlSheet.Cells(i + 4, 17) = "0"
+                xlSheet.Cells(i + 4, 16) = 利潤表_dgv.Rows(i).Cells("FTY_1").Value
+                xlSheet.Cells(i + 4, 17) = "=L" & i + 4 & "-(I" & i + 4 & "*P" & i + 4 & ")"
                 xlSheet.Cells(i + 4, 18) = "0"
+                xlSheet.Cells(i + 4, 19) = "0"
             End If
-            xlSheet.Cells(i + 4, 19) = "=IF(K" & i + 4 & "=0,0,(K" & i + 4 & "-H" & i + 4 & "*O" & i + 4 & ")/K" & i + 4 & ")"
-            xlSheet.Cells(i + 4, 20) = 利潤表_dgv.Rows(i).Cells("BasicPrice").Value
-            xlSheet.Cells(i + 4, 21) = 利潤表_dgv.Rows(i).Cells("Polybag").Value
-            xlSheet.Cells(i + 4, 22) = 利潤表_dgv.Rows(i).Cells("FOOTorPET").Value
-            xlSheet.Cells(i + 4, 23) = 利潤表_dgv.Rows(i).Cells("Tooling").Value
-            xlSheet.Cells(i + 4, 24) = 利潤表_dgv.Rows(i).Cells("RubberBand").Value
-            xlSheet.Cells(i + 4, 25) = 利潤表_dgv.Rows(i).Cells("JHOOK").Value
-            xlSheet.Cells(i + 4, 26) = 利潤表_dgv.Rows(i).Cells("WaterResistant").Value
-            xlSheet.Cells(i + 4, 27) = 利潤表_dgv.Rows(i).Cells("P16VAT").Value
-            xlSheet.Cells(i + 4, 28) = 利潤表_dgv.Rows(i).Cells("EXWsaving").Value
-            xlSheet.Cells(i + 4, 29) = "=W" & i + 4 & "*H" & i + 4 & ""
-            xlSheet.Cells(i + 4, 30) = 利潤表_dgv.Rows(i).Cells("Exchange").Value
-            xlSheet.Cells(i + 4, 31) = 利潤表_dgv.Rows(i).Cells("ItemNumber").Value
-            xlSheet.Cells(i + 4, 32) = 利潤表_dgv.Rows(i).Cells("審核").Value
-            xlSheet.Cells(i + 4, 33) = 利潤表_dgv.Rows(i).Cells("客戶訂單號").Value
-            xlSheet.Cells(i + 4, 34) = 利潤表_dgv.Rows(i).Cells("SalesOrder").Value
-            xlSheet.Cells(i + 4, 35) = 利潤表_dgv.Rows(i).Cells("CustomerName").Value
-            xlSheet.Cells(i + 4, 36) = 利潤表_dgv.Rows(i).Cells("最終運送").Value
+            xlSheet.Cells(i + 4, 20) = "=IF(L" & i + 4 & "=0,0,(L" & i + 4 & "-I" & i + 4 & "*P" & i + 4 & ")/L" & i + 4 & ")"
+            xlSheet.Cells(i + 4, 21) = 利潤表_dgv.Rows(i).Cells("BasicPrice").Value
+            xlSheet.Cells(i + 4, 22) = 利潤表_dgv.Rows(i).Cells("Polybag").Value
+            xlSheet.Cells(i + 4, 23) = 利潤表_dgv.Rows(i).Cells("FOOTorPET").Value
+            xlSheet.Cells(i + 4, 24) = 利潤表_dgv.Rows(i).Cells("Tooling").Value
+            xlSheet.Cells(i + 4, 25) = 利潤表_dgv.Rows(i).Cells("RubberBand").Value
+            xlSheet.Cells(i + 4, 26) = 利潤表_dgv.Rows(i).Cells("JHOOK").Value
+            xlSheet.Cells(i + 4, 27) = 利潤表_dgv.Rows(i).Cells("WaterResistant").Value
+            xlSheet.Cells(i + 4, 28) = 利潤表_dgv.Rows(i).Cells("P16VAT").Value
+            xlSheet.Cells(i + 4, 29) = 利潤表_dgv.Rows(i).Cells("EXWsaving").Value
+            xlSheet.Cells(i + 4, 30) = "=X" & i + 4 & "*I" & i + 4 & ""
+            xlSheet.Cells(i + 4, 31) = 利潤表_dgv.Rows(i).Cells("Exchange").Value
+            xlSheet.Cells(i + 4, 32) = 利潤表_dgv.Rows(i).Cells("ItemNumber").Value
+            xlSheet.Cells(i + 4, 33) = 利潤表_dgv.Rows(i).Cells("審核").Value
+            xlSheet.Cells(i + 4, 34) = 利潤表_dgv.Rows(i).Cells("客戶訂單號").Value
+            xlSheet.Cells(i + 4, 35) = 利潤表_dgv.Rows(i).Cells("SalesOrder").Value
+            xlSheet.Cells(i + 4, 36) = 利潤表_dgv.Rows(i).Cells("CustomerName").Value
+            xlSheet.Cells(i + 4, 37) = 利潤表_dgv.Rows(i).Cells("最終運送").Value
             With xlApp.Selection
                 .Font.Bold = True
             End With
@@ -163,24 +166,24 @@ Public Class 列印_訂單價格利潤表
         Dim 位置1 As String
         xlSheet.Columns("A:A").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("B:B").Select : myExcel.Selection.ColumnWidth = 8
         xlSheet.Columns("C:C").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("D:D").Select : myExcel.Selection.ColumnWidth = 9
-        xlSheet.Columns("E:E").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("F:F").Select : myExcel.Selection.ColumnWidth = 13
+        xlSheet.Columns("E:F").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("G:G").Select : myExcel.Selection.ColumnWidth = 13
 
-        xlSheet.Columns("G:G").Select : myExcel.Selection.ColumnWidth = 5
-        xlSheet.Columns("H:H").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("I:I").Select : myExcel.Selection.ColumnWidth = 9
-        xlSheet.Columns("J:J").Select : myExcel.Selection.ColumnWidth = 5.5 : xlSheet.Columns("K:K").Select : myExcel.Selection.ColumnWidth = 11
-        xlSheet.Columns("L:L").Select : myExcel.Selection.ColumnWidth = 6.5 : xlSheet.Columns("M:M").Select : myExcel.Selection.ColumnWidth = 10
-        xlSheet.Columns("N:N").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("O:O").Select : myExcel.Selection.ColumnWidth = 11
-        xlSheet.Columns("P:P").Select : myExcel.Selection.ColumnWidth = 14 : xlSheet.Columns("Q:Q").Select : myExcel.Selection.ColumnWidth = 11
-        xlSheet.Columns("R:R").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("S:S").Select : myExcel.Selection.ColumnWidth = 6.5
-        xlSheet.Columns("T:T").Select : myExcel.Selection.ColumnWidth = 7 : xlSheet.Columns("U:U").Select : myExcel.Selection.ColumnWidth = 7
-        xlSheet.Columns("V:V").Select : myExcel.Selection.ColumnWidth = 7 : xlSheet.Columns("W:W").Select : myExcel.Selection.ColumnWidth = 6
-        xlSheet.Columns("X:X").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("Y:Y").Select : myExcel.Selection.ColumnWidth = 6.5
-        xlSheet.Columns("Z:Z").Select : myExcel.Selection.ColumnWidth = 5 : xlSheet.Columns("AA:AA").Select : myExcel.Selection.ColumnWidth = 5
-        xlSheet.Columns("AB:AB").Select : myExcel.Selection.ColumnWidth = 9 : xlSheet.Columns("AC:AC").Select : myExcel.Selection.ColumnWidth = 8
-        xlSheet.Columns("AD:AD").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("AE:AE").Select : myExcel.Selection.ColumnWidth = 11
-        xlSheet.Columns("AF:AF").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("AG:AG").Select : myExcel.Selection.ColumnWidth = 13
-        xlSheet.Columns("AH:AH").Select : myExcel.Selection.ColumnWidth = 14 : xlSheet.Columns("AI:AI").Select : myExcel.Selection.ColumnWidth = 8
-        xlSheet.Columns("AJ:AJ").Select : myExcel.Selection.ColumnWidth = 75
+        xlSheet.Columns("H:H").Select : myExcel.Selection.ColumnWidth = 5
+        xlSheet.Columns("I:I").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("J:J").Select : myExcel.Selection.ColumnWidth = 9
+        xlSheet.Columns("K:K").Select : myExcel.Selection.ColumnWidth = 5.5 : xlSheet.Columns("L:L").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("M:M").Select : myExcel.Selection.ColumnWidth = 6.5 : xlSheet.Columns("N:N").Select : myExcel.Selection.ColumnWidth = 10
+        xlSheet.Columns("O:O").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("P:P").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("Q:Q").Select : myExcel.Selection.ColumnWidth = 14 : xlSheet.Columns("R:E").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("S:S").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("T:T").Select : myExcel.Selection.ColumnWidth = 6.5
+        xlSheet.Columns("U:U").Select : myExcel.Selection.ColumnWidth = 7 : xlSheet.Columns("V:V").Select : myExcel.Selection.ColumnWidth = 7
+        xlSheet.Columns("W:W").Select : myExcel.Selection.ColumnWidth = 7 : xlSheet.Columns("X:X").Select : myExcel.Selection.ColumnWidth = 6
+        xlSheet.Columns("Y:Y").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("Z:Z").Select : myExcel.Selection.ColumnWidth = 6.5
+        xlSheet.Columns("AA:AA").Select : myExcel.Selection.ColumnWidth = 5 : xlSheet.Columns("AB:AB").Select : myExcel.Selection.ColumnWidth = 5
+        xlSheet.Columns("AC:AC").Select : myExcel.Selection.ColumnWidth = 9 : xlSheet.Columns("AD:AD").Select : myExcel.Selection.ColumnWidth = 8
+        xlSheet.Columns("AE:AE").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("AF:AF").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("AG:AG").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("AH:AH").Select : myExcel.Selection.ColumnWidth = 13
+        xlSheet.Columns("AI:AI").Select : myExcel.Selection.ColumnWidth = 14 : xlSheet.Columns("AJ:AJ").Select : myExcel.Selection.ColumnWidth = 8
+        xlSheet.Columns("AK:AK").Select : myExcel.Selection.ColumnWidth = 75
 
 
         xlSheet.Cells.Select()
@@ -211,63 +214,63 @@ Public Class 列印_訂單價格利潤表
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
         End With
         xlSheet.Columns("A:A").Select
-        xlSheet.Columns("H:H").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
-        xlSheet.Columns("I:I").Select : myExcel.Selection.NumberFormatLocal = "yyyy/mm/dd"
-        xlSheet.Columns("J:K").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
-        xlSheet.Columns("O:R").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
-        xlSheet.Range("G2:H2").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
-        xlSheet.Columns("S:S").Select : myExcel.Selection.NumberFormatLocal = "0.00%"
+        xlSheet.Columns("I:I").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
+        xlSheet.Columns("J:J").Select : myExcel.Selection.NumberFormatLocal = "yyyy/mm/dd"
+        xlSheet.Columns("K:L").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
+        xlSheet.Columns("P:S").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
+        xlSheet.Range("H2:I2").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
+        xlSheet.Columns("T:T").Select : myExcel.Selection.NumberFormatLocal = "0.00%"
         myExcel.ActiveWindow.ScrollColumn = 2 : myExcel.ActiveWindow.ScrollColumn = 3 : myExcel.ActiveWindow.ScrollColumn = 4
-        xlSheet.Columns("T:AC").Select : myExcel.Selection.NumberFormatLocal = "_-* #,##0.00_-;-* #,##0.00_-;_-* ""-""??_-;_-@_-"
+        xlSheet.Columns("U:AD").Select : myExcel.Selection.NumberFormatLocal = "_-* #,##0.00_-;-* #,##0.00_-;_-* ""-""??_-;_-@_-"
         myExcel.ActiveWindow.ScrollColumn = 3 : myExcel.ActiveWindow.ScrollColumn = 2 : myExcel.ActiveWindow.ScrollColumn = 1
         xlSheet.Rows("4:4").Select : myExcel.ActiveWindow.FreezePanes = True
-        xlSheet.Range("H6").Select()
+        xlSheet.Range("I6").Select()
 
-        xlSheet.Range("A1:E2").Select() : With myExcel.Selection
+        xlSheet.Range("A1:F2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("G1:H1").Select() : With myExcel.Selection
+        xlSheet.Range("H1:I1").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("G2:H2").Select() : With myExcel.Selection
+        xlSheet.Range("H2:I2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("I1:J2").Select() : With myExcel.Selection
+        xlSheet.Range("J1:K2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("L1:N2").Select() : With myExcel.Selection
+        xlSheet.Range("M1:O2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("O1:P1").Select() : With myExcel.Selection
+        xlSheet.Range("P1:Q1").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("O2:P2").Select() : With myExcel.Selection
+        xlSheet.Range("P2:Q2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("R1:S1").Select() : With myExcel.Selection
+        xlSheet.Range("S1:T1").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("R2:S2").Select() : With myExcel.Selection
+        xlSheet.Range("S2:T2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("T1:AA2").Select() : With myExcel.Selection
+        xlSheet.Range("U1:AB2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("AB1:AC1").Select() : With myExcel.Selection
+        xlSheet.Range("AC1:AD1").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("AB2:AC2").Select() : With myExcel.Selection
+        xlSheet.Range("AC2:AD2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
 
-        xlSheet.Range("A1:N3").Select() : With myExcel.Selection.Interior
+        xlSheet.Range("A1:O3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorDark2 : .TintAndShade = -0.0999786370433668 : .PatternTintAndShade = 0 : End With
-        xlSheet.Range("O1:S3").Select() : With myExcel.Selection.Interior
+        xlSheet.Range("O1:T3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535 : .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
-        xlSheet.Range("T1:AC3").Select() : With myExcel.Selection.Interior
+        xlSheet.Range("U1:AD3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorAccent6 : .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
 
-        xlSheet.Range("A1:AJ3").Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
+        xlSheet.Range("A1:AK3").Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeBottom) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -281,7 +284,7 @@ Public Class 列印_訂單價格利潤表
         For M = 4 To 利潤表_dgv.Rows.Count + 2
             M += 1
         Next M
-        位置1 = "A4:AJ" & M
+        位置1 = "A4:AK" & M
         xlSheet.Range(位置1).Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -290,15 +293,21 @@ Public Class 列印_訂單價格利潤表
         With myExcel.Selection.Borders(xlInsideVertical) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlHairline : End With
         With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlHairline : End With
 
-        xlSheet.Range("AE1:AP2").Select()
+        xlSheet.Range("AF1:AQ2").Select()
         With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
         End With : myExcel.Selection.Merge
 
-        xlSheet.Range("AJ4:AJ" & M).Select()
+        xlSheet.Range("AK4:AK" & M).Select()
         With myExcel.Selection : .HorizontalAlignment = xlGeneral : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
             .IndentLevel = 0 : .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
 
         myExcel.ActiveWindow.DisplayGridlines = False
     End Sub
+    Private Sub CB_1_CheckedChanged(sender As Object, e As EventArgs) Handles CB_1.Click
+        CB_1.Checked = True : CB_2.Checked = False
+    End Sub
+    Private Sub CB_2_CheckedChanged(sender As Object, e As EventArgs) Handles CB_2.Click
+        CB_1.Checked = False : CB_2.Checked = True
+    End Sub
 End Class

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

@@ -148,9 +148,6 @@ Partial Class 訂單控制表
         Me.順時鐘90度旋轉_bt = New System.Windows.Forms.Button()
         Me.第九頁_bt = New System.Windows.Forms.Button()
         Me.第十頁_bt = New System.Windows.Forms.Button()
-        Me.列印明細_bt = New System.Windows.Forms.Button()
-        Me.驗貨報告_pb = New System.Windows.Forms.PictureBox()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
         Me.Label21 = New System.Windows.Forms.Label()
@@ -254,7 +251,6 @@ Partial Class 訂單控制表
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.Label51 = New System.Windows.Forms.Label()
         Me.Panel3 = New System.Windows.Forms.Panel()
-        Me.包裝資料_pb = New System.Windows.Forms.PictureBox()
         Me.CanceL3_bt = New System.Windows.Forms.Button()
         Me.TVW_tb = New System.Windows.Forms.TextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
@@ -262,14 +258,16 @@ Partial Class 訂單控制表
         Me.Label52 = New System.Windows.Forms.Label()
         Me.訂單拆分_bt = New System.Windows.Forms.Button()
         Me.資料庫選擇3_bt = New System.Windows.Forms.Button()
-        Me.開啟明細_bt = New System.Windows.Forms.Button()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+        Me.開啟明細_bt = New System.Windows.Forms.Button()
+        Me.列印明細_bt = New System.Windows.Forms.Button()
+        Me.驗貨報告_pb = New System.Windows.Forms.PictureBox()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.包裝資料_pb = New System.Windows.Forms.PictureBox()
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         CType(Me.計算_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
@@ -281,9 +279,11 @@ Partial Class 訂單控制表
         Me.資訊_gb.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.Panel3.SuspendLayout()
-        CType(Me.包裝資料_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.表頭_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.包裝資料_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '控制表_dgv
@@ -1401,37 +1401,6 @@ Partial Class 訂單控制表
         Me.第十頁_bt.Text = "第十頁"
         Me.第十頁_bt.UseVisualStyleBackColor = True
         '
-        '列印明細_bt
-        '
-        Me.列印明細_bt.BackgroundImage = Global.天盾國際管理系統.My.Resources.Resources.print
-        Me.列印明細_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.列印明細_bt.ForeColor = System.Drawing.Color.Olive
-        Me.列印明細_bt.Location = New System.Drawing.Point(1007, 87)
-        Me.列印明細_bt.Name = "列印明細_bt"
-        Me.列印明細_bt.Size = New System.Drawing.Size(46, 27)
-        Me.列印明細_bt.TabIndex = 516
-        Me.列印明細_bt.UseVisualStyleBackColor = True
-        '
-        '驗貨報告_pb
-        '
-        Me.驗貨報告_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
-        Me.驗貨報告_pb.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.驗貨報告_pb.Location = New System.Drawing.Point(1712, 35)
-        Me.驗貨報告_pb.Name = "驗貨報告_pb"
-        Me.驗貨報告_pb.Size = New System.Drawing.Size(190, 208)
-        Me.驗貨報告_pb.TabIndex = 501
-        Me.驗貨報告_pb.TabStop = False
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
-        Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.PictureBox1.Location = New System.Drawing.Point(1411, 3)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(297, 165)
-        Me.PictureBox1.TabIndex = 500
-        Me.PictureBox1.TabStop = False
-        '
         '資料庫選擇2_bt
         '
         Me.資料庫選擇2_bt.Location = New System.Drawing.Point(1842, 2)
@@ -2443,17 +2412,6 @@ Partial Class 訂單控制表
         Me.Panel3.Size = New System.Drawing.Size(1180, 363)
         Me.Panel3.TabIndex = 1376
         '
-        '包裝資料_pb
-        '
-        Me.包裝資料_pb.BackColor = System.Drawing.Color.White
-        Me.包裝資料_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
-        Me.包裝資料_pb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.包裝資料_pb.Location = New System.Drawing.Point(-1, -1)
-        Me.包裝資料_pb.Name = "包裝資料_pb"
-        Me.包裝資料_pb.Size = New System.Drawing.Size(1179, 362)
-        Me.包裝資料_pb.TabIndex = 1660
-        Me.包裝資料_pb.TabStop = False
-        '
         'CanceL3_bt
         '
         Me.CanceL3_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -2530,6 +2488,13 @@ Partial Class 訂單控制表
         Me.資料庫選擇3_bt.Text = "HP"
         Me.資料庫選擇3_bt.UseVisualStyleBackColor = True
         '
+        'ToolTip1
+        '
+        Me.ToolTip1.AutoPopDelay = 10000
+        Me.ToolTip1.InitialDelay = 500
+        Me.ToolTip1.IsBalloon = True
+        Me.ToolTip1.ReshowDelay = 100
+        '
         '開啟明細_bt
         '
         Me.開啟明細_bt.BackgroundImage = Global.天盾國際管理系統.My.Resources.Resources.tests
@@ -2541,12 +2506,47 @@ Partial Class 訂單控制表
         Me.開啟明細_bt.TabIndex = 1669
         Me.開啟明細_bt.UseVisualStyleBackColor = True
         '
-        'ToolTip1
+        '列印明細_bt
         '
-        Me.ToolTip1.AutoPopDelay = 10000
-        Me.ToolTip1.InitialDelay = 500
-        Me.ToolTip1.IsBalloon = True
-        Me.ToolTip1.ReshowDelay = 100
+        Me.列印明細_bt.BackgroundImage = Global.天盾國際管理系統.My.Resources.Resources.print
+        Me.列印明細_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.列印明細_bt.ForeColor = System.Drawing.Color.Olive
+        Me.列印明細_bt.Location = New System.Drawing.Point(1007, 87)
+        Me.列印明細_bt.Name = "列印明細_bt"
+        Me.列印明細_bt.Size = New System.Drawing.Size(46, 27)
+        Me.列印明細_bt.TabIndex = 516
+        Me.列印明細_bt.UseVisualStyleBackColor = True
+        '
+        '驗貨報告_pb
+        '
+        Me.驗貨報告_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.驗貨報告_pb.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.驗貨報告_pb.Location = New System.Drawing.Point(1712, 35)
+        Me.驗貨報告_pb.Name = "驗貨報告_pb"
+        Me.驗貨報告_pb.Size = New System.Drawing.Size(190, 208)
+        Me.驗貨報告_pb.TabIndex = 501
+        Me.驗貨報告_pb.TabStop = False
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.PictureBox1.Location = New System.Drawing.Point(1411, 3)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(297, 165)
+        Me.PictureBox1.TabIndex = 500
+        Me.PictureBox1.TabStop = False
+        '
+        '包裝資料_pb
+        '
+        Me.包裝資料_pb.BackColor = System.Drawing.Color.White
+        Me.包裝資料_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.包裝資料_pb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.包裝資料_pb.Location = New System.Drawing.Point(-1, -1)
+        Me.包裝資料_pb.Name = "包裝資料_pb"
+        Me.包裝資料_pb.Size = New System.Drawing.Size(1179, 362)
+        Me.包裝資料_pb.TabIndex = 1660
+        Me.包裝資料_pb.TabStop = False
         '
         '訂單控制表
         '
@@ -2712,8 +2712,6 @@ Partial Class 訂單控制表
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
         CType(Me.計算_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainer1.Panel1.ResumeLayout(False)
         Me.SplitContainer1.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2727,10 +2725,12 @@ Partial Class 訂單控制表
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
         Me.Panel3.ResumeLayout(False)
-        CType(Me.包裝資料_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
         CType(Me.表頭_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.包裝資料_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

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

@@ -724,7 +724,7 @@ Public Class 訂單控制表
         明細表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         明細表_dgv.ColumnHeadersHeight = 25 : 明細表_dgv.AllowUserToAddRows = False
         ConnOpen()
-        SQL1 = "SELECT      " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, " & 訂單資料表(5) & ".ProductName, 
+        SQL1 = "SELECT  DISTINCT " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, " & 訂單資料表(5) & ".ProductName, 
                             " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM, " & 訂單資料表(5) & ".[5], " & 訂單資料表(5) & ".[5.5], 
                             " & 訂單資料表(5) & ".[6], " & 訂單資料表(5) & ".[6.5], " & 訂單資料表(5) & ".[7], " & 訂單資料表(5) & ".[7.5], " & 訂單資料表(5) & ".[8], " & 訂單資料表(5) & ".[8.5], 
                             " & 訂單資料表(5) & ".[9], " & 訂單資料表(5) & ".[9.5], " & 訂單資料表(5) & ".[10], " & 訂單資料表(5) & ".[10.5], " & 訂單資料表(5) & ".[11], " & 訂單資料表(5) & ".[11.5], 
@@ -1004,15 +1004,23 @@ Public Class 訂單控制表
                     End If
                 End If
                 conn.Close() : PictureBox1.SizeMode = 4
+
                 '------------驗貨報告讀取--------------------------------------------------------------------------------------------
                 PA1 = 控制表_dgv("驗報圖庫", e.RowIndex).Value.ToString : PA2 = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString
-                If 控制表_dgv("驗報圖庫", e.RowIndex).Value.ToString = "" Then : 驗貨報告_pb.Image = Nothing : Else
-                    SQL_訂單驗貨報告圖片讀取() : 驗貨報告_pb.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) : 驗貨報告_pb.Image = Bitmap.FromStream(oStream)
-                    End While : conn.Close() : 驗貨報告_pb.SizeMode = 4
+                If 控制表_dgv("驗報圖庫", e.RowIndex).Value.ToString = "" Then : 驗貨報告_pb.Image = Nothing : Else : Dim 檔案 As String
+                    SQL_驗貨報告檔案確認()
+                    If dr.Read Then : If dr("副檔名").ToString = "PDF" Then : 檔案 = "PDF" : Else : 檔案 = "圖片" : End If : Else : 檔案 = "圖片" : End If
+                    If 檔案 = "圖片" Then
+                        SQL_訂單驗貨報告圖片讀取() : 驗貨報告_pb.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) : 驗貨報告_pb.Image = Bitmap.FromStream(oStream)
+                        End While : conn.Close() : 驗貨報告_pb.SizeMode = 4
+                    Else
+                        驗貨報告_pb.Image = My.Resources.Resources.PDF
+                    End If
                 End If : 圖片傳遞 = 驗貨報告_pb.Image
+
                 驗貨報告 = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString : PB(0) = 控制表_dgv("訂單流水號", e.RowIndex).Value.ToString
                 PB(1) = 控制表_dgv("年份季度", e.RowIndex).Value.ToString : PB(2) = 控制表_dgv("客戶訂單號", e.RowIndex).Value.ToString : PB(4) = 控制表_dgv("形體號", e.RowIndex).Value.ToString
                 PB(5) = 控制表_dgv("顏色", e.RowIndex).Value.ToString : PB(6) = 控制表_dgv("楦型", e.RowIndex).Value.ToString : DN(0) = 控制表_dgv("訂單數量", e.RowIndex).Value.ToString

TENDEN-MES-SYS/4、量產訂單管理/量產訂單系統/量產訂單輸入.Designer.vb

@@ -22,10 +22,10 @@ Partial Class 量產訂單輸入
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.資料庫選擇3_bt = New System.Windows.Forms.Button()
         Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
@@ -34,6 +34,9 @@ Partial Class 量產訂單輸入
         Me.天盾訂單號_tb = New System.Windows.Forms.TextBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Vendor_Cb = New System.Windows.Forms.ComboBox()
+        Me.清空2_bt = New System.Windows.Forms.Button()
+        Me.清空1_bt = New System.Windows.Forms.Button()
         Me.DIV_cb = New System.Windows.Forms.ComboBox()
         Me.ADD6_bt = New System.Windows.Forms.Button()
         Me.Label27 = New System.Windows.Forms.Label()
@@ -72,7 +75,6 @@ Partial Class 量產訂單輸入
         Me.Label15 = New System.Windows.Forms.Label()
         Me.Label14 = New System.Windows.Forms.Label()
         Me.日期2_dtp = New System.Windows.Forms.DateTimePicker()
-        Me.Vendor_tb = New System.Windows.Forms.TextBox()
         Me.Label13 = New System.Windows.Forms.Label()
         Me.新增清單5_bt = New System.Windows.Forms.Button()
         Me.新增清單4_bt = New System.Windows.Forms.Button()
@@ -139,6 +141,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.Label30 = New System.Windows.Forms.Label()
+        Me.STYLE_N_tb = New System.Windows.Forms.TextBox()
+        Me.Item2_cb = New System.Windows.Forms.ComboBox()
         CType(Me.訂單流水號_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -180,19 +185,19 @@ Partial Class 量產訂單輸入
         '
         '訂單流水號_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.訂單流水號_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.訂單流水號_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.訂單流水號_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.訂單流水號_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.訂單流水號_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.訂單流水號_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.訂單流水號_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
         Me.訂單流水號_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.訂單流水號_dgv.Location = New System.Drawing.Point(2, 64)
         Me.訂單流水號_dgv.Name = "訂單流水號_dgv"
@@ -232,6 +237,9 @@ Partial Class 量產訂單輸入
         Me.Panel1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.Vendor_Cb)
+        Me.Panel1.Controls.Add(Me.清空2_bt)
+        Me.Panel1.Controls.Add(Me.清空1_bt)
         Me.Panel1.Controls.Add(Me.DIV_cb)
         Me.Panel1.Controls.Add(Me.ADD6_bt)
         Me.Panel1.Controls.Add(Me.Label27)
@@ -270,7 +278,6 @@ Partial Class 量產訂單輸入
         Me.Panel1.Controls.Add(Me.Label15)
         Me.Panel1.Controls.Add(Me.Label14)
         Me.Panel1.Controls.Add(Me.日期2_dtp)
-        Me.Panel1.Controls.Add(Me.Vendor_tb)
         Me.Panel1.Controls.Add(Me.Label13)
         Me.Panel1.Controls.Add(Me.新增清單5_bt)
         Me.Panel1.Controls.Add(Me.新增清單4_bt)
@@ -300,6 +307,34 @@ Partial Class 量產訂單輸入
         Me.Panel1.Size = New System.Drawing.Size(1701, 232)
         Me.Panel1.TabIndex = 1380
         '
+        'Vendor_Cb
+        '
+        Me.Vendor_Cb.FormattingEnabled = True
+        Me.Vendor_Cb.Location = New System.Drawing.Point(94, 128)
+        Me.Vendor_Cb.Name = "Vendor_Cb"
+        Me.Vendor_Cb.Size = New System.Drawing.Size(152, 24)
+        Me.Vendor_Cb.TabIndex = 1460
+        '
+        '清空2_bt
+        '
+        Me.清空2_bt.ForeColor = System.Drawing.Color.Black
+        Me.清空2_bt.Location = New System.Drawing.Point(603, 30)
+        Me.清空2_bt.Name = "清空2_bt"
+        Me.清空2_bt.Size = New System.Drawing.Size(41, 22)
+        Me.清空2_bt.TabIndex = 1446
+        Me.清空2_bt.Text = "清空"
+        Me.清空2_bt.UseVisualStyleBackColor = True
+        '
+        '清空1_bt
+        '
+        Me.清空1_bt.ForeColor = System.Drawing.Color.Black
+        Me.清空1_bt.Location = New System.Drawing.Point(604, 5)
+        Me.清空1_bt.Name = "清空1_bt"
+        Me.清空1_bt.Size = New System.Drawing.Size(41, 22)
+        Me.清空1_bt.TabIndex = 1445
+        Me.清空1_bt.Text = "清空"
+        Me.清空1_bt.UseVisualStyleBackColor = True
+        '
         'DIV_cb
         '
         Me.DIV_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
@@ -534,7 +569,7 @@ Partial Class 量產訂單輸入
         Me.日期4_dtp.Format = System.Windows.Forms.DateTimePickerFormat.Custom
         Me.日期4_dtp.Location = New System.Drawing.Point(499, 4)
         Me.日期4_dtp.Name = "日期4_dtp"
-        Me.日期4_dtp.Size = New System.Drawing.Size(145, 23)
+        Me.日期4_dtp.Size = New System.Drawing.Size(102, 23)
         Me.日期4_dtp.TabIndex = 1416
         '
         '日期_dtp
@@ -605,7 +640,7 @@ Partial Class 量產訂單輸入
         Me.日期3_dtp.Format = System.Windows.Forms.DateTimePickerFormat.Custom
         Me.日期3_dtp.Location = New System.Drawing.Point(499, 29)
         Me.日期3_dtp.Name = "日期3_dtp"
-        Me.日期3_dtp.Size = New System.Drawing.Size(145, 23)
+        Me.日期3_dtp.Size = New System.Drawing.Size(102, 23)
         Me.日期3_dtp.TabIndex = 1405
         '
         'DeliveryAddress_lb
@@ -656,14 +691,6 @@ Partial Class 量產訂單輸入
         Me.日期2_dtp.Size = New System.Drawing.Size(88, 23)
         Me.日期2_dtp.TabIndex = 1399
         '
-        'Vendor_tb
-        '
-        Me.Vendor_tb.ForeColor = System.Drawing.Color.Black
-        Me.Vendor_tb.Location = New System.Drawing.Point(94, 128)
-        Me.Vendor_tb.Name = "Vendor_tb"
-        Me.Vendor_tb.Size = New System.Drawing.Size(152, 23)
-        Me.Vendor_tb.TabIndex = 1398
-        '
         'Label13
         '
         Me.Label13.AutoSize = True
@@ -825,11 +852,11 @@ Partial Class 量產訂單輸入
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(222, 7)
+        Me.Label4.Location = New System.Drawing.Point(213, 7)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(82, 16)
+        Me.Label4.Size = New System.Drawing.Size(91, 16)
         Me.Label4.TabIndex = 1415
-        Me.Label4.Text = "Created Date"
+        Me.Label4.Text = "Customer Date"
         '
         '總案件_tb
         '
@@ -921,8 +948,8 @@ Partial Class 量產訂單輸入
         '
         '明細表_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.明細表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -938,8 +965,8 @@ Partial Class 量產訂單輸入
         '
         '控制表_dgv
         '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.控制表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1207,15 +1234,15 @@ Partial Class 量產訂單輸入
         'Item_cb
         '
         Me.Item_cb.FormattingEnabled = True
-        Me.Item_cb.Location = New System.Drawing.Point(1163, 236)
+        Me.Item_cb.Location = New System.Drawing.Point(1241, 236)
         Me.Item_cb.Name = "Item_cb"
-        Me.Item_cb.Size = New System.Drawing.Size(113, 24)
+        Me.Item_cb.Size = New System.Drawing.Size(61, 24)
         Me.Item_cb.TabIndex = 1459
         '
         'Label28
         '
         Me.Label28.AutoSize = True
-        Me.Label28.Location = New System.Drawing.Point(1129, 240)
+        Me.Label28.Location = New System.Drawing.Point(1207, 241)
         Me.Label28.Name = "Label28"
         Me.Label28.Size = New System.Drawing.Size(32, 16)
         Me.Label28.TabIndex = 1458
@@ -1224,7 +1251,7 @@ Partial Class 量產訂單輸入
         'PD_cb
         '
         Me.PD_cb.FormattingEnabled = True
-        Me.PD_cb.Location = New System.Drawing.Point(998, 261)
+        Me.PD_cb.Location = New System.Drawing.Point(1085, 261)
         Me.PD_cb.Name = "PD_cb"
         Me.PD_cb.Size = New System.Drawing.Size(278, 24)
         Me.PD_cb.TabIndex = 1461
@@ -1232,7 +1259,7 @@ Partial Class 量產訂單輸入
         'Label29
         '
         Me.Label29.AutoSize = True
-        Me.Label29.Location = New System.Drawing.Point(999, 241)
+        Me.Label29.Location = New System.Drawing.Point(1082, 241)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(118, 16)
         Me.Label29.TabIndex = 1460
@@ -1252,7 +1279,7 @@ Partial Class 量產訂單輸入
         Me.帶入資料_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.帶入資料_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.帶入資料_bt.ForeColor = System.Drawing.Color.Blue
-        Me.帶入資料_bt.Location = New System.Drawing.Point(1334, 235)
+        Me.帶入資料_bt.Location = New System.Drawing.Point(1421, 235)
         Me.帶入資料_bt.Name = "帶入資料_bt"
         Me.帶入資料_bt.Size = New System.Drawing.Size(50, 50)
         Me.帶入資料_bt.TabIndex = 1463
@@ -1286,7 +1313,7 @@ Partial Class 量產訂單輸入
         Me.刪除單筆_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.刪除單筆_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除單筆_bt.ForeColor = System.Drawing.Color.Blue
-        Me.刪除單筆_bt.Location = New System.Drawing.Point(1390, 235)
+        Me.刪除單筆_bt.Location = New System.Drawing.Point(1477, 235)
         Me.刪除單筆_bt.Name = "刪除單筆_bt"
         Me.刪除單筆_bt.Size = New System.Drawing.Size(50, 50)
         Me.刪除單筆_bt.TabIndex = 1443
@@ -1298,7 +1325,7 @@ Partial Class 量產訂單輸入
         Me.新增訂單明細_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.新增訂單明細_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.新增訂單明細_bt.ForeColor = System.Drawing.Color.Blue
-        Me.新增訂單明細_bt.Location = New System.Drawing.Point(1278, 235)
+        Me.新增訂單明細_bt.Location = New System.Drawing.Point(1365, 235)
         Me.新增訂單明細_bt.Name = "新增訂單明細_bt"
         Me.新增訂單明細_bt.Size = New System.Drawing.Size(50, 50)
         Me.新增訂單明細_bt.TabIndex = 1442
@@ -1316,11 +1343,39 @@ Partial Class 量產訂單輸入
         Me.比對關鍵字_bt.TabIndex = 1377
         Me.比對關鍵字_bt.UseVisualStyleBackColor = True
         '
+        'Label30
+        '
+        Me.Label30.AutoSize = True
+        Me.Label30.Location = New System.Drawing.Point(1004, 240)
+        Me.Label30.Name = "Label30"
+        Me.Label30.Size = New System.Drawing.Size(52, 16)
+        Me.Label30.TabIndex = 1464
+        Me.Label30.Text = "STYLE #"
+        '
+        'STYLE_N_tb
+        '
+        Me.STYLE_N_tb.ForeColor = System.Drawing.Color.Black
+        Me.STYLE_N_tb.Location = New System.Drawing.Point(1002, 262)
+        Me.STYLE_N_tb.Name = "STYLE_N_tb"
+        Me.STYLE_N_tb.Size = New System.Drawing.Size(79, 23)
+        Me.STYLE_N_tb.TabIndex = 1465
+        '
+        'Item2_cb
+        '
+        Me.Item2_cb.FormattingEnabled = True
+        Me.Item2_cb.Location = New System.Drawing.Point(1302, 236)
+        Me.Item2_cb.Name = "Item2_cb"
+        Me.Item2_cb.Size = New System.Drawing.Size(61, 24)
+        Me.Item2_cb.TabIndex = 1466
+        '
         '量產訂單輸入
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1914, 966)
+        Me.Controls.Add(Me.Item2_cb)
+        Me.Controls.Add(Me.STYLE_N_tb)
+        Me.Controls.Add(Me.Label30)
         Me.Controls.Add(Me.帶入資料_bt)
         Me.Controls.Add(Me.資料流水號_tb)
         Me.Controls.Add(Me.PD_cb)
@@ -1402,7 +1457,6 @@ Partial Class 量產訂單輸入
     Friend WithEvents Label9 As Label
     Friend WithEvents Label12 As Label
     Friend WithEvents Label10 As Label
-    Friend WithEvents Vendor_tb As TextBox
     Friend WithEvents Label13 As Label
     Friend WithEvents Label14 As Label
     Friend WithEvents 日期2_dtp As DateTimePicker
@@ -1487,4 +1541,10 @@ Partial Class 量產訂單輸入
     Friend WithEvents Label29 As Label
     Friend WithEvents 資料流水號_tb As TextBox
     Friend WithEvents 帶入資料_bt As Button
+    Friend WithEvents 清空2_bt As Button
+    Friend WithEvents 清空1_bt As Button
+    Friend WithEvents Label30 As Label
+    Friend WithEvents STYLE_N_tb As TextBox
+    Friend WithEvents Vendor_Cb As ComboBox
+    Friend WithEvents Item2_cb As ComboBox
 End Class

TENDEN-MES-SYS/4、量產訂單管理/量產訂單系統/量產訂單輸入.vb

@@ -61,7 +61,7 @@ Public Class 量產訂單輸入
         End If
         For i As Integer = 14 To 28 : 控制表_dgv.Columns(i).Visible = False : Next : 控制表_dgv.Columns(29).Visible = True : 控制表_dgv.Columns(78).Visible = False
         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
-        For i As Integer = 0 To 控制表_dgv.Rows.Count - 1 : 控制表_dgv("選擇", i).Value = False : Next
+        For i As Integer = 0 To 控制表_dgv.Rows.Count - 1 : 控制表_dgv("選擇", i).Value = False : Next : 控制表_dgv.Columns(42).Visible = True
     End Sub
     Private Sub Set_控制表_dgv_插入勾選控件清單()
         Dim Col As New DataGridViewCheckBoxColumn With {
@@ -81,31 +81,32 @@ Public Class 量產訂單輸入
         da.Fill(ds2) : 明細表_dgv.DataSource = ds2.Tables(0) : conn.Close()
 
         明細表_dgv.EditMode = DataGridViewEditMode.EditOnEnter
-        明細表_dgv.Columns(0).Visible = False : 明細表_dgv.Columns(1).Visible = False
-        明細表_dgv.Columns(2).FillWeight = 90 : 明細表_dgv.Columns(3).FillWeight = 90 : 明細表_dgv.Columns(4).FillWeight = 190 : 明細表_dgv.Columns(5).FillWeight = 80
-        明細表_dgv.Columns(6).FillWeight = 70
-        For i As Integer = 7 To 25 : 明細表_dgv.Columns(i).FillWeight = 40 : Next
-        For i As Integer = 2 To 25 : 明細表_dgv.Columns(i).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(i).ReadOnly = False : Next
-        明細表_dgv.Columns(25).FillWeight = 60 : 明細表_dgv.Columns(25).ReadOnly = True : 明細表_dgv.Columns(3).ReadOnly = True : 明細表_dgv.Columns(5).ReadOnly = True
-        明細表_dgv.Columns(6).ReadOnly = True
+        明細表_dgv.Columns("天盾流水號").Visible = False : 明細表_dgv.Columns("客戶訂單號").Visible = False : 明細表_dgv.Columns("Item2").FillWeight = 45
+        明細表_dgv.Columns("Item").FillWeight = 45 : 明細表_dgv.Columns("ProductName").FillWeight = 90 : 明細表_dgv.Columns("ProductDescription").FillWeight = 190
+        明細表_dgv.Columns("Color").FillWeight = 80 : 明細表_dgv.Columns("DM").FillWeight = 70
+        For i As Integer = 8 To 26 : 明細表_dgv.Columns(i).FillWeight = 40 : Next
+        For i As Integer = 2 To 26 : 明細表_dgv.Columns(i).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(i).ReadOnly = False : Next
+        明細表_dgv.Columns(26).FillWeight = 60 : 明細表_dgv.Columns(26).ReadOnly = True : 明細表_dgv.Columns(4).ReadOnly = True : 明細表_dgv.Columns(6).ReadOnly = True
+        明細表_dgv.Columns(7).ReadOnly = True
 
         If 明細表_dgv.Rows.Count > 0 Then
             If PP1 <> "" Then : PP1 = "" : C2下拉表單資料載入() : End If : If PP2 <> "" Then : PP2 = "" : C3下拉表單資料載入() : End If
             資料流水號_tb.Text = 控制表_dgv.Rows(0).Cells("資料流水號").Value.ToString : 季_cb.Text = 控制表_dgv.Rows(0).Cells("年份季度").Value.ToString
             風格_cb.Text = 控制表_dgv.Rows(0).Cells("形體號").Value.ToString : 顏色_cb.Text = 控制表_dgv.Rows(0).Cells("顏色").Value.ToString
-            DM_cb.Text = 控制表_dgv.Rows(0).Cells("楦型").Value.ToString : Item_cb.Text = 明細表_dgv.Rows(0).Cells("ItemNumber").Value.ToString
+            DM_cb.Text = 控制表_dgv.Rows(0).Cells("楦型").Value.ToString : Item_cb.Text = 明細表_dgv.Rows(0).Cells("Item").Value.ToString
             PD_cb.Text = 明細表_dgv.Rows(0).Cells("ProductDescription").Value.ToString : DIV_cb.Text = 控制表_dgv.Rows(0).Cells("訂單種類").Value.ToString
+            Item2_cb.Text = 明細表_dgv.Rows(0).Cells("Item2").Value.ToString
         End If
     End Sub
     Private Sub 下拉表單資料載入()
         SQL_DeliveryTerms_下拉() : DT_cb.Items.Clear() : While (dr.Read()) : DT_cb.Items.Add(dr("DeliveryTerms")) : End While
         SQL_FROMPORT() : 客戶資料2_cb.Items.Clear() : While (dr.Read()) : 客戶資料2_cb.Items.Add(dr("FROMPORT")) : End While : conn.Close()
-        SQL_TOPORT() : 客戶資料3_cb.Items.Clear() : While (dr.Read()) : 客戶資料3_cb.Items.Add(dr("TOPORT")) : End While : conn.Close()
+        SQL_TOPORT() : 客戶資料3_cb.Items.Clear() : 客戶資料3_cb.Items.Add("") : While (dr.Read()) : 客戶資料3_cb.Items.Add(dr("TOPORT")) : End While : conn.Close()
         SQL_SalesOrder_下拉() : SalesOrder_cb.Items.Clear() : While (dr.Read()) : SalesOrder_cb.Items.Add(dr("SalesOrder")) : End While : conn.Close()
         SQL_下拉客戶資料() : 客戶名稱_cb.Items.Clear() : While (dr.Read()) : 客戶名稱_cb.Items.Add(dr("客戶名稱")) : End While : conn.Close()
         SQL_工廠簡稱_下拉() : FTY_cb.Items.Clear() : While (dr.Read()) : FTY_cb.Items.Add(dr("工廠簡稱")) : End While : conn.Close()
         SQL_季節_下拉() : 季_cb.Items.Clear() : While (dr.Read()) : 季_cb.Items.Add(dr("年份季度")) : End While
-
+        SQL_Vendor() : Vendor_Cb.Items.Clear() : While (dr.Read()) : Vendor_Cb.Items.Add(dr("VendorReference")) : End While
         SQL_工廠編號_下拉() : 工廠編號_cb.Items.Clear() : 地址1_cb.Items.Clear()
         While (dr.Read()) : 工廠編號_cb.Items.Add(dr("工廠編號")) : 地址1_cb.Items.Add(dr("工廠地址")) : End While : conn.Close()
         SQL_代理編號_下拉() : 代理編號_cb.Items.Clear() : 訂貨代理_cb.Items.Clear()
@@ -115,6 +116,7 @@ Public Class 量產訂單輸入
     End Sub
     Private Sub C1下拉表單資料載入()
         SQL_Item_下拉() : Item_cb.Items.Clear() : While (dr.Read()) : Item_cb.Items.Add(dr("ItemNumber")) : End While
+        SQL_Item2_下拉() : Item2_cb.Items.Clear() : While (dr.Read()) : Item2_cb.Items.Add(dr("裝箱")) : End While
     End Sub
     Private Sub C2下拉表單資料載入()
         ConnOpen()
@@ -151,6 +153,8 @@ Public Class 量產訂單輸入
         訂單資料庫選擇.ShowDialog()
     End Sub
     Private Sub 量產訂單輸入_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
+        日期4_dtp.Format = DateTimePickerFormat.Custom : 日期4_dtp.CustomFormat = " "
+        日期3_dtp.Format = DateTimePickerFormat.Custom : 日期3_dtp.CustomFormat = " "
         BB(0) = False : BB(1) = True : BB(2) = True : BB(3) = True : BB(4) = True : BB(5) = True : BB(6) = True : BB(7) = True : BB(8) = True : BB(9) = True
         C1下拉表單資料載入() : C2下拉表單資料載入() : C3下拉表單資料載入() : C4下拉表單資料載入() : C5下拉表單資料載入() : C6下拉表單資料載入()
         下拉表單資料載入() : Set_已建檔清單()
@@ -161,12 +165,12 @@ Public Class 量產訂單輸入
             客戶訂單號_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("客戶訂單號_1").Value.ToString : MOD_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ModeOfDelivery").Value.ToString
             DT_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("DeliveryTerms").Value.ToString : 日期1_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("OrgShipDate").Value.ToString
             客戶資料2_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("FromPort").Value.ToString : 客戶資料3_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ToPort").Value.ToString
-            SC_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ShippingCarrier").Value.ToString : Vendor_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("VendorReference").Value.ToString
+            SC_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ShippingCarrier").Value.ToString : Vendor_Cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("VendorReference").Value.ToString
             ShiptoN_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("CustomerName").Value.ToString : 入單型態_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("入單型態").Value.ToString
             客戶地址_bt.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("DeliveryAddress").Value.ToString : SalesOrder_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("SalesOrder").Value.ToString
-            日期3_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ShipDate").Value.ToString : 日期5_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("下單日").Value.ToString
+            日期5_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("下單日").Value.ToString : 客戶名稱_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("Brand").Value.ToString
             日期6_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("交期").Value.ToString : 日期_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("CreatedDate").Value.ToString
-            日期4_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ETADate").Value.ToString : 客戶名稱_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("Brand").Value.ToString
+
             力威訂單號_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("CustomerRequisition").Value.ToString : 地址1_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("工廠地址").Value.ToString
             代理編號_cb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("代理編號").Value.ToString : 訂貨代理_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("訂貨代理").Value.ToString
             總雙數_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("總雙數").Value.ToString : 總案件_tb.Text = 訂單流水號_dgv.Rows(e.RowIndex).Cells("總案件數").Value.ToString
@@ -177,6 +181,13 @@ Public Class 量產訂單輸入
                 日期2_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ModifiedDate").Value.ToString
             Else : 日期2_dtp.Text = Today() : End If : Set_訂單清單() : Set_訂單明細()
             總雙數_tb.Text = Strings.Format(CDbl(總雙數_tb.Text), "#,##0") : 總案件_tb.Text = Strings.Format(CDbl(總案件_tb.Text), "#,##0")
+
+            If 訂單流水號_dgv.Rows(e.RowIndex).Cells("ShipDate").Value.ToString = "" Or 訂單流水號_dgv.Rows(e.RowIndex).Cells("ShipDate").Value.ToString = " " Then
+                日期3_dtp.Format = DateTimePickerFormat.Custom : 日期3_dtp.CustomFormat = " "
+            Else : 日期3_dtp.Format = DateTimePickerFormat.Short : 日期3_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ShipDate").Value.ToString : End If
+            If 訂單流水號_dgv.Rows(e.RowIndex).Cells("ETADate").Value.ToString = "" Or 訂單流水號_dgv.Rows(e.RowIndex).Cells("ETADate").Value.ToString = " " Then
+                日期4_dtp.Format = DateTimePickerFormat.Custom : 日期4_dtp.CustomFormat = " "
+            Else : 日期4_dtp.Format = DateTimePickerFormat.Short : 日期4_dtp.Value = 訂單流水號_dgv.Rows(e.RowIndex).Cells("ETADate").Value.ToString : End If
         End If
     End Sub
     Private Sub 控制表_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 控制表_dgv.CellClick
@@ -184,8 +195,9 @@ Public Class 量產訂單輸入
             If PP1 <> "" Then : PP1 = "" : C2下拉表單資料載入() : End If : If PP2 <> "" Then : PP2 = "" : C3下拉表單資料載入() : End If
             資料流水號_tb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("資料流水號").Value.ToString : 季_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("年份季度").Value.ToString
             風格_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("形體號").Value.ToString : 顏色_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("顏色").Value.ToString
-            DM_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("楦型").Value.ToString : Item_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("ItemNumber").Value.ToString
+            DM_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("楦型").Value.ToString : Item_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("Item").Value.ToString
             PD_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("ProductDescription").Value.ToString : DIV_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("訂單種類").Value.ToString
+            Item2_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("Item2").Value.ToString
         End If
     End Sub
     Private Sub 明細表_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 明細表_dgv.CellClick
@@ -193,8 +205,9 @@ Public Class 量產訂單輸入
             If PP1 <> "" Then : PP1 = "" : C2下拉表單資料載入() : End If : If PP2 <> "" Then : PP2 = "" : C3下拉表單資料載入() : End If
             資料流水號_tb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("資料流水號").Value.ToString : 季_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("年份季度").Value.ToString
             風格_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("形體號").Value.ToString : 顏色_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("顏色").Value.ToString
-            DM_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("楦型").Value.ToString : Item_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("ItemNumber").Value.ToString
+            DM_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("楦型").Value.ToString : Item_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("Item").Value.ToString
             PD_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("ProductDescription").Value.ToString : DIV_cb.Text = 控制表_dgv.Rows(e.RowIndex).Cells("訂單種類").Value.ToString
+            Item2_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("Item2").Value.ToString
         End If
     End Sub
     Private Sub 明細表_dgv_CellEndEdit(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 明細表_dgv.CellEndEdit
@@ -256,7 +269,19 @@ Public Class 量產訂單輸入
         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 = 8 To 71 : 控制表_dgv.Columns(i).Visible = False : Next : For i As Integer = 72 To 77 : 控制表_dgv.Columns(i).Visible = True : Next
-        End If
+        End If : 控制表_dgv.Columns(42).Visible = True
+    End Sub
+    Private Sub 日期4_dtp_ValueChanged(sender As Object, e As EventArgs) Handles 日期4_dtp.MouseDown
+        日期4_dtp.Format = DateTimePickerFormat.Short
+    End Sub
+    Private Sub 日期3_dtp_ValueChanged(sender As Object, e As EventArgs) Handles 日期3_dtp.MouseDown
+        日期3_dtp.Format = DateTimePickerFormat.Short
+    End Sub
+    Private Sub 清空1_bt_Click(sender As Object, e As EventArgs) Handles 清空1_bt.Click
+        日期4_dtp.Format = DateTimePickerFormat.Custom : 日期4_dtp.CustomFormat = " "
+    End Sub
+    Private Sub 清空2_bt_Click(sender As Object, e As EventArgs) Handles 清空2_bt.Click
+        日期3_dtp.Format = DateTimePickerFormat.Custom : 日期3_dtp.CustomFormat = " "
     End Sub
     Private Sub 第一頁_bt_Click(sender As Object, e As EventArgs) Handles 第一頁_bt.Click
         第一頁_bt.Enabled = False : 第二頁_bt.Enabled = True : 第三頁_bt.Enabled = True : 第四頁_bt.Enabled = True : 第五頁_bt.Enabled = True : 第六頁_bt.Enabled = True
@@ -375,10 +400,12 @@ Public Class 量產訂單輸入
         ElseIf NUM1 > 9999 And NUM1 < 100000 Then : 流水 = 標頭 & "0" & NUM1 : ElseIf NUM1 > 99999 And NUM1 < 1000000 Then : 流水 = 標頭 & "" & NUM1
         ElseIf NUM1 > 9999999 Then : MessageBox.Show("超出流水號數量，請聯繫系統管理員") : Exit Sub : End If
         天盾訂單號_tb.Text = 流水 : 工廠編號_cb.Text = "" : 客戶訂單號_tb.Text = "" : MOD_tb.Text = "" : DT_cb.Text = "" : 客戶資料2_cb.Text = "" : 客戶資料3_cb.Text = ""
-        SC_tb.Text = "" : Vendor_tb.Text = "" : ShiptoN_cb.Text = "" : 入單型態_tb.Text = "" : 客戶地址_bt.Text = "" : SalesOrder_cb.Text = ""
+        SC_tb.Text = "" : Vendor_Cb.Text = "" : ShiptoN_cb.Text = "" : 入單型態_tb.Text = "" : 客戶地址_bt.Text = "" : SalesOrder_cb.Text = ""
         力威訂單號_tb.Text = "" : 地址1_tb.Text = "" : 代理編號_cb.Text = "" : 訂貨代理_tb.Text = "" : 總雙數_tb.Text = "" : 總案件_tb.Text = "0"
-        FTY_cb.Text = "" : 最終運送_tb.Text = "" : 日期_dtp.Value = Today() : 日期1_dtp.Value = Today() : 日期2_dtp.Text = Today() : 日期3_dtp.Value = Today()
-        日期4_dtp.Value = Today() : 日期5_dtp.Value = Today() : 日期6_dtp.Value = Today() : 入單型態_tb.Text = "2"
+        FTY_cb.Text = "" : 最終運送_tb.Text = "" : 日期_dtp.Value = Today() : 日期1_dtp.Value = Today() : 日期2_dtp.Text = Today()
+        日期3_dtp.Format = DateTimePickerFormat.Custom : 日期3_dtp.CustomFormat = " "
+        日期4_dtp.Format = DateTimePickerFormat.Custom : 日期4_dtp.CustomFormat = " "
+        日期5_dtp.Value = Today() : 日期6_dtp.Value = Today() : 入單型態_tb.Text = "2"
         If 訂單資料表(0) = "訂單明細表抬頭" Then : 客戶名稱_cb.Text = "" : 公司_tb.Text = ""
         ElseIf 訂單資料表(0) = "訂單明細表抬頭_DRS" Then : 客戶名稱_cb.Text = "" : 公司_tb.Text = ""
         ElseIf 訂單資料表(0) = "訂單明細表抬頭_HP" Then : 客戶名稱_cb.Text = "Hush Puppies"
@@ -389,22 +416,26 @@ Public Class 量產訂單輸入
         End If : Set_訂單清單() : Set_訂單明細()
 
         PA1 = 客戶訂單號_tb.Text : PA2 = 天盾訂單號_tb.Text : PA3 = MOD_tb.Text : PA4 = DT_cb.Text : PA5 = Strings.Format(日期1_dtp.Value, "yyyy/MM/dd") : PA6 = 客戶資料2_cb.Text
-        PA7 = 客戶資料3_cb.Text : PA8 = SC_tb.Text : PA9 = Vendor_tb.Text : PA10 = Strings.Format(日期2_dtp.Value, "yyyy/MM/dd") : PA11 = ShiptoN_cb.Text
-        PA12 = Strings.Format(日期3_dtp.Value, "yyyy/MM/dd") : PA13 = SalesOrder_cb.Text : PA14 = 客戶地址_bt.Text : PA15 = Strings.Format(日期5_dtp.Value, "yyyy/MM/dd")
-        PA16 = Strings.Format(日期6_dtp.Value, "yyyy/MM/dd") : PA17 = Strings.Format(日期4_dtp.Value, "yyyy/MM/dd") : PA18 = Strings.Format(日期_dtp.Value, "yyyy/MM/dd")
+        PA7 = 客戶資料3_cb.Text : PA8 = SC_tb.Text : PA9 = Vendor_Cb.Text : PA10 = Strings.Format(日期2_dtp.Value, "yyyy/MM/dd") : PA11 = ShiptoN_cb.Text
+        PA13 = SalesOrder_cb.Text : PA14 = 客戶地址_bt.Text : PA15 = Strings.Format(日期5_dtp.Value, "yyyy/MM/dd")
+        PA16 = Strings.Format(日期6_dtp.Value, "yyyy/MM/dd") : PA18 = Strings.Format(日期_dtp.Value, "yyyy/MM/dd")
         PA19 = 客戶名稱_cb.Text : PA20 = 力威訂單號_tb.Text : PA21 = 工廠編號_cb.Text : PA22 = 地址1_tb.Text : PA23 = 代理編號_cb.Text : PA24 = 訂貨代理_tb.Text
-        PA25 = 總雙數_tb.Text : PA26 = 總案件_tb.Text : PA27 = 公司_tb.Text : PA28 = FTY_cb.Text : PA29 = 最終運送_tb.Text : PA30 = 入單型態_tb.Text : SQL_訂單抬頭新增()
-        Set_已建檔清單()
+        PA25 = 總雙數_tb.Text : PA26 = 總案件_tb.Text : PA27 = 公司_tb.Text : PA28 = FTY_cb.Text : PA29 = 最終運送_tb.Text : PA30 = 入單型態_tb.Text
+        If 日期3_dtp.Text = "" Or 日期3_dtp.Text = " " Then : PA12 = 日期3_dtp.Text : Else : PA12 = Strings.Format(日期3_dtp.Value, "yyyy/MM/dd") : End If
+        If 日期4_dtp.Text = "" Or 日期4_dtp.Text = " " Then : PA17 = 日期4_dtp.Text : Else : PA17 = Strings.Format(日期4_dtp.Value, "yyyy/MM/dd") : End If
+        SQL_訂單抬頭新增() : Set_已建檔清單()
     End Sub
     Private Sub 存檔_tb_Click(sender As Object, e As EventArgs) Handles 存檔_tb.Click
         訂單流水號_dgv.Enabled = True
         PA1 = 客戶訂單號_tb.Text : PA2 = 天盾訂單號_tb.Text : PA3 = MOD_tb.Text : PA4 = DT_cb.Text : PA5 = Strings.Format(日期1_dtp.Value, "yyyy/MM/dd") : PA6 = 客戶資料2_cb.Text
-        PA7 = 客戶資料3_cb.Text : PA8 = SC_tb.Text : PA9 = Vendor_tb.Text : PA10 = Strings.Format(日期2_dtp.Value, "yyyy/MM/dd") : PA11 = ShiptoN_cb.Text
-        PA12 = Strings.Format(日期3_dtp.Value, "yyyy/MM/dd") : PA13 = SalesOrder_cb.Text : PA14 = 客戶地址_bt.Text : PA15 = Strings.Format(日期5_dtp.Value, "yyyy/MM/dd")
-        PA16 = Strings.Format(日期6_dtp.Value, "yyyy/MM/dd") : PA17 = Strings.Format(日期4_dtp.Value, "yyyy/MM/dd") : PA18 = Strings.Format(日期_dtp.Value, "yyyy/MM/dd")
+        PA7 = 客戶資料3_cb.Text : PA8 = SC_tb.Text : PA9 = Vendor_Cb.Text : PA10 = Strings.Format(日期2_dtp.Value, "yyyy/MM/dd") : PA11 = ShiptoN_cb.Text
+        PA13 = SalesOrder_cb.Text : PA14 = 客戶地址_bt.Text : PA15 = Strings.Format(日期5_dtp.Value, "yyyy/MM/dd")
+        PA16 = Strings.Format(日期6_dtp.Value, "yyyy/MM/dd") : PA18 = Strings.Format(日期_dtp.Value, "yyyy/MM/dd")
         PA19 = 客戶名稱_cb.Text : PA20 = 力威訂單號_tb.Text : PA21 = 工廠編號_cb.Text : PA22 = 地址1_tb.Text : PA23 = 代理編號_cb.Text : PA24 = 訂貨代理_tb.Text
         PA25 = 總雙數_tb.Text : PA26 = 總案件_tb.Text : PA27 = 公司_tb.Text : PA28 = FTY_cb.Text : PA29 = 最終運送_tb.Text : PA30 = 入單型態_tb.Text
         PA31 = Strings.Left(Strings.Format(日期_dtp.Value, "yyyy/MM/dd"), 4)
+        If 日期3_dtp.Text = "" Or 日期3_dtp.Text = " " Then : PA12 = 日期3_dtp.Text : Else : PA12 = Strings.Format(日期3_dtp.Value, "yyyy/MM/dd") : End If
+        If 日期4_dtp.Text = "" Or 日期4_dtp.Text = " " Then : PA17 = 日期4_dtp.Text : Else : PA17 = Strings.Format(日期4_dtp.Value, "yyyy/MM/dd") : End If
         C1下拉表單資料載入() : C5下拉表單資料載入() : SQL_訂單抬頭修改() : Set_已建檔清單() : 存檔() : MessageBox.Show("存檔完成!!")
     End Sub
     Private Sub 存檔()
@@ -412,9 +443,9 @@ Public Class 量產訂單輸入
         PA7 = Strings.Format(日期_dtp.Value, "yyyy/MM/dd") : PA10 = Strings.Format(日期6_dtp.Value, "yyyy/MM/dd")
         For i As Integer = 0 To 控制表_dgv.Rows.Count - 1
             PA5 = 控制表_dgv.Rows(i).Cells("顏色").Value.ToString : PA6 = 控制表_dgv.Rows(i).Cells("楦型").Value.ToString : PA16 = 控制表_dgv.Rows(i).Cells("訂單數量").Value.ToString
-            PA13 = 控制表_dgv.Rows(i).Cells("資料流水號").Value.ToString
-
-            PA12 = 明細表_dgv.Rows(i).Cells("ItemNumber").Value.ToString() : PA14 = 明細表_dgv.Rows(i).Cells("ProductDescription").Value.ToString()
+            PA13 = 控制表_dgv.Rows(i).Cells("資料流水號").Value.ToString : PA35 = 控制表_dgv.Rows(i).Cells("STYLE #").Value.ToString
+            PA = 明細表_dgv.Rows(i).Cells("Item2").Value.ToString()
+            PA12 = 明細表_dgv.Rows(i).Cells("Item").Value.ToString() : PA14 = 明細表_dgv.Rows(i).Cells("ProductDescription").Value.ToString()
             PA17 = 明細表_dgv.Rows(i).Cells("5").Value.ToString() : PA18 = 明細表_dgv.Rows(i).Cells("5.5").Value.ToString() : PA19 = 明細表_dgv.Rows(i).Cells("6").Value.ToString()
             PA20 = 明細表_dgv.Rows(i).Cells("6.5").Value.ToString() : PA21 = 明細表_dgv.Rows(i).Cells("7").Value.ToString() : PA22 = 明細表_dgv.Rows(i).Cells("7.5").Value.ToString()
             PA23 = 明細表_dgv.Rows(i).Cells("8").Value.ToString() : PA24 = 明細表_dgv.Rows(i).Cells("8.5").Value.ToString() : PA25 = 明細表_dgv.Rows(i).Cells("9").Value.ToString()
@@ -430,10 +461,12 @@ Public Class 量產訂單輸入
             訂單流水號_dgv.Enabled = True
             PA2 = 天盾訂單號_tb.Text : SQL_訂單抬頭刪除() : Set_已建檔清單()
             天盾訂單號_tb.Text = "" : 工廠編號_cb.Text = "" : 客戶訂單號_tb.Text = "" : MOD_tb.Text = "" : DT_cb.Text = "" : 客戶資料2_cb.Text = "" : 客戶資料3_cb.Text = ""
-            SC_tb.Text = "" : Vendor_tb.Text = "" : ShiptoN_cb.Text = "" : 入單型態_tb.Text = "" : 客戶地址_bt.Text = "" : SalesOrder_cb.Text = ""
+            SC_tb.Text = "" : Vendor_Cb.Text = "" : ShiptoN_cb.Text = "" : 入單型態_tb.Text = "" : 客戶地址_bt.Text = "" : SalesOrder_cb.Text = ""
             力威訂單號_tb.Text = "" : 地址1_tb.Text = "" : 代理編號_cb.Text = "" : 訂貨代理_tb.Text = "" : 總雙數_tb.Text = "" : 總案件_tb.Text = ""
-            FTY_cb.Text = "" : 最終運送_tb.Text = "" : 日期_dtp.Value = Today() : 日期1_dtp.Value = Today() : 日期2_dtp.Text = Today() : 日期3_dtp.Value = Today()
-            日期4_dtp.Value = Today() : 日期5_dtp.Value = Today() : 日期6_dtp.Value = Today() : 入單型態_tb.Text = "2"
+            FTY_cb.Text = "" : 最終運送_tb.Text = "" : 日期_dtp.Value = Today() : 日期1_dtp.Value = Today() : 日期2_dtp.Text = Today()
+            日期3_dtp.Format = DateTimePickerFormat.Custom : 日期3_dtp.CustomFormat = " "
+            日期4_dtp.Format = DateTimePickerFormat.Custom : 日期4_dtp.CustomFormat = " "
+            日期5_dtp.Value = Today() : 日期6_dtp.Value = Today() : 入單型態_tb.Text = "2"
             If 訂單資料表(0) = "訂單明細表抬頭" Then : 客戶名稱_cb.Text = "" : 公司_tb.Text = ""
             ElseIf 訂單資料表(0) = "訂單明細表抬頭_DRS" Then : 客戶名稱_cb.Text = "" : 公司_tb.Text = ""
             ElseIf 訂單資料表(0) = "訂單明細表抬頭_HP" Then : 客戶名稱_cb.Text = "Hush Puppies"
@@ -471,7 +504,7 @@ Public Class 量產訂單輸入
                                                 PA6 = DM_cb.Text : PA7 = Strings.Format(日期_dtp.Value, "yyyy/MM/dd") : PA8 = FTY_cb.Text : PA9 = DIV_cb.Text
                                                 PA10 = Strings.Format(日期6_dtp.Value, "yyyy/MM/dd") : PA11 = 力威訂單號_tb.Text : SQL_訂單控制表新增()
                                                 '-----------新增訂單明細表--------------------------------------------------------------------------------------------
-                                                PA12 = Item_cb.Text : PA14 = PD_cb.Text : SQL_訂單明細表新增()
+                                                PA12 = Item_cb.Text : PA15 = Item2_cb.Text : PA14 = PD_cb.Text : SQL_訂單明細表新增()
                                                 '-----------新增訂單成本利潤表----------------------------------------------------------------------------------------
                                                 PA15 = Strings.Left(Strings.Format(日期_dtp.Value, "yyyy/MM/dd"), 4)
                                                 SQL_查詢訂單成本利潤表流水號()
@@ -496,7 +529,8 @@ Public Class 量產訂單輸入
             If 資料流水號_tb.Text = 控制表_dgv.Rows(i).Cells("資料流水號").Value.ToString() Then
                 控制表_dgv.Rows(i).Cells("顏色").Value = 顏色_cb.Text
                 控制表_dgv.Rows(i).Cells("楦型").Value = DM_cb.Text
-                明細表_dgv.Rows(i).Cells("ItemNumber").Value = Item_cb.Text
+                明細表_dgv.Rows(i).Cells("Item").Value = Item_cb.Text
+                明細表_dgv.Rows(i).Cells("Item2").Value = Item2_cb.Text
                 明細表_dgv.Rows(i).Cells("ProductDescription").Value = PD_cb.Text
                 明細表_dgv.Rows(i).Cells("Color").Value = 顏色_cb.Text
                 明細表_dgv.Rows(i).Cells("DM").Value = DM_cb.Text
@@ -547,4 +581,7 @@ Public Class 量產訂單輸入
             End If
         End If
     End Sub
+    Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles STYLE_N_tb.TextChanged
+        For i As Integer = 0 To 控制表_dgv.Rows.Count - 1 : 控制表_dgv.Rows(i).Cells("STYLE #").Value = STYLE_N_tb.Text : Next
+    End Sub
 End Class

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

@@ -22,8 +22,7 @@ Partial Class 驗貨報告圖片導入資料庫
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Me.WebBrowser1 = New System.Windows.Forms.WebBrowser()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.訂單清單_dgv = New System.Windows.Forms.DataGridView()
         Me.型體名稱_lb = New System.Windows.Forms.Label()
         Me.客戶訂單號_lb = New System.Windows.Forms.Label()
@@ -40,8 +39,6 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.TextBox7 = New System.Windows.Forms.TextBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.讀取料夾路徑_bt = New System.Windows.Forms.Button()
-        Me.伺服器FTP文件夾_lb = New System.Windows.Forms.Label()
-        Me.Label7 = New System.Windows.Forms.Label()
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.Label8 = New System.Windows.Forms.Label()
@@ -53,29 +50,24 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.字體大小調整_lb = New System.Windows.Forms.Label()
         Me.資料庫選擇3_bt = New System.Windows.Forms.Button()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.副檔名_bt = New System.Windows.Forms.TextBox()
+        Me.資料流水號_tb = New System.Windows.Forms.TextBox()
+        Me.確認儲存1_bt = New System.Windows.Forms.Button()
         CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
         '
-        'WebBrowser1
-        '
-        Me.WebBrowser1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.WebBrowser1.Location = New System.Drawing.Point(567, 337)
-        Me.WebBrowser1.MinimumSize = New System.Drawing.Size(20, 20)
-        Me.WebBrowser1.Name = "WebBrowser1"
-        Me.WebBrowser1.Size = New System.Drawing.Size(341, 107)
-        Me.WebBrowser1.TabIndex = 521
-        Me.WebBrowser1.Url = New System.Uri("", System.UriKind.Relative)
-        Me.WebBrowser1.Visible = False
-        '
         '訂單清單_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.訂單清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.訂單清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.訂單清單_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.訂單清單_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.訂單清單_dgv.BackgroundColor = System.Drawing.Color.White
         Me.訂單清單_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.訂單清單_dgv.Location = New System.Drawing.Point(356, 79)
         Me.訂單清單_dgv.Name = "訂單清單_dgv"
@@ -121,7 +113,7 @@ Partial Class 驗貨報告圖片導入資料庫
         '查詢_bt
         '
         Me.查詢_bt.ForeColor = System.Drawing.Color.Black
-        Me.查詢_bt.Location = New System.Drawing.Point(795, 41)
+        Me.查詢_bt.Location = New System.Drawing.Point(795, 42)
         Me.查詢_bt.Name = "查詢_bt"
         Me.查詢_bt.Size = New System.Drawing.Size(149, 35)
         Me.查詢_bt.TabIndex = 532
@@ -153,11 +145,11 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         Me.確認儲存_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.確認儲存_bt.ForeColor = System.Drawing.Color.Blue
-        Me.確認儲存_bt.Location = New System.Drawing.Point(452, 3)
+        Me.確認儲存_bt.Location = New System.Drawing.Point(449, 1)
         Me.確認儲存_bt.Name = "確認儲存_bt"
-        Me.確認儲存_bt.Size = New System.Drawing.Size(107, 52)
+        Me.確認儲存_bt.Size = New System.Drawing.Size(89, 52)
         Me.確認儲存_bt.TabIndex = 535
-        Me.確認儲存_bt.Text = "確認儲存"
+        Me.確認儲存_bt.Text = "確認儲存" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "驗貨報告(舊)"
         Me.確認儲存_bt.UseVisualStyleBackColor = True
         '
         '驗貨日期_dtp
@@ -181,7 +173,7 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         Me.TextBox3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.TextBox3.ForeColor = System.Drawing.Color.Black
-        Me.TextBox3.Location = New System.Drawing.Point(899, 267)
+        Me.TextBox3.Location = New System.Drawing.Point(21, 41)
         Me.TextBox3.Name = "TextBox3"
         Me.TextBox3.Size = New System.Drawing.Size(149, 23)
         Me.TextBox3.TabIndex = 538
@@ -203,7 +195,7 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.TextBox7.AllowDrop = True
         Me.TextBox7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.TextBox7.ForeColor = System.Drawing.Color.Black
-        Me.TextBox7.Location = New System.Drawing.Point(899, 238)
+        Me.TextBox7.Location = New System.Drawing.Point(21, 12)
         Me.TextBox7.Multiline = True
         Me.TextBox7.Name = "TextBox7"
         Me.TextBox7.Size = New System.Drawing.Size(149, 23)
@@ -231,31 +223,6 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.讀取料夾路徑_bt.Text = "讀取料夾路徑"
         Me.讀取料夾路徑_bt.UseVisualStyleBackColor = True
         '
-        '伺服器FTP文件夾_lb
-        '
-        Me.伺服器FTP文件夾_lb.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.伺服器FTP文件夾_lb.AutoSize = True
-        Me.伺服器FTP文件夾_lb.Font = New System.Drawing.Font("微軟正黑體", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.伺服器FTP文件夾_lb.Location = New System.Drawing.Point(564, 310)
-        Me.伺服器FTP文件夾_lb.Name = "伺服器FTP文件夾_lb"
-        Me.伺服器FTP文件夾_lb.Size = New System.Drawing.Size(156, 24)
-        Me.伺服器FTP文件夾_lb.TabIndex = 567
-        Me.伺服器FTP文件夾_lb.Text = "伺服器FTP文件夾"
-        Me.伺服器FTP文件夾_lb.Visible = False
-        '
-        'Label7
-        '
-        Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Label7.AutoSize = True
-        Me.Label7.Font = New System.Drawing.Font("微軟正黑體", 21.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label7.ForeColor = System.Drawing.Color.Red
-        Me.Label7.Location = New System.Drawing.Point(919, 183)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(46, 37)
-        Me.Label7.TabIndex = 568
-        Me.Label7.Text = "↓"
-        Me.Label7.Visible = False
-        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -270,7 +237,7 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         Me.Label8.AutoSize = True
         Me.Label8.ForeColor = System.Drawing.Color.Blue
-        Me.Label8.Location = New System.Drawing.Point(565, 6)
+        Me.Label8.Location = New System.Drawing.Point(656, 6)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(223, 48)
         Me.Label8.TabIndex = 570
@@ -351,18 +318,62 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         Me.TextBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.TextBox1.ForeColor = System.Drawing.Color.Black
-        Me.TextBox1.Location = New System.Drawing.Point(899, 296)
+        Me.TextBox1.Location = New System.Drawing.Point(21, 70)
         Me.TextBox1.Name = "TextBox1"
         Me.TextBox1.Size = New System.Drawing.Size(149, 23)
         Me.TextBox1.TabIndex = 1637
         Me.TextBox1.Visible = False
         '
+        'Panel1
+        '
+        Me.Panel1.Controls.Add(Me.副檔名_bt)
+        Me.Panel1.Controls.Add(Me.資料流水號_tb)
+        Me.Panel1.Controls.Add(Me.TextBox7)
+        Me.Panel1.Controls.Add(Me.TextBox1)
+        Me.Panel1.Controls.Add(Me.TextBox3)
+        Me.Panel1.Location = New System.Drawing.Point(389, 103)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(189, 171)
+        Me.Panel1.TabIndex = 1638
+        '
+        '副檔名_bt
+        '
+        Me.副檔名_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.副檔名_bt.ForeColor = System.Drawing.Color.Black
+        Me.副檔名_bt.Location = New System.Drawing.Point(21, 128)
+        Me.副檔名_bt.Name = "副檔名_bt"
+        Me.副檔名_bt.Size = New System.Drawing.Size(149, 23)
+        Me.副檔名_bt.TabIndex = 1639
+        Me.副檔名_bt.Visible = False
+        '
+        '資料流水號_tb
+        '
+        Me.資料流水號_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.資料流水號_tb.ForeColor = System.Drawing.Color.Black
+        Me.資料流水號_tb.Location = New System.Drawing.Point(21, 99)
+        Me.資料流水號_tb.Name = "資料流水號_tb"
+        Me.資料流水號_tb.Size = New System.Drawing.Size(149, 23)
+        Me.資料流水號_tb.TabIndex = 1638
+        Me.資料流水號_tb.Visible = False
+        '
+        '確認儲存1_bt
+        '
+        Me.確認儲存1_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.確認儲存1_bt.ForeColor = System.Drawing.Color.Green
+        Me.確認儲存1_bt.Location = New System.Drawing.Point(540, 1)
+        Me.確認儲存1_bt.Name = "確認儲存1_bt"
+        Me.確認儲存1_bt.Size = New System.Drawing.Size(89, 52)
+        Me.確認儲存1_bt.TabIndex = 1639
+        Me.確認儲存1_bt.Text = "確認儲存" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "驗貨報告(新)"
+        Me.確認儲存1_bt.UseVisualStyleBackColor = True
+        '
         '驗貨報告圖片導入資料庫
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1350, 701)
-        Me.Controls.Add(Me.TextBox1)
+        Me.Controls.Add(Me.確認儲存1_bt)
+        Me.Controls.Add(Me.Panel1)
         Me.Controls.Add(Me.資料庫選擇3_bt)
         Me.Controls.Add(Me.字體_NUD)
         Me.Controls.Add(Me.字體大小調整_lb)
@@ -371,13 +382,9 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.Controls.Add(Me.查詢_bt)
         Me.Controls.Add(Me.天盾訂單號_tb)
         Me.Controls.Add(Me.天盾訂單號_lb)
-        Me.Controls.Add(Me.Label8)
         Me.Controls.Add(Me.Label5)
-        Me.Controls.Add(Me.伺服器FTP文件夾_lb)
-        Me.Controls.Add(Me.TextBox7)
         Me.Controls.Add(Me.Label4)
         Me.Controls.Add(Me.讀取料夾路徑_bt)
-        Me.Controls.Add(Me.TextBox3)
         Me.Controls.Add(Me.驗貨日期_lb)
         Me.Controls.Add(Me.驗貨日期_dtp)
         Me.Controls.Add(Me.確認儲存_bt)
@@ -386,23 +393,22 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.Controls.Add(Me.客戶訂單號_tb)
         Me.Controls.Add(Me.型體名稱_lb)
         Me.Controls.Add(Me.客戶訂單號_lb)
-        Me.Controls.Add(Me.WebBrowser1)
-        Me.Controls.Add(Me.Label7)
         Me.Controls.Add(Me.檔案名稱_lb)
         Me.Controls.Add(Me.訂單清單_dgv)
         Me.Controls.Add(Me.WebBrowser2)
+        Me.Controls.Add(Me.Label8)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "驗貨報告圖片導入資料庫"
         Me.Text = "驗貨報告圖片導入資料庫"
         CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
-
-    Friend WithEvents WebBrowser1 As WebBrowser
     Friend WithEvents 訂單清單_dgv As DataGridView
     Friend WithEvents 型體名稱_lb As Label
     Friend WithEvents 客戶訂單號_lb As Label
@@ -419,8 +425,6 @@ Partial Class 驗貨報告圖片導入資料庫
     Friend WithEvents TextBox7 As TextBox
     Friend WithEvents Label4 As Label
     Friend WithEvents 讀取料夾路徑_bt As Button
-    Friend WithEvents 伺服器FTP文件夾_lb As Label
-    Friend WithEvents Label7 As Label
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
     Friend WithEvents Label5 As Label
     Friend WithEvents Label8 As Label
@@ -432,5 +436,9 @@ Partial Class 驗貨報告圖片導入資料庫
     Friend WithEvents 字體大小調整_lb As Label
     Friend WithEvents 資料庫選擇3_bt As Button
     Friend WithEvents TextBox1 As TextBox
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents 資料流水號_tb As TextBox
+    Friend WithEvents 副檔名_bt As TextBox
+    Friend WithEvents 確認儲存1_bt As Button
 End Class
 

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

@@ -9,8 +9,8 @@ Public Class 驗貨報告圖片導入資料庫
         訂單清單_dgv.ColumnHeadersHeight = 25
         訂單清單_dgv.AllowUserToAddRows = False : ConnOpen()
     End Sub
-    Private  Sub Set_DGV1載入後設定()
-        CmdSet_For_DGV() :  : da.Fill(ds) : 訂單清單_dgv.DataSource = ds.Tables(0) : conn.Close()
+    Private Sub Set_DGV1載入後設定()
+        CmdSet_For_DGV() :: da.Fill(ds) : 訂單清單_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_清單1()
         Set_DGV1載入前設定() : SQL_訂單清單() : Set_DGV1載入後設定()
@@ -18,11 +18,12 @@ Public Class 驗貨報告圖片導入資料庫
     Private Sub Set_grid1()
         訂單清單_dgv.Columns(0).FillWeight = 80 : 訂單清單_dgv.Columns(1).FillWeight = 70 : 訂單清單_dgv.Columns(2).FillWeight = 120 : 訂單清單_dgv.Columns(3).FillWeight = 140
         訂單清單_dgv.Columns(4).FillWeight = 100 : 訂單清單_dgv.Columns(5).FillWeight = 80 : 訂單清單_dgv.Columns(6).FillWeight = 100 : 訂單清單_dgv.Columns(7).FillWeight = 100
-        訂單清單_dgv.Columns(8).FillWeight = 100 : 訂單清單_dgv.Columns(9).Visible = False : 訂單清單_dgv.Columns(10).Visible = False
+        訂單清單_dgv.Columns(8).FillWeight = 100 : 訂單清單_dgv.Columns(9).Visible = False : 訂單清單_dgv.Columns(10).Visible = False : 訂單清單_dgv.Columns("資料流水號").Visible = False
+        訂單清單_dgv.Columns("訂單數量").DefaultCellStyle.Format = "#,##0" : 訂單清單_dgv.Columns("力威訂單號").Visible = False
     End Sub
     Private Sub 驗貨報告圖片導入資料庫_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
-        訂單資料庫選擇.ShowDialog() : Target1 = Target & AA(3) & "/" : WebBrowser1.Url = New Uri(Target1)
+        訂單資料庫選擇.ShowDialog() : Target1 = Target & AA(3) & "/" : Panel1.SendToBack()
         Set_清單1() : Set_grid1()
         TextBox3.Visible = False : TextBox7.Visible = False
         If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then : WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath) : End If
@@ -38,24 +39,41 @@ Public Class 驗貨報告圖片導入資料庫
     End Sub
     Private Sub 訂單清單_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 訂單清單_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            客戶訂單號_tb.Text = 訂單清單_dgv("客戶訂單號", e.RowIndex).Value.ToString : 型體名稱_tb.Text = 訂單清單_dgv("形體號", e.RowIndex).Value.ToString
-            天盾訂單號_tb.Text = 訂單清單_dgv("訂單流水號", e.RowIndex).Value.ToString
+            客戶訂單號_tb.Text = 訂單清單_dgv("力威訂單號", e.RowIndex).Value.ToString : 型體名稱_tb.Text = 訂單清單_dgv("形體號", e.RowIndex).Value.ToString
+            天盾訂單號_tb.Text = 訂單清單_dgv("訂單流水號", e.RowIndex).Value.ToString : 資料流水號_tb.Text = 訂單清單_dgv("資料流水號", e.RowIndex).Value.ToString
         End If
     End Sub
     Private Sub 查詢_bt_Click(sender As Object, e As EventArgs) Handles 查詢_bt.Click
-        PA = InputBox("請輸入要查詢的資料") : Set_DGV1載入前設定() : SQL_訂單清單查詢() : Set_DGV1載入後設定() : Set_grid1()
-        PA = ""
+        PA = InputBox("請輸入要查詢的資料") : Set_DGV1載入前設定() : SQL_訂單清單查詢() : Set_DGV1載入後設定() : Set_grid1() : PA = ""
     End Sub
-    Private  Sub Button11_Click(sender As Object, e As EventArgs) Handles 確認儲存_bt.Click
-        If 客戶訂單號_tb.Text = "" Or 型體名稱_tb.Text = "" Or 檔案名稱_tb.Text = "" Then
-            MsgBox("檔案名稱或資料不可空白")
-        Else
+    Private Sub Button11_Click(sender As Object, e As EventArgs) Handles 確認儲存_bt.Click
+        If 客戶訂單號_tb.Text = "" Or 型體名稱_tb.Text = "" Or 檔案名稱_tb.Text = "" Then : MsgBox("檔案名稱或資料不可空白") : Else
+            SQL_資料庫選擇() : If dr.Read() Then : PA1 = dr("圖片資料庫").ToString : PA20 = PA1 : End If
+            SQL_查詢最後一筆驗貨報告編號()
+            If dr.Read() Then : TextBox3.Text = dr("驗貨報告編號").ToString : Else : TextBox3.Text = "0" : End If : conn.Close()
+            Dim NUM1 As Integer = Double.Parse(Strings.Right(TextBox3.Text, 8)) + 1
+            If NUM1 < 10 Then : TextBox3.Text = "IR" & "0000000" & NUM1
+            ElseIf NUM1 > 9 And NUM1 < 100 Then : TextBox3.Text = "IR" & "000000" & NUM1
+            ElseIf NUM1 > 99 And NUM1 < 1000 Then : TextBox3.Text = "IR" & "00000" & NUM1
+            ElseIf NUM1 > 999 And NUM1 < 10000 Then : TextBox3.Text = "IR" & "0000" & NUM1
+            ElseIf NUM1 > 9999 And NUM1 < 100000 Then : TextBox3.Text = "IR" & "000" & NUM1
+            ElseIf NUM1 > 99999 And NUM1 < 100000 Then : TextBox3.Text = "IR" & "00" & NUM1
+            ElseIf NUM1 > 999999 And NUM1 < 1000000 Then : TextBox3.Text = "IR" & "0" & NUM1
+            ElseIf NUM1 > 9999999 Then : TextBox3.Text = "IR" & NUM1 : End If
+
+            If Strings.Right(TextBox1.Text, 3) = "pdf" Or Strings.Right(TextBox1.Text, 3) = "PDF" Then : 副檔名_bt.Text = "PDF" : Else : 副檔名_bt.Text = "" : End If
+            PA49 = TextBox1.Text : SQL_新增驗貨報告圖庫_正式() : conn.Close()
+            DTP = Format(驗貨日期_dtp.Value, "yyyy/MM/dd") : SQL_修改驗貨報告圖庫() : conn.Close()
+            '----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+            檔案名稱_tb.Text = "" : TextBox1.Text = "" : Set_清單1() : Set_grid1() : MsgBox("新增完成")
+        End If
+    End Sub
+    Private Sub 確認儲存1_bt_Click(sender As Object, e As EventArgs) Handles 確認儲存1_bt.Click
+        If 客戶訂單號_tb.Text = "" Or 型體名稱_tb.Text = "" Or 檔案名稱_tb.Text = "" Then : MsgBox("檔案名稱或資料不可空白") : Else
             SQL_資料庫選擇() : If dr.Read() Then : PA1 = dr("圖片資料庫").ToString : PA20 = PA1 : End If
             SQL_查詢最後一筆驗貨報告編號()
-            If dr.Read() Then : TextBox3.Text = dr("驗貨報告編號").ToString : Else : TextBox3.Text = "0" : End If
-            conn.Close()
-            Dim NUM1 As Integer
-            NUM1 = Double.Parse(Strings.Right(TextBox3.Text, 8)) + 1
+            If dr.Read() Then : TextBox3.Text = dr("驗貨報告編號").ToString : Else : TextBox3.Text = "0" : End If : conn.Close()
+            Dim NUM1 As Integer = Double.Parse(Strings.Right(TextBox3.Text, 8)) + 1
             If NUM1 < 10 Then : TextBox3.Text = "IR" & "0000000" & NUM1
             ElseIf NUM1 > 9 And NUM1 < 100 Then : TextBox3.Text = "IR" & "000000" & NUM1
             ElseIf NUM1 > 99 And NUM1 < 1000 Then : TextBox3.Text = "IR" & "00000" & NUM1
@@ -63,28 +81,13 @@ Public Class 驗貨報告圖片導入資料庫
             ElseIf NUM1 > 9999 And NUM1 < 100000 Then : TextBox3.Text = "IR" & "000" & NUM1
             ElseIf NUM1 > 99999 And NUM1 < 100000 Then : TextBox3.Text = "IR" & "00" & NUM1
             ElseIf NUM1 > 999999 And NUM1 < 1000000 Then : TextBox3.Text = "IR" & "0" & NUM1
-            ElseIf NUM1 > 9999999 Then : TextBox3.Text = "IR" & NUM1
-            End If
-            PA49 = TextBox1.Text
-            If Strings.Left(Target1, 18) = "ftp://106.1.48.106" Then : SQL_新增驗貨報告編號_測試()
-            Else : SQL_新增驗貨報告圖庫_正式() : End If : conn.Close()
+            ElseIf NUM1 > 9999999 Then : TextBox3.Text = "IR" & NUM1 : End If
 
-            DTP = Format(驗貨日期_dtp.Value, "yyyy/MM/dd")
-            SQL_修改驗貨報告圖庫() : conn.Close()
-            ''---FTP方式刪除檔案----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-            'Dim frq As FtpWebRequest, frp As FtpWebResponse, fcr As NetworkCredential
-            'frq = CType(WebRequest.Create(New Uri(Target1 & 檔案名稱_tb.Text)), FtpWebRequest)
-            'fcr = New NetworkCredential(FTP帳號, FTP密碼)
-            'frq.Credentials = fcr
-            'frq.Method = WebRequestMethods.Ftp.DeleteFile
-            'frq.UseBinary = True
-            'frp = CType(frq.GetResponse, FtpWebResponse)
-            'frp.Close()
-            'WebBrowser1.Refresh()
+            If Strings.Right(TextBox1.Text, 3) = "pdf" Or Strings.Right(TextBox1.Text, 3) = "PDF" Then : 副檔名_bt.Text = "PDF" : Else : 副檔名_bt.Text = "" : End If
+            PA49 = TextBox1.Text : SQL_新增驗貨報告圖庫_正式() : conn.Close()
+            DTP = Format(驗貨日期_dtp.Value, "yyyy/MM/dd") : SQL_修改驗貨報告圖庫1() : conn.Close()
             '----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-            客戶訂單號_tb.Text = "" : 型體名稱_tb.Text = "" : 檔案名稱_tb.Text = "" : TextBox1.Text = ""
-            Set_清單1() : Set_grid1()
-            MsgBox("新增完成")
+            檔案名稱_tb.Text = "" : TextBox1.Text = "" : Set_清單1() : Set_grid1() : MsgBox("新增完成")
         End If
     End Sub
     Private Sub 檔案名稱_tb_DragEnter(sender As Object, e As DragEventArgs) Handles 檔案名稱_tb.DragEnter

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

@@ -22,10 +22,9 @@ Partial Class 驗貨報告資料庫
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.驗貨報告圖庫_dgv = New System.Windows.Forms.DataGridView()
-        Me.驗貨報告_pb = New System.Windows.Forms.PictureBox()
         Me.驗貨報告編號_tb = New System.Windows.Forms.TextBox()
         Me.下載圖片_bt = New System.Windows.Forms.Button()
         Me.查詢_bt = New System.Windows.Forms.Button()
@@ -57,21 +56,30 @@ Partial Class 驗貨報告資料庫
         Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.驗貨報告_wb = New System.Windows.Forms.WebBrowser()
+        Me.驗貨報告_pb = New System.Windows.Forms.PictureBox()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
         Me.字體_NUD = New System.Windows.Forms.NumericUpDown()
         Me.字體大小調整_lb = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.圖庫_tb = New System.Windows.Forms.TextBox()
         Me.Label38 = New System.Windows.Forms.Label()
         Me.圖片資料庫管理_dgv = New System.Windows.Forms.DataGridView()
         Me.資料庫選擇3_bt = New System.Windows.Forms.Button()
+        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.新版_ch = New System.Windows.Forms.CheckBox()
+        Me.舊版_ch = New System.Windows.Forms.CheckBox()
         CType(Me.驗貨報告圖庫_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
+        Me.Panel3.SuspendLayout()
+        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage2.SuspendLayout()
         CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.圖片資料庫管理_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel2.SuspendLayout()
         Me.SuspendLayout()
         '
         '驗貨報告圖庫_dgv
@@ -79,6 +87,7 @@ Partial Class 驗貨報告資料庫
         Me.驗貨報告圖庫_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.驗貨報告圖庫_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.驗貨報告圖庫_dgv.BackgroundColor = System.Drawing.Color.White
         Me.驗貨報告圖庫_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.驗貨報告圖庫_dgv.Location = New System.Drawing.Point(4, 33)
         Me.驗貨報告圖庫_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
@@ -88,21 +97,6 @@ Partial Class 驗貨報告資料庫
         Me.驗貨報告圖庫_dgv.Size = New System.Drawing.Size(615, 664)
         Me.驗貨報告圖庫_dgv.TabIndex = 4
         '
-        '驗貨報告_pb
-        '
-        Me.驗貨報告_pb.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.驗貨報告_pb.BackgroundImage = Global.天盾國際管理系統.My.Resources.Resources._9572465
-        Me.驗貨報告_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
-        Me.驗貨報告_pb.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.驗貨報告_pb.Location = New System.Drawing.Point(6, 52)
-        Me.驗貨報告_pb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.驗貨報告_pb.Name = "驗貨報告_pb"
-        Me.驗貨報告_pb.Size = New System.Drawing.Size(782, 606)
-        Me.驗貨報告_pb.TabIndex = 502
-        Me.驗貨報告_pb.TabStop = False
-        '
         '驗貨報告編號_tb
         '
         Me.驗貨報告編號_tb.Location = New System.Drawing.Point(321, 3)
@@ -147,7 +141,7 @@ Partial Class 驗貨報告資料庫
         '
         '客戶訂單號_tb
         '
-        Me.客戶訂單號_tb.Location = New System.Drawing.Point(555, 3)
+        Me.客戶訂單號_tb.Location = New System.Drawing.Point(321, 27)
         Me.客戶訂單號_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶訂單號_tb.Name = "客戶訂單號_tb"
         Me.客戶訂單號_tb.Size = New System.Drawing.Size(115, 23)
@@ -155,7 +149,7 @@ Partial Class 驗貨報告資料庫
         '
         '型體名稱_tb
         '
-        Me.型體名稱_tb.Location = New System.Drawing.Point(672, 3)
+        Me.型體名稱_tb.Location = New System.Drawing.Point(438, 27)
         Me.型體名稱_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.型體名稱_tb.Name = "型體名稱_tb"
         Me.型體名稱_tb.Size = New System.Drawing.Size(115, 23)
@@ -163,7 +157,7 @@ Partial Class 驗貨報告資料庫
         '
         'TextBox5
         '
-        Me.TextBox5.Location = New System.Drawing.Point(243, 110)
+        Me.TextBox5.Location = New System.Drawing.Point(3, 146)
         Me.TextBox5.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.TextBox5.Name = "TextBox5"
         Me.TextBox5.Size = New System.Drawing.Size(115, 23)
@@ -399,14 +393,13 @@ Partial Class 驗貨報告資料庫
         Me.TabPage1.Controls.Add(Me.年份季度_tb)
         Me.TabPage1.Controls.Add(Me.客戶訂單號_tb)
         Me.TabPage1.Controls.Add(Me.型體名稱_tb)
-        Me.TabPage1.Controls.Add(Me.TextBox5)
         Me.TabPage1.Controls.Add(Me.順時鐘90度旋轉_bt)
         Me.TabPage1.Controls.Add(Me.逆時鐘90度旋轉_bt)
         Me.TabPage1.Controls.Add(Me.水平翻轉_bt)
         Me.TabPage1.Controls.Add(Me.垂直翻轉_bt)
         Me.TabPage1.Controls.Add(Me.放大_bt)
         Me.TabPage1.Controls.Add(Me.復原_bt)
-        Me.TabPage1.Controls.Add(Me.驗貨報告_pb)
+        Me.TabPage1.Controls.Add(Me.Panel3)
         Me.TabPage1.Location = New System.Drawing.Point(4, 28)
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
@@ -415,6 +408,40 @@ Partial Class 驗貨報告資料庫
         Me.TabPage1.Text = "驗貨報告"
         Me.TabPage1.UseVisualStyleBackColor = True
         '
+        'Panel3
+        '
+        Me.Panel3.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel3.Controls.Add(Me.驗貨報告_wb)
+        Me.Panel3.Controls.Add(Me.驗貨報告_pb)
+        Me.Panel3.Location = New System.Drawing.Point(2, 52)
+        Me.Panel3.Name = "Panel3"
+        Me.Panel3.Size = New System.Drawing.Size(786, 604)
+        Me.Panel3.TabIndex = 560
+        '
+        '驗貨報告_wb
+        '
+        Me.驗貨報告_wb.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.驗貨報告_wb.Location = New System.Drawing.Point(0, 0)
+        Me.驗貨報告_wb.MinimumSize = New System.Drawing.Size(20, 20)
+        Me.驗貨報告_wb.Name = "驗貨報告_wb"
+        Me.驗貨報告_wb.Size = New System.Drawing.Size(784, 602)
+        Me.驗貨報告_wb.TabIndex = 559
+        '
+        '驗貨報告_pb
+        '
+        Me.驗貨報告_pb.BackColor = System.Drawing.Color.White
+        Me.驗貨報告_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.驗貨報告_pb.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.驗貨報告_pb.Location = New System.Drawing.Point(0, 0)
+        Me.驗貨報告_pb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.驗貨報告_pb.Name = "驗貨報告_pb"
+        Me.驗貨報告_pb.Size = New System.Drawing.Size(784, 602)
+        Me.驗貨報告_pb.TabIndex = 502
+        Me.驗貨報告_pb.TabStop = False
+        '
         'TabPage2
         '
         Me.TabPage2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -441,7 +468,7 @@ Partial Class 驗貨報告資料庫
         '
         Me.字體_NUD.DecimalPlaces = 1
         Me.字體_NUD.Increment = New Decimal(New Integer() {1, 0, 0, 65536})
-        Me.字體_NUD.Location = New System.Drawing.Point(580, 6)
+        Me.字體_NUD.Location = New System.Drawing.Point(159, 19)
         Me.字體_NUD.Maximum = New Decimal(New Integer() {18, 0, 0, 0})
         Me.字體_NUD.Minimum = New Decimal(New Integer() {6, 0, 0, 0})
         Me.字體_NUD.Name = "字體_NUD"
@@ -455,7 +482,7 @@ Partial Class 驗貨報告資料庫
         Me.字體大小調整_lb.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.字體大小調整_lb.ForeColor = System.Drawing.Color.Red
         Me.字體大小調整_lb.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.字體大小調整_lb.Location = New System.Drawing.Point(522, 9)
+        Me.字體大小調整_lb.Location = New System.Drawing.Point(101, 22)
         Me.字體大小調整_lb.Name = "字體大小調整_lb"
         Me.字體大小調整_lb.Size = New System.Drawing.Size(60, 17)
         Me.字體大小調整_lb.TabIndex = 1633
@@ -464,13 +491,23 @@ Partial Class 驗貨報告資料庫
         'Panel1
         '
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.圖庫_tb)
         Me.Panel1.Controls.Add(Me.Label38)
         Me.Panel1.Controls.Add(Me.圖片資料庫管理_dgv)
-        Me.Panel1.Location = New System.Drawing.Point(572, 164)
+        Me.Panel1.Controls.Add(Me.TextBox5)
+        Me.Panel1.Location = New System.Drawing.Point(213, 128)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(205, 303)
         Me.Panel1.TabIndex = 1634
         '
+        '圖庫_tb
+        '
+        Me.圖庫_tb.Location = New System.Drawing.Point(3, 177)
+        Me.圖庫_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.圖庫_tb.Name = "圖庫_tb"
+        Me.圖庫_tb.Size = New System.Drawing.Size(115, 23)
+        Me.圖庫_tb.TabIndex = 709
+        '
         'Label38
         '
         Me.Label38.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -484,27 +521,27 @@ Partial Class 驗貨報告資料庫
         '
         '圖片資料庫管理_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.White
-        Me.圖片資料庫管理_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.White
+        Me.圖片資料庫管理_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.圖片資料庫管理_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.圖片資料庫管理_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.圖片資料庫管理_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.圖片資料庫管理_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.White
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.圖片資料庫管理_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
         Me.圖片資料庫管理_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.圖片資料庫管理_dgv.Location = New System.Drawing.Point(3, 29)
         Me.圖片資料庫管理_dgv.Name = "圖片資料庫管理_dgv"
         Me.圖片資料庫管理_dgv.RowHeadersWidth = 5
         Me.圖片資料庫管理_dgv.RowTemplate.Height = 24
-        Me.圖片資料庫管理_dgv.Size = New System.Drawing.Size(195, 269)
+        Me.圖片資料庫管理_dgv.Size = New System.Drawing.Size(195, 110)
         Me.圖片資料庫管理_dgv.TabIndex = 707
         '
         '資料庫選擇3_bt
@@ -516,35 +553,70 @@ Partial Class 驗貨報告資料庫
         Me.資料庫選擇3_bt.Text = "HP"
         Me.資料庫選擇3_bt.UseVisualStyleBackColor = True
         '
+        'Panel2
+        '
+        Me.Panel2.Controls.Add(Me.字體_NUD)
+        Me.Panel2.Controls.Add(Me.字體大小調整_lb)
+        Me.Panel2.Location = New System.Drawing.Point(257, 145)
+        Me.Panel2.Name = "Panel2"
+        Me.Panel2.Size = New System.Drawing.Size(200, 100)
+        Me.Panel2.TabIndex = 1637
+        '
+        '新版_ch
+        '
+        Me.新版_ch.AutoSize = True
+        Me.新版_ch.Location = New System.Drawing.Point(450, 7)
+        Me.新版_ch.Name = "新版_ch"
+        Me.新版_ch.Size = New System.Drawing.Size(50, 20)
+        Me.新版_ch.TabIndex = 1638
+        Me.新版_ch.Text = "新版"
+        Me.新版_ch.UseVisualStyleBackColor = True
+        '
+        '舊版_ch
+        '
+        Me.舊版_ch.AutoSize = True
+        Me.舊版_ch.Checked = True
+        Me.舊版_ch.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.舊版_ch.Location = New System.Drawing.Point(506, 7)
+        Me.舊版_ch.Name = "舊版_ch"
+        Me.舊版_ch.Size = New System.Drawing.Size(50, 20)
+        Me.舊版_ch.TabIndex = 1639
+        Me.舊版_ch.Text = "舊版"
+        Me.舊版_ch.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(1422, 701)
+        Me.Controls.Add(Me.舊版_ch)
+        Me.Controls.Add(Me.新版_ch)
         Me.Controls.Add(Me.資料庫選擇3_bt)
-        Me.Controls.Add(Me.Panel1)
-        Me.Controls.Add(Me.字體_NUD)
-        Me.Controls.Add(Me.字體大小調整_lb)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.TabControl1)
         Me.Controls.Add(Me.資料庫選擇2_bt)
         Me.Controls.Add(Me.資料庫選擇1_bt)
         Me.Controls.Add(Me.驗貨報告圖庫_dgv)
+        Me.Controls.Add(Me.Panel2)
+        Me.Controls.Add(Me.Panel1)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "驗貨報告資料庫"
         Me.Text = "驗貨報告資料庫"
         CType(Me.驗貨報告圖庫_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabControl1.ResumeLayout(False)
         Me.TabPage1.ResumeLayout(False)
         Me.TabPage1.PerformLayout()
+        Me.Panel3.ResumeLayout(False)
+        CType(Me.驗貨報告_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabPage2.ResumeLayout(False)
         Me.TabPage2.PerformLayout()
         CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
         CType(Me.圖片資料庫管理_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel2.ResumeLayout(False)
+        Me.Panel2.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -590,4 +662,10 @@ Partial Class 驗貨報告資料庫
     Friend WithEvents Label38 As Label
     Friend WithEvents 圖片資料庫管理_dgv As DataGridView
     Friend WithEvents 資料庫選擇3_bt As Button
+    Friend WithEvents Panel2 As Panel
+    Friend WithEvents 驗貨報告_wb As WebBrowser
+    Friend WithEvents Panel3 As Panel
+    Friend WithEvents 圖庫_tb As TextBox
+    Friend WithEvents 新版_ch As CheckBox
+    Friend WithEvents 舊版_ch As CheckBox
 End Class

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

@@ -23,57 +23,43 @@ Public Class 驗貨報告資料庫
         圖片資料庫管理_dgv.Columns(0).FillWeight = 100 : 圖片資料庫管理_dgv.Columns(1).Visible = False
     End Sub
     Private Sub Set_DGV1載入前設定()
-        Try
-            驗貨報告圖庫_dgv.DataSource = Nothing : ds.Clear()
-            驗貨報告圖庫_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-            驗貨報告圖庫_dgv.ColumnHeadersHeight = 25 : 驗貨報告圖庫_dgv.AllowUserToAddRows = False : ConnOpen()
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        驗貨報告圖庫_dgv.DataSource = Nothing : ds.Clear()
+        驗貨報告圖庫_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        驗貨報告圖庫_dgv.ColumnHeadersHeight = 25 : 驗貨報告圖庫_dgv.AllowUserToAddRows = False : ConnOpen()
     End Sub
     Private Sub Set_DGV1載入後設定()
-        CmdSet_For_DGV() :  : da.Fill(ds) : 驗貨報告圖庫_dgv.DataSource = ds.Tables(0) : conn.Close()
+        CmdSet_For_DGV() : da.Fill(ds) : 驗貨報告圖庫_dgv.DataSource = ds.Tables(0) : conn.Close()
+        驗貨報告圖庫_dgv.Columns(0).FillWeight = 80 : 驗貨報告圖庫_dgv.Columns(1).FillWeight = 80 : 驗貨報告圖庫_dgv.Columns(2).FillWeight = 130
+        驗貨報告圖庫_dgv.Columns(3).FillWeight = 150 : 驗貨報告圖庫_dgv.Columns(4).FillWeight = 70 : 驗貨報告圖庫_dgv.Columns(5).FillWeight = 80
+        驗貨報告圖庫_dgv.Columns("驗報圖庫").Visible = False : 驗貨報告圖庫_dgv.Columns("驗報圖庫2").Visible = False
     End Sub
     Private Sub Set_圖片清單()
         Set_DGV1載入前設定() : SQL_驗貨報告圖庫清單() : Set_DGV1載入後設定()
     End Sub
-    Private Sub Set_grid()
-        Try
-            驗貨報告圖庫_dgv.Columns(0).FillWeight = 80 : 驗貨報告圖庫_dgv.Columns(1).FillWeight = 80 : 驗貨報告圖庫_dgv.Columns(2).FillWeight = 130
-            驗貨報告圖庫_dgv.Columns(3).FillWeight = 150 : 驗貨報告圖庫_dgv.Columns(4).FillWeight = 70 : 驗貨報告圖庫_dgv.Columns(5).FillWeight = 80
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Sub
     Private Sub 驗貨報告資料庫_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Try
-            Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
-            訂單資料庫選擇.ShowDialog() : Target1 = Target & AA(3) & "/" : WebBrowser1.Url = New Uri(Target1)
-            驗貨報告編號_tb.Enabled = False : 年份季度_tb.Enabled = False : 客戶訂單號_tb.Enabled = False : 型體名稱_tb.Enabled = False
-            TextBox5.Visible = False : TextBox7.Visible = False : Button24.Enabled = False
-            If CC(92) = True Then : Button24.Enabled = True : End If
-            If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then : WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath) : End If
-            Set_工程圖片資料庫狀態()
-            If TENDEN_MES_SYS.Size.Width > 1440 And TENDEN_MES_SYS.Size.Height > 900 Then : 字體_NUD.Value = 9
-            ElseIf TENDEN_MES_SYS.Size.Width <= 1440 And TENDEN_MES_SYS.Size.Height <= 900 Then : 字體_NUD.Value = 7.6 : End If
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+        Target1 = Target & AA(3) & "/" : WebBrowser1.Url = New Uri(Target1)
+        驗貨報告編號_tb.Enabled = False : 年份季度_tb.Enabled = False : 客戶訂單號_tb.Enabled = False : 型體名稱_tb.Enabled = False
+        TextBox5.Visible = False : TextBox7.Visible = False : Button24.Enabled = False : Panel1.Visible = False
+        If CC(92) = True Then : Button24.Enabled = True : End If
+
+        WebBrowser2.Navigate(Environment.GetFolderPath(Environment.SpecialFolder.Desktop))
+        If TENDEN_MES_SYS.Size.Width > 1440 And TENDEN_MES_SYS.Size.Height > 900 Then : 字體_NUD.Value = 9
+        ElseIf TENDEN_MES_SYS.Size.Width <= 1440 And TENDEN_MES_SYS.Size.Height <= 900 Then : 字體_NUD.Value = 7.6 : End If
+    End Sub
+    Private Sub 驗貨報告資料庫_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
+        Set_工程圖片資料庫狀態() : 訂單資料庫選擇.ShowDialog() : Set_圖片清單()
     End Sub
     Private Sub 驗貨報告資料庫_SizeChanged(sender As Object, e As EventArgs) Handles MyBase.SizeChanged
-        Try
-            If TENDEN_MES_SYS.Size.Width > 1440 And TENDEN_MES_SYS.Size.Height > 900 Then : 字體_NUD.Value = 9
-            ElseIf TENDEN_MES_SYS.Size.Width <= 1440 And TENDEN_MES_SYS.Size.Height <= 900 Then : 字體_NUD.Value = 7.6 : End If
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        If TENDEN_MES_SYS.Size.Width > 1440 And TENDEN_MES_SYS.Size.Height > 900 Then : 字體_NUD.Value = 9
+        ElseIf TENDEN_MES_SYS.Size.Width <= 1440 And TENDEN_MES_SYS.Size.Height <= 900 Then : 字體_NUD.Value = 7.6 : End If
     End Sub
     Private Sub 字體_NUD_ValueChanged(sender As Object, e As EventArgs) Handles 字體_NUD.ValueChanged
         驗貨報告圖庫_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
     End Sub
     Private Sub 圖片資料庫管理_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 圖片資料庫管理_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            PA20 = 圖片資料庫管理_dgv(0, e.RowIndex).Value.ToString : Set_圖片清單() : Set_grid() : Panel1.Visible = False
+            PA20 = 圖片資料庫管理_dgv(0, e.RowIndex).Value.ToString : Set_圖片清單()
         End If
     End Sub
     Private Sub 驗貨報告圖庫_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 驗貨報告圖庫_dgv.CellClick
@@ -81,19 +67,72 @@ Public Class 驗貨報告資料庫
             If e.RowIndex = -1 Then : Else
                 驗貨報告編號_tb.Text = 驗貨報告圖庫_dgv(5, e.RowIndex).Value.ToString : 年份季度_tb.Text = 驗貨報告圖庫_dgv(1, e.RowIndex).Value.ToString
                 客戶訂單號_tb.Text = 驗貨報告圖庫_dgv(2, e.RowIndex).Value.ToString : 型體名稱_tb.Text = 驗貨報告圖庫_dgv(3, e.RowIndex).Value.ToString
+                圖庫_tb.Text = 驗貨報告圖庫_dgv("驗報圖庫", e.RowIndex).Value.ToString
                 '------------驗貨報告讀取--------------------------------------------------------------------------------------------
-                PA1 = PA20 : PA2 = 驗貨報告圖庫_dgv("驗貨報告編號", e.RowIndex).Value.ToString
-                If 驗貨報告圖庫_dgv("驗貨報告編號", e.RowIndex).Value.ToString = "" Then : 驗貨報告_pb.Image = Nothing : Else
-                    SQL_驗貨報告() : 驗貨報告_pb.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) : 驗貨報告_pb.Image = Bitmap.FromStream(oStream)
-                    End While : conn.Close() : 驗貨報告_pb.SizeMode = 4
-                End If : 圖片傳遞 = 驗貨報告_pb.Image
+                If 舊版_ch.Checked = True Then
+                    PA1 = 驗貨報告圖庫_dgv("驗報圖庫", e.RowIndex).Value.ToString : PA2 = 驗貨報告圖庫_dgv("驗貨報告編號", e.RowIndex).Value.ToString
+                    If 驗貨報告圖庫_dgv("驗貨報告編號", e.RowIndex).Value.ToString = "" Then : 驗貨報告_pb.Image = Nothing : Else : Dim 檔案 As String
+                        SQL_驗貨報告檔案確認()
+                        If dr.Read Then : If dr("副檔名").ToString = "PDF" Then : 檔案 = "PDF" : Else : 檔案 = "圖片" : End If : Else : 檔案 = "圖片" : End If
+
+                        If 檔案 = "圖片" Then
+                            驗貨報告_pb.BringToFront()
+                            SQL_驗貨報告() : 驗貨報告_pb.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) : 驗貨報告_pb.Image = Bitmap.FromStream(oStream)
+                            End While : conn.Close() : 驗貨報告_pb.SizeMode = 4
+                        Else
+                            驗貨報告_wb.BringToFront()
+                            Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
+                            Dim sysPdfFolderPath As String = Path.Combine(desktopPath, "SYSPDF")                ' 判斷 SYSPDF 資料夾是否存在，如果不存在就新增
+                            If Not Directory.Exists(sysPdfFolderPath) Then : Directory.CreateDirectory(sysPdfFolderPath) : End If
+
+                            Dim ds1 As New DataSet
+                            PA1 = 驗貨報告圖庫_dgv("驗報圖庫", e.RowIndex).Value.ToString : SQL_驗貨報告圖庫3() : da.Fill(ds1) : conn.Close()
+                            If ds1.Tables(0).Rows.Count > 0 Then
+                                Dim imgData() As Byte : imgData = ds1.Tables(0).Rows(0).Item("驗貨報告") : Dim fs As FileStream
+                                fs = File.Create(desktopPath & "\SYSPDF\" & 驗貨報告圖庫_dgv("驗貨報告編號", e.RowIndex).Value.ToString & ".pdf", imgData.Length - 1)
+                                fs.Write(imgData, 0, imgData.Length - 1) : fs.Close()
+                            End If
+                            Dim pdfPath As String = Path.Combine(desktopPath & "\SYSPDF\" & 驗貨報告圖庫_dgv("驗貨報告編號", e.RowIndex).Value.ToString & ".pdf")
+                            驗貨報告_wb.Navigate(pdfPath)
+                        End If
+                    End If
+                Else
+                    PA1 = 驗貨報告圖庫_dgv("驗報圖庫2", e.RowIndex).Value.ToString : PA2 = 驗貨報告圖庫_dgv("驗貨報告編號2", e.RowIndex).Value.ToString
+                    If 驗貨報告圖庫_dgv("驗貨報告編號2", e.RowIndex).Value.ToString = "" Then : 驗貨報告_pb.Image = Nothing : Else : Dim 檔案 As String
+                        SQL_驗貨報告檔案確認()
+                        If dr.Read Then : If dr("副檔名").ToString = "PDF" Then : 檔案 = "PDF" : Else : 檔案 = "圖片" : End If : Else : 檔案 = "圖片" : End If
+
+                        If 檔案 = "圖片" Then
+                            驗貨報告_pb.BringToFront()
+                            SQL_驗貨報告() : 驗貨報告_pb.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) : 驗貨報告_pb.Image = Bitmap.FromStream(oStream)
+                            End While : conn.Close() : 驗貨報告_pb.SizeMode = 4
+                        Else
+                            驗貨報告_wb.BringToFront()
+                            Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
+                            Dim sysPdfFolderPath As String = Path.Combine(desktopPath, "SYSPDF")                ' 判斷 SYSPDF 資料夾是否存在，如果不存在就新增
+                            If Not Directory.Exists(sysPdfFolderPath) Then : Directory.CreateDirectory(sysPdfFolderPath) : End If
+
+                            Dim ds1 As New DataSet
+                            PA1 = 驗貨報告圖庫_dgv("驗報圖庫2", e.RowIndex).Value.ToString : SQL_驗貨報告圖庫3() : da.Fill(ds1) : conn.Close()
+                            If ds1.Tables(0).Rows.Count > 0 Then
+                                Dim imgData() As Byte : imgData = ds1.Tables(0).Rows(0).Item("驗貨報告") : Dim fs As FileStream
+                                fs = File.Create(desktopPath & "\SYSPDF\" & 驗貨報告圖庫_dgv("驗貨報告編號2", e.RowIndex).Value.ToString & ".pdf", imgData.Length - 1)
+                                fs.Write(imgData, 0, imgData.Length - 1) : fs.Close()
+                            End If
+                            Dim pdfPath As String = Path.Combine(desktopPath & "\SYSPDF\" & 驗貨報告圖庫_dgv("驗貨報告編號2", e.RowIndex).Value.ToString & ".pdf")
+                            驗貨報告_wb.Navigate(pdfPath)
+                        End If
+                    End If
+                End If
+                圖片傳遞 = 驗貨報告_pb.Image
             End If
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        Catch ex As Exception : End Try
     End Sub
     Private Sub 驗貨報告圖庫_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 驗貨報告圖庫_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
@@ -111,7 +150,7 @@ Public Class 驗貨報告資料庫
     End Sub
     Private Sub 查詢_bt_Click(sender As Object, e As EventArgs) Handles 查詢_bt.Click
         Try
-            PA = InputBox("請輸入關鍵字") : Set_DGV1載入前設定() : SQL_驗貨報告圖庫查詢1() : Set_DGV1載入後設定() : Set_grid()
+            PA = InputBox("請輸入關鍵字") : Set_DGV1載入前設定() : SQL_驗貨報告圖庫查詢1() : Set_DGV1載入後設定()
         Catch ex As Exception : MsgBox(ex.Message) : End Try
     End Sub
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles 下載圖片_bt.Click
@@ -122,12 +161,18 @@ Public Class 驗貨報告資料庫
                 With SaveFileDialog1 : .Filter = "所有文件(*.*)|*.*" : End With
                 TT = "驗貨報告"
 
-                SaveFileDialog1.FileName = TT & "-" & 年份季度_tb.Text & "-" & 客戶訂單號_tb.Text & "-" & 型體名稱_tb.Text & ".jpg"
+                PA1 = 圖庫_tb.Text : PA2 = 驗貨報告編號_tb.Text : SQL_驗貨報告檔案確認() : Dim 檔案 As String
+                If dr.Read Then : If dr("副檔名").ToString = "PDF" Then : 檔案 = "PDF" : Else : 檔案 = "圖片" : End If : Else : 檔案 = "圖片" : End If
+                If 檔案 = "PDF" Then
+                    SaveFileDialog1.FileName = TT & "-" & 年份季度_tb.Text & "-" & 客戶訂單號_tb.Text & "-" & 型體名稱_tb.Text & ".pgf"
+                Else
+                    SaveFileDialog1.FileName = TT & "-" & 年份季度_tb.Text & "-" & 客戶訂單號_tb.Text & "-" & 型體名稱_tb.Text & ".jpg"
+                End If
 
                 SaveFileDialog1.ShowDialog() : TextBox5.Text = SaveFileDialog1.FileName : ds1.Clear()
                 '------------驗貨報告讀取--------------------------------------------------------------------------------------------
-                PA1 = PA20 : SQL_驗貨報告圖庫3()
-                 : da.Fill(ds1) : conn.Close()
+                PA1 = 圖庫_tb.Text : SQL_驗貨報告圖庫3()
+                da.Fill(ds1) : conn.Close()
                 If ds1.Tables(0).Rows.Count > 0 Then
                     Dim imgData() As Byte
                     imgData = ds1.Tables(0).Rows(0).Item("驗貨報告")
@@ -284,9 +329,7 @@ Public Class 驗貨報告資料庫
                     WebBrowser1.Refresh()
                     '----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
                     TextBox6.Text = ""
-
-                    MsgBox("修改完成")
-                    Set_圖片清單() : Set_grid()
+                    MsgBox("修改完成") : Set_圖片清單()
                 End If
             End If
         Catch ex As Exception
@@ -302,4 +345,10 @@ Public Class 驗貨報告資料庫
     Private Sub 資料庫選擇3_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇3_bt.Click
         SQL_訂單資料表選擇_HP() : Set_圖片清單()
     End Sub
+    Private Sub 新版_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 新版_ch.Click
+        舊版_ch.Checked = False : 新版_ch.Checked = True
+    End Sub
+    Private Sub 舊版_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 舊版_ch.Click
+        舊版_ch.Checked = True : 新版_ch.Checked = False
+    End Sub
 End Class

TENDEN-MES-SYS/8、樣品訂單管理/系統列印介面/列印_中文樣品單.vb

@@ -18,9 +18,8 @@ Public Class 列印_中文樣品單
     Dim 位置5 As Integer = 0 : Dim 位置6 As Integer = 0 : Dim 位置7 As Integer = 0 : Dim 位置8 As Integer = 0 : Dim 位置9 As Integer = 0 : Dim 位置10 As Integer = 0
     Dim 面料數 As Integer = 0 : Dim 內裏數 As Integer = 0 : Dim 底部數 As Integer = 0 : Dim 飾物數 As Integer = 0
     Dim 攔寬 As Single
-    Dim 第一頁, 第二頁, 第三頁, 第四頁, 第五頁 As Boolean
-    Dim 分頁計數 As Integer = 0 : Dim 分頁計數1 As Integer = 0 : Dim 分頁計數2 As Integer = 0 : Dim 分頁計數3 As Integer = 0 : Dim 分頁計數4 As Integer = 0
-    Dim DGVX As Integer
+    Dim 第一頁, 第二頁, 第三頁, 第四頁, 第五頁, 第六頁, 第七頁, 第八頁, 第九頁, 第十頁, 第十一頁, 第十二頁, 第十三頁, 第十四頁, 第十五頁 As Boolean
+    Dim DGVX, 位置, 頁數 As Integer
 
     Private Sub Set_訂單清單4()
         敘述欄_dgv.DataSource = Nothing : ds12.Clear()
@@ -168,8 +167,8 @@ Public Class 列印_中文樣品單
             xlSheet.Cells(7, 1) = "CONSTRUCTION" : xlSheet.Cells(7, 2) = 樣品單抬頭_dgv.Rows(0).Cells("Construction").Value
             xlSheet.Cells(8, 1) = "型體名字" : xlSheet.Cells(8, 2) = 樣品單抬頭_dgv.Rows(0).Cells("型體名").Value
             xlSheet.Cells(9, 1) = "型體號碼" : xlSheet.Cells(9, 2) = 樣品單抬頭_dgv.Rows(0).Cells("型體號碼").Value
-            xlSheet.Cells(11, 1) = "顏色(COLOR DESCRIPTION)" : xlSheet.Cells(12, 1) = "訂單顏色(COLOR CODE)"
-            xlSheet.Cells(13, 1) = "項目編號(ITEM NUMBER)" : xlSheet.Cells(14, 1) = "数量：双（PAIRS）"
+            xlSheet.Cells(11, 5) = "顏色(COLOR DESCRIPTION)" : xlSheet.Cells(12, 5) = "訂單顏色(COLOR CODE)"
+            xlSheet.Cells(13, 5) = "項目編號(ITEM NUMBER)" : xlSheet.Cells(14, 5) = "数量：双（PAIRS）"
 
             xlSheet.Cells(3, 4) = "新型體" : xlSheet.Cells(3, 5) = "舊型體"
             xlSheet.Cells(3, 6) = "舊形體季別：" & 樣品單抬頭_dgv.Rows(0).Cells("舊型體季別").Value
@@ -242,242 +241,36 @@ Public Class 列印_中文樣品單
                 End If
 
                 '--------------------計算樣品單分頁---------------------------------------------------------------------------------------
-                If 樣品單控制表_dgv.Rows.Count > 12 Then
-                    分頁計數 = 2 : 分頁計數1 = 5 : 分頁計數2 = 8 : 分頁計數3 = 11 : 分頁計數4 = 樣品單控制表_dgv.Rows.Count - 1
-                    第一頁 = True : 第二頁 = True : 第三頁 = True : 第四頁 = False : 第五頁 = True
-                ElseIf 樣品單控制表_dgv.Rows.Count > 9 Then
-                    分頁計數 = 2 : 分頁計數1 = 5 : 分頁計數2 = 8 : 分頁計數3 = 樣品單控制表_dgv.Rows.Count - 1
-                    第一頁 = True : 第二頁 = True : 第三頁 = True : 第四頁 = True : 第五頁 = False
-                ElseIf 樣品單控制表_dgv.Rows.Count > 6 Then
-                    分頁計數 = 2 : 分頁計數1 = 5 : 分頁計數2 = 樣品單控制表_dgv.Rows.Count - 1
-                    第一頁 = True : 第二頁 = True : 第三頁 = True : 第四頁 = False : 第五頁 = False
-                ElseIf 樣品單控制表_dgv.Rows.Count > 3 Then
-                    分頁計數 = 2 : 分頁計數1 = 樣品單控制表_dgv.Rows.Count - 1
-                    第一頁 = True : 第二頁 = True : 第三頁 = False : 第四頁 = False : 第五頁 = False
-                Else
-                    分頁計數 = 樣品單控制表_dgv.Rows.Count - 1
-                    第一頁 = True : 第二頁 = False : 第三頁 = False : 第四頁 = False : 第五頁 = False
-                End If
+                Dim colorCount As Integer = 樣品單控制表_dgv.Rows.Count : 分頁數量 += colorCount
+                If colorCount = 0 Then : MessageBox.Show("配色數量為0，系統沒有後續邏輯，修改單據資料!!") : End If
                 '--------------------樣品單列印-------------------------------------------------------------------------------------------
-                If 第一頁 = True Then
+                For i As Integer = 0 To 樣品單控制表_dgv.Rows.Count - 1
                     xlSheet = NewMethod(xlBook)
                     位置1 = 0 : 位置2 = 0 : 位置3 = 0 : 位置5 = 0 : 位置6 = 0 : 位置7 = 0 : 位置8 = 0 : 位置9 = 0 : 位置10 = 0
                     面料數 = 0 : 內裏數 = 0 : 底部數 = 0 : 飾物數 = 0
-                    xlApp.Sheets(1).Name = 樣品單抬頭_dgv.Rows(0).Cells("型體號碼").Value & "第一頁"
-                    xlBook.Activate()
-                    xlSheet.Activate()
-                    循環列印1()
-                    For i As Integer = 0 To 分頁計數
-                        xlSheet.Cells(11, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("顏色").Value
-                        xlSheet.Cells(12, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("訂單顏色").Value
-                        xlSheet.Cells(13, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("ItemNumber").Value
-                        xlSheet.Cells(14, 5 + i) = Strings.Format(樣品單控制表_dgv.Rows(i).Cells("數量1").Value, "#,##0.0") & "双"
-                    Next : 循環列印2()
-                    For i As Integer = 0 To 分頁計數
-                        Set_DGV4載入前設定() : PA9 = 樣品單控制表_dgv.Rows(i).Cells("樣品流水號一").Value : SQL_讀取列印分頁計數() : Set_DGV4載入後設定()
-                        位置2 = 0
-                        For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("廠商").Value = "" Then
-                                xlSheet.Cells(15 + 位置2, 5 + i) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                            Else
-                                If 5 + i = 5 Then : 位置A = "E" & (15 + 位置2)
-                                ElseIf 5 + i = 6 Then : 位置A = "F" & (15 + 位置2)
-                                ElseIf 5 + i = 7 Then : 位置A = "G" & (15 + 位置2) : End If
-                                A1 = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                                A2 = 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                                xlSheet.Cells(15 + 位置2, 5 + i) = A1 & " / " & A2 : JJ(xlApp, xlSheet)
-                                'xlSheet.Cells(15 + 位置2, 5 + i) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value & " / " & 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                            End If
-                            位置2 += 1
-                        Next
-                    Next : 位置2 = 0
-                    For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                        For iii As Integer = 0 To 敘述欄_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("細項").Value.ToString = 敘述欄_dgv.Rows(iii).Cells("細項").Value.ToString Then
-                                xlSheet.Cells(15 + 位置2, 3) = 敘述欄_dgv.Rows(iii).Cells("內容").Value : Exit For
-                            End If
-                        Next : 位置2 += 1
-                    Next : 循環列印3()
-                    For i As Integer = 0 To 分頁計數
-                        xlSheet.Cells(位置8 + 1, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("備註").Value
-                        xlSheet.Cells(位置8 + 2, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("FINISH").Value
-                    Next
-                    AA(xlApp, xlSheet) : BB(xlApp, xlSheet) : CC(xlApp, xlSheet) : DD(xlApp, xlSheet) : FF(xlApp, xlSheet) : GG(xlApp, xlSheet)
-                    位置2 = 0 : For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1 : HH(xlApp, xlSheet) : 位置2 += 1 : Next : HH(xlApp, xlSheet) : 位置2 += 1 : HH(xlApp, xlSheet)
-                End If
-
-                If 第二頁 = True Then
-                    xlSheet = NewMethod(xlBook)
-                    位置1 = 0 : 位置2 = 0 : 位置3 = 0 : 位置5 = 0 : 位置6 = 0 : 位置7 = 0 : 位置8 = 0 : 位置9 = 0 : 位置10 = 0
-                    面料數 = 0 : 內裏數 = 0 : 底部數 = 0 : 飾物數 = 0
-                    xlApp.Sheets(1).Name = 樣品單抬頭_dgv.Rows(0).Cells("型體號碼").Value & "第二頁"
-                    xlBook.Activate()
-                    xlSheet.Activate()
-                    循環列印1()
-                    For i As Integer = 0 + 3 To 分頁計數1
-                        xlSheet.Cells(11, 5 + i - 3) = 樣品單控制表_dgv.Rows(i).Cells("顏色").Value
-                        xlSheet.Cells(12, 5 + i - 3) = 樣品單控制表_dgv.Rows(i).Cells("訂單顏色").Value
-                        xlSheet.Cells(13, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("ItemNumber").Value
-                        xlSheet.Cells(14, 5 + i - 3) = Strings.Format(樣品單控制表_dgv.Rows(i).Cells("數量1").Value, "#,##0.0") & "双"
-                    Next : 循環列印2()
-                    For i As Integer = 0 + 3 To 分頁計數1
-                        Set_DGV4載入前設定() : PA9 = 樣品單控制表_dgv.Rows(i).Cells("樣品流水號一").Value : SQL_讀取列印分頁計數() : Set_DGV4載入後設定()
-                        位置2 = 0
-                        For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("廠商").Value = "" Then
-                                xlSheet.Cells(15 + 位置2, 5 + i - 3) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                            Else
-                                If 5 + i - 3 = 5 Then : 位置A = "E" & (15 + 位置2)
-                                ElseIf 5 + i - 3 = 6 Then : 位置A = "F" & (15 + 位置2)
-                                ElseIf 5 + i - 3 = 7 Then : 位置A = "G" & (15 + 位置2) : End If
-                                A1 = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                                A2 = 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                                xlSheet.Cells(15 + 位置2, 5 + i - 3) = A1 & " / " & A2 : JJ(xlApp, xlSheet)
-                                'xlSheet.Cells(15 + 位置2, 5 + i - 3) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value & " / " & 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                            End If
-                            位置2 += 1
-                        Next
-                    Next : 位置2 = 0
-                    For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                        For iii As Integer = 0 To 敘述欄_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("細項").Value.ToString = 敘述欄_dgv.Rows(iii).Cells("細項").Value.ToString Then
-                                xlSheet.Cells(15 + 位置2, 3) = 敘述欄_dgv.Rows(iii).Cells("內容").Value : Exit For
-                            End If
-                        Next : 位置2 += 1
-                    Next : 循環列印3()
-                    For i As Integer = 0 + 3 To 分頁計數1
-                        xlSheet.Cells(位置8 + 1, 5 + i - 3) = 樣品單控制表_dgv.Rows(i).Cells("備註").Value
-                        xlSheet.Cells(位置8 + 2, 5 + i - 3) = 樣品單控制表_dgv.Rows(i).Cells("FINISH").Value
-                    Next
-                    AA(xlApp, xlSheet) : BB(xlApp, xlSheet) : CC(xlApp, xlSheet) : DD(xlApp, xlSheet) : FF(xlApp, xlSheet) : GG(xlApp, xlSheet)
-                    位置2 = 0 : For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1 : HH(xlApp, xlSheet) : 位置2 += 1 : Next : HH(xlApp, xlSheet) : 位置2 += 1 : HH(xlApp, xlSheet)
-                End If
+                    xlApp.Sheets(1).Name = 樣品單抬頭_dgv.Rows(0).Cells("型體號碼").Value & "第 " & i + 1 & " 頁"
+                    xlBook.Activate() : xlSheet.Activate() : 循環列印1()
 
-                If 第三頁 = True Then
-                    xlSheet = NewMethod(xlBook)
-                    位置1 = 0 : 位置2 = 0 : 位置3 = 0 : 位置5 = 0 : 位置6 = 0 : 位置7 = 0 : 位置8 = 0 : 位置9 = 0 : 位置10 = 0
-                    面料數 = 0 : 內裏數 = 0 : 底部數 = 0 : 飾物數 = 0
-                    xlApp.Sheets(1).Name = 樣品單抬頭_dgv.Rows(0).Cells("型體號碼").Value & "第三頁"
-                    xlBook.Activate()
-                    xlSheet.Activate()
-                    循環列印1()
-                    For i As Integer = 0 + 6 To 分頁計數2
-                        xlSheet.Cells(11, 5 + i - 6) = 樣品單控制表_dgv.Rows(i).Cells("顏色").Value
-                        xlSheet.Cells(12, 5 + i - 6) = 樣品單控制表_dgv.Rows(i).Cells("訂單顏色").Value
-                        xlSheet.Cells(13, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("ItemNumber").Value
-                        xlSheet.Cells(14, 5 + i - 6) = Strings.Format(樣品單控制表_dgv.Rows(i).Cells("數量1").Value, "#,##0.0") & "双"
-                    Next : 循環列印2()
-                    For i As Integer = 0 + 6 To 分頁計數2
-                        Set_DGV4載入前設定() : PA9 = 樣品單控制表_dgv.Rows(i).Cells("樣品流水號一").Value : SQL_讀取列印分頁計數() : Set_DGV4載入後設定()
-                        位置2 = 0
-                        For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("廠商").Value = "" Then
-                                xlSheet.Cells(15 + 位置2, 5 + i - 6) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                            Else
-                                If 5 + i - 6 = 5 Then : 位置A = "E" & (15 + 位置2)
-                                ElseIf 5 + i - 6 = 6 Then : 位置A = "F" & (15 + 位置2)
-                                ElseIf 5 + i - 6 = 7 Then : 位置A = "G" & (15 + 位置2) : End If
-                                A1 = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                                A2 = 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                                xlSheet.Cells(15 + 位置2, 5 + i - 6) = A1 & " / " & A2 : JJ(xlApp, xlSheet)
-                                'xlSheet.Cells(15 + 位置2, 5 + i - 6) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value & " / " & 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                            End If
-                            位置2 += 1
-                        Next
-                    Next : 位置2 = 0
-                    For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                        For iii As Integer = 0 To 敘述欄_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("細項").Value.ToString = 敘述欄_dgv.Rows(iii).Cells("細項").Value.ToString Then
-                                xlSheet.Cells(15 + 位置2, 3) = 敘述欄_dgv.Rows(iii).Cells("內容").Value : Exit For
-                            End If
-                        Next : 位置2 += 1
-                    Next : 循環列印3()
-                    For i As Integer = 0 + 6 To 分頁計數2
-                        xlSheet.Cells(位置8 + 1, 5 + i - 6) = 樣品單控制表_dgv.Rows(i).Cells("備註").Value
-                        xlSheet.Cells(位置8 + 2, 5 + i - 6) = 樣品單控制表_dgv.Rows(i).Cells("FINISH").Value
-                    Next : AA(xlApp, xlSheet) : BB(xlApp, xlSheet) : CC(xlApp, xlSheet) : DD(xlApp, xlSheet) : FF(xlApp, xlSheet) : GG(xlApp, xlSheet)
-                    位置2 = 0 : For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1 : HH(xlApp, xlSheet) : 位置2 += 1 : Next : HH(xlApp, xlSheet) : 位置2 += 1 : HH(xlApp, xlSheet)
-                End If
+                    xlSheet.Cells(11, 6) = 樣品單控制表_dgv.Rows(i).Cells("顏色").Value
+                    xlSheet.Cells(12, 6) = 樣品單控制表_dgv.Rows(i).Cells("訂單顏色").Value
+                    xlSheet.Cells(13, 6) = 樣品單控制表_dgv.Rows(i).Cells("ItemNumber").Value
+                    xlSheet.Cells(14, 6) = Strings.Format(樣品單控制表_dgv.Rows(i).Cells("數量1").Value, "#,##0.0") & "双"
+                    循環列印2()
 
-                If 第四頁 = True Then
-                    xlSheet = NewMethod(xlBook)
-                    位置1 = 0 : 位置2 = 0 : 位置3 = 0 : 位置5 = 0 : 位置6 = 0 : 位置7 = 0 : 位置8 = 0 : 位置9 = 0 : 位置10 = 0
-                    面料數 = 0 : 內裏數 = 0 : 底部數 = 0 : 飾物數 = 0
-                    xlApp.Sheets(1).Name = 樣品單抬頭_dgv.Rows(0).Cells("型體號碼").Value & "第四頁"
-                    xlBook.Activate()
-                    xlSheet.Activate()
-                    循環列印1()
-                    For i As Integer = 0 + 9 To 分頁計數3
-                        xlSheet.Cells(11, 5 + i - 9) = 樣品單控制表_dgv.Rows(i).Cells("顏色").Value
-                        xlSheet.Cells(12, 5 + i - 9) = 樣品單控制表_dgv.Rows(i).Cells("訂單顏色").Value
-                        xlSheet.Cells(13, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("ItemNumber").Value
-                        xlSheet.Cells(14, 5 + i - 9) = Strings.Format(樣品單控制表_dgv.Rows(i).Cells("數量1").Value, "#,##0.0") & "双"
-                    Next : 循環列印2()
-                    For i As Integer = 0 + 9 To 分頁計數3
-                        Set_DGV4載入前設定() : PA9 = 樣品單控制表_dgv.Rows(i).Cells("樣品流水號一").Value : SQL_讀取列印分頁計數() : Set_DGV4載入後設定()
-                        位置2 = 0
-                        For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("廠商").Value = "" Then
-                                xlSheet.Cells(15 + 位置2, 5 + i - 9) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                            Else
-                                If 5 + i - 9 = 5 Then : 位置A = "E" & (15 + 位置2)
-                                ElseIf 5 + i - 9 = 6 Then : 位置A = "F" & (15 + 位置2)
-                                ElseIf 5 + i - 9 = 7 Then : 位置A = "G" & (15 + 位置2) : End If
-                                A1 = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                                A2 = 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                                xlSheet.Cells(15 + 位置2, 5 + i - 9) = A1 & " / " & A2 : JJ(xlApp, xlSheet)
-                                'xlSheet.Cells(15 + 位置2, 5 + i - 9) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value & " / " & 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                            End If
-                            位置2 += 1
-                        Next
-                    Next : 位置2 = 0
+                    Set_DGV4載入前設定() : PA9 = 樣品單控制表_dgv.Rows(i).Cells("樣品流水號一").Value : SQL_讀取列印分頁計數() : Set_DGV4載入後設定()
+                    位置2 = 0
                     For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                        For iii As Integer = 0 To 敘述欄_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("細項").Value.ToString = 敘述欄_dgv.Rows(iii).Cells("細項").Value.ToString Then
-                                xlSheet.Cells(15 + 位置2, 3) = 敘述欄_dgv.Rows(iii).Cells("內容").Value : Exit For
-                            End If
-                        Next : 位置2 += 1
-                    Next : 循環列印3()
-                    For i As Integer = 0 + 9 To 分頁計數3
-                        xlSheet.Cells(位置8 + 1, 5 + i - 9) = 樣品單控制表_dgv.Rows(i).Cells("備註").Value
-                        xlSheet.Cells(位置8 + 2, 5 + i - 9) = 樣品單控制表_dgv.Rows(i).Cells("FINISH").Value
+                        If 明細表分頁_dgv.Rows(ii).Cells("廠商").Value = "" Then
+                            xlSheet.Cells(15 + 位置2, 5) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
+                        Else
+                            位置A = "E" & (15 + 位置2)
+                            A1 = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
+                            A2 = 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
+                            xlSheet.Cells(15 + 位置2, 5) = A1 & " / " & A2 : JJ(xlApp, xlSheet)
+                        End If
+                        位置2 += 1
                     Next
-                    AA(xlApp, xlSheet) : BB(xlApp, xlSheet) : CC(xlApp, xlSheet) : DD(xlApp, xlSheet) : FF(xlApp, xlSheet) : GG(xlApp, xlSheet)
-                    位置2 = 0 : For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1 : HH(xlApp, xlSheet) : 位置2 += 1 : Next : HH(xlApp, xlSheet) : 位置2 += 1 : HH(xlApp, xlSheet)
-                End If
-
-                If 第五頁 = True Then
-                    xlSheet = NewMethod(xlBook)
-                    位置1 = 0 : 位置2 = 0 : 位置3 = 0 : 位置5 = 0 : 位置6 = 0 : 位置7 = 0 : 位置8 = 0 : 位置9 = 0 : 位置10 = 0
-                    面料數 = 0 : 內裏數 = 0 : 底部數 = 0 : 飾物數 = 0
-                    xlApp.Sheets(1).Name = 樣品單抬頭_dgv.Rows(0).Cells("型體號碼").Value & "第五頁"
-                    xlBook.Activate()
-                    xlSheet.Activate()
-                    循環列印1()
-                    For i As Integer = 0 + 12 To 樣品單控制表_dgv.Rows.Count - 1
-                        xlSheet.Cells(11, 5 + i - 12) = 樣品單控制表_dgv.Rows(i).Cells("顏色").Value
-                        xlSheet.Cells(12, 5 + i - 12) = 樣品單控制表_dgv.Rows(i).Cells("訂單顏色").Value
-                        xlSheet.Cells(13, 5 + i) = 樣品單控制表_dgv.Rows(i).Cells("ItemNumber").Value
-                        xlSheet.Cells(14, 5 + i - 12) = Strings.Format(樣品單控制表_dgv.Rows(i).Cells("數量1").Value, "#,##0.0") & "双"
-                    Next : 循環列印2()
-                    For i As Integer = 0 + 12 To 樣品單控制表_dgv.Rows.Count - 1
-                        Set_DGV4載入前設定() : PA9 = 樣品單控制表_dgv.Rows(i).Cells("樣品流水號一").Value : SQL_讀取列印分頁計數() : Set_DGV4載入後設定()
-                        位置2 = 0
-                        For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
-                            If 明細表分頁_dgv.Rows(ii).Cells("廠商").Value = "" Then
-                                xlSheet.Cells(15 + 位置2, 5 + i - 12) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                            Else
-                                If 5 + i - 12 = 5 Then : 位置A = "E" & (15 + 位置2)
-                                ElseIf 5 + i - 12 = 6 Then : 位置A = "F" & (15 + 位置2)
-                                ElseIf 5 + i - 12 = 7 Then : 位置A = "G" & (15 + 位置2) : End If
-                                A1 = 明細表分頁_dgv.Rows(ii).Cells("內容").Value
-                                A2 = 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                                xlSheet.Cells(15 + 位置2, 5 + i - 12) = A1 & " / " & A2 : JJ(xlApp, xlSheet)
-                                'xlSheet.Cells(15 + 位置2, 5 + i - 12) = 明細表分頁_dgv.Rows(ii).Cells("內容").Value & " / " & 明細表分頁_dgv.Rows(ii).Cells("廠商").Value
-                            End If
-                            位置2 += 1
-                        Next
-                    Next : 位置2 = 0
+                    位置2 = 0
                     For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1
                         For iii As Integer = 0 To 敘述欄_dgv.Rows.Count - 1
                             If 明細表分頁_dgv.Rows(ii).Cells("細項").Value.ToString = 敘述欄_dgv.Rows(iii).Cells("細項").Value.ToString Then
@@ -485,20 +278,12 @@ Public Class 列印_中文樣品單
                             End If
                         Next : 位置2 += 1
                     Next : 循環列印3()
-                    For i As Integer = 0 + 12 To 樣品單控制表_dgv.Rows.Count - 1
-                        xlSheet.Cells(位置8 + 1, 5 + i - 12) = 樣品單控制表_dgv.Rows(i).Cells("備註").Value
-                        xlSheet.Cells(位置8 + 2, 5 + i - 12) = 樣品單控制表_dgv.Rows(i).Cells("FINISH").Value
-                    Next : AA(xlApp, xlSheet) : BB(xlApp, xlSheet) : CC(xlApp, xlSheet) : DD(xlApp, xlSheet) : FF(xlApp, xlSheet) : GG(xlApp, xlSheet)
+                    xlSheet.Cells(位置8 + 1, 5) = 樣品單控制表_dgv.Rows(i).Cells("備註").Value
+                    xlSheet.Cells(位置8 + 2, 5) = 樣品單控制表_dgv.Rows(i).Cells("FINISH").Value
+                    AA(xlApp, xlSheet) : BB(xlApp, xlSheet) : CC(xlApp, xlSheet) : DD(xlApp, xlSheet) : FF(xlApp, xlSheet) : GG(xlApp, xlSheet)
                     位置2 = 0 : For ii As Integer = 0 To 明細表分頁_dgv.Rows.Count - 1 : HH(xlApp, xlSheet) : 位置2 += 1 : Next : HH(xlApp, xlSheet) : 位置2 += 1 : HH(xlApp, xlSheet)
-                End If
-
-                If 第一頁 = True And 第二頁 = False And 第三頁 = False And 第四頁 = False And 第五頁 = False Then : xlApp.Sheets(2 + 分頁數量).Delete
-                ElseIf 第一頁 = True And 第二頁 = True And 第三頁 = False And 第四頁 = False And 第五頁 = False Then : xlApp.Sheets(3 + 分頁數量).Delete
-                ElseIf 第一頁 = True And 第二頁 = True And 第三頁 = True And 第四頁 = False And 第五頁 = False Then : xlApp.Sheets(4 + 分頁數量).Delete
-                ElseIf 第一頁 = True And 第二頁 = True And 第三頁 = True And 第四頁 = True And 第五頁 = False Then : xlApp.Sheets(5 + 分頁數量).Delete
-                ElseIf 第一頁 = True And 第二頁 = True And 第三頁 = True And 第四頁 = True And 第五頁 = True Then : xlApp.Sheets(6 + 分頁數量).Delete
-                End If
-
+                Next
+                xlApp.Sheets(分頁數量 + 1).Delete
                 xlSheet.PageSetup.PrintArea = ""
                 xlApp.Cells.Select()
                 xlApp.Application.WindowState = xlMinimized
@@ -516,7 +301,7 @@ Public Class 列印_中文樣品單
         xlSheet.Rows("1:1").Select : myExcel.Selection.RowHeight = 60 : xlSheet.Rows("2:2").Select : myExcel.Selection.RowHeight = 17
         xlSheet.Rows("3:9").Select : myExcel.Selection.RowHeight = 26 : xlSheet.Rows("10:10").Select : myExcel.Selection.RowHeight = 80
 
-        xlSheet.Range("D1:E1").Select() : With myExcel.Selection
+        xlSheet.Range("C1:E1").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
         xlSheet.Range("A2:F2").Select() : With myExcel.Selection
@@ -555,18 +340,6 @@ Public Class 列印_中文樣品單
         xlSheet.Range("F4:G10").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("A11:B11").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("A12:B12").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("A13:B13").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("A14:B14").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
         xlSheet.Range("D3:E3").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
@@ -663,7 +436,21 @@ Public Class 列印_中文樣品單
         With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
 
+        For i As Integer = 11 To 14
+            xlSheet.Range("F" & i & ":G" & i).Select()
+            With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
+                .IndentLevel = 0 : .ShrinkToFit = True : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
+            With myExcel.Selection : .HorizontalAlignment = xlLeft : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+                .ReadingOrder = xlContext : End With
+        Next
         位置8 = 14 + (面料數 * 1) + (內裏數 * 1) + (底部數 * 1) + (飾物數 * 1)
+        For i As Integer = 15 To 位置8 + 2
+            xlSheet.Range("E" & i & ":G" & i).Select()
+            With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
+                .IndentLevel = 0 : .ShrinkToFit = True : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
+            With myExcel.Selection : .HorizontalAlignment = xlLeft : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+                .ReadingOrder = xlContext : End With
+        Next
         xlSheet.Rows("15:" & 位置8).Select : xlSheet.Rows("15:" & 位置8).EntireRow.AutoFit
         For i As Integer = 15 To 位置8
             xlSheet.Rows(i & ":" & i).Select
@@ -671,7 +458,7 @@ Public Class 列印_中文樣品單
             xlSheet.Rows(位置11).Select : myExcel.Selection.RowHeight = 攔寬 + 20
         Next
 
-        位置5 = 14 + (面料數 * 1) : 位置4 = "A14:G" & 位置5
+        位置5 = 14 + (面料數 * 1) : 位置4 = "A15:G" & 位置5
         xlSheet.Range(位置4).Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlMedium : End With
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlMedium : End With
@@ -780,7 +567,7 @@ Public Class 列印_中文樣品單
         With myExcel.Selection.Font : .Name = "Microsoft YaHei UI" : .Size = 10 : .Strikethrough = False : .Superscript = False : .Subscript = False : .OutlineFont = False : .Shadow = False
             .Underline = xlUnderlineStyleNone : .TintAndShade = 0 : .ThemeFont = xlThemeFontNone : End With
 
-        xlSheet.Range("C11:D14").Select()
+        xlSheet.Range("A11:D14").Select()
         With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0
             .AddIndent = False : .IndentLevel = 0 : .ReadingOrder = xlContext : .MergeCells = False : End With
         myExcel.Selection.Merge : myExcel.ActiveCell.FormulaR1C1 = "材料敘述"
@@ -832,7 +619,7 @@ Public Class 列印_中文樣品單
     End Sub
     Private Sub BB(ByVal myExcel As Application, ByVal xlSheet As Worksheet)
         Clipboard.SetDataObject(PictureBox3.Image) : xlSheet.Range("C1").Select() : myExcel.ActiveSheet.Pictures.Paste.Select : myExcel.Selection.ShapeRange.Height = 48
-        myExcel.Selection.ShapeRange.IncrementLeft(115) : myExcel.Selection.ShapeRange.IncrementTop(5)
+        myExcel.Selection.ShapeRange.IncrementLeft(0) : myExcel.Selection.ShapeRange.IncrementTop(5)
     End Sub
     Private Sub CC(ByVal myExcel As Application, ByVal xlSheet As Worksheet)
         If 樣品單抬頭_dgv.Rows(0).Cells("中文樣品單產地標").Value = "" Then : Else

TENDEN-MES-SYS/9、資料庫系統管理/系統編碼原則.Designer.vb

@@ -22,12 +22,12 @@ Partial Class 系統編碼原則
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.圖片資料庫管理修改_bt = New System.Windows.Forms.Button()
         Me.圖片資料庫名稱_lb = New System.Windows.Forms.Label()
         Me.圖片資料庫名稱_tb = New System.Windows.Forms.TextBox()
@@ -38,8 +38,8 @@ Partial Class 系統編碼原則
         Me.伺服器狀態_dgv = New System.Windows.Forms.DataGridView()
         Me.是否可用_ch = New System.Windows.Forms.CheckBox()
         Me.LOG檔截斷3_bt = New System.Windows.Forms.Button()
-        Me.Label3 = New System.Windows.Forms.Label()
         Me.資料庫清單1_dgv = New System.Windows.Forms.DataGridView()
+        Me.選擇_tb = New System.Windows.Forms.TextBox()
         CType(Me.圖片資料庫管理_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MAX_nud, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.伺服器狀態_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -61,7 +61,7 @@ Partial Class 系統編碼原則
         Me.圖片資料庫名稱_lb.BackColor = System.Drawing.SystemColors.Control
         Me.圖片資料庫名稱_lb.Location = New System.Drawing.Point(934, 5)
         Me.圖片資料庫名稱_lb.Name = "圖片資料庫名稱_lb"
-        Me.圖片資料庫名稱_lb.Size = New System.Drawing.Size(92, 16)
+        Me.圖片資料庫名稱_lb.Size = New System.Drawing.Size(91, 16)
         Me.圖片資料庫名稱_lb.TabIndex = 708
         Me.圖片資料庫名稱_lb.Text = "圖片資料庫名稱"
         '
@@ -76,18 +76,18 @@ Partial Class 系統編碼原則
         '
         '圖片資料庫管理_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.White
-        Me.圖片資料庫管理_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.White
+        Me.圖片資料庫管理_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
         Me.圖片資料庫管理_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.圖片資料庫管理_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.圖片資料庫管理_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.White
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.圖片資料庫管理_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8
         Me.圖片資料庫管理_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.圖片資料庫管理_dgv.Location = New System.Drawing.Point(936, 27)
         Me.圖片資料庫管理_dgv.Name = "圖片資料庫管理_dgv"
@@ -112,7 +112,7 @@ Partial Class 系統編碼原則
         Me.伺服器_lb.BackColor = System.Drawing.SystemColors.Control
         Me.伺服器_lb.Location = New System.Drawing.Point(536, 6)
         Me.伺服器_lb.Name = "伺服器_lb"
-        Me.伺服器_lb.Size = New System.Drawing.Size(230, 16)
+        Me.伺服器_lb.Size = New System.Drawing.Size(229, 16)
         Me.伺服器_lb.TabIndex = 704
         Me.伺服器_lb.Text = "伺服器中資料庫極限容量監控設定值 (MB)"
         '
@@ -129,18 +129,18 @@ Partial Class 系統編碼原則
         '
         '伺服器狀態_dgv
         '
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.White
-        Me.伺服器狀態_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.White
+        Me.伺服器狀態_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
         Me.伺服器狀態_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.伺服器狀態_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.White
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.伺服器狀態_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.White
+        DataGridViewCellStyle10.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.伺服器狀態_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
         Me.伺服器狀態_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.伺服器狀態_dgv.Location = New System.Drawing.Point(6, 27)
         Me.伺服器狀態_dgv.Name = "伺服器狀態_dgv"
@@ -154,7 +154,7 @@ Partial Class 系統編碼原則
         Me.是否可用_ch.AutoSize = True
         Me.是否可用_ch.Location = New System.Drawing.Point(1246, 6)
         Me.是否可用_ch.Name = "是否可用_ch"
-        Me.是否可用_ch.Size = New System.Drawing.Size(75, 20)
+        Me.是否可用_ch.Size = New System.Drawing.Size(74, 20)
         Me.是否可用_ch.TabIndex = 709
         Me.是否可用_ch.Text = "是否鎖定"
         Me.是否可用_ch.UseVisualStyleBackColor = True
@@ -162,53 +162,54 @@ Partial Class 系統編碼原則
         'LOG檔截斷3_bt
         '
         Me.LOG檔截斷3_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.LOG檔截斷3_bt.Location = New System.Drawing.Point(67, 332)
+        Me.LOG檔截斷3_bt.Location = New System.Drawing.Point(173, 332)
         Me.LOG檔截斷3_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.LOG檔截斷3_bt.Name = "LOG檔截斷3_bt"
-        Me.LOG檔截斷3_bt.Size = New System.Drawing.Size(123, 23)
+        Me.LOG檔截斷3_bt.Size = New System.Drawing.Size(80, 23)
         Me.LOG檔截斷3_bt.TabIndex = 1505
         Me.LOG檔截斷3_bt.Text = "LOG檔截斷"
         '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.BackColor = System.Drawing.SystemColors.Control
-        Me.Label3.Location = New System.Drawing.Point(9, 335)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(56, 16)
-        Me.Label3.TabIndex = 1504
-        Me.Label3.Text = "主伺服器"
-        '
         '資料庫清單1_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.White
-        Me.資料庫清單1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.White
+        Me.資料庫清單1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        Me.資料庫清單1_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.資料庫清單1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.資料庫清單1_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.White
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.資料庫清單1_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.White
+        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.資料庫清單1_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
         Me.資料庫清單1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.資料庫清單1_dgv.Location = New System.Drawing.Point(6, 357)
+        Me.資料庫清單1_dgv.Location = New System.Drawing.Point(6, 356)
         Me.資料庫清單1_dgv.Name = "資料庫清單1_dgv"
         Me.資料庫清單1_dgv.RowHeadersWidth = 5
         Me.資料庫清單1_dgv.RowTemplate.Height = 24
-        Me.資料庫清單1_dgv.Size = New System.Drawing.Size(184, 198)
+        Me.資料庫清單1_dgv.Size = New System.Drawing.Size(247, 346)
         Me.資料庫清單1_dgv.TabIndex = 1506
         '
+        '選擇_tb
+        '
+        Me.選擇_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.選擇_tb.Location = New System.Drawing.Point(7, 332)
+        Me.選擇_tb.Margin = New System.Windows.Forms.Padding(5)
+        Me.選擇_tb.Name = "選擇_tb"
+        Me.選擇_tb.Size = New System.Drawing.Size(164, 23)
+        Me.選擇_tb.TabIndex = 1507
+        '
         '系統編碼原則
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1333, 706)
+        Me.Controls.Add(Me.選擇_tb)
         Me.Controls.Add(Me.資料庫清單1_dgv)
         Me.Controls.Add(Me.LOG檔截斷3_bt)
-        Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.伺服器狀態_dgv)
         Me.Controls.Add(Me.圖片資料庫管理修改_bt)
         Me.Controls.Add(Me.圖片資料庫名稱_lb)
@@ -241,6 +242,6 @@ Partial Class 系統編碼原則
     Friend WithEvents 伺服器狀態_dgv As DataGridView
     Friend WithEvents 是否可用_ch As CheckBox
     Friend WithEvents LOG檔截斷3_bt As Button
-    Friend WithEvents Label3 As Label
     Friend WithEvents 資料庫清單1_dgv As DataGridView
+    Friend WithEvents 選擇_tb As TextBox
 End Class

TENDEN-MES-SYS/9、資料庫系統管理/系統編碼原則.vb

@@ -62,6 +62,9 @@
             圖片資料庫名稱_tb.Text = 圖片資料庫管理_dgv(0, e.RowIndex).Value.ToString : 是否可用_ch.Checked = 圖片資料庫管理_dgv(1, e.RowIndex).Value
         End If
     End Sub
+    Private Sub 資料庫清單1_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 資料庫清單1_dgv.CellClick
+        If e.RowIndex = -1 Then : Else : 選擇_tb.Text = 資料庫清單1_dgv(0, e.RowIndex).Value.ToString : End If
+    End Sub
     Private Sub 伺服器狀態_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 伺服器狀態_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
         If e.RowIndex = 伺服器狀態_dgv.Rows.Count - 1 Then
@@ -89,9 +92,7 @@
     End Sub
     Private Sub LOG檔截斷3_bt_Click(sender As Object, e As EventArgs) Handles LOG檔截斷3_bt.Click
         Try
-            For I As Integer = 0 To 資料庫清單1_dgv.Rows.Count - 1
-                PA = 資料庫清單1_dgv(0, I).Value.ToString : 圖片庫 = PA : SQL_連線字串_圖片資料庫() : SQL_主資料庫LOG檔案截斷()
-            Next
+            PA = 選擇_tb.Text : 圖片庫 = PA : SQL_連線字串_圖片資料庫() : SQL_主資料庫LOG檔案截斷()
             重新讀取_bt.PerformClick() : MsgBox("伺服器截斷完成!!!")
         Catch ex As Exception
             MsgBox(ex.Message)

TENDEN-MES-SYS/LoginForm1vb.vb

@@ -1,8 +1,6 @@
 Option Explicit On
-Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Text
-
 Public Class LoginForm1vb
     ' TODO: 插入程式碼，利用提供的使用者名稱和密碼執行自訂驗證 (請參閱 https://go.microsoft.com/fwlink/?LinkId=35339)。
     ' 如此便可將自訂主體附加到目前執行緒的主體，如下所示:    My.User.CurrentPrincipal = CustomPrincipal 其中 CustomPrincipal 是用來執行驗證的 IPrincipal 實作。
@@ -109,44 +107,32 @@ Public Class LoginForm1vb
         Target1 = Target & AA(0) & "/"
         WebBrowser3.Url = New Uri(Target1)
         Dim Str As String = Application.StartupPath
-        If File.Exists(Str + "\TENDEN-ERP-SYS - 2021092901.exe") Then
-            UPDATE_bt.PerformClick()
-        End If
         If Strings.Right(Label1.Text, 10) <> Strings.Right(Label2.Text, 10) Then
-            自動更新2()
+            自動更新()
         Else : End If
     End Sub
     <Obsolete>
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
     End Sub
-    Private Sub 自動更新1()
-        Dim aa1 As MsgBoxResult
-        aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請開發人員注意是否有其他人員修改。並決定是否下載最新的執行檔?", MsgBoxStyle.OkCancel)
-        If aa1 = MsgBoxResult.Ok Then
-            UPDATE_bt.PerformClick()
-        Else
-            登入程序()
-        End If
-    End Sub
-    Private Sub 自動更新2()
-        Dim aa1 As MsgBoxResult
-        aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請下載最新的執行檔。", MsgBoxStyle.OkCancel)
-        If aa1 = MsgBoxResult.Ok Then
-            UPDATE_bt.PerformClick()
-        Else
-            MsgBox("操作不正確，請用手動方式下載更新。")
+    Private Sub 自動更新()
+        Dim Str As String = Application.StartupPath
+        If File.Exists(Str + "\NOTAUTO.txt") Then : Else
+            If ComboBox1.Text = "雲端伺服器" Then : Else
+                UPDATE_bt.PerformClick()
+            End If
         End If
     End Sub
     Private Sub OK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK.Click
+        Dim Str As String = Application.StartupPath
         If UsernameTextBox.Text = "b70340" Or UsernameTextBox.Text = "B70340" Then
             If Strings.Right(Label1.Text, 10) <> Strings.Right(Label2.Text, 10) Then
-                自動更新1()
+                If File.Exists(Str + "\NOTAUTO.txt") Then : 登入程序() : Else : 自動更新() : End If
             Else
                 登入程序()
             End If
         Else
             If Strings.Right(Label1.Text, 10) <> Strings.Right(Label2.Text, 10) Then
-                自動更新2()
+                自動更新()
             Else
                 登入程序()
             End If

TENDEN-MES-SYS/My Project/Resources.Designer.vb

@@ -430,6 +430,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
+        '''</summary>
+        Friend ReadOnly Property PDF() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("PDF", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
         '''</summary>

TENDEN-MES-SYS/My Project/Resources.resx

@@ -121,12 +121,12 @@
   <data name="6295116897660148006" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\6295116897660148006.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Add_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Add_Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ZOOM01" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\ZOOM01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SAVER" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\SAVER.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="shoe" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\shoe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -139,24 +139,30 @@
   <data name="9572467" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\9572467.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Report" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Abacus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Abacus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Shipping5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Shipping5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Shoe (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Shoe (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="1440X828" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\1440X828.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="renew" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\renew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="check" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="1980X1010" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\1980X1010.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="1366X719" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\1366X719.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Sendnow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Sendnow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="813f3d39b7439d9db10b59c3db4be4f" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\813f3d39b7439d9db10b59c3db4be4f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -187,18 +193,12 @@
   <data name="card_ipod" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\card_ipod.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Personnel" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Personnel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="00110102" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\00110102.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SAVER" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\SAVER.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Sys-Command" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Sys-Command.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="moving-and-packing-icon-set-03_brown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\moving-and-packing-icon-set-03_brown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -214,8 +214,11 @@
   <data name="add-2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\add-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shoe_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\shoe_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="moving-and-packing-icon-set-03_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\moving-and-packing-icon-set-03_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="business-info" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\business-info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="import" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -229,29 +232,26 @@
   <data name="下載" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\下載.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="check" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="renew" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\renew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ShoesInBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\ShoesInBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Payment" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Payment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="1280X956" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\1280X956.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="2019100601" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\2019100601.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="add-button" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\add-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="9572466" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\9572466.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="1980X1010" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\1980X1010.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Payment" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Payment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="tests" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\tests.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -259,8 +259,8 @@
   <data name="SAVER2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\SAVER2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Shipping5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Shipping5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="00110101" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\00110101.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -268,17 +268,20 @@
   <data name="basket_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\basket_back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Report" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="add-button" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\add-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="moving-and-packing-icon-set-03_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\moving-and-packing-icon-set-03_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="2019100601" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\2019100601.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="check-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\check-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Add_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Add_Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="00110102" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\00110102.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Personnel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Personnel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="2020032001" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\2020032001.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -286,10 +289,10 @@
   <data name="pen" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\pen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="business-info" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\business-info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="shoe_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\shoe_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Sendnow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Sendnow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PDF" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\PDF.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

TENDEN-MES-SYS/TENDEN_MES_SYS.vb

@@ -1,4 +1,6 @@
-Public Class TENDEN_MES_SYS
+Imports System.IO
+
+Public Class TENDEN_MES_SYS
     ReadOnly screenWidth = Screen.PrimaryScreen.Bounds.Width
     ReadOnly screenHeight = Screen.PrimaryScreen.Bounds.Height
     Private Sub ExitToolsStripMenuItem_Click(ByVal sender As Object, ByVal e As EventArgs) Handles ExitToolStripMenuItem.Click
@@ -24,6 +26,7 @@
     End Sub
     Private ReadOnly m_ChildFormNumber As Integer
     Private Sub MDIParent1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        刪除SYSPDF()
         If gUserName = "李協叡" Then
             Me.Text = Me.Text & "  --  " & g_conn_type & "  --  " & gUserName & "  --  系統版本  : " & 版本 & " - " & 登入人IP
         Else
@@ -62,7 +65,17 @@
         Me.STYLE形體下單數量統計_tsm.Enabled = CC(91)
     End Sub
     Private Sub MDIParent1_Unload(sender As Object, e As EventArgs) Handles MyBase.Closing
-        LoginForm1vb.Close()
+        刪除SYSPDF() : LoginForm1vb.Close()
+    End Sub
+    Private Sub 刪除SYSPDF()
+        ' 檢查 SYSPDF 資料夾是否存在，如果存在就強制刪除
+        Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
+        Dim sysPdfFolderPath As String = Path.Combine(desktopPath, "SYSPDF")
+        If Directory.Exists(sysPdfFolderPath) Then
+            Try
+                Directory.Delete(sysPdfFolderPath, True) ' 第二個參數為 True 表示刪除資料夾及其所有子資料夾和檔案
+            Catch ex As Exception : End Try
+        End If
     End Sub
     Private Sub MDIParent1_Resize(sender As Object, e As EventArgs) Handles MyBase.Resize, MyBase.Resize
         If screenWidth = 1920 And screenHeight = 1080 Then : Me.BackgroundImage = My.Resources._1980X1010

TENDEN-MES-SYS/bin/Debug/TENDEN-ERP-SYS.xml

@@ -207,6 +207,11 @@ TENDEN-ERP-SYS
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。
 </summary>
 </member>
+<member name="P:天盾國際管理系統.My.Resources.Resources.PDF">
+<summary>
+  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
+</summary>
+</member>
 <member name="P:天盾國際管理系統.My.Resources.Resources.pen">
 <summary>
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。

TENDEN-MES-SYS/obj/Debug/TENDEN-ERP-SYS.xml

@@ -207,6 +207,11 @@ TENDEN-ERP-SYS
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。
 </summary>
 </member>
+<member name="P:天盾國際管理系統.My.Resources.Resources.PDF">
+<summary>
+  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
+</summary>
+</member>
 <member name="P:天盾國際管理系統.My.Resources.Resources.pen">
 <summary>
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。

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

@@ -1 +1 @@
-1335c8ab621ce011c93b1a4140f0c075b3438e50
+aca4c6829544c17675e6825101dcd589d38819098f7f7f1b04c83b00a0b2d652

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

@@ -842,7 +842,6 @@ D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\WebActivatorEx.dll
 D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\Newtonsoft.Json.xml
 D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\Transformer.NET.xml
 D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾系統.vbproj.AssemblyReference.cache
-D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾系統.vbproj.SuggestedBindingRedirects.cache
 D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.出貨明細表1.resources
 D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.包裝資料圖片導入資料庫.resources
 D:\工巧明\TENDEN\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.包裝資料圖片資料庫.resources

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

@@ -1204,6 +1204,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="favicon-20181108114334167.ico" />
+    <None Include="圖片\PDF.png" />
     <None Include="圖片\Sendnow.png" />
     <None Include="圖片\renew.png" />
     <None Include="圖片\add-button.png" />