20240302備份

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

@@ -7,14 +7,21 @@
     End Sub
     Friend Sub SQL_訂單控制表1()
         ConnOpen()
-        SQL1 = "SELECT   訂單流水號, 年份季度, 客戶訂單號, 形體號, 驗貨報告圖片 FROM " & 訂單資料表(1) & "
-                WHERE   (客戶訂單號 LIKE '%" & 驗貨報告資料庫修正.客戶訂單號_tb.Text & "%') AND (形體號 LIKE N'" & 驗貨報告資料庫修正.型體名稱_tb.Text & "')"
+        SQL1 = "SELECT   訂單流水號, 年份季度, 客戶訂單號, 力威訂單號 AS 客戶訂單號2, 形體號, 驗貨報告圖片, 驗報圖庫, 驗貨報告圖片2, 驗報圖庫2
+                FROM " & 訂單資料表(1) & "
+                WHERE   (客戶訂單號 LIKE '%" & 驗貨報告資料庫修正.客戶訂單號_tb.Text & "%') OR (力威訂單號 LIKE N'" & 驗貨報告資料庫修正.客戶訂單號_tb.Text & "') OR
+                        (客戶訂單號 LIKE '%" & 驗貨報告資料庫修正.客戶訂單號2_tb.Text & "%') OR (力威訂單號 LIKE N'" & 驗貨報告資料庫修正.客戶訂單號2_tb.Text & "')"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_訂單控制表修改()
         ConnOpen()
-        SQL1 = "UPDATE " & 訂單資料表(1) & " SET 驗貨報告圖片 = N'" & 驗貨報告資料庫修正.驗貨報告編號_tb.Text & "'
-                    WHERE   (客戶訂單號 LIKE N'" & PA & "') AND (形體號 LIKE N'" & PA1 & "')"
+        SQL1 = "UPDATE " & 訂單資料表(1) & " SET 驗貨報告圖片 = N'" & PA2 & "', 驗報圖庫 = N'" & PA3 & "', 驗貨報告圖片2 = N'" & PA4 & "', 驗報圖庫2 = N'" & PA5 & "'
+                    WHERE   (客戶訂單號 LIKE N'" & PA & "') AND (形體號 LIKE N'" & PA6 & "')"
+        CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_驗貨報告資料刪除()
+        圖片庫 = PA1 : SQL_連線字串_圖片資料庫() : ConnOpen_工程圖庫SQL()
+        SQL1 = "DELETE 驗貨報告圖庫 WHERE  (驗貨報告編號 LIKE N'" & 驗貨報告資料庫修正.驗貨報告編號_tb.Text & "')"
         CmdSet_For_dr()
     End Sub
     '---------------------------驗貨報告圖片導入資料庫--------------------------------------------------------------
@@ -22,47 +29,47 @@
         ConnOpen() : SQL1 = "SELECT  TOP (1) 圖片資料庫  FROM  圖片資料庫管理  WHERE  (是否可用 = 0)  ORDER BY  圖片資料庫" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_訂單清單()
-        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) 
+        SQL1 = "SELECT    訂單流水號, 年份季度, 力威訂單號 AS 客戶訂單號, 客戶訂單號 AS 客戶訂單號2, 形體號, 顏色, 楦型, 訂單數量, 備註, 訂單種類, 生產工廠, 裁斷時間, 針車時間, 
+                          成型時間, 驗貨時間, 驗貨報告圖片, 資料流水號, 驗貨報告圖片2 FROM " & 訂單資料表(1) & " 
+                WHERE    (驗貨報告圖片 LIKE '' OR 驗貨報告圖片 IS NULL OR 驗貨報告圖片2 LIKE '' OR 驗貨報告圖片2 IS NULL) 
                 ORDER BY  SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
     End Sub
     Friend Sub SQL_訂單清單查詢()
-        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), 客戶訂單號, 形體號"
+        SQL1 = "SELECT    訂單流水號, 年份季度, 力威訂單號 AS 客戶訂單號, 客戶訂單號 AS 客戶訂單號2, 形體號, 顏色, 楦型, 訂單數量, 備註, 訂單種類, 生產工廠, 裁斷時間, 針車時間, 
+                          成型時間, 驗貨時間, 驗貨報告圖片, 資料流水號, 驗貨報告圖片2 FROM " & 訂單資料表(1) & " 
+                WHERE    (驗貨報告圖片 LIKE '' OR 驗貨報告圖片 IS NULL OR 驗貨報告圖片2 LIKE '' OR 驗貨報告圖片2 IS NULL) AND (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 
+                         客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%' OR 力威訂單號 LIKE '%" & PA & "%')
+                ORDER BY  SUBSTRING(訂單流水號, 4, 6), 客戶訂單號, 形體號"
     End Sub
     Friend Sub SQL_查詢最後一筆驗貨報告編號()
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫() : ConnOpen_工程圖庫SQL()
         SQL1 = "SELECT TOP (1) 驗貨報告編號 FROM 驗貨報告圖庫 ORDER BY 驗貨報告編號 DESC"
         CmdSet_For_dr()
     End Sub
-    Friend Sub SQL_新增驗貨報告編號_測試()
+    Friend Sub SQL_修改驗貨報告圖庫_正式()
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫() : ConnOpen_工程圖庫SQL()
-        SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 副檔名, 驗貨報告) 
-                SELECT N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "','" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "',
-                        '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', '" & 驗貨報告圖片導入資料庫.副檔名_bt.Text & "', @binary_file"
+        SQL1 = "UPDATE 驗貨報告圖庫 SET  操作人 = N'" & gUserName & "', 副檔名 = '" & 驗貨報告圖片導入資料庫.副檔名_bt.Text & "', 驗貨報告 = @binary_file 
+                       WHERE 驗貨報告編號 LIKE N'" & 驗貨報告圖片導入資料庫.驗報編碼_tb.Text & "'"
         CmdSet_For_dr_pic()
     End Sub
     Friend Sub SQL_新增驗貨報告圖庫_正式()
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫() : ConnOpen_工程圖庫SQL()
         SQL1 = "INSERT INTO 驗貨報告圖庫 (客戶訂單號, 型體名稱, 驗貨報告編號, 操作人, 副檔名, 驗貨報告) 
                 SELECT N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "','" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "',
-                        '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "','" & gUserName & "', '" & 驗貨報告圖片導入資料庫.副檔名_bt.Text & "', @binary_file"
+                        '" & 驗貨報告圖片導入資料庫.TextBox3.Text & "',N'" & 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 N'" & 驗貨報告圖片導入資料庫.天盾訂單號_tb.Text & "' AND 客戶訂單號 LIKE N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "' AND 
+                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 
+                WHERE (訂單流水號 LIKE N'" & 驗貨報告圖片導入資料庫.天盾訂單號_tb.Text & "' AND 力威訂單號 LIKE N'" & 驗貨報告圖片導入資料庫.客戶訂單號_tb.Text & "' AND 
                        形體號 LIKE N'" & 驗貨報告圖片導入資料庫.型體名稱_tb.Text & "')"
         CmdSet_For_dr()
     End Sub
@@ -72,7 +79,7 @@
                            訂單流水號, 年份季度, 力威訂單號 AS 客戶訂單號, 形體號 AS 型體名稱, 顏色, 驗貨報告圖片 AS 驗貨報告編號, 
                            驗報圖庫, 驗貨報告圖片2 AS 驗貨報告編號2,  驗報圖庫2
                 FROM      " & 訂單資料表(1) & "
-                WHERE      驗貨報告圖片 NOT LIKE '' AND 驗貨報告圖片 IS NOT NULL
+                WHERE      (驗貨報告圖片 NOT LIKE '' AND 驗貨報告圖片 IS NOT NULL) OR (驗貨報告圖片2 NOT LIKE '' AND 驗貨報告圖片2 IS NOT NULL)
                 GROUP BY   訂單流水號, 年份季度, 形體號, 顏色, 形體號, 力威訂單號, 驗貨報告圖片, 驗報圖庫, 驗貨報告圖片2, 驗報圖庫2
                 ORDER BY   客戶訂單號, 型體名稱"
     End Sub
@@ -82,14 +89,15 @@
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_驗貨報告圖庫查詢1()
-        SQL1 = "SELECT   " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, " & PA20 & ".dbo.驗貨報告圖庫.客戶訂單號, " & PA20 & ".dbo.驗貨報告圖庫.型體名稱, 
-                         " & 訂單資料表(1) & ".顏色,  " & PA20 & ".dbo.驗貨報告圖庫.驗貨報告編號 
-                FROM     " & PA20 & ".dbo.驗貨報告圖庫 LEFT OUTER JOIN " & 訂單資料表(1) & " ON " & PA20 & ".dbo.驗貨報告圖庫.客戶訂單號 = " & 訂單資料表(1) & ".客戶訂單號 
-                WHERE    " & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%' OR 
-                         " & PA20 & ".dbo.驗貨報告圖庫.客戶訂單號 LIKE '%" & PA & "%' OR " & PA20 & ".dbo.驗貨報告圖庫.型體名稱 LIKE '%" & PA & "%' 
-                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) OR (驗貨報告圖片2 NOT LIKE '' AND 驗貨報告圖片2 IS NOT NULL)) AND
+                           (訂單流水號 LIKE N'%" & PA & "%' OR 年份季度 LIKE N'%" & PA & "%' OR 力威訂單號 LIKE N'%" & PA & "%' OR 形體號 LIKE N'%" & PA & "%' OR 
+                            顏色 LIKE N'%" & PA & "%' )
+                GROUP BY   訂單流水號, 年份季度, 形體號, 顏色, 形體號, 力威訂單號, 驗貨報告圖片, 驗報圖庫, 驗貨報告圖片2, 驗報圖庫2
+                ORDER BY   客戶訂單號, 型體名稱"
     End Sub
     Friend Sub SQL_驗貨報告圖庫3()
         圖片庫 = PA1 : SQL_連線字串_圖片資料庫()

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

@@ -61,7 +61,7 @@
                             " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                             " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, 
                             " & 訂單資料表(6) & ".Quantity, " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS FTY_1,
-                            " & 訂單資料表(6) & ".FTYPrice AS FTY_2, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) 
+                            " & 訂單資料表(6) & ".FTYPrice AS FTY_2, " & 訂單資料表(6) & ".客戶單價 AS FTY_3, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) 
                             * " & 訂單資料表(6) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) 
                             * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionDarren, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) 
                             * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionTendenza, " & 訂單資料表(6) & ".FTYPrice AS [%_1], " & 訂單資料表(6) & ".FTYPrice AS [%_2], 
@@ -94,19 +94,20 @@
                             " & 訂單資料表(6) & ".年份, " & 訂單資料表(6) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(6) & ".Quantity, 
                             STYLELIST.ItemNumber, " & 訂單資料表(6) & ".審核, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".ProductID, 
                             " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, " & 訂單資料表(6) & ".FTY廠價, 
-                            " & 訂單資料表(1) & ".工廠回復交期, " & 訂單資料表(1) & ".TVW
+                            " & 訂單資料表(1) & ".工廠回復交期, " & 訂單資料表(1) & ".TVW, " & 訂單資料表(6) & ".客戶單價
                 ORDER BY    " & 訂單資料表(1) & ".訂單流水號 DESC"
     End Sub
     '----------------------------------訂單價格利潤明細表--------------------------------------------------------------
     Friend Sub SQL_訂單價格利潤明細表1()
-        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
-                       " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, 
-                       " & 訂單資料表(1) & ".單價, 
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : 表頭1 = "HTS#" : Else : 表頭1 = "ProductID" : End If
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號 AS 客人訂單號, 
+                       " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(1) & ".楦型, 
+                       " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                        " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(6) & ".Quantity, 
-                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS FTY_1, " & 訂單資料表(6) & ".FTYPrice AS FTY_2, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
-                       " & 訂單資料表(6) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionDarren, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionTendenza, " & 訂單資料表(6) & ".FTYPrice AS [%_1],
+                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS 實際廠價, " & 訂單資料表(6) & ".FTYPrice AS 天盾單價, 
+                       " & 訂單資料表(6) & ".客戶單價, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
+                       " & 訂單資料表(6) & ".Quantity AS [Commission TTL], (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Darren], 
+                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Tendenza], " & 訂單資料表(6) & ".FTYPrice AS [%_1],
                        " & 訂單資料表(6) & ".FTYPrice AS [%_2], " & 訂單資料表(6) & ".BasicPrice, " & 訂單資料表(6) & ".Polybag AS [PG/MOQ], " & 訂單資料表(6) & ".FOOTformOrPETform AS FOOTorPET, 
                        " & 訂單資料表(6) & ".Tooling, " & 訂單資料表(6) & ".RubberBand, " & 訂單資料表(6) & ".JHOOK, " & 訂單資料表(6) & ".WaterResistant, " & 訂單資料表(6) & ".P16VAT, 
                        " & 訂單資料表(6) & ".EXWsaving, " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling AS CollectedToolng, " & 訂單資料表(6) & ".年份, 
@@ -117,14 +118,15 @@
                 ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC, " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型"
     End Sub
     Friend Sub SQL_訂單價格利潤明細表2()
-        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
-                       " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, 
-                       " & 訂單資料表(1) & ".單價, 
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : 表頭1 = "HTS#" : Else : 表頭1 = "ProductID" : End If
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號 AS 客人訂單號, 
+                       " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(1) & ".楦型, 
+                       " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                        " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(6) & ".Quantity, 
-                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS FTY_1, " & 訂單資料表(6) & ".FTYPrice AS FTY_2, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
-                       " & 訂單資料表(6) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionDarren, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionTendenza, " & 訂單資料表(6) & ".FTYPrice AS [%_1],
+                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS 實際廠價, " & 訂單資料表(6) & ".FTYPrice AS 天盾單價, 
+                       " & 訂單資料表(6) & ".客戶單價, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
+                       " & 訂單資料表(6) & ".Quantity AS [Commission TTL], (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Darren], 
+                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Tendenza], " & 訂單資料表(6) & ".FTYPrice AS [%_1],
                        " & 訂單資料表(6) & ".FTYPrice AS [%_2], " & 訂單資料表(6) & ".BasicPrice, " & 訂單資料表(6) & ".Polybag AS [PG/MOQ], " & 訂單資料表(6) & ".FOOTformOrPETform AS FOOTorPET, 
                        " & 訂單資料表(6) & ".Tooling, " & 訂單資料表(6) & ".RubberBand, " & 訂單資料表(6) & ".JHOOK, " & 訂單資料表(6) & ".WaterResistant, " & 訂單資料表(6) & ".P16VAT, 
                        " & 訂單資料表(6) & ".EXWsaving, " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling AS CollectedToolng, " & 訂單資料表(6) & ".年份, 
@@ -140,14 +142,15 @@
                 ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
     End Sub
     Friend Sub SQL_訂單價格利潤明細表3()
-        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
-                       " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, 
-                       " & 訂單資料表(1) & ".單價, 
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : 表頭1 = "HTS#" : Else : 表頭1 = "ProductID" : End If
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號 AS 客人訂單號, 
+                       " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(1) & ".楦型, 
+                       " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                        " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(6) & ".Quantity, 
-                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS FTY_1, " & 訂單資料表(6) & ".FTYPrice AS FTY_2, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
-                       " & 訂單資料表(6) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionDarren, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionTendenza, " & 訂單資料表(6) & ".FTYPrice AS [%_1],
+                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS 實際廠價, " & 訂單資料表(6) & ".FTYPrice AS 天盾單價, 
+                       " & 訂單資料表(6) & ".客戶單價, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
+                       " & 訂單資料表(6) & ".Quantity AS [Commission TTL], (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Darren], 
+                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Tendenza], " & 訂單資料表(6) & ".FTYPrice AS [%_1],
                        " & 訂單資料表(6) & ".FTYPrice AS [%_2], " & 訂單資料表(6) & ".BasicPrice, " & 訂單資料表(6) & ".Polybag AS [PG/MOQ], " & 訂單資料表(6) & ".FOOTformOrPETform AS FOOTorPET, 
                        " & 訂單資料表(6) & ".Tooling, " & 訂單資料表(6) & ".RubberBand, " & 訂單資料表(6) & ".JHOOK, " & 訂單資料表(6) & ".WaterResistant, " & 訂單資料表(6) & ".P16VAT, 
                        " & 訂單資料表(6) & ".EXWsaving, " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling AS CollectedToolng, " & 訂單資料表(6) & ".年份, 
@@ -159,15 +162,16 @@
                 ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
     End Sub
     Friend Sub SQL_訂單價格利潤明細表4()
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : 表頭1 = "HTS#" : Else : 表頭1 = "ProductID" : End If
         列印用SQL = "WHERE " & 訂單資料表(6) & ".年份 LIKE '" & PA25 & "' AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) "
-        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
-                       " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, 
-                       " & 訂單資料表(1) & ".單價, 
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號 AS 客人訂單號, 
+                       " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(1) & ".楦型, 
+                       " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                        " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(6) & ".Quantity, 
-                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS FTY_1, " & 訂單資料表(6) & ".FTYPrice AS FTY_2, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
-                       " & 訂單資料表(6) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionDarren, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionTendenza, " & 訂單資料表(6) & ".FTYPrice AS [%_1],
+                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS 實際廠價, " & 訂單資料表(6) & ".FTYPrice AS 天盾單價, 
+                       " & 訂單資料表(6) & ".客戶單價, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
+                       " & 訂單資料表(6) & ".Quantity AS [Commission TTL], (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Darren], 
+                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Tendenza], " & 訂單資料表(6) & ".FTYPrice AS [%_1],
                        " & 訂單資料表(6) & ".FTYPrice AS [%_2], " & 訂單資料表(6) & ".BasicPrice, " & 訂單資料表(6) & ".Polybag AS [PG/MOQ], " & 訂單資料表(6) & ".FOOTformOrPETform AS FOOTorPET, 
                        " & 訂單資料表(6) & ".Tooling, " & 訂單資料表(6) & ".RubberBand, " & 訂單資料表(6) & ".JHOOK, " & 訂單資料表(6) & ".WaterResistant, " & 訂單資料表(6) & ".P16VAT, 
                        " & 訂單資料表(6) & ".EXWsaving, " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling AS CollectedToolng, " & 訂單資料表(6) & ".年份, 
@@ -178,6 +182,7 @@
                 ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
     End Sub
     Friend Sub SQL_訂單價格利潤明細表5()
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : 表頭1 = "HTS#" : Else : 表頭1 = "ProductID" : End If
         列印用SQL = " WHERE ((" & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%') OR 
                             (" & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%') OR 
                             (" & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".楦型 LIKE '%" & PA & "%') OR 
@@ -186,14 +191,14 @@
                             (" & 訂單資料表(1) & ".力威訂單號 LIKE '%" & PA & "%')) AND " & 訂單資料表(6) & ".天盾訂單號 IS NOT NULL AND 
                             " & 訂單資料表(6) & ".年份 LIKE '" & PA25 & "' AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) "
 
-        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
-                       " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, 
-                       " & 訂單資料表(1) & ".單價, 
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號 AS 客人訂單號, 
+                       " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(1) & ".楦型, 
+                       " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                        " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(6) & ".Quantity, 
-                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS FTY_1, " & 訂單資料表(6) & ".FTYPrice AS FTY_2, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
-                       " & 訂單資料表(6) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionDarren, 
-                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS CommissionTendenza, " & 訂單資料表(6) & ".FTYPrice AS [%_1],
+                       " & 訂單資料表(6) & ".Currency, " & 訂單資料表(6) & ".Exchange, " & 訂單資料表(6) & ".FTY廠價 AS 實際廠價, " & 訂單資料表(6) & ".FTYPrice AS 天盾單價, 
+                       " & 訂單資料表(6) & ".客戶單價, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * 
+                       " & 訂單資料表(6) & ".Quantity AS [Commission TTL], (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Darren], 
+                      (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(6) & ".FTYPrice) * " & 訂單資料表(6) & ".Quantity / 2 AS [Commission Tendenza], " & 訂單資料表(6) & ".FTYPrice AS [%_1],
                        " & 訂單資料表(6) & ".FTYPrice AS [%_2], " & 訂單資料表(6) & ".BasicPrice, " & 訂單資料表(6) & ".Polybag AS [PG/MOQ], " & 訂單資料表(6) & ".FOOTformOrPETform AS FOOTorPET, 
                        " & 訂單資料表(6) & ".Tooling, " & 訂單資料表(6) & ".RubberBand, " & 訂單資料表(6) & ".JHOOK, " & 訂單資料表(6) & ".WaterResistant, " & 訂單資料表(6) & ".P16VAT, 
                        " & 訂單資料表(6) & ".EXWsaving, " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling AS CollectedToolng, " & 訂單資料表(6) & ".年份, 
@@ -310,10 +315,10 @@
     Friend Sub SQL_新增訂單成本利潤表新增()
         ConnOpen()
         SQL1 = "INSERT INTO " & 訂單資料表(6) & " (資料流水號, 天盾訂單號, 客戶流水號, FTYPrice, BasicPrice, Polybag, FOOTformOrPETform, Tooling, RubberBand, JHOOK, WaterResistant, 
-                                                               P16VAT, EXWsaving, Currency, Exchange, 年份, Quantity, 利潤表流水號, 審核, D庸, FTY廠價) 
+                                                               P16VAT, EXWsaving, Currency, Exchange, 年份, Quantity, 利潤表流水號, 審核, D庸, FTY廠價, 客戶單價) 
                 VALUES ('" & PA & "', '" & PA1 & "', '" & PA2 & "', '" & PA3 & "', '" & PA4 & "', '" & PA5 & "', '" & PA6 & "', '" & PA7 & "', '" & PA8 & "', '" & PA9 & "', 
                         '" & PA10 & "', '" & PA11 & "', '" & PA12 & "', '" & 訂單價格利潤明細表.Currency_cb.Text & "', '" & PA13 & "', '" & PA14 & "', '" & PA15 & "', 
-                        '" & 利潤表流水號 & "', '" & PA17 & "', '" & PA18 & "', '" & PA19 & "')"
+                        '" & 利潤表流水號 & "', '" & PA17 & "', '" & PA18 & "', '" & PA19 & "', '" & PA20 & "')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_增加訂單控制表修改紀錄()
@@ -334,7 +339,7 @@
                                                   Tooling = '" & PA7 & "', RubberBand = '" & PA8 & "', JHOOK = '" & PA9 & "', WaterResistant = '" & PA10 & "', 
                                                   P16VAT = '" & PA11 & "', EXWsaving = '" & PA12 & "', Currency = '" & 訂單價格利潤明細表.Currency_cb.Text & "', 
                                                   Exchange = '" & PA13 & "', 年份 = '" & PA14 & "', Quantity = '" & PA15 & "', 審核 = '" & PA16 & "', D庸 = '" & PA18 & "',
-                                                  FTY廠價 = '" & PA19 & "'
+                                                  FTY廠價 = '" & PA19 & "', 客戶單價 = '" & PA20 & "'
                         WHERE (利潤表流水號 LIKE '" & 利潤表流水號 & "')"
         CmdSet_For_dr()
     End Sub
@@ -356,7 +361,7 @@
                        " & 訂單資料表(6) & ".Tooling, " & 訂單資料表(6) & ".RubberBand, " & 訂單資料表(6) & ".JHOOK, " & 訂單資料表(6) & ".WaterResistant, " & 訂單資料表(6) & ".P16VAT, 
                        " & 訂單資料表(6) & ".EXWsaving, " & 訂單資料表(6) & ".Quantity * " & 訂單資料表(6) & ".Tooling AS CollectedToolng, " & 訂單資料表(6) & ".年份, 
                        " & 訂單資料表(6) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(6) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(6) & ".審核, 
-                       " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(6) & ".FTY廠價
+                       " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(6) & ".FTY廠價, " & 訂單資料表(6) & ".客戶單價
                 FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN " & 訂單資料表(6) & " ON 
                        " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(6) & ".資料流水號 " & 列印用SQL & "
                 ORDER BY " & 訂單資料表(1) & ".力威訂單號 DESC"
@@ -382,35 +387,25 @@
                           貨款銷帳明細表.F_貼標費, 貨款銷帳明細表.利息or扣款 AS F_利息or扣款, 貨款銷帳明細表.F_增加款, 
                           貨款銷帳明細表.訂單數 AS 實付工廠金額, 貨款銷帳明細表.CUST_Price, 貨款銷帳明細表.訂單數 AS Amount2, 
                           貨款銷帳明細表.C_文件費, 貨款銷帳明細表.C_貼標費, 貨款銷帳明細表.C_利息or扣款, 
-                          貨款銷帳明細表.訂單數 AS 實際入帳金額, 貨款銷帳明細表.EX_FTY_DATE, 貨款銷帳明細表.Maturity_Date, 
+                          貨款銷帳明細表.訂單數 AS 實際入帳金額, 貨款銷帳明細表.Selling_Price, 貨款銷帳明細表.EX_FTY_DATE, 貨款銷帳明細表.Maturity_Date, 
                           貨款銷帳明細表.FTY_Payment_Date, 貨款銷帳明細表.訂單數 AS 總毛利, 貨款銷帳明細表.Darren佣金, 
-                          貨款銷帳明細表.Betty佣金, 貨款銷帳明細表.扣工廠手續費 AS 其他費用, 貨款銷帳明細表.訂單數 AS 公司毛利, 
+                          貨款銷帳明細表.Betty佣金, 貨款銷帳明細表.扣工廠手續費 AS 其他費用, 貨款銷帳明細表.訂單數 AS 公司毛利, 貨款銷帳明細表.訂單數 AS 客戶佣金, 
                           貨款銷帳明細表.Remark, QQ.客戶訂單號, 貨款銷帳明細表.已出貨 AS 異動, 貨款銷帳明細表.已出貨 AS 異動1, 
                           貨款銷帳明細表.已出貨 AS 已比對, 貨款銷帳明細表.已出貨 AS 模糊標註, 貨款銷帳明細表.已出貨 AS 需存檔
                 FROM      貨款銷帳明細表 LEFT OUTER JOIN
                          (SELECT  客戶訂單號, 力威訂單號  FROM  " & 訂單資料表(1) & "  GROUP BY  客戶訂單號, 力威訂單號) AS QQ ON LEFT(貨款銷帳明細表.訂單號, 10) = QQ.力威訂單號
-                WHERE    (貨款銷帳明細表.年份 LIKE '" & PA25 & "')
+                WHERE    (貨款銷帳明細表.年份 LIKE '" & PA25 & "') " & SQL2 & "
                 ORDER BY  " & PA30 & ", 貨款銷帳明細表.EX_FTY_DATE DESC"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_銷帳清單1()
         ConnOpen()
-        SQL1 = "SELECT    貨款銷帳明細表.流水號, 貨款銷帳明細表.年份, 貨款銷帳明細表.品牌, 貨款銷帳明細表.工廠, 貨款銷帳明細表.INV, 
-                          貨款銷帳明細表.訂單號, 貨款銷帳明細表.型體, 貨款銷帳明細表.顏色, 
-                          貨款銷帳明細表.楦型, 貨款銷帳明細表.訂單數, 貨款銷帳明細表.出貨數量, 貨款銷帳明細表.已出貨, 
-                          貨款銷帳明細表.已確認, 貨款銷帳明細表.FTY_PRICE, 貨款銷帳明細表.扣關稅or後廠價, 
-                          貨款銷帳明細表.訂單數 AS Amount1, 貨款銷帳明細表.F_銀行扣款, 貨款銷帳明細表.F_文件費, 
-                          貨款銷帳明細表.F_貼標費, 貨款銷帳明細表.利息or扣款 AS F_利息or扣款, 貨款銷帳明細表.F_增加款, 
-                          貨款銷帳明細表.訂單數 AS 實付工廠金額, 貨款銷帳明細表.CUST_Price, 貨款銷帳明細表.訂單數 AS Amount2, 
-                          貨款銷帳明細表.C_文件費, 貨款銷帳明細表.C_貼標費, 貨款銷帳明細表.C_利息or扣款, 
-                          貨款銷帳明細表.訂單數 AS 實際入帳金額, 貨款銷帳明細表.EX_FTY_DATE, 貨款銷帳明細表.Maturity_Date, 
-                          貨款銷帳明細表.FTY_Payment_Date, 貨款銷帳明細表.訂單數 AS 總毛利, 貨款銷帳明細表.Darren佣金, 
-                          貨款銷帳明細表.Betty佣金, 貨款銷帳明細表.扣工廠手續費 AS 其他費用, 貨款銷帳明細表.訂單數 AS 公司毛利, 
-                          貨款銷帳明細表.Remark, 貨款銷帳明細表.訂單號 AS 客戶訂單號, 貨款銷帳明細表.已出貨 AS 異動, 貨款銷帳明細表.已出貨 AS 異動1, 
-                          貨款銷帳明細表.已出貨 AS 已比對, 貨款銷帳明細表.已出貨 AS 需存檔
-                FROM      貨款銷帳明細表
-                WHERE    (貨款銷帳明細表.年份 LIKE '" & PA25 & "')
-                ORDER BY  " & PA30 & ", 貨款銷帳明細表.EX_FTY_DATE DESC"
+        SQL1 = "SELECT    流水號, 年份, 品牌, 工廠, INV, 訂單號, 型體, 顏色, 楦型, 訂單數, 出貨數量, 已出貨, 已確認, FTY_PRICE AS [FTY Price 實際廠價], 扣關稅or後廠價, 
+                          訂單數 AS Amount1, F_銀行扣款, F_文件費, F_貼標費, 利息or扣款 AS F_利息or扣款, F_增加款, 訂單數 AS 實付工廠金額, CUST_Price AS [Tendenza Price], 訂單數 AS Amount2, 
+                          C_文件費, C_貼標費, C_利息or扣款, 訂單數 AS 實際入帳金額, Selling_Price AS [Selling Price], EX_FTY_DATE, Maturity_Date, FTY_Payment_Date, 訂單數 AS 總毛利, Darren佣金, 
+                          Betty佣金, 扣工廠手續費 AS 其他費用, 訂單數 AS 公司毛利, Remark, 訂單號 AS 客戶訂單號, 已出貨 AS 異動, 已出貨 AS 異動1, 已出貨 AS 已比對, 
+                          已出貨 AS 需存檔
+                FROM      貨款銷帳明細表  WHERE  (年份 LIKE '" & PA25 & "')   ORDER BY  " & PA30 & ", EX_FTY_DATE DESC"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_銷帳清單_刪除()
@@ -422,18 +417,22 @@
                                           EX_FTY_DATE = N'" & PA66 & "', Maturity_Date = N'" & PA65 & "', FTY_Payment_Date = N'" & PA64 & "', Remark = N'" & PA63 & "', 
                                           Darren佣金 = N'" & PA62 & "', Betty佣金 = N'" & PA61 & "', 利息or扣款 = N'" & PA60 & "', 扣工廠手續費 = N'" & PA59 & "', 
                                           已確認 = N'" & PA58 & "', F_銀行扣款 = N'" & PA57 & "', F_文件費 = N'" & PA56 & "', F_貼標費 = N'" & PA55 & "', F_增加款 = N'" & PA54 & "', 
