20210125備份

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

@@ -4,7 +4,7 @@
     Public Target As String : Public Target1 As String : Public Target2 As String : Public FTP帳號 As String : Public FTP密碼 As String : Public 登入人IP As String
     Public CC(99) As Boolean : Public AA(99) As String : Public 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2020122601"
+    Public 版本 As String = "2021011901"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
 

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

@@ -1 +1 @@
-16185a3f75c474b333fac30eab4d1373e2459acf
+6d0fdce5cb2e0b53964df67f907ecf468459564a

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

@@ -226,3 +226,119 @@ G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料庫選擇.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單控制表.resources
 G:\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料比對與修改_力威.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\TENDEN-ERP-SYS.exe.config
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\TENDEN-ERP-SYS.exe
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\TENDEN-ERP-SYS.pdb
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\TENDEN-ERP-SYS.xml
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\Microsoft.Web.Infrastructure.dll
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\Newtonsoft.Json.dll
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\Transformer.NET.dll
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\WebActivatorEx.dll
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\Newtonsoft.Json.xml
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\bin\Debug\Transformer.NET.xml
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾系統.vbprojAssemblyReference.cache
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料匯入_力威.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.網段.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表七.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_訂單明細表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單改量差異查詢.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.人員ID卡系統配置設定.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.Customer_Information_資料管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.CXL訂單紀錄表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.DELIVERY_ADDRESS__資料管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.FACTORY_資料管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.FTP資料夾管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.INVOICE_確認部門.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.SAMPLE_TRACKER.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.TENDENZA_STYLE_形體下單數量統計.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.TENDENZA_STYLE_資料管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.TENDENZA_STYLE_資料管理_對應訂單.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.中文樣品單.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.中文樣品單批量列印.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.中文樣品單清單.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.中文樣品單階段.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.保證書出貨統計資料.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.出貨明細表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_INVOICE.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_SAMPLE_TRACKER.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_中文樣品單.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_出貨明細表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_吊牌.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_周進度表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_周進度表T1_T4.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_測試報告.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_生產進度表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_確認樣品確認通知單.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_訂單價格利潤表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_訂單分析二.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_訂單分析五.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_訂單分析四.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_訂單明細.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_費用報表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_量產樣品控制表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單執行資訊輸入.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.周進度表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.周進度表T1_T4.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.帳務資料庫管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.帳號管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.LoginForm1vb.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.TENDEN_MES_SYS.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.Resources.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.SplashScreen1.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.成本資料庫管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.收款報表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.收款報表批量輸入.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.楦頭圖片導入資料庫.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.楦頭圖片資料庫.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.楦頭規格表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.業務資料庫管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.樣品吊牌管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.樣品資料庫管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.清單修改.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.測試報告報告到期管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.測試報告控制表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.測試報告新配色管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.現有訂單鞋盒資訊查詢.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.生產進度表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.皮料資料紀錄表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.確認樣品確認通知單.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.系統使用者管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.系統執行檔版本管理.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單價格利潤明細表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表一.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表三.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表二.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表五.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表六.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單分析報表四.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單列印選擇.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單控制表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單控制表修改紀錄.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單明細表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單明細表修改紀錄.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單流水號.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料匯入_Vionic.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.列印_收款報表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.費用報表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.量產樣品控制表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.量產樣品明細表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.量產樣品流水號.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.量產樣品訂單CXL紀錄表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.量產樣品訂單出貨紀錄表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.量產樣品訂單匯入.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.鞋型圖片導入資料庫.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.鞋型圖片資料庫.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料庫選擇.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.訂單資料比對與修改_力威.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.鞋盒訂單紀錄表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.鞋盒資料控制表.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.驗貨報告圖片導入資料庫.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.驗貨報告大圖.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.驗貨報告資料庫.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.驗貨報告資料庫修正.resources
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾系統.vbproj.GenerateResource.cache
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾系統.vbproj.CoreCompileInputs.cache
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾系統.vbproj.CopyComplete
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.exe
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.xml
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.pdb

TENDEN-MES-SYS/彙總報表管理/訂單分析報表六.vb

@@ -175,13 +175,13 @@ Public Class 訂單分析報表六
                     conn.Close()
                     ConnOpen()
                     SQL1 = "SELECT     訂單明細表.天盾流水號 
