版本號 : 2021040801

更新內容如下
1、新增模具控制表(模具授權書)功能
2、周進度表客戶交期修改，與工廠交期修改同步
3、成本利潤表列印，部分資料轉移到表頭前面(Sammi使用)
4、系統中鞋圖抓取的KEY由形體名稱，修改為TVW號碼。

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

TENDEN-MES-SYS/TENDEN_MES_SYS.Designer.vb

@@ -139,6 +139,7 @@ Partial Class TENDEN_MES_SYS
         Me.FTP資料夾管理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.系統執行檔版本管理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator()
+        Me.模具控制表ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.MenuStrip.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -324,7 +325,7 @@ Partial Class TENDEN_MES_SYS
         '
         '製鞋技術資料管理_tsm
         '
-        Me.製鞋技術資料管理_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.楦頭規格表_tsm, Me.ToolStripSeparator21, Me.TENDENZASTYLE資料管理1_tsm, Me.TENDENZASTYLE資料管理2_tsm})
+        Me.製鞋技術資料管理_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.楦頭規格表_tsm, Me.模具控制表ToolStripMenuItem, Me.ToolStripSeparator21, Me.TENDENZASTYLE資料管理1_tsm, Me.TENDENZASTYLE資料管理2_tsm})
         Me.製鞋技術資料管理_tsm.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.製鞋技術資料管理_tsm.Image = Global.天盾國際管理系統.My.Resources.Resources.childish_Tool1
         Me.製鞋技術資料管理_tsm.Name = "製鞋技術資料管理_tsm"
@@ -963,6 +964,14 @@ Partial Class TENDEN_MES_SYS
         Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
         Me.ToolStripSeparator23.Size = New System.Drawing.Size(179, 6)
         '
+        '模具控制表ToolStripMenuItem
+        '
+        Me.模具控制表ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.模具控制表ToolStripMenuItem.Image = Global.天盾國際管理系統.My.Resources.Resources.pen
+        Me.模具控制表ToolStripMenuItem.Name = "模具控制表ToolStripMenuItem"
+        Me.模具控制表ToolStripMenuItem.Size = New System.Drawing.Size(288, 22)
+        Me.模具控制表ToolStripMenuItem.Text = "模具控制表"
+        '
         'TENDEN_MES_SYS
         '
         Me.AllowDrop = True
@@ -1100,4 +1109,5 @@ Partial Class TENDEN_MES_SYS
     Friend WithEvents ProductSalesProfitAnalysisTable_tsm As ToolStripMenuItem
     Friend WithEvents 訂單資料匯入力威_tsm As ToolStripMenuItem
     Friend WithEvents 訂單資料比對與修改力威_tsm As ToolStripMenuItem
+    Friend WithEvents 模具控制表ToolStripMenuItem As ToolStripMenuItem
 End Class

TENDEN-MES-SYS/TENDEN_MES_SYS.vb

@@ -295,4 +295,7 @@
     Private Sub 訂單資料比對與修改力威_tsm_Click(sender As Object, e As EventArgs) Handles 訂單資料比對與修改力威_tsm.Click
         PA = "" : 訂單資料比對與修改_力威.Show() : 訂單資料比對與修改_力威.BringToFront()
     End Sub
+    Private Sub 模具控制表ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles 模具控制表ToolStripMenuItem.Click
+        PA = "" : 模具控制表.Show()
+    End Sub
 End Class

TENDEN-MES-SYS/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName:=".NET Framework 4.6.1")>

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

@@ -1 +1 @@
-419f880514de2839daa27484b25eee5ec80131db
+c10c37018f5fb0d761d88893e1d9d5fdc21e044a

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

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

TENDEN-MES-SYS/圖片資料庫管理/鞋型圖片導入資料庫.vb

@@ -268,7 +268,7 @@ Public Class 鞋型圖片導入資料庫
             TextBox4.AppendText(file + Environment.NewLine)
         Next
     End Sub
-    Private  Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
+    Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
         If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then
             WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath)
         End If

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

@@ -101,6 +101,12 @@
   <ItemGroup>
     <Compile Include="Module\SQL_Module.vb" />
     <Compile Include="Module\SQL_量產訂單資料庫切換.vb" />
+    <Compile Include="製鞋技術資料管理\模具控制表.Designer.vb">
+      <DependentUpon>模具控制表.vb</DependentUpon>
+    </Compile>
+    <Compile Include="製鞋技術資料管理\模具控制表.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="量產訂單管理\業務資料日期除錯.Designer.vb">
       <DependentUpon>業務資料日期除錯.vb</DependentUpon>
     </Compile>
@@ -714,6 +720,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="製鞋技術資料管理\模具控制表.resx">
+      <DependentUpon>模具控制表.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="量產訂單管理\業務資料日期除錯.resx">
       <DependentUpon>業務資料日期除錯.vb</DependentUpon>
     </EmbeddedResource>

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

@@ -91,46 +91,47 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Cells(3, 3) = "力威 Po#"
         xlSheet.Cells(3, 4) = "Style"
         xlSheet.Cells(3, 5) = "CLR"
-        xlSheet.Cells(3, 6) = "DM"
-        xlSheet.Cells(3, 7) = "PRS"
-        xlSheet.Cells(3, 8) = "X/F Date"
-        xlSheet.Cells(3, 9) = "Price"
-        xlSheet.Cells(3, 10) = "Amount"
-        xlSheet.Cells(3, 11) = "Remark"
-        xlSheet.Cells(3, 12) = "Factory"
-        xlSheet.Cells(3, 13) = "DIV"
-        xlSheet.Cells(3, 14) = "FTY Price"
-        xlSheet.Cells(3, 15) = "Commission TTL"
-        xlSheet.Cells(3, 16) = "Commission Darren"
-        xlSheet.Cells(3, 17) = "Commission Tendenza"
-        xlSheet.Cells(3, 18) = "%"
-        xlSheet.Cells(3, 19) = "Basic Price(+)"
-        xlSheet.Cells(3, 20) = "PG/MOQ (+)"
-        xlSheet.Cells(3, 21) = "Foot form/ PET form(+)"
-        xlSheet.Cells(3, 22) = "Tooling (+)"
-        xlSheet.Cells(3, 23) = "Rubber Band(+)"
-        xlSheet.Cells(3, 24) = "J.HOOK (+)"
-        xlSheet.Cells(3, 25) = "Water Resistant(+)"
-        xlSheet.Cells(3, 26) = "16% VAT(+)"
-        xlSheet.Cells(3, 27) = "EXW Saving(-)"
-        xlSheet.Cells(3, 28) = "TTL Collected Toolng"
-        xlSheet.Cells(3, 29) = "Exchange"
-        xlSheet.Cells(1, 6) = "Total-PRS"
-        xlSheet.Cells(1, 10) = "Total-Amount"
+        xlSheet.Cells(3, 6) = "Product Id"
+
+        xlSheet.Cells(3, 7) = "DM"
+        xlSheet.Cells(3, 8) = "PRS"
+        xlSheet.Cells(3, 9) = "X/F Date"
+        xlSheet.Cells(3, 10) = "Price"
+        xlSheet.Cells(3, 11) = "Amount"
+        xlSheet.Cells(3, 12) = "Remark"
+        xlSheet.Cells(3, 13) = "Factory"
+        xlSheet.Cells(3, 14) = "DIV"
+        xlSheet.Cells(3, 15) = "FTY Price"
+        xlSheet.Cells(3, 16) = "Commission TTL"
+        xlSheet.Cells(3, 17) = "Commission Darren"
+        xlSheet.Cells(3, 18) = "Commission Tendenza"
+        xlSheet.Cells(3, 19) = "%"
+        xlSheet.Cells(3, 20) = "Basic Price(+)"
+        xlSheet.Cells(3, 21) = "PG/MOQ (+)"
+        xlSheet.Cells(3, 22) = "Foot form/ PET form(+)"
+        xlSheet.Cells(3, 23) = "Tooling (+)"
+        xlSheet.Cells(3, 24) = "Rubber Band(+)"
+        xlSheet.Cells(3, 25) = "J.HOOK (+)"
+        xlSheet.Cells(3, 26) = "Water Resistant(+)"
+        xlSheet.Cells(3, 27) = "16% VAT(+)"
+        xlSheet.Cells(3, 28) = "EXW Saving(-)"
+        xlSheet.Cells(3, 29) = "TTL Collected Toolng"
+        xlSheet.Cells(3, 30) = "Exchange"
+        xlSheet.Cells(1, 7) = "Total-PRS"
+        xlSheet.Cells(1, 11) = "Total-Amount"
         xlSheet.Cells(1, 15) = "Total-Commission-TTL"
-        xlSheet.Cells(1, 16) = "Total-Commission-Darren"
-        xlSheet.Cells(1, 17) = "Total-Commission-Tendenza"
-        xlSheet.Cells(1, 28) = "Total-TTL Collected Toolng"
-        xlSheet.Cells(2, 6) = "=SUBTOTAL(9,G4:G$99999)"
-        xlSheet.Cells(2, 10) = "=SUBTOTAL(9,J4:J$99999)"
-        xlSheet.Cells(2, 15) = "=SUBTOTAL(9,O4:O$99999)"
-        xlSheet.Cells(2, 16) = "=SUBTOTAL(9,P4:P$99999)"
+        xlSheet.Cells(1, 17) = "Total-Commission-Darren"
+        xlSheet.Cells(1, 18) = "Total-Commission-Tendenza"
+        xlSheet.Cells(1, 29) = "Total-TTL Collected Toolng"
+        xlSheet.Cells(2, 7) = "=SUBTOTAL(9,H4:H$99999)"
+        xlSheet.Cells(2, 11) = "=SUBTOTAL(9,K4:K$99999)"
+        xlSheet.Cells(2, 15) = "=SUBTOTAL(9,P4:P$99999)"
         xlSheet.Cells(2, 17) = "=SUBTOTAL(9,Q4:Q$99999)"