-                                          C_文件費 = N'" & PA53 & "', C_貼標費 = N'" & PA52 & "', C_利息or扣款 = N'" & PA51 & "', 已出貨 = N'" & PA50 & "', 訂單號 = '" & PA44 & "', 
-                                          型體 = N'" & PA49 & "', 顏色 = '" & PA48 & "', 楦型 = '" & PA47 & "'
+                                          C_文件費 = N'" & PA53 & "', C_貼標費 = N'" & PA52 & "', C_利息or扣款 = N'" & PA51 & "', 已出貨 = N'" & PA50 & "', 訂單號 = N'" & PA44 & "', 
+                                          型體 = N'" & PA49 & "', 顏色 = N'" & PA48 & "', 楦型 = N'" & PA47 & "', Selling_Price = N'" & PA46 & "'
                 WHERE  (流水號 LIKE '" & PA3 & "')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_銷帳清單_存檔1()
         ConnOpen()
         SQL1 = "UPDATE 貨款銷帳明細表 SET 出貨數量 = N'" & PA70 & "', FTY_PRICE = N'" & PA69 & "', 扣關稅or後廠價 = N'" & PA68 & "', CUST_Price = N'" & PA67 & "', 
-                                          EX_FTY_DATE = N'" & PA66 & "', Maturity_Date = N'" & PA65 & "', FTY_Payment_Date = N'" & PA64 & "', Remark = N'" & PA63 & "'
+                                          EX_FTY_DATE = N'" & PA66 & "', Maturity_Date = N'" & PA65 & "', FTY_Payment_Date = N'" & PA64 & "', Remark = N'" & PA63 & "',
+                                          Selling_Price = N'" & PA62 & "'
                 WHERE  (流水號 LIKE '" & PA3 & "')"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_銷帳清單_預設()
+        ConnOpen() : SQL1 = "UPDATE 貨款銷帳明細表 SET Selling_Price = N'0' WHERE  (Selling_Price IS NULL)" : CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_銷帳清單_流水號()
         ConnOpen() : SQL1 = "SELECT  TOP (1) 流水號  FROM  貨款銷帳明細表  ORDER BY  流水號 DESC" : CmdSet_For_dr()
     End Sub
@@ -583,17 +582,46 @@
     End Sub
     Friend Sub SQL_訂單明細表讀取()
         ConnOpen()
-        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) & "
-                WHERE     (客戶訂單號 LIKE '" & PA70 & "') AND (天盾流水號 LIKE '" & PA69 & "')
-                ORDER BY   資料流水號"
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : 表頭1 = "HTS#"
+            SQL1 = "SELECT   " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber AS Item, 
+                         " & 訂單資料表(5) & ".裝箱 AS Item2, " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(5) & ".ProductName, 
+                         " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM, " & 訂單資料表(5) & ".[5], 
+                         " & 訂單資料表(5) & ".[5.5], " & 訂單資料表(5) & ".[6], " & 訂單資料表(5) & ".[6.5], " & 訂單資料表(5) & ".[7], " & 訂單資料表(5) & ".[7.5], 
+                         " & 訂單資料表(5) & ".[8], " & 訂單資料表(5) & ".[8.5], " & 訂單資料表(5) & ".[9], " & 訂單資料表(5) & ".[9.5], " & 訂單資料表(5) & ".[10], 
+                         " & 訂單資料表(5) & ".[10.5], " & 訂單資料表(5) & ".[11], " & 訂單資料表(5) & ".[11.5], " & 訂單資料表(5) & ".[12], " & 訂單資料表(5) & ".[12.5], 
+                         " & 訂單資料表(5) & ".[13], " & 訂單資料表(5) & ".[14], 
+                         " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + " & 訂單資料表(5) & ".[6] + " & 訂單資料表(5) & ".[6.5] + " & 訂單資料表(5) & ".[7] + " & 訂單資料表(5) & ".[7.5]
+                          + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + " & 訂單資料表(5) & ".[9] + " & 訂單資料表(5) & ".[9.5] + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5]
+                          + " & 訂單資料表(5) & ".[11] + " & 訂單資料表(5) & ".[11.5] + " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] +
+                          " & 訂單資料表(5) & ".[14] AS TOTAL
+                FROM      " & 訂單資料表(5) & " INNER JOIN
+                          " & 訂單資料表(1) & " ON " & 訂單資料表(5) & ".資料流水號 = " & 訂單資料表(1) & ".資料流水號
+                WHERE    (" & 訂單資料表(5) & ".客戶訂單號 LIKE '" & PA70 & "') AND (" & 訂單資料表(5) & ".天盾流水號 LIKE '" & PA69 & "')
+                ORDER BY  " & 訂單資料表(5) & ".資料流水號"
+        Else : 表頭1 = "ProductID"
+            SQL1 = "SELECT   " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber AS Item, 
+                         " & 訂單資料表(5) & ".裝箱 AS Item2, " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(5) & ".ProductName, 
+                         " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM, " & 訂單資料表(5) & ".[5], 
+                         " & 訂單資料表(5) & ".[5.5], " & 訂單資料表(5) & ".[6], " & 訂單資料表(5) & ".[6.5], " & 訂單資料表(5) & ".[7], " & 訂單資料表(5) & ".[7.5], 
+                         " & 訂單資料表(5) & ".[8], " & 訂單資料表(5) & ".[8.5], " & 訂單資料表(5) & ".[9], " & 訂單資料表(5) & ".[9.5], " & 訂單資料表(5) & ".[10], 
+                         " & 訂單資料表(5) & ".[10.5], " & 訂單資料表(5) & ".[11], " & 訂單資料表(5) & ".[11.5], " & 訂單資料表(5) & ".[12], " & 訂單資料表(5) & ".[12.5], 
+                         " & 訂單資料表(5) & ".[13], " & 訂單資料表(5) & ".[14], 
+                         " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + " & 訂單資料表(5) & ".[6] + " & 訂單資料表(5) & ".[6.5] + " & 訂單資料表(5) & ".[7] + " & 訂單資料表(5) & ".[7.5]
+                          + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + " & 訂單資料表(5) & ".[9] + " & 訂單資料表(5) & ".[9.5] + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5]
+                          + " & 訂單資料表(5) & ".[11] + " & 訂單資料表(5) & ".[11.5] + " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] +
+                          " & 訂單資料表(5) & ".[14] AS TOTAL
+                FROM      " & 訂單資料表(5) & " INNER JOIN
+                          " & 訂單資料表(1) & " ON " & 訂單資料表(5) & ".天盾流水號 = " & 訂單資料表(1) & ".訂單流水號 AND 
+                          " & 訂單資料表(5) & ".Color = " & 訂單資料表(1) & ".顏色 AND " & 訂單資料表(5) & ".ProductName = " & 訂單資料表(1) & ".形體號 AND 
+                          " & 訂單資料表(5) & ".DM = " & 訂單資料表(1) & ".楦型
+                WHERE    (" & 訂單資料表(5) & ".客戶訂單號 LIKE '" & PA70 & "') AND (" & 訂單資料表(5) & ".天盾流水號 LIKE '" & PA69 & "')
+                ORDER BY  " & 訂單資料表(5) & ".資料流水號"
+        End If
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_訂單控制表讀取()
         ConnOpen()
-        SQL1 = "SELECT                訂單流水號,               年份季度,               力威訂單號,            形體號,             顏色,                  楦型,                 訂單數量, 
+        SQL1 = "SELECT                訂單流水號,               年份季度, 力威訂單號 AS 客人訂單號,            形體號,             顏色,                  楦型,                 訂單數量, 
                                         客戶交期,                   單價,                   總金額,              備註,         生產工廠,              訂單種類,             工廠回復交期, 
                                          CFMSPEC,              CFMSAMPLE,                   TRIAL1,            TRIAL2,           TRIAL3,                TRIAL4,             包裝確認時間, 
                                         貼標時間,               裁斷時間,                 針車時間,          成型時間,         驗貨時間,            實際離廠日,               資料流水號, 
@@ -659,7 +687,8 @@
         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 & "',TVW =  N'" & PA35 & "' 
+                                                 PO_S_Date = N'" & PA7 & "', Requested_XF = N'" & PA7 & "', Confirm_XF = N'" & PA7 & "', 力威訂單號 = N'" & PA11 & "',TVW =  N'" & PA35 & "', 
+                                                 ProductID = N'" & PA36 & "'
                 WHERE 資料流水號 LIKE N'" & PA13 & "'"
         CmdSet_For_dr()
     End Sub
@@ -669,6 +698,9 @@
     Friend Sub SQL_Item2_下拉()
         ConnOpen() : SQL1 = "SELECT  裝箱  FROM  " & 訂單資料表(5) & "  GROUP BY   裝箱  ORDER BY  裝箱" : CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_Item3_下拉()
+        ConnOpen() : SQL1 = "SELECT  ProductID  FROM  " & 訂單資料表(1) & "  GROUP BY   ProductID  ORDER BY  ProductID" : CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_ProductDescription_下拉()
         ConnOpen() : SQL1 = "SELECT  ProductDescription  FROM  " & 訂單資料表(5) & "  GROUP BY   ProductDescription  ORDER BY  ProductDescription" : CmdSet_For_dr()
     End Sub

TENDEN-MES-SYS/0、Module/SQL_量產訂單系統.vb

@@ -21,7 +21,11 @@
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_確認訂單明細表()
-        SQL1 = "SELECT      " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, " & 訂單資料表(5) & ".ProductName, 
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then
+            表頭1 = "HTS#"
+            SQL1 = "SELECT      " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, 
+                              CASE WHEN 裝箱 IS NULL OR 裝箱 = '' THEN ItemNumber 
+                              ELSE ItemNumber + ' - ' + 裝箱 END AS 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], 
@@ -29,24 +33,33 @@
                             " & 訂單資料表(5) & ".[13], " & 訂單資料表(5) & ".[14], " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + " & 訂單資料表(5) & ".[6] + 
                             " & 訂單資料表(5) & ".[6.5] + " & 訂單資料表(5) & ".[7] + " & 訂單資料表(5) & ".[7.5] + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + 
                             " & 訂單資料表(5) & ".[9] + " & 訂單資料表(5) & ".[9.5] + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5] + " & 訂單資料表(5) & ".[11] + 