-                           FROM        dbo.訂單明細表 INNER JOIN
+                           FROM        訂單明細表 INNER JOIN
                                           (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                           FROM     dbo.訂單控制表
+                                           FROM     訂單控制表
                                            WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                       dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                       dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                       dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                       訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                       訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                       訂單明細表.DM = WWEE.楦型 AND 
                                        訂單明細表.[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] = WWEE.訂單數量
@@ -200,13 +200,13 @@ Public Class 訂單分析報表六
                         conn.Close()
                         ConnOpen()
                         SQL1 = "SELECT     訂單明細表.天盾流水號 
-                               FROM        dbo.訂單明細表 INNER JOIN
+                               FROM        訂單明細表 INNER JOIN
                                               (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                               FROM     dbo.訂單控制表
+                                               FROM     訂單控制表
                                                WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                           dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                           dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                           dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                           訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                           訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                           訂單明細表.DM = WWEE.楦型 AND 
                                            訂單明細表.[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] = WWEE.訂單數量
@@ -224,13 +224,13 @@ Public Class 訂單分析報表六
                             conn.Close()
                             ConnOpen()
                             SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量
@@ -247,13 +247,13 @@ Public Class 訂單分析報表六
                                 conn.Close()
                                 ConnOpen()
                                 SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量
@@ -269,13 +269,13 @@ Public Class 訂單分析報表六
                                     conn.Close()
                                     ConnOpen()
                                     SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量
@@ -301,13 +301,13 @@ Public Class 訂單分析報表六
                 conn.Close()
                 ConnOpen()
                 SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量
@@ -326,13 +326,13 @@ Public Class 訂單分析報表六
                     conn.Close()
                     ConnOpen()
                     SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量
@@ -350,13 +350,13 @@ Public Class 訂單分析報表六
                         conn.Close()
                         ConnOpen()
                         SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量
@@ -373,13 +373,13 @@ Public Class 訂單分析報表六
                             conn.Close()
                             ConnOpen()
                             SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量
@@ -395,13 +395,13 @@ Public Class 訂單分析報表六
                                 conn.Close()
                                 ConnOpen()
                                 SQL1 = "SELECT     訂單明細表.天盾流水號 
-                                   FROM        dbo.訂單明細表 INNER JOIN
+                                   FROM        訂單明細表 INNER JOIN
                                                   (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                                   FROM     dbo.訂單控制表
+                                                   FROM     訂單控制表
                                                    WHERE   (客戶訂單號 LIKE '" & DataGridView1.Rows(i).Cells("客戶訂單號").Value & "') AND (CXL = 0 OR CXL IS NULL)) AS WWEE ON 
-                                               dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                               dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                               dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                               訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                               訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                               訂單明細表.DM = WWEE.楦型 AND 
                                                訂單明細表.[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] = WWEE.訂單數量

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

@@ -20,7 +20,50 @@ Public Class 列印_訂單價格利潤表
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_訂單清單()
-        Set_DGV1載入前設定() : SQL1 = 列印用SQL : Set_DGV1載入後設定()
+        Set_DGV1載入前設定()
+        SQL1 = "SELECT      " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
+                            " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
+                            " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, 
+                            " & 訂單資料表(7) & ".Quantity, " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, 
+                            " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) 
+                            * " & 訂單資料表(7) & ".Quantity AS CommissionTTL, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) 
+                            * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionDarren, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) 
+                            * " & 訂單資料表(7) & ".Quantity / 2 AS CommissionTendenza, 
+                            " & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice AS Percentage, " & 訂單資料表(7) & ".BasicPrice, 
+                            " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
+                            " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, 
+                            " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, " & 訂單資料表(7) & ".EXWsaving, 
+                            " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
+                            " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, 
+                            STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".ProductID, 
+                            " & 訂單資料表(2) & ".Material, " & 訂單資料表(2) & ".MaterialDescription, " & 訂單資料表(2) & ".Colorway, 
+                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, 
+                            " & 訂單資料表(2) & ".CustomerData
+                FROM        " & 訂單資料表(1) & " LEFT OUTER JOIN
+                            " & 訂單資料表(0) & " ON " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(0) & ".天盾流水號 LEFT OUTER JOIN
+                            " & 訂單資料表(2) & " ON " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(2) & ".Colorway AND 
+                            " & 訂單資料表(1) & ".形體號 = " & 訂單資料表(2) & ".StkName AND 
+                            " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(2) & ".天盾流水號 LEFT OUTER JOIN
+                            STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN
+                            " & 訂單資料表(7) & " ON " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 " & 列印用SQL & "
+                GROUP BY    " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
+                            " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
+                            " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
+                            " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, 
+                            (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity, 
+                            (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2, 
+                            (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * " & 訂單資料表(7) & ".Quantity / 2, 
+                            " & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, 
+                            " & 訂單資料表(7) & ".FOOTformOrPETform, " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, 
+                            " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
+                            " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling, 
+                            " & 訂單資料表(7) & ".年份, " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity, 
+                            STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".ProductID, 
+                            " & 訂單資料表(2) & ".Material, " & 訂單資料表(2) & ".MaterialDescription, " & 訂單資料表(2) & ".Colorway, 
+                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, 
+                            " & 訂單資料表(2) & ".CustomerData
+                ORDER BY    " & 訂單資料表(1) & ".訂單流水號 DESC"
+        Set_DGV1載入後設定()
     End Sub
     Private Sub Set_格式設定()
         DataGridView1.Visible = False
@@ -46,7 +89,7 @@ Public Class 列印_訂單價格利潤表
 
         xlSheet.Cells(3, 1) = "Tendenza Po#"
         xlSheet.Cells(3, 2) = "Season"
-        xlSheet.Cells(3, 3) = "Vionic Po#"
+        xlSheet.Cells(3, 3) = "力威 Po#"
         xlSheet.Cells(3, 4) = "Style"
         xlSheet.Cells(3, 5) = "CLR"
         xlSheet.Cells(3, 6) = "DM"
@@ -87,11 +130,20 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Cells(2, 28) = "=SUBTOTAL(9,AB4:AB$99999)"
         xlSheet.Cells(3, 30) = "ItemNumber"
         xlSheet.Cells(3, 31) = "審核"
+        xlSheet.Cells(3, 32) = "Vionic Po#"
+        xlSheet.Cells(3, 33) = "Product Id"
+        xlSheet.Cells(3, 34) = "Material"
+        xlSheet.Cells(3, 35) = "Material Description"
+        xlSheet.Cells(3, 36) = "Colorway"
+        xlSheet.Cells(3, 37) = "Ship Mode"
+        xlSheet.Cells(3, 38) = "Company code"
+        xlSheet.Cells(3, 39) = "Final Customer Ship To"
+        xlSheet.Cells(3, 40) = "Customer Data"
         AA(xlApp, xlSheet)
         For i As Integer = 0 To DataGridView1.Rows.Count - 1
             xlSheet.Cells(i + 4, 1) = DataGridView1.Rows(i).Cells("訂單流水號").Value
             xlSheet.Cells(i + 4, 2) = DataGridView1.Rows(i).Cells("年份季度").Value
-            xlSheet.Cells(i + 4, 3) = DataGridView1.Rows(i).Cells("客戶訂單號").Value
+            xlSheet.Cells(i + 4, 3) = DataGridView1.Rows(i).Cells("力威訂單號").Value
             xlSheet.Cells(i + 4, 4) = DataGridView1.Rows(i).Cells("形體號").Value
             xlSheet.Cells(i + 4, 5) = DataGridView1.Rows(i).Cells("顏色").Value
             xlSheet.Cells(i + 4, 6) = DataGridView1.Rows(i).Cells("楦型").Value
@@ -120,6 +172,15 @@ Public Class 列印_訂單價格利潤表
             xlSheet.Cells(i + 4, 29) = DataGridView1.Rows(i).Cells("Exchange").Value
             xlSheet.Cells(i + 4, 30) = DataGridView1.Rows(i).Cells("ItemNumber").Value
             xlSheet.Cells(i + 4, 31) = DataGridView1.Rows(i).Cells("審核").Value
+            xlSheet.Cells(i + 4, 32) = DataGridView1.Rows(i).Cells("客戶訂單號").Value
+            xlSheet.Cells(i + 4, 33) = DataGridView1.Rows(i).Cells("ProductID").Value
+            xlSheet.Cells(i + 4, 34) = DataGridView1.Rows(i).Cells("Material").Value
+            xlSheet.Cells(i + 4, 35) = DataGridView1.Rows(i).Cells("MaterialDescription").Value
+            xlSheet.Cells(i + 4, 36) = DataGridView1.Rows(i).Cells("Colorway").Value
+            xlSheet.Cells(i + 4, 37) = DataGridView1.Rows(i).Cells("SalesOrder").Value
+            xlSheet.Cells(i + 4, 38) = DataGridView1.Rows(i).Cells("CustomerName").Value
+            xlSheet.Cells(i + 4, 39) = DataGridView1.Rows(i).Cells("最終運送").Value
+            xlSheet.Cells(i + 4, 40) = DataGridView1.Rows(i).Cells("CustomerData").Value
             With xlApp.Selection
                 .Font.Bold = True
             End With
@@ -156,7 +217,13 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Columns("V:V").Select : myExcel.Selection.ColumnWidth = 7 : xlSheet.Columns("W:W").Select : myExcel.Selection.ColumnWidth = 6
         xlSheet.Columns("X:X").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("Y:Y").Select : myExcel.Selection.ColumnWidth = 6.5
         xlSheet.Columns("Z:Z").Select : myExcel.Selection.ColumnWidth = 5 : xlSheet.Columns("AA:AA").Select : myExcel.Selection.ColumnWidth = 5
-        xlSheet.Columns("AB:AB").Select : myExcel.Selection.ColumnWidth = 9
+        xlSheet.Columns("AB:AB").Select : myExcel.Selection.ColumnWidth = 9 : xlSheet.Columns("AC:AC").Select : myExcel.Selection.ColumnWidth = 8
+        xlSheet.Columns("AD:AD").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("AE:AE").Select : myExcel.Selection.ColumnWidth = 6
+        xlSheet.Columns("AF:AF").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("AG:AG").Select : myExcel.Selection.ColumnWidth = 15
+        xlSheet.Columns("AH:AH").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("AI:AI").Select : myExcel.Selection.ColumnWidth = 30
+        xlSheet.Columns("AJ:AJ").Select : myExcel.Selection.ColumnWidth = 12 : xlSheet.Columns("AK:AK").Select : myExcel.Selection.ColumnWidth = 14
+        xlSheet.Columns("AL:AL").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("AM:AM").Select : myExcel.Selection.ColumnWidth = 75
+        xlSheet.Columns("AN:AN").Select : myExcel.Selection.ColumnWidth = 105
 
         xlSheet.Cells.Select()
         With myExcel.Selection.Font
@@ -242,7 +309,7 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Range("S1:AB3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorAccent6 : .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
 
-        xlSheet.Range("A1:AB3").Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
+        xlSheet.Range("A1:AN3").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
@@ -256,7 +323,7 @@ Public Class 列印_訂單價格利潤表
         For M = 4 To DataGridView1.Rows.Count + 2
             M += 1
         Next M
-        位置1 = "A4:AB" & M
+        位置1 = "A4:AN" & 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
@@ -265,6 +332,15 @@ Public Class 列印_訂單價格利潤表
         With myExcel.Selection.Borders(xlInsideVertical) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlHairline : End With
         With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlHairline : End With
 
+        xlSheet.Range("AC1:AN2").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("AM4:AN" & 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
 End Class

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

@@ -18,7 +18,7 @@ Public Class 訂單價格利潤明細表
             Timer1.Enabled = True : Button6.Enabled = True : Button5.Enabled = False : Button9.Enabled = False
             Button11.Enabled = True : Button12.Enabled = True : Button13.Enabled = True
             If TextBox1.Text = "" Then
-                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
                                " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                                " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
                                " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
@@ -27,16 +27,18 @@ Public Class 訂單價格利潤明細表
                                " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
                                " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
                                " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
-                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, 
+                               " & 訂單資料表(1) & ".客戶訂單號 
                         FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN " & 訂單資料表(7) & " ON 
                                " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
                         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 
                                (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%') OR 
-                               (" & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%')) AND " & 訂單資料表(7) & ".天盾訂單號 IS NULL AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                               (" & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".力威訂單號 LIKE '%" & PA & "%')) 
+                               AND " & 訂單資料表(7) & ".天盾訂單號 IS NULL AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
                         ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
             Else
-                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
                                " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                                " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
                                " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
@@ -45,7 +47,8 @@ Public Class 訂單價格利潤明細表
                                " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
                                " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
                                " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
-                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, 
+                               " & 訂單資料表(1) & ".客戶訂單號 
                         FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName LEFT OUTER JOIN " & 訂單資料表(7) & " ON 
                                " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
                         WHERE (" & 訂單資料表(1) & ".訂單流水號 LIKE '" & TextBox1.Text & "') AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
@@ -57,7 +60,8 @@ Public Class 訂單價格利潤明細表
             Timer1.Enabled = False : Label47.Visible = False : Button6.Enabled = False : Button5.Enabled = True : Button9.Enabled = True
             Button11.Enabled = False : Button12.Enabled = False : Button13.Enabled = False
             If PA = "" Then
-                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                列印用SQL = "WHERE " & 訂單資料表(7) & ".年份 LIKE '" & ComboBox1.Text & "' AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) "
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
                                " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                                " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
                                " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
@@ -66,13 +70,21 @@ Public Class 訂單價格利潤明細表
                                " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
                                " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
                                " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
-                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, 
+                               " & 訂單資料表(1) & ".客戶訂單號 
                         FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN " & 訂單資料表(7) & " ON 
-                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
-                        WHERE " & 訂單資料表(7) & ".年份 LIKE '" & ComboBox1.Text & "' AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 " & 列印用SQL & "
                         ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
             Else
-                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+                列印用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 
+                                    (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR 
+                                    (" & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%') OR 
+                                    (" & 訂單資料表(1) & ".力威訂單號 LIKE '%" & PA & "%')) AND " & 訂單資料表(7) & ".天盾訂單號 IS NOT NULL AND 
+                                    " & 訂單資料表(7) & ".年份 LIKE '" & ComboBox1.Text & "' AND (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) "
+
+                SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
                                " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                                " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
                                " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
@@ -81,24 +93,19 @@ Public Class 訂單價格利潤明細表
                                " & 訂單資料表(7) & ".FTYPrice) AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
                                " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
                                " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
-                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                               " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, 
+                               " & 訂單資料表(1) & ".客戶訂單號 
                         FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName RIGHT OUTER JOIN " & 訂單資料表(7) & " ON 
-                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 
-                        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 
-                               (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%') OR (" & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%') OR 
-                               (" & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%')) AND " & 訂單資料表(7) & ".天盾訂單號 IS NOT NULL AND " & 訂單資料表(7) & ".年份 LIKE '" & ComboBox1.Text & "' AND 
-                               (" & 訂單資料表(1) & ".CXL IS NULL OR " & 訂單資料表(1) & ".CXL = 0) 
+                               " & 訂單資料表(1) & ".資料流水號 = " & 訂單資料表(7) & ".資料流水號 " & 列印用SQL & "
                         ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC"
             End If
-            列印用SQL = SQL1
             Set_DGV1載入後設定()
         End If
         TextBox18.Text = Format(DataGridView1.Rows.Count, "#,##0")
     End Sub
     Private Sub Set_編輯清單()
         Set_DGV1載入前設定()
-        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".資料流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".形體號, 
                        " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 AS 數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, 
                        " & 訂單資料表(1) & ".總金額, " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(7) & ".Quantity, 
                        " & 訂單資料表(7) & ".Currency, " & 訂單資料表(7) & ".Exchange, " & 訂單資料表(7) & ".FTYPrice, (" & 訂單資料表(1) & ".單價 - " & 訂單資料表(7) & ".FTYPrice) * 
@@ -107,7 +114,8 @@ Public Class 訂單價格利潤明細表
                        " & 訂單資料表(7) & ".FTYPrice AS Percentage, " & 訂單資料表(7) & ".BasicPrice, " & 訂單資料表(7) & ".Polybag, " & 訂單資料表(7) & ".FOOTformOrPETform AS FOOTorPET, 
                        " & 訂單資料表(7) & ".Tooling, " & 訂單資料表(7) & ".RubberBand, " & 訂單資料表(7) & ".JHOOK, " & 訂單資料表(7) & ".WaterResistant, " & 訂單資料表(7) & ".P16VAT, 
                        " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
-                       訂單價格利潤表暫存檔.利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核 
+                       訂單價格利潤表暫存檔.利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, 
+                       " & 訂單資料表(1) & ".客戶訂單號 
                 FROM   STYLELIST RIGHT OUTER JOIN " & 訂單資料表(1) & " ON STYLELIST.ProductName = " & 訂單資料表(1) & ".形體號 RIGHT OUTER JOIN 訂單價格利潤表暫存檔 ON 
                        " & 訂單資料表(1) & ".資料流水號 = 訂單價格利潤表暫存檔.資料流水號 LEFT OUTER JOIN " & 訂單資料表(7) & " ON 訂單價格利潤表暫存檔.資料流水號 = " & 訂單資料表(7) & ".資料流水號 
                 ORDER BY " & 訂單資料表(1) & ".訂單流水號 DESC, " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型"
@@ -218,7 +226,7 @@ Public Class 訂單價格利潤明細表
             DataGridView1.Columns(22).Visible = False : DataGridView1.Columns(23).Visible = False : DataGridView1.Columns(24).Visible = False
             DataGridView1.Columns(25).Visible = False : DataGridView1.Columns(26).Visible = False : DataGridView1.Columns(27).Visible = False : DataGridView1.Columns(28).Visible = False
             DataGridView1.Columns(29).Visible = False : DataGridView1.Columns(30).Visible = False : DataGridView1.Columns(31).Visible = False : DataGridView1.Columns(34).Visible = False
-            DataGridView1.Columns(35).Visible = False : DataGridView1.Columns(36).Visible = False
+            DataGridView1.Columns(35).Visible = False : DataGridView1.Columns(36).Visible = False : DataGridView1.Columns(37).Visible = False
         ElseIf BB(0) = False And BB(1) = True And BB(2) = False And BB(3) = False Then
             DataGridView1.Columns(17).Visible = False : DataGridView1.Columns(18).Visible = False : DataGridView1.Columns(19).Visible = False : DataGridView1.Columns(20).Visible = False
             DataGridView1.Columns(21).Visible = False
@@ -226,7 +234,7 @@ Public Class 訂單價格利潤明細表
             DataGridView1.Columns(22).Visible = True : DataGridView1.Columns(23).Visible = True : DataGridView1.Columns(24).Visible = True
             DataGridView1.Columns(25).Visible = True : DataGridView1.Columns(26).Visible = True : DataGridView1.Columns(27).Visible = True : DataGridView1.Columns(28).Visible = True
             DataGridView1.Columns(29).Visible = True : DataGridView1.Columns(30).Visible = True : DataGridView1.Columns(31).Visible = True : DataGridView1.Columns(34).Visible = False
-            DataGridView1.Columns(35).Visible = False : DataGridView1.Columns(36).Visible = False
+            DataGridView1.Columns(35).Visible = False : DataGridView1.Columns(36).Visible = False : DataGridView1.Columns(37).Visible = False
         ElseIf BB(0) = False And BB(1) = False And BB(2) = True And BB(3) = False Then
             DataGridView1.Columns(31).Visible = True : DataGridView1.Columns(18).Visible = True : DataGridView1.Columns(19).Visible = True : DataGridView1.Columns(20).Visible = True
             DataGridView1.Columns(21).Visible = True
@@ -234,7 +242,7 @@ Public Class 訂單價格利潤明細表
             DataGridView1.Columns(22).Visible = False : DataGridView1.Columns(23).Visible = False : DataGridView1.Columns(24).Visible = False
             DataGridView1.Columns(25).Visible = False : DataGridView1.Columns(26).Visible = False : DataGridView1.Columns(27).Visible = False : DataGridView1.Columns(28).Visible = False
             DataGridView1.Columns(29).Visible = False : DataGridView1.Columns(30).Visible = False : DataGridView1.Columns(17).Visible = False : DataGridView1.Columns(34).Visible = False
-            DataGridView1.Columns(35).Visible = False : DataGridView1.Columns(36).Visible = False
+            DataGridView1.Columns(35).Visible = False : DataGridView1.Columns(36).Visible = False : DataGridView1.Columns(37).Visible = False
         ElseIf BB(0) = False And BB(1) = False And BB(2) = False And BB(3) = True Then
             DataGridView1.Columns(31).Visible = False : DataGridView1.Columns(18).Visible = False : DataGridView1.Columns(19).Visible = False : DataGridView1.Columns(20).Visible = False
             DataGridView1.Columns(21).Visible = False
@@ -243,9 +251,9 @@ Public Class 訂單價格利潤明細表
             DataGridView1.Columns(25).Visible = False : DataGridView1.Columns(26).Visible = False : DataGridView1.Columns(27).Visible = False : DataGridView1.Columns(28).Visible = False
             DataGridView1.Columns(29).Visible = False : DataGridView1.Columns(30).Visible = False : DataGridView1.Columns(17).Visible = False
 
-            DataGridView1.Columns(34).Visible = True : DataGridView1.Columns(35).Visible = True : DataGridView1.Columns(36).Visible = True
+            DataGridView1.Columns(34).Visible = True : DataGridView1.Columns(35).Visible = True : DataGridView1.Columns(36).Visible = True : DataGridView1.Columns(37).Visible = True
         End If
-        DataGridView1.Columns(32).FillWeight = 50
+        DataGridView1.Columns(32).FillWeight = 50 : DataGridView1.Columns(34).FillWeight = 50 : DataGridView1.Columns(36).FillWeight = 50
         DataGridView1.Columns(14).DefaultCellStyle.BackColor = Color.MistyRose : DataGridView1.Columns(17).DefaultCellStyle.BackColor = Color.MistyRose
         DataGridView1.Columns(22).DefaultCellStyle.BackColor = Color.MistyRose : DataGridView1.Columns(23).DefaultCellStyle.BackColor = Color.MistyRose
         DataGridView1.Columns(24).DefaultCellStyle.BackColor = Color.MistyRose : DataGridView1.Columns(25).DefaultCellStyle.BackColor = Color.MistyRose

TENDEN-MES-SYS/樣品訂單管理/中文樣品單.Designer.vb

@@ -134,7 +134,7 @@ Partial Class 中文樣品單
         Me.TextBox17 = New System.Windows.Forms.TextBox()
         Me.刪除樣品單_bt = New System.Windows.Forms.Button()
         Me.Label15 = New System.Windows.Forms.Label()
-        Me.ComboBox8 = New System.Windows.Forms.ComboBox()
+        Me.階段_cb = New System.Windows.Forms.ComboBox()
         Me.Button46 = New System.Windows.Forms.Button()
         Me.Button47 = New System.Windows.Forms.Button()
         Me.Button48 = New System.Windows.Forms.Button()
@@ -1274,14 +1274,14 @@ Partial Class 中文樣品單
         Me.Label15.TabIndex = 408
         Me.Label15.Text = "階段："
         '
-        'ComboBox8
+        '階段_cb
         '
-        Me.ComboBox8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ComboBox8.FormattingEnabled = True
-        Me.ComboBox8.Location = New System.Drawing.Point(584, 186)
-        Me.ComboBox8.Name = "ComboBox8"
-        Me.ComboBox8.Size = New System.Drawing.Size(85, 24)
-        Me.ComboBox8.TabIndex = 409
+        Me.階段_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.階段_cb.FormattingEnabled = True
+        Me.階段_cb.Location = New System.Drawing.Point(584, 186)
+        Me.階段_cb.Name = "階段_cb"
+        Me.階段_cb.Size = New System.Drawing.Size(85, 24)
+        Me.階段_cb.TabIndex = 409
         '
         'Button46
         '
@@ -2140,7 +2140,7 @@ Partial Class 中文樣品單
         Me.Controls.Add(Me.控制項_bt)
         Me.Controls.Add(Me.Label16)
         Me.Controls.Add(Me.TextBox18)
-        Me.Controls.Add(Me.ComboBox8)
+        Me.Controls.Add(Me.階段_cb)
         Me.Controls.Add(Me.Label15)
         Me.Controls.Add(Me.清除其他LOGO_bt)
         Me.Controls.Add(Me.PictureBox4)
@@ -2337,7 +2337,7 @@ Partial Class 中文樣品單
     Friend WithEvents TextBox17 As TextBox
     Friend WithEvents 刪除樣品單_bt As Button
     Friend WithEvents Label15 As Label
-    Friend WithEvents ComboBox8 As ComboBox
+    Friend WithEvents 階段_cb As ComboBox
     Friend WithEvents Button46 As Button
     Friend WithEvents Button47 As Button
     Friend WithEvents Button48 As Button

TENDEN-MES-SYS/樣品訂單管理/中文樣品單.vb

@@ -319,14 +319,14 @@ Public Class 中文樣品單
         While (dr1.Read()) : ComboBox7.Items.Add(dr1("形體號")) : End While : conn1.Close()
     End Sub
     Private Sub ComboBox8下拉表單資料載入()
-        ComboBox8.Items.Clear()
+        階段_cb.Items.Clear()
         If 開發部門 = False And 確認部門 = True Then
-            ComboBox16.Items.Clear() : ComboBox8.Items.Clear()
-            ComboBox8.Items.Add("CFM") : ComboBox16.Items.Add("CFM")
+            ComboBox16.Items.Clear() : 階段_cb.Items.Clear()
+            階段_cb.Items.Add("CFM") : ComboBox16.Items.Add("CFM")
         ElseIf 開發部門 = True And 確認部門 = False Then
-            ComboBox16.Items.Clear() : ComboBox8.Items.Clear()
-            ComboBox8.Items.Add("ILR") : ComboBox8.Items.Add("FLR") : ComboBox8.Items.Add("SMS") : ComboBox8.Items.Add("SMU") : ComboBox8.Items.Add("Proto") : ComboBox8.Items.Add("Line")
-            ComboBox8.Items.Add("Canada")
+            ComboBox16.Items.Clear() : 階段_cb.Items.Clear()
+            階段_cb.Items.Add("ILR") : 階段_cb.Items.Add("FLR") : 階段_cb.Items.Add("SMS") : 階段_cb.Items.Add("SMU") : 階段_cb.Items.Add("Proto") : 階段_cb.Items.Add("Line")
+            階段_cb.Items.Add("Canada")
             ComboBox16.Items.Add("ILR") : ComboBox16.Items.Add("FLR") : ComboBox16.Items.Add("SMS") : ComboBox16.Items.Add("SMU") : ComboBox16.Items.Add("Proto") : ComboBox16.Items.Add("Line")
             ComboBox16.Items.Add("Canada")
         End If
@@ -686,7 +686,7 @@ Public Class 中文樣品單
                         End If
                     End If
                     ComboBox8下拉表單資料載入()
-                    ComboBox8.Text = 清單_dgv(3, e.RowIndex).Value.ToString
+                    階段_cb.Text = 清單_dgv(3, e.RowIndex).Value.ToString
 
                     TextBox35.Text = ComboBox2.Text
                     TextBox34.Text = Microsoft.VisualBasic.Left(顏色_dgv(32, 0).Value.ToString, 4)
@@ -702,21 +702,21 @@ Public Class 中文樣品單
                 End If
             End If
             TextBox35.Text = ComboBox2.Text : TextBox31.Text = ComboBox6.Text : TextBox30.Text = ComboBox7.Text : TextBox29.Text = ComboBox3.Text : TextBox26.Text = ComboBox4.Text
-            If ComboBox8.Text = "ILR" Then : ComboBox9.Text = "ILR"
-            ElseIf ComboBox8.Text = "FLR" Then : ComboBox9.Text = "FLR"
-            ElseIf ComboBox8.Text = "SMS" Then : ComboBox9.Text = "SS"
-            ElseIf ComboBox8.Text = "SMU" Or ComboBox8.Text = "SMU" Then : ComboBox9.Text = ""
-            ElseIf ComboBox8.Text = "Proto" Then : ComboBox9.Text = "Proto"
-            ElseIf ComboBox8.Text = "Line" Then : ComboBox9.Text = "Line"
-            ElseIf ComboBox8.Text = "Canada" Then : ComboBox9.Text = "Canada"
+            If 階段_cb.Text = "ILR" Then : ComboBox9.Text = "ILR"
+            ElseIf 階段_cb.Text = "FLR" Then : ComboBox9.Text = "FLR"
+            ElseIf 階段_cb.Text = "SMS" Then : ComboBox9.Text = "SS"
+            ElseIf 階段_cb.Text = "SMU" Or 階段_cb.Text = "SMU" Then : ComboBox9.Text = ""
+            ElseIf 階段_cb.Text = "Proto" Then : ComboBox9.Text = "Proto"
+            ElseIf 階段_cb.Text = "Line" Then : ComboBox9.Text = "Line"
+            ElseIf 階段_cb.Text = "Canada" Then : ComboBox9.Text = "Canada"
             End If
-            If ComboBox8.Text = "ILR" Or ComboBox8.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "SMS" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = True
-            ElseIf ComboBox8.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            If 階段_cb.Text = "ILR" Or 階段_cb.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "SMS" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = True
+            ElseIf 階段_cb.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             End If
         End If
     End Sub
@@ -754,21 +754,21 @@ Public Class 中文樣品單
             TextBox23.Text = 顏色_dgv(37, e.RowIndex).Value.ToString : TextBox22.Text = 顏色_dgv(38, e.RowIndex).Value.ToString & "/" & 顏色_dgv(39, e.RowIndex).Value.ToString
             TextBox21.Text = 顏色_dgv(43, e.RowIndex).Value.ToString : ComboBox12.Text = 顏色_dgv(38, e.RowIndex).Value.ToString
             ComboBox11.Text = 顏色_dgv(39, e.RowIndex).Value.ToString : ComboBox10.Text = 顏色_dgv(40, e.RowIndex).Value.ToString
-            If ComboBox8.Text = "ILR" Then : ComboBox9.Text = "ILR"
-            ElseIf ComboBox8.Text = "FLR" Then : ComboBox9.Text = "FLR"
-            ElseIf ComboBox8.Text = "SMS" Then : ComboBox9.Text = "SS"
-            ElseIf ComboBox8.Text = "SMU" Or ComboBox8.Text = "SMU" Then : ComboBox9.Text = ""
-            ElseIf ComboBox8.Text = "Proto" Then : ComboBox9.Text = "Proto"
-            ElseIf ComboBox8.Text = "Line" Then : ComboBox9.Text = "Line"
-            ElseIf ComboBox8.Text = "Canada" Then : ComboBox9.Text = "Canada"
+            If 階段_cb.Text = "ILR" Then : ComboBox9.Text = "ILR"
+            ElseIf 階段_cb.Text = "FLR" Then : ComboBox9.Text = "FLR"
+            ElseIf 階段_cb.Text = "SMS" Then : ComboBox9.Text = "SS"
+            ElseIf 階段_cb.Text = "SMU" Or 階段_cb.Text = "SMU" Then : ComboBox9.Text = ""
+            ElseIf 階段_cb.Text = "Proto" Then : ComboBox9.Text = "Proto"
+            ElseIf 階段_cb.Text = "Line" Then : ComboBox9.Text = "Line"
+            ElseIf 階段_cb.Text = "Canada" Then : ComboBox9.Text = "Canada"
             End If
-            If ComboBox8.Text = "ILR" Or ComboBox8.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "SMS" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = True
-            ElseIf ComboBox8.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-            ElseIf ComboBox8.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            If 階段_cb.Text = "ILR" Or 階段_cb.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "SMS" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = True
+            ElseIf 階段_cb.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf 階段_cb.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             End If
         End If
     End Sub
@@ -1022,7 +1022,7 @@ Public Class 中文樣品單
         If 開發部門 = False And 確認部門 = True Then
         ElseIf 開發部門 = True And 確認部門 = False Then
             中文樣品單階段.ShowDialog()
-            ComboBox8.Text = QA
+            階段_cb.Text = QA
         End If
         排序(0) = "ORDER BY 確認樣品單控制表.顏色, 確認樣品單明細表.細項" : 排序(1) = "ORDER BY 確認樣品單控制表暫存檔.顏色, 確認樣品單明細表暫存檔.細項"
         排序(2) = "ORDER BY 確認樣品單控制表.顏色, 確認樣品單明細表.細項" : 排序(3) = "ORDER BY 確認樣品單控制表暫存檔.顏色, 確認樣品單明細表暫存檔.細項"
@@ -1529,26 +1529,29 @@ Public Class 中文樣品單
         TextBox7.Text = 飾物_dgv(8, e.RowIndex).Value.ToString
     End Sub
     Private Sub Button29_Click(sender As Object, e As EventArgs) Handles 新增OR複製_bt.Click
-        If 開發部門 = False And 確認部門 = True Then : 部門 = "確認" : QA = "CFM"
-        ElseIf 開發部門 = True And 確認部門 = False Then : 部門 = "開發"
-        End If
-        If CheckBox8.Checked = True Then : ASD = "D"
-        ElseIf CheckBox7.Checked = True Then : ASD = "C"
-        ElseIf CheckBox6.Checked = True Then : ASD = "S"
-        ElseIf CheckBox8.Checked = False And CheckBox7.Checked = False And CheckBox6.Checked = False Then : ASD = ""
-        End If
-        ConnOpen()
-        SQL1 = "INSERT INTO 確認樣品單抬頭 " &
+        If 階段_cb.Text = "" Then
+            MsgBox("階段選項不可空白")
+        Else
+            If 開發部門 = False And 確認部門 = True Then : 部門 = "確認" : QA = "CFM"
+            ElseIf 開發部門 = True And 確認部門 = False Then : 部門 = "開發"
+            End If
+            If CheckBox8.Checked = True Then : ASD = "D"
+            ElseIf CheckBox7.Checked = True Then : ASD = "C"
+            ElseIf CheckBox6.Checked = True Then : ASD = "S"
+            ElseIf CheckBox8.Checked = False And CheckBox7.Checked = False And CheckBox6.Checked = False Then : ASD = ""
+            End If
+            ConnOpen()
+            SQL1 = "INSERT INTO 確認樣品單抬頭 " &
                "(樣品流水號, 品牌, 季節, 工廠, 楦頭, Construction, 型體名, 型體號碼, 内里印刷, 中文樣品單產地標, 中文樣品單鞋圖, 新舊形體, 舊型體季別, 日期, 部門, 中文樣品單中底LOGO, " &
                "中文樣品單其他LOGO, 階段, DEVELOPER, 制表人) " &
                    "VALUES ('" & 樣品單流水號變數1 & "','" & ComboBox1.Text & "','" & ComboBox2.Text & "','" & ComboBox3.Text & "','" & ComboBox4.Text & "','" & ComboBox5.Text &
                          "','" & ComboBox6.Text & "','" & ComboBox7.Text & "',N'" & TextBox2.Text & "','" & TextBox4.Text & "','" & TextBox5.Text & "','" & CheckBox1.Checked &
                          "',N'" & TextBox1.Text & "','" & Format(DateTimePicker1.Value, "yyyy/MM/dd") & "','" & 部門 & "','" & TextBox10.Text & "','" & TextBox17.Text &
-                         "', '" & ComboBox8.Text & "',N'" & TextBox18.Text & "',N'" & gUserName & "')"
-        CmdSet_For_dr() : conn.Close()
-        For i As Integer = 0 To 顏色_dgv.Rows.Count - 1
-            ConnOpen()
-            SQL1 = "INSERT INTO 確認樣品單控制表 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
+                         "', '" & 階段_cb.Text & "',N'" & TextBox18.Text & "',N'" & gUserName & "')"
+            CmdSet_For_dr() : conn.Close()
+            For i As Integer = 0 To 顏色_dgv.Rows.Count - 1
+                ConnOpen()
+                SQL1 = "INSERT INTO 確認樣品單控制表 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
                    "Approved_Date, Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments) " &
                    "VALUES ('" & 顏色_dgv.Rows(i).Cells("樣品流水號").Value &
@@ -1574,84 +1577,84 @@ Public Class 中文樣品單
                         "',N'" & ASD &
                         "',N'" & ComboBox9.Text &
                         "',N'" & 顏色_dgv.Rows(i).Cells("掛牌Comments").Value & "')"
-            CmdSet_For_dr() : conn.Close()
-            ConnOpen()
-            SQL1 = "INSERT INTO 確認品單掛牌 (樣品流水號, 樣品流水號一, Material_Article, Last, Construc_Name, Insole, Footbed, Gender, Width, D_C_S, Stage, 
+                CmdSet_For_dr() : conn.Close()
+                ConnOpen()
+                SQL1 = "INSERT INTO 確認品單掛牌 (樣品流水號, 樣品流水號一, Material_Article, Last, Construc_Name, Insole, Footbed, Gender, Width, D_C_S, Stage, 
                             Comments, Size) " &
                    "VALUES ('" & 顏色_dgv.Rows(i).Cells("樣品流水號").Value &
                          "','" & 顏色_dgv.Rows(i).Cells("樣品流水號一").Value &
                         "','','','','','','','','','','','')"
-            CmdSet_For_dr() : conn.Close()
-        Next
-        If 面料_dgv.Rows.Count > 0 Then
-            For i = 0 To 面料_dgv.Rows.Count - 1
-                ConnOpen()
-                SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
+                CmdSet_For_dr() : conn.Close()
+            Next
+            If 面料_dgv.Rows.Count > 0 Then
+                For i = 0 To 面料_dgv.Rows.Count - 1
+                    ConnOpen()
+                    SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
                        "VALUES ('" & 面料_dgv.Rows(i).Cells("樣品流水號二").Value &
                              "','" & 面料_dgv.Rows(i).Cells("樣品流水號三").Value &
                             "',N'" & 面料_dgv.Rows(i).Cells("Item_N").Value &
                             "',N'" & 面料_dgv.Rows(i).Cells("內容").Value &
                             "',N'" & 面料_dgv.Rows(i).Cells("Factory").Value &
                              "','" & 面料_dgv.Rows(i).Cells("樣品流水號").Value & "')"
-                CmdSet_For_dr() : conn.Close()
-            Next i
-        End If
-        If 內裡_dgv.Rows.Count > 0 Then
-            For i = 0 To 內裡_dgv.Rows.Count - 1
-                ConnOpen()
-                SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
+                    CmdSet_For_dr() : conn.Close()
+                Next i
+            End If
+            If 內裡_dgv.Rows.Count > 0 Then
+                For i = 0 To 內裡_dgv.Rows.Count - 1
+                    ConnOpen()
+                    SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
                        "VALUES ('" & 內裡_dgv.Rows(i).Cells("樣品流水號二").Value &
                              "','" & 內裡_dgv.Rows(i).Cells("樣品流水號三").Value &
                             "',N'" & 內裡_dgv.Rows(i).Cells("Item_N").Value &
                             "',N'" & 內裡_dgv.Rows(i).Cells("內容").Value &
                             "',N'" & 內裡_dgv.Rows(i).Cells("Factory").Value &
                              "','" & 內裡_dgv.Rows(i).Cells("樣品流水號").Value & "')"
-                CmdSet_For_dr() : conn.Close()
-            Next i
-        End If
-        If 底部_dgv.Rows.Count > 0 Then
-            For i = 0 To 底部_dgv.Rows.Count - 1
-                ConnOpen()
-                SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
+                    CmdSet_For_dr() : conn.Close()
+                Next i
+            End If
+            If 底部_dgv.Rows.Count > 0 Then
+                For i = 0 To 底部_dgv.Rows.Count - 1
+                    ConnOpen()
+                    SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
                        "VALUES ('" & 底部_dgv.Rows(i).Cells("樣品流水號二").Value &
                              "','" & 底部_dgv.Rows(i).Cells("樣品流水號三").Value &
                             "',N'" & 底部_dgv.Rows(i).Cells("Item_N").Value &
                             "',N'" & 底部_dgv.Rows(i).Cells("內容").Value &
                             "',N'" & 底部_dgv.Rows(i).Cells("Factory").Value &
                              "','" & 底部_dgv.Rows(i).Cells("樣品流水號").Value & "')"
-                CmdSet_For_dr() : conn.Close()
-            Next i
-        End If
-        If 飾物_dgv.Rows.Count > 0 Then
-            For i = 0 To 飾物_dgv.Rows.Count - 1
-                ConnOpen()
-                SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
+                    CmdSet_For_dr() : conn.Close()
+                Next i
+            End If
+            If 飾物_dgv.Rows.Count > 0 Then
+                For i = 0 To 飾物_dgv.Rows.Count - 1
+                    ConnOpen()
+                    SQL1 = "INSERT INTO 確認樣品單明細表 (樣品流水號二, 樣品流水號三, 細項, 內容, 廠商, 樣品流水號) " &
                        "VALUES ('" & 飾物_dgv.Rows(i).Cells("樣品流水號二").Value &
                              "','" & 飾物_dgv.Rows(i).Cells("樣品流水號三").Value &
                             "',N'" & 飾物_dgv.Rows(i).Cells("Item_N").Value &
                             "',N'" & 飾物_dgv.Rows(i).Cells("內容").Value &
                             "',N'" & 飾物_dgv.Rows(i).Cells("Factory").Value &
                              "','" & 飾物_dgv.Rows(i).Cells("樣品流水號").Value & "')"
-                CmdSet_For_dr() : conn.Close()
-            Next i
+                    CmdSet_For_dr() : conn.Close()
+                Next i
+            End If
+            ConnOpen()
+            SQL1 = "DELETE FROM 確認樣品單抬頭暫存檔 WHERE (樣品流水號 = '" & 樣品單流水號變數1 & "')"
+            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : conn.Close()
+            ConnOpen()
+            SQL1 = "DELETE FROM 確認樣品單控制表暫存檔 WHERE (樣品流水號 = '" & 樣品單流水號變數1 & "')"
+            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : conn.Close()
+            ConnOpen()
+            SQL1 = "DELETE FROM 確認樣品單明細表暫存檔 WHERE (樣品流水號 = '" & 樣品單流水號變數1 & "')"
+            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : conn.Close()
+            暫存模式 = False
+            階段_cb.Text = QA
+            Set_格式設定() : Set_確認樣品清單() : Set_grid() : Set_再次導入清單()
+            列印用SQL = TextBox3.Text
         End If
-        ConnOpen()
-        SQL1 = "DELETE FROM 確認樣品單抬頭暫存檔 WHERE (樣品流水號 = '" & 樣品單流水號變數1 & "')"
-        cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : conn.Close()
-        ConnOpen()
-        SQL1 = "DELETE FROM 確認樣品單控制表暫存檔 WHERE (樣品流水號 = '" & 樣品單流水號變數1 & "')"
-        cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : conn.Close()
-        ConnOpen()
-        SQL1 = "DELETE FROM 確認樣品單明細表暫存檔 WHERE (樣品流水號 = '" & 樣品單流水號變數1 & "')"
-        cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : conn.Close()
-        暫存模式 = False
-        ComboBox8.Text = QA
-        Set_格式設定() : Set_確認樣品清單() : Set_grid() : Set_再次導入清單()
-        列印用SQL = TextBox3.Text
     End Sub
-
     Private Sub Button34_Click(sender As Object, e As EventArgs) Handles 樣品單存檔_bt.Click
-        If ComboBox1.Text = "" Or ComboBox2.Text = "" Or ComboBox3.Text = "" Or ComboBox4.Text = "" Or ComboBox5.Text = "" Or ComboBox6.Text = "" Or ComboBox7.Text = "" Or ComboBox8.Text = "" Then
+        If ComboBox1.Text = "" Or ComboBox2.Text = "" Or ComboBox3.Text = "" Or ComboBox4.Text = "" Or ComboBox5.Text = "" Or ComboBox6.Text = "" Or ComboBox7.Text = "" Or 階段_cb.Text = "" Then
             MsgBox("抬頭資料有空格，請重新選擇樣品單")
         Else
             If CheckBox8.Checked = True Then : ASD = "D"
@@ -1663,7 +1666,7 @@ Public Class 中文樣品單
             SQL1 = "UPDATE 確認樣品單抬頭 SET 品牌 = '" & ComboBox1.Text & "', 季節 = '" & ComboBox2.Text & "', 工廠 = '" & ComboBox3.Text & "', 楦頭 = '" & ComboBox4.Text & "', " &
                    "Construction = '" & ComboBox5.Text & "', 型體名 = '" & ComboBox6.Text & "', 型體號碼 = '" & ComboBox7.Text & "', 内里印刷 = N'" & TextBox2.Text & "', 中文樣品單產地標 = '" & TextBox4.Text & "', " &
                    "中文樣品單鞋圖 = '" & TextBox5.Text & "', 新舊形體 = '" & CheckBox1.Checked & "', 舊型體季別 = N'" & TextBox1.Text & "', 日期 = '" & Format(DateTimePicker1.Value, "yyyy/MM/dd") & "', " &
-                   "中文樣品單中底LOGO = '" & TextBox10.Text & "', 中文樣品單其他LOGO = '" & TextBox17.Text & "', 階段 = '" & ComboBox8.Text & "', DEVELOPER = N'" & TextBox18.Text & "' " &
+                   "中文樣品單中底LOGO = '" & TextBox10.Text & "', 中文樣品單其他LOGO = '" & TextBox17.Text & "', 階段 = '" & 階段_cb.Text & "', DEVELOPER = N'" & TextBox18.Text & "' " &
                    "WHERE 樣品流水號 LIKE '" & TextBox3.Text & "'"
             CmdSet_For_dr() : conn.Close()
             For i = 0 To 顏色_dgv.Rows.Count - 1
@@ -2020,18 +2023,22 @@ Public Class 中文樣品單
         End If
     End Sub
     Private Sub Button38_Click(sender As Object, e As EventArgs) Handles 刷新資料_bt.Click
-        If 編輯模式_bt.Enabled = False Then
-            ConnOpen()
-            SQL1 = "UPDATE 確認樣品單抬頭 SET 品牌 = '" & ComboBox1.Text & "', 季節 = '" & ComboBox2.Text & "', 工廠 = '" & ComboBox3.Text & "', 楦頭 = '" & ComboBox4.Text & "', " &
-                   "Construction = '" & ComboBox5.Text & "', 型體名 = '" & ComboBox6.Text & "', 型體號碼 = '" & ComboBox7.Text & "', 内里印刷 = N'" & TextBox2.Text & "', 中文樣品單產地標 = '" & TextBox4.Text & "', " &
-                   "中文樣品單鞋圖 = '" & TextBox5.Text & "', 新舊形體 = '" & CheckBox1.Checked & "', 舊型體季別 = N'" & TextBox1.Text & "', 日期 = '" & Format(DateTimePicker1.Value, "yyyy/MM/dd") & "', " &
-                   "中文樣品單中底LOGO = '" & TextBox10.Text & "', 中文樣品單其他LOGO = '" & TextBox17.Text & "', 階段 = '" & ComboBox8.Text & "', DEVELOPER = N'" & TextBox18.Text & "' " &
-                   "WHERE 樣品流水號 LIKE '" & TextBox3.Text & "'"
-            CmdSet_For_dr() : conn.Close()
-            編輯模式存檔()
-            Set_再次導入清單()
-        ElseIf 編輯模式_bt.Enabled = True Then
-            Set_再次導入清單()
+        If 階段_cb.Text = "" Then
+            MsgBox("階段選項不可空白")
+        Else
+            If 編輯模式_bt.Enabled = False Then
+                ConnOpen()
+                SQL1 = "UPDATE 確認樣品單抬頭 SET 品牌 = '" & ComboBox1.Text & "', 季節 = '" & ComboBox2.Text & "', 工廠 = '" & ComboBox3.Text & "', 楦頭 = '" & ComboBox4.Text & "', " &
+                       "Construction = '" & ComboBox5.Text & "', 型體名 = '" & ComboBox6.Text & "', 型體號碼 = '" & ComboBox7.Text & "', 内里印刷 = N'" & TextBox2.Text & "', 中文樣品單產地標 = '" & TextBox4.Text & "', " &
+                       "中文樣品單鞋圖 = '" & TextBox5.Text & "', 新舊形體 = '" & CheckBox1.Checked & "', 舊型體季別 = N'" & TextBox1.Text & "', 日期 = '" & Format(DateTimePicker1.Value, "yyyy/MM/dd") & "', " &
+                       "中文樣品單中底LOGO = '" & TextBox10.Text & "', 中文樣品單其他LOGO = '" & TextBox17.Text & "', 階段 = '" & 階段_cb.Text & "', DEVELOPER = N'" & TextBox18.Text & "' " &
+                       "WHERE 樣品流水號 LIKE '" & TextBox3.Text & "'"
+                CmdSet_For_dr() : conn.Close()
+                編輯模式存檔()
+                Set_再次導入清單()
+            ElseIf 編輯模式_bt.Enabled = True Then
+                Set_再次導入清單()
+            End If
         End If
     End Sub
     Private Sub Button40_Click(sender As Object, e As EventArgs) Handles 調用_bt.Click
@@ -2281,22 +2288,22 @@ Public Class 中文樣品單
             CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = True
         End If
     End Sub
-    Private Sub ComboBox8_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox8.SelectedIndexChanged
-        If ComboBox8.Text = "ILR" Then : ComboBox9.Text = "ILR"
-        ElseIf ComboBox8.Text = "FLR" Then : ComboBox9.Text = "FLR"
-        ElseIf ComboBox8.Text = "SMS" Then : ComboBox9.Text = "SS"
-        ElseIf ComboBox8.Text = "SMU" Or ComboBox8.Text = "SMU" Then : ComboBox9.Text = ""
-        ElseIf ComboBox8.Text = "Proto" Then : ComboBox9.Text = "Proto"
-        ElseIf ComboBox8.Text = "Line" Then : ComboBox9.Text = "Line"
-        ElseIf ComboBox8.Text = "Canada" Then : ComboBox9.Text = "Canada"
-        End If
-        If ComboBox8.Text = "ILR" Or ComboBox8.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
-        ElseIf ComboBox8.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
-        ElseIf ComboBox8.Text = "SMS" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = True
-        ElseIf ComboBox8.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-        ElseIf ComboBox8.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-        ElseIf ComboBox8.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
-        ElseIf ComboBox8.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+    Private Sub ComboBox8_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 階段_cb.SelectedIndexChanged
+        If 階段_cb.Text = "ILR" Then : ComboBox9.Text = "ILR"
+        ElseIf 階段_cb.Text = "FLR" Then : ComboBox9.Text = "FLR"
+        ElseIf 階段_cb.Text = "SMS" Then : ComboBox9.Text = "SS"
+        ElseIf 階段_cb.Text = "SMU" Or 階段_cb.Text = "SMU" Then : ComboBox9.Text = ""
+        ElseIf 階段_cb.Text = "Proto" Then : ComboBox9.Text = "Proto"
+        ElseIf 階段_cb.Text = "Line" Then : ComboBox9.Text = "Line"
+        ElseIf 階段_cb.Text = "Canada" Then : ComboBox9.Text = "Canada"
+        End If
+        If 階段_cb.Text = "ILR" Or 階段_cb.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
+        ElseIf 階段_cb.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
+        ElseIf 階段_cb.Text = "SMS" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = True
+        ElseIf 階段_cb.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+        ElseIf 階段_cb.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+        ElseIf 階段_cb.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+        ElseIf 階段_cb.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
         End If
         TextBox2.Focus()
     End Sub

TENDEN-MES-SYS/量產訂單管理/訂單執行資訊輸入.Designer.vb

@@ -49,6 +49,7 @@ Partial Class 訂單執行資訊輸入
         Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
         Me.Label20 = New System.Windows.Forms.Label()
+        Me.EXCEL檔案導入1_bt = New System.Windows.Forms.Button()
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片庫_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -236,11 +237,11 @@ Partial Class 訂單執行資訊輸入
         '
         'EXCEL檔案導入_bt
         '
-        Me.EXCEL檔案導入_bt.Location = New System.Drawing.Point(752, 131)
+        Me.EXCEL檔案導入_bt.Location = New System.Drawing.Point(752, 97)
         Me.EXCEL檔案導入_bt.Name = "EXCEL檔案導入_bt"
         Me.EXCEL檔案導入_bt.Size = New System.Drawing.Size(346, 30)
         Me.EXCEL檔案導入_bt.TabIndex = 515
-        Me.EXCEL檔案導入_bt.Text = "EXCEL檔案導入-力威訂單號匹配VIONIC訂單號"
+        Me.EXCEL檔案導入_bt.Text = "EXCEL檔案導入-依據力威訂單號匹配VIONIC訂單號"
         Me.EXCEL檔案導入_bt.UseVisualStyleBackColor = True
         '
         'ProgressBar2
@@ -257,7 +258,7 @@ Partial Class 訂單執行資訊輸入
         '
         '資料庫選擇2_bt
         '
-        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(870, 97)
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(870, 63)
         Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
         Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
         Me.資料庫選擇2_bt.TabIndex = 562
@@ -266,7 +267,7 @@ Partial Class 訂單執行資訊輸入
         '
         '資料庫選擇1_bt
         '
-        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(792, 97)
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(792, 63)
         Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
         Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
         Me.資料庫選擇1_bt.TabIndex = 561
@@ -276,17 +277,27 @@ Partial Class 訂單執行資訊輸入
         'Label20
         '
         Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(749, 96)
+        Me.Label20.Location = New System.Drawing.Point(749, 62)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(44, 32)
         Me.Label20.TabIndex = 560
         Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
         '
+        'EXCEL檔案導入1_bt
+        '
+        Me.EXCEL檔案導入1_bt.Location = New System.Drawing.Point(752, 129)
+        Me.EXCEL檔案導入1_bt.Name = "EXCEL檔案導入1_bt"
+        Me.EXCEL檔案導入1_bt.Size = New System.Drawing.Size(346, 30)
+        Me.EXCEL檔案導入1_bt.TabIndex = 563
+        Me.EXCEL檔案導入1_bt.Text = "EXCEL檔案導入-依據力威訂單號更新交期" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
+        Me.EXCEL檔案導入1_bt.UseVisualStyleBackColor = True
+        '
         '訂單執行資訊輸入
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1914, 991)
+        Me.Controls.Add(Me.EXCEL檔案導入1_bt)
         Me.Controls.Add(Me.資料庫選擇2_bt)
         Me.Controls.Add(Me.資料庫選擇1_bt)
         Me.Controls.Add(Me.Label20)
@@ -348,5 +359,6 @@ Partial Class 訂單執行資訊輸入
     Friend WithEvents 資料庫選擇2_bt As Button
     Friend WithEvents 資料庫選擇1_bt As Button
     Friend WithEvents Label20 As Label
+    Friend WithEvents EXCEL檔案導入1_bt As Button
 End Class
 

TENDEN-MES-SYS/量產訂單管理/訂單執行資訊輸入.vb

@@ -239,6 +239,41 @@ Public Class 訂單執行資訊輸入
         分頁一_bt.Enabled = True : 分頁二_bt.Enabled = True : 分頁三_bt.Enabled = False
         Set_grid()
     End Sub
+    Private Sub EXCEL檔案導入1_bt_Click(sender As Object, e As EventArgs) Handles EXCEL檔案導入1_bt.Click
+        If OpenFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then
+            file_name = OpenFileDialog1.FileName
+            xlApp = CreateObject("Excel.Application")
+            xlApp.DisplayAlerts = False
+            xlApp.Visible = True
+            xlApp.Workbooks.Open(file_name)
+            xlSheet = xlApp.Worksheets(1)
+            xlSheet.Activate()
+            xlApp.Visible = False
+            Dim 次數 As Integer = 0
+            For YY As Integer = 1 To 3000
+                資料數1 = 3000 : 進度條1()
+                If IsNothing(xlSheet.Cells(YY, 1).value) Then
+                    Exit For
+                Else
+                    conn.Close()
+                    ConnOpen()
+                    SQL1 = "SELECT 客戶訂單號 FROM " & 訂單資料表(1) & " WHERE 力威訂單號 LIKE '" & xlSheet.Cells(YY, 1).value & "'"
+                    CmdSet_For_dr()
+                    If dr.Read() Then
+                        conn.Close()
+                        ConnOpen()
+                        SQL1 = "UPDATE " & 訂單資料表(1) & " SET 客戶交期 = '" & xlSheet.Cells(YY, 2).value & "', PO_S_Date = '" & xlSheet.Cells(YY, 2).value & "', 
+                                                             Requested_XF = '" & xlSheet.Cells(YY, 2).value & "', Confirm_XF = '" & xlSheet.Cells(YY, 2).value & "' 
+                                WHERE 力威訂單號 LIKE '" & xlSheet.Cells(YY, 1).value & "'"
+                        CmdSet_For_dr() : conn.Close() : 次數 += 1
+                    End If : conn.Close()
+                End If
+            Next : ProgressBar2.Value = 0 : 最終數1 = 0
+            MsgBox("已修改  " & 次數 & "  次!")
+            xlApp.Quit() : xlApp = Nothing
+        ElseIf OpenFileDialog1.ShowDialog = Windows.Forms.DialogResult.No Then
+        End If
+    End Sub
     Private Sub EXCEL檔案導入_bt_Click(sender As Object, e As EventArgs) Handles EXCEL檔案導入_bt.Click
         If OpenFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then
             file_name = OpenFileDialog1.FileName
@@ -280,4 +315,6 @@ Public Class 訂單執行資訊輸入
     Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
         SQL_訂單資料表選擇_非VIONIC() : Set_清單() : Set_grid()
     End Sub
+
+
 End Class

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

@@ -89,7 +89,7 @@ Partial Class 訂單控制表
         Me.CheckBox17 = New System.Windows.Forms.CheckBox()
         Me.天盾訂單號_tb = New System.Windows.Forms.TextBox()
         Me.TextBox7 = New System.Windows.Forms.TextBox()
-        Me.CheckBox23 = New System.Windows.Forms.CheckBox()
+        Me.不使用條件_ch = New System.Windows.Forms.CheckBox()
         Me.Label58 = New System.Windows.Forms.Label()
         Me.TextBox8 = New System.Windows.Forms.TextBox()
         Me.TextBox9 = New System.Windows.Forms.TextBox()
@@ -107,7 +107,7 @@ Partial Class 訂單控制表
         Me.Button22 = New System.Windows.Forms.Button()
         Me.Button28 = New System.Windows.Forms.Button()
         Me.新增_bt = New System.Windows.Forms.Button()
-        Me.Button30 = New System.Windows.Forms.Button()
+        Me.開啟訂單明細表_bt = New System.Windows.Forms.Button()
         Me.Button31 = New System.Windows.Forms.Button()
         Me.Label62 = New System.Windows.Forms.Label()
         Me.TextBox11 = New System.Windows.Forms.TextBox()
@@ -236,8 +236,8 @@ Partial Class 訂單控制表
         Me.BB05_lb = New System.Windows.Forms.Label()
         Me.BB04_lb = New System.Windows.Forms.Label()
         Me.裝箱控制表_dgv = New System.Windows.Forms.DataGridView()
-        Me.裝箱明細_dgv = New System.Windows.Forms.DataGridView()
         Me.明細表_dgv = New System.Windows.Forms.DataGridView()
+        Me.裝箱明細_dgv = New System.Windows.Forms.DataGridView()
         Me.訂單明細_bt = New System.Windows.Forms.Button()
         Me.裝箱明細_bt = New System.Windows.Forms.Button()
         Me.裝箱資訊_bt = New System.Windows.Forms.Button()
@@ -253,8 +253,8 @@ Partial Class 訂單控制表
         Me.SplitContainer1.SuspendLayout()
         Me.資訊_gb.SuspendLayout()
         CType(Me.裝箱控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '控制表_dgv
@@ -803,14 +803,14 @@ Partial Class 訂單控制表
         Me.TextBox7.Size = New System.Drawing.Size(26, 22)
         Me.TextBox7.TabIndex = 295
         '
-        'CheckBox23
+        '不使用條件_ch
         '
-        Me.CheckBox23.AutoSize = True
-        Me.CheckBox23.Location = New System.Drawing.Point(12, 8)
-        Me.CheckBox23.Name = "CheckBox23"
-        Me.CheckBox23.Size = New System.Drawing.Size(15, 14)
-        Me.CheckBox23.TabIndex = 296
-        Me.CheckBox23.UseVisualStyleBackColor = True
+        Me.不使用條件_ch.AutoSize = True
+        Me.不使用條件_ch.Location = New System.Drawing.Point(12, 8)
+        Me.不使用條件_ch.Name = "不使用條件_ch"
+        Me.不使用條件_ch.Size = New System.Drawing.Size(15, 14)
+        Me.不使用條件_ch.TabIndex = 296
+        Me.不使用條件_ch.UseVisualStyleBackColor = True
         '
         'Label58
         '
@@ -979,15 +979,15 @@ Partial Class 訂單控制表
         Me.新增_bt.Text = "新增"
         Me.新增_bt.UseVisualStyleBackColor = True
         '
-        'Button30
+        '開啟訂單明細表_bt
         '
-        Me.Button30.ForeColor = System.Drawing.Color.Black
-        Me.Button30.Location = New System.Drawing.Point(547, 103)
-        Me.Button30.Name = "Button30"
-        Me.Button30.Size = New System.Drawing.Size(73, 43)
-        Me.Button30.TabIndex = 326
-        Me.Button30.Text = "開啟訂單明細表"
-        Me.Button30.UseVisualStyleBackColor = True
+        Me.開啟訂單明細表_bt.ForeColor = System.Drawing.Color.Black
+        Me.開啟訂單明細表_bt.Location = New System.Drawing.Point(547, 103)
+        Me.開啟訂單明細表_bt.Name = "開啟訂單明細表_bt"
+        Me.開啟訂單明細表_bt.Size = New System.Drawing.Size(73, 43)
+        Me.開啟訂單明細表_bt.TabIndex = 326
+        Me.開啟訂單明細表_bt.Text = "開啟訂單明細表"
+        Me.開啟訂單明細表_bt.UseVisualStyleBackColor = True
         '
         'Button31
         '
@@ -1690,8 +1690,8 @@ Partial Class 訂單控制表
         Me.SplitContainer1.Panel2.AutoScroll = True
         Me.SplitContainer1.Panel2.Controls.Add(Me.資訊_gb)
         Me.SplitContainer1.Panel2.Controls.Add(Me.裝箱控制表_dgv)
-        Me.SplitContainer1.Panel2.Controls.Add(Me.裝箱明細_dgv)
         Me.SplitContainer1.Panel2.Controls.Add(Me.明細表_dgv)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.裝箱明細_dgv)
         Me.SplitContainer1.Size = New System.Drawing.Size(1900, 695)
         Me.SplitContainer1.SplitterDistance = 454
         Me.SplitContainer1.TabIndex = 753
@@ -2236,26 +2236,10 @@ Partial Class 訂單控制表
         Me.裝箱控制表_dgv.Size = New System.Drawing.Size(465, 229)
         Me.裝箱控制表_dgv.TabIndex = 3
         '
-        '裝箱明細_dgv
-        '
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
-        Me.裝箱明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.裝箱明細_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.裝箱明細_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.裝箱明細_dgv.Location = New System.Drawing.Point(475, 2)
-        Me.裝箱明細_dgv.Name = "裝箱明細_dgv"
-        Me.裝箱明細_dgv.RowHeadersWidth = 5
-        Me.裝箱明細_dgv.RowTemplate.Height = 24
-        Me.裝箱明細_dgv.Size = New System.Drawing.Size(1418, 229)
-        Me.裝箱明細_dgv.TabIndex = 4
-        '
         '明細表_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.明細表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -2268,6 +2252,22 @@ Partial Class 訂單控制表
         Me.明細表_dgv.Size = New System.Drawing.Size(1418, 229)
         Me.明細表_dgv.TabIndex = 2
         '
+        '裝箱明細_dgv
+        '
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, 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) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.裝箱明細_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.裝箱明細_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.裝箱明細_dgv.Location = New System.Drawing.Point(475, 2)
+        Me.裝箱明細_dgv.Name = "裝箱明細_dgv"
+        Me.裝箱明細_dgv.RowHeadersWidth = 5
+        Me.裝箱明細_dgv.RowTemplate.Height = 24
+        Me.裝箱明細_dgv.Size = New System.Drawing.Size(1418, 229)
+        Me.裝箱明細_dgv.TabIndex = 4
+        '
         '訂單明細_bt
         '
         Me.訂單明細_bt.Enabled = False
@@ -2374,7 +2374,7 @@ Partial Class 訂單控制表
         Me.Controls.Add(Me.Label62)
         Me.Controls.Add(Me.TextBox11)
         Me.Controls.Add(Me.Button31)
-        Me.Controls.Add(Me.Button30)
+        Me.Controls.Add(Me.開啟訂單明細表_bt)
         Me.Controls.Add(Me.Button28)
         Me.Controls.Add(Me.Button22)
         Me.Controls.Add(Me.Button14)
@@ -2387,7 +2387,7 @@ Partial Class 訂單控制表
         Me.Controls.Add(Me.TextBox9)
         Me.Controls.Add(Me.TextBox8)
         Me.Controls.Add(Me.Label58)
-        Me.Controls.Add(Me.CheckBox23)
+        Me.Controls.Add(Me.不使用條件_ch)
         Me.Controls.Add(Me.TextBox7)
         Me.Controls.Add(Me.CheckBox17)
         Me.Controls.Add(Me.CheckBox9)
@@ -2467,8 +2467,8 @@ Partial Class 訂單控制表
         Me.資訊_gb.ResumeLayout(False)
         Me.資訊_gb.PerformLayout()
         CType(Me.裝箱控制表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -2535,7 +2535,7 @@ Partial Class 訂單控制表
     Friend WithEvents CheckBox17 As CheckBox
     Friend WithEvents 天盾訂單號_tb As TextBox
     Friend WithEvents TextBox7 As TextBox
-    Friend WithEvents CheckBox23 As CheckBox
+    Friend WithEvents 不使用條件_ch As CheckBox
     Friend WithEvents Label58 As Label
     Friend WithEvents TextBox8 As TextBox
     Friend WithEvents TextBox9 As TextBox
@@ -2553,7 +2553,7 @@ Partial Class 訂單控制表
     Friend WithEvents Button22 As Button
     Friend WithEvents Button28 As Button
     Friend WithEvents 新增_bt As Button
-    Friend WithEvents Button30 As Button
+    Friend WithEvents 開啟訂單明細表_bt As Button
     Friend WithEvents Button31 As Button
     Friend WithEvents Label62 As Label
     Friend WithEvents TextBox11 As TextBox

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

@@ -40,7 +40,7 @@ Public Class 訂單控制表
     Private ReadOnly BB(9) As Boolean
     Dim aa As MsgBoxResult
     Private Sub SQL宣告()
-        SQL字串1 = "SELECT                訂單流水號,               年份季度,               客戶訂單號,            形體號,             顏色,                  楦型,                 訂單數量, " &
+        SQL字串1 = "SELECT                訂單流水號,               年份季度,               力威訂單號,            形體號,             顏色,                  楦型,                 訂單數量, " &
                                            "客戶交期,                   單價,                   總金額,              備註,         生產工廠,              訂單種類,             工廠回復交期, " &
                                             "CFMSPEC,              CFMSAMPLE,                   TRIAL1,            TRIAL2,           TRIAL3,                TRIAL4,             包裝確認時間, " &
                                            "貼標時間,               裁斷時間,                 針車時間,          成型時間,         驗貨時間,            實際離廠日,               資料流水號, " &
@@ -50,7 +50,7 @@ Public Class 訂單控制表
                                        "TRIAL3 AS T3,           TRIAL4 AS T4,          CFMSPEC AS TEST,              面料,             副料,                  中底,                     鞋墊, " &
                                                "大底,                     跟,     包裝確認時間 AS 包裝,  裁斷時間 AS 裁斷, 針車時間 AS 針車,      成型時間 AS 成型,         驗貨時間 AS 驗貨, " &
                                     "工廠進度表備註1,        工廠進度表備註2,             客戶包裝確認,      東莞業務備註,     驗貨報告圖片,              工廠確認,                 利威確認, 
-                                              結關日,                SMS簽回,                  FRS簽回,     MASTER_SWATCH,       力威訂單號,             ProductID,                      UoM
+                                              結關日,                SMS簽回,                  FRS簽回,     MASTER_SWATCH,       客戶訂單號,             ProductID,                      UoM
                     FROM " & 訂單資料表(1) & ""
     End Sub
     Private Sub Set_grid()
@@ -169,11 +169,11 @@ Public Class 訂單控制表
     End Sub
     Private Sub Set_搜尋()
         If CheckBox1.Checked = False And CheckBox2.Checked = False And CheckBox3.Checked = False And CheckBox4.Checked = False And CheckBox5.Checked = False And CheckBox6.Checked = False And
-            CheckBox7.Checked = False And CheckBox8.Checked = False And CheckBox9.Checked = False And CheckBox17.Checked = False And CheckBox23.Checked = False Then
+            CheckBox7.Checked = False And CheckBox8.Checked = False And CheckBox9.Checked = False And CheckBox17.Checked = False And 不使用條件_ch.Checked = False Then
         Else
             Set_DGV1載入前設定()
         End If
-        If CheckBox23.Checked = True Then
+        If 不使用條件_ch.Checked = True Then
             PA = InputBox("請輸入要查詢的資料")
             列印用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 
@@ -721,7 +721,7 @@ Public Class 訂單控制表
             MsgBox("沒有選擇篩選條件")
         End If
         If CheckBox1.Checked = False And CheckBox2.Checked = False And CheckBox3.Checked = False And CheckBox4.Checked = False And CheckBox5.Checked = False And CheckBox6.Checked = False And
-            CheckBox7.Checked = False And CheckBox8.Checked = False And CheckBox9.Checked = False And CheckBox17.Checked = False And CheckBox23.Checked = False Then
+            CheckBox7.Checked = False And CheckBox8.Checked = False And CheckBox9.Checked = False And CheckBox17.Checked = False And 不使用條件_ch.Checked = False Then
         Else
             Set_DGV1載入後設定() : Set_自動彙總1() : Set_grid() : Set_自動彙總1()
         End If
@@ -741,7 +741,7 @@ Public Class 訂單控制表
         Button11.Enabled = False : 第一頁_bt.Enabled = False : 第二頁_bt.Enabled = True : 第三頁_bt.Enabled = True
     End Sub
     Private Sub Set_格式設定1()
-        CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox23.Checked = False
+        CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : 不使用條件_ch.Checked = False
     End Sub
     Private Sub Set_自動彙總1()
         Dim 數量加總 As Double = 0 : Dim 金額加總 As Double = 0
@@ -940,7 +940,7 @@ Public Class 訂單控制表
         AA1_lb.Text = "Purchasing Group" : AA2_lb.Text = "PO Type" : AA3_lb.Text = "Inco Terms" : AA4_lb.Text = "CALERES PO#" : AA5_lb.Text = "SERVICED"
         AA6_lb.Text = "Version" : AA7_lb.Text = "Vendor" : AA8_lb.Text = "Company Code" : AA9_lb.Text = "Shipping Method" : AA10_lb.Text = "Ship To"
         AA11_lb.Text = "Factory No" : AA12_lb.Text = "Final Customer Ship To"
-        明細表_dgv.Visible = True : 裝箱明細_dgv.Visible = False : 資訊_gb.Visible = False
+        明細表_dgv.Visible = True : 裝箱明細_dgv.Visible = False : 資訊_gb.Visible = False : 開啟訂單明細表_bt.Visible = False
 
         訂單資料庫選擇.ShowDialog()
 
@@ -981,7 +981,7 @@ Public Class 訂單控制表
         End If
         '訂單明細表可視權限
         If CC(15) = False Then
-            Button30.Enabled = False
+            開啟訂單明細表_bt.Enabled = False
         End If
         '客戶交期可視權限
         If CC(17) = False Then
@@ -1026,7 +1026,7 @@ Public Class 訂單控制表
             PP1 = 控制表_dgv(3, e.RowIndex).Value.ToString : PP2 = 控制表_dgv(4, e.RowIndex).Value.ToString
             ComboBox2下拉表單資料載入() : ComboBox3下拉表單資料載入()
             天盾訂單號_tb.Text = 控制表_dgv(0, e.RowIndex).Value.ToString : ComboBox1.Text = 控制表_dgv(1, e.RowIndex).Value.ToString
-            客戶訂單號_tb.Text = 控制表_dgv(2, e.RowIndex).Value.ToString : ComboBox2.Text = 控制表_dgv(3, e.RowIndex).Value.ToString
+            客戶訂單號_tb.Text = 控制表_dgv("客戶訂單號", e.RowIndex).Value.ToString : ComboBox2.Text = 控制表_dgv(3, e.RowIndex).Value.ToString
             ComboBox3.Text = 控制表_dgv(4, e.RowIndex).Value.ToString : ComboBox4.Text = 控制表_dgv(5, e.RowIndex).Value.ToString
             訂單數量 = 控制表_dgv(6, e.RowIndex).Value.ToString : TextBox3.Text = Format(Val(訂單數量), "#,##0")
 
@@ -1175,8 +1175,8 @@ Public Class 訂單控制表
     Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click
         DateTimePicker30.Format = DateTimePickerFormat.Custom : DateTimePicker30.CustomFormat = " "
     End Sub
-    Private Sub CheckBox23_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox23.Click
-        If CheckBox23.Checked = True Then : CheckBox23.Checked = True : Set_格式設定() : Else : CheckBox23.Checked = False : End If
+    Private Sub CheckBox23_CheckedChanged(sender As Object, e As EventArgs) Handles 不使用條件_ch.Click
+        If 不使用條件_ch.Checked = True Then : 不使用條件_ch.Checked = True : Set_格式設定() : Else : 不使用條件_ch.Checked = False : End If
     End Sub
     Private Sub CheckBox6_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox6.Click
         If CheckBox6.Checked = True Then
@@ -1218,49 +1218,49 @@ Public Class 訂單控制表
         If CheckBox6.Checked = True Or CheckBox9.Checked = True Or CheckBox17.Checked = True Then
             CheckBox1.Checked = False
         Else
-            If CheckBox1.Checked = True Then : CheckBox1.Checked = True : CheckBox23.Checked = False : Else : CheckBox1.Checked = False : End If
+            If CheckBox1.Checked = True Then : CheckBox1.Checked = True : 不使用條件_ch.Checked = False : Else : CheckBox1.Checked = False : End If
         End If
     End Sub
     Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox2.Click
         If CheckBox6.Checked = True Or CheckBox9.Checked = True Or CheckBox17.Checked = True Then
             CheckBox2.Checked = False
         Else
-            If CheckBox2.Checked = True Then : CheckBox2.Checked = True : CheckBox23.Checked = False : Else : CheckBox2.Checked = False : End If
+            If CheckBox2.Checked = True Then : CheckBox2.Checked = True : 不使用條件_ch.Checked = False : Else : CheckBox2.Checked = False : End If
         End If
     End Sub
     Private Sub CheckBox3_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox3.Click
         If CheckBox6.Checked = True Or CheckBox9.Checked = True Or CheckBox17.Checked = True Then
             CheckBox3.Checked = False
         Else
-            If CheckBox3.Checked = True Then : CheckBox3.Checked = True : CheckBox23.Checked = False : Else : CheckBox3.Checked = False : End If
+            If CheckBox3.Checked = True Then : CheckBox3.Checked = True : 不使用條件_ch.Checked = False : Else : CheckBox3.Checked = False : End If
         End If
     End Sub
     Private Sub CheckBox4_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox4.Click
         If CheckBox6.Checked = True Or CheckBox9.Checked = True Or CheckBox17.Checked = True Then
             CheckBox4.Checked = False
         Else
-            If CheckBox4.Checked = True Then : CheckBox4.Checked = True : CheckBox23.Checked = False : Else : CheckBox4.Checked = False : End If
+            If CheckBox4.Checked = True Then : CheckBox4.Checked = True : 不使用條件_ch.Checked = False : Else : CheckBox4.Checked = False : End If
         End If
     End Sub
     Private Sub CheckBox5_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox5.Click
         If CheckBox6.Checked = True Or CheckBox9.Checked = True Or CheckBox17.Checked = True Then
             CheckBox5.Checked = False
         Else
-            If CheckBox5.Checked = True Then : CheckBox5.Checked = True : CheckBox23.Checked = False : Else : CheckBox5.Checked = False : End If
+            If CheckBox5.Checked = True Then : CheckBox5.Checked = True : 不使用條件_ch.Checked = False : Else : CheckBox5.Checked = False : End If
         End If
     End Sub
     Private Sub CheckBox7_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox7.Click
         If CheckBox17.Checked = True Then
             CheckBox7.Checked = False
         Else
-            If CheckBox7.Checked = True Then : CheckBox7.Checked = True : CheckBox23.Checked = False : Else : CheckBox7.Checked = False : End If
+            If CheckBox7.Checked = True Then : CheckBox7.Checked = True : 不使用條件_ch.Checked = False : Else : CheckBox7.Checked = False : End If
         End If
     End Sub
     Private Sub CheckBox8_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox8.Click
         If CheckBox17.Checked = True Then
             CheckBox8.Checked = False
         Else
-            If CheckBox8.Checked = True Then : CheckBox8.Checked = True : CheckBox23.Checked = False : Else : CheckBox8.Checked = False : End If
+            If CheckBox8.Checked = True Then : CheckBox8.Checked = True : 不使用條件_ch.Checked = False : Else : CheckBox8.Checked = False : End If
         End If
     End Sub
     Private Sub TextBox3_TextChanged(sender As Object, e As EventArgs) Handles TextBox3.TextChanged
@@ -1420,22 +1420,28 @@ Public Class 訂單控制表
         aa = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
             ConnOpen()
-            SQL1 = "DELETE FROM " & 訂單資料表(1) & " WHERE (資料流水號 = '" & TextBox7.Text & "')"
+            SQL1 = "DELETE FROM " & 訂單資料表(1) & " WHERE (訂單流水號 = '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
-            SQL1 = "DELETE FROM 訂單控制表修改紀錄 WHERE (流水號 = '" & TextBox7.Text & "')"
+            SQL1 = "DELETE FROM " & 訂單資料表(0) & " WHERE (天盾流水號 = '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             ConnOpen()
-            SQL1 = "DELETE FROM " & 訂單資料表(6) & " WHERE (資料流水號 = '" & TextBox7.Text & "')"
+            SQL1 = "DELETE FROM " & 訂單資料表(6) & " WHERE (天盾流水號 = '" & 天盾訂單號_tb.Text & "')"
+            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
+            ConnOpen()
+            SQL1 = "DELETE FROM " & 訂單資料表(2) & " WHERE (天盾流水號 = '" & 天盾訂單號_tb.Text & "')"
+            cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
+            ConnOpen()
+            SQL1 = "DELETE FROM " & 訂單資料表(3) & " WHERE (天盾流水號 = '" & 天盾訂單號_tb.Text & "')"
             cmd.CommandText = SQL1 : cmd.Connection = conn : cmd.ExecuteNonQuery() : cmd.ExecuteNonQuery() : conn.Close()
             MsgBox("刪除完成")
         End If
-        Set_搜尋()
+        Set_訂單清單() : Set_自動彙總1() : Set_grid()
     End Sub
     Private Sub Button28_Click(sender As Object, e As EventArgs) Handles Button28.Click
         If 列印用SQL = "" Then : MsgBox("請先搜尋資料後再行列印") : Else : 訂單列印選擇.Show() : End If
     End Sub
-    Private Sub Button30_Click(sender As Object, e As EventArgs) Handles Button30.Click
+    Private Sub Button30_Click(sender As Object, e As EventArgs) Handles 開啟訂單明細表_bt.Click
         If 天盾訂單號_tb.Text = "" Then
             MsgBox("請先選擇訂單資料")
         Else

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

@@ -45,13 +45,13 @@ Public Class 訂單明細表
                                     訂單明細表.[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        dbo.訂單明細表 INNER JOIN
+                        FROM        訂單明細表 INNER JOIN
                                        (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                        FROM     dbo.訂單控制表
+                                        FROM     訂單控制表
                                         WHERE   (客戶訂單號 LIKE '" & 客戶訂單號_tb.Text & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單流水號 LIKE '" & 訂單號_tb.Text & "')) AS WWEE ON 
-                                    dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                    dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                    dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                    訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                    訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                    訂單明細表.DM = WWEE.楦型 AND 
                                     訂單明細表.[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] = WWEE.訂單數量
@@ -65,13 +65,13 @@ Public Class 訂單明細表
                                     訂單明細表.[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        dbo.訂單明細表 INNER JOIN
+                        FROM        訂單明細表 INNER JOIN
                                        (SELECT   訂單流水號, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, CXL
-                                        FROM     dbo.訂單控制表
+                                        FROM     訂單控制表
                                         WHERE   (客戶訂單號 LIKE '" & 客戶訂單號_tb.Text & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單流水號 LIKE '" & 訂單號_tb.Text & "')) AS WWEE ON 
-                                    dbo.訂單明細表.天盾流水號 = WWEE.訂單流水號 AND dbo.訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
-                                    dbo.訂單明細表.ProductName = WWEE.形體號 AND dbo.訂單明細表.Color = WWEE.顏色 AND 
-                                    dbo.訂單明細表.DM = WWEE.楦型 AND 
+                                    訂單明細表.天盾流水號 = WWEE.訂單流水號 AND 訂單明細表.客戶訂單號 = WWEE.客戶訂單號 AND 
+                                    訂單明細表.ProductName = WWEE.形體號 AND 訂單明細表.Color = WWEE.顏色 AND 
+                                    訂單明細表.DM = WWEE.楦型 AND 
                                     訂單明細表.[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] = WWEE.訂單數量

TENDEN-MES-SYS/量產訂單管理/訂單資料匯入-力威.Designer.vb

@@ -571,6 +571,7 @@ Partial Class 訂單資料匯入_力威
         Me.供應商編號_tb.Name = "供應商編號_tb"
         Me.供應商編號_tb.Size = New System.Drawing.Size(139, 23)
         Me.供應商編號_tb.TabIndex = 621
+        Me.供應商編號_tb.Text = " 903537"
         '
         'Label14
         '

TENDEN-MES-SYS/量產訂單管理/訂單資料匯入-力威.vb

@@ -254,7 +254,7 @@ Public Class 訂單資料匯入_力威
 
         SEASON_cb_下拉表單資料載入() : DIV_cb_下拉表單資料載入() : Remark_cb_下拉表單資料載入() : FTY_cb_下拉表單資料載入()
 
-        Number_tb.Text = "" : Brand_cb.Text = "" : 訂單類別_tb.Text = "" : 英科條款_tb.Text = "" : 公司編號_tb.Text = "" : 服務_tb.Text = "" : 版本_tb.Text = "" : 供應商編號_tb.Text = ""
+        Number_tb.Text = "" : Brand_cb.Text = "" : 訂單類別_tb.Text = "" : 英科條款_tb.Text = "" : 公司編號_tb.Text = "" : 服務_tb.Text = "" : 版本_tb.Text = "" : 供應商編號_tb.Text = " 903537"
         客戶訂單號_tb.Text = "" : 郵寄方式_tb.Text = "" : 客戶交期_dtp.Value = Today() : 客戶交期_dtp.Text = "" : 總雙數_tb.Text = "" : 總案件_tb.Text = "" : VendorName_tb.Text = ""
         工廠編號_tb.Text = "" : 地址1_tb.Text = "" : 地址二_tb.Text = "" : 代理編號_cb.Text = "" : 訂貨代理_tb.Text = "" : 天盾流水號_tb.Text = "" : 最終運送_tb.Text = ""
 
@@ -332,7 +332,7 @@ Public Class 訂單資料匯入_力威
                         資料數1 = 60 : 進度條1()
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 16) = "Purchasing Group" Then : Brand_cb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 22, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 7) = "PO Type" Then : 訂單類別_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
-                        If Strings.Left(xlSheet.Cells(YY, XX).value, 6) = "Vendor" Then : 供應商編號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
+                        'If Strings.Left(xlSheet.Cells(YY, XX).value, 6) = "Vendor" Then : 供應商編號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 18) = "Unsized Commitment" Then : 客戶訂單號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 28, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 12) = "Company Code" Then
                             公司編號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 18, 4) : 服務_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 35, 500) : End If

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

@@ -22,23 +22,23 @@ Partial Class 訂單資料比對與修改_力威
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle34 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()
+        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 DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -184,6 +184,8 @@ Partial Class 訂單資料比對與修改_力威
         Me.國標測試報告_ch = New System.Windows.Forms.CheckBox()
         Me.Label28 = New System.Windows.Forms.Label()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.刪除新建_bt = New System.Windows.Forms.Button()
+        Me.覆蓋更新_bt = New System.Windows.Forms.Button()
         Me.BB12_lb = New System.Windows.Forms.Label()
         Me.BB11_lb = New System.Windows.Forms.Label()
         Me.BB10_lb = New System.Windows.Forms.Label()
@@ -294,8 +296,6 @@ Partial Class 訂單資料比對與修改_力威
         Me.Label88 = New System.Windows.Forms.Label()
         Me.Label71 = New System.Windows.Forms.Label()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
-        Me.覆蓋更新_bt = New System.Windows.Forms.Button()
-        Me.刪除新建_bt = New System.Windows.Forms.Button()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -506,8 +506,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '控制表1_dgv
         '
-        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.控制表1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.控制表1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         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)
@@ -522,8 +522,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '明細表1_dgv
         '
-        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         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)
@@ -561,8 +561,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱控制1_dgv
         '
-        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱控制1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.裝箱控制1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         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)
@@ -576,8 +576,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱明細1_dgv
         '
-        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱明細1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.裝箱明細1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.裝箱明細1_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.裝箱明細1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -600,8 +600,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '抬頭清單_dgv
         '
-        DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.抬頭清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
+        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) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -745,6 +745,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.供應商編號1_tb.Name = "供應商編號1_tb"
         Me.供應商編號1_tb.Size = New System.Drawing.Size(139, 23)
         Me.供應商編號1_tb.TabIndex = 825
+        Me.供應商編號1_tb.Text = " 903537"
         '
         'Label38
         '
@@ -1306,8 +1307,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '控制表_dgv
         '
-        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, 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) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1322,8 +1323,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '明細表_dgv
         '
-        DataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, 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)
@@ -1361,8 +1362,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱控制_dgv
         '
-        DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱控制_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, 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)
@@ -1376,8 +1377,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱明細_dgv
         '
-        DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.裝箱明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
         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
@@ -1528,6 +1529,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.供應商編號_tb.Name = "供應商編號_tb"
         Me.供應商編號_tb.Size = New System.Drawing.Size(139, 23)
         Me.供應商編號_tb.TabIndex = 757
+        Me.供應商編號_tb.Text = " 903537"
         '
         'Label12
         '
@@ -1999,6 +2001,28 @@ Partial Class 訂單資料比對與修改_力威
         Me.TabPage3.Text = "--------------------訂單改版比對--------------------"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
+        '刪除新建_bt
+        '
+        Me.刪除新建_bt.Enabled = False
+        Me.刪除新建_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.刪除新建_bt.Location = New System.Drawing.Point(1433, 194)
+        Me.刪除新建_bt.Name = "刪除新建_bt"
+        Me.刪除新建_bt.Size = New System.Drawing.Size(220, 25)
+        Me.刪除新建_bt.TabIndex = 914
+        Me.刪除新建_bt.Text = "資料對比後需要刪除舊資料新建"
+        Me.刪除新建_bt.UseVisualStyleBackColor = True
+        '
+        '覆蓋更新_bt
+        '
+        Me.覆蓋更新_bt.Enabled = False
+        Me.覆蓋更新_bt.ForeColor = System.Drawing.Color.Green
+        Me.覆蓋更新_bt.Location = New System.Drawing.Point(1209, 194)
+        Me.覆蓋更新_bt.Name = "覆蓋更新_bt"
+        Me.覆蓋更新_bt.Size = New System.Drawing.Size(220, 25)
+        Me.覆蓋更新_bt.TabIndex = 913
+        Me.覆蓋更新_bt.Text = "資料對比後吻合度可覆蓋更新"
+        Me.覆蓋更新_bt.UseVisualStyleBackColor = True
+        '
         'BB12_lb
         '
         Me.BB12_lb.AutoSize = True
@@ -2254,8 +2278,8 @@ Partial Class 訂單資料比對與修改_力威
         Me.SplitContainer7.Panel2.AutoScroll = True
         Me.SplitContainer7.Panel2.Controls.Add(Me.Label19)
         Me.SplitContainer7.Panel2.Controls.Add(Me.控制表3_dgv)
-        Me.SplitContainer7.Size = New System.Drawing.Size(1870, 718)
-        Me.SplitContainer7.SplitterDistance = 344
+        Me.SplitContainer7.Size = New System.Drawing.Size(1870, 721)
+        Me.SplitContainer7.SplitterDistance = 345
         Me.SplitContainer7.TabIndex = 644
         '
         'Label7
@@ -2269,8 +2293,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '控制表2_dgv
         '
-        DataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.控制表2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.控制表2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
         Me.控制表2_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)