-        xlSheet.Cells(2, 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(2, 18) = "=SUBTOTAL(9,S4:R$99999)"
+        xlSheet.Cells(2, 29) = "=SUBTOTAL(9,AC4:AC$99999)"
+        xlSheet.Cells(3, 31) = "ItemNumber"
+        xlSheet.Cells(3, 32) = "審核"
+        xlSheet.Cells(3, 33) = "Vionic Po#"
         xlSheet.Cells(3, 34) = "Material"
         xlSheet.Cells(3, 35) = "Material Description"
         xlSheet.Cells(3, 36) = "Colorway"
@@ -145,34 +146,35 @@ Public Class 列印_訂單價格利潤表
             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
-            xlSheet.Cells(i + 4, 7) = DataGridView1.Rows(i).Cells("Quantity").Value
-            xlSheet.Cells(i + 4, 8) = DataGridView1.Rows(i).Cells("客戶交期").Value
-            xlSheet.Cells(i + 4, 9) = "=S" & i + 4 & "+T" & i + 4 & "+U" & i + 4 & "+V" & i + 4 & "+W" & i + 4 & "+X" & i + 4 & "+Y" & i + 4 & "+Z" & i + 4 & "/AC" & i + 4 & "-AA" & i + 4
-            xlSheet.Cells(i + 4, 10) = "=G" & i + 4 & "*I" & i + 4 & ""
-            xlSheet.Cells(i + 4, 11) = DataGridView1.Rows(i).Cells("備註").Value
-            xlSheet.Cells(i + 4, 12) = DataGridView1.Rows(i).Cells("工廠").Value
-            xlSheet.Cells(i + 4, 13) = DataGridView1.Rows(i).Cells("訂單種類").Value
-            xlSheet.Cells(i + 4, 14) = DataGridView1.Rows(i).Cells("FTYPrice").Value
-            xlSheet.Cells(i + 4, 15) = "=J" & i + 4 & "-(G" & i + 4 & "*N" & i + 4 & ")"
-            xlSheet.Cells(i + 4, 16) = "=(J" & i + 4 & "-(G" & i + 4 & "*N" & i + 4 & "))/2"
-            xlSheet.Cells(i + 4, 17) = "=(J" & i + 4 & "-(G" & i + 4 & "*N" & i + 4 & "))/2"
-            xlSheet.Cells(i + 4, 18) = "=IF(J" & i + 4 & "=0,0,(J" & i + 4 & "-G" & i + 4 & "*N" & i + 4 & ")/J" & i + 4 & ")"
-            xlSheet.Cells(i + 4, 19) = DataGridView1.Rows(i).Cells("BasicPrice").Value
-            xlSheet.Cells(i + 4, 20) = DataGridView1.Rows(i).Cells("Polybag").Value
-            xlSheet.Cells(i + 4, 21) = DataGridView1.Rows(i).Cells("FOOTorPET").Value
-            xlSheet.Cells(i + 4, 22) = DataGridView1.Rows(i).Cells("Tooling").Value
-            xlSheet.Cells(i + 4, 23) = DataGridView1.Rows(i).Cells("RubberBand").Value
-            xlSheet.Cells(i + 4, 24) = DataGridView1.Rows(i).Cells("JHOOK").Value
-            xlSheet.Cells(i + 4, 25) = DataGridView1.Rows(i).Cells("WaterResistant").Value
-            xlSheet.Cells(i + 4, 26) = DataGridView1.Rows(i).Cells("P16VAT").Value
-            xlSheet.Cells(i + 4, 27) = DataGridView1.Rows(i).Cells("EXWsaving").Value
-            xlSheet.Cells(i + 4, 28) = "=V" & i + 4 & "*G" & i + 4 & ""
-            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, 6) = DataGridView1.Rows(i).Cells("ProductID").Value
+
+            xlSheet.Cells(i + 4, 7) = DataGridView1.Rows(i).Cells("楦型").Value
+            xlSheet.Cells(i + 4, 8) = DataGridView1.Rows(i).Cells("Quantity").Value
+            xlSheet.Cells(i + 4, 9) = DataGridView1.Rows(i).Cells("客戶交期").Value
+            xlSheet.Cells(i + 4, 10) = "=T" & i + 4 & "+U" & i + 4 & "+V" & i + 4 & "+W" & i + 4 & "+X" & i + 4 & "+Y" & i + 4 & "+Z" & i + 4 & "+AA" & i + 4 & "/AD" & i + 4 & "-AB" & i + 4
+            xlSheet.Cells(i + 4, 11) = "=H" & i + 4 & "*J" & i + 4 & ""
+            xlSheet.Cells(i + 4, 12) = DataGridView1.Rows(i).Cells("備註").Value
+            xlSheet.Cells(i + 4, 13) = DataGridView1.Rows(i).Cells("工廠").Value
+            xlSheet.Cells(i + 4, 14) = DataGridView1.Rows(i).Cells("訂單種類").Value
+            xlSheet.Cells(i + 4, 15) = DataGridView1.Rows(i).Cells("FTYPrice").Value
+            xlSheet.Cells(i + 4, 16) = "=K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & ")"
+            xlSheet.Cells(i + 4, 17) = "=(K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & "))/2"
+            xlSheet.Cells(i + 4, 18) = "=(K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & "))/2"
+            xlSheet.Cells(i + 4, 19) = "=IF(K" & i + 4 & "=0,0,(K" & i + 4 & "-H" & i + 4 & "*O" & i + 4 & ")/K" & i + 4 & ")"
+            xlSheet.Cells(i + 4, 20) = DataGridView1.Rows(i).Cells("BasicPrice").Value
+            xlSheet.Cells(i + 4, 21) = DataGridView1.Rows(i).Cells("Polybag").Value
+            xlSheet.Cells(i + 4, 22) = DataGridView1.Rows(i).Cells("FOOTorPET").Value
+            xlSheet.Cells(i + 4, 23) = DataGridView1.Rows(i).Cells("Tooling").Value
+            xlSheet.Cells(i + 4, 24) = DataGridView1.Rows(i).Cells("RubberBand").Value
+            xlSheet.Cells(i + 4, 25) = DataGridView1.Rows(i).Cells("JHOOK").Value
+            xlSheet.Cells(i + 4, 26) = DataGridView1.Rows(i).Cells("WaterResistant").Value
+            xlSheet.Cells(i + 4, 27) = DataGridView1.Rows(i).Cells("P16VAT").Value
+            xlSheet.Cells(i + 4, 28) = DataGridView1.Rows(i).Cells("EXWsaving").Value
+            xlSheet.Cells(i + 4, 29) = "=W" & i + 4 & "*H" & i + 4 & ""
+            xlSheet.Cells(i + 4, 30) = DataGridView1.Rows(i).Cells("Exchange").Value
+            xlSheet.Cells(i + 4, 31) = DataGridView1.Rows(i).Cells("ItemNumber").Value
+            xlSheet.Cells(i + 4, 32) = DataGridView1.Rows(i).Cells("審核").Value
+            xlSheet.Cells(i + 4, 33) = DataGridView1.Rows(i).Cells("客戶訂單號").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
@@ -203,23 +205,25 @@ Public Class 列印_訂單價格利潤表
     End Sub
     Private Sub BB(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
         Dim 位置1 As String
-        xlSheet.Columns("A:A").Select : myExcel.Selection.ColumnWidth = 9 : xlSheet.Columns("B:B").Select : myExcel.Selection.ColumnWidth = 6
+        xlSheet.Columns("A:A").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("B:B").Select : myExcel.Selection.ColumnWidth = 8
         xlSheet.Columns("C:C").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("D:D").Select : myExcel.Selection.ColumnWidth = 9
-        xlSheet.Columns("E:E").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("F:F").Select : myExcel.Selection.ColumnWidth = 5
-        xlSheet.Columns("G:G").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("H:H").Select : myExcel.Selection.ColumnWidth = 9
-        xlSheet.Columns("I:I").Select : myExcel.Selection.ColumnWidth = 5.5 : xlSheet.Columns("J:J").Select : myExcel.Selection.ColumnWidth = 11
-        xlSheet.Columns("K:K").Select : myExcel.Selection.ColumnWidth = 6.5 : xlSheet.Columns("L:L").Select : myExcel.Selection.ColumnWidth = 5.5
+        xlSheet.Columns("E:E").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("F:F").Select : myExcel.Selection.ColumnWidth = 13
+
+        xlSheet.Columns("G:G").Select : myExcel.Selection.ColumnWidth = 5
+        xlSheet.Columns("H:H").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("I:I").Select : myExcel.Selection.ColumnWidth = 9
+        xlSheet.Columns("J:J").Select : myExcel.Selection.ColumnWidth = 5.5 : xlSheet.Columns("K:K").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("L:L").Select : myExcel.Selection.ColumnWidth = 6.5 : xlSheet.Columns("M:M").Select : myExcel.Selection.ColumnWidth = 10
         xlSheet.Columns("N:N").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("O:O").Select : myExcel.Selection.ColumnWidth = 11
         xlSheet.Columns("P:P").Select : myExcel.Selection.ColumnWidth = 14 : xlSheet.Columns("Q:Q").Select : myExcel.Selection.ColumnWidth = 11
-        xlSheet.Columns("R:R").Select : myExcel.Selection.ColumnWidth = 6.5 : xlSheet.Columns("S:S").Select : myExcel.Selection.ColumnWidth = 6.5
+        xlSheet.Columns("R:R").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("S:S").Select : myExcel.Selection.ColumnWidth = 6.5
         xlSheet.Columns("T:T").Select : myExcel.Selection.ColumnWidth = 7 : xlSheet.Columns("U:U").Select : myExcel.Selection.ColumnWidth = 7
         xlSheet.Columns("V:V").Select : myExcel.Selection.ColumnWidth = 7 : xlSheet.Columns("W:W").Select : myExcel.Selection.ColumnWidth = 6
         xlSheet.Columns("X:X").Select : myExcel.Selection.ColumnWidth = 6 : xlSheet.Columns("Y:Y").Select : myExcel.Selection.ColumnWidth = 6.5
         xlSheet.Columns("Z:Z").Select : myExcel.Selection.ColumnWidth = 5 : xlSheet.Columns("AA:AA").Select : myExcel.Selection.ColumnWidth = 5
         xlSheet.Columns("AB:AB").Select : myExcel.Selection.ColumnWidth = 9 : xlSheet.Columns("AC:AC").Select : myExcel.Selection.ColumnWidth = 8
-        xlSheet.Columns("AD:AD").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("AE:AE").Select : myExcel.Selection.ColumnWidth = 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("AD:AD").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("AE:AE").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("AF:AF").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("AG:AG").Select : myExcel.Selection.ColumnWidth = 13
+        xlSheet.Columns("AH:AH").Select : myExcel.Selection.ColumnWidth = 15 : 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
@@ -252,60 +256,60 @@ Public Class 列印_訂單價格利潤表
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
         End With
         xlSheet.Columns("A:A").Select
-        xlSheet.Columns("G:G").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
-        xlSheet.Columns("H:H").Select : myExcel.Selection.NumberFormatLocal = "yyyy/mm/dd"
-        xlSheet.Columns("I:J").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
-        xlSheet.Columns("N:Q").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
-        xlSheet.Range("F2:G2").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
-        xlSheet.Columns("R:R").Select : myExcel.Selection.NumberFormatLocal = "0.00%"
+        xlSheet.Columns("H:H").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
+        xlSheet.Columns("I:I").Select : myExcel.Selection.NumberFormatLocal = "yyyy/mm/dd"
+        xlSheet.Columns("J:K").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
+        xlSheet.Columns("O:R").Select : myExcel.Selection.NumberFormatLocal = "#,##0.00_ ;[紅色]-#,##0.00 "
+        xlSheet.Range("G2:H2").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
+        xlSheet.Columns("S:S").Select : myExcel.Selection.NumberFormatLocal = "0.00%"
         myExcel.ActiveWindow.ScrollColumn = 2 : myExcel.ActiveWindow.ScrollColumn = 3 : myExcel.ActiveWindow.ScrollColumn = 4
-        xlSheet.Columns("S:AB").Select : myExcel.Selection.NumberFormatLocal = "_-* #,##0.00_-;-* #,##0.00_-;_-* ""-""??_-;_-@_-"
+        xlSheet.Columns("T:AC").Select : myExcel.Selection.NumberFormatLocal = "_-* #,##0.00_-;-* #,##0.00_-;_-* ""-""??_-;_-@_-"
         myExcel.ActiveWindow.ScrollColumn = 3 : myExcel.ActiveWindow.ScrollColumn = 2 : myExcel.ActiveWindow.ScrollColumn = 1
         xlSheet.Rows("4:4").Select : myExcel.ActiveWindow.FreezePanes = True
-        xlSheet.Range("G6").Select()
+        xlSheet.Range("H6").Select()
 
         xlSheet.Range("A1:E2").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("F1:G1").Select() : With myExcel.Selection
+        xlSheet.Range("G1:H1").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("F2:G2").Select() : With myExcel.Selection
+        xlSheet.Range("G2:H2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("H1:I2").Select() : With myExcel.Selection
+        xlSheet.Range("I1:J2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("K1:M2").Select() : With myExcel.Selection
+        xlSheet.Range("L1:N2").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("N1:O1").Select() : With myExcel.Selection
+        xlSheet.Range("O1:P1").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("N2:O2").Select() : With myExcel.Selection
+        xlSheet.Range("O2:P2").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("Q1:R1").Select() : With myExcel.Selection
+        xlSheet.Range("R1:S1").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("Q2:R2").Select() : With myExcel.Selection
+        xlSheet.Range("R2:S2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
-        xlSheet.Range("S1:Z2").Select() : With myExcel.Selection
+        xlSheet.Range("T1:AA2").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("AA1:AB1").Select() : With myExcel.Selection
+        xlSheet.Range("AB1:AC1").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("AA2:AB2").Select() : With myExcel.Selection
+        xlSheet.Range("AB2:AC2").Select() : With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0 : .ShrinkToFit = False
             .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
 
-        xlSheet.Range("A1:M3").Select() : With myExcel.Selection.Interior
+        xlSheet.Range("A1:N3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorDark2 : .TintAndShade = -0.0999786370433668 : .PatternTintAndShade = 0 : End With
-        xlSheet.Range("N1:R3").Select() : With myExcel.Selection.Interior
+        xlSheet.Range("O1:S3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535 : .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
-        xlSheet.Range("S1:AB3").Select() : With myExcel.Selection.Interior
+        xlSheet.Range("T1:AC3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorAccent6 : .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
 
         xlSheet.Range("A1:AN3").Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
@@ -331,7 +335,7 @@ 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()
+        xlSheet.Range("AE1:AP2").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

TENDEN-MES-SYS/樣品訂單管理/量產樣品訂單出貨紀錄表.Designer.vb

@@ -22,7 +22,7 @@ Partial Class 量產樣品訂單出貨紀錄表
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Button37 = New System.Windows.Forms.Button()
         Me.Button36 = New System.Windows.Forms.Button()
         Me.Button35 = New System.Windows.Forms.Button()
@@ -36,6 +36,9 @@ Partial Class 量產樣品訂單出貨紀錄表
         Me.DateTimePicker9 = New System.Windows.Forms.DateTimePicker()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -119,8 +122,8 @@ Partial Class 量產樣品訂單出貨紀錄表
         '
         'DataGridView1
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Beige
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.Beige
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.DataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Location = New System.Drawing.Point(344, 12)
@@ -170,11 +173,41 @@ Partial Class 量產樣品訂單出貨紀錄表
         Me.Label1.TabIndex = 499
         Me.Label1.Text = "量產樣品訂單出貨紀錄表"
         '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(13, 456)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 525
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(76, 439)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(105, 50)
+        Me.資料庫選擇1_bt.TabIndex = 526
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(187, 439)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(133, 50)
+        Me.資料庫選擇2_bt.TabIndex = 527
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_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.資料庫選擇2_bt)
+        Me.Controls.Add(Me.資料庫選擇1_bt)
+        Me.Controls.Add(Me.Label20)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.PictureBox1)
         Me.Controls.Add(Me.DateTimePicker9)
@@ -212,5 +245,8 @@ Partial Class 量產樣品訂單出貨紀錄表
     Friend WithEvents DateTimePicker9 As DateTimePicker
     Friend WithEvents PictureBox1 As PictureBox
     Friend WithEvents Label1 As Label
+    Friend WithEvents Label20 As Label
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
 End Class
 

TENDEN-MES-SYS/樣品訂單管理/量產樣品訂單出貨紀錄表.vb

@@ -2,10 +2,24 @@
 Imports System.IO
 Public Class 量產樣品訂單出貨紀錄表
     ReadOnly ds As New DataSet
-    ReadOnly SQL字串1 As String = "SELECT 量產樣流水號, 樣品單號, Po_Placed_Date AS Po_Placed_D, Sample_Type, FTY, PO, Style, Color, Width, QTY, Requested_XFD AS Requested_D, CFM_D_XFD AS CFM_D_D, " &
-                             "Ship_Date, AWB, Notes, DN, [5], [5.5], [6], [6.5], [7], [7.5], [8], [8.5], [9], [9.5], [10], [10.5], [11], [12], [13], [14], CXL, CXLTime, 出貨數量, 出貨時間, 明細建檔 " &
-                             "FROM 量產樣品控制表"
-    ReadOnly SQL字串2 As String = " ORDER BY   樣品單號 DESC, Po_Placed_Date, Style, Color, Width"
+    ReadOnly SQL字串1 As String = "SELECT          量產樣品控制表.量產樣流水號, 量產樣品控制表.樣品單號, 
+                            量產樣品控制表.Po_Placed_Date AS Po_Placed_D, 量產樣品控制表.Sample_Type, 
+                            量產樣品控制表.FTY, 量產樣品控制表.PO, 量產樣品控制表.Style, 量產樣品控制表.Color, 
+                            量產樣品控制表.Width, 量產樣品控制表.QTY, 量產樣品控制表.Requested_XFD AS Requested_D, 
+                            量產樣品控制表.CFM_D_XFD AS CFM_D_D, 量產樣品控制表.Ship_Date, 量產樣品控制表.AWB, 
+                            量產樣品控制表.Notes, 量產樣品控制表.DN, 量產樣品控制表.[5], 量產樣品控制表.[5.5], 
+                            量產樣品控制表.[6], 量產樣品控制表.[6.5], 量產樣品控制表.[7], 量產樣品控制表.[7.5], 
+                            量產樣品控制表.[8], 量產樣品控制表.[8.5], 量產樣品控制表.[9], 量產樣品控制表.[9.5], 
+                            量產樣品控制表.[10], 量產樣品控制表.[10.5], 量產樣品控制表.[11], 量產樣品控制表.[12], 
+                            量產樣品控制表.[13], 量產樣品控制表.[14], 量產樣品控制表.CXL, 量產樣品控制表.CXLTime, 
+                            量產樣品控制表.出貨數量, 量產樣品控制表.出貨時間, 量產樣品控制表.明細建檔, 
+                            QQ.Style AS TVW
+FROM              量產樣品控制表 INNER JOIN
+                                (SELECT          ProductName, Style
+                                  FROM               STYLELIST
+                                  GROUP BY    ProductName, Style) AS QQ ON 量產樣品控制表.Style = QQ.ProductName"
+    ReadOnly SQL字串2 As String = " ORDER BY   量產樣品控制表.樣品單號 DESC, 量產樣品控制表.Po_Placed_Date, 量產樣品控制表.Style, 
+                                               量產樣品控制表.Color, 量產樣品控制表.Width"
     ReadOnly CH(7) As String
     ReadOnly BB(3) As Boolean
     Private  Sub Set_DGV1載入前設定()
@@ -20,7 +34,7 @@ Public Class 量產樣品訂單出貨紀錄表
     End Sub
     Private  Sub Set_訂單清單()
         Set_DGV1載入前設定()
-        SQL1 = SQL字串1 & " WHERE (CXL = 0) AND (QTY - 出貨數量 = 0)" & SQL字串2
+        SQL1 = SQL字串1 & " WHERE (量產樣品控制表.CXL = 0) AND (量產樣品控制表.QTY - 量產樣品控制表.出貨數量 = 0)" & SQL字串2
         Set_DGV1載入後設定()
     End Sub
     Private  Sub Set_grid()
@@ -34,7 +48,7 @@ Public Class 量產樣品訂單出貨紀錄表
         DataGridView1.Columns(25).FillWeight = 35 : DataGridView1.Columns(26).FillWeight = 35 : DataGridView1.Columns(27).FillWeight = 36 : DataGridView1.Columns(28).FillWeight = 36
         DataGridView1.Columns(29).FillWeight = 36 : DataGridView1.Columns(30).FillWeight = 36 : DataGridView1.Columns(31).FillWeight = 36 : DataGridView1.Columns(32).FillWeight = 105
         DataGridView1.Columns(33).FillWeight = 120 : DataGridView1.Columns(34).FillWeight = 110 : DataGridView1.Columns(35).FillWeight = 120 : DataGridView1.Columns(36).FillWeight = 110
-
+        DataGridView1.Columns(37).Visible = False
         DataGridView1.Columns(9).DefaultCellStyle.Format = "#,##0"
         DataGridView1.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : DataGridView1.Columns(9).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         DataGridView1.Columns(34).DefaultCellStyle.Format = "#,##0"
@@ -79,21 +93,21 @@ Public Class 量產樣品訂單出貨紀錄表
     End Sub
     Private  Sub Set_搜尋()
         PA = InputBox("請輸入要查詢的資料")
-        CH(0) = " AND (樣品單號 Like '%" & PA & "%'"
-        CH(1) = " OR Sample_Type Like '%" & PA & "%'"
-        CH(2) = " OR FTY Like '%" & PA & "%'"
-        CH(3) = " OR PO Like '%" & PA & "%'"
-        CH(4) = " OR Style Like '%" & PA & "%'"
-        CH(5) = " OR Color Like '%" & PA & "%'"
-        CH(6) = " OR Width Like '%" & PA & "%'"
-        CH(7) = " OR 量產樣流水號 LIKE '" & PA & "')"
+        CH(0) = " AND (量產樣品控制表.樣品單號 Like '%" & PA & "%'"
+        CH(1) = " OR 量產樣品控制表.Sample_Type Like '%" & PA & "%'"
+        CH(2) = " OR 量產樣品控制表.FTY Like '%" & PA & "%'"
+        CH(3) = " OR 量產樣品控制表.PO Like '%" & PA & "%'"
+        CH(4) = " OR 量產樣品控制表.Style Like '%" & PA & "%'"
+        CH(5) = " OR 量產樣品控制表.Color Like '%" & PA & "%'"
+        CH(6) = " OR 量產樣品控制表.Width Like '%" & PA & "%'"
+        CH(7) = " OR 量產樣品控制表.量產樣流水號 LIKE '" & PA & "')"
         SQL1 = SQL字串1 & " WHERE (CXL = 0)" & CH(0) & CH(1) & CH(2) & CH(3) & CH(4) & CH(5) & CH(6) & CH(7) & SQL字串2
         PA = ""
     End Sub
     Private  Sub 量產樣品訂單出貨紀錄表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
         BB(0) = False : BB(1) = True : BB(2) = True : BB(3) = True
-        Set_訂單清單() : Set_grid()
+        訂單資料庫選擇.ShowDialog() : Set_訂單清單() : Set_grid()
         Button12.Enabled = False : DateTimePicker9.Visible = False
     End Sub
     Private  Sub DataGridView1_CellEndEdit(ByVal sender As Object, ByVal e As DataGridViewCellEventArgs) Handles DataGridView1.CellEndEdit
@@ -114,7 +128,7 @@ Public Class 量產樣品訂單出貨紀錄表
 
             If DataGridView1(7, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & DataGridView1(6, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & DataGridView1("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 PictureBox1.Image = Nothing
                 While dr.Read() = True
@@ -123,13 +137,13 @@ Public Class 量產樣品訂單出貨紀錄表
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & DataGridView1(6, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & DataGridView1(7, e.RowIndex).Value.ToString & "' " &
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & DataGridView1("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & DataGridView1(7, e.RowIndex).Value.ToString & "' " &
                        "AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & DataGridView1(6, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & DataGridView1(7, e.RowIndex).Value.ToString & "' " &
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & DataGridView1("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & DataGridView1(7, e.RowIndex).Value.ToString & "' " &
                        "AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     PictureBox1.Image = Nothing
@@ -140,7 +154,7 @@ Public Class 量產樣品訂單出貨紀錄表
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & DataGridView1(6, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & DataGridView1("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     PictureBox1.Image = Nothing
                     While dr.Read() = True
@@ -197,7 +211,15 @@ Public Class 量產樣品訂單出貨紀錄表
             cmd.CommandText = SQL1 : cmd.ExecuteNonQuery() : conn.Close()
         Next i
         MsgBox("修改完成")
-        Set_訂單清單() : Set_grid()
+        訂單資料庫選擇.ShowDialog() : Set_訂單清單() : Set_grid()
         Button12.Enabled = False
     End Sub
+
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單() : Set_grid()
+    End Sub
+
+    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/製鞋技術資料管理/TENDENZA_STYLE_資料管理_對應訂單.Designer.vb

@@ -48,6 +48,9 @@ Partial Class TENDENZA_STYLE_資料管理_對應訂單
         Me.Button4 = New System.Windows.Forms.Button()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.CheckBox2 = New System.Windows.Forms.CheckBox()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DataGridView2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -238,9 +241,9 @@ Partial Class TENDENZA_STYLE_資料管理_對應訂單
         '
         Me.Button2.Font = New System.Drawing.Font("微軟正黑體", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Button2.ForeColor = System.Drawing.Color.Red
-        Me.Button2.Location = New System.Drawing.Point(1429, 779)
+        Me.Button2.Location = New System.Drawing.Point(1430, 817)
         Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(473, 200)
+        Me.Button2.Size = New System.Drawing.Size(473, 162)
         Me.Button2.TabIndex = 519
         Me.Button2.Text = "完成編輯，開始訂單資料重組"
         Me.Button2.UseVisualStyleBackColor = True
@@ -260,9 +263,9 @@ Partial Class TENDENZA_STYLE_資料管理_對應訂單
         '
         Me.Button4.Font = New System.Drawing.Font("微軟正黑體", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Button4.ForeColor = System.Drawing.Color.Blue
-        Me.Button4.Location = New System.Drawing.Point(1430, 571)
+        Me.Button4.Location = New System.Drawing.Point(1430, 649)
         Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(473, 200)
+        Me.Button4.Size = New System.Drawing.Size(473, 162)
         Me.Button4.TabIndex = 521
         Me.Button4.Text = "完成編輯，暫不重組訂單資料"
         Me.Button4.UseVisualStyleBackColor = True
@@ -287,11 +290,41 @@ Partial Class TENDENZA_STYLE_資料管理_對應訂單
         Me.CheckBox2.Text = "重組訂單資料庫(歷史資料)"
         Me.CheckBox2.UseVisualStyleBackColor = True
         '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(1429, 576)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 524
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(1479, 576)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(200, 50)
+        Me.資料庫選擇1_bt.TabIndex = 525
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(1702, 576)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(200, 50)
+        Me.資料庫選擇2_bt.TabIndex = 526
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
         'TENDENZA_STYLE_資料管理_對應訂單
         '
         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.資料庫選擇2_bt)
+        Me.Controls.Add(Me.資料庫選擇1_bt)
+        Me.Controls.Add(Me.Label20)
         Me.Controls.Add(Me.CheckBox2)
         Me.Controls.Add(Me.CheckBox1)
         Me.Controls.Add(Me.Button4)
@@ -353,4 +386,7 @@ Partial Class TENDENZA_STYLE_資料管理_對應訂單
     Friend WithEvents Button4 As Button
     Friend WithEvents CheckBox1 As CheckBox
     Friend WithEvents CheckBox2 As CheckBox
+    Friend WithEvents Label20 As Label
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
 End Class

TENDEN-MES-SYS/製鞋技術資料管理/TENDENZA_STYLE_資料管理_對應訂單.vb

@@ -16,12 +16,12 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
         Set_DGV1載入前設定()
         SQL1 = "SELECT LEFT(STYLELIST.建立季節, 4) AS 建立季節, STYLELIST.ItemNumber AS 項目編號, STYLELIST.ProductName, 
                             STYLELIST.Style, STYLELIST.Description, STYLELIST.APMA確認, QQ.T1, QQ.T2, QQ.WEAR_TEST, QQ.CFM, QQ.T3, 
-                            QQ.T4, QQ.形體號, QQ.顏色, QQ.楦型
+                            QQ.T4, QQ.形體號, QQ.顏色, QQ.楦型, QQ.TVW
                 FROM STYLELIST LEFT OUTER JOIN
-                    (SELECT 形體號, 顏色, 楦型, TRIAL1 AS T1, TRIAL2 AS T2, TRIAL3 AS T3, TRIAL4 AS T4, CFMSAMPLE AS CFM, 長期試穿 AS WEAR_TEST
-                     FROM 訂單控制表
+                    (SELECT 形體號, 顏色, 楦型, TRIAL1 AS T1, TRIAL2 AS T2, TRIAL3 AS T3, TRIAL4 AS T4, CFMSAMPLE AS CFM, 長期試穿 AS WEAR_TEST, " & 訂單資料表(1) & ".TVW
+                     FROM " & 訂單資料表(1) & "
                      WHERE (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0)
-                     GROUP BY 形體號, 顏色, 楦型, TRIAL1, TRIAL2, TRIAL3, TRIAL4, CFMSAMPLE, 長期試穿) AS QQ ON STYLELIST.ProductName = QQ.形體號
+                     GROUP BY 形體號, 顏色, 楦型, TRIAL1, TRIAL2, TRIAL3, TRIAL4, CFMSAMPLE, 長期試穿, " & 訂單資料表(1) & ".TVW) AS QQ ON STYLELIST.ProductName = QQ.形體號
                 WHERE (QQ.形體號 IS NOT NULL)
                 ORDER BY STYLELIST.Style"
         Set_DGV1載入後設定() : Set_grid()
@@ -30,7 +30,7 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
         DataGridView1.Columns(0).FillWeight = 60 : DataGridView1.Columns(1).FillWeight = 80 : DataGridView1.Columns(2).Visible = False : DataGridView1.Columns(3).FillWeight = 80
         DataGridView1.Columns(4).FillWeight = 250 : DataGridView1.Columns(5).Visible = False : DataGridView1.Columns(6).FillWeight = 90 : DataGridView1.Columns(7).FillWeight = 90
         DataGridView1.Columns(8).FillWeight = 90 : DataGridView1.Columns(9).FillWeight = 90 : DataGridView1.Columns(10).FillWeight = 90 : DataGridView1.Columns(11).FillWeight = 90
-        DataGridView1.Columns(12).FillWeight = 150 : DataGridView1.Columns(13).FillWeight = 90 : DataGridView1.Columns(14).FillWeight = 90
+        DataGridView1.Columns(12).FillWeight = 150 : DataGridView1.Columns(13).FillWeight = 90 : DataGridView1.Columns(14).FillWeight = 90 : DataGridView1.Columns(15).Visible = False
     End Sub
     Private  Sub Set_DGV2載入前設定()
         DataGridView2.DataSource = Nothing : ds1.Clear()
@@ -52,7 +52,7 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
     End Sub
     Private  Sub TENDENZA_STYLE_資料管理_對應訂單_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
-        讀取清單() : Button1.Enabled = False : Button2.Enabled = False : Button4.Enabled = False
+        訂單資料庫選擇.ShowDialog() : 讀取清單() : Button1.Enabled = False : Button2.Enabled = False : Button4.Enabled = False
         If CC(85) = False And CC(86) = False Then : Button8.Enabled = False : End If
         If CC(87) = False Then : CheckBox1.Enabled = False : End If
         If CC(88) = False Then : CheckBox2.Enabled = False : End If
@@ -60,17 +60,17 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
     Private  Sub DataGridView1_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles DataGridView1.CellClick
         If e.RowIndex = -1 Then : Else
             Set_DGV2載入前設定()
-            SQL1 = "SELECT 訂單控制表.訂單流水號 AS VT#, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單控制表.工廠回復交期 AS 訂單日期, " &
-                   "訂單控制表.TVW AS 型體號, " &
-                   "訂單明細表.ItemNumber, 訂單控制表.形體號 AS ProductName, 訂單明細表.ProductDescription, 訂單控制表.顏色, 訂單控制表.楦型, 訂單控制表.訂單數量 FROM 訂單控制表 LEFT OUTER JOIN " &
-                   "訂單明細表 ON 訂單控制表.形體號 = 訂單明細表.ProductName AND 訂單控制表.楦型 = 訂單明細表.DM AND 訂單控制表.顏色 = 訂單明細表.Color AND 訂單控制表.訂單流水號 = 訂單明細表.天盾流水號 " &
-                   "AND 訂單控制表.客戶訂單號 = 訂單明細表.客戶訂單號 " &
-                   "WHERE (訂單控制表.形體號 LIKE '" & DataGridView1.Rows(e.RowIndex).Cells("ProductName").Value & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) " &
-                   "ORDER BY 訂單控制表.客戶交期 DESC, VT#"
+            SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號 AS VT#, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(1) & ".工廠回復交期 AS 訂單日期, " &
+                   "" & 訂單資料表(1) & ".TVW AS 型體號, " &
+                   "" & 訂單資料表(5) & ".ItemNumber," & 訂單資料表(1) & ".形體號 AS ProductName, " & 訂單資料表(5) & ".ProductDescription," & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 FROM " & 訂單資料表(1) & " LEFT OUTER JOIN " &
+                   "" & 訂單資料表(5) & " ON " & 訂單資料表(1) & ".形體號 =" & 訂單資料表(5) & ".ProductName AND " & 訂單資料表(1) & ".楦型 = " & 訂單資料表(5) & ".DM AND " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(5) & ".Color AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(5) & ".天盾流水號 " &
+                   "AND " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(5) & ".客戶訂單號 " &
+                   "WHERE (" & 訂單資料表(1) & ".形體號 LIKE '" & DataGridView1.Rows(e.RowIndex).Cells("ProductName").Value & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) " &
+                   "ORDER BY " & 訂單資料表(1) & ".客戶交期 DESC, VT#"
             Set_DGV2載入後設定() : Set_grid2()
 
             ConnOpen()
-            SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & DataGridView1(3, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標' ORDER BY 類型 DESC"
+            SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & DataGridView1("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標' ORDER BY 類型 DESC"
             CmdSet_For_dr()
             PictureBox1.Image = Nothing
             While dr.Read() = True
@@ -147,12 +147,12 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
         Dim QQWEE As String
         For i As Integer = 0 To DataGridView1.Rows.Count - 1
             Set_DGV2載入前設定()
-            SQL1 = "SELECT TOP(1) 訂單控制表.訂單流水號 AS VT#, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單控制表.工廠回復交期 AS 訂單日期, " &
-                   "訂單控制表.TVW AS 型體號, " &
-                   "訂單明細表.ItemNumber, 訂單控制表.形體號 AS ProductName, 訂單明細表.ProductDescription, 訂單控制表.顏色, 訂單控制表.楦型, 訂單控制表.訂單數量 FROM 訂單控制表 LEFT OUTER JOIN " &
-                   "訂單明細表 ON 訂單控制表.形體號 = 訂單明細表.ProductName AND 訂單控制表.楦型 = 訂單明細表.DM AND 訂單控制表.顏色 = 訂單明細表.Color AND 訂單控制表.訂單流水號 = 訂單明細表.天盾流水號 " &
-                   "AND 訂單控制表.客戶訂單號 = 訂單明細表.客戶訂單號 WHERE (訂單控制表.形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') " &
-                   "ORDER BY 訂單控制表.客戶交期 DESC, VT#"
+            SQL1 = "SELECT TOP(1) " & 訂單資料表(1) & ".訂單流水號 AS VT#, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 AS 工廠," & 訂單資料表(1) & ".訂單種類," & 訂單資料表(1) & ".工廠回復交期 AS 訂單日期, " &
+                   "" & 訂單資料表(1) & ".TVW AS 型體號, " &
+                   "" & 訂單資料表(1) & ".ItemNumber, " & 訂單資料表(1) & ".形體號 AS ProductName, " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 FROM " & 訂單資料表(1) & " LEFT OUTER JOIN " &
+                   "" & 訂單資料表(1) & "ON" & 訂單資料表(1) & ".形體號 = " & 訂單資料表(5) & ".ProductName AND " & 訂單資料表(1) & ".楦型 =" & 訂單資料表(5) & ".DM AND " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(5) & ".Color AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(5) & ".天盾流水號 " &
+                   "AND " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(5) & ".客戶訂單號 WHERE (" & 訂單資料表(1) & ".形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') " &
+                   "ORDER BY " & 訂單資料表(1) & ".客戶交期 DESC, VT#"
             Set_DGV2載入後設定() : Set_grid2()
 
             QQWEE = DataGridView1(0, i).Value.ToString
@@ -186,7 +186,7 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
 
             If CC(85) = True And CC(86) = True Then
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
                        "', TRIAL2 = '" & DataGridView1.Rows(i).Cells("T2").Value &
                        "', TRIAL3 = '" & DataGridView1.Rows(i).Cells("T3").Value & "', TRIAL4 = '" & DataGridView1.Rows(i).Cells("T4").Value &
                        "', 長期試穿 = '" & DataGridView1.Rows(i).Cells("WEAR_TEST").Value & "', CFMSAMPLE = '" & DataGridView1.Rows(i).Cells("CFM").Value & "' " &
@@ -195,7 +195,7 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
                 CmdSet_For_dr() : conn.Close()
             ElseIf CC(85) = True And CC(86) = False Then
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
                        "', TRIAL2 = '" & DataGridView1.Rows(i).Cells("T2").Value &
                        "', TRIAL3 = '" & DataGridView1.Rows(i).Cells("T3").Value & "', TRIAL4 = '" & DataGridView1.Rows(i).Cells("T4").Value &
                        "' WHERE (形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') AND (顏色  LIKE '" & DataGridView1.Rows(i).Cells("顏色").Value & "') 
@@ -203,7 +203,7 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
                 CmdSet_For_dr() : conn.Close()
             ElseIf CC(85) = False And CC(86) = True Then
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', 長期試穿 = '" & DataGridView1.Rows(i).Cells("WEAR_TEST").Value &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', 長期試穿 = '" & DataGridView1.Rows(i).Cells("WEAR_TEST").Value &
                        "', CFMSAMPLE = '" & DataGridView1.Rows(i).Cells("CFM").Value & "' " &
                        "WHERE (形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') AND (顏色  LIKE '" & DataGridView1.Rows(i).Cells("顏色").Value & "') 
                           AND (楦型  LIKE '" & DataGridView1.Rows(i).Cells("楦型").Value & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0)"
@@ -230,14 +230,14 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
             If CC(85) = True And CC(86) = True Then
                 ConnOpen()
                 If CheckBox2.Checked = False Then
-                    SQL1 = "UPDATE 訂單控制表 SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
+                    SQL1 = "UPDATE" & 訂單資料表(1) & " SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
                            "', TRIAL2 = '" & DataGridView1.Rows(i).Cells("T2").Value &
                            "', TRIAL3 = '" & DataGridView1.Rows(i).Cells("T3").Value & "', TRIAL4 = '" & DataGridView1.Rows(i).Cells("T4").Value &
                            "', 長期試穿 = '" & DataGridView1.Rows(i).Cells("WEAR_TEST").Value & "', CFMSAMPLE = '" & DataGridView1.Rows(i).Cells("CFM").Value & "' " &
                            "WHERE (形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') AND (顏色  LIKE '" & DataGridView1.Rows(i).Cells("顏色").Value & "') 
                               AND (楦型  LIKE '" & DataGridView1.Rows(i).Cells("楦型").Value & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0)"
                 Else
-                    SQL1 = "UPDATE 訂單控制表 SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
+                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
                            "', TRIAL2 = '" & DataGridView1.Rows(i).Cells("T2").Value &
                            "', TRIAL3 = '" & DataGridView1.Rows(i).Cells("T3").Value & "', TRIAL4 = '" & DataGridView1.Rows(i).Cells("T4").Value &
                            "', 長期試穿 = '" & DataGridView1.Rows(i).Cells("WEAR_TEST").Value & "', CFMSAMPLE = '" & DataGridView1.Rows(i).Cells("CFM").Value & "' " &
@@ -247,7 +247,7 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
                 CmdSet_For_dr() : conn.Close()
             ElseIf CC(85) = True And CC(86) = False Then
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
+                SQL1 = "UPDATE " & 訂單資料表(1) & " SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', TRIAL1 = '" & DataGridView1.Rows(i).Cells("T1").Value &
                        "', TRIAL2 = '" & DataGridView1.Rows(i).Cells("T2").Value &
                        "', TRIAL3 = '" & DataGridView1.Rows(i).Cells("T3").Value & "', TRIAL4 = '" & DataGridView1.Rows(i).Cells("T4").Value &
                        "' WHERE (形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') AND (顏色  LIKE '" & DataGridView1.Rows(i).Cells("顏色").Value & "') 
@@ -255,7 +255,7 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
                 CmdSet_For_dr() : conn.Close()
             ElseIf CC(85) = False And CC(86) = True Then
                 ConnOpen()
-                SQL1 = "UPDATE 訂單控制表 SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', 長期試穿 = '" & DataGridView1.Rows(i).Cells("WEAR_TEST").Value &
+                SQL1 = "UPDATE" & 訂單資料表(1) & " SET TVW = '" & DataGridView1.Rows(i).Cells("Style").Value & "', 長期試穿 = '" & DataGridView1.Rows(i).Cells("WEAR_TEST").Value &
                        "', CFMSAMPLE = '" & DataGridView1.Rows(i).Cells("CFM").Value & "' " &
                        "WHERE (形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') AND (顏色  LIKE '" & DataGridView1.Rows(i).Cells("顏色").Value & "') 
                           AND (楦型  LIKE '" & DataGridView1.Rows(i).Cells("楦型").Value & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0)"
@@ -268,11 +268,17 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
     Private  Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
         Button2.Enabled = False : Button1.Enabled = False : Button4.Enabled = False : Button8.Enabled = True
     End Sub
-    Private  Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged
+    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged
         If CheckBox1.Checked = False Then
             Button2.Enabled = False
         ElseIf CheckBox1.Checked = True Then
             Button2.Enabled = True
         End If
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : 讀取清單()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : 讀取清單()
+    End Sub
 End Class

TENDEN-MES-SYS/製鞋技術資料管理/模具控制表.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="FolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

TENDEN-MES-SYS/量產訂單管理/TENDENZA_STYLE_形體下單數量統計.Designer.vb

@@ -25,6 +25,9 @@ Partial Class TENDENZA_STYLE_形體下單數量統計
         Me.圖片庫_dgv = New System.Windows.Forms.DataGridView()
         Me.圖片_pb = New System.Windows.Forms.PictureBox()
         Me.查詢形體名稱_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.圖片庫_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -44,26 +47,56 @@ Partial Class TENDENZA_STYLE_形體下單數量統計
         '
         Me.圖片_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.圖片_pb.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.圖片_pb.Location = New System.Drawing.Point(1023, 43)
+        Me.圖片_pb.Location = New System.Drawing.Point(1023, 108)
         Me.圖片_pb.Name = "圖片_pb"
-        Me.圖片_pb.Size = New System.Drawing.Size(879, 936)
+        Me.圖片_pb.Size = New System.Drawing.Size(879, 871)
         Me.圖片_pb.TabIndex = 500
         Me.圖片_pb.TabStop = False
         '
         '查詢形體名稱_bt
         '
-        Me.查詢形體名稱_bt.Location = New System.Drawing.Point(1023, 12)
+        Me.查詢形體名稱_bt.Location = New System.Drawing.Point(1023, 77)
         Me.查詢形體名稱_bt.Name = "查詢形體名稱_bt"
         Me.查詢形體名稱_bt.Size = New System.Drawing.Size(879, 25)
         Me.查詢形體名稱_bt.TabIndex = 501
         Me.查詢形體名稱_bt.Text = "查詢形體名稱"
         Me.查詢形體名稱_bt.UseVisualStyleBackColor = True
         '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(1279, 12)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(200, 50)
+        Me.資料庫選擇2_bt.TabIndex = 529
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(1073, 12)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(200, 50)
+        Me.資料庫選擇1_bt.TabIndex = 528
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(1023, 12)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 527
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
         'TENDENZA_STYLE_形體下單數量統計
         '
         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.資料庫選擇2_bt)
+        Me.Controls.Add(Me.資料庫選擇1_bt)
+        Me.Controls.Add(Me.Label20)
         Me.Controls.Add(Me.查詢形體名稱_bt)
         Me.Controls.Add(Me.圖片_pb)
         Me.Controls.Add(Me.圖片庫_dgv)
@@ -74,11 +107,15 @@ Partial Class TENDENZA_STYLE_形體下單數量統計
         CType(Me.圖片庫_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.圖片_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents 圖片庫_dgv As DataGridView
     Friend WithEvents 圖片_pb As PictureBox
     Friend WithEvents 查詢形體名稱_bt As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents Label20 As Label
 End Class
 

TENDEN-MES-SYS/量產訂單管理/TENDENZA_STYLE_形體下單數量統計.vb

@@ -14,21 +14,26 @@ Public Class TENDENZA_STYLE_形體下單數量統計
     End Sub
     Private Sub Set_清單()
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單控制表.年份季度, 訂單控制表.形體號 AS 形體名稱, STYLELIST.Style, 訂單明細表.ItemNumber, STYLELIST.Description, SUM(訂單控制表.訂單數量) AS 總雙數 " &
-               "FROM 訂單控制表 LEFT OUTER JOIN STYLELIST ON 訂單控制表.形體號 = STYLELIST.ProductName LEFT OUTER JOIN 訂單明細表 ON 訂單控制表.形體號 = 訂單明細表.ProductName " &
-               "WHERE (訂單控制表.形體號 LIKE '%" & PA & "%') GROUP BY   訂單控制表.年份季度, 訂單控制表.形體號, 訂單明細表.ItemNumber, STYLELIST.Style, STYLELIST.Description " &
-               "HAVING (SUM(訂單控制表.訂單數量) > 0) ORDER BY   形體名稱, 訂單控制表.年份季度 DESC"
+        SQL1 = "SELECT  " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".形體號 AS 形體名稱, STYLELIST.Style,  " & 訂單資料表(5) & ".ItemNumber, 
+                        STYLELIST.Description, SUM( " & 訂單資料表(1) & ".訂單數量) AS 總雙數, " & 訂單資料表(1) & ".TVW
+                FROM    " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName 
+                        LEFT OUTER JOIN " & 訂單資料表(5) & " ON  " & 訂單資料表(1) & ".形體號 = " & 訂單資料表(5) & ".ProductName 
+                WHERE  (" & 訂單資料表(1) & ".形體號 Like '%" & PA & "%') 
+                GROUP BY  " & 訂單資料表(1) & ".年份季度,  " & 訂單資料表(1) & ".形體號,  
+                      " & 訂單資料表(5) & ".ItemNumber, STYLELIST.Style, STYLELIST.Description, " & 訂單資料表(1) & ".TVW
+                HAVING(SUM(" & 訂單資料表(1) & ".訂單數量) > 0) ORDER BY   形體名稱, " & 訂單資料表(1) & ".年份季度 DESC"
         Set_DGV1載入後設定()
     End Sub
     Private Sub Set_grid()
         圖片庫_dgv.Columns(0).FillWeight = 80 : 圖片庫_dgv.Columns(1).FillWeight = 120 : 圖片庫_dgv.Columns(2).FillWeight = 90 : 圖片庫_dgv.Columns(3).FillWeight = 90
-        圖片庫_dgv.Columns(4).FillWeight = 300 : 圖片庫_dgv.Columns(5).FillWeight = 100
+        圖片庫_dgv.Columns(4).FillWeight = 300 : 圖片庫_dgv.Columns(5).FillWeight = 100 : 圖片庫_dgv.Columns(6).Visible = False
         圖片庫_dgv.Columns(5).DefaultCellStyle.Format = "#,##0"
         圖片庫_dgv.Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 圖片庫_dgv.Columns(5).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
     End Sub
     Private Sub TENDENZA_STYLE_形體下單數量統計_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
-        Set_清單()
+
+        訂單資料庫選擇.ShowDialog() : Set_清單()
     End Sub
     Private Sub DataGridView1_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 圖片庫_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
@@ -47,7 +52,7 @@ Public Class TENDENZA_STYLE_形體下單數量統計
     Private Sub DataGridView1_CellClick(ByVal sender As Object, ByVal e As DataGridViewCellEventArgs) Handles 圖片庫_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             ConnOpen()
-            SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 圖片庫_dgv(1, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+            SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 Like '" & 圖片庫_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
             CmdSet_For_dr()
             圖片_pb.Image = Nothing
             While dr.Read() = True
@@ -60,4 +65,10 @@ Public Class TENDENZA_STYLE_形體下單數量統計
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles 查詢形體名稱_bt.Click
         PA = InputBox("請輸入要查詢的資料") : Set_清單() : PA = ""
     End Sub
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_清單()
+    End Sub
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_清單()
+    End Sub
 End Class

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

@@ -21,7 +21,7 @@ Public Class 出貨明細表
                             貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 
                             " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, 
                             " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 貨款匯入出款明細表.實際離廠日, 
-                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片
+                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片, " & 訂單資料表(1) & ".TVW
                     FROM    貨款匯入出款明細表 INNER JOIN
                             " & 訂單資料表(1) & " ON 貨款匯入出款明細表.顏色 = " & 訂單資料表(1) & ".顏色 AND 
                             貨款匯入出款明細表.楦型 = " & 訂單資料表(1) & ".楦型 AND 
@@ -35,7 +35,7 @@ Public Class 出貨明細表
                             貨款匯入出款明細表.楦型, 貨款匯入出款明細表.訂單數量, 貨款匯入出款明細表.出貨數量, 
                             " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, 
                             " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 貨款匯入出款明細表.實際離廠日, 
-                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片
+                            " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".驗貨報告圖片, " & 訂單資料表(1) & ".TVW
                     FROM    貨款匯入出款明細表 INNER JOIN
                             " & 訂單資料表(1) & " ON 貨款匯入出款明細表.顏色 = " & 訂單資料表(1) & ".顏色 AND 
                             貨款匯入出款明細表.楦型 = " & 訂單資料表(1) & ".楦型 AND 
@@ -63,7 +63,7 @@ Public Class 出貨明細表
 
         訂單明細表_dgv.Columns(9).FillWeight = 235 : 訂單明細表_dgv.Columns(10).FillWeight = 80 : 訂單明細表_dgv.Columns(11).FillWeight = 80 : 訂單明細表_dgv.Columns(12).FillWeight = 80
         訂單明細表_dgv.Columns(13).FillWeight = 80 : 訂單明細表_dgv.Columns(14).FillWeight = 80 : 訂單明細表_dgv.Columns(15).FillWeight = 90
-        訂單明細表_dgv.Columns(16).Visible = False
+        訂單明細表_dgv.Columns(16).Visible = False : 訂單明細表_dgv.Columns(17).Visible = False
     End Sub
     Private Sub ComboBox1下拉表單資料載入()
         conn1.Close()
@@ -115,7 +115,7 @@ Public Class 出貨明細表
 
             If 訂單明細表_dgv(5, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單明細表_dgv(4, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單明細表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 驗貨報告_pb.Image = Nothing
                 While dr.Read() = True
@@ -124,13 +124,13 @@ Public Class 出貨明細表
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單明細表_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單明細表_dgv(5, e.RowIndex).Value.ToString & "' " &
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單明細表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單明細表_dgv(5, e.RowIndex).Value.ToString & "' " &
                        "AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單明細表_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單明細表_dgv(5, e.RowIndex).Value.ToString & "' " &
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單明細表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單明細表_dgv(5, e.RowIndex).Value.ToString & "' " &
                            "AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     驗貨報告_pb.Image = Nothing
@@ -141,7 +141,7 @@ Public Class 出貨明細表
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單明細表_dgv(4, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單明細表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     驗貨報告_pb.Image = Nothing
                     While dr.Read() = True

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

@@ -15,12 +15,12 @@ Public Class 周進度表
         If PA = "" Then
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date , 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, " &
                    "訂單數量 AS QTY, Requested_XF, Confirm_XF, Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號, 
-                    驗貨報告圖片, 力威訂單號 
+                    驗貨報告圖片, 力威訂單號 ,TVW
                     FROM " & 訂單資料表(1) & " " &
                    "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) ORDER BY   訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH "
         Else
             SQL1 = "SELECT 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, Requested_XF, Confirm_XF, " &
-                   "Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號, 驗貨報告圖片, 力威訂單號 FROM " & 訂單資料表(1) & " " &
+                   "Revised_XF, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, 訂單流水號, 驗貨報告圖片, 力威訂單號,TVW FROM " & 訂單資料表(1) & " " &
                    "WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單流水號 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (年份季度 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (客戶訂單號 LIKE '%" & PA & "%') OR " &
@@ -41,7 +41,7 @@ Public Class 周進度表
         訂單種類_dgv.Columns(4).FillWeight = 200 : 訂單種類_dgv.Columns(5).FillWeight = 130 : 訂單種類_dgv.Columns(6).FillWeight = 55 : 訂單種類_dgv.Columns(7).FillWeight = 55
         訂單種類_dgv.Columns(8).FillWeight = 90 : 訂單種類_dgv.Columns(9).FillWeight = 80 : 訂單種類_dgv.Columns(10).FillWeight = 80 : 訂單種類_dgv.Columns(11).FillWeight = 75
         訂單種類_dgv.Columns(12).FillWeight = 75 : 訂單種類_dgv.Columns(13).FillWeight = 75 : 訂單種類_dgv.Columns(14).FillWeight = 150 : 訂單種類_dgv.Columns(15).FillWeight = 152
-        訂單種類_dgv.Columns(16).Visible = False
+        訂單種類_dgv.Columns(16).Visible = False : 訂單種類_dgv.Columns(19).Visible = False
         訂單種類_dgv.Columns(17).Visible = False
         訂單種類_dgv.Columns(7).DefaultCellStyle.Format = "#,##0"
         訂單種類_dgv.Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -113,13 +113,13 @@ Public Class 周進度表
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單種類_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單種類_dgv(5, e.RowIndex).Value.ToString &
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單種類_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單種類_dgv(5, e.RowIndex).Value.ToString &
                     "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單種類_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單種類_dgv(5, e.RowIndex).Value.ToString &
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單種類_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單種類_dgv(5, e.RowIndex).Value.ToString &
                         "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片_pb.Image = Nothing
@@ -130,7 +130,7 @@ Public Class 周進度表
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單種類_dgv(4, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單種類_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片_pb.Image = Nothing
                     While dr.Read() = True
@@ -245,7 +245,8 @@ Public Class 周進度表
                                           "Requested_XF = '" & 訂單種類_dgv.Rows(i).Cells("Requested_XF").Value & "', " &
                                             "Confirm_XF = '" & 訂單種類_dgv.Rows(i).Cells("Confirm_XF").Value & "', " &
                                             "Revised_XF = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "', " &
-                                              "客戶交期 = '" & 訂單種類_dgv.Rows(i).Cells("Confirm_XF").Value & "' " &
+                                              "客戶交期 = '" & 訂單種類_dgv.Rows(i).Cells("Confirm_XF").Value & "', " &
+                                              "工廠回復交期 = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "' " &
                        "WHERE (客戶訂單號 LIKE '" & 訂單種類_dgv.Rows(i).Cells("PO#").Value & "') AND (形體號 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Style_Name").Value & "') " &
                        "AND (顏色 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Color").Value & "') AND (楦型 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Width").Value & "') " &
                        "AND (訂單數量 = " & 訂單種類_dgv.Rows(i).Cells("QTY").Value & ")"
@@ -254,7 +255,8 @@ Public Class 周進度表
                                           "Requested_XF = '" & 訂單種類_dgv.Rows(i).Cells("Requested_XF").Value & "', " &
                                             "Confirm_XF = '" & 訂單種類_dgv.Rows(i).Cells("Confirm_XF").Value & "', " &
                                             "Revised_XF = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "', " &
-                                              "客戶交期 = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "' 
+                                              "客戶交期 = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "', " &
+                                              "工廠回復交期 = '" & 訂單種類_dgv.Rows(i).Cells("Revised_XF").Value & "' 
                         WHERE (客戶訂單號 LIKE '" & 訂單種類_dgv.Rows(i).Cells("PO#").Value & "') AND (形體號 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Style_Name").Value & "') " &
                        "AND (顏色 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Color").Value & "') AND (楦型 LIKE '" & 訂單種類_dgv.Rows(i).Cells("Width").Value & "') " &
                        "AND (訂單數量 = " & 訂單種類_dgv.Rows(i).Cells("QTY").Value & ")"

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

@@ -11,11 +11,11 @@ Public Class 周進度表T1_T4
         If PA = "" Then
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片, 力威訂單號 FROM " & 訂單資料表(1) & " WHERE (CXL IS NULL OR CXL = 0) AND (訂單數量 - 出貨數量 <> 0) ORDER BY 訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
+                   "訂單流水號, 驗貨報告圖片, 力威訂單號,TVW FROM " & 訂單資料表(1) & " WHERE (CXL IS NULL OR CXL = 0) AND (訂單數量 - 出貨數量 <> 0) ORDER BY 訂單流水號 DESC, STYLE_NAME, COLOR, WIDTH"
         Else
             SQL1 = "SELECT 年份季度 AS SEASON, 訂單種類 AS Order_type, PO_S_Date, 生產工廠 AS Plant, 客戶訂單號 AS PO#, 形體號 AS Style_Name, 顏色 AS Color, 楦型 AS Width, 訂單數量 AS QTY, " &
                    "Requested_XF, Confirm_XF, Revised_XF, TRIAL1 AS T1, CFMSAMPLE AS CFM, TRIAL4 AS T4, 裁斷時間 AS Cutting, 針車時間 AS Stitching, 成型時間 AS Lasting, Special_Packaging, Remarks, " &
-                   "訂單流水號, 驗貨報告圖片, 力威訂單號 FROM " & 訂單資料表(1) & " WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單流水號 LIKE '%" & PA & "%') OR " &
+                   "訂單流水號, 驗貨報告圖片, 力威訂單號,TVW FROM " & 訂單資料表(1) & " WHERE (CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (訂單流水號 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (年份季度 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (客戶訂單號 LIKE '%" & PA & "%') OR " &
                          "(CXL IS NULL OR (CXL = 0)) AND (訂單數量 - 出貨數量 <> 0) AND (形體號 LIKE '%" & PA & "%') OR " &
@@ -35,7 +35,7 @@ Public Class 周進度表T1_T4
         訂單清單_dgv.Columns(8).FillWeight = 55 : 訂單清單_dgv.Columns(9).Visible = False : 訂單清單_dgv.Columns(10).FillWeight = 75 : 訂單清單_dgv.Columns(11).Visible = False
         訂單清單_dgv.Columns(12).FillWeight = 75 : 訂單清單_dgv.Columns(13).FillWeight = 75 : 訂單清單_dgv.Columns(14).FillWeight = 75 : 訂單清單_dgv.Columns(15).FillWeight = 75
         訂單清單_dgv.Columns(16).FillWeight = 75 : 訂單清單_dgv.Columns(17).FillWeight = 75 : 訂單清單_dgv.Columns(18).FillWeight = 120 : 訂單清單_dgv.Columns(19).FillWeight = 93
-        訂單清單_dgv.Columns(20).Visible = False : 訂單清單_dgv.Columns(21).Visible = False
+        訂單清單_dgv.Columns(20).Visible = False : 訂單清單_dgv.Columns(21).Visible = False : 訂單清單_dgv.Columns(23).Visible = False
         訂單清單_dgv.Columns(8).DefaultCellStyle.Format = "#,##0"
         訂單清單_dgv.Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 訂單清單_dgv.Columns(8).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         訂單清單_dgv.Columns(2).DefaultCellStyle.BackColor = Color.MistyRose : 訂單清單_dgv.Columns(9).DefaultCellStyle.BackColor = Color.MistyRose
@@ -54,7 +54,7 @@ Public Class 周進度表T1_T4
         If e.RowIndex = -1 Then : Else
             If 訂單清單_dgv(6, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 圖片庫一_pb.Image = Nothing
                 While dr.Read() = True
@@ -63,13 +63,13 @@ Public Class 周進度表T1_T4
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(6, e.RowIndex).Value.ToString &
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(6, e.RowIndex).Value.ToString &
                     "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(6, e.RowIndex).Value.ToString &
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(6, e.RowIndex).Value.ToString &
                         "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
@@ -80,7 +80,7 @@ Public Class 周進度表T1_T4
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
                     While dr.Read() = True

TENDEN-MES-SYS/量產訂單管理/現有訂單鞋盒資訊查詢.Designer.vb

@@ -26,6 +26,9 @@ Partial Class 現有訂單鞋盒資訊查詢
         Me.訂單控制表2_dgv = New System.Windows.Forms.DataGridView()
         Me.圖片庫一_pb = New System.Windows.Forms.PictureBox()
         Me.查詢_bt = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         CType(Me.訂單控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.訂單控制表2_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片庫一_pb, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -73,11 +76,41 @@ Partial Class 現有訂單鞋盒資訊查詢
         Me.查詢_bt.Text = "查詢"
         Me.查詢_bt.UseVisualStyleBackColor = True
         '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(360, 50)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 518
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(443, 50)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇1_bt.TabIndex = 519
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(553, 52)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(75, 30)
+        Me.資料庫選擇2_bt.TabIndex = 520
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_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.資料庫選擇2_bt)
+        Me.Controls.Add(Me.資料庫選擇1_bt)
+        Me.Controls.Add(Me.Label20)
         Me.Controls.Add(Me.查詢_bt)
         Me.Controls.Add(Me.圖片庫一_pb)
         Me.Controls.Add(Me.訂單控制表2_dgv)
@@ -90,6 +123,7 @@ Partial Class 現有訂單鞋盒資訊查詢
         CType(Me.訂單控制表2_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.圖片庫一_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
 
@@ -97,5 +131,8 @@ Partial Class 現有訂單鞋盒資訊查詢
     Friend WithEvents 訂單控制表2_dgv As DataGridView
     Friend WithEvents 圖片庫一_pb As PictureBox
     Friend WithEvents 查詢_bt As Button
+    Friend WithEvents Label20 As Label
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
 End Class
 

TENDEN-MES-SYS/量產訂單管理/現有訂單鞋盒資訊查詢.vb

@@ -15,18 +15,18 @@ Public Class 現有訂單鞋盒資訊查詢
     End Sub
     Private Sub Set_清單1()
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單控制表.訂單流水號 AS VT#, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, " &
-               "訂單控制表.客戶交期 AS 訂單日期, 訂單控制表.TVW AS 型體號, 訂單控制表.形體號 AS ProductName, 訂單控制表.顏色, 訂單控制表.楦型, 訂單控制表.訂單數量, " &
-               "訂單控制表.工廠回復交期, 訂單控制表.客戶包裝確認, 訂單控制表.東莞業務備註, 鞋盒資料控制表.S_B_S, 鞋盒資料控制表.M_B_S, " &
-               "鞋盒資料控制表.L_B_S, 鞋盒資料控制表.E_B_S FROM 訂單控制表 LEFT OUTER JOIN 鞋盒資料控制表 ON 訂單控制表.形體號 = 鞋盒資料控制表.STYLE " &
-               "WHERE (訂單控制表.CXL = 0 OR 訂單控制表.CXL IS NULL) AND (訂單控制表.訂單數量 - 訂單控制表.出貨數量 <> 0) ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC, 訂單控制表.形體號"
+        SQL1 = "SELECT  " & 訂單資料表(1) & ".訂單流水號 AS VT#, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, 
+               " & 訂單資料表(1) & ".客戶交期 As 訂單日期, " & 訂單資料表(1) & ".TVW As 型體號, " & 訂單資料表(1) & ".形體號 As ProductName, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, 
+               " & 訂單資料表(1) & ".工廠回復交期, " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".東莞業務備註, 鞋盒資料控制表.S_B_S, 鞋盒資料控制表.M_B_S,
+               鞋盒資料控制表.L_B_S, 鞋盒資料控制表.E_B_S, " & 訂單資料表(1) & " . TVW FROM " & 訂單資料表(1) & " LEFT OUTER JOIN 鞋盒資料控制表 On " & 訂單資料表(1) & ".形體號 = 鞋盒資料控制表.STYLE 
+               WHERE (" & 訂單資料表(1) & ".CXL = 0 Or " & 訂單資料表(1) & ".CXL Is NULL) And (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC, " & 訂單資料表(1) & ".形體號"
         Set_DGV1載入後設定()
     End Sub
     Private Sub Set_grid1()
         訂單控制表_dgv.Columns(0).FillWeight = 75 : 訂單控制表_dgv.Columns(1).FillWeight = 50 : 訂單控制表_dgv.Columns(2).FillWeight = 110 : 訂單控制表_dgv.Columns(3).FillWeight = 45
         訂單控制表_dgv.Columns(4).FillWeight = 80 : 訂單控制表_dgv.Columns(5).FillWeight = 80 : 訂單控制表_dgv.Columns(6).FillWeight = 80 : 訂單控制表_dgv.Columns(7).FillWeight = 140
         訂單控制表_dgv.Columns(8).FillWeight = 100 : 訂單控制表_dgv.Columns(9).FillWeight = 50 : 訂單控制表_dgv.Columns(10).FillWeight = 70 : 訂單控制表_dgv.Columns(11).FillWeight = 90
-        訂單控制表_dgv.Columns(12).FillWeight = 90 : 訂單控制表_dgv.Columns(13).FillWeight = 225 : 訂單控制表_dgv.Columns(14).FillWeight = 145
+        訂單控制表_dgv.Columns(12).FillWeight = 90 : 訂單控制表_dgv.Columns(13).FillWeight = 225 : 訂單控制表_dgv.Columns(14).FillWeight = 145 : 訂單控制表_dgv.Columns(18).Visible = False
         訂單控制表_dgv.Columns(15).FillWeight = 145 : 訂單控制表_dgv.Columns(16).FillWeight = 145 : 訂單控制表_dgv.Columns(17).FillWeight = 145
         訂單控制表_dgv.Columns(10).DefaultCellStyle.Format = "#,##0"
         訂單控制表_dgv.Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 訂單控制表_dgv.Columns(10).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -44,11 +44,11 @@ Public Class 現有訂單鞋盒資訊查詢
     End Sub
     Private Sub Set_清單2()
         Set_DGV2載入前設定()
-        SQL1 = "SELECT 訂單控制表.訂單流水號 AS VT#, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單控制表.客戶交期 AS 訂單日期, " &
-               "訂單控制表.TVW AS 型體號, 訂單控制表.形體號 AS ProductName, 訂單控制表.顏色, 訂單控制表.楦型, 鞋盒資料控制表.S_GW, 鞋盒資料控制表.M_GW, 鞋盒資料控制表.L_GW, 鞋盒資料控制表.E_GW, " &
-               "鞋盒資料控制表.Dimensions_S, 鞋盒資料控制表.Dimensions_M, 鞋盒資料控制表.Dimensions_L, 鞋盒資料控制表.Dimensions_E, 鞋盒資料控制表.PRS_CRT, 鞋盒資料控制表.QUK " &
-               "FROM 訂單控制表 LEFT OUTER JOIN 鞋盒資料控制表 ON 訂單控制表.形體號 = 鞋盒資料控制表.STYLE " &
-               "WHERE (訂單控制表.CXL = 0 OR 訂單控制表.CXL IS NULL) AND (訂單控制表.訂單數量 - 訂單控制表.出貨數量 <> 0) ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC, 訂單控制表.形體號"
+        SQL1 = "Select " & 訂單資料表(1) & ".訂單流水號 As VT#, " & 訂單資料表(1) & ".年份季度 As 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 As 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(1) & ".客戶交期 As 訂單日期, 
+               " & 訂單資料表(1) & ".TVW As 型體號, " & 訂單資料表(1) & ".形體號 As ProductName, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, 鞋盒資料控制表.S_GW, 鞋盒資料控制表.M_GW, 鞋盒資料控制表.L_GW, 鞋盒資料控制表.E_GW, 
+               鞋盒資料控制表.Dimensions_S, 鞋盒資料控制表.Dimensions_M, 鞋盒資料控制表.Dimensions_L, 鞋盒資料控制表.Dimensions_E, 鞋盒資料控制表.PRS_CRT, 鞋盒資料控制表.QUK, " & 訂單資料表(1) & ".TVW
+               FROM " & 訂單資料表(1) & " LEFT OUTER JOIN 鞋盒資料控制表 On " & 訂單資料表(1) & ".形體號 = 鞋盒資料控制表.STYLE 
+               WHERE (" & 訂單資料表(1) & ".CXL = 0 Or " & 訂單資料表(1) & ".CXL Is NULL) And (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC, " & 訂單資料表(1) & ".形體號"
         Set_DGV2載入後設定()
     End Sub
     Private Sub Set_grid2()
@@ -57,7 +57,7 @@ Public Class 現有訂單鞋盒資訊查詢
         訂單控制表2_dgv.Columns(8).FillWeight = 100 : 訂單控制表2_dgv.Columns(9).FillWeight = 50 : 訂單控制表2_dgv.Columns(10).FillWeight = 70 : 訂單控制表2_dgv.Columns(11).FillWeight = 70
         訂單控制表2_dgv.Columns(12).FillWeight = 70 : 訂單控制表2_dgv.Columns(13).FillWeight = 70 : 訂單控制表2_dgv.Columns(14).FillWeight = 145 : 訂單控制表2_dgv.Columns(15).FillWeight = 145
         訂單控制表2_dgv.Columns(16).FillWeight = 145 : 訂單控制表2_dgv.Columns(17).FillWeight = 145 : 訂單控制表2_dgv.Columns(18).FillWeight = 90 : 訂單控制表2_dgv.Columns(19).FillWeight = 105
-        訂單控制表2_dgv.Columns(10).DefaultCellStyle.Format = "#,##0.00" : 訂單控制表2_dgv.Columns(11).DefaultCellStyle.Format = "#,##0.00"
+        訂單控制表2_dgv.Columns(10).DefaultCellStyle.Format = "#,##0.00" : 訂單控制表2_dgv.Columns(11).DefaultCellStyle.Format = "#,##0.00" : 訂單控制表2_dgv.Columns(20).Visible = False
         訂單控制表2_dgv.Columns(12).DefaultCellStyle.Format = "#,##0.00" : 訂單控制表2_dgv.Columns(13).DefaultCellStyle.Format = "#,##0.00"
         訂單控制表2_dgv.Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 訂單控制表2_dgv.Columns(10).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         訂單控制表2_dgv.Columns(11).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 訂單控制表2_dgv.Columns(11).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -66,7 +66,7 @@ Public Class 現有訂單鞋盒資訊查詢
     End Sub
     Private Sub 現有訂單鞋盒資訊查詢_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
-        Set_清單1() : Set_grid1() : Set_清單2() : Set_grid2()
+        訂單資料庫選擇.ShowDialog() : Set_清單1() : Set_grid1() : Set_清單2() : Set_grid2()
     End Sub
     Private Sub DataGridView1_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 訂單控制表_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
@@ -106,7 +106,7 @@ Public Class 現有訂單鞋盒資訊查詢
         If e.RowIndex = -1 Then : Else
             If 訂單控制表_dgv(8, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表_dgv(7, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "Select TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 Like '" & 訂單控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 圖片庫一_pb.Image = Nothing
                 While dr.Read() = True
@@ -115,13 +115,13 @@ Public Class 現有訂單鞋盒資訊查詢
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表_dgv(7, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表_dgv(8, e.RowIndex).Value.ToString &
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表_dgv(8, e.RowIndex).Value.ToString &
                     "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表_dgv(7, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表_dgv(8, e.RowIndex).Value.ToString &
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表_dgv(8, e.RowIndex).Value.ToString &
                         "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
@@ -132,7 +132,7 @@ Public Class 現有訂單鞋盒資訊查詢
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表_dgv(7, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
                     While dr.Read() = True
@@ -148,7 +148,7 @@ Public Class 現有訂單鞋盒資訊查詢
         If e.RowIndex = -1 Then : Else
             If 訂單控制表2_dgv(8, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表2_dgv(7, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單控制表2_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 圖片庫一_pb.Image = Nothing
                 While dr.Read() = True
@@ -157,13 +157,13 @@ Public Class 現有訂單鞋盒資訊查詢
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表2_dgv(7, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表2_dgv(8, e.RowIndex).Value.ToString &
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單控制表2_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表2_dgv(8, e.RowIndex).Value.ToString &
                     "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表2_dgv(7, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表2_dgv(8, e.RowIndex).Value.ToString &
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單控制表2_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單控制表2_dgv(8, e.RowIndex).Value.ToString &
                         "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
@@ -174,7 +174,7 @@ Public Class 現有訂單鞋盒資訊查詢
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單控制表2_dgv(7, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單控制表2_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
                     While dr.Read() = True
@@ -189,25 +189,33 @@ Public Class 現有訂單鞋盒資訊查詢
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles 查詢_bt.Click
         PA = InputBox("請輸入要查詢的資料")
         Set_DGV1載入前設定()
-        SQL1 = "SELECT 訂單控制表.訂單流水號 AS VT#, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, " &
-               "訂單控制表.客戶交期 AS 訂單日期, 訂單控制表.TVW AS 型體號, 訂單控制表.形體號 AS ProductName, 訂單控制表.顏色, 訂單控制表.楦型, 訂單控制表.訂單數量, " &
-               "訂單控制表.工廠回復交期, 訂單控制表.客戶包裝確認, 訂單控制表.東莞業務備註, 鞋盒資料控制表.S_B_S, 鞋盒資料控制表.M_B_S, " &
-               "鞋盒資料控制表.L_B_S, 鞋盒資料控制表.E_B_S FROM 訂單控制表 LEFT OUTER JOIN 鞋盒資料控制表 ON 訂單控制表.形體號 = 鞋盒資料控制表.STYLE " &
-               "WHERE (訂單控制表.CXL = 0 OR 訂單控制表.CXL IS NULL) AND (訂單控制表.訂單數量 - 訂單控制表.出貨數量 <> 0) AND (訂單控制表.訂單流水號 LIKE '%" & PA & "%' OR " &
-               "訂單控制表.年份季度 LIKE '%" & PA & "%' OR 訂單控制表.客戶訂單號 LIKE '%" & PA & "%' OR 訂單控制表.生產工廠 LIKE '%" & PA & "%' OR " &
-               "訂單控制表.訂單種類 LIKE '%" & PA & "%' OR 訂單控制表.TVW LIKE '%" & PA & "%' OR 訂單控制表.形體號 LIKE '%" & PA & "%' OR 訂單控制表.顏色 LIKE '%" & PA & "%') " &
-               "ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC, 訂單控制表.形體號"
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號 AS VT#," & 訂單資料表(1) & ".年份季度 AS 季度," & 訂單資料表(1) & ".客戶訂單號," & 訂單資料表(1) & ".生產工廠 AS 工廠," & 訂單資料表(1) & ".訂單種類, 
+               " & 訂單資料表(1) & ".客戶交期 As 訂單日期," & 訂單資料表(1) & ".TVW As 型體號," & 訂單資料表(1) & ".形體號 As ProductName," & 訂單資料表(1) & ".顏色," & 訂單資料表(1) & ".楦型," & 訂單資料表(1) & ".訂單數量, 
+               " & 訂單資料表(1) & ".工廠回復交期," & 訂單資料表(1) & ".客戶包裝確認," & 訂單資料表(1) & ".東莞業務備註, 鞋盒資料控制表.S_B_S, 鞋盒資料控制表.M_B_S, 
+               鞋盒資料控制表.L_B_S, 鞋盒資料控制表.E_B_S," & 訂單資料表(1) & ".TVW FROM" & 訂單資料表(1) & " LEFT OUTER JOIN 鞋盒資料控制表 On" & 訂單資料表(1) & ".形體號 = 鞋盒資料控制表.STYLE 
+               WHERE(" & 訂單資料表(1) & ".CXL = 0 Or " & 訂單資料表(1) & ".CXL Is NULL) And (" & 訂單資料表(1) & ".訂單數量 -" & 訂單資料表(1) & ".出貨數量 <> 0) And (" & 訂單資料表(1) & ".訂單流水號 Like '%" & PA & "%' OR 
+               " & 訂單資料表(1) & ".年份季度 Like '%" & PA & "%' OR" & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%' OR 
+               " & 訂單資料表(1) & ".訂單種類 Like '%" & PA & "%' OR" & 訂單資料表(1) & ".TVW LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%') 
+               ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC," & 訂單資料表(1) & ".形體號"
         Set_DGV1載入後設定() : Set_grid1()
         Set_DGV2載入前設定()
-        SQL1 = "SELECT 訂單控制表.訂單流水號 AS VT#, 訂單控制表.年份季度 AS 季度, 訂單控制表.客戶訂單號, 訂單控制表.生產工廠 AS 工廠, 訂單控制表.訂單種類, 訂單控制表.客戶交期 AS 訂單日期, " &
-               "訂單控制表.TVW AS 型體號, 訂單控制表.形體號 AS ProductName, 訂單控制表.顏色, 訂單控制表.楦型, 鞋盒資料控制表.S_GW, 鞋盒資料控制表.M_GW, 鞋盒資料控制表.L_GW, 鞋盒資料控制表.E_GW, " &
-               "鞋盒資料控制表.Dimensions_S, 鞋盒資料控制表.Dimensions_M, 鞋盒資料控制表.Dimensions_L, 鞋盒資料控制表.Dimensions_E, 鞋盒資料控制表.PRS_CRT, 鞋盒資料控制表.QUK " &
-               "FROM 訂單控制表 LEFT OUTER JOIN 鞋盒資料控制表 ON 訂單控制表.形體號 = 鞋盒資料控制表.STYLE " &
-               "WHERE (訂單控制表.CXL = 0 OR 訂單控制表.CXL IS NULL) AND (訂單控制表.訂單數量 - 訂單控制表.出貨數量 <> 0) AND (訂單控制表.訂單流水號 LIKE '%" & PA & "%' OR " &
-               "訂單控制表.年份季度 LIKE '%" & PA & "%' OR 訂單控制表.客戶訂單號 LIKE '%" & PA & "%' OR 訂單控制表.生產工廠 LIKE '%" & PA & "%' OR " &
-               "訂單控制表.訂單種類 LIKE '%" & PA & "%' OR 訂單控制表.TVW LIKE '%" & PA & "%' OR 訂單控制表.形體號 LIKE '%" & PA & "%' OR 訂單控制表.顏色 LIKE '%" & PA & "%') " &
-               "ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC, 訂單控制表.形體號"
+        SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號 AS VT#," & 訂單資料表(1) & ".年份季度 AS 季度," & 訂單資料表(1) & ".客戶訂單號," & 訂單資料表(1) & ".生產工廠 AS 工廠," & 訂單資料表(1) & ".訂單種類," & 訂單資料表(1) & ".客戶交期 AS 訂單日期, 
+               " & 訂單資料表(1) & ".TVW As 型體號," & 訂單資料表(1) & ".形體號 As ProductName," & 訂單資料表(1) & ".顏色," & 訂單資料表(1) & ".楦型, 鞋盒資料控制表.S_GW, 鞋盒資料控制表.M_GW, 鞋盒資料控制表.L_GW, 鞋盒資料控制表.E_GW, 
+               鞋盒資料控制表.Dimensions_S, 鞋盒資料控制表.Dimensions_M, 鞋盒資料控制表.Dimensions_L, 鞋盒資料控制表.Dimensions_E, 鞋盒資料控制表.PRS_CRT, 鞋盒資料控制表.QUK ,  " & 訂單資料表(1) & ".TVW
+               FROM" & 訂單資料表(1) & " LEFT OUTER JOIN 鞋盒資料控制表 ON" & 訂單資料表(1) & ".形體號 = 鞋盒資料控制表.STYLE 
+               WHERE (" & 訂單資料表(1) & ".CXL = 0 OR" & 訂單資料表(1) & ".CXL IS NULL) AND (" & 訂單資料表(1) & ".訂單數量 -" & 訂單資料表(1) & ".出貨數量 <> 0) AND (" & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%' OR 
+               " & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%' OR 
+               " & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".TVW LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%' OR" & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%') 
+               ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC," & 訂單資料表(1) & ".形體號"
         Set_DGV2載入後設定() : Set_grid2()
         PA = ""
     End Sub
+
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_清單1() : Set_grid1() : Set_清單2() : Set_grid2()
+    End Sub
+
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_清單1() : Set_grid1() : Set_清單2() : Set_grid2()
+    End Sub
 End Class

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

@@ -44,7 +44,7 @@ Public Class 生產進度表
     End Sub
     Private Sub Set_grid()
         訂單清單_dgv.Columns(0).FillWeight = 80 : 訂單清單_dgv.Columns(1).FillWeight = 100 : 訂單清單_dgv.Columns(2).FillWeight = 80 : 訂單清單_dgv.Columns(3).FillWeight = 120
-        訂單清單_dgv.Columns(4).FillWeight = 200 : 訂單清單_dgv.Columns(5).FillWeight = 80 : 訂單清單_dgv.Columns(6).FillWeight = 90 : 訂單清單_dgv.Columns(7).FillWeight = 80
+        訂單清單_dgv.Columns(4).FillWeight = 200 : 訂單清單_dgv.Columns(5).Visible = False : 訂單清單_dgv.Columns(6).FillWeight = 90 : 訂單清單_dgv.Columns(7).FillWeight = 80
         訂單清單_dgv.Columns(8).FillWeight = 90 : 訂單清單_dgv.Columns(9).FillWeight = 150 : 訂單清單_dgv.Columns(10).FillWeight = 65 : 訂單清單_dgv.Columns(11).FillWeight = 80
         訂單清單_dgv.Columns(12).FillWeight = 69 : 訂單清單_dgv.Columns(13).FillWeight = 69 : 訂單清單_dgv.Columns(14).FillWeight = 69 : 訂單清單_dgv.Columns(15).FillWeight = 70
         訂單清單_dgv.Columns(16).FillWeight = 69 : 訂單清單_dgv.Columns(17).FillWeight = 69 : 訂單清單_dgv.Columns(18).FillWeight = 70 : 訂單清單_dgv.Columns(19).FillWeight = 70
@@ -56,7 +56,7 @@ Public Class 生產進度表
         訂單清單_dgv.Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         訂單清單_dgv.Columns(10).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
         If BB(0) = False And BB(1) = True And BB(2) = True And BB(3) = True Then
-            訂單清單_dgv.Columns(1).Visible = True : 訂單清單_dgv.Columns(2).Visible = True : 訂單清單_dgv.Columns(5).Visible = True : 訂單清單_dgv.Columns(6).Visible = True
+            訂單清單_dgv.Columns(1).Visible = True : 訂單清單_dgv.Columns(2).Visible = True : 訂單清單_dgv.Columns(5).Visible = False : 訂單清單_dgv.Columns(6).Visible = True
             訂單清單_dgv.Columns(7).Visible = True
 
             訂單清單_dgv.Columns(12).Visible = True : 訂單清單_dgv.Columns(13).Visible = True : 訂單清單_dgv.Columns(14).Visible = True : 訂單清單_dgv.Columns(15).Visible = True
@@ -67,7 +67,7 @@ Public Class 生產進度表
             訂單清單_dgv.Columns(28).Visible = False : 訂單清單_dgv.Columns(29).Visible = False : 訂單清單_dgv.Columns(30).Visible = False : 訂單清單_dgv.Columns(31).Visible = False
             訂單清單_dgv.Columns(32).Visible = False
         ElseIf BB(0) = True And BB(1) = False And BB(2) = True And BB(3) = True Then
-            訂單清單_dgv.Columns(1).Visible = True : 訂單清單_dgv.Columns(2).Visible = True : 訂單清單_dgv.Columns(5).Visible = True : 訂單清單_dgv.Columns(6).Visible = True
+            訂單清單_dgv.Columns(1).Visible = True : 訂單清單_dgv.Columns(2).Visible = True : 訂單清單_dgv.Columns(5).Visible = False : 訂單清單_dgv.Columns(6).Visible = True
             訂單清單_dgv.Columns(7).Visible = True
 
             訂單清單_dgv.Columns(12).Visible = False : 訂單清單_dgv.Columns(13).Visible = False : 訂單清單_dgv.Columns(14).Visible = False : 訂單清單_dgv.Columns(15).Visible = False
@@ -162,7 +162,7 @@ Public Class 生產進度表
         If e.RowIndex = -1 Then : Else
             If 訂單清單_dgv(9, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 驗貨報告_pb.Image = Nothing
                 While dr.Read() = True
@@ -171,12 +171,12 @@ Public Class 生產進度表
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(9, e.RowIndex).Value.ToString & "'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(9, e.RowIndex).Value.ToString & "'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(9, e.RowIndex).Value.ToString & "'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(9, e.RowIndex).Value.ToString & "'"
                     CmdSet_For_dr()
                     驗貨報告_pb.Image = Nothing
                     While dr.Read() = True
@@ -186,7 +186,7 @@ Public Class 生產進度表
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     驗貨報告_pb.Image = Nothing
                     While dr.Read() = True

TENDEN-MES-SYS/量產訂單管理/皮料資料紀錄表.vb

@@ -16,11 +16,12 @@ Public Class 皮料資料紀錄表
     Private Sub Set_皮料清單()
         Set_DGV1載入前設定()
         If PA = "" Then
-            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號 FROM " & 訂單資料表(1) & " " &
-                   "WHERE ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)  " &
-                   "ORDER BY   資料流水號 DESC, 形體號, 顏色, 楦型"
+            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號,TVW
+                    FROM " & 訂單資料表(1) & " 
+                   WHERE ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0)  
+                   ORDER BY   資料流水號 DESC, 形體號, 顏色, 楦型 "
         Else
-            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號 FROM " & 訂單資料表(1) & " " &
+            SQL1 = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, 工廠回復交期, LEATHER, LEA_Note, 資料流水號,TVW FROM " & 訂單資料表(1) & " " &
                    "WHERE ((年份季度 NOT LIKE '%10%') AND (年份季度 NOT LIKE '%11%') AND (年份季度 NOT LIKE '%12%') AND (年份季度 NOT LIKE '%13%') AND " &
                    "(年份季度 NOT LIKE '%14%') AND (年份季度 NOT LIKE '%15%') AND (年份季度 NOT LIKE '%16%') AND (年份季度 NOT LIKE '%17%')) AND " &
                    "(訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR " &
@@ -33,7 +34,7 @@ Public Class 皮料資料紀錄表
         皮料清單_dgv.Columns(0).FillWeight = 85 : 皮料清單_dgv.Columns(1).FillWeight = 70 : 皮料清單_dgv.Columns(2).FillWeight = 120 : 皮料清單_dgv.Columns(3).FillWeight = 200
         皮料清單_dgv.Columns(4).FillWeight = 130 : 皮料清單_dgv.Columns(5).FillWeight = 80 : 皮料清單_dgv.Columns(6).FillWeight = 80 : 皮料清單_dgv.Columns(7).FillWeight = 150
         皮料清單_dgv.Columns(8).FillWeight = 90 : 皮料清單_dgv.Columns(9).FillWeight = 90 : 皮料清單_dgv.Columns(10).FillWeight = 90 : 皮料清單_dgv.Columns(11).FillWeight = 120
-        皮料清單_dgv.Columns(12).FillWeight = 228 : 皮料清單_dgv.Columns(13).Visible = False
+        皮料清單_dgv.Columns(12).FillWeight = 228 : 皮料清單_dgv.Columns(13).Visible = False : 皮料清單_dgv.Columns(14).Visible = False
 
         皮料清單_dgv.Columns(6).DefaultCellStyle.Format = "#,##0"
         皮料清單_dgv.Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 皮料清單_dgv.Columns(6).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -56,7 +57,7 @@ Public Class 皮料資料紀錄表
         If e.RowIndex = -1 Then : Else
             If 皮料清單_dgv(4, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 皮料清單_dgv(3, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 皮料清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 圖片庫_pb.Image = Nothing
                 While dr.Read() = True
@@ -65,12 +66,12 @@ Public Class 皮料資料紀錄表
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 皮料清單_dgv(3, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 皮料清單_dgv(4, e.RowIndex).Value.ToString & "'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 皮料清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 皮料清單_dgv(4, e.RowIndex).Value.ToString & "'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 皮料清單_dgv(3, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 皮料清單_dgv(4, e.RowIndex).Value.ToString & "'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 皮料清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 皮料清單_dgv(4, e.RowIndex).Value.ToString & "'"
                     CmdSet_For_dr()
                     圖片庫_pb.Image = Nothing
                     While dr.Read() = True
@@ -80,7 +81,7 @@ Public Class 皮料資料紀錄表
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 皮料清單_dgv(3, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 皮料清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫_pb.Image = Nothing
                     While dr.Read() = True

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

@@ -21,7 +21,7 @@ Public Class 訂單執行資訊輸入
                            " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, 
                            " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
                            " & 訂單資料表(1) & ".利威確認 AS 利威驗貨, " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".資料流水號, 
-                           " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH 
+                           " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH ," & 訂單資料表(1) & ".TVW
                     FROM " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName 
                     WHERE (" & 訂單資料表(1) & ".CXL = 0 OR " & 訂單資料表(1) & ".CXL IS NULL) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) 
                     ORDER BY   " & 訂單資料表(1) & ".客戶訂單號 DESC"
@@ -31,7 +31,7 @@ Public Class 訂單執行資訊輸入
                            " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, 
                            " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
                            " & 訂單資料表(1) & ".利威確認 AS 利威驗貨, " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".資料流水號, 
-                           " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH 
+                           " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH , " & 訂單資料表(1) & ".TVW
                     FROM " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName 
                     WHERE (" & 訂單資料表(1) & ".CXL = 0 OR " & 訂單資料表(1) & ".CXL IS NULL) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) 
                            AND (" & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%' OR 
@@ -99,7 +99,7 @@ Public Class 訂單執行資訊輸入
         If e.RowIndex = -1 Then : Else
             If 控制表_dgv(4, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 圖片庫_pb.Image = Nothing
                 While dr.Read() = True
@@ -108,12 +108,12 @@ Public Class 訂單執行資訊輸入
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 控制表_dgv(4, e.RowIndex).Value.ToString & "'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 控制表_dgv(4, e.RowIndex).Value.ToString & "'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 控制表_dgv(4, e.RowIndex).Value.ToString & "'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 控制表_dgv(4, e.RowIndex).Value.ToString & "'"
                     CmdSet_For_dr()
                     圖片庫_pb.Image = Nothing
                     While dr.Read() = True
@@ -123,7 +123,7 @@ Public Class 訂單執行資訊輸入
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv(3, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫_pb.Image = Nothing
                     While dr.Read() = True

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

@@ -1023,26 +1023,6 @@ Public Class 訂單控制表
         End If
         Set_格式設定() : Set_訂單清單() : Set_自動彙總1() : Set_grid()
         ComboBox1下拉表單資料載入() : ComboBox2下拉表單資料載入() : ComboBox3下拉表單資料載入() : ComboBox4下拉表單資料載入() : ComboBox5下拉表單資料載入() : ComboBox6下拉表單資料載入()
-
-        'Set_客戶交期除錯()
-        'If 除錯_dgv.Rows.Count > 0 Then
-        '    For I As Integer = 0 To 除錯_dgv.Rows.Count - 1
-        '        If IsNumeric(Strings.Left(除錯_dgv("後段", I).Value.ToString, 2)) = False And IsNumeric(Strings.Right(除錯_dgv("後段", I).Value.ToString, 2)) = False Then
-        '            除錯_dgv("後段", I).Value = 除錯_dgv("前段", I).Value.ToString & "/" & "0" & Strings.Left(除錯_dgv("後段", I).Value.ToString, 1) & "/0" &
-        '                Strings.Right(除錯_dgv("後段", I).Value.ToString, 1)
-        '        ElseIf IsNumeric(Strings.Left(除錯_dgv("後段", I).Value.ToString, 2)) = True And IsNumeric(Strings.Right(除錯_dgv("後段", I).Value.ToString, 2)) = False Then
-        '            除錯_dgv("後段", I).Value = 除錯_dgv("前段", I).Value.ToString & "/" & Strings.Left(除錯_dgv("後段", I).Value.ToString, 2) & "/0" &
-        '                Strings.Right(除錯_dgv("後段", I).Value.ToString, 1)
-        '            除錯_dgv("後段", I).Value = "2021/" & Strings.Left(除錯_dgv("前段", I).Value.ToString, 2) & "/0" & Strings.Right(除錯_dgv("前段", I).Value.ToString, 1)
-        '        ElseIf IsNumeric(Strings.Left(除錯_dgv("後段", I).Value.ToString, 2)) = False And IsNumeric(Strings.Right(除錯_dgv("後段", I).Value.ToString, 2)) = True Then
-        '            除錯_dgv("後段", I).Value = 除錯_dgv("前段", I).Value.ToString & "/" & "0" & Strings.Left(除錯_dgv("後段", I).Value.ToString, 1) & "/" &
-        '                Strings.Right(除錯_dgv("後段", I).Value.ToString, 2)
-        '        End If
-        '        ConnOpen()
-        '        SQL1 = "UPDATE 訂單控制表 SET 客戶交期 = '" & 除錯_dgv("後段", I).Value.ToString & "' WHERE (資料流水號 = '" & 除錯_dgv("資料流水號", I).Value.ToString & "')"
-        '        CmdSet_For_dr() : conn.Close()
-        '    Next
-        'End If
     End Sub
     Private Sub 訂單控制表_Unload(sender As Object, e As EventArgs) Handles MyBase.Closing
         frmOpenFlag = False
@@ -1153,7 +1133,7 @@ Public Class 訂單控制表
 
                 If 控制表_dgv("顏色", e.RowIndex).Value = "" Then
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     PictureBox1.Image = Nothing
                     While dr.Read() = True
@@ -1162,13 +1142,13 @@ Public Class 訂單控制表
                     End While
                 Else
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 
                             顏色 LIKE '" & 控制表_dgv("顏色", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     If dr.Read() Then
                         conn.Close()
                         ConnOpen()
-                        SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 
+                        SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 
                                 顏色 LIKE '" & 控制表_dgv("顏色", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                         CmdSet_For_dr()
                         PictureBox1.Image = Nothing
@@ -1179,7 +1159,7 @@ Public Class 訂單控制表
                     Else
                         conn.Close()
                         ConnOpen()
-                        SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 控制表_dgv("形體號", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                        SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 控制表_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                         CmdSet_For_dr()
                         PictureBox1.Image = Nothing
                         While dr.Read() = True

TENDEN-MES-SYS/量產訂單管理/鞋盒訂單紀錄表.Designer.vb

@@ -32,6 +32,9 @@ Partial Class 鞋盒訂單紀錄表
         Me.圖片庫一_pb = New System.Windows.Forms.PictureBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.資料庫選擇1_bt = New System.Windows.Forms.Button()
+        Me.資料庫選擇2_bt = New System.Windows.Forms.Button()
         CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.圖片庫一_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -124,11 +127,41 @@ Partial Class 鞋盒訂單紀錄表
         Me.Label2.Text = "PS : 查詢後編輯才可存檔"
         Me.Label2.Visible = False
         '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(11, 453)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(44, 32)
+        Me.Label20.TabIndex = 528
+        Me.Label20.Text = "選擇訂" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "單品牌"
+        '
+        '資料庫選擇1_bt
+        '
+        Me.資料庫選擇1_bt.Location = New System.Drawing.Point(61, 445)
+        Me.資料庫選擇1_bt.Name = "資料庫選擇1_bt"
+        Me.資料庫選擇1_bt.Size = New System.Drawing.Size(113, 50)
+        Me.資料庫選擇1_bt.TabIndex = 529
+        Me.資料庫選擇1_bt.Text = "VIONIC"
+        Me.資料庫選擇1_bt.UseVisualStyleBackColor = True
+        '
+        '資料庫選擇2_bt
+        '
+        Me.資料庫選擇2_bt.Location = New System.Drawing.Point(180, 446)
+        Me.資料庫選擇2_bt.Name = "資料庫選擇2_bt"
+        Me.資料庫選擇2_bt.Size = New System.Drawing.Size(124, 50)
+        Me.資料庫選擇2_bt.TabIndex = 530
+        Me.資料庫選擇2_bt.Text = "DRS/ LIF"
+        Me.資料庫選擇2_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.資料庫選擇2_bt)
+        Me.Controls.Add(Me.資料庫選擇1_bt)
+        Me.Controls.Add(Me.Label20)
         Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.圖片庫一_pb)
@@ -157,5 +190,8 @@ Partial Class 鞋盒訂單紀錄表
     Friend WithEvents 圖片庫一_pb As PictureBox
     Friend WithEvents Label1 As Label
     Friend WithEvents Label2 As Label
+    Friend WithEvents Label20 As Label
+    Friend WithEvents 資料庫選擇1_bt As Button
+    Friend WithEvents 資料庫選擇2_bt As Button
 End Class
 

TENDEN-MES-SYS/量產訂單管理/鞋盒訂單紀錄表.vb

@@ -16,17 +16,19 @@ Public Class 鞋盒訂單紀錄表
     Private Sub Set_訂單清單()
         Set_DGV1載入前設定()
         If PA = "" Then
-            SQL1 = "SELECT 資料流水號, 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, GOODBOX FROM 訂單控制表 " &
-                   "WHERE (年份季度 NOT LIKE '%10%') AND (年份季度 NOT LIKE '%11%') AND (年份季度 NOT LIKE '%12%') AND (年份季度 NOT LIKE '%13%') AND " &
-                   "(年份季度 NOT LIKE '%14%') AND (年份季度 NOT LIKE '%15%') AND (年份季度 NOT LIKE '%16%') AND (年份季度 NOT LIKE '%17%') " &
-                   "ORDER BY 訂單流水號 DESC, 形體號, 顏色, 楦型"
+            SQL1 = "SELECT 資料流水號, 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, GOODBOX, TVW 
+                    FROM " & 訂單資料表(1) & "
+                   WHERE (年份季度 NOT LIKE '%10%') AND (年份季度 NOT LIKE '%11%') AND (年份季度 NOT LIKE '%12%') AND (年份季度 NOT LIKE '%13%') AND 
+                   (年份季度 NOT LIKE '%14%') AND (年份季度 NOT LIKE '%15%') AND (年份季度 NOT LIKE '%16%') AND (年份季度 NOT LIKE '%17%') 
+                   ORDER BY 訂單流水號 DESC, 形體號, 顏色, 楦型"
         Else
-            SQL1 = "SELECT 資料流水號, 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, GOODBOX FROM 訂單控制表 " &
-                   "WHERE ((年份季度 NOT LIKE '%10%') AND (年份季度 NOT LIKE '%11%') AND (年份季度 NOT LIKE '%12%') AND (年份季度 NOT LIKE '%13%') AND " &
-                   "(年份季度 NOT LIKE '%14%') AND (年份季度 NOT LIKE '%15%') AND (年份季度 NOT LIKE '%16%') AND (年份季度 NOT LIKE '%17%')) AND " &
-                   "(訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR " &
-                   "顏色 LIKE '%" & PA & "%' OR 楦型 LIKE '%" & PA & "%' OR 訂單數量 LIKE '%" & PA & "%' OR 備註 LIKE '%" & PA & "%' OR " &
-                   "生產工廠 LIKE '%" & PA & "%' OR 訂單種類 LIKE '%" & PA & "%') ORDER BY 訂單流水號 DESC, 形體號, 顏色, 楦型"
+            SQL1 = "SELECT 資料流水號, 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 備註, 生產工廠, 訂單種類, GOODBOX, TVW 
+                    FROM " & 訂單資料表(1) & "
+                   WHERE ((年份季度 NOT LIKE '%10%') AND (年份季度 NOT LIKE '%11%') AND (年份季度 NOT LIKE '%12%') AND (年份季度 NOT LIKE '%13%') AND 
+                   (年份季度 NOT LIKE '%14%') AND (年份季度 NOT LIKE '%15%') AND (年份季度 NOT LIKE '%16%') AND (年份季度 NOT LIKE '%17%')) AND 
+                   (訂單流水號 Like '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR 
+                   顏色 Like '%" & PA & "%' OR 楦型 LIKE '%" & PA & "%' OR 訂單數量 LIKE '%" & PA & "%' OR 備註 LIKE '%" & PA & "%' OR 
+                   生產工廠 Like '%" & PA & "%' OR 訂單種類 LIKE '%" & PA & "%') ORDER BY 訂單流水號 DESC, 形體號, 顏色, 楦型"
         End If
         Set_DGV1載入後設定()
     End Sub
@@ -43,7 +45,7 @@ Public Class 鞋盒訂單紀錄表
     Private Sub 鞋盒訂單紀錄表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
         PA = ""
-        Set_訂單清單() : Set_grid()
+        訂單資料庫選擇.ShowDialog() : Set_訂單清單() : Set_grid()
         QQ(0) = True : QQ(1) = False
         存檔_bt.Enabled = False
     End Sub
@@ -54,7 +56,7 @@ Public Class 鞋盒訂單紀錄表
         If e.RowIndex = -1 Then : Else
             If 訂單清單_dgv(5, e.RowIndex).Value = "" Then
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 圖片庫一_pb.Image = Nothing
                 While dr.Read() = True
@@ -63,13 +65,13 @@ Public Class 鞋盒訂單紀錄表
                 End While
             Else
                 ConnOpen()
-                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString &
+                SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString &
                     "' AND 類型 NOT LIKE '確認-產地標'"
                 CmdSet_For_dr()
                 If dr.Read() Then
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString &
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 顏色 LIKE '" & 訂單清單_dgv(5, e.RowIndex).Value.ToString &
                         "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
@@ -80,7 +82,7 @@ Public Class 鞋盒訂單紀錄表
                 Else
                     conn.Close()
                     ConnOpen()
-                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體名 LIKE '" & 訂單清單_dgv(4, e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
+                    SQL1 = "SELECT TOP(1) 圖片 FROM 圖片庫一 WHERE 形體號 LIKE '" & 訂單清單_dgv("TVW", e.RowIndex).Value.ToString & "' AND 類型 NOT LIKE '確認-產地標'"
                     CmdSet_For_dr()
                     圖片庫一_pb.Image = Nothing
                     While dr.Read() = True
@@ -142,4 +144,12 @@ Public Class 鞋盒訂單紀錄表
         MsgBox("存檔完成")
         Set_訂單清單() : Set_grid() : Timer1.Enabled = False : Label47.Visible = False : 存檔_bt.Enabled = False
     End Sub
+
+    Private Sub 資料庫選擇1_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇1_bt.Click
+        SQL_訂單資料表選擇_VIONIC() : Set_訂單清單()
+    End Sub
+
+    Private Sub 資料庫選擇2_bt_Click(sender As Object, e As EventArgs) Handles 資料庫選擇2_bt.Click
+        SQL_訂單資料表選擇_非VIONIC() : Set_訂單清單()
+    End Sub
 End Class