-                            " & 訂單資料表(5) & ".[11.5] + " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] + " & 訂單資料表(5) & ".[14] AS TOTAL
-                FROM        " & 訂單資料表(5) & " 
+                            " & 訂單資料表(5) & ".[11.5] + " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] + " & 訂單資料表(5) & ".[14] AS TOTAL,
+                            " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(1) & ".TVW AS [STYLE#]
+                FROM        " & 訂單資料表(5) & " LEFT OUTER JOIN
+                            " & 訂單資料表(1) & " ON " & 訂單資料表(5) & ".資料流水號 = " & 訂單資料表(1) & ".資料流水號
                 WHERE      (" & 訂單資料表(5) & ".客戶訂單號 LIKE '" & 訂單明細表.客戶訂單號_tb.Text & "') AND (" & 訂單資料表(5) & ".天盾流水號 LIKE '" & 訂單明細表.訂單號_tb.Text & "')
-                ORDER BY   " & 訂單資料表(5) & ".資料流水號"
-    End Sub
-    Friend Sub SQL_確認訂單明細表1()
-        SQL1 = "SELECT      " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, " & 訂單資料表(5) & ".ItemNumber, " & 訂單資料表(5) & ".ProductName, 
-                            " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM, " & 訂單資料表(5) & ".[5], " & 訂單資料表(5) & ".[5.5], 
-                            " & 訂單資料表(5) & ".[6], " & 訂單資料表(5) & ".[6.5], " & 訂單資料表(5) & ".[7], " & 訂單資料表(5) & ".[7.5], " & 訂單資料表(5) & ".[8], 
-                            " & 訂單資料表(5) & ".[8.5], " & 訂單資料表(5) & ".[9], " & 訂單資料表(5) & ".[9.5], " & 訂單資料表(5) & ".[10], " & 訂單資料表(5) & ".[10.5], 
-                            " & 訂單資料表(5) & ".[11], " & 訂單資料表(5) & ".[11.5], " & 訂單資料表(5) & ".[12], " & 訂單資料表(5) & ".[12.5], " & 訂單資料表(5) & ".[13], 
-                            " & 訂單資料表(5) & ".[14], " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + " & 訂單資料表(5) & ".[6] + " & 訂單資料表(5) & ".[6.5] + 
-                            " & 訂單資料表(5) & ".[7] + " & 訂單資料表(5) & ".[7.5] + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + " & 訂單資料表(5) & ".[9] + 
-                            " & 訂單資料表(5) & ".[9.5] + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5] + " & 訂單資料表(5) & ".[11] + " & 訂單資料表(5) & ".[11.5]
-                            + " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] + " & 訂單資料表(5) & ".[14] AS TOTAL
-                FROM        " & 訂單資料表(5) & "
-                WHERE     (" & 訂單資料表(5) & ".客戶訂單號 LIKE '" & 訂單明細表.客戶訂單號_tb.Text & "') AND (" & 訂單資料表(5) & ".天盾流水號 LIKE '" & 訂單明細表.訂單號_tb.Text & "')
-                ORDER BY   " & 訂單資料表(5) & ".ProductName, " & 訂單資料表(5) & ".Color"
+                " & SQL2
+        Else
+            表頭1 = "ProductID"
+            SQL1 = "SELECT      " & 訂單資料表(5) & ".天盾流水號, " & 訂單資料表(5) & ".客戶訂單號, 
+                              CASE WHEN 裝箱 IS NULL OR 裝箱 = '' THEN ItemNumber 
+                              ELSE ItemNumber + ' - ' + 裝箱 END AS ItemNumber, " & 訂單資料表(5) & ".ProductName, 
+                            " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(5) & ".Color, " & 訂單資料表(5) & ".DM, " & 訂單資料表(5) & ".[5], 
+                            " & 訂單資料表(5) & ".[5.5], " & 訂單資料表(5) & ".[6], " & 訂單資料表(5) & ".[6.5], " & 訂單資料表(5) & ".[7], " & 訂單資料表(5) & ".[7.5], 
+                            " & 訂單資料表(5) & ".[8], " & 訂單資料表(5) & ".[8.5], " & 訂單資料表(5) & ".[9], " & 訂單資料表(5) & ".[9.5], " & 訂單資料表(5) & ".[10], 
+                            " & 訂單資料表(5) & ".[10.5], " & 訂單資料表(5) & ".[11], " & 訂單資料表(5) & ".[11.5], " & 訂單資料表(5) & ".[12], " & 訂單資料表(5) & ".[12.5], 
+                            " & 訂單資料表(5) & ".[13], " & 訂單資料表(5) & ".[14], " & 訂單資料表(5) & ".[5] + " & 訂單資料表(5) & ".[5.5] + " & 訂單資料表(5) & ".[6] + 
+                            " & 訂單資料表(5) & ".[6.5] + " & 訂單資料表(5) & ".[7] + " & 訂單資料表(5) & ".[7.5] + " & 訂單資料表(5) & ".[8] + " & 訂單資料表(5) & ".[8.5] + 
+                            " & 訂單資料表(5) & ".[9] + " & 訂單資料表(5) & ".[9.5] + " & 訂單資料表(5) & ".[10] + " & 訂單資料表(5) & ".[10.5] + " & 訂單資料表(5) & ".[11] + 
+                            " & 訂單資料表(5) & ".[11.5] + " & 訂單資料表(5) & ".[12] + " & 訂單資料表(5) & ".[12.5] + " & 訂單資料表(5) & ".[13] + " & 訂單資料表(5) & ".[14] AS TOTAL,
+                            " & 訂單資料表(1) & ".ProductID AS [" & 表頭1 & "], " & 訂單資料表(1) & ".TVW AS [STYLE#]
+                FROM        " & 訂單資料表(5) & "  INNER JOIN
+                            " & 訂單資料表(1) & " ON " & 訂單資料表(5) & ".天盾流水號 = " & 訂單資料表(1) & ".訂單流水號 AND 
+                            " & 訂單資料表(5) & ".Color = " & 訂單資料表(1) & ".顏色 AND " & 訂單資料表(5) & ".ProductName = " & 訂單資料表(1) & ".形體號 AND 
+                            " & 訂單資料表(5) & ".DM = " & 訂單資料表(1) & ".楦型
+                WHERE      (" & 訂單資料表(5) & ".客戶訂單號 LIKE '" & 訂單明細表.客戶訂單號_tb.Text & "') AND (" & 訂單資料表(5) & ".天盾流水號 LIKE '" & 訂單明細表.訂單號_tb.Text & "')
+                " & SQL2
+        End If
     End Sub
     Friend Sub SQL_確認訂單明細表2()
         SQL1 = "SELECT 天盾流水號, 客戶訂單號, ItemNumber, ProductName, ProductDescription, Color, DM, [5], [5.5], [6], [6.5], [7], [7.5], [8], [8.5], [9], [9.5], [10], [10.5], [11], 
@@ -907,6 +920,7 @@
     End Sub
     Friend Sub SQL_訂單控制出貨數量預設()
         ConnOpen() : SQL1 = "UPDATE " & 訂單資料表(1) & " SET 出貨數量 = '0' WHERE (出貨數量 IS NULL)" : CmdSet_For_dr() : conn.Close()
+        ConnOpen() : SQL1 = "UPDATE " & 訂單資料表(1) & " SET 驗貨報告圖片2 = '' WHERE (驗貨報告圖片2 IS NULL)" : CmdSet_For_dr() : conn.Close()
     End Sub
     Friend Sub SQL_訂單流水號站存清空()
         ConnOpen() : SQL1 = "DELETE FROM " & 訂單資料表(4) & " WHERE (訂單流水號 = '" & Strings.Right(訂單控制表.天盾訂單號_tb.Text, 6) & "')" : CmdSet_For_dr()

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

@@ -3,13 +3,13 @@
     Public g_conn_type, gUserName, 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, 登入人IP, AA(99), 圖片庫, SQL密碼 As String
     Public CC(99), 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2024012001"
+    Public 版本 As String = "2024022703"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
     '----系統用全域變數----------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 圖片傳遞 As Image
     Public 進度條後墜 As String
-    Public 首次開啟, 重新計算, BL1 As Boolean
+    Public 首次開啟, 重新計算, BL1, BL2, BL3 As Boolean
     '--------------整數變數
     Public 比例1, 比例2, 比例3, 分母, 計算累加 As Integer
     Public lastFoundRowIndex, lastFoundColIndex As Integer
@@ -21,7 +21,7 @@
     Public PA, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PA16, PA17, PA18, PA19, PA20, PA21, PA22, PA23, PA24, PA25, PA26,
            PA27, PA28, PA29, PA30, PA31, PA32, PA33, PA34, PA35, PA36, PA37, PA38, PA39, PA40, PA41, PA42, PA43, PA44, PA45, PA46, PA47, PA48, PA49, PA50, PA51, PA52,
            PA53, PA54, PA55, PA56, PA57, PA58, PA59, PA60, PA61, PA62, PA63, PA64, PA65, PA66, PA67, PA68, PA69, PA70,
-           WW, 條件, WWD1, WWD2, WWD3, 流水號2, EDFR, 日期(1), QQWEE, 樣品單流水號變數1, 樣品單流水號變數2, 樣品單流水號變數3, 部門, QWWE, ZXC,
+           WW, 條件, WWD1, WWD2, WWD3, 流水號2, EDFR, 日期(1), QQWEE, 樣品單流水號變數1, 樣品單流水號變數2, 樣品單流水號變數3, 部門, QWWE, ZXC, 表頭1,
            kkk1, kkk2, kkk3, kkk4, kkk5, kkk6, YR, YS, YD, ASDF, PP, 品牌V_R判斷, QA, PP1, PP2, PP3, PP4, PP5, PP6, PP7, PP8, ASD, 列印用SQL, 驗貨報告, 訂單紀錄流水號,
            PPAA, PPBB(3000), 排序(1), OD(42), 訂單資料表(10), PB(60), 利潤表流水號 As String
     '--------------整數變數

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

@@ -187,12 +187,12 @@ Partial Class 出貨明細表1
         Me.Controls.Add(Me.PO號_tb)
         Me.Controls.Add(Me.年份_cb)
         Me.Controls.Add(Me.Label16)
-        Me.Controls.Add(Me.銷帳1_dgv)
         Me.Controls.Add(Me.銷帳_dgv)
+        Me.Controls.Add(Me.銷帳1_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(4)
         Me.Name = "出貨明細表1"
-        Me.Text = "出貨明細表1"
+        Me.Text = "出貨明細表"
         CType(Me.銷帳_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.銷帳1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)

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

@@ -16,9 +16,9 @@
         銷帳_dgv.Columns(0).Visible = False : 銷帳_dgv.Columns(1).Visible = False : 銷帳_dgv.Columns(11).Visible = False : 銷帳_dgv.Columns(15).Visible = False
         銷帳_dgv.Columns(16).Visible = False : 銷帳_dgv.Columns(17).Visible = False : 銷帳_dgv.Columns(18).Visible = False : 銷帳_dgv.Columns(19).Visible = False
         銷帳_dgv.Columns(20).Visible = False : 銷帳_dgv.Columns(21).Visible = False : 銷帳_dgv.Columns(23).Visible = False : 銷帳_dgv.Columns(24).Visible = False
-        銷帳_dgv.Columns(25).Visible = False : 銷帳_dgv.Columns(26).Visible = False : 銷帳_dgv.Columns(27).Visible = False : 銷帳_dgv.Columns(31).Visible = False
-        銷帳_dgv.Columns(32).Visible = False : 銷帳_dgv.Columns(33).Visible = False : 銷帳_dgv.Columns(34).Visible = False : 銷帳_dgv.Columns(35).Visible = False
-        銷帳_dgv.Columns(37).Visible = False : 銷帳_dgv.Columns(38).Visible = False : 銷帳_dgv.Columns(39).Visible = False
+        銷帳_dgv.Columns(25).Visible = False : 銷帳_dgv.Columns(26).Visible = False : 銷帳_dgv.Columns(27).Visible = False : 銷帳_dgv.Columns(32).Visible = False
+        銷帳_dgv.Columns(33).Visible = False : 銷帳_dgv.Columns(34).Visible = False : 銷帳_dgv.Columns(35).Visible = False : 銷帳_dgv.Columns(36).Visible = False
+        銷帳_dgv.Columns(38).Visible = False : 銷帳_dgv.Columns(39).Visible = False : 銷帳_dgv.Columns(40).Visible = False
         銷帳_dgv.EditMode = DataGridViewEditMode.EditOnEnter
         銷帳_dgv.Columns(9).DefaultCellStyle.Format = "#,##0" : 銷帳_dgv.Columns(10).DefaultCellStyle.Format = "#,##0"
         銷帳_dgv.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -27,33 +27,33 @@
         銷帳_dgv.Columns(10).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         銷帳_dgv.Columns(6).FillWeight = 60 : 銷帳_dgv.Columns(7).FillWeight = 60 : 銷帳_dgv.Columns(8).FillWeight = 40
         銷帳_dgv.Columns(9).FillWeight = 40 : 銷帳_dgv.Columns(10).FillWeight = 40 : 銷帳_dgv.Columns(11).FillWeight = 40 : 銷帳_dgv.Columns(12).FillWeight = 40
-        銷帳_dgv.Columns(36).FillWeight = 300 : 銷帳_dgv.Columns(5).FillWeight = 85
-        銷帳_dgv.Columns(38).FillWeight = 40 : 銷帳_dgv.Columns(39).FillWeight = 40 : 銷帳_dgv.Columns(2).FillWeight = 70 : 銷帳_dgv.Columns(3).FillWeight = 40
-        銷帳_dgv.Columns(28).FillWeight = 90 : 銷帳_dgv.Columns(29).FillWeight = 125 : 銷帳_dgv.Columns(30).FillWeight = 90 : 銷帳_dgv.Columns("需存檔").FillWeight = 40
-        For I As Integer = 13 To 27
+        銷帳_dgv.Columns(37).FillWeight = 300 : 銷帳_dgv.Columns(5).FillWeight = 85
+        銷帳_dgv.Columns(39).FillWeight = 40 : 銷帳_dgv.Columns(40).FillWeight = 40 : 銷帳_dgv.Columns(2).FillWeight = 70 : 銷帳_dgv.Columns(3).FillWeight = 40
+        銷帳_dgv.Columns(29).FillWeight = 90 : 銷帳_dgv.Columns(30).FillWeight = 125 : 銷帳_dgv.Columns(31).FillWeight = 90 : 銷帳_dgv.Columns("需存檔").FillWeight = 40
+        For I As Integer = 13 To 28
             銷帳_dgv.Columns(I).DefaultCellStyle.Format = "#,##0.00" : 銷帳_dgv.Columns(I).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
             銷帳_dgv.Columns(I).FillWeight = 60
         Next : 銷帳_dgv.Columns(21).FillWeight = 70 : 銷帳_dgv.Columns(23).FillWeight = 70 : 銷帳_dgv.Columns(27).FillWeight = 70
-        For I As Integer = 31 To 35
+        For I As Integer = 32 To 36
             銷帳_dgv.Columns(I).DefaultCellStyle.Format = "#,##0.00" : 銷帳_dgv.Columns(I).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
             銷帳_dgv.Columns(I).FillWeight = 70
         Next
 
-        For I As Integer = 0 To 41 : 銷帳_dgv.Columns(I).ReadOnly = True : Next
-        銷帳_dgv.Columns(13).ReadOnly = False : 銷帳_dgv.Columns(14).ReadOnly = False : 銷帳_dgv.Columns(22).ReadOnly = False : 銷帳_dgv.Columns(28).ReadOnly = False
-        銷帳_dgv.Columns(29).ReadOnly = False : 銷帳_dgv.Columns(30).ReadOnly = False : 銷帳_dgv.Columns(36).ReadOnly = False
+        For I As Integer = 0 To 42 : 銷帳_dgv.Columns(I).ReadOnly = True : Next
+        銷帳_dgv.Columns(13).ReadOnly = False : 銷帳_dgv.Columns(14).ReadOnly = False : 銷帳_dgv.Columns(22).ReadOnly = False : 銷帳_dgv.Columns(29).ReadOnly = False
+        銷帳_dgv.Columns(30).ReadOnly = False : 銷帳_dgv.Columns(31).ReadOnly = False : 銷帳_dgv.Columns(37).ReadOnly = False
 
         For I As Integer = 0 To 銷帳_dgv.Rows.Count - 1 : 銷帳_dgv("需存檔", I).Value = False
             If 銷帳_dgv(11, I).Value = False Then
                 For II As Integer = 2 To 10 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.White : Next
                 For II As Integer = 13 To 21 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.White : Next
-                For II As Integer = 22 To 27 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.White : Next
-                For II As Integer = 28 To 36 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.White : Next
+                For II As Integer = 22 To 28 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.White : Next
+                For II As Integer = 29 To 37 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.White : Next
             Else
                 For II As Integer = 2 To 10 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.LightCyan : Next
                 For II As Integer = 13 To 21 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.Cornsilk : Next
-                For II As Integer = 22 To 27 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.LavenderBlush : Next
-                For II As Integer = 28 To 36 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.Beige : Next
+                For II As Integer = 22 To 28 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.LavenderBlush : Next
+                For II As Integer = 29 To 37 : 銷帳_dgv.Rows(I).Cells(II).Style.BackColor = Color.Beige : Next
             End If
             If 銷帳_dgv(11, I).Value = True Then
                 If 銷帳_dgv(14, I).Value = 0 Then
@@ -64,15 +64,15 @@
                 銷帳_dgv(21, I).Value = 銷帳_dgv(15, I).Value - 銷帳_dgv(16, I).Value - 銷帳_dgv(17, I).Value - 銷帳_dgv(18, I).Value - 銷帳_dgv(19, I).Value + 銷帳_dgv(20, I).Value
                 銷帳_dgv(23, I).Value = 銷帳_dgv(10, I).Value * 銷帳_dgv(22, I).Value
                 銷帳_dgv(27, I).Value = 銷帳_dgv(23, I).Value - 銷帳_dgv(24, I).Value - 銷帳_dgv(25, I).Value - 銷帳_dgv(26, I).Value
-                銷帳_dgv(31, I).Value = 銷帳_dgv(27, I).Value - 銷帳_dgv(21, I).Value
-                銷帳_dgv(35, I).Value = 銷帳_dgv(31, I).Value - 銷帳_dgv(32, I).Value - 銷帳_dgv(33, I).Value - 銷帳_dgv(34, I).Value
+                銷帳_dgv(32, I).Value = 銷帳_dgv(28, I).Value - 銷帳_dgv(21, I).Value
+                銷帳_dgv(36, I).Value = 銷帳_dgv(32, I).Value - 銷帳_dgv(33, I).Value - 銷帳_dgv(34, I).Value - 銷帳_dgv(35, I).Value
             End If
             If 銷帳_dgv(12, I).Value = True Then : 銷帳_dgv(10, I).ReadOnly = True : 銷帳_dgv(11, I).ReadOnly = True : 銷帳_dgv(22, I).ReadOnly = True
                 For II As Integer = 13 To 14 : 銷帳_dgv(II, I).ReadOnly = True : Next : For II As Integer = 16 To 20 : 銷帳_dgv(II, I).ReadOnly = True : Next
-                For II As Integer = 24 To 26 : 銷帳_dgv(II, I).ReadOnly = True : Next : For II As Integer = 32 To 34 : 銷帳_dgv(II, I).ReadOnly = True : Next
+                For II As Integer = 24 To 28 : 銷帳_dgv(II, I).ReadOnly = True : Next : For II As Integer = 33 To 35 : 銷帳_dgv(II, I).ReadOnly = True : Next
             Else : 銷帳_dgv(10, I).ReadOnly = False : 銷帳_dgv(11, I).ReadOnly = False : 銷帳_dgv(22, I).ReadOnly = False
                 For II As Integer = 13 To 14 : 銷帳_dgv(II, I).ReadOnly = False : Next : For II As Integer = 16 To 20 : 銷帳_dgv(II, I).ReadOnly = False : Next
-                For II As Integer = 24 To 26 : 銷帳_dgv(II, I).ReadOnly = False : Next : For II As Integer = 32 To 34 : 銷帳_dgv(II, I).ReadOnly = False : Next
+                For II As Integer = 24 To 28 : 銷帳_dgv(II, I).ReadOnly = False : Next : For II As Integer = 33 To 35 : 銷帳_dgv(II, I).ReadOnly = False : Next
             End If
         Next : 銷帳_dgv.Columns("已比對").Visible = False : 銷帳_dgv.Columns("需存檔").Visible = True
     End Sub
@@ -82,18 +82,19 @@
         銷帳_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 7.6)
     End Sub
     Private Sub 出貨明細表1_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
-        Set_銷帳清單() : 首次開啟 = False
+        SQL_銷帳清單_預設() : Set_銷帳清單() : 首次開啟 = False
     End Sub
     Private Sub 銷帳_dgv_CellContentCl(sender As Object, e As DataGridViewCellEventArgs) Handles 銷帳_dgv.CellEndEdit
         For I As Integer = 0 To 銷帳_dgv.Rows.Count - 1
             If 銷帳_dgv("出貨數量", I).Value.ToString <> 銷帳1_dgv("出貨數量", I).Value.ToString Or
-                   銷帳_dgv("FTY_PRICE", I).Value.ToString <> 銷帳1_dgv("FTY_PRICE", I).Value.ToString Or
+                   銷帳_dgv("FTY Price 實際廠價", I).Value.ToString <> 銷帳1_dgv("FTY Price 實際廠價", I).Value.ToString Or
                    銷帳_dgv("扣關稅or後廠價", I).Value.ToString <> 銷帳1_dgv("扣關稅or後廠價", I).Value.ToString Or
-                   銷帳_dgv("CUST_Price", I).Value.ToString <> 銷帳1_dgv("CUST_Price", I).Value.ToString Or
+                   銷帳_dgv("Tendenza Price", I).Value.ToString <> 銷帳1_dgv("Tendenza Price", I).Value.ToString Or
                    銷帳_dgv("EX_FTY_DATE", I).Value.ToString <> 銷帳1_dgv("EX_FTY_DATE", I).Value.ToString Or
                    銷帳_dgv("Maturity_Date", I).Value.ToString <> 銷帳1_dgv("Maturity_Date", I).Value.ToString Or
                    銷帳_dgv("FTY_Payment_Date", I).Value.ToString <> 銷帳1_dgv("FTY_Payment_Date", I).Value.ToString Or
-                   銷帳_dgv("Remark", I).Value.ToString <> 銷帳1_dgv("Remark", I).Value.ToString Then
+                   銷帳_dgv("Remark", I).Value.ToString <> 銷帳1_dgv("Remark", I).Value.ToString Or
+                   銷帳_dgv("Selling Price", I).Value.ToString <> 銷帳1_dgv("Selling Price", I).Value.ToString Then
                 銷帳_dgv("需存檔", I).Value = True
             Else
                 銷帳_dgv("需存檔", I).Value = False
@@ -152,13 +153,14 @@
     Private Sub 存檔_tb_Click(sender As Object, e As EventArgs) Handles 存檔_tb.Click
         For I As Integer = 0 To 銷帳_dgv.Rows.Count - 1
             If 銷帳_dgv("出貨數量", I).Value.ToString <> 銷帳1_dgv("出貨數量", I).Value.ToString Or
-                   銷帳_dgv("FTY_PRICE", I).Value.ToString <> 銷帳1_dgv("FTY_PRICE", I).Value.ToString Or
+                   銷帳_dgv("FTY Price 實際廠價", I).Value.ToString <> 銷帳1_dgv("FTY Price 實際廠價", I).Value.ToString Or
                    銷帳_dgv("扣關稅or後廠價", I).Value.ToString <> 銷帳1_dgv("扣關稅or後廠價", I).Value.ToString Or
-                   銷帳_dgv("CUST_Price", I).Value.ToString <> 銷帳1_dgv("CUST_Price", I).Value.ToString Or
+                   銷帳_dgv("Tendenza Price", I).Value.ToString <> 銷帳1_dgv("Tendenza Price", I).Value.ToString Or
                    銷帳_dgv("EX_FTY_DATE", I).Value.ToString <> 銷帳1_dgv("EX_FTY_DATE", I).Value.ToString Or
                    銷帳_dgv("Maturity_Date", I).Value.ToString <> 銷帳1_dgv("Maturity_Date", I).Value.ToString Or
                    銷帳_dgv("FTY_Payment_Date", I).Value.ToString <> 銷帳1_dgv("FTY_Payment_Date", I).Value.ToString Or
-                   銷帳_dgv("Remark", I).Value.ToString <> 銷帳1_dgv("Remark", I).Value.ToString Then
+                   銷帳_dgv("Remark", I).Value.ToString <> 銷帳1_dgv("Remark", I).Value.ToString Or
+                   銷帳_dgv("Selling Price", I).Value.ToString <> 銷帳1_dgv("Selling Price", I).Value.ToString Then
                 銷帳_dgv("需存檔", I).Value = True
             Else
                 銷帳_dgv("需存檔", I).Value = False
@@ -171,20 +173,22 @@
             If aa1 = MsgBoxResult.Ok Then : 資料數 = 銷帳_dgv.Rows.Count
                 For i As Integer = 0 To 銷帳_dgv.Rows.Count - 1 : MyModule1.進度條()
                     If 銷帳_dgv.Rows(i).Cells("需存檔").Value = True Then : PA3 = 銷帳_dgv.Rows(i).Cells("流水號").Value.ToString
-                        PA70 = 銷帳_dgv.Rows(i).Cells("出貨數量").Value.ToString : PA69 = 銷帳_dgv.Rows(i).Cells("FTY_PRICE").Value.ToString
-                        PA68 = 銷帳_dgv.Rows(i).Cells("扣關稅or後廠價").Value.ToString : PA67 = 銷帳_dgv.Rows(i).Cells("CUST_Price").Value.ToString
+                        PA70 = 銷帳_dgv.Rows(i).Cells("出貨數量").Value.ToString : PA69 = 銷帳_dgv.Rows(i).Cells("FTY Price 實際廠價").Value.ToString
+                        PA68 = 銷帳_dgv.Rows(i).Cells("扣關稅or後廠價").Value.ToString : PA67 = 銷帳_dgv.Rows(i).Cells("Tendenza Price").Value.ToString
                         PA66 = 銷帳_dgv.Rows(i).Cells("EX_FTY_DATE").Value.ToString : PA65 = 銷帳_dgv.Rows(i).Cells("Maturity_Date").Value.ToString
                         PA64 = 銷帳_dgv.Rows(i).Cells("FTY_Payment_Date").Value.ToString : PA63 = 銷帳_dgv.Rows(i).Cells("Remark").Value.ToString
+                        PA62 = 銷帳_dgv.Rows(i).Cells("Selling Price").Value.ToString
                         SQL_銷帳清單_存檔1() : 銷帳_dgv.Rows(i).Cells("需存檔").Value = False
                     End If
                 Next : TENDEN_MES_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0 : MsgBox("整體存檔完成")
             End If
         Else
             If 流水號_tb.Text = "" Then : MsgBox("沒有選擇要存檔的資料!!") : Else : PA3 = 流水號_tb.Text
-                PA70 = 銷帳_dgv.Rows(目前選擇項).Cells("出貨數量").Value.ToString : PA69 = 銷帳_dgv.Rows(目前選擇項).Cells("FTY_PRICE").Value.ToString
-                PA68 = 銷帳_dgv.Rows(目前選擇項).Cells("扣關稅or後廠價").Value.ToString : PA67 = 銷帳_dgv.Rows(目前選擇項).Cells("CUST_Price").Value.ToString
+                PA70 = 銷帳_dgv.Rows(目前選擇項).Cells("出貨數量").Value.ToString : PA69 = 銷帳_dgv.Rows(目前選擇項).Cells("FTY Price 實際廠價").Value.ToString
+                PA68 = 銷帳_dgv.Rows(目前選擇項).Cells("扣關稅or後廠價").Value.ToString : PA67 = 銷帳_dgv.Rows(目前選擇項).Cells("Tendenza Price").Value.ToString
                 PA66 = 銷帳_dgv.Rows(目前選擇項).Cells("EX_FTY_DATE").Value.ToString : PA65 = 銷帳_dgv.Rows(目前選擇項).Cells("Maturity_Date").Value.ToString
                 PA64 = 銷帳_dgv.Rows(目前選擇項).Cells("FTY_Payment_Date").Value.ToString : PA63 = 銷帳_dgv.Rows(目前選擇項).Cells("Remark").Value.ToString
+                PA62 = 銷帳_dgv.Rows(目前選擇項).Cells("Selling Price").Value.ToString
                 銷帳_dgv.Rows(目前選擇項).Cells("需存檔").Value = False : SQL_銷帳清單_存檔1() : MsgBox("單筆存檔完成")
             End If
         End If

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

@@ -58,6 +58,8 @@ Partial Class 出貨銷帳明細表
         Me.流水號_tb = New System.Windows.Forms.TextBox()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.視窗2_pl = New System.Windows.Forms.Panel()
+        Me.差異_下1_bt = New System.Windows.Forms.Button()
+        Me.差異_上1_bt = New System.Windows.Forms.Button()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.控制表1_dgv = New System.Windows.Forms.DataGridView()
         Me.控制表_dgv = New System.Windows.Forms.DataGridView()
@@ -84,6 +86,10 @@ Partial Class 出貨銷帳明細表
         Me.比對關鍵字_bt = New System.Windows.Forms.Button()
         Me.銷帳1_dgv = New System.Windows.Forms.DataGridView()
         Me.模糊比對_ch = New System.Windows.Forms.CheckBox()
+        Me.篩選2_ch = New System.Windows.Forms.CheckBox()
+        Me.篩選3_ch = New System.Windows.Forms.CheckBox()
+        Me.篩選4_ch = New System.Windows.Forms.CheckBox()
+        Me.篩選1_ch = New System.Windows.Forms.CheckBox()
         CType(Me.利潤表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.銷帳_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -145,7 +151,7 @@ Partial Class 出貨銷帳明細表
         '
         Me.Label20.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(1240, 10)
+        Me.Label20.Location = New System.Drawing.Point(1240, 19)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(88, 16)
         Me.Label20.TabIndex = 563
@@ -213,7 +219,7 @@ Partial Class 出貨銷帳明細表
         Me.品牌標註_lb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.品牌標註_lb.AutoSize = True
         Me.品牌標註_lb.ForeColor = System.Drawing.Color.Red
-        Me.品牌標註_lb.Location = New System.Drawing.Point(1328, 10)
+        Me.品牌標註_lb.Location = New System.Drawing.Point(1328, 19)
         Me.品牌標註_lb.Name = "品牌標註_lb"
         Me.品牌標註_lb.Size = New System.Drawing.Size(57, 16)
         Me.品牌標註_lb.TabIndex = 570
@@ -261,7 +267,7 @@ Partial Class 出貨銷帳明細表
         Me.INV排序_cb.AutoSize = True
         Me.INV排序_cb.Checked = True
         Me.INV排序_cb.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.INV排序_cb.Location = New System.Drawing.Point(744, 8)
+        Me.INV排序_cb.Location = New System.Drawing.Point(822, 0)
         Me.INV排序_cb.Name = "INV排序_cb"
         Me.INV排序_cb.Size = New System.Drawing.Size(71, 20)
         Me.INV排序_cb.TabIndex = 1376
@@ -272,7 +278,7 @@ Partial Class 出貨銷帳明細表
         '
         Me.PO排序_cb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.PO排序_cb.AutoSize = True
-        Me.PO排序_cb.Location = New System.Drawing.Point(822, 8)
+        Me.PO排序_cb.Location = New System.Drawing.Point(822, 17)
         Me.PO排序_cb.Name = "PO排序_cb"
         Me.PO排序_cb.Size = New System.Drawing.Size(67, 20)
         Me.PO排序_cb.TabIndex = 1377
@@ -313,6 +319,8 @@ Partial Class 出貨銷帳明細表
         '
         Me.視窗2_pl.BackColor = System.Drawing.Color.LightCyan
         Me.視窗2_pl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.視窗2_pl.Controls.Add(Me.差異_下1_bt)
+        Me.視窗2_pl.Controls.Add(Me.差異_上1_bt)
         Me.視窗2_pl.Controls.Add(Me.Panel3)
         Me.視窗2_pl.Controls.Add(Me.隱藏_bt)
         Me.視窗2_pl.Controls.Add(Me.新增資料_bt)
@@ -323,6 +331,32 @@ Partial Class 出貨銷帳明細表
         Me.視窗2_pl.Size = New System.Drawing.Size(1545, 408)
         Me.視窗2_pl.TabIndex = 1403
         '
+        '差異_下1_bt
+        '
+        Me.差異_下1_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.差異_下1_bt.BackgroundImage = Global.天盾國際管理系統.My.Resources.Resources.arrow_down
+        Me.差異_下1_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        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.Blue
+        Me.差異_下1_bt.Location = New System.Drawing.Point(375, 2)
+        Me.差異_下1_bt.Name = "差異_下1_bt"
+        Me.差異_下1_bt.Size = New System.Drawing.Size(25, 25)
+        Me.差異_下1_bt.TabIndex = 1382
+        Me.差異_下1_bt.UseVisualStyleBackColor = True
+        '
+        '差異_上1_bt
+        '
+        Me.差異_上1_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.差異_上1_bt.BackgroundImage = Global.天盾國際管理系統.My.Resources.Resources.arrow_up
+        Me.差異_上1_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        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.Blue
+        Me.差異_上1_bt.Location = New System.Drawing.Point(340, 2)
+        Me.差異_上1_bt.Name = "差異_上1_bt"
+        Me.差異_上1_bt.Size = New System.Drawing.Size(25, 25)
+        Me.差異_上1_bt.TabIndex = 1381
+        Me.差異_上1_bt.UseVisualStyleBackColor = True
+        '
         'Panel3
         '
         Me.Panel3.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -685,19 +719,64 @@ Partial Class 出貨銷帳明細表
         '
         '模糊比對_ch
         '
+        Me.模糊比對_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.模糊比對_ch.AutoSize = True
-        Me.模糊比對_ch.Location = New System.Drawing.Point(520, 8)
+        Me.模糊比對_ch.Location = New System.Drawing.Point(1245, 0)
         Me.模糊比對_ch.Name = "模糊比對_ch"
-        Me.模糊比對_ch.Size = New System.Drawing.Size(98, 20)
+        Me.模糊比對_ch.Size = New System.Drawing.Size(128, 20)
         Me.模糊比對_ch.TabIndex = 1848
-        Me.模糊比對_ch.Text = "開啟模糊比對"
+        Me.模糊比對_ch.Text = "開  啟  模  糊  比  對"
         Me.模糊比對_ch.UseVisualStyleBackColor = True
         '
+        '篩選2_ch
+        '
+        Me.篩選2_ch.AutoSize = True
+        Me.篩選2_ch.Location = New System.Drawing.Point(529, 17)
+        Me.篩選2_ch.Name = "篩選2_ch"
+        Me.篩選2_ch.Size = New System.Drawing.Size(42, 20)
+        Me.篩選2_ch.TabIndex = 1849
+        Me.篩選2_ch.Text = "HP"
+        Me.篩選2_ch.UseVisualStyleBackColor = True
+        '
+        '篩選3_ch
+        '
+        Me.篩選3_ch.AutoSize = True
+        Me.篩選3_ch.Location = New System.Drawing.Point(579, -1)
+        Me.篩選3_ch.Name = "篩選3_ch"
+        Me.篩選3_ch.Size = New System.Drawing.Size(68, 20)
+        Me.篩選3_ch.TabIndex = 1850
+        Me.篩選3_ch.Text = "VIONIC"
+        Me.篩選3_ch.UseVisualStyleBackColor = True
+        '
+        '篩選4_ch
+        '
+        Me.篩選4_ch.AutoSize = True
+        Me.篩選4_ch.Location = New System.Drawing.Point(579, 17)
+        Me.篩選4_ch.Name = "篩選4_ch"
+        Me.篩選4_ch.Size = New System.Drawing.Size(73, 20)
+        Me.篩選4_ch.TabIndex = 1851
+        Me.篩選4_ch.Text = "DRS/ LIF"
+        Me.篩選4_ch.UseVisualStyleBackColor = True
+        '
+        '篩選1_ch
+        '
+        Me.篩選1_ch.AutoSize = True
+        Me.篩選1_ch.Checked = True
+        Me.篩選1_ch.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.篩選1_ch.Location = New System.Drawing.Point(529, 0)
+        Me.篩選1_ch.Name = "篩選1_ch"
+        Me.篩選1_ch.Size = New System.Drawing.Size(46, 20)
+        Me.篩選1_ch.TabIndex = 1852
+        Me.篩選1_ch.Text = "ALL"
+        Me.篩選1_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(1593, 679)
+        Me.Controls.Add(Me.篩選1_ch)
+        Me.Controls.Add(Me.篩選3_ch)
         Me.Controls.Add(Me.模糊比對_ch)
         Me.Controls.Add(Me.導入_bt)
         Me.Controls.Add(Me.楦型_tb)
@@ -719,7 +798,6 @@ Partial Class 出貨銷帳明細表
         Me.Controls.Add(Me.差異_下_bt)
         Me.Controls.Add(Me.差異_上_bt)
         Me.Controls.Add(Me.PO號1_tb)
-        Me.Controls.Add(Me.PO排序_cb)
         Me.Controls.Add(Me.INV排序_cb)
         Me.Controls.Add(Me.比對關鍵字_bt)
         Me.Controls.Add(Me.年份_cb)
@@ -733,6 +811,9 @@ Partial Class 出貨銷帳明細表
         Me.Controls.Add(Me.利潤表_dgv)
         Me.Controls.Add(Me.銷帳_dgv)
         Me.Controls.Add(Me.銷帳1_dgv)
+        Me.Controls.Add(Me.PO排序_cb)
+        Me.Controls.Add(Me.篩選2_ch)
+        Me.Controls.Add(Me.篩選4_ch)
         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(4)
         Me.Name = "出貨銷帳明細表"
@@ -801,4 +882,10 @@ Partial Class 出貨銷帳明細表
     Friend WithEvents 導入_bt As Button
     Friend WithEvents 銷帳1_dgv As DataGridView
     Friend WithEvents 模糊比對_ch As CheckBox
+    Friend WithEvents 差異_下1_bt As Button
+    Friend WithEvents 差異_上1_bt As Button
+    Friend WithEvents 篩選2_ch As CheckBox
+    Friend WithEvents 篩選3_ch As CheckBox
+    Friend WithEvents 篩選4_ch As CheckBox
+    Friend WithEvents 篩選1_ch As CheckBox
 End Class

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

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class 列印_訂單價格利潤表
     Inherits System.Windows.Forms.Form
 
     'Form 覆寫 Dispose 以清除元件清單。
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -15,19 +15,17 @@ Partial Class 列印_訂單價格利潤表
     End Sub
 
     '為 Windows Form 設計工具的必要項
-    Private  components As System.ComponentModel.IContainer
+    Private components As System.ComponentModel.IContainer
 
     '注意: 以下為 Windows Form 設計工具所需的程序
     '可以使用 Windows Form 設計工具進行修改。
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
-    Private  Sub InitializeComponent()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+    Private Sub InitializeComponent()
+        Dim DataGridViewCellStyle1 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()
         '
@@ -35,7 +33,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, 36)
+        Me.取消列印_bt.Location = New System.Drawing.Point(128, 3)
         Me.取消列印_bt.Name = "取消列印_bt"
         Me.取消列印_bt.Size = New System.Drawing.Size(110, 54)
         Me.取消列印_bt.TabIndex = 314
@@ -46,7 +44,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, 36)
+        Me.確認列印_bt.Location = New System.Drawing.Point(12, 3)
         Me.確認列印_bt.Name = "確認列印_bt"
         Me.確認列印_bt.Size = New System.Drawing.Size(110, 54)
         Me.確認列印_bt.TabIndex = 313
@@ -55,8 +53,8 @@ Partial Class 列印_訂單價格利潤表
         '
         '利潤表_dgv
         '
-        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
+        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.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.利潤表_dgv.Location = New System.Drawing.Point(12, 114)
         Me.利潤表_dgv.Name = "利潤表_dgv"
@@ -65,35 +63,11 @@ Partial Class 列印_訂單價格利潤表
         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, 95)
-        Me.Controls.Add(Me.CB_2)
-        Me.Controls.Add(Me.CB_1)
+        Me.ClientSize = New System.Drawing.Size(250, 61)
         Me.Controls.Add(Me.取消列印_bt)
         Me.Controls.Add(Me.確認列印_bt)
         Me.Controls.Add(Me.利潤表_dgv)
@@ -106,14 +80,11 @@ Partial Class 列印_訂單價格利潤表
         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

@@ -17,7 +17,7 @@ Public Class 列印_訂單價格利潤表
         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()
     End Sub
     Private Sub Set_訂單清單()
         Set_DGV1載入前設定() : SQL_訂單價格利潤表() : Set_DGV1載入後設定()
@@ -35,64 +35,41 @@ Public Class 列印_訂單價格利潤表
         Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
 
         xlApp = CType(CreateObject("Excel.Application"), Microsoft.Office.Interop.Excel.Application)
-        xlBook = xlApp.Workbooks.Add
-        xlApp.DisplayAlerts = True
-        xlBook.Activate()
-        xlSheet = NewMethod(xlBook)
-        xlSheet.Activate()
-        xlApp.Visible = True
-        xlApp.Application.WindowState = xlMaximized
+        xlBook = xlApp.Workbooks.Add : xlApp.DisplayAlerts = True : xlBook.Activate() : xlSheet = NewMethod(xlBook)
+        xlSheet.Activate() : xlApp.Visible = True : xlApp.Application.WindowState = xlMaximized
 
-        xlSheet.Cells(3, 1) = "Tendenza Po#"
-        xlSheet.Cells(3, 2) = "Season"
-        xlSheet.Cells(3, 3) = "Po#"
-        xlSheet.Cells(3, 4) = "Style"
-        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, 1) = "Tendenza Po#" : xlSheet.Cells(3, 2) = "Season" : xlSheet.Cells(3, 3) = "Po#" : xlSheet.Cells(3, 4) = "Style"
+        xlSheet.Cells(3, 5) = "Style #" : xlSheet.Cells(3, 6) = "CLR" : xlSheet.Cells(3, 7) = "FTY DATE" : xlSheet.Cells(3, 8) = "DM"
+        xlSheet.Cells(3, 9) = "PRS" : xlSheet.Cells(3, 10) = "X/F Date"
+        '
+        xlSheet.Cells(3, 11) = "Amount" : xlSheet.Cells(3, 12) = "Remark"
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : xlSheet.Cells(3, 13) = "HTS#" : Else : xlSheet.Cells(3, 13) = "ProductID" : End If
+        xlSheet.Cells(3, 14) = "Factory" : xlSheet.Cells(3, 15) = "DIV"
 
-        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"
+        xlSheet.Cells(3, 16) = "FTY Price 實際廠價" : xlSheet.Cells(3, 17) = "" : xlSheet.Cells(3, 18) = "%"
+
+        xlSheet.Cells(3, 19) = "FTYPrice (D廠價)" : xlSheet.Cells(3, 20) = "TendenzaPrice" : xlSheet.Cells(3, 21) = "Comm-TTL"
+        xlSheet.Cells(3, 22) = "Comm-Darren" : xlSheet.Cells(3, 23) = "Comm-Tendenza" : xlSheet.Cells(3, 24) = "%"
+
+        xlSheet.Cells(3, 25) = "Selling Price" : xlSheet.Cells(3, 26) = "Comm-TTL" : xlSheet.Cells(3, 27) = "%"
+
+        xlSheet.Cells(3, 28) = "Basic Price(+)" : xlSheet.Cells(3, 29) = "PG/MOQ (+)" : xlSheet.Cells(3, 30) = "Foot form/ PET form(+)"
+        xlSheet.Cells(3, 31) = "Tooling (+)" : xlSheet.Cells(3, 32) = "Rubber Band(+)" : xlSheet.Cells(3, 33) = "J.HOOK (+)"
+        xlSheet.Cells(3, 34) = "Water Resistant(+)" : xlSheet.Cells(3, 35) = "16% VAT(+)" : xlSheet.Cells(3, 36) = "EXW Saving(-)"
+        xlSheet.Cells(3, 37) = "TTL Collected Toolng" : xlSheet.Cells(3, 38) = "Exchange"
+
+        xlSheet.Cells(1, 8) = "Total-PRS" : xlSheet.Cells(1, 10) = "Total-Amount" : xlSheet.Cells(1, 17) = ""
+        xlSheet.Cells(1, 21) = "Total-Comm (D+T)" : xlSheet.Cells(1, 23) = "Total-Comm/2" : xlSheet.Cells(1, 26) = "Total-Comm (Me Too)"
+        xlSheet.Cells(1, 37) = "Total-TTL Collected Toolng"
+
+        xlSheet.Cells(2, 8) = "=SUBTOTAL(9,I4:I$99999)" : xlSheet.Cells(2, 10) = "=SUBTOTAL(9,K4:K$99999)"
+        xlSheet.Cells(2, 17) = "" : xlSheet.Cells(2, 21) = "=SUBTOTAL(9,U4:U$99999)"
+        xlSheet.Cells(2, 23) = "=SUBTOTAL(9,W4:W$99999)" : xlSheet.Cells(2, 26) = "=SUBTOTAL(9,Z4:Z$99999)"
+        xlSheet.Cells(2, 37) = "=SUBTOTAL(9,AK4:AK$99999)"
+
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : xlSheet.Cells(3, 41) = "DSW Po#" : Else : xlSheet.Cells(3, 41) = "Vionic Po#" : End If
+        xlSheet.Cells(3, 39) = "ItemNumber" : xlSheet.Cells(3, 40) = "審核"
+        xlSheet.Cells(3, 42) = "Ship Mode" : xlSheet.Cells(3, 43) = "Company code" : xlSheet.Cells(3, 44) = "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
@@ -101,57 +78,54 @@ Public Class 列印_訂單價格利潤表
             xlSheet.Cells(i + 4, 4) = 利潤表_dgv.Rows(i).Cells("形體號").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) = 利潤表_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, 12) = 利潤表_dgv.Rows(i).Cells("備註").Value