@@ -2280,7 +2304,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.控制表2_dgv.Name = "控制表2_dgv"
         Me.控制表2_dgv.RowHeadersWidth = 5
         Me.控制表2_dgv.RowTemplate.Height = 24
-        Me.控制表2_dgv.Size = New System.Drawing.Size(1856, 307)
+        Me.控制表2_dgv.Size = New System.Drawing.Size(1856, 308)
         Me.控制表2_dgv.TabIndex = 637
         '
         'Label19
@@ -2294,8 +2318,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '控制表3_dgv
         '
-        DataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.控制表3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.控制表3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
         Me.控制表3_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)
@@ -2305,7 +2329,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.控制表3_dgv.Name = "控制表3_dgv"
         Me.控制表3_dgv.RowHeadersWidth = 5
         Me.控制表3_dgv.RowTemplate.Height = 24
-        Me.控制表3_dgv.Size = New System.Drawing.Size(1856, 333)
+        Me.控制表3_dgv.Size = New System.Drawing.Size(1856, 335)
         Me.控制表3_dgv.TabIndex = 638
         '
         'TabPage5
@@ -2341,8 +2365,8 @@ Partial Class 訂單資料比對與修改_力威
         Me.SplitContainer8.Panel2.AutoScroll = True
         Me.SplitContainer8.Panel2.Controls.Add(Me.Label52)
         Me.SplitContainer8.Panel2.Controls.Add(Me.明細表3_dgv)
-        Me.SplitContainer8.Size = New System.Drawing.Size(1870, 718)
-        Me.SplitContainer8.SplitterDistance = 344
+        Me.SplitContainer8.Size = New System.Drawing.Size(1870, 721)
+        Me.SplitContainer8.SplitterDistance = 345
         Me.SplitContainer8.TabIndex = 645
         '
         'Label34
@@ -2356,8 +2380,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '明細表2_dgv
         '
-        DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
         Me.明細表2_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)
@@ -2367,7 +2391,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.明細表2_dgv.Name = "明細表2_dgv"
         Me.明細表2_dgv.RowHeadersWidth = 5
         Me.明細表2_dgv.RowTemplate.Height = 24
-        Me.明細表2_dgv.Size = New System.Drawing.Size(1856, 307)
+        Me.明細表2_dgv.Size = New System.Drawing.Size(1856, 308)
         Me.明細表2_dgv.TabIndex = 637
         '
         'Label52
@@ -2381,8 +2405,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '明細表3_dgv
         '
-        DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
         Me.明細表3_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)
@@ -2392,7 +2416,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.明細表3_dgv.Name = "明細表3_dgv"
         Me.明細表3_dgv.RowHeadersWidth = 5
         Me.明細表3_dgv.RowTemplate.Height = 24