+            xlSheet.Cells(i + 4, 13) = 利潤表_dgv.Rows(i).Cells("ProductID").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, 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, 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, 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
-        Next i
-        BB(xlApp, xlSheet)
-        xlSheet.PageSetup.PrintArea = ""
-        xlApp.Cells.Select()
-        xlSheet.Range("B1").Select()
-        xlApp.Application.WindowState = xlMinimized
-        MsgBox("列印完成")
-        列印用SQL = "" : Me.Close()
+
+            xlSheet.Cells(i + 4, 28) = 利潤表_dgv.Rows(i).Cells("BasicPrice").Value
+            xlSheet.Cells(i + 4, 29) = 利潤表_dgv.Rows(i).Cells("Polybag").Value
+            xlSheet.Cells(i + 4, 30) = 利潤表_dgv.Rows(i).Cells("FOOTorPET").Value
+            xlSheet.Cells(i + 4, 31) = 利潤表_dgv.Rows(i).Cells("Tooling").Value
+            xlSheet.Cells(i + 4, 32) = 利潤表_dgv.Rows(i).Cells("RubberBand").Value
+            xlSheet.Cells(i + 4, 33) = 利潤表_dgv.Rows(i).Cells("JHOOK").Value
+            xlSheet.Cells(i + 4, 34) = 利潤表_dgv.Rows(i).Cells("WaterResistant").Value
+            xlSheet.Cells(i + 4, 35) = 利潤表_dgv.Rows(i).Cells("P16VAT").Value
+            xlSheet.Cells(i + 4, 36) = 利潤表_dgv.Rows(i).Cells("EXWsaving").Value
+
+            xlSheet.Cells(i + 4, 38) = 利潤表_dgv.Rows(i).Cells("Exchange").Value
+            xlSheet.Cells(i + 4, 39) = 利潤表_dgv.Rows(i).Cells("ItemNumber").Value
+            xlSheet.Cells(i + 4, 40) = 利潤表_dgv.Rows(i).Cells("審核").Value
+            xlSheet.Cells(i + 4, 41) = 利潤表_dgv.Rows(i).Cells("客戶訂單號").Value
+            xlSheet.Cells(i + 4, 42) = 利潤表_dgv.Rows(i).Cells("SalesOrder").Value
+            xlSheet.Cells(i + 4, 43) = 利潤表_dgv.Rows(i).Cells("CustomerName").Value
+            xlSheet.Cells(i + 4, 44) = 利潤表_dgv.Rows(i).Cells("最終運送").Value
+
+            xlSheet.Cells(i + 4, 16) = 利潤表_dgv.Rows(i).Cells("FTY_1").Value
+            xlSheet.Cells(i + 4, 19) = 利潤表_dgv.Rows(i).Cells("FTY_2").Value
+            xlSheet.Cells(i + 4, 25) = 利潤表_dgv.Rows(i).Cells("FTY_3").Value
+
+            xlSheet.Cells(i + 4, 11) = "=I" & i + 4 & "*T" & i + 4
+            xlSheet.Cells(i + 4, 37) = "=AE" & i + 4 & "*I" & i + 4
+            xlSheet.Cells(i + 4, 17) = ""  '"=(I" & i + 4 & "*S" & i + 4 & ")-(I" & i + 4 & "*P" & i + 4 & ")"
+            xlSheet.Cells(i + 4, 18) = "=IF(AB" & i + 4 & "=0,0,(AB" & i + 4 & "*I" & i + 4 & "-I" & i + 4 & "*P" & i + 4 & ")/(AB" & i + 4 & "*I" & i + 4 & "))"
+            xlSheet.Cells(i + 4, 20) = "=AB" & i + 4 & "+AC" & i + 4 & "+AD" & i + 4 & "+AE" & i + 4 & "+AF" & i + 4 & "+AG" & i + 4 & "+AH" & i + 4 & "+AI" & i + 4 & "/AL" & i + 4 & "-AJ" & i + 4
+            xlSheet.Cells(i + 4, 21) = "=K" & i + 4 & "-(I" & i + 4 & "*S" & i + 4 & ")"
+            xlSheet.Cells(i + 4, 22) = "=U" & i + 4 & "/2"
+            xlSheet.Cells(i + 4, 23) = "=U" & i + 4 & "/2"
+            xlSheet.Cells(i + 4, 24) = "=IF(K" & i + 4 & "=0,0,(K" & i + 4 & "-I" & i + 4 & "*S" & i + 4 & ")/K" & i + 4 & ")"
+            xlSheet.Cells(i + 4, 26) = "=(I" & i + 4 & "*Y" & i + 4 & ")-K" & i + 4 & ""
+            xlSheet.Cells(i + 4, 27) = "=IF(Y" & i + 4 & "=0,0,(Y" & i + 4 & "*I" & i + 4 & "-K" & i + 4 & ")/(Y" & i + 4 & "*I" & i + 4 & "))"
+            With xlApp.Selection : .Font.Bold = True : End With
+        Next i : BB(xlApp, xlSheet)
+        xlSheet.PageSetup.PrintArea = "" : xlApp.Cells.Select() : xlSheet.Range("B1").Select()
+        xlApp.Application.WindowState = xlMinimized : MsgBox("列印完成") : Me.Close()
     End Sub
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 取消列印_bt.Click
         列印用SQL = "" : 財務列印(0) = False : 財務列印(1) = False : Me.Close()