-        Me.明細表3_dgv.Size = New System.Drawing.Size(1856, 333)
+        Me.明細表3_dgv.Size = New System.Drawing.Size(1856, 335)
         Me.明細表3_dgv.TabIndex = 638
         '
         'TabPage6
@@ -2428,8 +2452,8 @@ Partial Class 訂單資料比對與修改_力威
         Me.SplitContainer9.Panel2.AutoScroll = True
         Me.SplitContainer9.Panel2.Controls.Add(Me.Label61)
         Me.SplitContainer9.Panel2.Controls.Add(Me.裝箱控制3_dgv)
-        Me.SplitContainer9.Size = New System.Drawing.Size(1870, 718)
-        Me.SplitContainer9.SplitterDistance = 344
+        Me.SplitContainer9.Size = New System.Drawing.Size(1870, 721)
+        Me.SplitContainer9.SplitterDistance = 345
         Me.SplitContainer9.TabIndex = 645
         '
         'Label60
@@ -2443,8 +2467,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱控制2_dgv
         '
-        DataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱控制2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31
+        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.裝箱控制2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
         Me.裝箱控制2_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)
@@ -2453,7 +2477,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.裝箱控制2_dgv.Name = "裝箱控制2_dgv"
         Me.裝箱控制2_dgv.RowHeadersWidth = 5
         Me.裝箱控制2_dgv.RowTemplate.Height = 24