@@ -161,130 +135,124 @@ Public Class 列印_訂單價格利潤表
     End Function
     Private Sub AA(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
         xlSheet.Columns("C:C").Select : myExcel.Selection.NumberFormatLocal = "@"
+        xlSheet.Columns("AO:AO").Select : myExcel.Selection.NumberFormatLocal = "@"
     End Sub
     Private Sub BB(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
         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:F").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("G:G").Select : myExcel.Selection.ColumnWidth = 13
-
-        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()
-        With myExcel.Selection.Font
-            .Name = "微軟正黑體" : .Size = 9 : .Strikethrough = False : .Superscript = False : .Subscript = False : .OutlineFont = False : .Shadow = False
-            .Underline = xlUnderlineStyleNone : .ThemeColor = xlThemeColorLight1 : .TintAndShade = 0 : .ThemeFont = xlThemeFontNone
-        End With
+        With myExcel.Selection.Font : .Name = "微軟正黑體" : .Size = 9 : .Strikethrough = False : .Superscript = False : .Subscript = False : .OutlineFont = False : .Shadow = False
+            .Underline = xlUnderlineStyleNone : .ThemeColor = xlThemeColorLight1 : .TintAndShade = 0 : .ThemeFont = xlThemeFontNone : End With
 
-        xlSheet.Rows("1:1").Select
-        With myExcel.Selection
-            .HorizontalAlignment = xlGeneral : .VerticalAlignment = xlCenter : .WrapText = True : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
-        End With
+        xlSheet.Rows("3:3").Select : myExcel.Selection.AutoFilter
+        xlSheet.Range("G4").Select() : myExcel.ActiveWindow.FreezePanes = True
 
         xlSheet.Rows("3:3").Select
-        With myExcel.Selection
-            .HorizontalAlignment = xlGeneral : .VerticalAlignment = xlCenter : .WrapText = True : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
-        End With
-        With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = True : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
-        End With
-
+        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = True : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
         xlSheet.Rows("1:1").Select
-        With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = True : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
-        End With
-        xlSheet.Columns("A:A").Select
-        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("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("I6").Select()
+        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = True : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
+        xlSheet.Columns("A:A").Select : myExcel.Selection.ColumnWidth = 9 : 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:F").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("G:G").Select : myExcel.Selection.ColumnWidth = 10
+        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 = 8 : xlSheet.Columns("O:O").Select : myExcel.Selection.ColumnWidth = 8
+        xlSheet.Columns("P:P").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("T:T").Select : myExcel.Selection.ColumnWidth = 6
+        xlSheet.Columns("AN:AN").Select : myExcel.Selection.ColumnWidth = 5 : xlSheet.Columns("AM:AM").Select : myExcel.Selection.ColumnWidth = 10
+        xlSheet.Columns("AO:AO").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("AP:AP").Select : myExcel.Selection.ColumnWidth = 14
+        xlSheet.Columns("AQ:AQ").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("AR:AR").Select : myExcel.Selection.ColumnWidth = 75
+        xlSheet.Columns("D:D").Select : xlSheet.Columns("D:D").EntireColumn.AutoFit : xlSheet.Columns("E:E").Select : xlSheet.Columns("E:E").EntireColumn.AutoFit
+        xlSheet.Columns("F:F").Select : xlSheet.Columns("F:F").EntireColumn.AutoFit : xlSheet.Columns("K:K").Select : xlSheet.Columns("K:K").EntireColumn.AutoFit
+        xlSheet.Columns("L:L").Select : xlSheet.Columns("L:L").EntireColumn.AutoFit : xlSheet.Columns("M:M").Select : xlSheet.Columns("M:M").EntireColumn.AutoFit
+        myExcel.Selection.NumberFormatLocal = "@"
+        xlSheet.Columns("I:I").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ "
+
+        xlSheet.Columns("N:N").Select
+        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
 
-        xlSheet.Range("A1:F2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Columns("R:R").Select : myExcel.Selection.Style = "Percent" : myExcel.Selection.NumberFormatLocal = "0.00%" : myExcel.Selection.ColumnWidth = 6
+        xlSheet.Columns("X:X").Select : myExcel.Selection.Style = "Percent" : myExcel.Selection.NumberFormatLocal = "0.00%" : myExcel.Selection.ColumnWidth = 6
+        xlSheet.Columns("AA:AA").Select : myExcel.Selection.Style = "Percent" : myExcel.Selection.NumberFormatLocal = "0.00%" : myExcel.Selection.ColumnWidth = 6
+        xlSheet.Columns("AB:AK").Select : myExcel.Selection.Style = "Comma" : xlSheet.Columns("Y:Z").Select : myExcel.Selection.Style = "Comma"
+        xlSheet.Columns("S:W").Select : myExcel.Selection.Style = "Comma" : xlSheet.Columns("P:Q").Select : myExcel.Selection.Style = "Comma"
+        xlSheet.Columns("K:K").Select : myExcel.Selection.Style = "Comma"
+
+        xlSheet.Columns("AO:AO").Select : myExcel.Selection.Cut
+        xlSheet.Columns("D:D").Select : myExcel.Selection.Insert(Shift:=xlRight)
+        xlSheet.Columns("R:R").Select : myExcel.Selection.EntireColumn.Hidden = True
+        xlSheet.Range("A1:H2").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("H1:I1").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("I1:J1").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("H2:I2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("I2:J2").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("J1:K2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("K1:L1").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("M1:O2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("K2:L2").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("P1:Q1").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("M1:U2").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("P2:Q2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("V1:W1").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("S1:T1").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("V2:W2").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("S2:T2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("X1:Y1").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("U1:AB2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("X2:Y2").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("AC1:AD1").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("AA1:AB1").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("AC2:AD2").Select() : With myExcel.Selection
-            .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
+        xlSheet.Range("AA2: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("Z1:Z2").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("AC1:AK2").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("AM1:AR2").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:O3").Select() : With myExcel.Selection.Interior
-            .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorDark2 : .TintAndShade = -0.0999786370433668 : .PatternTintAndShade = 0 : End With
-        xlSheet.Range("O1:T3").Select() : With myExcel.Selection.Interior
-            .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535 : .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
-        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:AK3").Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
+        xlSheet.Range("A3:P3").Select()
+        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorDark2
+            .TintAndShade = -0.0999786370433668 : .PatternTintAndShade = 0 : End With
+        xlSheet.Range("Q3:S3").Select()
+        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535 : .TintAndShade = 0
+            .PatternTintAndShade = 0 : End With
+        xlSheet.Range("T3:Y3").Select()
+        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 5296274 : .TintAndShade = 0
+            .PatternTintAndShade = 0 : End With
+        xlSheet.Range("Z3:AB3").Select()
+        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorAccent1
+            .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
+        xlSheet.Range("AC3:AL3").Select()
+        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorAccent5
+            .TintAndShade = 0.799981688894314 : .PatternTintAndShade = 0 : End With
+        xlSheet.Range("A1:AR3").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
         With myExcel.Selection.Borders(xlEdgeRight) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlInsideVertical) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-
-        xlSheet.Rows("3:3").Select : myExcel.Selection.AutoFilter
-
         Dim M As Integer = 4
-        For M = 4 To 利潤表_dgv.Rows.Count + 2
-            M += 1
-        Next M
-        位置1 = "A4:AK" & M
+        For M = 4 To 利潤表_dgv.Rows.Count + 2 : M += 1 : Next M : 位置1 = "A4:AR" & 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
@@ -292,22 +260,6 @@ Public Class 列印_訂單價格利潤表
         With myExcel.Selection.Borders(xlEdgeRight) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         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("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("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
+        xlSheet.Range("A3").Select() : myExcel.ActiveWindow.DisplayGridlines = False
     End Sub
 End Class

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

@@ -23,12 +23,12 @@ Partial Class 訂單價格利潤明細表
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        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()
+        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()
         Me.利潤表_dgv = New System.Windows.Forms.DataGridView()
         Me.利潤拆分_bt = New System.Windows.Forms.Button()
         Me.成本組成_bt = New System.Windows.Forms.Button()
@@ -100,12 +100,10 @@ Partial Class 訂單價格利潤明細表
         Me.列印_bt = New System.Windows.Forms.Button()
         Me.錨點1 = New System.Windows.Forms.TextBox()
         Me.空間2 = New System.Windows.Forms.Panel()
-        Me.FTY1_ch = New System.Windows.Forms.CheckBox()
-        Me.FTY2_ch = New System.Windows.Forms.CheckBox()
+        Me.PID_cb = New System.Windows.Forms.CheckBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.利潤表1_dgv = New System.Windows.Forms.DataGridView()
         Me.空間1 = New System.Windows.Forms.Panel()
-        Me.PID_cb = New System.Windows.Forms.CheckBox()
         CType(Me.利潤表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單流水號_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox1.SuspendLayout()
@@ -124,19 +122,19 @@ Partial Class 訂單價格利潤明細表
             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
-        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.利潤表_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.利潤表_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.利潤表_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.利潤表_dgv.Location = New System.Drawing.Point(3, 130)
         Me.利潤表_dgv.Name = "利潤表_dgv"
         Me.利潤表_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.利潤表_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.利潤表_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
         Me.利潤表_dgv.RowTemplate.Height = 24
         Me.利潤表_dgv.Size = New System.Drawing.Size(1792, 831)
         Me.利潤表_dgv.TabIndex = 2
@@ -163,19 +161,19 @@ Partial Class 訂單價格利潤明細表
         '
         '訂單流水號_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.訂單流水號_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        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), System.Windows.Forms.AnchorStyles)
         Me.訂單流水號_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.訂單流水號_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
-        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
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.訂單流水號_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.訂單流水號_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.訂單流水號_dgv.Location = New System.Drawing.Point(2, 1)
         Me.訂單流水號_dgv.Name = "訂單流水號_dgv"
@@ -625,10 +623,10 @@ Partial Class 訂單價格利潤明細表
         '
         'ProgressBar1
         '
-        Me.ProgressBar1.Location = New System.Drawing.Point(714, 105)
+        Me.ProgressBar1.Location = New System.Drawing.Point(827, 105)
         Me.ProgressBar1.Maximum = 10000
         Me.ProgressBar1.Name = "ProgressBar1"
-        Me.ProgressBar1.Size = New System.Drawing.Size(365, 20)
+        Me.ProgressBar1.Size = New System.Drawing.Size(238, 20)
         Me.ProgressBar1.TabIndex = 489
         '
         'GroupBox1
@@ -725,7 +723,7 @@ Partial Class 訂單價格利潤明細表
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(653, 107)
+        Me.Label19.Location = New System.Drawing.Point(766, 107)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(55, 16)
         Me.Label19.TabIndex = 563
@@ -835,8 +833,6 @@ Partial Class 訂單價格利潤明細表
         Me.空間2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.空間2.Controls.Add(Me.PID_cb)
         Me.空間2.Controls.Add(Me.Label19)
-        Me.空間2.Controls.Add(Me.FTY1_ch)
-        Me.空間2.Controls.Add(Me.FTY2_ch)
         Me.空間2.Controls.Add(Me.Panel1)
         Me.空間2.Controls.Add(Me.Label9)
         Me.空間2.Controls.Add(Me.ProgressBar1)
@@ -863,27 +859,15 @@ Partial Class 訂單價格利潤明細表
         Me.空間2.Size = New System.Drawing.Size(1800, 964)
         Me.空間2.TabIndex = 494
         '
-        'FTY1_ch
-        '
-        Me.FTY1_ch.AutoSize = True
-        Me.FTY1_ch.Location = New System.Drawing.Point(420, 105)
-        Me.FTY1_ch.Name = "FTY1_ch"
-        Me.FTY1_ch.Size = New System.Drawing.Size(58, 20)
-        Me.FTY1_ch.TabIndex = 498
-        Me.FTY1_ch.Text = "FTY_1"
-        Me.FTY1_ch.UseVisualStyleBackColor = True
-        '
-        'FTY2_ch
+        'PID_cb
         '
-        Me.FTY2_ch.AutoSize = True
-        Me.FTY2_ch.Checked = True
-        Me.FTY2_ch.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.FTY2_ch.Location = New System.Drawing.Point(488, 105)
-        Me.FTY2_ch.Name = "FTY2_ch"
-        Me.FTY2_ch.Size = New System.Drawing.Size(58, 20)
-        Me.FTY2_ch.TabIndex = 497
-        Me.FTY2_ch.Text = "FTY_2"
-        Me.FTY2_ch.UseVisualStyleBackColor = True
+        Me.PID_cb.AutoSize = True
+        Me.PID_cb.Location = New System.Drawing.Point(672, 105)
+        Me.PID_cb.Name = "PID_cb"
+        Me.PID_cb.Size = New System.Drawing.Size(82, 20)
+        Me.PID_cb.TabIndex = 565
+        Me.PID_cb.Text = "ProductID"
+        Me.PID_cb.UseVisualStyleBackColor = True
         '
         'Panel1
         '
@@ -907,19 +891,19 @@ Partial Class 訂單價格利潤明細表
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.利潤表1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.利潤表1_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.利潤表1_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.利潤表1_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5
         Me.利潤表1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.利潤表1_dgv.Location = New System.Drawing.Point(3, 130)
         Me.利潤表1_dgv.Name = "利潤表1_dgv"
         Me.利潤表1_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.利潤表1_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.利潤表1_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
         Me.利潤表1_dgv.RowTemplate.Height = 24
         Me.利潤表1_dgv.Size = New System.Drawing.Size(1792, 831)
         Me.利潤表1_dgv.TabIndex = 564
@@ -936,16 +920,6 @@ Partial Class 訂單價格利潤明細表
         Me.空間1.Size = New System.Drawing.Size(108, 964)
         Me.空間1.TabIndex = 493
         '
-        'PID_cb
-        '
-        Me.PID_cb.AutoSize = True
-        Me.PID_cb.Location = New System.Drawing.Point(559, 105)
-        Me.PID_cb.Name = "PID_cb"
-        Me.PID_cb.Size = New System.Drawing.Size(82, 20)
-        Me.PID_cb.TabIndex = 565
-        Me.PID_cb.Text = "ProductID"
-        Me.PID_cb.UseVisualStyleBackColor = True
-        '
         '訂單價格利潤明細表
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
@@ -1050,8 +1024,6 @@ Partial Class 訂單價格利潤明細表
     Friend WithEvents 空間1 As Panel
     Friend WithEvents Panel1 As Panel
     Friend WithEvents 資料庫選擇3_bt As Button
-    Friend WithEvents FTY1_ch As CheckBox
-    Friend WithEvents FTY2_ch As CheckBox
     Friend WithEvents 利潤表1_dgv As DataGridView
     Friend WithEvents PID_cb As CheckBox
 End Class

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

@@ -1,27 +1,18 @@
 Option Strict Off
 Public Class 訂單價格利潤明細表
-    Dim ds, ds1, ds2 As New DataSet
     ReadOnly BB(3) As Boolean : Public 平均數 As Integer : Public 最終數 As Integer = 0 : Public 資料數 As Integer = 0
     Dim A1, A2, A3, B1, B2, B3 As Integer
-    Private Sub 利潤表載入前設定()
+    Private Sub Set_訂單清單()
+        SQL_修改訂單資料表2()
+        Dim ds, ds2 As New DataSet
         利潤表_dgv.DataSource = Nothing : ds.Clear()
         利潤表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        利潤表_dgv.ColumnHeadersHeight = 25 : 利潤表_dgv.AllowUserToAddRows = False
+        利潤表_dgv.ColumnHeadersHeight = 40 : 利潤表_dgv.AllowUserToAddRows = False
 
         利潤表1_dgv.DataSource = Nothing : ds2.Clear()
         利潤表1_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         利潤表1_dgv.ColumnHeadersHeight = 25 : 利潤表1_dgv.AllowUserToAddRows = False
         ConnOpen()
-    End Sub
-    Private Sub 利潤表載入後設定()
-        CmdSet_For_DGV() : da.Fill(ds) : 利潤表_dgv.DataSource = ds.Tables(0) : da.Fill(ds2) : 利潤表1_dgv.DataSource = ds2.Tables(0) : conn.Close()
-        For I As Integer = 0 To 利潤表_dgv.Rows.Count - 1
-            利潤表_dgv("需存檔", I).Value = False : 利潤表1_dgv("需存檔", I).Value = False
-        Next
-    End Sub
-    Private Sub Set_訂單清單()
-        SQL_修改訂單資料表2()
-        利潤表載入前設定()
         If 未建檔_cb.Checked = True Then
             Timer1.Enabled = True : 存檔_bt.Enabled = True : 刪除_bt.Enabled = False : 修改_bt.Enabled = False
             等於訂單數_bt.Enabled = True : 等於零_bt.Enabled = True : 匯率為1_bt.Enabled = True
@@ -30,7 +21,11 @@ Public Class 訂單價格利潤明細表
             Else
                 SQL_訂單價格利潤明細表3()
             End If
-            利潤表載入後設定() : Set_自動彙總1() : Set_grid() : Set_暫存資料設定()
+            CmdSet_For_DGV() : da.Fill(ds) : 利潤表_dgv.DataSource = ds.Tables(0) : da.Fill(ds2) : 利潤表1_dgv.DataSource = ds2.Tables(0) : conn.Close()
+            For I As Integer = 0 To 利潤表_dgv.Rows.Count - 1
+                利潤表_dgv("需存檔", I).Value = False : 利潤表1_dgv("需存檔", I).Value = False
+            Next
+            Set_自動彙總1() : Set_grid() : Set_暫存資料設定()
         ElseIf 未建檔_cb.Checked = False Then
             Timer1.Enabled = False : Label47.Visible = False : 存檔_bt.Enabled = False : 刪除_bt.Enabled = True : 修改_bt.Enabled = True
             等於訂單數_bt.Enabled = False : 等於零_bt.Enabled = False : 匯率為1_bt.Enabled = False
@@ -39,19 +34,34 @@ Public Class 訂單價格利潤明細表
             Else
                 PA25 = 年份_cb.Text : SQL_訂單價格利潤明細表5()
             End If
-            利潤表載入後設定()
+            CmdSet_For_DGV() : da.Fill(ds) : 利潤表_dgv.DataSource = ds.Tables(0) : da.Fill(ds2) : 利潤表1_dgv.DataSource = ds2.Tables(0) : conn.Close()
+            For I As Integer = 0 To 利潤表_dgv.Rows.Count - 1
+                利潤表_dgv("需存檔", I).Value = False : 利潤表1_dgv("需存檔", I).Value = False
+            Next
         End If
         資料筆數_tb.Text = Format(利潤表_dgv.Rows.Count, "#,##0")
     End Sub
     Private Sub Set_編輯清單()
-        利潤表載入前設定() : SQL_訂單價格利潤明細表1() : 利潤表載入後設定()
+        Dim ds, ds2 As New DataSet
+        利潤表_dgv.DataSource = Nothing : ds.Clear()
+        利潤表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        利潤表_dgv.ColumnHeadersHeight = 40 : 利潤表_dgv.AllowUserToAddRows = False
+
+        利潤表1_dgv.DataSource = Nothing : ds2.Clear()
+        利潤表1_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        利潤表1_dgv.ColumnHeadersHeight = 25 : 利潤表1_dgv.AllowUserToAddRows = False
+        ConnOpen()
+        SQL_訂單價格利潤明細表1()
+        CmdSet_For_DGV() : da.Fill(ds) : 利潤表_dgv.DataSource = ds.Tables(0) : da.Fill(ds2) : 利潤表1_dgv.DataSource = ds2.Tables(0) : conn.Close()
+        For I As Integer = 0 To 利潤表_dgv.Rows.Count - 1
+            利潤表_dgv("需存檔", I).Value = False : 利潤表1_dgv("需存檔", I).Value = False
+        Next
     End Sub
     Private Sub Set_暫存資料設定()
         SQL_刪除訂單價格利潤表暫存檔() : conn.Close()
         Dim NUM2 As Integer
         SQL_查詢利潤表流水號()
-        If dr.Read() Then : NUM2 = Strings.Right(dr("利潤表流水號").ToString, 8) : End If
-        conn.Close()
+        If dr.Read() Then : NUM2 = Strings.Right(dr("利潤表流水號").ToString, 8) : End If : conn.Close()
         For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1
             NUM2 += 1
             If NUM2 < 10 Then : 利潤表流水號 = "PR" & "0000000" & NUM2
@@ -68,6 +78,7 @@ Public Class 訂單價格利潤明細表
         Next i
     End Sub
     Private Sub Set_未建檔清單()
+        Dim ds1 As New DataSet
         訂單流水號_dgv.DataSource = Nothing : ds1.Clear()
         訂單流水號_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         訂單流水號_dgv.ColumnHeadersHeight = 25
@@ -77,16 +88,16 @@ Public Class 訂單價格利潤明細表
     End Sub
     Private Sub Set_grid()
         利潤表_dgv.Columns("訂單流水號").FillWeight = 80 : 利潤表_dgv.Columns("資料流水號").Visible = False : 利潤表_dgv.Columns("年份季度").FillWeight = 55
-        利潤表_dgv.Columns("力威訂單號").FillWeight = 100 : 利潤表_dgv.Columns("形體號").FillWeight = 90 : 利潤表_dgv.Columns("顏色").FillWeight = 70
-        利潤表_dgv.Columns("力威訂單號").FillWeight = 100 : 利潤表_dgv.Columns("楦型").FillWeight = 45 : 利潤表_dgv.Columns("數量").FillWeight = 45
-        If PID_cb.Checked = True Then : 利潤表_dgv.Columns("ProductID").Visible = True : Else : 利潤表_dgv.Columns("ProductID").Visible = False : End If
-        利潤表_dgv.Columns("ProductID").FillWeight = 120
+        利潤表_dgv.Columns("客人訂單號").FillWeight = 100 : 利潤表_dgv.Columns("形體號").FillWeight = 90 : 利潤表_dgv.Columns("顏色").FillWeight = 70
+        利潤表_dgv.Columns("楦型").FillWeight = 45 : 利潤表_dgv.Columns("數量").FillWeight = 45
+        If PID_cb.Checked = True Then : 利潤表_dgv.Columns(表頭1).Visible = True : Else : 利潤表_dgv.Columns(表頭1).Visible = False : End If
+        利潤表_dgv.Columns(表頭1).FillWeight = 120
         利潤表_dgv.Columns("單價").FillWeight = 45 : 利潤表_dgv.Columns("總金額").FillWeight = 75 : 利潤表_dgv.Columns("備註").FillWeight = 80
         利潤表_dgv.Columns("工廠").FillWeight = 40 : 利潤表_dgv.Columns("訂單種類").FillWeight = 65 : 利潤表_dgv.Columns("Quantity").FillWeight = 65
-        利潤表_dgv.Columns("Currency").FillWeight = 65 : 利潤表_dgv.Columns("Exchange").FillWeight = 70 : 利潤表_dgv.Columns("FTY_1").FillWeight = 60
-        利潤表_dgv.Columns("FTY_2").FillWeight = 60 : 利潤表_dgv.Columns("CommissionTTL").FillWeight = 130 : 利潤表_dgv.Columns("CommissionDarren").FillWeight = 150
-        利潤表_dgv.Columns("CommissionTendenza").FillWeight = 160 : 利潤表_dgv.Columns("%_1").FillWeight = 60 : 利潤表_dgv.Columns("%_2").FillWeight = 60
-        利潤表_dgv.Columns("BasicPrice").FillWeight = 70 : 利潤表_dgv.Columns("PG/MOQ").FillWeight = 60
+        利潤表_dgv.Columns("Currency").FillWeight = 65 : 利潤表_dgv.Columns("Exchange").FillWeight = 70 : 利潤表_dgv.Columns("實際廠價").FillWeight = 60
+        利潤表_dgv.Columns("天盾單價").FillWeight = 60 : 利潤表_dgv.Columns("Commission TTL").FillWeight = 80 : 利潤表_dgv.Columns("Commission Darren").FillWeight = 80
+        利潤表_dgv.Columns("Commission Tendenza").FillWeight = 80 : 利潤表_dgv.Columns("%_1").FillWeight = 60 : 利潤表_dgv.Columns("%_2").FillWeight = 60
+        利潤表_dgv.Columns("BasicPrice").FillWeight = 70 : 利潤表_dgv.Columns("PG/MOQ").FillWeight = 60 : 利潤表_dgv.Columns("客戶單價").FillWeight = 60
         利潤表_dgv.Columns("FOOTorPET").FillWeight = 78 : 利潤表_dgv.Columns("Tooling").FillWeight = 58 : 利潤表_dgv.Columns("RubberBand").FillWeight = 83
         利潤表_dgv.Columns("JHOOK").FillWeight = 58 : 利潤表_dgv.Columns("WaterResistant").FillWeight = 95 : 利潤表_dgv.Columns("P16VAT").FillWeight = 60
         利潤表_dgv.Columns("EXWsaving").FillWeight = 75 : 利潤表_dgv.Columns("CollectedToolng").FillWeight = 110 : 利潤表_dgv.Columns("需存檔").FillWeight = 30
@@ -96,11 +107,12 @@ Public Class 訂單價格利潤明細表
         利潤表_dgv.Columns("總金額").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("總金額").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("Quantity").DefaultCellStyle.Format = "#,##0" : 利潤表_dgv.Columns("Quantity").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("Exchange").DefaultCellStyle.Format = "#,##0.0000" : 利潤表_dgv.Columns("Exchange").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("FTY_1").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("FTY_1").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("FTY_2").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("FTY_2").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("CommissionTTL").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("CommissionTTL").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("CommissionDarren").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("CommissionDarren").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("CommissionTendenza").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("CommissionTendenza").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("實際廠價").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("實際廠價").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("天盾單價").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("天盾單價").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight  '客戶單價
+        利潤表_dgv.Columns("客戶單價").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("客戶單價").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("Commission TTL").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("Commission TTL").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("Commission Darren").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("Commission Darren").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("Commission Tendenza").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("Commission Tendenza").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("%_1").DefaultCellStyle.Format = "#,##0.00%" : 利潤表_dgv.Columns("%_1").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("%_2").DefaultCellStyle.Format = "#,##0.00%" : 利潤表_dgv.Columns("%_2").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("BasicPrice").DefaultCellStyle.Format = "#,##0.00" : 利潤表_dgv.Columns("BasicPrice").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -122,20 +134,21 @@ Public Class 訂單價格利潤明細表
         利潤表_dgv.Columns("Quantity").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("Currency").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("Exchange").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("FTY_1").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("FTY_2").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("CommissionTTL").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("CommissionDarren").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-        利潤表_dgv.Columns("CommissionTendenza").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("實際廠價").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("天盾單價").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("客戶單價").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("Commission TTL").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("Commission Darren").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+        利潤表_dgv.Columns("Commission Tendenza").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("%_1").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("%_2").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         利潤表_dgv.Columns("年份").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
 
         利潤表_dgv.Columns("利潤表流水號").Visible = False
         If BB(0) = True And BB(1) = False And BB(2) = False And BB(3) = False Then
-            利潤表_dgv.Columns("FTY_1").Visible = True : 利潤表_dgv.Columns("FTY_2").Visible = True : 利潤表_dgv.Columns("CommissionTTL").Visible = True
-            利潤表_dgv.Columns("CommissionDarren").Visible = True : 利潤表_dgv.Columns("CommissionTendenza").Visible = True
-            利潤表_dgv.Columns("%_1").Visible = True : 利潤表_dgv.Columns("%_2").Visible = True
+            利潤表_dgv.Columns("實際廠價").Visible = True : 利潤表_dgv.Columns("天盾單價").Visible = True : 利潤表_dgv.Columns("Commission TTL").Visible = True
+            利潤表_dgv.Columns("Commission Darren").Visible = True : 利潤表_dgv.Columns("Commission Tendenza").Visible = True
+            利潤表_dgv.Columns("%_1").Visible = True : 利潤表_dgv.Columns("%_2").Visible = True : 利潤表_dgv.Columns("客戶單價").Visible = True
 
             利潤表_dgv.Columns("BasicPrice").Visible = False : 利潤表_dgv.Columns("PG/MOQ").Visible = False : 利潤表_dgv.Columns("FOOTorPET").Visible = False
             利潤表_dgv.Columns("Tooling").Visible = False : 利潤表_dgv.Columns("RubberBand").Visible = False : 利潤表_dgv.Columns("JHOOK").Visible = False
@@ -143,9 +156,9 @@ Public Class 訂單價格利潤明細表
             利潤表_dgv.Columns("CollectedToolng").Visible = False : 利潤表_dgv.Columns("驗證").Visible = False : 利潤表_dgv.Columns("需存檔").Visible = False
             利潤表_dgv.Columns("ItemNumber").Visible = False : 利潤表_dgv.Columns("審核").Visible = False : 利潤表_dgv.Columns("客戶訂單號").Visible = False
         ElseIf BB(0) = False And BB(1) = True And BB(2) = False And BB(3) = False Then
-            利潤表_dgv.Columns("FTY_1").Visible = False : 利潤表_dgv.Columns("FTY_2").Visible = False : 利潤表_dgv.Columns("CommissionTTL").Visible = False
-            利潤表_dgv.Columns("CommissionDarren").Visible = False : 利潤表_dgv.Columns("CommissionTendenza").Visible = False
-            利潤表_dgv.Columns("%_1").Visible = False : 利潤表_dgv.Columns("%_2").Visible = False
+            利潤表_dgv.Columns("實際廠價").Visible = False : 利潤表_dgv.Columns("天盾單價").Visible = False : 利潤表_dgv.Columns("Commission TTL").Visible = False
+            利潤表_dgv.Columns("Commission Darren").Visible = False : 利潤表_dgv.Columns("Commission Tendenza").Visible = False
+            利潤表_dgv.Columns("%_1").Visible = False : 利潤表_dgv.Columns("%_2").Visible = False : 利潤表_dgv.Columns("客戶單價").Visible = False
 
             利潤表_dgv.Columns("BasicPrice").Visible = True : 利潤表_dgv.Columns("PG/MOQ").Visible = True : 利潤表_dgv.Columns("FOOTorPET").Visible = True
             利潤表_dgv.Columns("Tooling").Visible = True : 利潤表_dgv.Columns("RubberBand").Visible = True : 利潤表_dgv.Columns("JHOOK").Visible = True
@@ -153,32 +166,32 @@ Public Class 訂單價格利潤明細表
             利潤表_dgv.Columns("CollectedToolng").Visible = True : 利潤表_dgv.Columns("驗證").Visible = False : 利潤表_dgv.Columns("需存檔").Visible = False
             利潤表_dgv.Columns("ItemNumber").Visible = False : 利潤表_dgv.Columns("審核").Visible = False : 利潤表_dgv.Columns("客戶訂單號").Visible = False
         ElseIf BB(0) = False And BB(1) = False And BB(2) = True And BB(3) = False Then
-            利潤表_dgv.Columns("CollectedToolng").Visible = True : 利潤表_dgv.Columns("CommissionTTL").Visible = True
-            利潤表_dgv.Columns("CommissionDarren").Visible = True : 利潤表_dgv.Columns("CommissionTendenza").Visible = True
+            利潤表_dgv.Columns("CollectedToolng").Visible = True : 利潤表_dgv.Columns("Commission TTL").Visible = True
+            利潤表_dgv.Columns("Commission Darren").Visible = True : 利潤表_dgv.Columns("Commission Tendenza").Visible = True
             利潤表_dgv.Columns("%_1").Visible = True : 利潤表_dgv.Columns("%_2").Visible = True
 
             利潤表_dgv.Columns("BasicPrice").Visible = False : 利潤表_dgv.Columns("PG/MOQ").Visible = False : 利潤表_dgv.Columns("FOOTorPET").Visible = False
             利潤表_dgv.Columns("Tooling").Visible = False : 利潤表_dgv.Columns("RubberBand").Visible = False : 利潤表_dgv.Columns("JHOOK").Visible = False
             利潤表_dgv.Columns("WaterResistant").Visible = False : 利潤表_dgv.Columns("P16VAT").Visible = False : 利潤表_dgv.Columns("EXWsaving").Visible = False
-            利潤表_dgv.Columns("FTY_1").Visible = False : 利潤表_dgv.Columns("FTY_2").Visible = False : 利潤表_dgv.Columns("驗證").Visible = False
+            利潤表_dgv.Columns("實際廠價").Visible = False : 利潤表_dgv.Columns("天盾單價").Visible = False : 利潤表_dgv.Columns("驗證").Visible = False
             利潤表_dgv.Columns("ItemNumber").Visible = False : 利潤表_dgv.Columns("審核").Visible = False : 利潤表_dgv.Columns("客戶訂單號").Visible = False
-            利潤表_dgv.Columns("需存檔").Visible = False
+            利潤表_dgv.Columns("需存檔").Visible = False : 利潤表_dgv.Columns("客戶單價").Visible = False
         ElseIf BB(0) = False And BB(1) = False And BB(2) = False And BB(3) = True Then
-            利潤表_dgv.Columns("CollectedToolng").Visible = False : 利潤表_dgv.Columns("CommissionTTL").Visible = False
-            利潤表_dgv.Columns("CommissionDarren").Visible = False : 利潤表_dgv.Columns("CommissionTendenza").Visible = False
+            利潤表_dgv.Columns("CollectedToolng").Visible = False : 利潤表_dgv.Columns("Commission TTL").Visible = False
+            利潤表_dgv.Columns("Commission Darren").Visible = False : 利潤表_dgv.Columns("Commission Tendenza").Visible = False
             利潤表_dgv.Columns("%_1").Visible = False : 利潤表_dgv.Columns("%_2").Visible = False
 
             利潤表_dgv.Columns("BasicPrice").Visible = False : 利潤表_dgv.Columns("PG/MOQ").Visible = False : 利潤表_dgv.Columns("FOOTorPET").Visible = False
             利潤表_dgv.Columns("Tooling").Visible = False : 利潤表_dgv.Columns("RubberBand").Visible = False : 利潤表_dgv.Columns("JHOOK").Visible = False
             利潤表_dgv.Columns("WaterResistant").Visible = False : 利潤表_dgv.Columns("P16VAT").Visible = False : 利潤表_dgv.Columns("EXWsaving").Visible = False
-            利潤表_dgv.Columns("FTY_1").Visible = False : 利潤表_dgv.Columns("FTY_2").Visible = False
+            利潤表_dgv.Columns("實際廠價").Visible = False : 利潤表_dgv.Columns("天盾單價").Visible = False : 利潤表_dgv.Columns("客戶單價").Visible = False
 
             利潤表_dgv.Columns("驗證").Visible = True : 利潤表_dgv.Columns("ItemNumber").Visible = True : 利潤表_dgv.Columns("審核").Visible = True
             利潤表_dgv.Columns("客戶訂單號").Visible = True : 利潤表_dgv.Columns("需存檔").Visible = True
         End If
         利潤表_dgv.Columns("年份").FillWeight = 50 : 利潤表_dgv.Columns("驗證").FillWeight = 50 : 利潤表_dgv.Columns("審核").FillWeight = 50
-        利潤表_dgv.Columns("FTY_1").DefaultCellStyle.BackColor = Color.MistyRose
-        利潤表_dgv.Columns("Quantity").DefaultCellStyle.BackColor = Color.MistyRose : 利潤表_dgv.Columns("FTY_2").DefaultCellStyle.BackColor = Color.MistyRose
+        利潤表_dgv.Columns("實際廠價").DefaultCellStyle.BackColor = Color.MistyRose : 利潤表_dgv.Columns("客戶單價").DefaultCellStyle.BackColor = Color.MistyRose
+        利潤表_dgv.Columns("Quantity").DefaultCellStyle.BackColor = Color.MistyRose : 利潤表_dgv.Columns("天盾單價").DefaultCellStyle.BackColor = Color.MistyRose
         利潤表_dgv.Columns("BasicPrice").DefaultCellStyle.BackColor = Color.MistyRose : 利潤表_dgv.Columns("PG/MOQ").DefaultCellStyle.BackColor = Color.MistyRose
         利潤表_dgv.Columns("FOOTorPET").DefaultCellStyle.BackColor = Color.MistyRose : 利潤表_dgv.Columns("Tooling").DefaultCellStyle.BackColor = Color.MistyRose
         利潤表_dgv.Columns("RubberBand").DefaultCellStyle.BackColor = Color.MistyRose : 利潤表_dgv.Columns("JHOOK").DefaultCellStyle.BackColor = Color.MistyRose
@@ -187,10 +200,16 @@ Public Class 訂單價格利潤明細表
         利潤表_dgv.EditMode = DataGridViewEditMode.EditOnEnter
 
         利潤表_dgv.Columns("單價").DefaultCellStyle.ForeColor = Color.Red : 利潤表_dgv.Columns("總金額").DefaultCellStyle.ForeColor = Color.Red
-        利潤表_dgv.Columns("CommissionTTL").DefaultCellStyle.ForeColor = Color.Red : 利潤表_dgv.Columns("CommissionDarren").DefaultCellStyle.ForeColor = Color.Red
-        利潤表_dgv.Columns("CommissionTendenza").DefaultCellStyle.ForeColor = Color.Red : 利潤表_dgv.Columns("%_1").DefaultCellStyle.ForeColor = Color.Red
+        利潤表_dgv.Columns("Commission TTL").DefaultCellStyle.ForeColor = Color.Red : 利潤表_dgv.Columns("Commission Darren").DefaultCellStyle.ForeColor = Color.Red
+        利潤表_dgv.Columns("Commission Tendenza").DefaultCellStyle.ForeColor = Color.Red : 利潤表_dgv.Columns("%_1").DefaultCellStyle.ForeColor = Color.Red
         利潤表_dgv.Columns("%_2").DefaultCellStyle.ForeColor = Color.Red : 利潤表_dgv.Columns("年份").DefaultCellStyle.ForeColor = Color.Red
         利潤表_dgv.Columns("CollectedToolng").DefaultCellStyle.ForeColor = Color.Red
+        For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1
+            If IsDBNull(利潤表_dgv("實際廠價", i).Value) Then : 利潤表_dgv("實際廠價", i).Value = 0 : End If
+            If IsDBNull(利潤表_dgv("客戶單價", i).Value) Then : 利潤表_dgv("客戶單價", i).Value = 0 : End If
+            If IsDBNull(利潤表1_dgv("實際廠價", i).Value) Then : 利潤表1_dgv("實際廠價", i).Value = 0 : End If
+            If IsDBNull(利潤表1_dgv("客戶單價", i).Value) Then : 利潤表1_dgv("客戶單價", i).Value = 0 : End If
+        Next
     End Sub
     Private Sub Set_grid1()
         訂單流水號_dgv.Columns(0).FillWeight = 90
@@ -208,14 +227,14 @@ Public Class 訂單價格利潤明細表
             If 利潤表_dgv("P16VAT", i).Value.ToString = "" Then : EU(7) = 0 : Else : EU(7) = Double.Parse(利潤表_dgv("P16VAT", i).Value.ToString) : End If
             If 利潤表_dgv("EXWsaving", i).Value.ToString = "" Then : EU(8) = 0 : Else : EU(8) = Double.Parse(利潤表_dgv("EXWsaving", i).Value.ToString) : End If
             If 利潤表_dgv("Quantity", i).Value.ToString = "" Then : EU(9) = 0 : Else : EU(9) = Double.Parse(利潤表_dgv("Quantity", i).Value.ToString) : End If
-            If 利潤表_dgv("FTY_1", i).Value.ToString = "" Then : EU(12) = 0 : Else : EU(12) = Double.Parse(利潤表_dgv("FTY_1", i).Value.ToString) : End If
-            If 利潤表_dgv("FTY_2", i).Value.ToString = "" Then : EU(10) = 0 : Else : EU(10) = Double.Parse(利潤表_dgv("FTY_2", i).Value.ToString) : End If
+            If 利潤表_dgv("實際廠價", i).Value.ToString = "" Then : EU(12) = 0 : Else : EU(12) = Double.Parse(利潤表_dgv("實際廠價", i).Value.ToString) : End If
+            If 利潤表_dgv("天盾單價", i).Value.ToString = "" Then : EU(10) = 0 : Else : EU(10) = Double.Parse(利潤表_dgv("天盾單價", i).Value.ToString) : End If
             If 利潤表_dgv("Exchange", i).Value.ToString = "" Then : EU(11) = 1 : Else : EU(11) = Double.Parse(利潤表_dgv("Exchange", i).Value.ToString) : End If
             利潤表_dgv.Rows(i).Cells("單價").Value = EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) / EU(11) - EU(8)
             利潤表_dgv.Rows(i).Cells("CollectedToolng").Value = EU(9) * EU(3)
-            利潤表_dgv.Rows(i).Cells("CommissionTTL").Value = ((EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) / EU(11) - EU(8)) - EU(10)) * EU(9)
-            利潤表_dgv.Rows(i).Cells("CommissionDarren").Value = ((EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) / EU(11) - EU(8)) - EU(10)) * EU(9) / 2
-            利潤表_dgv.Rows(i).Cells("CommissionTendenza").Value = ((EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) / EU(11) - EU(8)) - EU(10)) * EU(9) / 2
+            利潤表_dgv.Rows(i).Cells("Commission TTL").Value = ((EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) / EU(11) - EU(8)) - EU(10)) * EU(9)
+            利潤表_dgv.Rows(i).Cells("Commission Darren").Value = ((EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) / EU(11) - EU(8)) - EU(10)) * EU(9) / 2
+            利潤表_dgv.Rows(i).Cells("Commission Tendenza").Value = ((EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) / EU(11) - EU(8)) - EU(10)) * EU(9) / 2
             If (EU(0) + EU(1) + EU(2) + EU(3) + EU(4) + EU(5) + EU(6) + EU(7) - EU(8)) = 0 Or EU(9) = 0 Then
                 利潤表_dgv.Rows(i).Cells("%_1").Value = 0
             Else
@@ -233,25 +252,25 @@ Public Class 訂單價格利潤明細表
             If 利潤表_dgv.RowCount = 0 Then
                 金額加總(1) = "0.00"
             Else
-                TextBox6.Text = 利潤表_dgv("CommissionTTL", i).Value.ToString
-                If TextBox6.Text = "" Then : 金額加總(1) += 0 : Else : 金額加總(1) += 利潤表_dgv.Rows(i).Cells("CommissionTTL").Value : End If
+                TextBox6.Text = 利潤表_dgv("Commission TTL", i).Value.ToString
+                If TextBox6.Text = "" Then : 金額加總(1) += 0 : Else : 金額加總(1) += 利潤表_dgv.Rows(i).Cells("Commission TTL").Value : End If
             End If
             If 利潤表_dgv.RowCount = 0 Then
                 金額加總(2) = "0.00"
             Else
-                TextBox7.Text = 利潤表_dgv("CommissionDarren", i).Value.ToString
-                If TextBox7.Text = "" Then : 金額加總(2) += 0 : Else : 金額加總(2) += 利潤表_dgv.Rows(i).Cells("CommissionDarren").Value : End If
+                TextBox7.Text = 利潤表_dgv("Commission Darren", i).Value.ToString
+                If TextBox7.Text = "" Then : 金額加總(2) += 0 : Else : 金額加總(2) += 利潤表_dgv.Rows(i).Cells("Commission Darren").Value : End If
             End If
             If 利潤表_dgv.RowCount = 0 Then
                 金額加總(3) = "0.00"
             Else
-                TextBox8.Text = 利潤表_dgv("CommissionTendenza", i).Value.ToString
-                If TextBox8.Text = "" Then : 金額加總(3) += 0 : Else : 金額加總(3) += 利潤表_dgv.Rows(i).Cells("CommissionTendenza").Value : End If
+                TextBox8.Text = 利潤表_dgv("Commission Tendenza", i).Value.ToString
+                If TextBox8.Text = "" Then : 金額加總(3) += 0 : Else : 金額加總(3) += 利潤表_dgv.Rows(i).Cells("Commission Tendenza").Value : End If
             End If
             If 利潤表_dgv.RowCount = 0 Then
                 金額加總(4) = "0.00"
             Else
-                TextBox10.Text = 利潤表_dgv("CommissionTendenza", i).Value.ToString
+                TextBox10.Text = 利潤表_dgv("Commission Tendenza", i).Value.ToString
                 If TextBox10.Text = "" Then : 金額加總(4) += 0 : Else : 金額加總(4) += 利潤表_dgv.Rows(i).Cells("CollectedToolng").Value : End If
             End If
             利潤表_dgv.Rows(i).Cells("年份").Value = Strings.Left(利潤表_dgv("客戶交期", i).Value.ToString, 4)
@@ -277,6 +296,7 @@ Public Class 訂單價格利潤明細表
         成本組成_bt.Enabled = False
         Set_訂單清單() : Set_grid() : Set_未建檔清單() : Set_grid1() : Set_自動彙總1() : Set_格式()
         A1 = 空間1.Location.X : A2 = 空間2.Location.X : B2 = 空間2.Location.Y : A3 = 空間2.Size.Width : B3 = 空間2.Size.Height
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : PID_cb.Text = "HTS#" : Else : PID_cb.Text = "ProductID" : End If
     End Sub
     Private Sub 訂單價格利潤明細表_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
         ZOOM_tb.PerformClick()
@@ -297,7 +317,7 @@ Public Class 訂單價格利潤明細表
     End Sub
     Private Sub 利潤表_dgv_CellClick(ByVal sender As 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 : 資料流水號_tb.Text = 利潤表_dgv("資料流水號", e.RowIndex).Value.ToString
             年份_cb.Text = 利潤表_dgv("年份", e.RowIndex).Value.ToString : Currency_cb.Text = 利潤表_dgv("Currency", e.RowIndex).Value.ToString
@@ -434,7 +454,7 @@ Public Class 訂單價格利潤明細表
                     SQL_修改訂單控制表() : conn.Close()
                     '--------------------------------------------------------------------------------------
                     PA1 = 利潤表_dgv.Rows(i).Cells("訂單流水號").Value.ToString
-                    PA2 = 利潤表_dgv.Rows(i).Cells("客戶訂單號").Value.ToString : PA3 = 利潤表_dgv.Rows(i).Cells("FTY_2").Value.ToString
+                    PA2 = 利潤表_dgv.Rows(i).Cells("客戶訂單號").Value.ToString : PA3 = 利潤表_dgv.Rows(i).Cells("天盾單價").Value.ToString
                     PA4 = 利潤表_dgv.Rows(i).Cells("BasicPrice").Value.ToString : PA5 = 利潤表_dgv.Rows(i).Cells("PG/MOQ").Value.ToString
                     PA6 = 利潤表_dgv.Rows(i).Cells("FOOTorPET").Value.ToString : PA7 = 利潤表_dgv.Rows(i).Cells("Tooling").Value.ToString
                     PA8 = 利潤表_dgv.Rows(i).Cells("RubberBand").Value.ToString : PA9 = 利潤表_dgv.Rows(i).Cells("JHOOK").Value.ToString
@@ -442,7 +462,8 @@ Public Class 訂單價格利潤明細表
                     PA12 = 利潤表_dgv.Rows(i).Cells("EXWsaving").Value.ToString : PA13 = 利潤表_dgv.Rows(i).Cells("Exchange").Value.ToString
                     PA14 = 利潤表_dgv.Rows(i).Cells("年份").Value.ToString : PA15 = 利潤表_dgv.Rows(i).Cells("Quantity").Value.ToString
                     利潤表流水號 = 利潤表_dgv.Rows(i).Cells("利潤表流水號").Value.ToString : PA17 = 利潤表_dgv.Rows(i).Cells("審核").Value.ToString
-                    PA18 = 利潤表_dgv.Rows(i).Cells("CommissionDarren").Value.ToString : PA19 = 利潤表_dgv.Rows(i).Cells("FTY_1").Value.ToString
+                    PA18 = 利潤表_dgv.Rows(i).Cells("Commission Darren").Value.ToString : PA19 = 利潤表_dgv.Rows(i).Cells("實際廠價").Value.ToString
+                    PA20 = 利潤表_dgv.Rows(i).Cells("客戶單價").Value.ToString
                     SQL_查詢最後一筆利潤表流水號()
                     If dr.Read() Then : NUM2 = Strings.Right(dr("利潤表流水號").ToString, 8) : End If : conn.Close() : NUM2 += 1
                     If NUM2 < 10 Then : 利潤表流水號 = "PR" & "0000000" & NUM2
@@ -473,7 +494,7 @@ Public Class 訂單價格利潤明細表
             MsgBox("年份或幣別沒有選擇")
         Else
             For I As Integer = 0 To 利潤表_dgv.Rows.Count - 1
-                If CDbl(利潤表_dgv("FTY_2", I).Value.ToString) <> CDbl(利潤表1_dgv("FTY_2", I).Value.ToString) Or
+                If CDbl(利潤表_dgv("天盾單價", I).Value.ToString) <> CDbl(利潤表1_dgv("天盾單價", I).Value.ToString) Or
                    CDbl(利潤表_dgv("BasicPrice", I).Value.ToString) <> CDbl(利潤表1_dgv("BasicPrice", I).Value.ToString) Or
                    CDbl(利潤表_dgv("PG/MOQ", I).Value.ToString) <> CDbl(利潤表1_dgv("PG/MOQ", I).Value.ToString) Or
                    CDbl(利潤表_dgv("FOOTorPET", I).Value.ToString) <> CDbl(利潤表1_dgv("FOOTorPET", I).Value.ToString) Or
@@ -487,7 +508,8 @@ Public Class 訂單價格利潤明細表
                    CDbl(利潤表_dgv("年份", I).Value.ToString) <> CDbl(利潤表1_dgv("年份", I).Value.ToString) Or
                    CDbl(利潤表_dgv("Quantity", I).Value.ToString) <> CDbl(利潤表1_dgv("Quantity", I).Value.ToString) Or
                    利潤表_dgv("審核", I).Value.ToString <> 利潤表1_dgv("審核", I).Value.ToString Or
-                   CDbl(利潤表_dgv("FTY_1", I).Value.ToString) <> CDbl(利潤表1_dgv("FTY_1", I).Value.ToString) Then
+                   CDbl(利潤表_dgv("實際廠價", I).Value.ToString) <> CDbl(利潤表1_dgv("實際廠價", I).Value.ToString) Or
+                   CDbl(利潤表_dgv("客戶單價", I).Value.ToString) <> CDbl(利潤表1_dgv("客戶單價", I).Value.ToString) Then
                     利潤表_dgv("需存檔", I).Value = True
                 Else
                     利潤表_dgv("需存檔", I).Value = False
@@ -507,7 +529,7 @@ Public Class 訂單價格利潤明細表
                     PA = 利潤表_dgv.Rows(i).Cells("資料流水號").Value.ToString : PA1 = 利潤表_dgv.Rows(i).Cells("單價").Value.ToString
                     PA2 = 利潤表_dgv.Rows(i).Cells("總金額").Value.ToString : SQL_修改訂單資料表() : conn.Close()
                     '-------------------------------------------------------------------------------------------------------
-                    PA3 = 利潤表_dgv.Rows(i).Cells("FTY_2").Value.ToString : PA4 = 利潤表_dgv.Rows(i).Cells("BasicPrice").Value.ToString
+                    PA3 = 利潤表_dgv.Rows(i).Cells("天盾單價").Value.ToString : PA4 = 利潤表_dgv.Rows(i).Cells("BasicPrice").Value.ToString
                     PA5 = 利潤表_dgv.Rows(i).Cells("PG/MOQ").Value.ToString : PA6 = 利潤表_dgv.Rows(i).Cells("FOOTorPET").Value.ToString
                     PA7 = 利潤表_dgv.Rows(i).Cells("Tooling").Value.ToString : PA8 = 利潤表_dgv.Rows(i).Cells("RubberBand").Value.ToString
                     PA9 = 利潤表_dgv.Rows(i).Cells("JHOOK").Value.ToString : PA10 = 利潤表_dgv.Rows(i).Cells("WaterResistant").Value.ToString
@@ -515,8 +537,8 @@ Public Class 訂單價格利潤明細表
                     PA13 = 利潤表_dgv.Rows(i).Cells("Exchange").Value.ToString : PA14 = 利潤表_dgv.Rows(i).Cells("年份").Value.ToString
                     PA15 = 利潤表_dgv.Rows(i).Cells("Quantity").Value.ToString : PA16 = 利潤表_dgv.Rows(i).Cells("審核").Value.ToString
                     利潤表流水號 = 利潤表_dgv.Rows(i).Cells("利潤表流水號").Value.ToString
-                    PA19 = 利潤表_dgv.Rows(i).Cells("FTY_1").Value.ToString
-                    PA18 = 利潤表_dgv.Rows(i).Cells("CommissionDarren").Value.ToString : SQL_訂單成本利潤表修改() : conn.Close()
+                    PA19 = 利潤表_dgv.Rows(i).Cells("實際廠價").Value.ToString : PA20 = 利潤表_dgv.Rows(i).Cells("客戶單價").Value.ToString
+                    PA18 = 利潤表_dgv.Rows(i).Cells("Commission Darren").Value.ToString : SQL_訂單成本利潤表修改() : conn.Close()
                 End If
             Next i : ProgressBar1.Value = 0 : 最終數 = 0
             MsgBox("修改完成") : PA = ""
@@ -543,9 +565,7 @@ Public Class 訂單價格利潤明細表
         Set_訂單清單() : Set_grid() : Set_未建檔清單() : Set_grid1() : Set_自動彙總1() : Set_格式()
     End Sub
     Private Sub 列印_bt_Click(sender As Object, e As EventArgs) Handles 列印_bt.Click
-        If 列印用SQL = "" Then : MsgBox("請先搜尋資料後再行列印") : Else
-            If FTY2_ch.Checked = True Then : BL1 = True : Else : BL1 = False : End If : 列印_訂單價格利潤表.Show()
-        End If
+        If 列印用SQL = "" Then : MsgBox("請先搜尋資料後再行列印") : Else : 列印_訂單價格利潤表.Show() : End If
     End Sub
     Private Sub ZOOM_tb_Click(sender As Object, e As EventArgs) Handles ZOOM_tb.Click
         If 空間1.Visible = True Then
@@ -563,29 +583,25 @@ Public Class 訂單價格利潤明細表
     Private Sub PID_cb_CheckedChanged(sender As Object, e As EventArgs) Handles PID_cb.CheckedChanged
         Set_grid()
     End Sub
-    Private Sub FTY1_ch_Click(sender As Object, e As EventArgs) Handles FTY1_ch.Click
-        FTY1_ch.Checked = True : FTY2_ch.Checked = False
-    End Sub
-    Private Sub FTY2_ch_Click(sender As Object, e As EventArgs) Handles FTY2_ch.Click
-        FTY1_ch.Checked = False : FTY2_ch.Checked = True
+    Private Sub 年份_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 年份_cb.SelectedIndexChanged
+        返回_bt.PerformClick()
     End Sub
     Private Sub 等於訂單數_bt_Click(sender As Object, e As EventArgs) Handles 等於訂單數_bt.Click
-        For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1
-            利潤表_dgv.Rows(i).Cells("Quantity").Value = 利潤表_dgv.Rows(i).Cells("數量").Value
-        Next i
+        For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1 : 利潤表_dgv.Rows(i).Cells("Quantity").Value = 利潤表_dgv.Rows(i).Cells("數量").Value : Next i
     End Sub
     Private Sub 匯率為1_bt_Click(sender As Object, e As EventArgs) Handles 匯率為1_bt.Click
-        For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1
-            利潤表_dgv.Rows(i).Cells("Exchange").Value = 1
-        Next i
+        For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1 : 利潤表_dgv.Rows(i).Cells("Exchange").Value = 1 : Next i
     End Sub
     Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
         SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid() : Set_未建檔清單() : Set_grid1() : Set_自動彙總1() : Set_格式()
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : PID_cb.Text = "HTS#" : Else : PID_cb.Text = "ProductID" : End If
     End Sub
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
         SQL_訂單資料表選擇_DRS() : Set_訂單清單() : Set_grid() : Set_未建檔清單() : Set_grid1() : Set_自動彙總1() : Set_格式()
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : PID_cb.Text = "HTS#" : Else : PID_cb.Text = "ProductID" : End If
     End Sub
     Private Sub 資料庫選擇3_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇3_bt.Click
         SQL_訂單資料表選擇_HP() : Set_訂單清單() : Set_grid() : Set_未建檔清單() : Set_grid1() : Set_自動彙總1() : Set_格式()
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : PID_cb.Text = "HTS#" : Else : PID_cb.Text = "ProductID" : End If
     End Sub
 End Class

TENDEN-MES-SYS/4、量產訂單管理/系統列印介面/列印_訂單明細.vb

@@ -10,7 +10,7 @@ Imports Microsoft.Office.Interop.Excel.XlWindowState
 Public Class 列印_訂單明細
     ReadOnly ds As New DataSet
     Dim N1 As Integer = 6 : Dim N2 As Integer
-    Dim M1 As String
+    Dim M1, M2 As String
     Dim xlApp As Microsoft.Office.Interop.Excel.Application
     Dim xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
@@ -78,7 +78,8 @@ Public Class 列印_訂單明細
             If OD(34) <> 0 Then : xlSheet.Cells(16, N1) = "11" : N1 += 1 : End If : If OD(41) <> 0 Then : xlSheet.Cells(16, N1) = "11.5" : N1 += 1 : End If
             If OD(35) <> 0 Then : xlSheet.Cells(16, N1) = "12" : N1 += 1 : End If : If OD(42) <> 0 Then : xlSheet.Cells(16, N1) = "12.5" : N1 += 1 : End If
             If OD(36) <> 0 Then : xlSheet.Cells(16, N1) = "13" : N1 += 1 : End If : If OD(37) <> 0 Then : xlSheet.Cells(16, N1) = "14" : N1 += 1 : End If
-            xlSheet.Cells(16, N1) = "TOTAL"
+            xlSheet.Cells(16, N1) = "TOTAL" : xlSheet.Cells(16, N1 + 2) = "STYLE#"
+            If Strings.Right(訂單資料表(5), 2) = "HP" Then : xlSheet.Cells(16, N1 + 1) = "HTS#" : Else : xlSheet.Cells(16, N1 + 1) = "ProductID" : End If
 
             For i As Integer = 0 To DataGridView1.Rows.Count - 1
                 xlSheet.Cells(i + 17, 1) = DataGridView1.Rows(i).Cells("ItemNumber").Value
@@ -106,9 +107,10 @@ Public Class 列印_訂單明細
                 If OD(36) <> 0 Then : xlSheet.Cells(i + 17, N1) = DataGridView1.Rows(i).Cells("13").Value : N1 += 1 : End If
                 If OD(37) <> 0 Then : xlSheet.Cells(i + 17, N1) = DataGridView1.Rows(i).Cells("14").Value : N1 += 1 : End If
                 xlSheet.Cells(i + 17, N1) = DataGridView1.Rows(i).Cells("TOTAL").Value
-                With xlApp.Selection
-                    .Font.Bold = True
-                End With
+                xlSheet.Cells(i + 17, N1 + 2) = DataGridView1.Rows(i).Cells("STYLE#").Value.ToString
+                If Strings.Right(訂單資料表(5), 2) = "HP" Then : xlSheet.Cells(i + 17, N1 + 1) = DataGridView1.Rows(i).Cells("HTS#").Value.ToString
+                Else : xlSheet.Cells(i + 17, N1 + 1) = DataGridView1.Rows(i).Cells("ProductID").Value.ToString : End If
+                With xlApp.Selection : .Font.Bold = True : End With
                 N2 = i
             Next i
 
@@ -124,7 +126,7 @@ Public Class 列印_訂單明細
             If OD(35) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(35) : N1 += 1 : End If : If OD(42) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(42) : N1 += 1 : End If  '12  12.5
             If OD(36) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(36) : N1 += 1 : End If : If OD(37) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(37) : N1 += 1 : End If  '13  14
             xlSheet.Cells(N2 + 17, N1) = OD(38)
-
+            N1 += 2
             BB(xlApp, xlSheet)
 
             xlSheet.PageSetup.PrintArea = ""
@@ -150,7 +152,11 @@ Public Class 列印_訂單明細
         ElseIf N1 = 15 Then : M1 = "O" : ElseIf N1 = 16 Then : M1 = "P" : ElseIf N1 = 17 Then : M1 = "Q" : ElseIf N1 = 18 Then : M1 = "R"
         ElseIf N1 = 19 Then : M1 = "S" : ElseIf N1 = 20 Then : M1 = "T" : ElseIf N1 = 21 Then : M1 = "U" : ElseIf N1 = 22 Then : M1 = "V"
         ElseIf N1 = 23 Then : M1 = "W" : ElseIf N1 = 24 Then : M1 = "X" : End If
-
+        If N1 - 1 = 7 Then : M2 = "G" : ElseIf N1 - 1 = 8 Then : M2 = "H" : ElseIf N1 - 1 = 9 Then : M2 = "I" : ElseIf N1 - 1 = 10 Then : M2 = "J"
+        ElseIf N1 - 1 = 11 Then : M2 = "K" : ElseIf N1 - 1 = 12 Then : M2 = "L" : ElseIf N1 - 1 = 13 Then : M2 = "M" : ElseIf N1 - 1 = 14 Then : M2 = "N"
+        ElseIf N1 - 1 = 15 Then : M2 = "O" : ElseIf N1 - 1 = 16 Then : M2 = "P" : ElseIf N1 - 1 = 17 Then : M2 = "Q" : ElseIf N1 - 1 = 18 Then : M2 = "R"
+        ElseIf N1 - 1 = 19 Then : M2 = "S" : ElseIf N1 - 1 = 20 Then : M2 = "T" : ElseIf N1 - 1 = 21 Then : M2 = "U" : ElseIf N1 - 1 = 22 Then : M2 = "V"
+        ElseIf N1 - 1 = 23 Then : M2 = "W" : ElseIf N1 - 1 = 24 Then : M2 = "X" : End If
         xlSheet.Cells.Select()
         With myExcel.Selection.Font
             .Name = "微軟正黑體" : .Size = 9 : .Strikethrough = False : .Superscript = False : .Subscript = False : .OutlineFont = False : .Shadow = False
@@ -362,6 +368,9 @@ Public Class 列印_訂單明細
         End With
         myExcel.Selection.Merge
         xlSheet.Rows("6:6").Select : xlSheet.Range("O6").Activate() : myExcel.Selection.RowHeight = 12.75
+        xlSheet.Columns(M2 & ":" & M1).Select
+        xlSheet.Columns(M2 & ":" & M1).EntireColumn.AutoFit
+        myExcel.Selection.NumberFormatLocal = "@"
         xlSheet.Range("O7").Select()
     End Sub
 End Class

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

@@ -251,6 +251,7 @@ 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()
@@ -263,7 +264,6 @@ Partial Class 訂單控制表
         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()
@@ -279,11 +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
@@ -715,9 +715,9 @@ Partial Class 訂單控制表
         'ACTUAL_ex_fty_dtp
         '
         Me.ACTUAL_ex_fty_dtp.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.ACTUAL_ex_fty_dtp.Location = New System.Drawing.Point(107, 32)
+        Me.ACTUAL_ex_fty_dtp.Location = New System.Drawing.Point(113, 32)
         Me.ACTUAL_ex_fty_dtp.Name = "ACTUAL_ex_fty_dtp"
-        Me.ACTUAL_ex_fty_dtp.Size = New System.Drawing.Size(80, 22)
+        Me.ACTUAL_ex_fty_dtp.Size = New System.Drawing.Size(101, 22)
         Me.ACTUAL_ex_fty_dtp.TabIndex = 268
         '
         'Label57
@@ -1109,7 +1109,7 @@ Partial Class 訂單控制表
         'CXL訂單_bt
         '
         Me.CXL訂單_bt.ForeColor = System.Drawing.Color.Black
-        Me.CXL訂單_bt.Location = New System.Drawing.Point(275, 10)
+        Me.CXL訂單_bt.Location = New System.Drawing.Point(274, 10)
         Me.CXL訂單_bt.Name = "CXL訂單_bt"
         Me.CXL訂單_bt.Size = New System.Drawing.Size(66, 25)
         Me.CXL訂單_bt.TabIndex = 336
@@ -1167,25 +1167,22 @@ Partial Class 訂單控制表
         Me.整單出貨_ch.CheckState = System.Windows.Forms.CheckState.Checked
         Me.整單出貨_ch.Location = New System.Drawing.Point(11, 58)
         Me.整單出貨_ch.Name = "整單出貨_ch"
-        Me.整單出貨_ch.Size = New System.Drawing.Size(70, 19)
+        Me.整單出貨_ch.Size = New System.Drawing.Size(144, 19)
         Me.整單出貨_ch.TabIndex = 340
-        Me.整單出貨_ch.Text = "整單出貨"
+        Me.整單出貨_ch.Text = "整單出貨(以訂單號為主)"
         Me.整單出貨_ch.UseVisualStyleBackColor = True
         '
         'GroupBox1
         '
-        Me.GroupBox1.Controls.Add(Me.啟用批量出貨_ch)
         Me.GroupBox1.Controls.Add(Me.批量出貨_bt)
-        Me.GroupBox1.Controls.Add(Me.整單出貨可出貨數量_tb)
-        Me.GroupBox1.Controls.Add(Me.Label19)
         Me.GroupBox1.Controls.Add(Me.確定出貨_tb)
-        Me.GroupBox1.Controls.Add(Me.拆單出貨出貨數量_tb)
         Me.GroupBox1.Controls.Add(Me.清空4_bt)
         Me.GroupBox1.Controls.Add(Me.Label57)
         Me.GroupBox1.Controls.Add(Me.ACTUAL_ex_fty_dtp)
         Me.GroupBox1.Controls.Add(Me.整單出貨_ch)
         Me.GroupBox1.Controls.Add(Me.Label56)
         Me.GroupBox1.Controls.Add(Me.Label50)
+        Me.GroupBox1.Controls.Add(Me.啟用批量出貨_ch)
         Me.GroupBox1.Location = New System.Drawing.Point(1056, 1)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(347, 105)
@@ -1198,15 +1195,15 @@ Partial Class 訂單控制表
         Me.啟用批量出貨_ch.AutoSize = True
         Me.啟用批量出貨_ch.Location = New System.Drawing.Point(11, 79)
         Me.啟用批量出貨_ch.Name = "啟用批量出貨_ch"
-        Me.啟用批量出貨_ch.Size = New System.Drawing.Size(92, 19)
+        Me.啟用批量出貨_ch.Size = New System.Drawing.Size(147, 19)
         Me.啟用批量出貨_ch.TabIndex = 347
-        Me.啟用批量出貨_ch.Text = "啟用批量出貨"
+        Me.啟用批量出貨_ch.Text = "啟用批量出貨或分批出貨"
         Me.啟用批量出貨_ch.UseVisualStyleBackColor = True
         '
         '批量出貨_bt
         '
         Me.批量出貨_bt.ForeColor = System.Drawing.Color.Black
-        Me.批量出貨_bt.Location = New System.Drawing.Point(290, 55)
+        Me.批量出貨_bt.Location = New System.Drawing.Point(214, 56)
         Me.批量出貨_bt.Name = "批量出貨_bt"
         Me.批量出貨_bt.Size = New System.Drawing.Size(50, 45)
         Me.批量出貨_bt.TabIndex = 346
@@ -1216,16 +1213,16 @@ Partial Class 訂單控制表
         '整單出貨可出貨數量_tb
         '
         Me.整單出貨可出貨數量_tb.ForeColor = System.Drawing.Color.Red
-        Me.整單出貨可出貨數量_tb.Location = New System.Drawing.Point(152, 55)
+        Me.整單出貨可出貨數量_tb.Location = New System.Drawing.Point(194, 70)
         Me.整單出貨可出貨數量_tb.Name = "整單出貨可出貨數量_tb"
-        Me.整單出貨可出貨數量_tb.Size = New System.Drawing.Size(79, 22)
+        Me.整單出貨可出貨數量_tb.Size = New System.Drawing.Size(56, 22)
         Me.整單出貨可出貨數量_tb.TabIndex = 345
         Me.整單出貨可出貨數量_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
         '
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(82, 59)
+        Me.Label19.Location = New System.Drawing.Point(248, 45)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(62, 15)
         Me.Label19.TabIndex = 344
@@ -1234,7 +1231,7 @@ Partial Class 訂單控制表
         '確定出貨_tb
         '
         Me.確定出貨_tb.ForeColor = System.Drawing.Color.Black
-        Me.確定出貨_tb.Location = New System.Drawing.Point(237, 55)
+        Me.確定出貨_tb.Location = New System.Drawing.Point(161, 56)
         Me.確定出貨_tb.Name = "確定出貨_tb"
         Me.確定出貨_tb.Size = New System.Drawing.Size(50, 45)
         Me.確定出貨_tb.TabIndex = 343
@@ -1244,9 +1241,9 @@ Partial Class 訂單控制表
         '拆單出貨出貨數量_tb
         '
         Me.拆單出貨出貨數量_tb.ForeColor = System.Drawing.Color.Red
-        Me.拆單出貨出貨數量_tb.Location = New System.Drawing.Point(152, 78)
+        Me.拆單出貨出貨數量_tb.Location = New System.Drawing.Point(194, 42)
         Me.拆單出貨出貨數量_tb.Name = "拆單出貨出貨數量_tb"
-        Me.拆單出貨出貨數量_tb.Size = New System.Drawing.Size(79, 22)
+        Me.拆單出貨出貨數量_tb.Size = New System.Drawing.Size(56, 22)
         Me.拆單出貨出貨數量_tb.TabIndex = 342
         Me.拆單出貨出貨數量_tb.Text = "0"
         Me.拆單出貨出貨數量_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
@@ -1254,7 +1251,7 @@ Partial Class 訂單控制表
         '清空4_bt
         '
         Me.清空4_bt.ForeColor = System.Drawing.Color.Black
-        Me.清空4_bt.Location = New System.Drawing.Point(189, 32)
+        Me.清空4_bt.Location = New System.Drawing.Point(221, 32)
         Me.清空4_bt.Name = "清空4_bt"
         Me.清空4_bt.Size = New System.Drawing.Size(41, 22)
         Me.清空4_bt.TabIndex = 323
@@ -2412,6 +2409,17 @@ 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)
@@ -2438,9 +2446,12 @@ Partial Class 訂單控制表
         '
         Me.Panel1.Controls.Add(Me.表頭_dgv)
         Me.Panel1.Controls.Add(Me.新增_bt)
+        Me.Panel1.Controls.Add(Me.Label19)
+        Me.Panel1.Controls.Add(Me.整單出貨可出貨數量_tb)
         Me.Panel1.Controls.Add(Me.確認新增_bt)
         Me.Panel1.Controls.Add(Me.計算_dgv)
         Me.Panel1.Controls.Add(Me.指定拆單_bt)
+        Me.Panel1.Controls.Add(Me.拆單出貨出貨數量_tb)
         Me.Panel1.Controls.Add(Me.開啟訂單明細表_bt)
         Me.Panel1.Controls.Add(Me.拆單出貨_ch)
         Me.Panel1.Location = New System.Drawing.Point(576, 386)
@@ -2537,17 +2548,6 @@ Partial Class 訂單控制表
         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
-        '
         '訂單控制表
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
@@ -2725,12 +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

@@ -40,7 +40,8 @@ Public Class 訂單控制表
                                               楦頭號,                   材質,                 七號模具,      TRIAL1 AS T1,     TRIAL2 AS T2, 長期試穿 AS WEAR_TEST,         CFMSAMPLE AS CFM, 
                                         TRIAL3 AS T3,           TRIAL4 AS T4,          CFMSPEC AS TEST,              面料,             副料,                  中底,                     鞋墊, 
                                                 大底,                     跟,     包裝確認時間 AS 包裝,  裁斷時間 AS 裁斷, 針車時間 AS 針車,      成型時間 AS 成型,         驗貨時間 AS 驗貨, 
-                                     工廠進度表備註1,        工廠進度表備註2,             客戶包裝確認,      東莞業務備註,     驗貨報告圖片,              工廠確認,                 利威確認, 
+                                     工廠進度表備註1,        工廠進度表備註2,             客戶包裝確認,      東莞業務備註,                驗貨報告圖片 + '-' + 驗貨報告圖片2 AS 驗貨報告圖片,
+                                            工廠確認,               利威確認, 
                                               結關日,                SMS簽回,                  FRS簽回,     MASTER_SWATCH,       客戶訂單號,             ProductID,                      UoM,
                                             驗報圖庫
                     FROM " & 訂單資料表(1) & ""
@@ -1006,7 +1007,10 @@ Public Class 訂單控制表
                 conn.Close() : PictureBox1.SizeMode = 4
 
                 '------------驗貨報告讀取--------------------------------------------------------------------------------------------
-                PA1 = 控制表_dgv("驗報圖庫", e.RowIndex).Value.ToString : PA2 = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString
+                PA1 = 控制表_dgv("驗報圖庫", e.RowIndex).Value.ToString
+                If Strings.Left(控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString, 1) <> "-" Then
+                    PA2 = Strings.Left(控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString, 10)
+                Else : PA2 = "" : End If
                 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
@@ -1021,7 +1025,11 @@ Public Class 訂單控制表
                     End If
                 End If : 圖片傳遞 = 驗貨報告_pb.Image
 
-                驗貨報告 = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString : PB(0) = 控制表_dgv("訂單流水號", e.RowIndex).Value.ToString
+                If Strings.Left(控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString, 1) <> "-" Then
+                    驗貨報告 = Strings.Left(控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString, 10)
+                    PB(51) = Strings.Left(控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString, 10)
+                Else : 驗貨報告 = "" : PB(51) = "" : End If
+                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
                 PB(7) = 控制表_dgv("客戶交期", e.RowIndex).Value.ToString : DN(1) = 控制表_dgv("單價", e.RowIndex).Value.ToString : DN(2) = 控制表_dgv("總金額", e.RowIndex).Value.ToString
@@ -1040,7 +1048,7 @@ Public Class 訂單控制表
                 PB(42) = 控制表_dgv("中底", e.RowIndex).Value.ToString : PB(43) = 控制表_dgv("鞋墊", e.RowIndex).Value.ToString : PB(44) = 控制表_dgv("大底", e.RowIndex).Value.ToString
                 PB(45) = 控制表_dgv("跟", e.RowIndex).Value.ToString : PB(46) = 控制表_dgv("工廠進度表備註1", e.RowIndex).Value.ToString : PB(47) = 控制表_dgv("七號模具", e.RowIndex).Value.ToString
                 PB(48) = 控制表_dgv("工廠進度表備註2", e.RowIndex).Value.ToString : BL(1) = 0 : PB(49) = 控制表_dgv("客戶包裝確認", e.RowIndex).Value.ToString
-                PB(50) = 控制表_dgv("東莞業務備註", e.RowIndex).Value.ToString : PB(51) = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString : PB(52) = 控制表_dgv("工廠確認", e.RowIndex).Value.ToString
+                PB(50) = 控制表_dgv("東莞業務備註", e.RowIndex).Value.ToString : PB(52) = 控制表_dgv("工廠確認", e.RowIndex).Value.ToString
                 PB(53) = 控制表_dgv("利威確認", e.RowIndex).Value.ToString : PB(54) = 控制表_dgv("結關日", e.RowIndex).Value.ToString : PB(55) = 控制表_dgv("SMS簽回", e.RowIndex).Value.ToString
                 PB(56) = 控制表_dgv("FRS簽回", e.RowIndex).Value.ToString : PB(57) = 控制表_dgv("MASTER_SWATCH", e.RowIndex).Value.ToString : PB(58) = 控制表_dgv("力威訂單號", e.RowIndex).Value.ToString
                 PB(59) = 控制表_dgv("ProductID", e.RowIndex).Value.ToString : PB(60) = 控制表_dgv("UoM", e.RowIndex).Value.ToString
@@ -1405,13 +1413,16 @@ Public Class 訂單控制表
                                                         ConnOpen()
                                                         SQL1 = "SELECT  訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 
                                                                         工廠回復交期, CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 
-                                                                        驗貨時間, 實際離廠日, 資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, CXL, CXLTime, 出貨數量, 驗貨報告圖片, 力威訂單號 
+                                                                        驗貨時間, 實際離廠日, 資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, CXL, CXLTime, 出貨數量, 
+                                                                        驗貨報告圖片 + '-' + 驗貨報告圖片2 AS 驗貨報告圖片, 力威訂單號 
                                                                 FROM    " & 訂單資料表(1) & " 
                                                                 WHERE  (資料流水號 = '" & TextBox7.Text & "') AND (CXL = 0 OR CXL IS NULL)"
                                                         CmdSet_For_DGV() : da.Fill(ds1) : 計算_dgv.DataSource = ds1.Tables(0) : conn.Close()
                                                         For i As Integer = 0 To 計算_dgv.Rows.Count - 1
                                                             GHJK = 計算_dgv(35, i).Value.ToString
-                                                            If GHJK = "" Then : MsgBox("驗貨報告不齊全，請重新確認。") : Set_搜尋() : 天盾訂單號_tb.Text = "" : TextBox7.Text = "" : Exit Sub : End If
+                                                            If GHJK = "" Or Strings.Left(GHJK, 1) = "-" Or Strings.Right(GHJK, 1) = "-" Then
+                                                                MsgBox("驗貨報告不齊全，請重新確認。") : Set_搜尋() : 天盾訂單號_tb.Text = "" : TextBox7.Text = "" : Exit Sub
+                                                            End If
                                                         Next
                                                         If 計算_dgv.Rows(0).Cells("出貨數量").Value >= 計算_dgv.Rows(0).Cells("訂單數量").Value Then
                                                             MsgBox("系統有誤，請通知系統管理員處理。") : Exit Sub
@@ -1456,7 +1467,7 @@ Public Class 訂單控制表
                                                                                             顏色, 楦型) 
                                                                 VALUES (N'" & 流水 & "', N'" & Strings.Left(計算_dgv.Rows(0).Cells("客戶交期").Value.ToString, 4) & "', N'" & Brand_tb.Text & "', 
                                                                         N'" & 工廠 & "', N'" & PA70 & "', N'" & 計算_dgv.Rows(0).Cells("力威訂單號").Value.ToString & "', N'" & 總雙數_tb.Text & "',
-                                                                        N'" & EDRW & "', '0', '0', '0', N'" & 計算_dgv.Rows(0).Cells("客戶交期").Value.ToString & "', '', '', '', 
+                                                                        N'" & EDRW & "', '0', '0', '0', N'" & Strings.Format(ACTUAL_ex_fty_dtp.Value, "yyyy/MM/dd") & "', '', '', '', 
                                                                         '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', N'" & 計算_dgv.Rows(0).Cells("形體號").Value.ToString & "', 
                                                                         N'" & 計算_dgv.Rows(0).Cells("顏色").Value.ToString & "', N'" & 計算_dgv.Rows(0).Cells("楦型").Value.ToString & "')"
                                                         CmdSet_For_dr()
@@ -1469,13 +1480,16 @@ Public Class 訂單控制表
                                                     ConnOpen()
                                                     SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期,
                                                                CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, 
-                                                               資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, CXL, CXLTime, 出貨數量, 驗貨報告圖片, 力威訂單號  FROM " & 訂單資料表(1) & " 
+                                                               資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, CXL, CXLTime, 出貨數量, 驗貨報告圖片 + '-' + 驗貨報告圖片2 AS 驗貨報告圖片, 
+                                                               力威訂單號  FROM " & 訂單資料表(1) & " 
                                                             WHERE (訂單流水號 = '" & 天盾訂單號_tb.Text & "') AND (CXL = 0 OR CXL IS NULL)"
                                                     CmdSet_For_DGV() : da.Fill(ds1) : 計算_dgv.DataSource = ds1.Tables(0) : conn.Close()
 
                                                     For i As Integer = 0 To 計算_dgv.Rows.Count - 1
                                                         GHJK = 計算_dgv(35, i).Value.ToString
-                                                        If GHJK = "" Then : MsgBox("驗貨報告不齊全，請重新確認。") : Set_搜尋() : 天盾訂單號_tb.Text = "" : TextBox7.Text = "" : Exit Sub : End If
+                                                        If GHJK = "" Or Strings.Left(GHJK, 1) = "-" Or Strings.Right(GHJK, 1) = "-" Then
+                                                            MsgBox("驗貨報告不齊全，請重新確認。") : Set_搜尋() : 天盾訂單號_tb.Text = "" : TextBox7.Text = "" : Exit Sub
+                                                        End If
                                                     Next
 
                                                     SQL_出貨流水號()
@@ -1520,7 +1534,7 @@ Public Class 訂單控制表
                                                                                             顏色, 楦型) 
                                                                 VALUES (N'" & 流水 & "', N'" & Strings.Left(計算_dgv.Rows(i).Cells("客戶交期").Value.ToString, 4) & "', N'" & Brand_tb.Text & "', 
                                                                         N'" & 工廠 & "', N'" & PA70 & "', N'" & 計算_dgv.Rows(i).Cells("力威訂單號").Value.ToString & "', N'" & 總雙數_tb.Text & "',
-                                                                        N'" & EDRW & "', '0', '0', '0', N'" & 計算_dgv.Rows(i).Cells("客戶交期").Value.ToString & "', '', '', '', 
+                                                                        N'" & EDRW & "', '0', '0', '0', N'" & Strings.Format(ACTUAL_ex_fty_dtp.Value, "yyyy/MM/dd") & "', '', '', '', 
                                                                         '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', N'" & 計算_dgv.Rows(i).Cells("形體號").Value.ToString & "', 
                                                                         N'" & 計算_dgv.Rows(i).Cells("顏色").Value.ToString & "', N'" & 計算_dgv.Rows(i).Cells("楦型").Value.ToString & "')"
                                                         CmdSet_For_dr()
@@ -1586,13 +1600,14 @@ Public Class 訂單控制表
         平均數 = 10000 / 資料數 : 最終數 += 平均數 : If 最終數 > 10000 Then : 最終數 = 10000 : End If : ProgressBar1.Value = 最終數
     End Sub
     Private Sub 批量出貨_bt_Click(sender As Object, e As EventArgs) Handles 批量出貨_bt.Click
-        發票號碼編輯.ShowDialog()
+        發票號碼編輯.ShowDialog() : Dim 筆數 As Integer
         If PA70 = "" Then : MessageBox.Show("沒有發輸入票號碼無法操作出貨!!") : Else
             aa = MsgBox("執行批量出貨之前需要在訂單控制表清單中先勾選要出貨的資料，請確定你已完成出貨資料選擇?", MsgBoxStyle.OkCancel)
             If aa = MsgBoxResult.Ok Then : Dim EDR, 總雙 As Integer : Dim 流水, 工廠, 客戶 As String : 流水 = "" : 工廠 = "" : 客戶 = ""
                 For I As Integer = 0 To 控制表_dgv.Rows.Count - 1
                     資料數 = 控制表_dgv.Rows.Count : 進度條()
-                    If 控制表_dgv("選擇", I).Value = True And 控制表_dgv("驗貨報告圖片", I).Value.ToString <> "" Then
+                    If 控制表_dgv("選擇", I).Value = True And 控制表_dgv("驗貨報告圖片", I).Value.ToString <> "" And Strings.Left(控制表_dgv("驗貨報告圖片", I).Value.ToString, 1) <> "-" And
+                        Strings.Right(控制表_dgv("驗貨報告圖片", I).Value.ToString, 1) <> "-" Then : 筆數 += 1
                         '-------寫入貨款匯入出款明細表-----------------------------------------------------------------------------------------------------------
                         SQL_出貨流水號()
                         If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("貨款流水號").ToString, 8)) : Else : EDR = 0 : End If : conn.Close() : EDR += 1