-        Me.裝箱控制2_dgv.Size = New System.Drawing.Size(1856, 307)
+        Me.裝箱控制2_dgv.Size = New System.Drawing.Size(1856, 308)
         Me.裝箱控制2_dgv.TabIndex = 637
         '
         'Label61
@@ -2467,8 +2491,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱控制3_dgv
         '
-        DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱控制3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32
+        DataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.裝箱控制3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15
         Me.裝箱控制3_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)
@@ -2477,7 +2501,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.裝箱控制3_dgv.Name = "裝箱控制3_dgv"
         Me.裝箱控制3_dgv.RowHeadersWidth = 5
         Me.裝箱控制3_dgv.RowTemplate.Height = 24
-        Me.裝箱控制3_dgv.Size = New System.Drawing.Size(1856, 333)
+        Me.裝箱控制3_dgv.Size = New System.Drawing.Size(1856, 335)
         Me.裝箱控制3_dgv.TabIndex = 638
         '
         'TabPage7
@@ -2513,8 +2537,8 @@ Partial Class 訂單資料比對與修改_力威
         Me.SplitContainer10.Panel2.AutoScroll = True
         Me.SplitContainer10.Panel2.Controls.Add(Me.Label66)
         Me.SplitContainer10.Panel2.Controls.Add(Me.裝箱明細3_dgv)