@@ -1635,14 +1650,14 @@ Public Class 訂單控制表
                                                             顏色, 楦型) 
                                 VALUES (N'" & 流水 & "', N'" & Strings.Left(控制表_dgv.Rows(I).Cells("客戶交期").Value.ToString, 4) & "', N'" & 客戶 & "', 
                                         N'" & 工廠 & "', N'" & PA70 & "', N'" & 控制表_dgv.Rows(I).Cells("力威訂單號").Value.ToString & "', N'" & 總雙 & "',
-                                        N'" & 控制表_dgv.Rows(I).Cells("訂單數量").Value & "', '0', '0', '0', N'" & 控制表_dgv.Rows(I).Cells("客戶交期").Value.ToString & "', '', '', '', 
+                                        N'" & 控制表_dgv.Rows(I).Cells("訂單數量").Value & "', '0', '0', '0', N'" & Strings.Format(ACTUAL_ex_fty_dtp.Value, "yyyy/MM/dd") & "', '', '', '', 
                                         '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', N'" & 控制表_dgv.Rows(I).Cells("形體號").Value.ToString & "', 
                                         N'" & 控制表_dgv.Rows(I).Cells("顏色").Value.ToString & "', N'" & 控制表_dgv.Rows(I).Cells("楦型").Value.ToString & "')"
                         CmdSet_For_dr()
                         conn.Close()
                     End If
                 Next : ProgressBar1.Value = 0 : 最終數 = 0
-            End If : MsgBox("出貨資料作業完成") : 返回_bt.PerformClick()
+            End If : MsgBox("出貨資料作業完成，共轉移 " & 筆數 & " 筆資料!!") : 返回_bt.PerformClick()
         End If
     End Sub
     Private Sub 清單全選_bt_Click(sender As Object, e As EventArgs) Handles 清單全選_bt.Click

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

@@ -201,12 +201,13 @@ Partial Class 訂單明細表
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.訂單明細表_gdv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.訂單明細表_gdv.BackgroundColor = System.Drawing.Color.White
         Me.訂單明細表_gdv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.訂單明細表_gdv.Location = New System.Drawing.Point(9, 299)
+        Me.訂單明細表_gdv.Location = New System.Drawing.Point(3, 299)
         Me.訂單明細表_gdv.Name = "訂單明細表_gdv"
         Me.訂單明細表_gdv.RowHeadersWidth = 5
         Me.訂單明細表_gdv.RowTemplate.Height = 24
-        Me.訂單明細表_gdv.Size = New System.Drawing.Size(1333, 334)
+        Me.訂單明細表_gdv.Size = New System.Drawing.Size(1347, 334)
         Me.訂單明細表_gdv.TabIndex = 328
         '
         'Label11

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

@@ -24,15 +24,10 @@ Public Class 訂單明細表
         訂單明細表_gdv.AllowUserToAddRows = False
         ConnOpen()
         If 明細判斷 = True Then
-            If WS = False Then
-                SQL_確認訂單明細表()
-            Else
-                SQL_確認訂單明細表1()
-
-            End If
-        ElseIf 明細判斷 = False Then
-            SQL_確認訂單明細表2()
-        End If
+            If WS = False Then : SQL2 = "ORDER BY   " & 訂單資料表(5) & ".資料流水號"
+            Else : SQL2 = "ORDER BY   " & 訂單資料表(5) & ".ProductName, " & 訂單資料表(5) & ".Color"
+            End If : SQL_確認訂單明細表()
+        ElseIf 明細判斷 = False Then : SQL_確認訂單明細表2() : End If
         列印用SQL = SQL1
         cmd.Connection = conn : cmd.CommandText = SQL1 : da.SelectCommand = cmd : da.Fill(ds) : 訂單明細表_gdv.DataSource = ds.Tables(0) : conn.Close()
     End Sub

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

@@ -22,10 +22,10 @@ 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()
         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,7 @@ Partial Class 量產訂單輸入
         Me.天盾訂單號_tb = New System.Windows.Forms.TextBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.開啟明細_bt = New System.Windows.Forms.Button()
         Me.Vendor_Cb = New System.Windows.Forms.ComboBox()
         Me.清空2_bt = New System.Windows.Forms.Button()
         Me.清空1_bt = New System.Windows.Forms.Button()
@@ -144,6 +145,8 @@ Partial Class 量產訂單輸入
         Me.Label30 = New System.Windows.Forms.Label()
         Me.STYLE_N_tb = New System.Windows.Forms.TextBox()
         Me.Item2_cb = New System.Windows.Forms.ComboBox()
+        Me.Label31 = New System.Windows.Forms.Label()
+        Me.HTPID_cb = New System.Windows.Forms.ComboBox()
         CType(Me.訂單流水號_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -185,19 +188,19 @@ 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
+        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
         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
-        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
+        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
         Me.訂單流水號_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.訂單流水號_dgv.Location = New System.Drawing.Point(2, 64)
         Me.訂單流水號_dgv.Name = "訂單流水號_dgv"
@@ -237,6 +240,7 @@ 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.開啟明細_bt)
         Me.Panel1.Controls.Add(Me.Vendor_Cb)
         Me.Panel1.Controls.Add(Me.清空2_bt)
         Me.Panel1.Controls.Add(Me.清空1_bt)
@@ -307,6 +311,17 @@ Partial Class 量產訂單輸入
         Me.Panel1.Size = New System.Drawing.Size(1701, 232)
         Me.Panel1.TabIndex = 1380
         '
+        '開啟明細_bt
+        '
+        Me.開啟明細_bt.BackgroundImage = Global.天盾國際管理系統.My.Resources.Resources.tests
+        Me.開啟明細_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.開啟明細_bt.ForeColor = System.Drawing.Color.Olive
+        Me.開啟明細_bt.Location = New System.Drawing.Point(103, 2)
+        Me.開啟明細_bt.Name = "開啟明細_bt"
+        Me.開啟明細_bt.Size = New System.Drawing.Size(50, 50)
+        Me.開啟明細_bt.TabIndex = 1670
+        Me.開啟明細_bt.UseVisualStyleBackColor = True
+        '
         'Vendor_Cb
         '
         Me.Vendor_Cb.FormattingEnabled = True
@@ -369,7 +384,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(148, 2)
+        Me.刪除_bt.Location = New System.Drawing.Point(163, 2)
         Me.刪除_bt.Name = "刪除_bt"
         Me.刪除_bt.Size = New System.Drawing.Size(50, 50)
         Me.刪除_bt.TabIndex = 1441
@@ -398,7 +413,7 @@ Partial Class 量產訂單輸入
         Me.存檔_tb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.存檔_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.存檔_tb.ForeColor = System.Drawing.Color.Blue
-        Me.存檔_tb.Location = New System.Drawing.Point(92, 2)
+        Me.存檔_tb.Location = New System.Drawing.Point(52, 2)
         Me.存檔_tb.Name = "存檔_tb"
         Me.存檔_tb.Size = New System.Drawing.Size(50, 50)
         Me.存檔_tb.TabIndex = 1440
@@ -429,7 +444,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(36, 2)
+        Me.新增訂單_bt.Location = New System.Drawing.Point(2, 2)
         Me.新增訂單_bt.Name = "新增訂單_bt"
         Me.新增訂單_bt.Size = New System.Drawing.Size(50, 50)
         Me.新增訂單_bt.TabIndex = 1439
@@ -948,8 +963,8 @@ Partial Class 量產訂單輸入
         '
         '明細表_dgv
         '
-        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
+        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
         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)
@@ -965,8 +980,8 @@ Partial Class 量產訂單輸入
         '
         '控制表_dgv
         '
-        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
+        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
         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)
@@ -1234,7 +1249,7 @@ Partial Class 量產訂單輸入
         'Item_cb
         '
         Me.Item_cb.FormattingEnabled = True
-        Me.Item_cb.Location = New System.Drawing.Point(1241, 236)
+        Me.Item_cb.Location = New System.Drawing.Point(1236, 236)
         Me.Item_cb.Name = "Item_cb"
         Me.Item_cb.Size = New System.Drawing.Size(61, 24)
         Me.Item_cb.TabIndex = 1459
@@ -1242,7 +1257,7 @@ Partial Class 量產訂單輸入
         'Label28
         '
         Me.Label28.AutoSize = True
-        Me.Label28.Location = New System.Drawing.Point(1207, 241)
+        Me.Label28.Location = New System.Drawing.Point(1202, 241)
         Me.Label28.Name = "Label28"
         Me.Label28.Size = New System.Drawing.Size(32, 16)
         Me.Label28.TabIndex = 1458
@@ -1251,7 +1266,7 @@ Partial Class 量產訂單輸入
         'PD_cb
         '
         Me.PD_cb.FormattingEnabled = True
-        Me.PD_cb.Location = New System.Drawing.Point(1085, 261)
+        Me.PD_cb.Location = New System.Drawing.Point(1080, 261)
         Me.PD_cb.Name = "PD_cb"
         Me.PD_cb.Size = New System.Drawing.Size(278, 24)
         Me.PD_cb.TabIndex = 1461
@@ -1259,7 +1274,7 @@ Partial Class 量產訂單輸入
         'Label29
         '
         Me.Label29.AutoSize = True
-        Me.Label29.Location = New System.Drawing.Point(1082, 241)
+        Me.Label29.Location = New System.Drawing.Point(1077, 241)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(118, 16)
         Me.Label29.TabIndex = 1460
@@ -1279,7 +1294,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(1421, 235)
+        Me.帶入資料_bt.Location = New System.Drawing.Point(1554, 235)
         Me.帶入資料_bt.Name = "帶入資料_bt"
         Me.帶入資料_bt.Size = New System.Drawing.Size(50, 50)
         Me.帶入資料_bt.TabIndex = 1463
@@ -1313,7 +1328,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(1477, 235)
+        Me.刪除單筆_bt.Location = New System.Drawing.Point(1610, 235)
         Me.刪除單筆_bt.Name = "刪除單筆_bt"
         Me.刪除單筆_bt.Size = New System.Drawing.Size(50, 50)
         Me.刪除單筆_bt.TabIndex = 1443
@@ -1325,7 +1340,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(1365, 235)
+        Me.新增訂單明細_bt.Location = New System.Drawing.Point(1498, 235)
         Me.新增訂單明細_bt.Name = "新增訂單明細_bt"
         Me.新增訂單明細_bt.Size = New System.Drawing.Size(50, 50)
         Me.新增訂單明細_bt.TabIndex = 1442
@@ -1346,7 +1361,7 @@ Partial Class 量產訂單輸入
         'Label30
         '
         Me.Label30.AutoSize = True
-        Me.Label30.Location = New System.Drawing.Point(1004, 240)
+        Me.Label30.Location = New System.Drawing.Point(1001, 240)
         Me.Label30.Name = "Label30"
         Me.Label30.Size = New System.Drawing.Size(52, 16)
         Me.Label30.TabIndex = 1464
@@ -1355,7 +1370,7 @@ Partial Class 量產訂單輸入
         '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.Location = New System.Drawing.Point(999, 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
@@ -1363,16 +1378,35 @@ Partial Class 量產訂單輸入
         'Item2_cb
         '
         Me.Item2_cb.FormattingEnabled = True
-        Me.Item2_cb.Location = New System.Drawing.Point(1302, 236)
+        Me.Item2_cb.Location = New System.Drawing.Point(1297, 236)
         Me.Item2_cb.Name = "Item2_cb"
         Me.Item2_cb.Size = New System.Drawing.Size(61, 24)
         Me.Item2_cb.TabIndex = 1466
         '
+        'Label31
+        '
+        Me.Label31.AutoSize = True
+        Me.Label31.Location = New System.Drawing.Point(1362, 240)
+        Me.Label31.Name = "Label31"
+        Me.Label31.Size = New System.Drawing.Size(31, 16)
+        Me.Label31.TabIndex = 1467
+        Me.Label31.Text = "........"
+        '
+        'HTPID_cb
+        '
+        Me.HTPID_cb.FormattingEnabled = True
+        Me.HTPID_cb.Location = New System.Drawing.Point(1360, 261)
+        Me.HTPID_cb.Name = "HTPID_cb"
+        Me.HTPID_cb.Size = New System.Drawing.Size(132, 24)
+        Me.HTPID_cb.TabIndex = 1469
+        '
         '量產訂單輸入
         '
         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.HTPID_cb)
+        Me.Controls.Add(Me.Label31)
         Me.Controls.Add(Me.Item2_cb)
         Me.Controls.Add(Me.STYLE_N_tb)
         Me.Controls.Add(Me.Label30)
@@ -1547,4 +1581,7 @@ Partial Class 量產訂單輸入
     Friend WithEvents STYLE_N_tb As TextBox
     Friend WithEvents Vendor_Cb As ComboBox
     Friend WithEvents Item2_cb As ComboBox
+    Friend WithEvents Label31 As Label
+    Friend WithEvents 開啟明細_bt As Button
+    Friend WithEvents HTPID_cb As ComboBox
 End Class

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

@@ -83,11 +83,11 @@ Public Class 量產訂單輸入
         明細表_dgv.EditMode = DataGridViewEditMode.EditOnEnter
         明細表_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
+        明細表_dgv.Columns("Color").FillWeight = 80 : 明細表_dgv.Columns("DM").FillWeight = 70 : 明細表_dgv.Columns(4).FillWeight = 100
+        For i As Integer = 9 To 27 : 明細表_dgv.Columns(i).FillWeight = 40 : Next
+        For i As Integer = 2 To 27 : 明細表_dgv.Columns(i).DefaultCellStyle.Format = "#,##0" : 明細表_dgv.Columns(i).ReadOnly = False : Next
+        明細表_dgv.Columns(27).FillWeight = 60 : 明細表_dgv.Columns(27).ReadOnly = True : 明細表_dgv.Columns(5).ReadOnly = True : 明細表_dgv.Columns(7).ReadOnly = True
+        明細表_dgv.Columns(8).ReadOnly = True
 
         If 明細表_dgv.Rows.Count > 0 Then
             If PP1 <> "" Then : PP1 = "" : C2下拉表單資料載入() : End If : If PP2 <> "" Then : PP2 = "" : C3下拉表單資料載入() : End If
@@ -117,6 +117,7 @@ Public Class 量產訂單輸入
     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
+        SQL_Item3_下拉() : HTPID_cb.Items.Clear() : While (dr.Read()) : HTPID_cb.Items.Add(dr("ProductID")) : End While
     End Sub
     Private Sub C2下拉表單資料載入()
         ConnOpen()
@@ -151,6 +152,7 @@ Public Class 量產訂單輸入
         第一頁_bt.Enabled = False : 第二頁_bt.Enabled = True : 第三頁_bt.Enabled = True : 第四頁_bt.Enabled = True : 第五頁_bt.Enabled = True : 第六頁_bt.Enabled = True
         第七頁_bt.Enabled = True : 第八頁_bt.Enabled = True : 第九頁_bt.Enabled = True : 第十頁_bt.Enabled = True
         訂單資料庫選擇.ShowDialog()
+        If Strings.Right(訂單資料表(5), 2) = "HP" Then : Label31.Text = "HTS#" : Else : Label31.Text = "ProductID" : End If
     End Sub
     Private Sub 量產訂單輸入_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
         日期4_dtp.Format = DateTimePickerFormat.Custom : 日期4_dtp.CustomFormat = " "
@@ -207,7 +209,7 @@ Public Class 量產訂單輸入
             風格_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("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
+            Item2_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("Item2").Value.ToString : HTPID_cb.Text = 明細表_dgv.Rows(e.RowIndex).Cells(4).Value.ToString
         End If
     End Sub
     Private Sub 明細表_dgv_CellEndEdit(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 明細表_dgv.CellEndEdit
@@ -366,13 +368,13 @@ Public Class 量產訂單輸入
         修改清單(6) = False : 修改清單(7) = False : 修改清單(8) = False : 修改清單(9) = False : 修改清單(10) = True : 修改清單(11) = False : 清單修改.Show() : 下拉表單資料載入()
     End Sub
     Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
-        SQL_訂單資料表選擇_VIONIC() : Set_已建檔清單()
+        SQL_訂單資料表選擇_VIONIC() : Set_已建檔清單() : If Strings.Right(訂單資料表(5), 2) = "HP" Then : Label31.Text = "HTS#" : Else : Label31.Text = "ProductID" : End If
     End Sub
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
-        SQL_訂單資料表選擇_DRS() : Set_已建檔清單()
+        SQL_訂單資料表選擇_DRS() : Set_已建檔清單() : If Strings.Right(訂單資料表(5), 2) = "HP" Then : Label31.Text = "HTS#" : Else : Label31.Text = "ProductID" : End If
     End Sub
     Private Sub 資料庫選擇3_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇3_bt.Click
-        SQL_訂單資料表選擇_HP() : Set_已建檔清單()
+        SQL_訂單資料表選擇_HP() : Set_已建檔清單() : If Strings.Right(訂單資料表(5), 2) = "HP" Then : Label31.Text = "HTS#" : Else : Label31.Text = "ProductID" : End If
     End Sub
     Private Sub 比對關鍵字_bt_Click(sender As Object, e As EventArgs) Handles 比對關鍵字_bt.Click
         查詢DGV中的關鍵字(訂單流水號_dgv, PO號_tb)
@@ -443,7 +445,7 @@ 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 : PA35 = 控制表_dgv.Rows(i).Cells("STYLE #").Value.ToString
+            PA13 = 控制表_dgv.Rows(i).Cells("資料流水號").Value.ToString : PA35 = 控制表_dgv.Rows(i).Cells("STYLE #").Value.ToString : PA36 = 明細表_dgv.Rows(i).Cells(4).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()
@@ -527,13 +529,10 @@ Public Class 量產訂單輸入
     Private Sub 帶入資料_bt_Click(sender As Object, e As EventArgs) Handles 帶入資料_bt.Click
         For i As Integer = 0 To 控制表_dgv.Rows.Count - 1
             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("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
+                控制表_dgv.Rows(i).Cells("顏色").Value = 顏色_cb.Text : 控制表_dgv.Rows(i).Cells("楦型").Value = DM_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 : 明細表_dgv.Rows(i).Cells(4).Value = HTPID_cb.Text
             End If
         Next
     End Sub
@@ -557,7 +556,7 @@ Public Class 量產訂單輸入
         For i As Integer = 0 To 控制表_dgv.Rows.Count - 1 : 控制表_dgv.Rows(i).Cells("生產工廠").Value = FTY_cb.Text : Next
     End Sub
     Private Sub 力威訂單號_tb_TextChanged(sender As Object, e As EventArgs) Handles 力威訂單號_tb.TextChanged
-        For i As Integer = 0 To 控制表_dgv.Rows.Count - 1 : 控制表_dgv.Rows(i).Cells("力威訂單號").Value = 力威訂單號_tb.Text : Next
+        For i As Integer = 0 To 控制表_dgv.Rows.Count - 1 : 控制表_dgv.Rows(i).Cells("客人訂單號").Value = 力威訂單號_tb.Text : Next
     End Sub
     Private Sub 日期_dtp_ValueChanged(sender As Object, e As EventArgs) Handles 日期_dtp.ValueChanged
         For i As Integer = 0 To 控制表_dgv.Rows.Count - 1
@@ -584,4 +583,7 @@ Public Class 量產訂單輸入
     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
+    Private Sub 開啟明細_bt_Click(sender As Object, e As EventArgs) Handles 開啟明細_bt.Click
+        PA = 天盾訂單號_tb.Text : 訂單明細表.Show()
+    End Sub
 End Class

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

@@ -22,7 +22,6 @@ Partial Class 驗貨報告圖片導入資料庫
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
-        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()
@@ -51,6 +50,9 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.資料庫選擇3_bt = New System.Windows.Forms.Button()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.驗報編碼_tb = New System.Windows.Forms.TextBox()
+        Me.圖編2_tb = New System.Windows.Forms.TextBox()
+        Me.圖編1_tb = New System.Windows.Forms.TextBox()
         Me.副檔名_bt = New System.Windows.Forms.TextBox()
         Me.資料流水號_tb = New System.Windows.Forms.TextBox()
         Me.確認儲存1_bt = New System.Windows.Forms.Button()
@@ -61,8 +63,6 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         '訂單清單_dgv
         '
-        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)
@@ -149,7 +149,7 @@ Partial Class 驗貨報告圖片導入資料庫
         Me.確認儲存_bt.Name = "確認儲存_bt"
         Me.確認儲存_bt.Size = New System.Drawing.Size(89, 52)
         Me.確認儲存_bt.TabIndex = 535
-        Me.確認儲存_bt.Text = "確認儲存" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "驗貨報告(舊)"
+        Me.確認儲存_bt.Text = "確認儲存" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "天盾QC版"
         Me.確認儲存_bt.UseVisualStyleBackColor = True
         '
         '驗貨日期_dtp
@@ -173,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(21, 41)
+        Me.TextBox3.Location = New System.Drawing.Point(5, 33)
         Me.TextBox3.Name = "TextBox3"
         Me.TextBox3.Size = New System.Drawing.Size(149, 23)
         Me.TextBox3.TabIndex = 538
@@ -195,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(21, 12)
+        Me.TextBox7.Location = New System.Drawing.Point(5, 8)
         Me.TextBox7.Multiline = True
         Me.TextBox7.Name = "TextBox7"
         Me.TextBox7.Size = New System.Drawing.Size(149, 23)
@@ -318,7 +318,7 @@ 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(21, 70)
+        Me.TextBox1.Location = New System.Drawing.Point(5, 58)
         Me.TextBox1.Name = "TextBox1"
         Me.TextBox1.Size = New System.Drawing.Size(149, 23)
         Me.TextBox1.TabIndex = 1637
@@ -333,14 +333,44 @@ Partial Class 驗貨報告圖片導入資料庫
         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.Size = New System.Drawing.Size(160, 210)
         Me.Panel1.TabIndex = 1638
         '
+        '驗報編碼_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(1027, 52)
+        Me.驗報編碼_tb.Name = "驗報編碼_tb"
+        Me.驗報編碼_tb.Size = New System.Drawing.Size(94, 23)
+        Me.驗報編碼_tb.TabIndex = 1642
+        Me.驗報編碼_tb.Visible = False
+        '
+        '圖編2_tb
+        '
+        Me.圖編2_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.圖編2_tb.ForeColor = System.Drawing.Color.Black
+        Me.圖編2_tb.Location = New System.Drawing.Point(950, 53)
+        Me.圖編2_tb.Name = "圖編2_tb"
+        Me.圖編2_tb.Size = New System.Drawing.Size(71, 23)
+        Me.圖編2_tb.TabIndex = 1641
+        Me.圖編2_tb.Visible = False
+        '
+        '圖編1_tb
+        '
+        Me.圖編1_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.圖編1_tb.ForeColor = System.Drawing.Color.Black
+        Me.圖編1_tb.Location = New System.Drawing.Point(950, 28)
+        Me.圖編1_tb.Name = "圖編1_tb"
+        Me.圖編1_tb.Size = New System.Drawing.Size(71, 23)
+        Me.圖編1_tb.TabIndex = 1640
+        Me.圖編1_tb.Visible = False
+        '
         '副檔名_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.Location = New System.Drawing.Point(5, 108)
         Me.副檔名_bt.Name = "副檔名_bt"
         Me.副檔名_bt.Size = New System.Drawing.Size(149, 23)
         Me.副檔名_bt.TabIndex = 1639
@@ -350,7 +380,7 @@ Partial Class 驗貨報告圖片導入資料庫
         '
         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.Location = New System.Drawing.Point(5, 83)
         Me.資料流水號_tb.Name = "資料流水號_tb"
         Me.資料流水號_tb.Size = New System.Drawing.Size(149, 23)
         Me.資料流水號_tb.TabIndex = 1638
@@ -364,7 +394,7 @@ Partial Class 驗貨報告圖片導入資料庫
         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.Text = "確認儲存" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "客人版"
         Me.確認儲存1_bt.UseVisualStyleBackColor = True
         '
         '驗貨報告圖片導入資料庫
@@ -372,8 +402,11 @@ Partial Class 驗貨報告圖片導入資料庫
         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.驗報編碼_tb)
         Me.Controls.Add(Me.確認儲存1_bt)
+        Me.Controls.Add(Me.圖編2_tb)
         Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.圖編1_tb)
         Me.Controls.Add(Me.資料庫選擇3_bt)
         Me.Controls.Add(Me.字體_NUD)
         Me.Controls.Add(Me.字體大小調整_lb)
@@ -440,5 +473,8 @@ Partial Class 驗貨報告圖片導入資料庫
     Friend WithEvents 資料流水號_tb As TextBox
     Friend WithEvents 副檔名_bt As TextBox
     Friend WithEvents 確認儲存1_bt As Button
+    Friend WithEvents 圖編2_tb As TextBox
+    Friend WithEvents 圖編1_tb As TextBox
+    Friend WithEvents 驗報編碼_tb As TextBox
 End Class
 

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

@@ -10,21 +10,23 @@ Public Class 驗貨報告圖片導入資料庫
         訂單清單_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() : Set_grid1()
     End Sub
     Private Sub Set_清單1()
         Set_DGV1載入前設定() : SQL_訂單清單() : Set_DGV1載入後設定()
     End Sub
     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("資料流水號").Visible = False
-        訂單清單_dgv.Columns("訂單數量").DefaultCellStyle.Format = "#,##0" : 訂單清單_dgv.Columns("力威訂單號").Visible = False
+        訂單清單_dgv.Columns(0).FillWeight = 80 : 訂單清單_dgv.Columns(1).FillWeight = 70 : 訂單清單_dgv.Columns(2).FillWeight = 120 : 訂單清單_dgv.Columns(3).FillWeight = 120
+        訂單清單_dgv.Columns(4).FillWeight = 140 : 訂單清單_dgv.Columns(5).FillWeight = 100 : 訂單清單_dgv.Columns(6).FillWeight = 80 : 訂單清單_dgv.Columns(7).FillWeight = 100
+        訂單清單_dgv.Columns(8).FillWeight = 100 : 訂單清單_dgv.Columns(9).FillWeight = 100
+        訂單清單_dgv.Columns(10).Visible = False : 訂單清單_dgv.Columns(11).Visible = False : 訂單清單_dgv.Columns("資料流水號").Visible = False
+        訂單清單_dgv.Columns("訂單數量").DefaultCellStyle.Format = "#,##0" : 訂單清單_dgv.Columns("針車時間").Visible = False : 訂單清單_dgv.Columns("備註").Visible = False
+        訂單清單_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) & "/" : Panel1.SendToBack()
-        Set_清單1() : Set_grid1()
+        Set_清單1()
         TextBox3.Visible = False : TextBox7.Visible = False
         If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then : WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath) : End If
         If TENDEN_MES_SYS.Size.Width > 1440 And TENDEN_MES_SYS.Size.Height > 900 Then : 字體_NUD.Value = 9
@@ -39,12 +41,27 @@ 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
+            圖編1_tb.Text = 訂單清單_dgv("驗貨報告圖片", e.RowIndex).Value.ToString : 圖編2_tb.Text = 訂單清單_dgv("驗貨報告圖片2", 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
+            Exit Sub
+        Else
+            If 訂單清單_dgv(0, e.RowIndex).Value.ToString <> 訂單清單_dgv(0, e.RowIndex + 1).Value.ToString Then
+                Dim startX As Integer = IIf(訂單清單_dgv.RowHeadersVisible, 訂單清單_dgv.RowHeadersWidth, 0)
+                Dim startY As Integer = e.RowBounds.Top + e.RowBounds.Height - 1
+                Dim endX As Integer = startX + 訂單清單_dgv.Columns.GetColumnsWidth(DataGridViewElementStates.Visible) - 訂單清單_dgv.HorizontalScrollingOffset
+                e.Graphics.DrawLine(linePen, startX, startY, endX, startY)
+                Exit Sub
+            End If
         End If
     End Sub
     Private Sub 查詢_bt_Click(sender As Object, e As EventArgs) Handles 查詢_bt.Click
-        PA = InputBox("請輸入要查詢的資料") : Set_DGV1載入前設定() : SQL_訂單清單查詢() : Set_DGV1載入後設定() : Set_grid1() : PA = ""
+        PA = InputBox("請輸入要查詢的資料") : Set_DGV1載入前設定() : SQL_訂單清單查詢() : Set_DGV1載入後設定() : 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
@@ -62,10 +79,12 @@ Public Class 驗貨報告圖片導入資料庫
             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()
+            PA49 = TextBox1.Text
+            If 圖編1_tb.Text = "" Then : SQL_新增驗貨報告圖庫_正式() : conn.Close()
+            Else : 驗報編碼_tb.Text = 圖編1_tb.Text : TextBox3.Text = 圖編1_tb.Text : SQL_修改驗貨報告圖庫_正式() : End If
             DTP = Format(驗貨日期_dtp.Value, "yyyy/MM/dd") : SQL_修改驗貨報告圖庫() : conn.Close()
             '----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-            檔案名稱_tb.Text = "" : TextBox1.Text = "" : Set_清單1() : Set_grid1() : MsgBox("新增完成")
+            檔案名稱_tb.Text = "" : TextBox1.Text = "" : Set_清單1() : MsgBox("新增完成")
         End If
     End Sub
     Private Sub 確認儲存1_bt_Click(sender As Object, e As EventArgs) Handles 確認儲存1_bt.Click
@@ -84,10 +103,12 @@ Public Class 驗貨報告圖片導入資料庫
             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()
+            PA49 = TextBox1.Text
+            If 圖編2_tb.Text = "" Then : SQL_新增驗貨報告圖庫_正式() : conn.Close()
+            Else : 驗報編碼_tb.Text = 圖編2_tb.Text : TextBox3.Text = 圖編2_tb.Text : SQL_修改驗貨報告圖庫_正式() : End If
             DTP = Format(驗貨日期_dtp.Value, "yyyy/MM/dd") : SQL_修改驗貨報告圖庫1() : conn.Close()
             '----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-            檔案名稱_tb.Text = "" : TextBox1.Text = "" : Set_清單1() : Set_grid1() : MsgBox("新增完成")
+            檔案名稱_tb.Text = "" : TextBox1.Text = "" : Set_清單1() : 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,8 +22,8 @@ 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.驗貨報告圖庫_dgv = New System.Windows.Forms.DataGridView()
         Me.驗貨報告編號_tb = New System.Windows.Forms.TextBox()
         Me.下載圖片_bt = New System.Windows.Forms.Button()
@@ -521,21 +521,21 @@ Partial Class 驗貨報告資料庫
         '
         '圖片資料庫管理_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.White
-        Me.圖片資料庫管理_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.White
+        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) _
             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