-        Me.SplitContainer10.Size = New System.Drawing.Size(1870, 718)
-        Me.SplitContainer10.SplitterDistance = 344
+        Me.SplitContainer10.Size = New System.Drawing.Size(1870, 721)
+        Me.SplitContainer10.SplitterDistance = 345
         Me.SplitContainer10.TabIndex = 645
         '
         'Label65
@@ -2528,8 +2552,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱明細2_dgv
         '
-        DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱明細2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33
+        DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.裝箱明細2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
         Me.裝箱明細2_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)
@@ -2539,7 +2563,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.裝箱明細2_dgv.Name = "裝箱明細2_dgv"
         Me.裝箱明細2_dgv.RowHeadersWidth = 5
         Me.裝箱明細2_dgv.RowTemplate.Height = 24
-        Me.裝箱明細2_dgv.Size = New System.Drawing.Size(1856, 307)
+        Me.裝箱明細2_dgv.Size = New System.Drawing.Size(1856, 308)
         Me.裝箱明細2_dgv.TabIndex = 637
         '
         'Label66
@@ -2553,8 +2577,8 @@ Partial Class 訂單資料比對與修改_力威
         '
         '裝箱明細3_dgv
         '
-        DataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.裝箱明細3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle34
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.裝箱明細3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
         Me.裝箱明細3_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)