-        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
+        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
         Me.圖片資料庫管理_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.圖片資料庫管理_dgv.Location = New System.Drawing.Point(3, 29)
         Me.圖片資料庫管理_dgv.Name = "圖片資料庫管理_dgv"
@@ -565,11 +565,11 @@ Partial Class 驗貨報告資料庫
         '新版_ch
         '
         Me.新版_ch.AutoSize = True
-        Me.新版_ch.Location = New System.Drawing.Point(450, 7)
+        Me.新版_ch.Location = New System.Drawing.Point(541, 10)
         Me.新版_ch.Name = "新版_ch"
-        Me.新版_ch.Size = New System.Drawing.Size(50, 20)
+        Me.新版_ch.Size = New System.Drawing.Size(62, 20)
         Me.新版_ch.TabIndex = 1638
-        Me.新版_ch.Text = "新版"
+        Me.新版_ch.Text = "客人版"
         Me.新版_ch.UseVisualStyleBackColor = True
         '
         '舊版_ch
@@ -577,11 +577,11 @@ Partial Class 驗貨報告資料庫
         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.Location = New System.Drawing.Point(459, 10)
         Me.舊版_ch.Name = "舊版_ch"
-        Me.舊版_ch.Size = New System.Drawing.Size(50, 20)
+        Me.舊版_ch.Size = New System.Drawing.Size(80, 20)
         Me.舊版_ch.TabIndex = 1639
-        Me.舊版_ch.Text = "舊版"
+        Me.舊版_ch.Text = "天盾QC版"
         Me.舊版_ch.UseVisualStyleBackColor = True
         '
         '驗貨報告資料庫
@@ -589,7 +589,6 @@ Partial Class 驗貨報告資料庫
         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.Label1)
@@ -599,6 +598,7 @@ Partial Class 驗貨報告資料庫
         Me.Controls.Add(Me.驗貨報告圖庫_dgv)
         Me.Controls.Add(Me.Panel2)
         Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.舊版_ch)
         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 = "驗貨報告資料庫"

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

@@ -65,11 +65,12 @@ Public Class 驗貨報告資料庫
     Private Sub 驗貨報告圖庫_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 驗貨報告圖庫_dgv.CellClick
         Try
             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(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
                 '------------驗貨報告讀取--------------------------------------------------------------------------------------------
                 If 舊版_ch.Checked = True Then
+                    驗貨報告編號_tb.Text = 驗貨報告圖庫_dgv("驗貨報告編號", e.RowIndex).Value.ToString
                     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_驗貨報告檔案確認()
@@ -100,6 +101,7 @@ Public Class 驗貨報告資料庫
                         End If
                     End If
                 Else
+                    驗貨報告編號_tb.Text = 驗貨報告圖庫_dgv("驗貨報告編號2", e.RowIndex).Value.ToString
                     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_驗貨報告檔案確認()

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

@@ -22,15 +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 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()
         Me.驗貨報告圖庫_dgv = New System.Windows.Forms.DataGridView()
-        Me.客戶訂單號_tb = New System.Windows.Forms.TextBox()
-        Me.客戶訂單號_lb = New System.Windows.Forms.Label()
-        Me.型體名稱_tb = New System.Windows.Forms.TextBox()
-        Me.型體名稱_lb = New System.Windows.Forms.Label()
         Me.訂單控制表_dgv = New System.Windows.Forms.DataGridView()
         Me.驗貨報告編號_tb = New System.Windows.Forms.TextBox()
         Me.驗貨報告編號_lb = New System.Windows.Forms.Label()
@@ -42,80 +39,58 @@ Partial Class 驗貨報告資料庫修正
         Me.圖片資料庫管理_dgv = New System.Windows.Forms.DataGridView()
         Me.重選資料庫_bt = New System.Windows.Forms.Button()
         Me.資料庫選擇3_bt = New System.Windows.Forms.Button()
+        Me.刪除資料_bt = New System.Windows.Forms.Button()
+        Me.客戶訂單號_lb = New System.Windows.Forms.Label()
+        Me.客戶訂單號_tb = New System.Windows.Forms.TextBox()
+        Me.型體名稱_lb = New System.Windows.Forms.Label()
+        Me.型體名稱_tb = New System.Windows.Forms.TextBox()
+        Me.訂單控制表1_dgv = New System.Windows.Forms.DataGridView()
+        Me.客戶訂單號2_tb = New System.Windows.Forms.TextBox()
+        Me.客戶訂單號1_tb = New System.Windows.Forms.TextBox()
         CType(Me.驗貨報告圖庫_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.圖片資料庫管理_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.訂單控制表1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '驗貨報告圖庫_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
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.驗貨報告圖庫_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
         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(7, 35)
+        Me.驗貨報告圖庫_dgv.Location = New System.Drawing.Point(2, 29)
         Me.驗貨報告圖庫_dgv.Name = "驗貨報告圖庫_dgv"
         Me.驗貨報告圖庫_dgv.RowHeadersWidth = 5
         Me.驗貨報告圖庫_dgv.RowTemplate.Height = 24
-        Me.驗貨報告圖庫_dgv.Size = New System.Drawing.Size(437, 507)
+        Me.驗貨報告圖庫_dgv.Size = New System.Drawing.Size(330, 516)
         Me.驗貨報告圖庫_dgv.TabIndex = 523
         '
-        '客戶訂單號_tb
-        '
-        Me.客戶訂單號_tb.ForeColor = System.Drawing.Color.Black
-        Me.客戶訂單號_tb.Location = New System.Drawing.Point(340, 6)
-        Me.客戶訂單號_tb.Name = "客戶訂單號_tb"
-        Me.客戶訂單號_tb.Size = New System.Drawing.Size(149, 23)
-        Me.客戶訂單號_tb.TabIndex = 532
-        '
-        '客戶訂單號_lb
-        '
-        Me.客戶訂單號_lb.AutoSize = True
-        Me.客戶訂單號_lb.Location = New System.Drawing.Point(266, 9)
-        Me.客戶訂單號_lb.Name = "客戶訂單號_lb"
-        Me.客戶訂單號_lb.Size = New System.Drawing.Size(67, 16)
-        Me.客戶訂單號_lb.TabIndex = 531
-        Me.客戶訂單號_lb.Text = "客戶訂單號"
-        '
-        '型體名稱_tb
-        '
-        Me.型體名稱_tb.ForeColor = System.Drawing.Color.Black
-        Me.型體名稱_tb.Location = New System.Drawing.Point(557, 6)
-        Me.型體名稱_tb.Name = "型體名稱_tb"
-        Me.型體名稱_tb.Size = New System.Drawing.Size(149, 23)
-        Me.型體名稱_tb.TabIndex = 534
-        '
-        '型體名稱_lb
-        '
-        Me.型體名稱_lb.AutoSize = True
-        Me.型體名稱_lb.Location = New System.Drawing.Point(495, 9)
-        Me.型體名稱_lb.Name = "型體名稱_lb"
-        Me.型體名稱_lb.Size = New System.Drawing.Size(55, 16)
-        Me.型體名稱_lb.TabIndex = 533
-        Me.型體名稱_lb.Text = "型體名稱"
-        '
         '訂單控制表_dgv
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.訂單控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
-        Me.訂單控制表_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        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
+        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(450, 35)
+        Me.訂單控制表_dgv.Location = New System.Drawing.Point(334, 29)
         Me.訂單控制表_dgv.Name = "訂單控制表_dgv"
         Me.訂單控制表_dgv.RowHeadersWidth = 5
         Me.訂單控制表_dgv.RowTemplate.Height = 24
-        Me.訂單控制表_dgv.Size = New System.Drawing.Size(799, 507)
+        Me.訂單控制表_dgv.Size = New System.Drawing.Size(916, 516)
         Me.訂單控制表_dgv.TabIndex = 535
         '
         '驗貨報告編號_tb
         '
         Me.驗貨報告編號_tb.ForeColor = System.Drawing.Color.Black
-        Me.驗貨報告編號_tb.Location = New System.Drawing.Point(798, 6)
+        Me.驗貨報告編號_tb.Location = New System.Drawing.Point(86, 3)
         Me.驗貨報告編號_tb.Name = "驗貨報告編號_tb"
         Me.驗貨報告編號_tb.Size = New System.Drawing.Size(149, 23)
         Me.驗貨報告編號_tb.TabIndex = 537
@@ -123,7 +98,7 @@ Partial Class 驗貨報告資料庫修正
         '驗貨報告編號_lb
         '
         Me.驗貨報告編號_lb.AutoSize = True
-        Me.驗貨報告編號_lb.Location = New System.Drawing.Point(712, 9)
+        Me.驗貨報告編號_lb.Location = New System.Drawing.Point(5, 7)
         Me.驗貨報告編號_lb.Name = "驗貨報告編號_lb"
         Me.驗貨報告編號_lb.Size = New System.Drawing.Size(79, 16)
         Me.驗貨報告編號_lb.TabIndex = 536
@@ -131,16 +106,17 @@ Partial Class 驗貨報告資料庫修正
         '
         '重新配對_bt
         '
-        Me.重新配對_bt.Location = New System.Drawing.Point(1107, 6)
+        Me.重新配對_bt.Location = New System.Drawing.Point(799, 1)
         Me.重新配對_bt.Name = "重新配對_bt"
-        Me.重新配對_bt.Size = New System.Drawing.Size(142, 23)
+        Me.重新配對_bt.Size = New System.Drawing.Size(104, 26)
         Me.重新配對_bt.TabIndex = 538
-        Me.重新配對_bt.Text = "重新配對"
+        Me.重新配對_bt.Text = "修改圖檔聯繫"
         Me.重新配對_bt.UseVisualStyleBackColor = True
         '
         '資料庫選擇2_bt
         '
-        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(157, 4)
+        Me.資料庫選擇2_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(1088, 1)
         Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
         Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 26)
         Me.資料庫選擇2_bt.TabIndex = 589
@@ -149,7 +125,8 @@ Partial Class 驗貨報告資料庫修正
         '
         '資料庫選擇1_bt
         '
-        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(82, 4)
+        Me.資料庫選擇1_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(1013, 1)
         Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
         Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 26)
         Me.資料庫選擇1_bt.TabIndex = 588
@@ -159,8 +136,10 @@ Partial Class 驗貨報告資料庫修正
         'Panel1
         '
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Panel1.Controls.Add(Me.Label38)
         Me.Panel1.Controls.Add(Me.圖片資料庫管理_dgv)
+        Me.Panel1.Controls.Add(Me.Label38)
+        Me.Panel1.Controls.Add(Me.客戶訂單號2_tb)
+        Me.Panel1.Controls.Add(Me.客戶訂單號_tb)
         Me.Panel1.Location = New System.Drawing.Point(525, 122)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(205, 303)
@@ -179,23 +158,23 @@ Partial Class 驗貨報告資料庫修正
         '
         '圖片資料庫管理_dgv
         '
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.White
-        Me.圖片資料庫管理_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.White
+        Me.圖片資料庫管理_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
         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
-        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
+        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.White
+        DataGridViewCellStyle9.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.圖片資料庫管理_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9
         Me.圖片資料庫管理_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.圖片資料庫管理_dgv.Location = New System.Drawing.Point(3, 29)
+        Me.圖片資料庫管理_dgv.Location = New System.Drawing.Point(4, 29)
         Me.圖片資料庫管理_dgv.Name = "圖片資料庫管理_dgv"
         Me.圖片資料庫管理_dgv.RowHeadersWidth = 5
         Me.圖片資料庫管理_dgv.RowTemplate.Height = 24
@@ -204,7 +183,8 @@ Partial Class 驗貨報告資料庫修正
         '
         '重選資料庫_bt
         '
-        Me.重選資料庫_bt.Location = New System.Drawing.Point(953, 4)
+        Me.重選資料庫_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.重選資料庫_bt.Location = New System.Drawing.Point(1164, 1)
         Me.重選資料庫_bt.Name = "重選資料庫_bt"
         Me.重選資料庫_bt.Size = New System.Drawing.Size(85, 26)
         Me.重選資料庫_bt.TabIndex = 1636
@@ -213,18 +193,97 @@ Partial Class 驗貨報告資料庫修正
         '
         '資料庫選擇3_bt
         '
-        Me.資料庫選擇3_bt.Location = New System.Drawing.Point(7, 4)
+        Me.資料庫選擇3_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.資料庫選擇3_bt.Location = New System.Drawing.Point(938, 1)
         Me.資料庫選擇3_bt.Name = "資料庫選擇3_bt"
         Me.資料庫選擇3_bt.Size = New System.Drawing.Size(75, 26)
         Me.資料庫選擇3_bt.TabIndex = 1637
         Me.資料庫選擇3_bt.Text = "HP"
         Me.資料庫選擇3_bt.UseVisualStyleBackColor = True
         '
+        '刪除資料_bt
+        '
+        Me.刪除資料_bt.Location = New System.Drawing.Point(248, 1)
+        Me.刪除資料_bt.Name = "刪除資料_bt"
+        Me.刪除資料_bt.Size = New System.Drawing.Size(84, 26)
+        Me.刪除資料_bt.TabIndex = 1638
+        Me.刪除資料_bt.Text = "刪除資料"
+        Me.刪除資料_bt.UseVisualStyleBackColor = True
+        '
+        '客戶訂單號_lb
+        '
+        Me.客戶訂單號_lb.AutoSize = True
+        Me.客戶訂單號_lb.Location = New System.Drawing.Point(343, 6)
+        Me.客戶訂單號_lb.Name = "客戶訂單號_lb"
+        Me.客戶訂單號_lb.Size = New System.Drawing.Size(67, 16)
+        Me.客戶訂單號_lb.TabIndex = 531
+        Me.客戶訂單號_lb.Text = "客戶訂單號"
+        '
+        '客戶訂單號_tb
+        '
+        Me.客戶訂單號_tb.ForeColor = System.Drawing.Color.Black
+        Me.客戶訂單號_tb.Location = New System.Drawing.Point(37, 55)
+        Me.客戶訂單號_tb.Name = "客戶訂單號_tb"
+        Me.客戶訂單號_tb.Size = New System.Drawing.Size(115, 23)
+        Me.客戶訂單號_tb.TabIndex = 532
+        '
+        '型體名稱_lb
+        '
+        Me.型體名稱_lb.AutoSize = True
+        Me.型體名稱_lb.Location = New System.Drawing.Point(653, 7)
+        Me.型體名稱_lb.Name = "型體名稱_lb"
+        Me.型體名稱_lb.Size = New System.Drawing.Size(55, 16)
+        Me.型體名稱_lb.TabIndex = 533
+        Me.型體名稱_lb.Text = "型體名稱"
+        '
+        '型體名稱_tb
+        '
+        Me.型體名稱_tb.ForeColor = System.Drawing.Color.Black
+        Me.型體名稱_tb.Location = New System.Drawing.Point(710, 3)
+        Me.型體名稱_tb.Name = "型體名稱_tb"
+        Me.型體名稱_tb.Size = New System.Drawing.Size(89, 23)
+        Me.型體名稱_tb.TabIndex = 534
+        '
+        '訂單控制表1_dgv
+        '
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.訂單控制表1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        Me.訂單控制表1_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.訂單控制表1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.訂單控制表1_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.訂單控制表1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.訂單控制表1_dgv.Location = New System.Drawing.Point(334, 29)
+        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(916, 516)
+        Me.訂單控制表1_dgv.TabIndex = 1639
+        '
+        '客戶訂單號2_tb
+        '
+        Me.客戶訂單號2_tb.ForeColor = System.Drawing.Color.Black
+        Me.客戶訂單號2_tb.Location = New System.Drawing.Point(37, 84)
+        Me.客戶訂單號2_tb.Name = "客戶訂單號2_tb"
+        Me.客戶訂單號2_tb.Size = New System.Drawing.Size(115, 23)
+        Me.客戶訂單號2_tb.TabIndex = 1640
+        '
+        '客戶訂單號1_tb
+        '
+        Me.客戶訂單號1_tb.ForeColor = System.Drawing.Color.Black
+        Me.客戶訂單號1_tb.Location = New System.Drawing.Point(412, 4)
+        Me.客戶訂單號1_tb.Name = "客戶訂單號1_tb"
+        Me.客戶訂單號1_tb.Size = New System.Drawing.Size(115, 23)
+        Me.客戶訂單號1_tb.TabIndex = 1641
+        '
         '驗貨報告資料庫修正
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1254, 547)
+        Me.Controls.Add(Me.客戶訂單號1_tb)
+        Me.Controls.Add(Me.刪除資料_bt)
         Me.Controls.Add(Me.資料庫選擇3_bt)
         Me.Controls.Add(Me.重選資料庫_bt)
         Me.Controls.Add(Me.Panel1)
@@ -233,12 +292,12 @@ Partial Class 驗貨報告資料庫修正
         Me.Controls.Add(Me.重新配對_bt)
         Me.Controls.Add(Me.驗貨報告編號_tb)
         Me.Controls.Add(Me.驗貨報告編號_lb)
-        Me.Controls.Add(Me.訂單控制表_dgv)
         Me.Controls.Add(Me.型體名稱_tb)
         Me.Controls.Add(Me.型體名稱_lb)
-        Me.Controls.Add(Me.客戶訂單號_tb)
         Me.Controls.Add(Me.客戶訂單號_lb)
         Me.Controls.Add(Me.驗貨報告圖庫_dgv)
+        Me.Controls.Add(Me.訂單控制表_dgv)
+        Me.Controls.Add(Me.訂單控制表1_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.Name = "驗貨報告資料庫修正"
@@ -249,17 +308,13 @@ Partial Class 驗貨報告資料庫修正
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
         CType(Me.圖片資料庫管理_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.訂單控制表1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents 驗貨報告圖庫_dgv As DataGridView
-    Friend WithEvents 客戶訂單號_tb As TextBox
-    Friend WithEvents 客戶訂單號_lb As Label
-    Friend WithEvents 型體名稱_tb As TextBox
-    Friend WithEvents 型體名稱_lb As Label
-    Friend WithEvents 訂單控制表_dgv As DataGridView
     Friend WithEvents 驗貨報告編號_tb As TextBox
     Friend WithEvents 驗貨報告編號_lb As Label
     Friend WithEvents 重新配對_bt As Button
@@ -270,4 +325,13 @@ Partial Class 驗貨報告資料庫修正
     Friend WithEvents 圖片資料庫管理_dgv As DataGridView
     Friend WithEvents 重選資料庫_bt As Button
     Friend WithEvents 資料庫選擇3_bt As Button
+    Friend WithEvents 刪除資料_bt As Button
+    Friend WithEvents 客戶訂單號_lb As Label
+    Friend WithEvents 客戶訂單號_tb As TextBox
+    Friend WithEvents 型體名稱_lb As Label
+    Friend WithEvents 型體名稱_tb As TextBox
+    Friend WithEvents 訂單控制表_dgv As DataGridView
+    Friend WithEvents 訂單控制表1_dgv As DataGridView
+    Friend WithEvents 客戶訂單號2_tb As TextBox
+    Friend WithEvents 客戶訂單號1_tb As TextBox
 End Class

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

@@ -1,6 +1,5 @@
 Option Strict Off
 Public Class 驗貨報告資料庫修正
-    ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet
     Private Sub Set_工程圖片資料庫狀態()
         Dim ds9 As New DataSet : 圖片資料庫管理_dgv.DataSource = Nothing : ds9.Clear()
         圖片資料庫管理_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -11,73 +10,91 @@ Public Class 驗貨報告資料庫修正
         圖片資料庫管理_dgv.Columns(0).FillWeight = 100 : 圖片資料庫管理_dgv.Columns(1).Visible = False
     End Sub
     Private Sub Set_清單1()
-        Try
-            驗貨報告圖庫_dgv.DataSource = Nothing : ds.Clear()
-            驗貨報告圖庫_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-            驗貨報告圖庫_dgv.ColumnHeadersHeight = 25
-            驗貨報告圖庫_dgv.AllowUserToAddRows = False
-            SQL_驗貨報告圖庫() : da.Fill(ds) : 驗貨報告圖庫_dgv.DataSource = ds.Tables(0) : conn.Close()
-            驗貨報告圖庫_dgv.Columns(0).FillWeight = 100 : 驗貨報告圖庫_dgv.Columns(1).FillWeight = 100 : 驗貨報告圖庫_dgv.Columns(2).FillWeight = 80
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        Dim ds As New DataSet : 驗貨報告圖庫_dgv.DataSource = Nothing : ds.Clear()
+        驗貨報告圖庫_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        驗貨報告圖庫_dgv.ColumnHeadersHeight = 25
+        驗貨報告圖庫_dgv.AllowUserToAddRows = False
+        SQL_驗貨報告圖庫() : da.Fill(ds) : 驗貨報告圖庫_dgv.DataSource = ds.Tables(0) : conn.Close()
+        驗貨報告圖庫_dgv.Columns(0).FillWeight = 100 : 驗貨報告圖庫_dgv.Columns(1).FillWeight = 100 : 驗貨報告圖庫_dgv.Columns(2).FillWeight = 80
     End Sub
     Private Sub Set_清單2()
-        Try
-            訂單控制表_dgv.DataSource = Nothing : ds1.Clear()
-            訂單控制表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-            訂單控制表_dgv.ColumnHeadersHeight = 25
-            訂單控制表_dgv.AllowUserToAddRows = False
-            SQL_訂單控制表1() : da.Fill(ds1) : 訂單控制表_dgv.DataSource = ds1.Tables(0) : conn.Close()
-            訂單控制表_dgv.Columns(0).FillWeight = 100 : 訂單控制表_dgv.Columns(1).FillWeight = 100 : 訂單控制表_dgv.Columns(2).FillWeight = 100
-            訂單控制表_dgv.Columns(3).FillWeight = 100 : 訂單控制表_dgv.Columns(4).FillWeight = 100
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        Dim ds, ds1 As New DataSet
+        訂單控制表_dgv.DataSource = Nothing : ds1.Clear()
+        訂單控制表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        訂單控制表_dgv.ColumnHeadersHeight = 25 : 訂單控制表_dgv.AllowUserToAddRows = False
+        訂單控制表1_dgv.DataSource = Nothing : ds1.Clear()
+        訂單控制表1_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        訂單控制表1_dgv.ColumnHeadersHeight = 25 : 訂單控制表1_dgv.AllowUserToAddRows = False
+
+        SQL_訂單控制表1()
+        da.Fill(ds1) : 訂單控制表_dgv.DataSource = ds1.Tables(0) : da.Fill(ds) : 訂單控制表1_dgv.DataSource = ds.Tables(0)
+        訂單控制表_dgv.Columns(0).FillWeight = 100 : 訂單控制表_dgv.Columns(1).FillWeight = 100 : 訂單控制表_dgv.Columns(2).FillWeight = 100
+        訂單控制表_dgv.Columns(3).FillWeight = 100 : 訂單控制表_dgv.Columns(4).FillWeight = 100
+        訂單控制表_dgv.EditMode = DataGridViewEditMode.EditOnEnter
+        訂單控制表_dgv.Columns(0).ReadOnly = True : 訂單控制表_dgv.Columns(1).ReadOnly = True : 訂單控制表_dgv.Columns(2).ReadOnly = True
+        訂單控制表_dgv.Columns(3).ReadOnly = True : 訂單控制表_dgv.Columns(4).ReadOnly = True
     End Sub
     Private Sub 驗貨報告資料庫修正_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Set_工程圖片資料庫狀態() : SQL_訂單資料表選擇_VIONIC()
+        Set_工程圖片資料庫狀態() : SQL_訂單資料表選擇_HP()
+        驗貨報告圖庫_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 7.6)
+        訂單控制表_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 7.6)
+    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
+            客戶訂單號2_tb.Text = 訂單控制表_dgv("客戶訂單號2", e.RowIndex).Value.ToString
+        End If
     End Sub
     Private Sub 圖片資料庫管理_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 圖片資料庫管理_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            PA1 = 圖片資料庫管理_dgv(0, e.RowIndex).Value.ToString : Set_清單1() : Panel1.Visible = False
+            PA1 = 圖片資料庫管理_dgv(0, e.RowIndex).Value.ToString : Set_清單1() : Set_清單2() : Panel1.Visible = False
         End If
     End Sub
     Private Sub 驗貨報告圖庫_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 驗貨報告圖庫_dgv.CellClick
-        Try
-            If e.RowIndex = -1 Then : Else
-                型體名稱_tb.Text = 驗貨報告圖庫_dgv(1, e.RowIndex).Value.ToString : 驗貨報告編號_tb.Text = 驗貨報告圖庫_dgv(2, e.RowIndex).Value.ToString
-                客戶訂單號_tb.Text = 驗貨報告圖庫_dgv(0, e.RowIndex).Value.ToString
-                Set_清單2()
-            End If
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        If e.RowIndex = -1 Then : Else
+            驗貨報告編號_tb.Text = 驗貨報告圖庫_dgv(2, e.RowIndex).Value.ToString
+        End If
     End Sub
     Private Sub 客戶訂單號_tb_TextChanged(sender As Object, e As EventArgs) Handles 客戶訂單號_tb.TextChanged
-        Set_清單1()
+        Set_清單1() : Set_清單2()
+    End Sub
+    Private Sub 客戶訂單號2_tb_TextChanged(sender As Object, e As EventArgs) Handles 客戶訂單號2_tb.TextChanged
+        Set_清單1() : Set_清單2()
+    End Sub
+    Private Sub 客戶訂單號1_tb_TextChanged(sender As Object, e As EventArgs) Handles 客戶訂單號1_tb.TextChanged
+        客戶訂單號2_tb.Text = 客戶訂單號1_tb.Text : 客戶訂單號_tb.Text = 客戶訂單號1_tb.Text
     End Sub
     Private Sub 重新配對_bt_Click(sender As Object, e As EventArgs) Handles 重新配對_bt.Click
-        Try
-            For i As Integer = 0 To 訂單控制表_dgv.Rows.Count - 1
-                PA = 訂單控制表_dgv.Rows(i).Cells("客戶訂單號").Value : PA1 = 訂單控制表_dgv.Rows(i).Cells("形體號").Value
+        For i As Integer = 0 To 訂單控制表_dgv.Rows.Count - 1
+            If 訂單控制表_dgv.Rows(i).Cells("驗貨報告圖片").Value.ToString <> 訂單控制表1_dgv.Rows(i).Cells("驗貨報告圖片").Value.ToString Or
+                訂單控制表_dgv.Rows(i).Cells("驗報圖庫").Value.ToString <> 訂單控制表1_dgv.Rows(i).Cells("驗報圖庫").Value.ToString Or
+                訂單控制表_dgv.Rows(i).Cells("驗貨報告圖片2").Value.ToString <> 訂單控制表1_dgv.Rows(i).Cells("驗貨報告圖片2").Value.ToString Or
+                訂單控制表_dgv.Rows(i).Cells("驗報圖庫2").Value.ToString <> 訂單控制表1_dgv.Rows(i).Cells("驗報圖庫2").Value.ToString Then
+                PA = 訂單控制表_dgv.Rows(i).Cells("客戶訂單號").Value : PA6 = 訂單控制表_dgv.Rows(i).Cells("形體號").Value
+                PA2 = 訂單控制表_dgv.Rows(i).Cells("驗貨報告圖片").Value.ToString : PA3 = 訂單控制表_dgv.Rows(i).Cells("驗報圖庫").Value.ToString
+                PA4 = 訂單控制表_dgv.Rows(i).Cells("驗貨報告圖片2").Value.ToString : PA5 = 訂單控制表_dgv.Rows(i).Cells("驗報圖庫2").Value.ToString
                 SQL_訂單控制表修改() : conn.Close()
-            Next
-            MsgBox("修改完成。")
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+            End If
+        Next : MsgBox("修改完成。") : Set_清單2()
+    End Sub
+    Private Sub 刪除資料_bt_Click(sender As Object, e As EventArgs) Handles 刪除資料_bt.Click
+        Dim aa As MsgBoxResult = MsgBox("確定要刪除這個驗貨報告檔案?", MsgBoxStyle.OkCancel)
+        If aa = MsgBoxResult.Ok Then
+            SQL_驗貨報告資料刪除() : Set_清單1() : MsgBox("刪除完成。")
+        End If
     End Sub
     Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
-        SQL_訂單資料表選擇_VIONIC() : Set_清單2()
+        Panel1.Visible = True : SQL_訂單資料表選擇_VIONIC() : Set_清單1() : Set_清單2()
     End Sub
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
-        SQL_訂單資料表選擇_DRS() : Set_清單2()
+        Panel1.Visible = True : SQL_訂單資料表選擇_DRS() : Set_清單1() : Set_清單2()
     End Sub
     Private Sub 資料庫選擇3_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇3_bt.Click
-        SQL_訂單資料表選擇_HP() : Set_清單2()
+        Panel1.Visible = True : SQL_訂單資料表選擇_HP() : Set_清單1() : Set_清單2()
     End Sub
     Private Sub 重選資料庫_bt_Click(sender As Object, e As EventArgs) Handles 重選資料庫_bt.Click
         Panel1.Visible = True
     End Sub
+
+
 End Class