@@ -2564,7 +2588,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.裝箱明細3_dgv.Name = "裝箱明細3_dgv"
         Me.裝箱明細3_dgv.RowHeadersWidth = 5
         Me.裝箱明細3_dgv.RowTemplate.Height = 24
-        Me.裝箱明細3_dgv.Size = New System.Drawing.Size(1856, 333)
+        Me.裝箱明細3_dgv.Size = New System.Drawing.Size(1856, 335)
         Me.裝箱明細3_dgv.TabIndex = 638
         '
         'AA18_lb
@@ -2698,6 +2722,7 @@ Partial Class 訂單資料比對與修改_力威
         Me.供應商編號2_tb.Name = "供應商編號2_tb"
         Me.供應商編號2_tb.Size = New System.Drawing.Size(139, 23)
         Me.供應商編號2_tb.TabIndex = 882
+        Me.供應商編號2_tb.Text = " 903537"
         '
         'AA06_lb
         '
@@ -3154,28 +3179,6 @@ Partial Class 訂單資料比對與修改_力威
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
-        '覆蓋更新_bt
-        '
-        Me.覆蓋更新_bt.Enabled = False
-        Me.覆蓋更新_bt.ForeColor = System.Drawing.Color.Green
-        Me.覆蓋更新_bt.Location = New System.Drawing.Point(1209, 194)
-        Me.覆蓋更新_bt.Name = "覆蓋更新_bt"
-        Me.覆蓋更新_bt.Size = New System.Drawing.Size(220, 25)
-        Me.覆蓋更新_bt.TabIndex = 913
-        Me.覆蓋更新_bt.Text = "資料對比後吻合度可覆蓋更新"
-        Me.覆蓋更新_bt.UseVisualStyleBackColor = True
-        '
-        '刪除新建_bt
-        '
-        Me.刪除新建_bt.Enabled = False
-        Me.刪除新建_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.刪除新建_bt.Location = New System.Drawing.Point(1433, 194)
-        Me.刪除新建_bt.Name = "刪除新建_bt"
-        Me.刪除新建_bt.Size = New System.Drawing.Size(220, 25)
-        Me.刪除新建_bt.TabIndex = 914
-        Me.刪除新建_bt.Text = "資料對比後需要刪除舊資料新建"
-        Me.刪除新建_bt.UseVisualStyleBackColor = True
-        '
         '訂單資料比對與修改_力威
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)

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

@@ -658,7 +658,7 @@ Public Class 訂單資料比對與修改_力威
                         資料數1 = 60 : 進度條1()
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 16) = "Purchasing Group" Then : Brand_cb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 22, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 7) = "PO Type" Then : 訂單類別_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
-                        If Strings.Left(xlSheet.Cells(YY, XX).value, 6) = "Vendor" Then : 供應商編號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
+                        'If Strings.Left(xlSheet.Cells(YY, XX).value, 6) = "Vendor" Then : 供應商編號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 12, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 18) = "Unsized Commitment" Then : 客戶訂單號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 28, 50) : End If
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 12) = "Company Code" Then
                             公司編號_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 18, 4) : 服務_tb.Text = Strings.Mid(xlSheet.Cells(YY, XX).value, 35, 500) : End If
@@ -1313,11 +1313,11 @@ Public Class 訂單資料比對與修改_力威
         '-------清空------------------------------------------------------------------------------------------------------------------------------------------------------------------
         SEASON_cb_下拉表單資料載入() : DIV_cb_下拉表單資料載入() : Remark_cb_下拉表單資料載入() : FTY_cb_下拉表單資料載入()
 
-        Number_tb.Text = "" : Brand_cb.Text = "" : 訂單類別_tb.Text = "" : 英科條款_tb.Text = "" : 公司編號_tb.Text = "" : 服務_tb.Text = "" : 版本_tb.Text = "" : 供應商編號_tb.Text = ""
+        Number_tb.Text = "" : Brand_cb.Text = "" : 訂單類別_tb.Text = "" : 英科條款_tb.Text = "" : 公司編號_tb.Text = "" : 服務_tb.Text = "" : 版本_tb.Text = "" : 供應商編號_tb.Text = " 903537"
         客戶訂單號_tb.Text = "" : 郵寄方式_tb.Text = "" : 客戶交期_dtp.Value = Today() : 客戶交期_dtp.Text = "" : 總雙數_tb.Text = "" : 總案件_tb.Text = "" : VendorName_tb.Text = ""
         工廠編號_tb.Text = "" : 地址1_tb.Text = "" : 地址二_tb.Text = "" : 代理編號_cb.Text = "" : 訂貨代理_tb.Text = "" : 最終運送_tb.Text = ""
 
-        Number2_tb.Text = "" : Brand2_cb.Text = "" : 訂單類別2_tb.Text = "" : 英科條款2_tb.Text = "" : 公司編號2_tb.Text = "" : 服務2_tb.Text = "" : 版本2_tb.Text = "" : 供應商編號2_tb.Text = ""
+        Number2_tb.Text = "" : Brand2_cb.Text = "" : 訂單類別2_tb.Text = "" : 英科條款2_tb.Text = "" : 公司編號2_tb.Text = "" : 服務2_tb.Text = "" : 版本2_tb.Text = "" : 供應商編號2_tb.Text = " 903537"
         客戶訂單號2_tb.Text = "" : 郵寄方式2_tb.Text = "" : 客戶交期2_dtp.Value = Today() : 客戶交期2_dtp.Text = "" : 總雙數2_tb.Text = "" : 總案件2_tb.Text = "" : VendorName2_tb.Text = ""
         工廠編號2_tb.Text = "" : 地址12_tb.Text = "" : 地址二2_tb.Text = "" : 代理編號2_cb.Text = "" : 訂貨代理2_tb.Text = "" : 最終運送2_tb.Text = ""