20210712備份

GA-ERP-SYS/GA-ERP-SYS.Designer.vb

@@ -156,7 +156,7 @@ Partial Class GA_ERP_SYS
         '
         Me.基本資料_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.business_info
         Me.基本資料_tsm.Name = "基本資料_tsm"
-        Me.基本資料_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.基本資料_tsm.Size = New System.Drawing.Size(122, 22)
         Me.基本資料_tsm.Text = "基本資料"
         '
         '報表系統管理ToolStripMenuItem
@@ -186,21 +186,21 @@ Partial Class GA_ERP_SYS
         '
         Me.流水帳自動導入_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.pen
         Me.流水帳自動導入_tsm.Name = "流水帳自動導入_tsm"
-        Me.流水帳自動導入_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.流水帳自動導入_tsm.Size = New System.Drawing.Size(158, 22)
         Me.流水帳自動導入_tsm.Text = "流水帳自動導入"
         '
         '流水帳手動輸入_tsm
         '
         Me.流水帳手動輸入_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.pen
         Me.流水帳手動輸入_tsm.Name = "流水帳手動輸入_tsm"
-        Me.流水帳手動輸入_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.流水帳手動輸入_tsm.Size = New System.Drawing.Size(158, 22)
         Me.流水帳手動輸入_tsm.Text = "流水帳手動輸入"
         '
         '商客資料導入_tsm
         '
         Me.商客資料導入_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.pen
         Me.商客資料導入_tsm.Name = "商客資料導入_tsm"
-        Me.商客資料導入_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.商客資料導入_tsm.Size = New System.Drawing.Size(158, 22)
         Me.商客資料導入_tsm.Text = "商客資料導入"
         '
         '資料庫系統管理_tsm
@@ -238,6 +238,7 @@ Partial Class GA_ERP_SYS
         Me.FTP_tsm.Name = "FTP_tsm"
         Me.FTP_tsm.Size = New System.Drawing.Size(194, 22)
         Me.FTP_tsm.Text = "FTP資料夾管理"
+        Me.FTP_tsm.Visible = False
         '
         '人員ID卡系統配置設定_tsm
         '
@@ -258,9 +259,8 @@ Partial Class GA_ERP_SYS
         'ToolStripStatusLabel
         '
         Me.ToolStripStatusLabel.Name = "ToolStripStatusLabel"
-        Me.ToolStripStatusLabel.Size = New System.Drawing.Size(336, 17)
-        Me.ToolStripStatusLabel.Text = "著作權 : GCM.LTD.C                                                                  " &
-    "       "
+        Me.ToolStripStatusLabel.Size = New System.Drawing.Size(266, 17)
+        Me.ToolStripStatusLabel.Text = "GA-SYS                                                                        "
         '
         'ToolStripStatusLabel1
         '

GA-ERP-SYS/GA-ERP-SYS.vb

@@ -79,7 +79,7 @@ Public Class GA_ERP_SYS
         PA = "" : 人員ID卡系統配置設定.ShowDialog() : 人員ID卡系統配置設定.BringToFront()
     End Sub
     Private Sub 系統執行檔版本管理ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles 系統執行檔版本管理_tsm.Click
-        PA = "" : 系統執行檔版本管理.Show() : 系統執行檔版本管理.BringToFront()
+        PA = "" : 系統執行檔版本管理.ShowDialog()
     End Sub
     Private Sub FTPToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FTP_tsm.Click
         PA = "" : FTP資料夾管理.Show() : FTP資料夾管理.BringToFront()

GA-ERP-SYS/LoginForm1.vb

@@ -33,27 +33,27 @@ Public Class LoginForm1
 
         Me.ActiveControl = 使用者帳號_cb
         '-----MAC碼與硬碟資料-------------------------------------------------------------------------------------------------------------------------------------------------------------
-        Dim Wmi As New Management.ManagementObjectSearcher("SELECT * FROM Win32_NetworkAdapterConfiguration")
-        For Each WmiObj As Management.ManagementObject In Wmi.Get
-            If CBool(WmiObj("IPEnabled")) Then
-                MACKK = WmiObj("MACAddress")
-            End If
-        Next
-        Dim cmicWmi As New Management.ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive")
-        For Each cmicWmiObj As Management.ManagementObject In cmicWmi.Get
-            diskId = cmicWmiObj("size")             'diskId = cmicWmiObj("signature")
-            diskSerialNumber = cmicWmiObj("serialnumber")
-            diskModel = cmicWmiObj("Model")
-            Exit For
-        Next
+        'Dim Wmi As New Management.ManagementObjectSearcher("SELECT * FROM Win32_NetworkAdapterConfiguration")
+        'For Each WmiObj As Management.ManagementObject In Wmi.Get
+        '    If CBool(WmiObj("IPEnabled")) Then
+        '        MACKK = WmiObj("MACAddress")
+        '    End If
+        'Next
+        'Dim cmicWmi As New Management.ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive")
+        'For Each cmicWmiObj As Management.ManagementObject In cmicWmi.Get
+        '    diskId = cmicWmiObj("size")             'diskId = cmicWmiObj("signature")
+        '    diskSerialNumber = cmicWmiObj("serialnumber")
+        '    diskModel = cmicWmiObj("Model")
+        '    Exit For
+        'Next
         '-----電腦綁定判斷-------------------------------------------------------------------------------------------------------------------------------------------------------------
-        PA1 = MACKK : PA2 = diskId : PA3 = diskSerialNumber : PA4 = diskModel
-        SQL_電腦綁定()
-        If dr.Read() Then
-            conn.Close()
-        Else
-            conn.Close() : MsgBox("該電腦沒有註冊，無法使用系統。") : Me.Close()
-        End If
+        'PA1 = MACKK : PA2 = diskId : PA3 = diskSerialNumber : PA4 = diskModel
+        'SQL_電腦綁定()
+        'If dr.Read() Then
+        '    conn.Close()
+        'Else
+        '    conn.Close() : MsgBox("該電腦沒有註冊，無法使用系統。") : Me.Close()
+        'End If
         Set_使用者清單()
     End Sub
     Private Sub 簡易登入_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 簡易登入_dgv.CellClick
@@ -63,7 +63,7 @@ Public Class LoginForm1
     End Sub
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 伺服器區域_ch.SelectedIndexChanged
         '-----------------------確認登入伺服器位置-----------------------------------------------------------------------------------------------------------------------------------------
-        登入人IP = "180.177.181.162,5264" : 登入() : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
+        登入人IP = "103.231.201.230,2433" : 登入() : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
     End Sub
     Private Sub 登入()
         '-----------------------寫入連線字串-----------------------------------------------------------------------------------------------------------------------------------------------
@@ -89,8 +89,7 @@ Public Class LoginForm1
         登入程序()
     End Sub
     Private Sub 自動更新2()
-        Dim aa1 As MsgBoxResult
-        aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請下載最新的執行檔。", MsgBoxStyle.OkCancel)
+        Dim aa1 As MsgBoxResult = MsgBox("系統版本號 與 資料庫版本號 對應不上，請下載最新的執行檔。", MsgBoxStyle.OkCancel)
         If aa1 = MsgBoxResult.Ok Then
             更新下載_ch.Checked = True
             Me.Size = New Size(805, 279)
@@ -101,6 +100,15 @@ Public Class LoginForm1
             ElseIf screenWidth = 1600 And screenHeight = 900 Then
             End If
             Shell("explorer http://106.1.50.79:8080/ga-erp-sys/", vbNormalFocus)
+        Else
+            Me.Size = New Size(466, 279)
+            If screenWidth = 1920 And screenHeight = 1080 Then : Me.Location = New Point(727, 401)
+            ElseIf screenWidth = 1366 And screenHeight = 768 Then : Me.Location = New Point(450, 245)
+            ElseIf screenWidth = 1440 And screenHeight = 900 Then : Me.Location = New Point(487, 311)
+            ElseIf screenWidth = 1280 And screenHeight = 1024 Then : Me.Location = New Point(407, 373)
+            ElseIf screenWidth = 1600 And screenHeight = 900 Then : Me.Location = New Point(567, 311)
+            End If
+            簡易登入_dgv.Visible = False : 解鎖_bt.Visible = False
         End If
     End Sub
     Private Sub 登入程序()

GA-ERP-SYS/Module/SQL_子系統管理.vb

@@ -14,31 +14,40 @@
     '-----------------------下行客戶--------------------------------------------------------------------
     Friend Sub SQL_基本資料_客戶下資料表()
         ConnOpen_子SQL()
-        SQL1 = "SELECT     商客基本資料表.商品, 下行客戶.網址, 下行客戶.帳號 AS 老闆帳號, 下行客戶.客戶下 AS 客戶帳號, 下行客戶.基數 AS 客戶名稱, 下行客戶.流水號
+        SQL1 = "SELECT     商客基本資料表.商品, 下行客戶.網址, 下行客戶.帳號 AS 老闆帳號, 下行客戶.客戶下 AS 客戶帳號, 下行客戶.客名 AS 客戶名稱, 下行客戶.流水號, 下行客戶.基數
                 FROM       下行客戶 LEFT OUTER JOIN
                            商客基本資料表 ON 下行客戶.網址 = 商客基本資料表.網址 AND 下行客戶.帳號 = 商客基本資料表.帳號
+                WHERE      下行客戶.客戶下 LIKE N'%" & PA & "%' " & PA9 & "
                 ORDER BY   商客基本資料表.商品, 下行客戶.帳號"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_系統編碼規則_客戶下重複查詢()
+        ConnOpen_子SQL()
         SQL1 = "SELECT 客戶下 FROM 下行客戶 
                 WHERE  客戶下 LIKE N'" & 基本資料.客戶下_tb.Text & "' AND 網址 LIKE N'" & 基本資料.網址3_tb.Text & "' AND 
                        帳號 LIKE N'" & 基本資料.帳號3_tb.Text & "' AND 基數 LIKE N'" & 基本資料.下行1_cb.Text & "'"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_系統編碼規則_客戶下新增()
-        SQL1 = "INSERT INTO 下行客戶 (客戶下, 網址, 帳號, 基數) 
-                VALUES (N'" & 基本資料.客戶下_tb.Text & "', N'" & 基本資料.網址3_tb.Text & "', N'" & 基本資料.帳號3_tb.Text & "', N'" & 基本資料.下行1_cb.Text & "')"
+        ConnOpen_子SQL()
+        SQL1 = "INSERT INTO 下行客戶 (客戶下, 網址, 帳號, 基數, 流水號, 客名) 
+                VALUES (N'" & 基本資料.客戶下_tb.Text & "', N'" & 基本資料.網址3_tb.Text & "', N'" & 基本資料.帳號3_tb.Text & "', 
+                        N'" & 基本資料.下行1_cb.Text & "', N'" & PA10 & "', N'" & 基本資料.下行1_cb.Text & "')"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_系統編碼規則_客戶下刪除()
-        SQL1 = "DELETE FROM 下行客戶  WHERE  客戶下 LIKE N'" & 基本資料.客戶下_tb.Text & "' AND 網址 LIKE N'" & 基本資料.網址3_tb.Text & "' AND 
-                       帳號 LIKE N'" & 基本資料.帳號3_tb.Text & "' AND 基數 LIKE N'" & 基本資料.下行1_cb.Text & "'"
+        ConnOpen_子SQL() : SQL1 = "DELETE FROM 下行客戶 WHERE 流水號 LIKE N'" & 基本資料.流水號_tb.Text & "'" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_系統編碼規則_客戶下修改()
-        SQL1 = "UPDATE 下行客戶 SET 客戶下 = N'" & PA & "', 網址 = N'" & PA1 & "', 帳號 = N'" & PA2 & "', 基數 = N'" & PA3 & "'
-                WHERE  客戶下 LIKE N'" & 基本資料.客戶下_tb.Text & "' AND 網址 LIKE N'" & 基本資料.網址3_tb.Text & "' AND 
-                       帳號 LIKE N'" & 基本資料.帳號3_tb.Text & "' AND 基數 LIKE N'" & 基本資料.下行1_cb.Text & "'"
+        SQL1 = "UPDATE 下行客戶 SET 客戶下 = N'" & PA & "', 網址 = N'" & PA1 & "', 帳號 = N'" & PA2 & "', 基數 = N'" & PA3 & "', 客名 = N'" & PA4 & "'
+                WHERE  流水號 LIKE N'" & 基本資料.流水號_tb.Text & "'"
     End Sub
     '--------------------------商客基本資料表------------------------------------------------------
+    Friend Sub SQL_商客資料表2()
+        ConnOpen_子SQL()
+        SQL1 = "SELECT 網址, 帳號, 密碼, 資料, 上繳源, 商品, 上行基數, 下行基數 FROM 商客基本資料表 WHERE 網址 LIKE N'%" & PA1 & "%' ORDER BY  商品, 上繳源, 帳號"
+        CmdSet_For_DGV()
+    End Sub
     Friend Sub SQL_商客資料表()
         ConnOpen_子SQL()
         SQL1 = "SELECT 網址, 帳號, 密碼, 資料, 上繳源, 商品, 上行基數, 下行基數 FROM 商客基本資料表 WHERE 網址 NOT LIKE N'' ORDER BY  商品, 上繳源, 帳號"
@@ -56,14 +65,21 @@
                                     N'" & 基本資料.上繳源_tb.Text & "', N'" & 基本資料.商品_cb.Text & "', N'" & 基本資料.上行_cb.Text & "', N'" & 基本資料.下行_cb.Text & "')"
     End Sub
     Friend Sub SQL_系統編碼規則_商客刪除()
+        ConnOpen_子SQL()
         SQL1 = "DELETE FROM 商客基本資料表 WHERE (帳號 LIKE N'" & 基本資料.帳號_tb.Text & "' AND  網址 LIKE N'" & 基本資料.網址_tb.Text & "')"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_系統編碼規則_商客修改()
         SQL1 = "UPDATE 商客基本資料表 SET 網址 = N'" & PA2 & "',上繳源 = N'" & PA3 & "', 資料 = N'" & PA8 & "', 商品 = N'" & PA9 & "',
                                           帳號 = N'" & PA4 & "', 密碼 = N'" & PA5 & "' ,上行基數 = N'" & PA6 & "' ,下行基數 = N'" & PA7 & "'                                    
                                   WHERE (帳號 LIKE N'" & 基本資料.帳號1_tb.Text & "' AND  網址 LIKE N'" & 基本資料.網址1_tb.Text & "')"
     End Sub
-
+    Friend Sub SQL_商品確認()
+        ConnOpen_子SQL() : SQL1 = "SELECT 商品 FROM 商品資料表 WHERE 商品 LIKE N'" & PA9 & "'" : CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_商品寫入()
+        ConnOpen_子SQL() : SQL1 = "INSERT INTO 商品資料表 (商品) VALUES (N'" & PA9 & "')" : CmdSet_For_dr()
+    End Sub
     '-----------------------------------下拉清單-------------------------------------------------------------------------------------------
     Friend Sub SQL_下拉商品清單讀取()
         ConnOpen_子SQL() : SQL1 = "SELECT 商品 FROM 商品資料表" : CmdSet_For_dr()
@@ -186,9 +202,6 @@
     Friend Sub SQL_LOG_刪除1()
         ConnOpen_子SQL() : SQL1 = "DELETE [LOG] WHERE 查詢區間 LIKE N'" & PA1 & "-" & PA2 & "'" : CmdSet_For_dr()
     End Sub
-    Friend Sub SQL_LOG_刪除2()
-        ConnOpen_子SQL() : SQL1 = "DELETE [LOG] WHERE 查詢區間 LIKE N'" & PA1 & "-" & PA2 & "' AND 狀態 LIKE N'無法取得資料'" : CmdSet_For_dr()
-    End Sub
     Friend Sub SQL_查詢日期資料()
         ConnOpen_子SQL() : SQL1 = "SELECT TOP (1) 開始, 結束 FROM 查詢時間" : CmdSet_For_dr()
     End Sub
@@ -291,6 +304,39 @@
                 ORDER BY    商客基本資料表.上繳源"
         CmdSet_For_DGV()
     End Sub
+    Friend Sub SQL_彙總查詢3()
+        ConnOpen_子SQL()
+        SQL1 = "SELECT  商品, 上繳源 AS 天帳, 上繳源 AS 地帳, 上繳源 AS 個人所得, 上繳源 AS 水差, 
+                        上繳源 AS 核帳, 上繳源
+                FROM    商客基本資料表
+                WHERE  (上繳源 LIKE N'" & 流水帳查詢.老闆_tb.Text & "')
+                GROUP BY   商品, 上繳源
+                ORDER BY   商品"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_彙總查詢4()
+        ConnOpen_子SQL()
+        SQL1 = "SELECT     商客基本資料表.商品, 下行客戶.客名 AS 客戶, 下行客戶.客戶下 AS 帳號, 商客基本資料表.上繳源 AS 天帳, 
+                           商客基本資料表.上繳源 AS 地帳, 商客基本資料表.上繳源 AS 個人所得, 商客基本資料表.上繳源 AS 水差, 
+                           商客基本資料表.上繳源 AS 核帳, 商客基本資料表.上繳源
+                FROM       商客基本資料表 INNER JOIN
+                           下行客戶 ON 商客基本資料表.網址 = 下行客戶.網址 AND 商客基本資料表.帳號 = 下行客戶.帳號
+                WHERE     (商客基本資料表.上繳源 LIKE N'" & 流水帳查詢.老闆_tb.Text & "')
+                GROUP BY   商客基本資料表.商品, 商客基本資料表.上繳源, 下行客戶.客戶下, 下行客戶.客名
+                ORDER BY   商客基本資料表.商品"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_彙總查詢5()
+        ConnOpen_子SQL()
+        SQL1 = "SELECT          商客基本資料表.商品, 下行客戶.客名 AS 應收, 下行客戶.客戶下 AS 客戶帳號, 下行客戶.基數, 下行客戶.網址, 下行客戶.帳號
+                FROM              下行客戶 INNER JOIN
+                            商客基本資料表 ON 下行客戶.網址 = 商客基本資料表.網址 AND 下行客戶.帳號 = 商客基本資料表.帳號
+                WHERE          (下行客戶.客名 LIKE  N'" & 流水帳查詢.客戶_tb.Text & "')
+                GROUP BY   下行客戶.客名, 商客基本資料表.商品, 下行客戶.客戶下, 下行客戶.網址, 下行客戶.帳號, 下行客戶.基數, 
+                            商客基本資料表.上繳源
+                ORDER BY   應收"
+        CmdSet_For_DGV()
+    End Sub
     Friend Sub SQL_流水帳_清除()
         ConnOpen_子SQL()
         SQL1 = "DELETE  流水帳 
@@ -308,15 +354,21 @@
         ConnOpen_子SQL() : SQL1 = "SELECT 商品 FROM 商客基本資料表 GROUP BY 商品 ORDER BY 商品" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_流水帳_客戶下新增()
-        ConnOpen_子SQL() : SQL1 = "INSERT INTO 下行客戶 (客戶下, 網址, 帳號, 基數, 流水號) VALUES (N'" & PA & "', N'" & PA1 & "', N'" & PA2 & "', N'" & PA4 & "', N'" & PA3 & "')" : CmdSet_For_dr()
+        ConnOpen_子SQL()
+        SQL1 = "INSERT INTO 下行客戶 (客戶下, 網址, 帳號, 基數, 流水號, 客名) 
+                VALUES (N'" & PA & "', N'" & PA1 & "', N'" & PA2 & "', N'', N'" & PA3 & "', N'')"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_流水帳_客戶下修改()
         ConnOpen_子SQL()
-        SQL1 = "UPDATE 下行客戶 SET 基數 = N'" & PA3 & "' WHERE (客戶下 LIKE N'" & PA & "' AND 網址 LIKE N'" & PA1 & "' AND 帳號 LIKE N'" & PA2 & "')"
+        SQL1 = "UPDATE 下行客戶 SET 客名 = N'" & PA3 & "' WHERE (客戶下 LIKE N'" & PA & "' AND 網址 LIKE N'" & PA1 & "' AND 帳號 LIKE N'" & PA2 & "')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_客戶下資料表()
-        ConnOpen_子SQL() : SQL1 = "SELECT 客戶下 AS 客戶帳號, 網址, 帳號, 基數 AS 客戶名稱 FROM 下行客戶" : CmdSet_For_DGV()
+        ConnOpen_子SQL() : SQL1 = "SELECT 客戶下 AS 客戶帳號, 網址, 帳號, 客名 AS 客戶名稱 FROM 下行客戶" : CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_客戶下名稱()
+        ConnOpen_子SQL() : SQL1 = "SELECT 客名 AS 客戶 FROM 下行客戶 WHERE 客名 NOT LIKE '' AND 客名 IS NOT NULL GROUP BY 客名 ORDER BY 客名" : CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_LOG查詢1()
         ConnOpen_子SQL()

GA-ERP-SYS/Module/SQL_連線字串.vb

@@ -1,6 +1,6 @@
 Module SQL_連線字串
     Friend Sub SQL_連線字串_主SQL()
-        ConString = "Data Source=" & 登入人IP & ";Initial Catalog=GA-ERP-SYS;Persist Security Info=True;User ID=B70340;Password=0911274990;Max pool size = 200;Connection Timeout=0"
+        ConString = "Data Source=" & 登入人IP & ";Initial Catalog=GA-ERP-SYS;Persist Security Info=True;User ID=B70340;Password=Lee0911274990;Max pool size = 200;Connection Timeout=0"
     End Sub
     Friend Sub SQL_連線字串_子SQL()
         ConString1 = "Data Source=" & 登入人IP2 & ";Initial Catalog=" & 子SQL名稱 & ";Persist Security Info=True;User ID=" & 業務帳號 & ";Password=" & 業務密碼 & ";Max pool size = 200;Connection Timeout=0"

GA-ERP-SYS/Module/全域變數.vb

@@ -7,7 +7,7 @@
     Public 子SQL名稱 As String : Public 子SQL名稱1 As String : Public 登入客戶 As String : Public 登入資料庫 As String : Public 業務名稱 As String
     Public 業務帳號 As String : Public 業務密碼 As String : Public 業務帳號1 As String : Public 業務密碼1 As String
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2021061001"
+    Public 版本 As String = "2021071201"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 判斷重登 As Boolean : Public 內外網 As Boolean : Public 重登確認 As Boolean : Public 主頁開啟 As Boolean

GA-ERP-SYS/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' 設為預設，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.1")>
-<Assembly: AssemblyFileVersion("1.0.0.1")>
+<Assembly: AssemblyVersion("1.1.0.1")>
+<Assembly: AssemblyFileVersion("1.1.0.1")>

GA-ERP-SYS/基本資料管理/基本資料.Designer.vb

@@ -34,6 +34,15 @@ Partial Class 基本資料
         Me.GroupBox3 = New System.Windows.Forms.GroupBox()
         Me.資料_dgv = New System.Windows.Forms.DataGridView()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        Me.RadioButton3 = New System.Windows.Forms.RadioButton()
+        Me.RadioButton2 = New System.Windows.Forms.RadioButton()
+        Me.RadioButton1 = New System.Windows.Forms.RadioButton()
+        Me.搜索3_bt = New System.Windows.Forms.Button()
+        Me.流水號_tb = New System.Windows.Forms.TextBox()
+        Me.清除搜索1_bt = New System.Windows.Forms.Button()
+        Me.搜索1_bt = New System.Windows.Forms.Button()
+        Me.客戶名稱_tb = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.下行1_cb = New System.Windows.Forms.ComboBox()
         Me.Label29 = New System.Windows.Forms.Label()
         Me.網址3_tb = New System.Windows.Forms.TextBox()
@@ -47,6 +56,8 @@ Partial Class 基本資料
         Me.客戶下_dgv = New System.Windows.Forms.DataGridView()
         Me.Label25 = New System.Windows.Forms.Label()
         Me.GroupBox7 = New System.Windows.Forms.GroupBox()
+        Me.清除搜索2_bt = New System.Windows.Forms.Button()
+        Me.搜索2_bt = New System.Windows.Forms.Button()
         Me.下行_cb = New System.Windows.Forms.ComboBox()
         Me.上行_cb = New System.Windows.Forms.ComboBox()
         Me.Label24 = New System.Windows.Forms.Label()
@@ -167,6 +178,15 @@ Partial Class 基本資料
         '
         'GroupBox5
         '
+        Me.GroupBox5.Controls.Add(Me.RadioButton3)
+        Me.GroupBox5.Controls.Add(Me.RadioButton2)
+        Me.GroupBox5.Controls.Add(Me.RadioButton1)
+        Me.GroupBox5.Controls.Add(Me.搜索3_bt)
+        Me.GroupBox5.Controls.Add(Me.流水號_tb)
+        Me.GroupBox5.Controls.Add(Me.清除搜索1_bt)
+        Me.GroupBox5.Controls.Add(Me.搜索1_bt)
+        Me.GroupBox5.Controls.Add(Me.客戶名稱_tb)
+        Me.GroupBox5.Controls.Add(Me.Label1)
         Me.GroupBox5.Controls.Add(Me.下行1_cb)
         Me.GroupBox5.Controls.Add(Me.Label29)
         Me.GroupBox5.Controls.Add(Me.網址3_tb)
@@ -188,11 +208,109 @@ Partial Class 基本資料
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "下行客戶"
         '
+        'RadioButton3
+        '
+        Me.RadioButton3.AutoSize = True
+        Me.RadioButton3.Location = New System.Drawing.Point(263, 97)
+        Me.RadioButton3.Name = "RadioButton3"
+        Me.RadioButton3.Size = New System.Drawing.Size(158, 20)
+        Me.RadioButton3.TabIndex = 1539
+        Me.RadioButton3.Text = "查詢沒有客戶名稱的資料"
+        Me.RadioButton3.UseVisualStyleBackColor = True
+        '
+        'RadioButton2
+        '
+        Me.RadioButton2.AutoSize = True
+        Me.RadioButton2.Location = New System.Drawing.Point(111, 97)
+        Me.RadioButton2.Name = "RadioButton2"
+        Me.RadioButton2.Size = New System.Drawing.Size(146, 20)
+        Me.RadioButton2.TabIndex = 1538
+        Me.RadioButton2.Text = "查詢有客戶名稱的資料" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
+        Me.RadioButton2.UseVisualStyleBackColor = True
+        '
+        'RadioButton1
+        '
+        Me.RadioButton1.AutoSize = True
+        Me.RadioButton1.Checked = True
+        Me.RadioButton1.Location = New System.Drawing.Point(7, 97)
+        Me.RadioButton1.Name = "RadioButton1"
+        Me.RadioButton1.Size = New System.Drawing.Size(98, 20)
+        Me.RadioButton1.TabIndex = 1537
+        Me.RadioButton1.TabStop = True
+        Me.RadioButton1.Text = "全部資料呈現"
+        Me.RadioButton1.UseVisualStyleBackColor = True
+        '
+        '搜索3_bt
+        '
+        Me.搜索3_bt.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.搜索3_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.搜索3_bt.ForeColor = System.Drawing.Color.Purple
+        Me.搜索3_bt.Location = New System.Drawing.Point(146, 69)
+        Me.搜索3_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.搜索3_bt.Name = "搜索3_bt"
+        Me.搜索3_bt.Size = New System.Drawing.Size(136, 24)
+        Me.搜索3_bt.TabIndex = 1536
+        Me.搜索3_bt.Text = "使用網址搜索客商資料"
+        Me.搜索3_bt.UseVisualStyleBackColor = False
+        '
+        '流水號_tb
+        '
+        Me.流水號_tb.Location = New System.Drawing.Point(92, 273)
+        Me.流水號_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.流水號_tb.Name = "流水號_tb"
+        Me.流水號_tb.Size = New System.Drawing.Size(110, 23)
+        Me.流水號_tb.TabIndex = 1535
+        Me.流水號_tb.Visible = False
+        '
+        '清除搜索1_bt
+        '
+        Me.清除搜索1_bt.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.清除搜索1_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.清除搜索1_bt.ForeColor = System.Drawing.Color.Purple
+        Me.清除搜索1_bt.Location = New System.Drawing.Point(285, 69)
+        Me.清除搜索1_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.清除搜索1_bt.Name = "清除搜索1_bt"
+        Me.清除搜索1_bt.Size = New System.Drawing.Size(69, 24)
+        Me.清除搜索1_bt.TabIndex = 1534
+        Me.清除搜索1_bt.Text = "清除搜索"
+        Me.清除搜索1_bt.UseVisualStyleBackColor = False
+        '
+        '搜索1_bt
+        '
+        Me.搜索1_bt.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.搜索1_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.搜索1_bt.ForeColor = System.Drawing.Color.Purple
+        Me.搜索1_bt.Location = New System.Drawing.Point(6, 69)
+        Me.搜索1_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.搜索1_bt.Name = "搜索1_bt"
+        Me.搜索1_bt.Size = New System.Drawing.Size(136, 24)
+        Me.搜索1_bt.TabIndex = 1533
+        Me.搜索1_bt.Text = "使用客戶帳號搜索資料"
+        Me.搜索1_bt.UseVisualStyleBackColor = False
+        '
+        '客戶名稱_tb
+        '
+        Me.客戶名稱_tb.Location = New System.Drawing.Point(266, 42)
+        Me.客戶名稱_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.客戶名稱_tb.Name = "客戶名稱_tb"
+        Me.客戶名稱_tb.Size = New System.Drawing.Size(95, 23)
+        Me.客戶名稱_tb.TabIndex = 1532
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.Label1.Location = New System.Drawing.Point(208, 45)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(56, 16)
+        Me.Label1.TabIndex = 1531
+        Me.Label1.Text = "客戶名稱"
+        '
         '下行1_cb
         '
         Me.下行1_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.下行1_cb.FormattingEnabled = True
-        Me.下行1_cb.Location = New System.Drawing.Point(210, 40)
+        Me.下行1_cb.Location = New System.Drawing.Point(403, 42)
         Me.下行1_cb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.下行1_cb.Name = "下行1_cb"
         Me.下行1_cb.Size = New System.Drawing.Size(110, 24)
@@ -202,7 +320,7 @@ Partial Class 基本資料
         '
         Me.Label29.AutoSize = True
         Me.Label29.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label29.Location = New System.Drawing.Point(176, 43)
+        Me.Label29.Location = New System.Drawing.Point(369, 45)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(34, 17)
         Me.Label29.TabIndex = 1529
@@ -210,7 +328,7 @@ Partial Class 基本資料
         '
         '網址3_tb
         '
-        Me.網址3_tb.Location = New System.Drawing.Point(210, 16)
+        Me.網址3_tb.Location = New System.Drawing.Point(242, 17)
         Me.網址3_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.網址3_tb.Name = "網址3_tb"
         Me.網址3_tb.Size = New System.Drawing.Size(271, 23)
@@ -218,7 +336,7 @@ Partial Class 基本資料
         '
         '帳號3_tb
         '
-        Me.帳號3_tb.Location = New System.Drawing.Point(41, 42)
+        Me.帳號3_tb.Location = New System.Drawing.Point(68, 17)
         Me.帳號3_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.帳號3_tb.Name = "帳號3_tb"
         Me.帳號3_tb.Size = New System.Drawing.Size(134, 23)
@@ -228,7 +346,7 @@ Partial Class 基本資料
         '
         Me.Label26.AutoSize = True
         Me.Label26.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label26.Location = New System.Drawing.Point(178, 20)
+        Me.Label26.Location = New System.Drawing.Point(208, 20)
         Me.Label26.Name = "Label26"
         Me.Label26.Size = New System.Drawing.Size(32, 16)
         Me.Label26.TabIndex = 1523
@@ -238,7 +356,7 @@ Partial Class 基本資料
         '
         Me.客戶下刪除_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.客戶下刪除_bt.ForeColor = System.Drawing.Color.Red
-        Me.客戶下刪除_bt.Location = New System.Drawing.Point(429, 40)
+        Me.客戶下刪除_bt.Location = New System.Drawing.Point(463, 69)
         Me.客戶下刪除_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶下刪除_bt.Name = "客戶下刪除_bt"
         Me.客戶下刪除_bt.Size = New System.Drawing.Size(52, 24)
@@ -248,7 +366,7 @@ Partial Class 基本資料
         '
         '客戶下_tb
         '
-        Me.客戶下_tb.Location = New System.Drawing.Point(41, 17)
+        Me.客戶下_tb.Location = New System.Drawing.Point(68, 42)
         Me.客戶下_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶下_tb.Name = "客戶下_tb"
         Me.客戶下_tb.Size = New System.Drawing.Size(134, 23)
@@ -257,7 +375,7 @@ Partial Class 基本資料
         '客戶下修正_bt
         '
         Me.客戶下修正_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.客戶下修正_bt.Location = New System.Drawing.Point(376, 40)
+        Me.客戶下修正_bt.Location = New System.Drawing.Point(410, 69)
         Me.客戶下修正_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶下修正_bt.Name = "客戶下修正_bt"
         Me.客戶下修正_bt.Size = New System.Drawing.Size(52, 24)
@@ -269,18 +387,18 @@ Partial Class 基本資料
         '
         Me.Label6.AutoSize = True
         Me.Label6.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label6.Location = New System.Drawing.Point(6, 24)
+        Me.Label6.Location = New System.Drawing.Point(10, 45)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(32, 16)
+        Me.Label6.Size = New System.Drawing.Size(56, 16)
         Me.Label6.TabIndex = 1
-        Me.Label6.Text = "客戶"
+        Me.Label6.Text = "客戶帳號"
         '
         '客戶下新增_bt
         '
         Me.客戶下新增_bt.BackColor = System.Drawing.SystemColors.ControlLight
         Me.客戶下新增_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.客戶下新增_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.客戶下新增_bt.Location = New System.Drawing.Point(323, 40)
+        Me.客戶下新增_bt.Location = New System.Drawing.Point(357, 69)
         Me.客戶下新增_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶下新增_bt.Name = "客戶下新增_bt"
         Me.客戶下新增_bt.Size = New System.Drawing.Size(52, 24)
@@ -296,26 +414,28 @@ Partial Class 基本資料
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.客戶下_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.客戶下_dgv.Location = New System.Drawing.Point(7, 67)
+        Me.客戶下_dgv.Location = New System.Drawing.Point(7, 122)
         Me.客戶下_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶下_dgv.Name = "客戶下_dgv"
         Me.客戶下_dgv.RowHeadersWidth = 4
         Me.客戶下_dgv.RowTemplate.Height = 24
-        Me.客戶下_dgv.Size = New System.Drawing.Size(527, 885)
+        Me.客戶下_dgv.Size = New System.Drawing.Size(527, 830)
         Me.客戶下_dgv.TabIndex = 0
         '
         'Label25
         '
         Me.Label25.AutoSize = True
         Me.Label25.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label25.Location = New System.Drawing.Point(5, 46)
+        Me.Label25.Location = New System.Drawing.Point(9, 20)
         Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(32, 16)
+        Me.Label25.Size = New System.Drawing.Size(56, 16)
         Me.Label25.TabIndex = 1522
-        Me.Label25.Text = "帳號"
+        Me.Label25.Text = "老闆帳號"
         '
         'GroupBox7
         '
+        Me.GroupBox7.Controls.Add(Me.清除搜索2_bt)
+        Me.GroupBox7.Controls.Add(Me.搜索2_bt)
         Me.GroupBox7.Controls.Add(Me.下行_cb)
         Me.GroupBox7.Controls.Add(Me.上行_cb)
         Me.GroupBox7.Controls.Add(Me.Label24)
@@ -347,11 +467,37 @@ Partial Class 基本資料
         Me.GroupBox7.TabStop = False
         Me.GroupBox7.Text = "商客基本資料表"
         '
+        '清除搜索2_bt
+        '
+        Me.清除搜索2_bt.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.清除搜索2_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.清除搜索2_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.清除搜索2_bt.Location = New System.Drawing.Point(145, 69)
+        Me.清除搜索2_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.清除搜索2_bt.Name = "清除搜索2_bt"
+        Me.清除搜索2_bt.Size = New System.Drawing.Size(69, 24)
+        Me.清除搜索2_bt.TabIndex = 1536
+        Me.清除搜索2_bt.Text = "清除搜索"
+        Me.清除搜索2_bt.UseVisualStyleBackColor = False
+        '
+        '搜索2_bt
+        '
+        Me.搜索2_bt.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.搜索2_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.搜索2_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.搜索2_bt.Location = New System.Drawing.Point(7, 69)
+        Me.搜索2_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.搜索2_bt.Name = "搜索2_bt"
+        Me.搜索2_bt.Size = New System.Drawing.Size(136, 24)
+        Me.搜索2_bt.TabIndex = 1535
+        Me.搜索2_bt.Text = "使用網址搜索資料"
+        Me.搜索2_bt.UseVisualStyleBackColor = False
+        '
         '下行_cb
         '
         Me.下行_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.下行_cb.FormattingEnabled = True
-        Me.下行_cb.Location = New System.Drawing.Point(476, 41)
+        Me.下行_cb.Location = New System.Drawing.Point(630, 43)
         Me.下行_cb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.下行_cb.Name = "下行_cb"
         Me.下行_cb.Size = New System.Drawing.Size(110, 24)
@@ -361,7 +507,7 @@ Partial Class 基本資料
         '
         Me.上行_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.上行_cb.FormattingEnabled = True
-        Me.上行_cb.Location = New System.Drawing.Point(476, 14)
+        Me.上行_cb.Location = New System.Drawing.Point(630, 16)
         Me.上行_cb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.上行_cb.Name = "上行_cb"
         Me.上行_cb.Size = New System.Drawing.Size(110, 24)
@@ -371,7 +517,7 @@ Partial Class 基本資料
         '
         Me.Label24.AutoSize = True
         Me.Label24.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label24.Location = New System.Drawing.Point(418, 18)
+        Me.Label24.Location = New System.Drawing.Point(569, 20)
         Me.Label24.Name = "Label24"
         Me.Label24.Size = New System.Drawing.Size(60, 17)
         Me.Label24.TabIndex = 1524
@@ -381,7 +527,7 @@ Partial Class 基本資料
         '
         Me.Label22.AutoSize = True
         Me.Label22.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label22.Location = New System.Drawing.Point(418, 43)
+        Me.Label22.Location = New System.Drawing.Point(569, 45)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(60, 17)
         Me.Label22.TabIndex = 1523
@@ -392,36 +538,36 @@ Partial Class 基本資料
         Me.網址1_tb.Location = New System.Drawing.Point(47, 273)
         Me.網址1_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.網址1_tb.Name = "網址1_tb"
-        Me.網址1_tb.Size = New System.Drawing.Size(47, 23)
+        Me.網址1_tb.Size = New System.Drawing.Size(110, 23)
         Me.網址1_tb.TabIndex = 1522
         Me.網址1_tb.Visible = False
         '
         '帳號1_tb
         '
-        Me.帳號1_tb.Location = New System.Drawing.Point(47, 311)
+        Me.帳號1_tb.Location = New System.Drawing.Point(47, 304)
         Me.帳號1_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.帳號1_tb.Name = "帳號1_tb"
-        Me.帳號1_tb.Size = New System.Drawing.Size(47, 23)
+        Me.帳號1_tb.Size = New System.Drawing.Size(110, 23)
         Me.帳號1_tb.TabIndex = 1521
         Me.帳號1_tb.Visible = False
         '
         '商客刪除_bt
         '
         Me.商客刪除_bt.ForeColor = System.Drawing.Color.Red
-        Me.商客刪除_bt.Location = New System.Drawing.Point(927, 12)
+        Me.商客刪除_bt.Location = New System.Drawing.Point(1021, 16)
         Me.商客刪除_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.商客刪除_bt.Name = "商客刪除_bt"
-        Me.商客刪除_bt.Size = New System.Drawing.Size(153, 25)
+        Me.商客刪除_bt.Size = New System.Drawing.Size(100, 77)
         Me.商客刪除_bt.TabIndex = 1511
         Me.商客刪除_bt.Text = "刪除"
         Me.商客刪除_bt.UseVisualStyleBackColor = True
         '
         '商客修正_bt
         '
-        Me.商客修正_bt.Location = New System.Drawing.Point(927, 40)
+        Me.商客修正_bt.Location = New System.Drawing.Point(918, 16)
         Me.商客修正_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.商客修正_bt.Name = "商客修正_bt"
-        Me.商客修正_bt.Size = New System.Drawing.Size(153, 25)
+        Me.商客修正_bt.Size = New System.Drawing.Size(100, 77)
         Me.商客修正_bt.TabIndex = 1510
         Me.商客修正_bt.Text = "修正"
         Me.商客修正_bt.UseVisualStyleBackColor = True
@@ -429,26 +575,26 @@ Partial Class 基本資料
         '商客新增_bt
         '
         Me.商客新增_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.商客新增_bt.Location = New System.Drawing.Point(768, 41)
+        Me.商客新增_bt.Location = New System.Drawing.Point(815, 16)
         Me.商客新增_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.商客新增_bt.Name = "商客新增_bt"
-        Me.商客新增_bt.Size = New System.Drawing.Size(153, 25)
+        Me.商客新增_bt.Size = New System.Drawing.Size(100, 77)
         Me.商客新增_bt.TabIndex = 1509
         Me.商客新增_bt.Text = "新增"
         Me.商客新增_bt.UseVisualStyleBackColor = True
         '
         '網址_tb
         '
-        Me.網址_tb.Location = New System.Drawing.Point(48, 43)
+        Me.網址_tb.Location = New System.Drawing.Point(42, 18)
         Me.網址_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.網址_tb.Name = "網址_tb"
-        Me.網址_tb.Size = New System.Drawing.Size(366, 23)
+        Me.網址_tb.Size = New System.Drawing.Size(242, 23)
         Me.網址_tb.TabIndex = 1520
         '
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(211, 22)
+        Me.Label9.Location = New System.Drawing.Point(213, 47)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(32, 16)
         Me.Label9.TabIndex = 1514
@@ -458,7 +604,7 @@ Partial Class 基本資料
         '
         Me.資料_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.資料_cb.FormattingEnabled = True
-        Me.資料_cb.Location = New System.Drawing.Point(252, 16)
+        Me.資料_cb.Location = New System.Drawing.Point(247, 43)
         Me.資料_cb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.資料_cb.Name = "資料_cb"
         Me.資料_cb.Size = New System.Drawing.Size(160, 24)
@@ -467,7 +613,7 @@ Partial Class 基本資料
         'Label11
         '
         Me.Label11.AutoSize = True
-        Me.Label11.Location = New System.Drawing.Point(768, 18)
+        Me.Label11.Location = New System.Drawing.Point(413, 46)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(32, 16)
         Me.Label11.TabIndex = 1517
@@ -475,7 +621,7 @@ Partial Class 基本資料
         '
         '密碼_tb
         '
-        Me.密碼_tb.Location = New System.Drawing.Point(803, 14)
+        Me.密碼_tb.Location = New System.Drawing.Point(448, 43)
         Me.密碼_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.密碼_tb.Name = "密碼_tb"
         Me.密碼_tb.Size = New System.Drawing.Size(115, 23)
@@ -485,7 +631,7 @@ Partial Class 基本資料
         '
         Me.Label12.AutoSize = True
         Me.Label12.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label12.Location = New System.Drawing.Point(589, 45)
+        Me.Label12.Location = New System.Drawing.Point(290, 21)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(47, 17)
         Me.Label12.TabIndex = 1518
@@ -495,7 +641,7 @@ Partial Class 基本資料
         '
         Me.Label10.AutoSize = True
         Me.Label10.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label10.Location = New System.Drawing.Point(593, 17)
+        Me.Label10.Location = New System.Drawing.Point(413, 21)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(34, 17)
         Me.Label10.TabIndex = 1516
@@ -503,16 +649,16 @@ Partial Class 基本資料
         '
         '上繳源_tb
         '
-        Me.上繳源_tb.Location = New System.Drawing.Point(637, 42)
+        Me.上繳源_tb.Location = New System.Drawing.Point(338, 18)
         Me.上繳源_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.上繳源_tb.Name = "上繳源_tb"
-        Me.上繳源_tb.Size = New System.Drawing.Size(125, 23)
+        Me.上繳源_tb.Size = New System.Drawing.Size(69, 23)
         Me.上繳源_tb.TabIndex = 1517
         '
         'Label8
         '
         Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(6, 22)
+        Me.Label8.Location = New System.Drawing.Point(8, 49)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(32, 16)
         Me.Label8.TabIndex = 1512
@@ -520,9 +666,8 @@ Partial Class 基本資料
         '
         '商品_cb
         '
-        Me.商品_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.商品_cb.FormattingEnabled = True
-        Me.商品_cb.Location = New System.Drawing.Point(47, 16)
+        Me.商品_cb.Location = New System.Drawing.Point(42, 43)
         Me.商品_cb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.商品_cb.Name = "商品_cb"
         Me.商品_cb.Size = New System.Drawing.Size(160, 24)
@@ -536,26 +681,26 @@ Partial Class 基本資料
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.商客_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.商客_dgv.Location = New System.Drawing.Point(6, 69)
+        Me.商客_dgv.Location = New System.Drawing.Point(6, 96)
         Me.商客_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.商客_dgv.Name = "商客_dgv"
         Me.商客_dgv.RowHeadersWidth = 4
         Me.商客_dgv.RowTemplate.Height = 24
-        Me.商客_dgv.Size = New System.Drawing.Size(1115, 882)
+        Me.商客_dgv.Size = New System.Drawing.Size(1115, 855)
         Me.商客_dgv.TabIndex = 0
         '
         '帳號_tb
         '
-        Me.帳號_tb.Location = New System.Drawing.Point(637, 14)
+        Me.帳號_tb.Location = New System.Drawing.Point(448, 18)
         Me.帳號_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.帳號_tb.Name = "帳號_tb"
-        Me.帳號_tb.Size = New System.Drawing.Size(125, 23)
+        Me.帳號_tb.Size = New System.Drawing.Size(115, 23)
         Me.帳號_tb.TabIndex = 1515
         '
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(7, 47)
+        Me.Label13.Location = New System.Drawing.Point(8, 22)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(32, 16)
         Me.Label13.TabIndex = 1519
@@ -632,4 +777,15 @@ Partial Class 基本資料
     Friend WithEvents Label25 As Label
     Friend WithEvents 下行1_cb As ComboBox
     Friend WithEvents Label29 As Label
+    Friend WithEvents 客戶名稱_tb As TextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents 搜索1_bt As Button
+    Friend WithEvents 清除搜索1_bt As Button
+    Friend WithEvents 清除搜索2_bt As Button
+    Friend WithEvents 搜索2_bt As Button
+    Friend WithEvents 流水號_tb As TextBox
+    Friend WithEvents 搜索3_bt As Button
+    Friend WithEvents RadioButton3 As RadioButton
+    Friend WithEvents RadioButton2 As RadioButton
+    Friend WithEvents RadioButton1 As RadioButton
 End Class

GA-ERP-SYS/基本資料管理/基本資料.vb

@@ -1,5 +1,5 @@
 Public Class 基本資料
-    ReadOnly ds, ds1, ds2, ds4, ds6 As New DataSet
+    ReadOnly ds, ds1, ds2, ds4, ds6 As New DataSet : Dim GP As Integer = 0 : Dim GPP As String
     Private Sub Set_商品清單()
         商品_dgv.DataSource = Nothing : ds.Clear() : 商品_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         商品_dgv.ColumnHeadersHeight = 25
@@ -36,16 +36,16 @@
         客戶下_dgv.AllowUserToAddRows = False
         SQL_基本資料_客戶下資料表()
         da.Fill(ds4) : 客戶下_dgv.DataSource = ds4.Tables(0) : conn.Close()
-        客戶下_dgv.Columns(0).FillWeight = 80 : 客戶下_dgv.Columns(1).FillWeight = 200 : 客戶下_dgv.Columns(2).FillWeight = 80 : 客戶下_dgv.Columns(3).FillWeight = 80
-        客戶下_dgv.Columns(4).FillWeight = 80 : 客戶下_dgv.Columns(5).Visible = False
         客戶下_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
+        客戶下_dgv.Columns(0).FillWeight = 80 : 客戶下_dgv.Columns(1).FillWeight = 200 : 客戶下_dgv.Columns(2).FillWeight = 80 : 客戶下_dgv.Columns(3).FillWeight = 80
+        客戶下_dgv.Columns(4).FillWeight = 80 : 客戶下_dgv.Columns(5).Visible = False : 客戶下_dgv.Columns(6).FillWeight = 80
     End Sub
     Private Sub Set_商客清單()
         商客_dgv.DataSource = Nothing : ds6.Clear()
         商客_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         商客_dgv.ColumnHeadersHeight = 25
         商客_dgv.AllowUserToAddRows = False
-        SQL_商客資料表()
+        SQL_商客資料表2()
         da.Fill(ds6) : 商客_dgv.DataSource = ds6.Tables(0) : conn.Close()
         商客_dgv.Columns(0).FillWeight = 140
         商客_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
@@ -58,7 +58,7 @@
     End Sub
     Private Sub 基本資料_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = GA_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
-        Set_商品清單() : Set_基數清單() : Set_資料清單() : Set_客戶下清單() : Set_商客清單()
+
         SQL_下拉商品清單讀取()
         商品_cb.Items.Clear() : While (dr.Read()) : 商品_cb.Items.Add(dr("商品")) : End While : conn.Close()
         '-------------------------------------------------------------------------------------------------------
@@ -70,6 +70,8 @@
         '-------------------------------------------------------------------------------------------------------
         SQL_上行清單讀取()
         下行_cb.Items.Clear() : 下行1_cb.Items.Clear() : While (dr.Read()) : 下行_cb.Items.Add(dr("基數")) : 下行1_cb.Items.Add(dr("基數")) : End While : conn.Close()
+
+        PA = "" : PA1 = "" : PA9 = "" : Set_商品清單() : Set_基數清單() : Set_資料清單() : Set_客戶下清單() : Set_商客清單()
     End Sub
     Private Sub 商客_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 商客_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
@@ -99,49 +101,84 @@
             End If
         End If
     End Sub
+    Private Sub 資料_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 資料_cb.SelectedIndexChanged
+        If Strings.Left(資料_cb.Text, 2) = "長板" Then
+            上行_cb.Text = "上缴金额"
+            If Strings.Mid(資料_cb.Text, 3, 7) = "(總監)" Then : 下行_cb.Text = "總監"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(大股東)" Then : 下行_cb.Text = "大股東"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(股東)" Then : 下行_cb.Text = "股東"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(總代理)" Then : 下行_cb.Text = "總代理"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(代理)" Then : 下行_cb.Text = "代理"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(會員)" Then : 下行_cb.Text = "會員"
+            End If
+        Else
+            If Strings.Mid(資料_cb.Text, 3, 7) = "(總監)" Then : 上行_cb.Text = "總監" : 下行_cb.Text = "大股東"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(大股東)" Then : 上行_cb.Text = "大股東" : 下行_cb.Text = "股東"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(股東)" Then : 上行_cb.Text = "股東" : 下行_cb.Text = "總代理"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(總代理)" Then : 上行_cb.Text = "總代理" : 下行_cb.Text = "代理"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(代理)" Then : 上行_cb.Text = "代理" : 下行_cb.Text = "會員"
+            ElseIf Strings.Mid(資料_cb.Text, 3, 7) = "(會員)" Then : 上行_cb.Text = "會員" : 下行_cb.Text = "會員"
+            End If
+        End If
+    End Sub
     '----------------------------------------------下行客戶----------------------------------------------------------------
     Private Sub 客戶下新增_bt_Click(sender As Object, e As EventArgs) Handles 客戶下新增_bt.Click
         If 客戶下_tb.Text = "" Or 網址3_tb.Text = "" Or 帳號3_tb.Text = "" Or 下行1_cb.Text = "" Then
             MsgBox("資料沒有完整，請重新檢查")
         Else
-            連結() : SQL_系統編碼規則_客戶下重複查詢() : CmdSet_For_dr()
+            SQL_系統編碼規則_客戶下重複查詢()
             If dr.Read() Then
                 MsgBox("資料重複，請從新輸入或檢查") : conn.Close() : dr.Close()
             Else
-                重開() : SQL_系統編碼規則_客戶下新增() : CmdSet_For_dr() : MsgBox("新增完成") : conn.Close() : dr.Close()
+                SQL_下行客戶流水號最後一筆()
+                If dr.Read() Then : GP = Double.Parse(Strings.Right(dr("流水號").ToString, 6)) : Else : GP = 0 : End If : conn.Close()
+                '----------------------自动生成流水号-------------------------------------------------------------------------
+                If GP < 10 Then : GPP = "GA" & "00000" & GP
+                ElseIf GP > 9 And GP < 100 Then : GPP = "GA" & "0000" & GP
+                ElseIf GP > 99 And GP < 1000 Then : GPP = "GA" & "000" & GP
+                ElseIf GP > 999 And GP < 10000 Then : GPP = "GA" & "00" & GP
+                ElseIf GP > 9999 And GP < 100000 Then : GPP = "GA" & "0" & GP
+                ElseIf GP > 999999 Then : GPP = "GA" & GP : End If : PA10 = GPP
+
+                SQL_系統編碼規則_客戶下新增() : MsgBox("新增完成") : conn.Close() : dr.Close()
             End If
-        End If : Set_客戶下清單()
+        End If : PA = "" : Set_客戶下清單()
     End Sub
     Private Sub 客戶下修正_bt_Click(sender As Object, e As EventArgs) Handles 客戶下修正_bt.Click
         If 客戶下_tb.Text = "" Or 網址3_tb.Text = "" Or 帳號3_tb.Text = "" Or 下行1_cb.Text = "" Then
             MsgBox("資料有缺或有誤，請重新檢查")
         Else
-            PA = InputBox("請輸入要修改的客戶名稱", "", 客戶下_tb.Text)
-            PA1 = InputBox("請輸入要修改的網址", "", 網址3_tb.Text)
-            PA2 = InputBox("請輸入要修改的帳號", "", 帳號3_tb.Text)
-            PA3 = InputBox("請輸入要修改的基數", "", 下行1_cb.Text)
+            PA = 客戶下_tb.Text : PA1 = 網址3_tb.Text : PA2 = 帳號3_tb.Text : PA3 = 下行1_cb.Text : PA4 = 客戶名稱_tb.Text
             If PA = "" Or PA1 = "" Or PA2 = "" Or PA3 = "" Then
                 MsgBox("不能空白")
             Else
                 連結() : SQL_系統編碼規則_客戶下修改() : CmdSet_For_dr() : MsgBox("修改完成") : conn.Close() : dr.Close()
             End If
-        End If : Set_客戶下清單()
+        End If : PA = "" : Set_客戶下清單()
     End Sub
     Private Sub 客戶下刪除_bt_Click(sender As Object, e As EventArgs) Handles 客戶下刪除_bt.Click
         Dim aa As MsgBoxResult = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
-            ConnOpen_子SQL() : SQL_系統編碼規則_客戶下刪除() : CmdSet_For_dr() : MsgBox("刪除完成")
-        End If
-        conn.Close() : Set_客戶下清單()
+            SQL_系統編碼規則_客戶下刪除() : MsgBox("刪除完成")
+        End If : conn.Close() : PA = "" : Set_客戶下清單()
     End Sub
     Private Sub 客戶下_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 客戶下_dgv.CellClick
         If e.RowIndex = -1 Then : Else
+            SQL_上行清單讀取() : 下行1_cb.Items.Clear() : While (dr.Read()) : 下行1_cb.Items.Add(dr("基數")) : End While : conn.Close()
+            流水號_tb.Text = 客戶下_dgv("流水號", e.RowIndex).Value.ToString
             客戶下_tb.Text = 客戶下_dgv("客戶帳號", e.RowIndex).Value.ToString
             網址3_tb.Text = 客戶下_dgv("網址", e.RowIndex).Value.ToString
             帳號3_tb.Text = 客戶下_dgv("老闆帳號", e.RowIndex).Value.ToString
-            下行1_cb.Text = 客戶下_dgv("客戶名稱", e.RowIndex).Value.ToString
+            下行1_cb.Text = 客戶下_dgv("基數", e.RowIndex).Value.ToString
+            客戶名稱_tb.Text = 客戶下_dgv("客戶名稱", e.RowIndex).Value.ToString
         End If
     End Sub
+    Private Sub 搜索1_bt_Click(sender As Object, e As EventArgs) Handles 搜索1_bt.Click
+        PA = 客戶下_tb.Text : Set_客戶下清單()
+    End Sub
+    Private Sub 清除搜索_bt_Click(sender As Object, e As EventArgs) Handles 清除搜索1_bt.Click
+        PA = "" : Set_客戶下清單()
+    End Sub
     '-----------------------------------商客基本資料表-----------------------------------------
     Private Sub 商客_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 商客_dgv.CellClick
         If e.RowIndex = -1 Then : Else
@@ -160,26 +197,47 @@
             If dr.Read() Then
                 MsgBox("資料重複，請從新輸入或檢查") : conn.Close() : dr.Close()
             Else
+                PA9 = 商品_cb.Text
+                SQL_商品確認()
+                If dr.Read() Then : conn.Close()
+                Else : SQL_商品寫入() : Set_商品清單() : conn.Close() : End If
                 重開() : SQL_系統編碼規則_商客新增() : CmdSet_For_dr() : MsgBox("新增完成") : conn.Close() : dr.Close()
             End If
         End If : Set_商客清單()
     End Sub
     Private Sub 商客刪除_bt_Click(sender As Object, e As EventArgs) Handles 商客刪除_bt.Click
-        SQL_系統編碼規則_商客刪除()
-        ConnOpen_子SQL()
-        Dim aa As MsgBoxResult
-        aa = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
+        Dim aa As MsgBoxResult = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
-            CmdSet_For_dr() : MsgBox("刪除完成")
-        End If
-        conn.Close() : Set_商客清單()
+            SQL_系統編碼規則_商客刪除() : MsgBox("刪除完成") : conn.Close()
+        End If : PA1 = "" : Set_商客清單()
     End Sub
     Private Sub 商客修正_bt_Click(sender As Object, e As EventArgs) Handles 商客修正_bt.Click
         If 網址_tb.Text = "" Or 上繳源_tb.Text = "" Or 帳號_tb.Text = "" Or 密碼_tb.Text = "" Or 上行_cb.Text = "" Or 下行_cb.Text = "" Then
             MsgBox("資料有缺或有誤，請重新檢查")
         Else
             PA2 = 網址_tb.Text : PA3 = 上繳源_tb.Text : PA4 = 帳號_tb.Text : PA5 = 密碼_tb.Text : PA6 = 上行_cb.Text : PA7 = 下行_cb.Text : PA8 = 資料_cb.Text : PA9 = 商品_cb.Text
+            SQL_商品確認()
+            If dr.Read() Then : conn.Close()
+            Else : SQL_商品寫入() : Set_商品清單() : conn.Close() : End If
             連結() : SQL_系統編碼規則_商客修改() : CmdSet_For_dr() : MsgBox("修改完成") : conn.Close() : dr.Close()
-        End If : Set_商客清單()
+        End If : PA1 = "" : Set_商客清單()
+    End Sub
+    Private Sub 搜索2_bt_Click(sender As Object, e As EventArgs) Handles 搜索2_bt.Click
+        PA1 = 網址_tb.Text : Set_商客清單()
+    End Sub
+    Private Sub 搜索3_bt_Click(sender As Object, e As EventArgs) Handles 搜索3_bt.Click
+        PA1 = 網址3_tb.Text : Set_商客清單()
+    End Sub
+    Private Sub 清除搜索2_bt_Click(sender As Object, e As EventArgs) Handles 清除搜索2_bt.Click
+        PA1 = "" : Set_商客清單()
+    End Sub
+    Private Sub RadioButton1_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton1.Click
+        PA9 = "" : Set_客戶下清單()
+    End Sub
+    Private Sub RadioButton2_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton2.Click
+        PA9 = "AND (客名 NOT LIKE N'')" : Set_客戶下清單()
+    End Sub
+    Private Sub RadioButton3_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton3.Click
+        PA9 = "AND (客名 LIKE N'' OR 客名 IS NULL)" : Set_客戶下清單()
     End Sub
 End Class

GA-ERP-SYS/報表系統管理/流水帳查詢.Designer.vb

@@ -23,15 +23,18 @@ Partial Class 流水帳查詢
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.流水帳_dgv = New System.Windows.Forms.DataGridView()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.資料_cb = New System.Windows.Forms.ComboBox()
@@ -88,13 +91,26 @@ Partial Class 流水帳查詢
         Me.使用網址_ch = New System.Windows.Forms.CheckBox()
         Me.重新導入_bt = New System.Windows.Forms.Button()
         Me.LOG檔_bt = New System.Windows.Forms.Button()
-        Me.LOG檔_GUP = New System.Windows.Forms.GroupBox()
+        Me.L50 = New System.Windows.Forms.GroupBox()
         Me.列印_bt = New System.Windows.Forms.Button()
-        Me.流水帳1_dgv = New System.Windows.Forms.DataGridView()
-        Me.明細合併_bt = New System.Windows.Forms.Button()
         Me.客戶資料_bt = New System.Windows.Forms.Button()
         Me.RadioButton3 = New System.Windows.Forms.RadioButton()
-        Me.RadioButton4 = New System.Windows.Forms.RadioButton()
+        Me.彙總3_dgv = New System.Windows.Forms.DataGridView()
+        Me.彙總4_dgv = New System.Windows.Forms.DataGridView()
+        Me.老闆_tb = New System.Windows.Forms.TextBox()
+        Me.L1 = New System.Windows.Forms.Label()
+        Me.L2 = New System.Windows.Forms.Label()
+        Me.所得1_tb = New System.Windows.Forms.TextBox()
+        Me.L4 = New System.Windows.Forms.Label()
+        Me.地帳1_tb = New System.Windows.Forms.TextBox()
+        Me.L3 = New System.Windows.Forms.Label()
+        Me.天帳1_tb = New System.Windows.Forms.TextBox()
+        Me.客戶_dgv = New System.Windows.Forms.DataGridView()
+        Me.彙總5_dgv = New System.Windows.Forms.DataGridView()
+        Me.客戶_tb = New System.Windows.Forms.TextBox()
+        Me.L5 = New System.Windows.Forms.Label()
+        Me.L6 = New System.Windows.Forms.Label()
+        Me.合計_tb = New System.Windows.Forms.TextBox()
         CType(Me.流水帳_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.彙總_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.彙總1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -104,14 +120,17 @@ Partial Class 流水帳查詢
         CType(Me.LOG2_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.日期_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.批次_nud, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.LOG檔_GUP.SuspendLayout()
-        CType(Me.流水帳1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.L50.SuspendLayout()
+        CType(Me.彙總3_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.彙總4_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.客戶_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.彙總5_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '流水帳_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.流水帳_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.流水帳_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
         Me.流水帳_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.流水帳_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -182,8 +201,8 @@ Partial Class 流水帳查詢
         '
         '彙總_dgv
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.彙總_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.彙總_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
         Me.彙總_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.彙總_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -282,28 +301,31 @@ Partial Class 流水帳查詢
         'RadioButton1
         '
         Me.RadioButton1.AutoSize = True
-        Me.RadioButton1.Checked = True
-        Me.RadioButton1.Location = New System.Drawing.Point(592, 86)
+        Me.RadioButton1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.RadioButton1.Location = New System.Drawing.Point(588, 86)
         Me.RadioButton1.Name = "RadioButton1"
-        Me.RadioButton1.Size = New System.Drawing.Size(135, 20)
+        Me.RadioButton1.Size = New System.Drawing.Size(190, 20)
         Me.RadioButton1.TabIndex = 1531
-        Me.RadioButton1.Text = "應付彙總(商品/老闆)"
+        Me.RadioButton1.Text = "帳務彙總表(查看資料受否齊全)"
         Me.RadioButton1.UseVisualStyleBackColor = True
         '
         'RadioButton2
         '
         Me.RadioButton2.AutoSize = True
-        Me.RadioButton2.Location = New System.Drawing.Point(732, 86)
+        Me.RadioButton2.Checked = True
+        Me.RadioButton2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.RadioButton2.Location = New System.Drawing.Point(588, 109)
         Me.RadioButton2.Name = "RadioButton2"
-        Me.RadioButton2.Size = New System.Drawing.Size(130, 20)
+        Me.RadioButton2.Size = New System.Drawing.Size(142, 20)
         Me.RadioButton2.TabIndex = 1532
-        Me.RadioButton2.Text = "應付彙總(分離呈現)"
+        Me.RadioButton2.TabStop = True
+        Me.RadioButton2.Text = "應收付報表(點選查詢)"
         Me.RadioButton2.UseVisualStyleBackColor = True
         '
         '彙總1_dgv
         '
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.彙總1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.彙總1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15
         Me.彙總1_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.彙總1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -312,13 +334,13 @@ Partial Class 流水帳查詢
         Me.彙總1_dgv.Name = "彙總1_dgv"
         Me.彙總1_dgv.RowHeadersWidth = 4
         Me.彙總1_dgv.RowTemplate.Height = 24
-        Me.彙總1_dgv.Size = New System.Drawing.Size(427, 834)
+        Me.彙總1_dgv.Size = New System.Drawing.Size(427, 407)
         Me.彙總1_dgv.TabIndex = 1534
         '
         '彙總2_dgv
         '
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.彙總2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.彙總2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
         Me.彙總2_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.彙總2_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -327,13 +349,13 @@ Partial Class 流水帳查詢
         Me.彙總2_dgv.Name = "彙總2_dgv"
         Me.彙總2_dgv.RowHeadersWidth = 4
         Me.彙總2_dgv.RowTemplate.Height = 24
-        Me.彙總2_dgv.Size = New System.Drawing.Size(427, 834)
+        Me.彙總2_dgv.Size = New System.Drawing.Size(427, 407)
         Me.彙總2_dgv.TabIndex = 1535
         '
         '客戶下_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.客戶下_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.客戶下_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
         Me.客戶下_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -353,7 +375,7 @@ Partial Class 流水帳查詢
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.存檔_bt.Location = New System.Drawing.Point(865, 933)
         Me.存檔_bt.Name = "存檔_bt"
-        Me.存檔_bt.Size = New System.Drawing.Size(753, 33)
+        Me.存檔_bt.Size = New System.Drawing.Size(825, 33)
         Me.存檔_bt.TabIndex = 1537
         Me.存檔_bt.Text = "客戶資料比對存檔"
         Me.存檔_bt.UseVisualStyleBackColor = True
@@ -362,7 +384,7 @@ Partial Class 流水帳查詢
         '
         Me.Delete_bT.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Delete_bT.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.Delete_bT.Location = New System.Drawing.Point(1619, 933)
+        Me.Delete_bT.Location = New System.Drawing.Point(1692, 933)
         Me.Delete_bT.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Delete_bT.Name = "Delete_bT"
         Me.Delete_bT.Size = New System.Drawing.Size(73, 33)
@@ -383,8 +405,8 @@ Partial Class 流水帳查詢
         '
         'LOG1_dgv
         '
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.LOG1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.LOG1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
         Me.LOG1_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.LOG1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -398,8 +420,8 @@ Partial Class 流水帳查詢
         '
         'LOG2_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.LOG2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.LOG2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
         Me.LOG2_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -474,8 +496,8 @@ Partial Class 流水帳查詢
         '
         '日期_dgv
         '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.日期_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.日期_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
         Me.日期_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -701,14 +723,14 @@ Partial Class 流水帳查詢
         Me.重新導入_bt.Name = "重新導入_bt"
         Me.重新導入_bt.Size = New System.Drawing.Size(272, 27)
         Me.重新導入_bt.TabIndex = 1569
-        Me.重新導入_bt.Text = "重新導入 [ X ] 資料"
+        Me.重新導入_bt.Text = "重新導入 [ X 或 NA] 的資料"
         Me.重新導入_bt.UseVisualStyleBackColor = True
         '
         'LOG檔_bt
         '
         Me.LOG檔_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LOG檔_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.LOG檔_bt.Location = New System.Drawing.Point(1693, 933)
+        Me.LOG檔_bt.Location = New System.Drawing.Point(1766, 933)
         Me.LOG檔_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.LOG檔_bt.Name = "LOG檔_bt"
         Me.LOG檔_bt.Size = New System.Drawing.Size(73, 33)
@@ -716,16 +738,16 @@ Partial Class 流水帳查詢
         Me.LOG檔_bt.Text = "LOG檔"
         Me.LOG檔_bt.UseVisualStyleBackColor = True
         '
-        'LOG檔_GUP
+        'L50
         '
-        Me.LOG檔_GUP.Controls.Add(Me.LOG1_dgv)
-        Me.LOG檔_GUP.Controls.Add(Me.LOG2_dgv)
-        Me.LOG檔_GUP.Location = New System.Drawing.Point(865, 526)
-        Me.LOG檔_GUP.Name = "LOG檔_GUP"
-        Me.LOG檔_GUP.Size = New System.Drawing.Size(1050, 404)
-        Me.LOG檔_GUP.TabIndex = 1571
-        Me.LOG檔_GUP.TabStop = False
-        Me.LOG檔_GUP.Text = "LOG檔"
+        Me.L50.Controls.Add(Me.LOG1_dgv)
+        Me.L50.Controls.Add(Me.LOG2_dgv)
+        Me.L50.Location = New System.Drawing.Point(865, 526)
+        Me.L50.Name = "L50"
+        Me.L50.Size = New System.Drawing.Size(1050, 404)
+        Me.L50.TabIndex = 1571
+        Me.L50.TabStop = False
+        Me.L50.Text = "LOG檔"
         '
         '列印_bt
         '
@@ -738,38 +760,11 @@ Partial Class 流水帳查詢
         Me.列印_bt.Text = "列印成EXCEL"
         Me.列印_bt.UseVisualStyleBackColor = True
         '
-        '流水帳1_dgv
-        '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.流水帳1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
-        Me.流水帳1_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.流水帳1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.流水帳1_dgv.Location = New System.Drawing.Point(865, 30)
-        Me.流水帳1_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.流水帳1_dgv.Name = "流水帳1_dgv"
-        Me.流水帳1_dgv.RowHeadersWidth = 4
-        Me.流水帳1_dgv.RowTemplate.Height = 24
-        Me.流水帳1_dgv.Size = New System.Drawing.Size(1050, 900)
-        Me.流水帳1_dgv.TabIndex = 1573
-        '
-        '明細合併_bt
-        '
-        Me.明細合併_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.明細合併_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.明細合併_bt.Location = New System.Drawing.Point(1842, 933)
-        Me.明細合併_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.明細合併_bt.Name = "明細合併_bt"
-        Me.明細合併_bt.Size = New System.Drawing.Size(73, 33)
-        Me.明細合併_bt.TabIndex = 1574
-        Me.明細合併_bt.Text = "明細合併"
-        Me.明細合併_bt.UseVisualStyleBackColor = True
-        '
         '客戶資料_bt
         '
         Me.客戶資料_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.客戶資料_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.客戶資料_bt.Location = New System.Drawing.Point(1768, 933)
+        Me.客戶資料_bt.Location = New System.Drawing.Point(1841, 933)
         Me.客戶資料_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶資料_bt.Name = "客戶資料_bt"
         Me.客戶資料_bt.Size = New System.Drawing.Size(73, 33)
@@ -780,34 +775,222 @@ Partial Class 流水帳查詢
         'RadioButton3
         '
         Me.RadioButton3.AutoSize = True
-        Me.RadioButton3.Location = New System.Drawing.Point(732, 109)
+        Me.RadioButton3.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.RadioButton3.Location = New System.Drawing.Point(733, 109)
         Me.RadioButton3.Name = "RadioButton3"
         Me.RadioButton3.Size = New System.Drawing.Size(130, 20)
-        Me.RadioButton3.TabIndex = 1577
-        Me.RadioButton3.Text = "應收彙總(分離呈現)"
+        Me.RadioButton3.TabIndex = 1576
+        Me.RadioButton3.Text = "收付關聯表(依老闆)"
         Me.RadioButton3.UseVisualStyleBackColor = True
         '
-        'RadioButton4
+        '彙總3_dgv
         '
-        Me.RadioButton4.AutoSize = True
-        Me.RadioButton4.Location = New System.Drawing.Point(592, 109)
-        Me.RadioButton4.Name = "RadioButton4"
-        Me.RadioButton4.Size = New System.Drawing.Size(135, 20)
-        Me.RadioButton4.TabIndex = 1576
-        Me.RadioButton4.Text = "應收彙總(商品/客戶)"
-        Me.RadioButton4.UseVisualStyleBackColor = True
+        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.彙總3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
+        Me.彙總3_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.彙總3_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.彙總3_dgv.Location = New System.Drawing.Point(6, 568)
+        Me.彙總3_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.彙總3_dgv.Name = "彙總3_dgv"
+        Me.彙總3_dgv.RowHeadersWidth = 4
+        Me.彙總3_dgv.RowTemplate.Height = 24
+        Me.彙總3_dgv.Size = New System.Drawing.Size(331, 371)
+        Me.彙總3_dgv.TabIndex = 1579
+        '
+        '彙總4_dgv
+        '
+        DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.彙總4_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
+        Me.彙總4_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.彙總4_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.彙總4_dgv.Location = New System.Drawing.Point(343, 541)
+        Me.彙總4_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.彙總4_dgv.Name = "彙總4_dgv"
+        Me.彙總4_dgv.RowHeadersWidth = 4
+        Me.彙總4_dgv.RowTemplate.Height = 24
+        Me.彙總4_dgv.Size = New System.Drawing.Size(519, 425)
+        Me.彙總4_dgv.TabIndex = 1578
+        '
+        '老闆_tb
+        '
+        Me.老闆_tb.ForeColor = System.Drawing.Color.Black
+        Me.老闆_tb.Location = New System.Drawing.Point(48, 541)
+        Me.老闆_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.老闆_tb.Name = "老闆_tb"
+        Me.老闆_tb.Size = New System.Drawing.Size(69, 23)
+        Me.老闆_tb.TabIndex = 1580
+        Me.老闆_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'L1
+        '
+        Me.L1.AutoSize = True
+        Me.L1.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.L1.ForeColor = System.Drawing.Color.Black
+        Me.L1.Location = New System.Drawing.Point(12, 544)
+        Me.L1.Name = "L1"
+        Me.L1.Size = New System.Drawing.Size(34, 17)
+        Me.L1.TabIndex = 1581
+        Me.L1.Text = "老闆"
+        '
+        'L2
+        '
+        Me.L2.AutoSize = True
+        Me.L2.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.L2.ForeColor = System.Drawing.Color.Green
+        Me.L2.Location = New System.Drawing.Point(171, 544)
+        Me.L2.Name = "L2"
+        Me.L2.Size = New System.Drawing.Size(34, 17)
+        Me.L2.TabIndex = 1587
+        Me.L2.Text = "所得"
+        '
+        '所得1_tb
+        '
+        Me.所得1_tb.ForeColor = System.Drawing.Color.Green
+        Me.所得1_tb.Location = New System.Drawing.Point(207, 541)
+        Me.所得1_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.所得1_tb.Name = "所得1_tb"
+        Me.所得1_tb.Size = New System.Drawing.Size(130, 23)
+        Me.所得1_tb.TabIndex = 1586
+        Me.所得1_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'L4
+        '
+        Me.L4.AutoSize = True
+        Me.L4.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.L4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.L4.Location = New System.Drawing.Point(173, 944)
+        Me.L4.Name = "L4"
+        Me.L4.Size = New System.Drawing.Size(34, 17)
+        Me.L4.TabIndex = 1585
+        Me.L4.Text = "應收"
+        '
+        '地帳1_tb
+        '
+        Me.地帳1_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.地帳1_tb.Location = New System.Drawing.Point(207, 941)
+        Me.地帳1_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.地帳1_tb.Name = "地帳1_tb"
+        Me.地帳1_tb.Size = New System.Drawing.Size(130, 23)
+        Me.地帳1_tb.TabIndex = 1584
+        Me.地帳1_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'L3
+        '
+        Me.L3.AutoSize = True
+        Me.L3.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.L3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.L3.Location = New System.Drawing.Point(6, 944)
+        Me.L3.Name = "L3"
+        Me.L3.Size = New System.Drawing.Size(34, 17)
+        Me.L3.TabIndex = 1583
+        Me.L3.Text = "應付"
+        '
+        '天帳1_tb
+        '
+        Me.天帳1_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.天帳1_tb.Location = New System.Drawing.Point(40, 941)
+        Me.天帳1_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.天帳1_tb.Name = "天帳1_tb"
+        Me.天帳1_tb.Size = New System.Drawing.Size(130, 23)
+        Me.天帳1_tb.TabIndex = 1582
+        Me.天帳1_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        '客戶_dgv
+        '
+        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.客戶_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
+        Me.客戶_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.客戶_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.客戶_dgv.Location = New System.Drawing.Point(342, 568)
+        Me.客戶_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.客戶_dgv.Name = "客戶_dgv"
+        Me.客戶_dgv.RowHeadersWidth = 4
+        Me.客戶_dgv.RowTemplate.Height = 24
+        Me.客戶_dgv.Size = New System.Drawing.Size(90, 398)
+        Me.客戶_dgv.TabIndex = 1588
+        '
+        '彙總5_dgv
+        '
+        DataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.彙總5_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
+        Me.彙總5_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.彙總5_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.彙總5_dgv.Location = New System.Drawing.Point(435, 568)
+        Me.彙總5_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.彙總5_dgv.Name = "彙總5_dgv"
+        Me.彙總5_dgv.RowHeadersWidth = 4
+        Me.彙總5_dgv.RowTemplate.Height = 24
+        Me.彙總5_dgv.Size = New System.Drawing.Size(427, 398)
+        Me.彙總5_dgv.TabIndex = 1589
+        '
+        '客戶_tb
+        '
+        Me.客戶_tb.ForeColor = System.Drawing.Color.Black
+        Me.客戶_tb.Location = New System.Drawing.Point(473, 542)
+        Me.客戶_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.客戶_tb.Name = "客戶_tb"
+        Me.客戶_tb.Size = New System.Drawing.Size(69, 23)
+        Me.客戶_tb.TabIndex = 1590
+        Me.客戶_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'L5
+        '
+        Me.L5.AutoSize = True
+        Me.L5.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.L5.ForeColor = System.Drawing.Color.Black
+        Me.L5.Location = New System.Drawing.Point(437, 545)
+        Me.L5.Name = "L5"
+        Me.L5.Size = New System.Drawing.Size(34, 17)
+        Me.L5.TabIndex = 1591
+        Me.L5.Text = "客戶"
+        '
+        'L6
+        '
+        Me.L6.AutoSize = True
+        Me.L6.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.L6.ForeColor = System.Drawing.Color.Green
+        Me.L6.Location = New System.Drawing.Point(548, 545)
+        Me.L6.Name = "L6"
+        Me.L6.Size = New System.Drawing.Size(34, 17)
+        Me.L6.TabIndex = 1593
+        Me.L6.Text = "合計"
+        '
+        '合計_tb
+        '
+        Me.合計_tb.ForeColor = System.Drawing.Color.Green
+        Me.合計_tb.Location = New System.Drawing.Point(584, 542)
+        Me.合計_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.合計_tb.Name = "合計_tb"
+        Me.合計_tb.Size = New System.Drawing.Size(130, 23)
+        Me.合計_tb.TabIndex = 1592
+        Me.合計_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
         '流水帳查詢
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1924, 971)
-        Me.Controls.Add(Me.RadioButton3)
-        Me.Controls.Add(Me.RadioButton4)
+        Me.Controls.Add(Me.L6)
+        Me.Controls.Add(Me.合計_tb)
+        Me.Controls.Add(Me.客戶_tb)
+        Me.Controls.Add(Me.L5)
+        Me.Controls.Add(Me.客戶_dgv)
+        Me.Controls.Add(Me.L2)
+        Me.Controls.Add(Me.所得1_tb)
+        Me.Controls.Add(Me.L4)
+        Me.Controls.Add(Me.地帳1_tb)
+        Me.Controls.Add(Me.L3)
+        Me.Controls.Add(Me.天帳1_tb)
+        Me.Controls.Add(Me.老闆_tb)
+        Me.Controls.Add(Me.L1)
+        Me.Controls.Add(Me.彙總3_dgv)
         Me.Controls.Add(Me.客戶資料_bt)
-        Me.Controls.Add(Me.明細合併_bt)
         Me.Controls.Add(Me.列印_bt)
-        Me.Controls.Add(Me.LOG檔_GUP)
+        Me.Controls.Add(Me.L50)
         Me.Controls.Add(Me.LOG檔_bt)
         Me.Controls.Add(Me.重新導入_bt)
         Me.Controls.Add(Me.使用網址_ch)
@@ -838,7 +1021,6 @@ Partial Class 流水帳查詢
         Me.Controls.Add(Me.重讀_bt)
         Me.Controls.Add(Me.Delete_bT)
         Me.Controls.Add(Me.存檔_bt)
-        Me.Controls.Add(Me.客戶下_dgv)
         Me.Controls.Add(Me.RadioButton2)
         Me.Controls.Add(Me.Panel1)
         Me.Controls.Add(Me.水差_tb)
@@ -856,11 +1038,14 @@ Partial Class 流水帳查詢
         Me.Controls.Add(Me.資料_cb)
         Me.Controls.Add(Me.RadioButton1)
         Me.Controls.Add(Me.彙總2_dgv)
-        Me.Controls.Add(Me.彙總_dgv)
         Me.Controls.Add(Me.彙總1_dgv)
         Me.Controls.Add(Me.Label5)
-        Me.Controls.Add(Me.流水帳1_dgv)
         Me.Controls.Add(Me.流水帳_dgv)
+        Me.Controls.Add(Me.彙總5_dgv)
+        Me.Controls.Add(Me.彙總4_dgv)
+        Me.Controls.Add(Me.客戶下_dgv)
+        Me.Controls.Add(Me.彙總_dgv)
+        Me.Controls.Add(Me.RadioButton3)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "流水帳查詢"
@@ -874,8 +1059,11 @@ Partial Class 流水帳查詢
         CType(Me.LOG2_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.日期_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.批次_nud, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.LOG檔_GUP.ResumeLayout(False)
-        CType(Me.流水帳1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.L50.ResumeLayout(False)
+        CType(Me.彙總3_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.彙總4_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.客戶_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.彙總5_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -937,11 +1125,24 @@ Partial Class 流水帳查詢
     Friend WithEvents 使用網址_ch As CheckBox
     Friend WithEvents 重新導入_bt As Button
     Friend WithEvents LOG檔_bt As Button
-    Friend WithEvents LOG檔_GUP As GroupBox
+    Friend WithEvents L50 As GroupBox
     Friend WithEvents 列印_bt As Button
-    Friend WithEvents 流水帳1_dgv As DataGridView
-    Friend WithEvents 明細合併_bt As Button
     Friend WithEvents 客戶資料_bt As Button
     Friend WithEvents RadioButton3 As RadioButton
-    Friend WithEvents RadioButton4 As RadioButton
+    Friend WithEvents 彙總3_dgv As DataGridView
+    Friend WithEvents 彙總4_dgv As DataGridView
+    Friend WithEvents 老闆_tb As TextBox
+    Friend WithEvents L1 As Label
+    Friend WithEvents L2 As Label
+    Friend WithEvents 所得1_tb As TextBox
+    Friend WithEvents L4 As Label
+    Friend WithEvents 地帳1_tb As TextBox
+    Friend WithEvents L3 As Label
+    Friend WithEvents 天帳1_tb As TextBox
+    Friend WithEvents 客戶_dgv As DataGridView
+    Friend WithEvents 彙總5_dgv As DataGridView
+    Friend WithEvents 客戶_tb As TextBox
+    Friend WithEvents L5 As Label
+    Friend WithEvents L6 As Label
+    Friend WithEvents 合計_tb As TextBox
 End Class

GA-ERP-SYS/報表系統管理/流水帳查詢.vb

@@ -10,7 +10,8 @@ Imports Microsoft.Office.Interop.Excel.XlThemeFont
 Imports Microsoft.Office.Interop.Excel.XlThemeColor
 Imports Microsoft.Office.Interop.Excel.XlWindowState
 Public Class 流水帳查詢
-    ReadOnly ds, ds1, ds2, ds3, ds4, ds5, ds6, ds7 As New DataSet : Dim 批次, N1, N2, N3 As Integer : Dim GP As Integer = 0 : Dim GPP As String
+    ReadOnly ds, ds1, ds2, ds3, ds4, ds5, ds6, ds7, ds8, ds9, ds10, ds11 As New DataSet : Dim 第一, 第二 As String
+    Dim 批次, N1, N2, N3 As Integer : Dim GP As Integer = 0 : Dim GPP As String : Dim NN1, NN2 As Integer
     Private Sub Set_客戶下清單()
         客戶下_dgv.DataSource = Nothing : ds4.Clear()
         客戶下_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -27,17 +28,20 @@ Public Class 流水帳查詢
         流水帳_dgv.AllowUserToAddRows = False
         PA40 = 網址_tb.Text : SQL_流水帳查詢()
         da.Fill(ds) : 流水帳_dgv.DataSource = ds.Tables(0) : conn.Close()
-        流水帳_dgv.Columns("水差").Visible = False
+
         流水帳_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
+        流水帳_dgv.Columns("水差").Visible = False : 流水帳_dgv.Columns("核帳").FillWeight = 55 : 流水帳_dgv.Columns("客名").FillWeight = 65
+        流水帳_dgv.Columns(7).Visible = False : 流水帳_dgv.Columns(6).Visible = False
+        流水帳_dgv.Columns("網址").FillWeight = 180 : 流水帳_dgv.Columns("客戶").FillWeight = 150 : 流水帳_dgv.Columns(1).FillWeight = 110
+        流水帳_dgv.Columns(0).FillWeight = 110
 
-        流水帳_dgv.Columns("網址").FillWeight = 200 : 流水帳_dgv.Columns("客戶").FillWeight = 150 : 流水帳_dgv.Columns(1).FillWeight = 110
         流水帳_dgv.Columns("天帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         流水帳_dgv.Columns("地帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         流水帳_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         流水帳_dgv.Columns("個人所得").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         流水帳_dgv.Columns("核帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
 
-        流水帳_dgv.Columns(7).Visible = False : 流水帳_dgv.Columns(6).Visible = False
+
         For i As Integer = 15 To 55 : 流水帳_dgv.Columns(i).Visible = False : Next
         計算()
     End Sub
@@ -174,7 +178,7 @@ Public Class 流水帳查詢
             流水帳_dgv.Rows(i).Cells("客帳").Value = StrReverse(帳號)
 
             For ii As Integer = 0 To 客戶下_dgv.Rows.Count - 1
-                If 流水帳_dgv("客帳", i).Value.ToString = 客戶下_dgv("客戶帳號", ii).Value.ToString Then
+                If 流水帳_dgv("客帳", i).Value.ToString = 客戶下_dgv("客戶帳號", ii).Value.ToString And 流水帳_dgv("網址", i).Value.ToString = 客戶下_dgv("網址", ii).Value.ToString Then
                     流水帳_dgv("客名", i).Value = 客戶下_dgv("客戶名稱", ii).Value.ToString : Exit For
                 Else
                     流水帳_dgv("客名", i).Value = ""
@@ -196,6 +200,7 @@ Public Class 流水帳查詢
         彙總_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
         彙總_dgv.Columns(0).FillWeight = 90 : 彙總_dgv.Columns(1).FillWeight = 75 : 彙總_dgv.Columns(2).FillWeight = 130 : 彙總_dgv.Columns(3).FillWeight = 80
         彙總_dgv.Columns(7).Visible = False : 彙總_dgv.Columns(8).FillWeight = 60 : 彙總_dgv.Columns(9).FillWeight = 45 : 彙總_dgv.Columns(10).Visible = False
+
         彙總_dgv.Columns("天帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         彙總_dgv.Columns("地帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         彙總_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -272,7 +277,7 @@ Public Class 流水帳查詢
         da.Fill(ds2) : 彙總1_dgv.DataSource = ds2.Tables(0) : conn.Close()
         彙總1_dgv.Columns("水差").Visible = False
         彙總1_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
-        彙總1_dgv.Columns(4).FillWeight = 80 : 彙總1_dgv.Columns(5).FillWeight = 80
+        彙總1_dgv.Columns(4).FillWeight = 80 : 彙總1_dgv.Columns(5).FillWeight = 50
         彙總1_dgv.Columns("天帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         彙總1_dgv.Columns("地帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         彙總1_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -309,7 +314,7 @@ Public Class 流水帳查詢
         da.Fill(ds3) : 彙總2_dgv.DataSource = ds3.Tables(0) : conn.Close()
         彙總2_dgv.Columns("水差").Visible = False
         彙總2_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
-        彙總2_dgv.Columns(4).FillWeight = 80 : 彙總2_dgv.Columns(5).FillWeight = 80
+        彙總2_dgv.Columns(4).FillWeight = 80 : 彙總2_dgv.Columns(5).FillWeight = 50
         彙總2_dgv.Columns("天帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         彙總2_dgv.Columns("地帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         彙總2_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -338,12 +343,155 @@ Public Class 流水帳查詢
             彙總2_dgv.Rows(i).Cells("核帳").Value = Strings.Format(Val(彙總2_dgv.Rows(i).Cells("核帳").Value), "#,##0")
         Next
     End Sub
+    Private Sub Set_流水帳清單5()
+        彙總3_dgv.DataSource = Nothing : ds9.Clear() : 彙總3_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        彙總3_dgv.ColumnHeadersHeight = 25
+        彙總3_dgv.AllowUserToAddRows = False
+        SQL_彙總查詢3()
+        da.Fill(ds9) : 彙總3_dgv.DataSource = ds9.Tables(0) : conn.Close()
+        彙總3_dgv.Columns("水差").Visible = False : 彙總3_dgv.Columns("上繳源").Visible = False
+        彙總3_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
+        彙總3_dgv.Columns("核帳").FillWeight = 50
+        彙總3_dgv.Columns("天帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總3_dgv.Columns("地帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總3_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總3_dgv.Columns("個人所得").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總3_dgv.Columns("核帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
+        For i As Integer = 0 To 彙總3_dgv.Rows.Count - 1
+            彙總3_dgv.Rows(i).Cells("天帳").Value = "0" : 彙總3_dgv.Rows(i).Cells("地帳").Value = "0"
+            彙總3_dgv.Rows(i).Cells("個人所得").Value = "0" : 彙總3_dgv.Rows(i).Cells("水差").Value = "0"
+            For ii As Integer = 0 To 流水帳_dgv.Rows.Count - 1
+                If 彙總3_dgv.Rows(i).Cells("上繳源").Value.ToString = 流水帳_dgv.Rows(ii).Cells("老闆").Value.ToString And
+                    彙總3_dgv.Rows(i).Cells("商品").Value.ToString = 流水帳_dgv.Rows(ii).Cells("商品").Value.ToString Then
+                    彙總3_dgv.Rows(i).Cells("天帳").Value = Val(彙總3_dgv.Rows(i).Cells("天帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("天帳1").Value)
+                    彙總3_dgv.Rows(i).Cells("地帳").Value = Val(彙總3_dgv.Rows(i).Cells("地帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("地帳1").Value)
+                    彙總3_dgv.Rows(i).Cells("個人所得").Value = Val(彙總3_dgv.Rows(i).Cells("個人所得").Value) + Val(流水帳_dgv.Rows(ii).Cells("個人所得1").Value)
+                    彙總3_dgv.Rows(i).Cells("水差").Value = Val(彙總3_dgv.Rows(i).Cells("水差").Value) + Val(流水帳_dgv.Rows(ii).Cells("水差1").Value)
+                End If
+            Next
+
+            彙總3_dgv.Rows(i).Cells("核帳").Value = Val(彙總3_dgv.Rows(i).Cells("天帳").Value) + Val(彙總3_dgv.Rows(i).Cells("地帳").Value) +
+                                                     Val(彙總3_dgv.Rows(i).Cells("個人所得").Value)
+
+            彙總3_dgv.Rows(i).Cells("天帳").Value = Strings.Format(Val(彙總3_dgv.Rows(i).Cells("天帳").Value), "#,##0")
+            彙總3_dgv.Rows(i).Cells("地帳").Value = Strings.Format(Val(彙總3_dgv.Rows(i).Cells("地帳").Value), "#,##0")
+            彙總3_dgv.Rows(i).Cells("個人所得").Value = Strings.Format(Val(彙總3_dgv.Rows(i).Cells("個人所得").Value), "#,##0")
+            彙總3_dgv.Rows(i).Cells("水差").Value = Strings.Format(Val(彙總3_dgv.Rows(i).Cells("水差").Value), "#,##0")
+            彙總3_dgv.Rows(i).Cells("核帳").Value = Strings.Format(Val(彙總3_dgv.Rows(i).Cells("核帳").Value), "#,##0")
+        Next
+    End Sub
+    Private Sub Set_流水帳清單6()
+        彙總4_dgv.DataSource = Nothing : ds8.Clear() : 彙總4_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        彙總4_dgv.ColumnHeadersHeight = 25
+        彙總4_dgv.AllowUserToAddRows = False
+        SQL_彙總查詢4()
+        da.Fill(ds8) : 彙總4_dgv.DataSource = ds8.Tables(0) : conn.Close()
+        彙總4_dgv.Columns("水差").Visible = False : 彙總4_dgv.Columns("上繳源").Visible = False
+        彙總4_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
+        彙總4_dgv.Columns("核帳").FillWeight = 50
+        彙總4_dgv.Columns("天帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總4_dgv.Columns("地帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總4_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總4_dgv.Columns("個人所得").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        彙總4_dgv.Columns("核帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+
+        For i As Integer = 0 To 彙總4_dgv.Rows.Count - 1
+            彙總4_dgv.Rows(i).Cells("天帳").Value = "0" : 彙總4_dgv.Rows(i).Cells("地帳").Value = "0"
+            彙總4_dgv.Rows(i).Cells("個人所得").Value = "0" : 彙總4_dgv.Rows(i).Cells("水差").Value = "0"
+            For ii As Integer = 0 To 流水帳_dgv.Rows.Count - 1
+                If 彙總4_dgv.Rows(i).Cells("上繳源").Value.ToString = 流水帳_dgv.Rows(ii).Cells("老闆").Value.ToString And
+                    彙總4_dgv.Rows(i).Cells("商品").Value.ToString = 流水帳_dgv.Rows(ii).Cells("商品").Value.ToString And
+                    彙總4_dgv.Rows(i).Cells("帳號").Value.ToString = 流水帳_dgv.Rows(ii).Cells("客帳").Value.ToString Then
+                    彙總4_dgv.Rows(i).Cells("天帳").Value = Val(彙總4_dgv.Rows(i).Cells("天帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("天帳1").Value)
+                    彙總4_dgv.Rows(i).Cells("地帳").Value = Val(彙總4_dgv.Rows(i).Cells("地帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("地帳1").Value)
+                    彙總4_dgv.Rows(i).Cells("個人所得").Value = Val(彙總4_dgv.Rows(i).Cells("個人所得").Value) + Val(流水帳_dgv.Rows(ii).Cells("個人所得1").Value)
+                    彙總4_dgv.Rows(i).Cells("水差").Value = Val(彙總4_dgv.Rows(i).Cells("水差").Value) + Val(流水帳_dgv.Rows(ii).Cells("水差1").Value)
+                End If
+            Next
+
+            彙總4_dgv.Rows(i).Cells("核帳").Value = Val(彙總4_dgv.Rows(i).Cells("天帳").Value) + Val(彙總4_dgv.Rows(i).Cells("地帳").Value) +
+                                                     Val(彙總4_dgv.Rows(i).Cells("個人所得").Value)
+
+            彙總4_dgv.Rows(i).Cells("天帳").Value = Strings.Format(Val(彙總4_dgv.Rows(i).Cells("天帳").Value), "#,##0")
+            彙總4_dgv.Rows(i).Cells("地帳").Value = Strings.Format(Val(彙總4_dgv.Rows(i).Cells("地帳").Value), "#,##0")
+            彙總4_dgv.Rows(i).Cells("個人所得").Value = Strings.Format(Val(彙總4_dgv.Rows(i).Cells("個人所得").Value), "#,##0")
+            彙總4_dgv.Rows(i).Cells("水差").Value = Strings.Format(Val(彙總4_dgv.Rows(i).Cells("水差").Value), "#,##0")
+            彙總4_dgv.Rows(i).Cells("核帳").Value = Strings.Format(Val(彙總4_dgv.Rows(i).Cells("核帳").Value), "#,##0")
+        Next
+    End Sub
+    Private Sub Set_流水帳清單7()
+        彙總5_dgv.DataSource = Nothing : ds11.Clear() : 彙總5_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        彙總5_dgv.ColumnHeadersHeight = 25
+        彙總5_dgv.AllowUserToAddRows = False
+        SQL_彙總查詢5()
+        da.Fill(ds11) : 彙總5_dgv.DataSource = ds11.Tables(0) : conn.Close()
+
+        彙總5_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
+        彙總5_dgv.Columns(0).FillWeight = 80 : 彙總5_dgv.Columns(1).FillWeight = 90 : 彙總5_dgv.Columns(2).FillWeight = 80
+        彙總5_dgv.Columns(3).FillWeight = 80 : 彙總5_dgv.Columns(4).FillWeight = 130 : 彙總5_dgv.Columns(5).Visible = False
+        彙總5_dgv.Columns("應收").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+        合計_tb.Text = "0"
+        For i As Integer = 0 To 彙總5_dgv.Rows.Count - 1
+            彙總5_dgv.Rows(i).Cells("應收").Value = "0"
+            For ii As Integer = 0 To 流水帳_dgv.Rows.Count - 1
+                If Strings.Left(流水帳_dgv.Rows(ii).Cells("資料").Value, 2) = "短版" Or Strings.Left(流水帳_dgv.Rows(ii).Cells("資料").Value, 2) = "短板" Then
+                    If 彙總5_dgv.Rows(i).Cells("網址").Value.ToString = 流水帳_dgv.Rows(ii).Cells("網址").Value.ToString And
+                       彙總5_dgv.Rows(i).Cells("商品").Value.ToString = 流水帳_dgv.Rows(ii).Cells("商品").Value.ToString And
+                       彙總5_dgv.Rows(i).Cells("客戶帳號").Value.ToString = 流水帳_dgv.Rows(ii).Cells("客帳").Value.ToString Then
+                        If 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "總監" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("總監小計s").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "大股東" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("大股東小計s").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "股東" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("股東小計s").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "總代理" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("總代理小計s").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "代理" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("代理小計s").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "會員" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("客戶小計s").Value)
+                        End If
+                    End If
+                ElseIf Strings.Left(流水帳_dgv.Rows(iI).Cells("資料").Value, 2) = "長板" Or Strings.Left(流水帳_dgv.Rows(iI).Cells("資料").Value, 2) = "長版" Then
+                    If 彙總5_dgv.Rows(i).Cells("網址").Value.ToString = 流水帳_dgv.Rows(ii).Cells("網址").Value.ToString And
+                       彙總5_dgv.Rows(i).Cells("商品").Value.ToString = 流水帳_dgv.Rows(ii).Cells("商品").Value.ToString And
+                       彙總5_dgv.Rows(i).Cells("客戶帳號").Value.ToString = 流水帳_dgv.Rows(ii).Cells("客帳").Value.ToString Then
+                        If 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "總監" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("總監").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "大股東" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("大股東").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "股東" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("股東").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "總代理" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("總代理").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "代理" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("代理").Value)
+                        ElseIf 彙總5_dgv.Rows(i).Cells("基數").Value.ToString = "會員" Then
+                            彙總5_dgv.Rows(i).Cells("應收").Value = Val(彙總5_dgv.Rows(i).Cells("應收").Value) + Val(流水帳_dgv.Rows(ii).Cells("會員").Value)
+                        End If
+                    End If
+                End If
+            Next
+            合計_tb.Text = Val(合計_tb.Text) + Val(彙總5_dgv.Rows(i).Cells("應收").Value)
+            彙總5_dgv.Rows(i).Cells("應收").Value = Strings.Format(Val(彙總5_dgv.Rows(i).Cells("應收").Value), "#,##0")
+        Next
+        合計_tb.Text = Strings.Format(Val(合計_tb.Text), "#,##0")
+    End Sub
+    Private Sub Set_客戶名稱()
+        客戶_dgv.DataSource = Nothing : ds5.Clear() : 客戶_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        客戶_dgv.ColumnHeadersHeight = 25
+        客戶_dgv.AllowUserToAddRows = False
+        SQL_客戶下名稱()
+        da.Fill(ds5) : 客戶_dgv.DataSource = ds5.Tables(0) : conn.Close()
+        客戶_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
+    End Sub
     Private Sub Set_LOG1()
-        LOG1_dgv.DataSource = Nothing : ds5.Clear() : LOG1_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        LOG1_dgv.DataSource = Nothing : ds10.Clear() : LOG1_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         LOG1_dgv.ColumnHeadersHeight = 25
         LOG1_dgv.AllowUserToAddRows = False
         SQL_LOG查詢1()
-        da.Fill(ds5) : LOG1_dgv.DataSource = ds5.Tables(0) : conn.Close()
+        da.Fill(ds10) : LOG1_dgv.DataSource = ds10.Tables(0) : conn.Close()
         LOG1_dgv.Columns(0).FillWeight = 35 : LOG1_dgv.Columns(2).FillWeight = 90 : LOG1_dgv.Columns(3).FillWeight = 75 : LOG1_dgv.Columns(4).Visible = False
         LOG1_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
         For I As Integer = 0 To LOG1_dgv.Rows.Count - 1
@@ -398,13 +546,19 @@ Public Class 流水帳查詢
     End Sub
     Private Sub 流水帳查詢_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = GA_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+
         天_ch.Checked = False : 周_ch.Checked = True : 月_ch.Checked = False : DA1_bt.Text = "上週" : DA2_bt.Text = "本週" : DA3_bt.Text = "下週"
-        LOG檔_GUP.Visible = False : 流水帳1_dgv.Visible = False : 客戶下_dgv.Visible = False
-        Set_客戶下清單() : Set_日期清單() : SQL_流水帳上繳()
+        L50.Visible = False : 客戶下_dgv.Visible = False : L6.Visible = True
+        彙總_dgv.Visible = False : 彙總1_dgv.Visible = True : 彙總2_dgv.Visible = True : 彙總3_dgv.Visible = True : 彙總4_dgv.Visible = False
+        L1.Visible = True : L2.Visible = True : L3.Visible = True : L4.Visible = True : L5.Visible = True : 老闆_tb.Visible = True : 所得1_tb.Visible = True
+        天帳1_tb.Visible = True : 地帳1_tb.Visible = True : 客戶_dgv.Visible = True : 彙總5_dgv.Visible = True : 客戶_tb.Visible = True : 合計_tb.Visible = True
+
+        Set_客戶名稱() : Set_客戶下清單() : Set_日期清單() : SQL_流水帳上繳()
         老闆_cb.Items.Clear() : 老闆_cb.Items.Add("") : While (dr.Read()) : 老闆_cb.Items.Add(dr("上繳源")) : End While : conn.Close()
         SQL_流水帳商品()
         商品_cb.Items.Clear() : 商品_cb.Items.Add("") : While (dr.Read()) : 商品_cb.Items.Add(dr("商品")) : End While : conn.Close()
-        彙總_dgv.Visible = True : 彙總1_dgv.Visible = False : 彙總2_dgv.Visible = False : 資料_cb.SelectedIndex = 0
+        資料_cb.SelectedIndex = 0
+
         Set_流水帳清單1()
         If CC(8) = False Then
             Delete_bT.Enabled = False
@@ -417,6 +571,18 @@ Public Class 流水帳查詢
             End If
         End If
     End Sub
+    Private Sub 彙總2_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 彙總2_dgv.CellClick
+        If e.RowIndex = -1 Then : Else
+            老闆_tb.Text = 彙總2_dgv("老闆", e.RowIndex).Value.ToString : Set_流水帳清單5() : Set_流水帳清單6()
+            所得1_tb.Text = 彙總2_dgv("個人所得", e.RowIndex).Value.ToString
+            天帳1_tb.Text = 彙總2_dgv("天帳", e.RowIndex).Value.ToString : 地帳1_tb.Text = 彙總2_dgv("地帳", e.RowIndex).Value.ToString
+        End If
+    End Sub
+    Private Sub 客戶_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 客戶_dgv.CellClick
+        If e.RowIndex = -1 Then : Else
+            客戶_tb.Text = 客戶_dgv("客戶", e.RowIndex).Value.ToString : Set_流水帳清單7()
+        End If
+    End Sub
     Private Sub 流水帳_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 流水帳_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             If 使用網址_ch.Checked = True Then
@@ -455,6 +621,20 @@ Public Class 流水帳查詢
             End If
         End If
     End Sub
+    Private Sub 彙總4_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 彙總4_dgv.RowPostPaint
+        Dim linePen As New Pen(Color.Blue, 2)
+        If e.RowIndex = 彙總4_dgv.Rows.Count - 1 Then
+            Exit Sub
+        Else
+            If 彙總4_dgv(0, e.RowIndex).Value.ToString <> 彙總4_dgv(0, e.RowIndex + 1).Value.ToString Then
+                Dim startX As Integer = IIf(彙總4_dgv.RowHeadersVisible, 彙總4_dgv.RowHeadersWidth, 0)
+                Dim startY As Integer = e.RowBounds.Top + e.RowBounds.Height - 1
+                Dim endX As Integer = startX + 彙總4_dgv.Columns.GetColumnsWidth(DataGridViewElementStates.Visible) - 彙總4_dgv.HorizontalScrollingOffset
+                e.Graphics.DrawLine(linePen, startX, startY, endX, startY)
+                Exit Sub
+            End If
+        End If
+    End Sub
     Private Sub 流水帳_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 流水帳_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
         If e.RowIndex = 流水帳_dgv.Rows.Count - 1 Then
@@ -489,6 +669,21 @@ Public Class 流水帳查詢
             e.CellStyle.ForeColor = Color.Red
         End If
     End Sub
+    Private Sub 彙總3_dgv_CellFormatting(sender As Object, e As DataGridViewCellFormattingEventArgs) Handles 彙總3_dgv.CellFormatting
+        If IsNumeric(Val(e.Value.ToString)) = True And Val(e.Value.ToString) < 0 Then
+            e.CellStyle.ForeColor = Color.Red
+        End If
+    End Sub
+    Private Sub 彙總4_dgv_CellFormatting(sender As Object, e As DataGridViewCellFormattingEventArgs) Handles 彙總4_dgv.CellFormatting
+        If IsNumeric(Val(e.Value.ToString)) = True And Val(e.Value.ToString) < 0 Then
+            e.CellStyle.ForeColor = Color.Red
+        End If
+    End Sub
+    Private Sub 彙總5_dgv_CellFormatting(sender As Object, e As DataGridViewCellFormattingEventArgs) Handles 彙總5_dgv.CellFormatting
+        If IsNumeric(Val(e.Value.ToString)) = True And Val(e.Value.ToString) < 0 Then
+            e.CellStyle.ForeColor = Color.Red
+        End If
+    End Sub
     Private Sub 資料_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 資料_cb.SelectedIndexChanged
         Set_流水帳清單1()
     End Sub
@@ -497,15 +692,15 @@ Public Class 流水帳查詢
     End Sub
     Private Sub 天_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 天_ch.Click
         天_ch.Checked = True : 周_ch.Checked = False : 月_ch.Checked = False : DA2_bt.PerformClick()
-        DA1_bt.Text = "上一天" : DA2_bt.Text = "今天" : DA3_bt.Text = "下一天" : 重讀_bt.PerformClick()
+        DA1_bt.Text = "上一天" : DA2_bt.Text = "今天" : DA3_bt.Text = "下一天" : Set_日期清單() : 重讀_bt.PerformClick()
     End Sub
     Private Sub 周_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 周_ch.Click
         天_ch.Checked = False : 周_ch.Checked = True : 月_ch.Checked = False : DA2_bt.PerformClick()
-        DA1_bt.Text = "上一週" : DA2_bt.Text = "本週" : DA3_bt.Text = "下一週" : 重讀_bt.PerformClick()
+        DA1_bt.Text = "上一週" : DA2_bt.Text = "本週" : DA3_bt.Text = "下一週" : Set_日期清單() : 重讀_bt.PerformClick()
     End Sub
     Private Sub 月_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 月_ch.Click
         天_ch.Checked = False : 周_ch.Checked = False : 月_ch.Checked = True : DA2_bt.PerformClick()
-        DA1_bt.Text = "上一月" : DA2_bt.Text = "本月" : DA3_bt.Text = "下一月" : 重讀_bt.PerformClick()
+        DA1_bt.Text = "上一月" : DA2_bt.Text = "本月" : DA3_bt.Text = "下一月" : Set_日期清單() : 重讀_bt.PerformClick()
     End Sub
     Private Sub DA1_bt_Click(sender As Object, e As EventArgs) Handles DA1_bt.Click
         If 天_ch.Checked = True Then
@@ -567,28 +762,42 @@ Public Class 流水帳查詢
         End If
     End Sub
     Private Sub Delete_bTlick(sender As Object, e As EventArgs) Handles Delete_bT.Click
-        Set_客戶下清單() : SQL_LOG_刪除() : SQL_流水帳_清除() : Set_日期清單()
+        Set_客戶名稱() : Set_客戶下清單() : SQL_LOG_刪除() : SQL_流水帳_清除() : Set_日期清單()
         SQL_流水帳上繳()
         老闆_cb.Items.Clear() : 老闆_cb.Items.Add("") : While (dr.Read()) : 老闆_cb.Items.Add(dr("上繳源")) : End While : conn.Close()
         SQL_流水帳商品()
         商品_cb.Items.Clear() : 商品_cb.Items.Add("") : While (dr.Read()) : 商品_cb.Items.Add(dr("商品")) : End While : conn.Close()
-        彙總_dgv.Visible = True : 彙總1_dgv.Visible = False : 彙總2_dgv.Visible = False : 資料_cb.SelectedIndex = 0
+        資料_cb.SelectedIndex = 0
         Set_流水帳清單1()
     End Sub
     Private Sub 重讀_bt_Click(sender As Object, e As EventArgs) Handles 重讀_bt.Click
-        Set_客戶下清單() : Set_日期清單()
+        Set_客戶名稱() : Set_客戶下清單()
         SQL_流水帳上繳()
         老闆_cb.Items.Clear() : 老闆_cb.Items.Add("") : While (dr.Read()) : 老闆_cb.Items.Add(dr("上繳源")) : End While : conn.Close()
         SQL_流水帳商品()
         商品_cb.Items.Clear() : 商品_cb.Items.Add("") : While (dr.Read()) : 商品_cb.Items.Add(dr("商品")) : End While : conn.Close()
-        彙總_dgv.Visible = True : 彙總1_dgv.Visible = False : 彙總2_dgv.Visible = False : 資料_cb.SelectedIndex = 0
         Set_流水帳清單1()
     End Sub
     Private Sub RadioButton1_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton1.CheckedChanged
-        彙總_dgv.Visible = True : 彙總1_dgv.Visible = False : 彙總2_dgv.Visible = False
+        彙總_dgv.Visible = True : 彙總1_dgv.Visible = False : 彙總2_dgv.Visible = False : 彙總3_dgv.Visible = False : 彙總4_dgv.Visible = False
+        L1.Visible = False : L2.Visible = False : L3.Visible = False : L4.Visible = False : L5.Visible = False : L6.Visible = False
+        老闆_tb.Visible = False : 所得1_tb.Visible = False : 合計_tb.Visible = False
+        天帳1_tb.Visible = False : 地帳1_tb.Visible = False : 客戶_dgv.Visible = False : 彙總5_dgv.Visible = False : 客戶_tb.Visible = False
     End Sub
     Private Sub RadioButton2_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton2.CheckedChanged
-        彙總_dgv.Visible = False : 彙總1_dgv.Visible = True : 彙總2_dgv.Visible = True
+        彙總_dgv.Visible = False : 彙總1_dgv.Visible = True : 彙總2_dgv.Visible = True : 彙總3_dgv.Visible = True : 彙總4_dgv.Visible = False
+        L1.Visible = True : L2.Visible = True : L3.Visible = True : L4.Visible = True : L5.Visible = True : L6.Visible = True
+        老闆_tb.Visible = True : 所得1_tb.Visible = True : 合計_tb.Visible = True
+        天帳1_tb.Visible = True : 地帳1_tb.Visible = True : 客戶_dgv.Visible = True : 彙總5_dgv.Visible = True : 客戶_tb.Visible = True
+    End Sub
+    Private Sub RadioButton3_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton3.CheckedChanged
+        彙總_dgv.Visible = False : 彙總1_dgv.Visible = True : 彙總2_dgv.Visible = True : 彙總3_dgv.Visible = True : 彙總4_dgv.Visible = True
+        L1.Visible = True : L2.Visible = True : L3.Visible = True : L4.Visible = True : L5.Visible = False : L6.Visible = False
+        老闆_tb.Visible = True : 所得1_tb.Visible = True : 合計_tb.Visible = False
+        天帳1_tb.Visible = True : 地帳1_tb.Visible = True : 客戶_dgv.Visible = False : 彙總5_dgv.Visible = False : 客戶_tb.Visible = False
+    End Sub
+    Private Sub 客戶資料_bt_Click(sender As Object, e As EventArgs) Handles 客戶資料_bt.Click
+        If 客戶下_dgv.Visible = False Then : 客戶下_dgv.Visible = True : 客戶下_dgv.BringToFront() : Else : 客戶下_dgv.Visible = False : End If
     End Sub
     Private Sub 商品_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 商品_cb.SelectedIndexChanged
         Set_流水帳清單1()
@@ -652,15 +861,16 @@ Public Class 流水帳查詢
         GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
     End Sub
     Private Sub LOG檔_bt_Click(sender As Object, e As EventArgs) Handles LOG檔_bt.Click
-        If LOG檔_GUP.Visible = False Then : LOG檔_GUP.Visible = True : Else : LOG檔_GUP.Visible = False : End If
+        If L50.Visible = False Then : L50.Visible = True : Else : L50.Visible = False : End If
     End Sub
     Private Sub R_bT_Click(sender As Object, e As EventArgs) Handles R_bT.Click
         SQL_SQL_自動導入判斷_關閉()
     End Sub
     Private Sub 重新導入_bt_Click(sender As Object, e As EventArgs) Handles 重新導入_bt.Click
+        RadioButton1.Checked = True : RadioButton2.Checked = False : RadioButton3.Checked = False
         Dim 執行 As Boolean
         For i As Integer = 0 To 彙總_dgv.Rows.Count - 1
-            If 彙總_dgv.Rows(i).Cells("狀態").Value.ToString = "X" Then
+            If 彙總_dgv.Rows(i).Cells("狀態").Value.ToString = "X" Or 彙總_dgv.Rows(i).Cells("狀態").Value.ToString = "NA" Then
                 PA1 = 彙總_dgv.Rows(i).Cells("網址").Value.ToString : PA2 = 彙總_dgv.Rows(i).Cells("帳號").Value.ToString
                 PA3 = 彙總_dgv.Rows(i).Cells("密碼").Value.ToString : SQL_商客資料暫存檔_新增() : 執行 = True
             End If
@@ -674,7 +884,7 @@ Public Class 流水帳查詢
                 Else
                     conn.Close() : dr.Close() : SQL_SQL_自動導入判斷_開啟()
                     PA1 = Strings.Format(開始日期_dtp.Value, "yyyy-MM-dd") : PA2 = Strings.Format(結束日期_dtp.Value, "yyyy-MM-dd")
-                    SQL_查詢日期清空() : SQL_LOG_刪除2() : SQL_查詢日期寫入1()
+                    SQL_查詢日期清空() : SQL_LOG_刪除1() : SQL_查詢日期寫入1()
                     If File.Exists("000.csv") Then
                         File.Delete("000.csv")
                     End If
@@ -703,13 +913,9 @@ Public Class 流水帳查詢
             MsgBox("沒有需要重新導入的網址與帳號!!")
         End If
     End Sub
-    Private Sub 明細合併_bt_Click(sender As Object, e As EventArgs) Handles 明細合併_bt.Click
-        If 流水帳1_dgv.Visible = False Then : 流水帳1_dgv.Visible = True : Else : 流水帳1_dgv.Visible = False : End If
-    End Sub
-    Private Sub 客戶資料_bt_Click(sender As Object, e As EventArgs) Handles 客戶資料_bt.Click
-        If 客戶下_dgv.Visible = False Then : 客戶下_dgv.Visible = True : Else : 客戶下_dgv.Visible = False : End If
-    End Sub
+
     Private Sub 商客新增_bt_Click(sender As Object, e As EventArgs) Handles 商客新增_bt.Click
+        RadioButton1.Checked = True : RadioButton2.Checked = False : RadioButton3.Checked = False
         SQL_自動導入判斷()
         If dr.Read() Then
             If dr("正在自動導入中").ToString = "YES" Then
@@ -758,10 +964,12 @@ Public Class 流水帳查詢
                     File.Delete(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv")
                 End If
                 LOG檔.ShowDialog() : SQL_SQL_自動導入判斷_關閉() : SQL_查詢日期清空() : SQL_商客資料暫存檔_刪除() : 重讀_bt.PerformClick()
+                存檔_bt.PerformClick()
             End If
         End If
     End Sub
     Private Sub 批次導入_bt_Click(sender As Object, e As EventArgs) Handles 批次導入_bt.Click
+        RadioButton1.Checked = True : RadioButton2.Checked = False : RadioButton3.Checked = False
         批次 = 0 : Timer2.Enabled = True
     End Sub
     Private Sub 清除_bt_Click(sender As Object, e As EventArgs) Handles 清除_bt.Click
@@ -784,6 +992,7 @@ Public Class 流水帳查詢
                     Timer2.Enabled = False
                     SQL_SQL_自動導入判斷_關閉() : SQL_查詢日期清空()
                     MsgBox("批量自動導入 " & 批次 - 1 & " 次，完成!!!") : conn.Close() : dr.Close() : 重讀_bt.PerformClick()
+                    存檔_bt.PerformClick()
                 Else
                     conn.Close() : dr.Close() : SQL_SQL_自動導入判斷_開啟()
                     PA1 = Strings.Format(開始日期_dtp.Value, "yyyy-MM-dd") : PA2 = Strings.Format(結束日期_dtp.Value, "yyyy-MM-dd")
@@ -830,8 +1039,21 @@ Public Class 流水帳查詢
         Else : xlApp.Sheets("sheet2").Select : xlApp.Sheets("sheet2").Name = "應收帳款" : End If
         xlBook.Activate()
         xlSheet.Activate()
-
-
+        NN2 = 0 : DD(xlApp, xlSheet)
+        For i As Integer = 0 To 客戶_dgv.Rows.Count - 1
+            客戶_tb.Text = 客戶_dgv("客戶", i).Value.ToString : Set_流水帳清單7()
+            NN1 = 0
+            xlSheet.Cells(1, 1 + NN2) = Strings.Right(Strings.Format(開始日期_dtp.Value, "yyyy/MM/dd"), 5) & "~" & Strings.Right(Strings.Format(結束日期_dtp.Value, "yyyy/MM/dd"), 5)
+            xlSheet.Cells(1, 2 + NN2) = 客戶_tb.Text
+            For ii As Integer = 0 To 彙總5_dgv.Rows.Count - 1
+                xlSheet.Cells(2 + ii, 1 + NN2) = 彙總5_dgv.Rows(ii).Cells("商品").Value : xlSheet.Cells(2 + ii, 2 + NN2) = 彙總5_dgv.Rows(ii).Cells("應收").Value
+                NN1 = ii + 4
+            Next
+            xlSheet.Cells(1 + NN1, 1 + NN2) = "前期" : xlSheet.Cells(1 + NN1 + 1, 1 + NN2) = "已收"
+            xlSheet.Cells(1 + NN1 + 2, 1 + NN2) = "合計" : xlSheet.Cells(1 + NN1 + 2, 2 + NN2) = 合計_tb.Text
+            EE(xlApp, xlSheet) : NN2 += 3
+        Next
+        FF(xlApp, xlSheet)
         '-------------------------------------------------------------------------------------------------------------------------------------------------------------------
         xlSheet = NewMethod(xlBook)
         If xlApp.Sheets(1).Name = "工作表3" Then : xlApp.Sheets("工作表3").Select : xlApp.Sheets("工作表3").Name = "應付帳款"
@@ -847,23 +1069,30 @@ Public Class 流水帳查詢
             xlSheet.Cells(2 + I, 5) = 彙總2_dgv.Rows(I).Cells("核帳").Value
             N1 = I + 2
         Next
-        xlSheet.Cells(1, 7) = "商品" : xlSheet.Cells(1, 8) = "應收" : xlSheet.Cells(1, 9) = "應付" : xlSheet.Cells(1, 10) = "個人所得" : xlSheet.Cells(1, 11) = "核帳"
-        For I As Integer = 0 To 彙總1_dgv.Rows.Count - 1
-            xlSheet.Cells(2 + I, 7) = 彙總1_dgv.Rows(I).Cells("商品").Value : xlSheet.Cells(2 + I, 8) = 彙總1_dgv.Rows(I).Cells("天帳").Value
-            xlSheet.Cells(2 + I, 9) = 彙總1_dgv.Rows(I).Cells("地帳").Value : xlSheet.Cells(2 + I, 10) = 彙總1_dgv.Rows(I).Cells("個人所得").Value
-            xlSheet.Cells(2 + I, 11) = 彙總1_dgv.Rows(I).Cells("核帳").Value
-            N2 = I + 2
-        Next
-        xlSheet.Cells(1, 13) = "商品" : xlSheet.Cells(1, 14) = "老闆" : xlSheet.Cells(1, 15) = "網址" : xlSheet.Cells(1, 16) = "帳號"
-        xlSheet.Cells(1, 17) = "應收" : xlSheet.Cells(1, 18) = "應付" : xlSheet.Cells(1, 19) = "個人所得" : xlSheet.Cells(1, 20) = "核帳"
-        For I As Integer = 0 To 彙總1_dgv.Rows.Count - 1
-            xlSheet.Cells(2 + I, 13) = 彙總_dgv.Rows(I).Cells("商品").Value : xlSheet.Cells(2 + I, 14) = 彙總_dgv.Rows(I).Cells("老闆").Value
-            xlSheet.Cells(2 + I, 15) = 彙總_dgv.Rows(I).Cells("網址").Value : xlSheet.Cells(2 + I, 16) = 彙總_dgv.Rows(I).Cells("帳號").Value
-            xlSheet.Cells(2 + I, 17) = 彙總_dgv.Rows(I).Cells("天帳").Value : xlSheet.Cells(2 + I, 18) = 彙總_dgv.Rows(I).Cells("地帳").Value
-            xlSheet.Cells(2 + I, 19) = 彙總_dgv.Rows(I).Cells("個人所得").Value : xlSheet.Cells(2 + I, 20) = 彙總_dgv.Rows(I).Cells("核帳").Value
-            N3 = I + 2
+        NN2 = 0
+        For i As Integer = 0 To 彙總2_dgv.Rows.Count - 1
+            老闆_tb.Text = 彙總2_dgv("老闆", i).Value.ToString : Set_流水帳清單5() : Set_流水帳清單6()
+            所得1_tb.Text = 彙總2_dgv("個人所得", i).Value.ToString
+            天帳1_tb.Text = 彙總2_dgv("天帳", i).Value.ToString : 地帳1_tb.Text = 彙總2_dgv("地帳", i).Value.ToString
+
+            NN1 = 0
+            xlSheet.Cells(1, 7 + NN2) = Strings.Right(Strings.Format(開始日期_dtp.Value, "yyyy/MM/dd"), 5) & "~" & Strings.Right(Strings.Format(結束日期_dtp.Value, "yyyy/MM/dd"), 5)
+            xlSheet.Cells(1, 8 + NN2) = 老闆_tb.Text
+            For ii As Integer = 0 To 彙總3_dgv.Rows.Count - 1
+                xlSheet.Cells(2 + ii, 7 + NN2) = 彙總3_dgv.Rows(ii).Cells("商品").Value : xlSheet.Cells(2 + ii, 8 + NN2) = 彙總3_dgv.Rows(ii).Cells("天帳").Value
+                NN1 = ii + 4
+            Next
+            xlSheet.Cells(1 + NN1, 7 + NN2) = "已付" : xlSheet.Cells(1 + NN1 + 1, 7 + NN2) = "前期"
+            xlSheet.Cells(1 + NN1 + 2, 7 + NN2) = "合計" : xlSheet.Cells(1 + NN1 + 2, 8 + NN2) = 天帳1_tb.Text
+            GG(xlApp, xlSheet) : NN2 += 3
         Next
-        BB(xlApp, xlSheet)
+        BB(xlApp, xlSheet) : FF(xlApp, xlSheet)
+
+        If xlApp.Sheets(3).Name = "工作表1" Then
+            xlApp.Sheets("工作表1").Delete
+        Else
+            xlApp.Sheets("sheet1").Delete
+        End If
 
         xlSheet.PageSetup.PrintArea = ""
         xlApp.Cells.Select()
@@ -879,19 +1108,12 @@ Public Class 流水帳查詢
         With myExcel.Selection.Font : .Name = "微軟正黑體" : .Size = 10 : .Strikethrough = False : .Superscript = False : .Subscript = False : .OutlineFont = False
             .Shadow = False : .Underline = xlUnderlineStyleNone : .ThemeColor = xlThemeColorLight1 : .TintAndShade = 0 : .ThemeFont = xlThemeFontNone
         End With
+        myExcel.Selection.ColumnWidth = 1
+
         xlSheet.Columns("A:A").Select
         With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
-        xlSheet.Columns("G:G").Select
-        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
-        xlSheet.Columns("M:M").Select
-        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
-        xlSheet.Columns("N:N").Select
-        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
-            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
-        xlSheet.Range("A1:T1").Select()
+        xlSheet.Range("A1:E1").Select()
         With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
 
@@ -905,30 +1127,9 @@ Public Class 流水帳查詢
         With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic
             .ThemeColor = xlThemeColorAccent1 : .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
-        xlSheet.Range("G1:K1").Select()
-        myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
-        With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlEdgeBottom) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlEdgeRight) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlInsideVertical) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic
-            .ThemeColor = xlThemeColorAccent1 : .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
-        xlSheet.Range("M1:T1").Select()
-        myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
-        With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlEdgeBottom) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlEdgeRight) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlInsideVertical) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic
-            .ThemeColor = xlThemeColorAccent1 : .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
     End Sub
     Private Sub BB(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
-        xlSheet.Columns("A:T").Select
-        xlSheet.Columns("A:T").EntireColumn.AutoFit
+        xlSheet.Columns("A:E").Select
         xlSheet.Range("A2:E" & N1).Select()
         myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -941,8 +1142,47 @@ Public Class 流水帳查詢
         xlSheet.Range("A2:A" & N1).Select()
         With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535
             .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
+    End Sub
+    Private Sub DD(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
+        xlSheet.Cells.Select()
+        With myExcel.Selection.Font : .Name = "微軟正黑體" : .Size = 10 : .Strikethrough = False : .Superscript = False : .Subscript = False
+            .OutlineFont = False : .Shadow = False : .Underline = xlUnderlineStyleNone : .ThemeColor = xlThemeColorLight1 : .TintAndShade = 0
+            .ThemeFont = xlThemeFontNone : End With
+        myExcel.Selection.ColumnWidth = 1
+    End Sub
+    Private Sub EE(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
+        If NN2 = 0 Then : 第一 = "A" : 第二 = "B" : ElseIf NN2 = 3 Then : 第一 = "D" : 第二 = "E" : ElseIf NN2 = 6 Then : 第一 = "G" : 第二 = "H"
+        ElseIf NN2 = 9 Then : 第一 = "J" : 第二 = "K" : ElseIf NN2 = 12 Then : 第一 = "M" : 第二 = "N" : ElseIf NN2 = 15 Then : 第一 = "P" : 第二 = "Q"
+        ElseIf NN2 = 18 Then : 第一 = "S" : 第二 = "T" : ElseIf NN2 = 21 Then : 第一 = "V" : 第二 = "W" : ElseIf NN2 = 24 Then : 第一 = "Y" : 第二 = "Z"
+        ElseIf NN2 = 27 Then : 第一 = "AB" : 第二 = "AC" : ElseIf NN2 = 30 Then : 第一 = "AE" : 第二 = "AF" : ElseIf NN2 = 33 Then : 第一 = "AH" : 第二 = "AI"
+        ElseIf NN2 = 36 Then : 第一 = "AK" : 第二 = "AL" : ElseIf NN2 = 39 Then : 第一 = "AN" : 第二 = "AO" : ElseIf NN2 = 42 Then : 第一 = "AQ" : 第二 = "AR"
+        ElseIf NN2 = 45 Then : 第一 = "AT" : 第二 = "AU" : ElseIf NN2 = 48 Then : 第一 = "AW" : 第二 = "AX" : ElseIf NN2 = 51 Then : 第一 = "AZ" : 第二 = "BA"
+        ElseIf NN2 = 54 Then : 第一 = "BC" : 第二 = "BD" : ElseIf NN2 = 57 Then : 第一 = "BF" : 第二 = "BG" : ElseIf NN2 = 60 Then : 第一 = "BI" : 第二 = "BJ"
+        ElseIf NN2 = 63 Then : 第一 = "BL" : 第二 = "BM" : ElseIf NN2 = 66 Then : 第一 = "BO" : 第二 = "BP" : ElseIf NN2 = 69 Then : 第一 = "BR" : 第二 = "BS"
+        ElseIf NN2 = 72 Then : 第一 = "BU" : 第二 = "BV" : ElseIf NN2 = 75 Then : 第一 = "BX" : 第二 = "BY" : ElseIf NN2 = 78 Then : 第一 = "CA" : 第二 = "CB"
+        ElseIf NN2 = 81 Then : 第一 = "CD" : 第二 = "CE" : ElseIf NN2 = 84 Then : 第一 = "CG" : 第二 = "CH" : ElseIf NN2 = 87 Then : 第一 = "CJ" : 第二 = "CK"
+        ElseIf NN2 = 90 Then : 第一 = "CM" : 第二 = "CN" : ElseIf NN2 = 93 Then : 第一 = "CP" : 第二 = "CQ" : ElseIf NN2 = 96 Then : 第一 = "CS" : 第二 = "CT"
+        ElseIf NN2 = 99 Then : 第一 = "CV" : 第二 = "CW" : ElseIf NN2 = 102 Then : 第一 = "CY" : 第二 = "CZ" : ElseIf NN2 = 105 Then : 第一 = "DB" : 第二 = "DC"
+        ElseIf NN2 = 108 Then : 第一 = "DE" : 第二 = "DF" : ElseIf NN2 = 111 Then : 第一 = "DH" : 第二 = "DI" : ElseIf NN2 = 114 Then : 第一 = "DK" : 第二 = "DL"
+        ElseIf NN2 = 117 Then : 第一 = "DN" : 第二 = "DO" : ElseIf NN2 = 120 Then : 第一 = "DQ" : 第二 = "DR" : ElseIf NN2 = 123 Then : 第一 = "DT" : 第二 = "DU"
+        ElseIf NN2 = 126 Then : 第一 = "DW" : 第二 = "DX" : ElseIf NN2 = 129 Then : 第一 = "DZ" : 第二 = "EA" : ElseIf NN2 = 132 Then : 第一 = "EC" : 第二 = "ED"
+        ElseIf NN2 = 135 Then : 第一 = "EF" : 第二 = "EG" : ElseIf NN2 = 138 Then : 第一 = "EI" : 第二 = "EJ" : ElseIf NN2 = 141 Then : 第一 = "EL" : 第二 = "EM"
+        ElseIf NN2 = 144 Then : 第一 = "EO" : 第二 = "EP" : ElseIf NN2 = 147 Then : 第一 = "ER" : 第二 = "ES" : ElseIf NN2 = 150 Then : 第一 = "EU" : 第二 = "EV"
+        ElseIf NN2 = 153 Then : 第一 = "EX" : 第二 = "EY" : ElseIf NN2 = 156 Then : 第一 = "FA" : 第二 = "FB" : ElseIf NN2 = 159 Then : 第一 = "FD" : 第二 = "FE"
+        ElseIf NN2 = 162 Then : 第一 = "FG" : 第二 = "FH" : ElseIf NN2 = 165 Then : 第一 = "FJ" : 第二 = "FK" : ElseIf NN2 = 168 Then : 第一 = "FM" : 第二 = "FN"
+        ElseIf NN2 = 171 Then : 第一 = "FP" : 第二 = "FQ" : ElseIf NN2 = 174 Then : 第一 = "FS" : 第二 = "FT" : ElseIf NN2 = 177 Then : 第一 = "FV" : 第二 = "FW"
+        ElseIf NN2 = 180 Then : 第一 = "FY" : 第二 = "FZ" : ElseIf NN2 = 183 Then : 第一 = "GB" : 第二 = "GC" : ElseIf NN2 = 186 Then : 第一 = "GE" : 第二 = "GF"
+        ElseIf NN2 = 189 Then : 第一 = "GH" : 第二 = "GI" : ElseIf NN2 = 192 Then : 第一 = "GK" : 第二 = "GL" : ElseIf NN2 = 195 Then : 第一 = "GN" : 第二 = "GO"
+        ElseIf NN2 = 198 Then : 第一 = "GQ" : 第二 = "GR" : ElseIf NN2 = 201 Then : 第一 = "GT" : 第二 = "GU" : ElseIf NN2 = 204 Then : 第一 = "GW" : 第二 = "GX"
+        ElseIf NN2 = 207 Then : 第一 = "GZ" : 第二 = "HA" : End If
 
-        xlSheet.Range("G2:K" & N2).Select()
+        xlSheet.Columns(第一 & ":" & 第一).Select
+        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
+            .IndentLevel = 0 : .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
+        xlSheet.Columns(第二 & ":" & 第二).Select : myExcel.Selection.NumberFormatLocal = "#,##0;[紅色]-#,##0"
+        xlSheet.Range(第一 & "2:" & 第一 & NN1 - 2).Select()
+        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535 : .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
+        xlSheet.Range(第一 & "1:" & 第二 & NN1 + 3).Select()
         myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -950,12 +1190,87 @@ Public Class 流水帳查詢
         With myExcel.Selection.Borders(xlEdgeRight) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlInsideVertical) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
-        xlSheet.Range("G2:G" & N2).Select()
-        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535
-            .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
+    End Sub
+    Private Sub FF(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
+        xlSheet.Cells.Select()
+        myExcel.Cells.EntireColumn.AutoFit()
+    End Sub
+    Private Sub GG(ByVal myExcel As Microsoft.Office.Interop.Excel.Application, ByVal xlSheet As Microsoft.Office.Interop.Excel.Worksheet)
+        If NN2 = 0 Then : 第一 = "G" : 第二 = "H" : ElseIf NN2 = 3 Then : 第一 = "J" : 第二 = "K"
+        ElseIf NN2 = 6 Then : 第一 = "M" : 第二 = "N"
+        ElseIf NN2 = 9 Then : 第一 = "P" : 第二 = "Q"
+        ElseIf NN2 = 12 Then : 第一 = "S" : 第二 = "T"
+        ElseIf NN2 = 15 Then : 第一 = "V" : 第二 = "W"
+        ElseIf NN2 = 18 Then : 第一 = "Y" : 第二 = "Z"
+        ElseIf NN2 = 21 Then : 第一 = "AB" : 第二 = "AC"
+        ElseIf NN2 = 24 Then : 第一 = "AE" : 第二 = "AF"
+        ElseIf NN2 = 27 Then : 第一 = "AH" : 第二 = "AI"
+        ElseIf NN2 = 30 Then : 第一 = "AK" : 第二 = "AL"
+        ElseIf NN2 = 33 Then : 第一 = "AN" : 第二 = "AO"
+        ElseIf NN2 = 36 Then : 第一 = "AQ" : 第二 = "AR"
+        ElseIf NN2 = 39 Then : 第一 = "AT" : 第二 = "AU"
+        ElseIf NN2 = 42 Then : 第一 = "AW" : 第二 = "AX"
+        ElseIf NN2 = 45 Then : 第一 = "AZ" : 第二 = "BA"
+        ElseIf NN2 = 48 Then : 第一 = "BC" : 第二 = "BD"
+        ElseIf NN2 = 51 Then : 第一 = "BF" : 第二 = "BG"
+        ElseIf NN2 = 54 Then : 第一 = "BI" : 第二 = "BJ"
+        ElseIf NN2 = 57 Then : 第一 = "BL" : 第二 = "BM"
+        ElseIf NN2 = 60 Then : 第一 = "BO" : 第二 = "BP"
+        ElseIf NN2 = 63 Then : 第一 = "BR" : 第二 = "BS"
+        ElseIf NN2 = 66 Then : 第一 = "BU" : 第二 = "BV"
+        ElseIf NN2 = 69 Then : 第一 = "BX" : 第二 = "BY"
+        ElseIf NN2 = 72 Then : 第一 = "CA" : 第二 = "CB"
+        ElseIf NN2 = 75 Then : 第一 = "CD" : 第二 = "CE"
+        ElseIf NN2 = 78 Then : 第一 = "CG" : 第二 = "CH"
+        ElseIf NN2 = 81 Then : 第一 = "CJ" : 第二 = "CK"
+        ElseIf NN2 = 84 Then : 第一 = "CM" : 第二 = "CN"
+        ElseIf NN2 = 87 Then : 第一 = "CP" : 第二 = "CQ"
+        ElseIf NN2 = 90 Then : 第一 = "CS" : 第二 = "CT"
+        ElseIf NN2 = 93 Then : 第一 = "CV" : 第二 = "CW"
+        ElseIf NN2 = 96 Then : 第一 = "CY" : 第二 = "CZ"
+        ElseIf NN2 = 99 Then : 第一 = "DB" : 第二 = "DC"
+        ElseIf NN2 = 102 Then : 第一 = "DE" : 第二 = "DF"
+        ElseIf NN2 = 105 Then : 第一 = "DH" : 第二 = "DI"
+        ElseIf NN2 = 108 Then : 第一 = "DK" : 第二 = "DL"
+        ElseIf NN2 = 111 Then : 第一 = "DN" : 第二 = "DO"
+        ElseIf NN2 = 114 Then : 第一 = "DQ" : 第二 = "DR"
+        ElseIf NN2 = 117 Then : 第一 = "DT" : 第二 = "DU"
+        ElseIf NN2 = 120 Then : 第一 = "DW" : 第二 = "DX"
+        ElseIf NN2 = 123 Then : 第一 = "DZ" : 第二 = "EA"
+        ElseIf NN2 = 126 Then : 第一 = "EC" : 第二 = "ED"
+        ElseIf NN2 = 129 Then : 第一 = "EF" : 第二 = "EG"
+        ElseIf NN2 = 132 Then : 第一 = "EI" : 第二 = "EJ"
+        ElseIf NN2 = 135 Then : 第一 = "EL" : 第二 = "EM"
+        ElseIf NN2 = 138 Then : 第一 = "EO" : 第二 = "EP"
+        ElseIf NN2 = 141 Then : 第一 = "ER" : 第二 = "ES"
+        ElseIf NN2 = 144 Then : 第一 = "EU" : 第二 = "EV"
+        ElseIf NN2 = 147 Then : 第一 = "EX" : 第二 = "EY"
+        ElseIf NN2 = 150 Then : 第一 = "FA" : 第二 = "FB"
+        ElseIf NN2 = 153 Then : 第一 = "FD" : 第二 = "FE"
+        ElseIf NN2 = 156 Then : 第一 = "FG" : 第二 = "FH"
+        ElseIf NN2 = 159 Then : 第一 = "FJ" : 第二 = "FK"
+        ElseIf NN2 = 162 Then : 第一 = "FM" : 第二 = "FN"
+        ElseIf NN2 = 165 Then : 第一 = "FP" : 第二 = "FQ"
+        ElseIf NN2 = 168 Then : 第一 = "FS" : 第二 = "FT"
+        ElseIf NN2 = 171 Then : 第一 = "FV" : 第二 = "FW"
+        ElseIf NN2 = 174 Then : 第一 = "FY" : 第二 = "FZ"
+        ElseIf NN2 = 177 Then : 第一 = "GB" : 第二 = "GC"
+        ElseIf NN2 = 180 Then : 第一 = "GE" : 第二 = "GF"
+        ElseIf NN2 = 183 Then : 第一 = "GH" : 第二 = "GI"
+        ElseIf NN2 = 186 Then : 第一 = "GK" : 第二 = "GL"
+        ElseIf NN2 = 189 Then : 第一 = "GN" : 第二 = "GO"
+        ElseIf NN2 = 192 Then : 第一 = "GQ" : 第二 = "GR"
+        ElseIf NN2 = 195 Then : 第一 = "GT" : 第二 = "GU"
+        ElseIf NN2 = 198 Then : 第一 = "GW" : 第二 = "GX"
+        ElseIf NN2 = 201 Then : 第一 = "GZ" : 第二 = "HA" : End If
 
-        xlSheet.Range("M2:T" & N3).Select()
+        xlSheet.Columns(第一 & ":" & 第一).Select
+        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
+            .IndentLevel = 0 : .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
+        xlSheet.Columns(第二 & ":" & 第二).Select : myExcel.Selection.NumberFormatLocal = "#,##0;[紅色]-#,##0"
+        xlSheet.Range(第一 & "2:" & 第一 & NN1 - 2).Select()
+        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535 : .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
+        xlSheet.Range(第一 & "1:" & 第二 & NN1 + 3).Select()
         myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -963,9 +1278,5 @@ Public Class 流水帳查詢
         With myExcel.Selection.Borders(xlEdgeRight) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlInsideVertical) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlInsideHorizontal) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
-        myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
-        xlSheet.Range("M2:N" & N3).Select()
-        With myExcel.Selection.Interior : .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .Color = 65535
-            .TintAndShade = 0 : .PatternTintAndShade = 0 : End With
     End Sub
 End Class

GA-ERP-SYS/資料庫系統管理/系統執行檔版本管理.Designer.vb

@@ -22,101 +22,26 @@ Partial Class 系統執行檔版本管理
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.FTP原代碼_wb = New System.Windows.Forms.WebBrowser()
         Me.資料庫版本號_lb = New System.Windows.Forms.Label()
-        Me.Label12 = New System.Windows.Forms.Label()
-        Me.Label13 = New System.Windows.Forms.Label()
-        Me.讀取資料夾路徑_bt = New System.Windows.Forms.Button()
-        Me.本機資料夾_wb = New System.Windows.Forms.WebBrowser()
-        Me.FTP執行檔_wb = New System.Windows.Forms.WebBrowser()
         Me.修改_bt = New System.Windows.Forms.Button()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.版本號_tb = New System.Windows.Forms.TextBox()
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
         Me.SuspendLayout()
         '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label1.Location = New System.Drawing.Point(958, 514)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(80, 16)
-        Me.Label1.TabIndex = 660
-        Me.Label1.Text = "原代碼存放取"
-        '
-        'FTP原代碼_wb
-        '
-        Me.FTP原代碼_wb.Location = New System.Drawing.Point(961, 536)
-        Me.FTP原代碼_wb.MinimumSize = New System.Drawing.Size(20, 20)
-        Me.FTP原代碼_wb.Name = "FTP原代碼_wb"
-        Me.FTP原代碼_wb.Size = New System.Drawing.Size(936, 419)
-        Me.FTP原代碼_wb.TabIndex = 659
-        Me.FTP原代碼_wb.Url = New System.Uri("", System.UriKind.Relative)
-        '
         '資料庫版本號_lb
         '
         Me.資料庫版本號_lb.AutoSize = True
         Me.資料庫版本號_lb.BackColor = System.Drawing.SystemColors.Control
-        Me.資料庫版本號_lb.Location = New System.Drawing.Point(283, 19)
+        Me.資料庫版本號_lb.Location = New System.Drawing.Point(262, 12)
         Me.資料庫版本號_lb.Name = "資料庫版本號_lb"
         Me.資料庫版本號_lb.Size = New System.Drawing.Size(146, 12)
         Me.資料庫版本號_lb.TabIndex = 658
         Me.資料庫版本號_lb.Text = "資料庫版本號 : 2021060901"
         '
-        'Label12
-        '
-        Me.Label12.AutoSize = True
-        Me.Label12.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label12.Location = New System.Drawing.Point(959, 52)
-        Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(92, 16)
-        Me.Label12.TabIndex = 657
-        Me.Label12.Text = "執行檔案更新區"
-        '
-        'Label13
-        '
-        Me.Label13.AutoSize = True
-        Me.Label13.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label13.Location = New System.Drawing.Point(17, 48)
-        Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(56, 16)
-        Me.Label13.TabIndex = 656
-        Me.Label13.Text = "我的電腦"
-        '
-        '讀取資料夾路徑_bt
-        '
-        Me.讀取資料夾路徑_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.讀取資料夾路徑_bt.ForeColor = System.Drawing.Color.Blue
-        Me.讀取資料夾路徑_bt.Location = New System.Drawing.Point(79, 44)
-        Me.讀取資料夾路徑_bt.Name = "讀取資料夾路徑_bt"
-        Me.讀取資料夾路徑_bt.Size = New System.Drawing.Size(97, 24)
-        Me.讀取資料夾路徑_bt.TabIndex = 655
-        Me.讀取資料夾路徑_bt.Text = "讀取料夾路徑"
-        Me.讀取資料夾路徑_bt.UseVisualStyleBackColor = True
-        '
-        '本機資料夾_wb
-        '
-        Me.本機資料夾_wb.Location = New System.Drawing.Point(20, 74)
-        Me.本機資料夾_wb.MinimumSize = New System.Drawing.Size(20, 20)
-        Me.本機資料夾_wb.Name = "本機資料夾_wb"
-        Me.本機資料夾_wb.Size = New System.Drawing.Size(936, 881)
-        Me.本機資料夾_wb.TabIndex = 654
-        Me.本機資料夾_wb.Url = New System.Uri("", System.UriKind.Relative)
-        '
-        'FTP執行檔_wb
-        '
-        Me.FTP執行檔_wb.Location = New System.Drawing.Point(962, 74)
-        Me.FTP執行檔_wb.MinimumSize = New System.Drawing.Size(20, 20)
-        Me.FTP執行檔_wb.Name = "FTP執行檔_wb"
-        Me.FTP執行檔_wb.Size = New System.Drawing.Size(936, 419)
-        Me.FTP執行檔_wb.TabIndex = 653
-        Me.FTP執行檔_wb.Url = New System.Uri("", System.UriKind.Relative)
-        '
         '修改_bt
         '
-        Me.修改_bt.Location = New System.Drawing.Point(172, 16)
+        Me.修改_bt.Location = New System.Drawing.Point(155, 6)
         Me.修改_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.修改_bt.Name = "修改_bt"
         Me.修改_bt.Size = New System.Drawing.Size(105, 24)
@@ -127,7 +52,7 @@ Partial Class 系統執行檔版本管理
         '
         Me.Label3.AutoSize = True
         Me.Label3.BackColor = System.Drawing.SystemColors.Control
-        Me.Label3.Location = New System.Drawing.Point(17, 19)
+        Me.Label3.Location = New System.Drawing.Point(9, 12)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(41, 12)
         Me.Label3.TabIndex = 651
@@ -136,7 +61,7 @@ Partial Class 系統執行檔版本管理
         '版本號_tb
         '
         Me.版本號_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.版本號_tb.Location = New System.Drawing.Point(63, 16)
+        Me.版本號_tb.Location = New System.Drawing.Point(52, 7)
         Me.版本號_tb.Margin = New System.Windows.Forms.Padding(5)
         Me.版本號_tb.Name = "版本號_tb"
         Me.版本號_tb.Size = New System.Drawing.Size(101, 23)
@@ -146,33 +71,19 @@ Partial Class 系統執行檔版本管理
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1914, 971)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.FTP原代碼_wb)
+        Me.ClientSize = New System.Drawing.Size(411, 35)
         Me.Controls.Add(Me.資料庫版本號_lb)
-        Me.Controls.Add(Me.Label12)
-        Me.Controls.Add(Me.Label13)
-        Me.Controls.Add(Me.讀取資料夾路徑_bt)
-        Me.Controls.Add(Me.本機資料夾_wb)
-        Me.Controls.Add(Me.FTP執行檔_wb)
         Me.Controls.Add(Me.修改_bt)
         Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.版本號_tb)
         Me.Name = "系統執行檔版本管理"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "系統執行檔版本管理"
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
-
-    Friend WithEvents Label1 As Label
-    Friend WithEvents FTP原代碼_wb As WebBrowser
     Friend WithEvents 資料庫版本號_lb As Label
-    Friend WithEvents Label12 As Label
-    Friend WithEvents Label13 As Label
-    Friend WithEvents 讀取資料夾路徑_bt As Button
-    Friend WithEvents 本機資料夾_wb As WebBrowser
-    Friend WithEvents FTP執行檔_wb As WebBrowser
     Friend WithEvents 修改_bt As Button
     Friend WithEvents Label3 As Label
     Friend WithEvents 版本號_tb As TextBox

GA-ERP-SYS/資料庫系統管理/系統執行檔版本管理.vb

@@ -1,17 +1,12 @@
 Option Strict Off
 Public Class 系統執行檔版本管理
     Private Sub 系統執行檔版本管理_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Me.MdiParent = GA_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
         SQL_系統版本號驗證()
         If dr.Read() Then : 資料庫版本號_lb.Text = "資料庫版本號 : " & dr("系統認證版本號") : 版本號_tb.Text = dr("系統認證版本號") : End If : conn.Close()
-        Target1 = Target & AA(0) & "/" : Target2 = Target & AA(1) & "/" : FTP執行檔_wb.Url = New Uri(Target1) : FTP原代碼_wb.Url = New Uri(Target2)
-        If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then : 本機資料夾_wb.Navigate(FolderBrowserDialog1.SelectedPath) : End If
     End Sub
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 修改_bt.Click
         SQL_版本號管理修改() : conn.Close() : SQL_系統版本號驗證()
         If dr.Read() Then : 資料庫版本號_lb.Text = "資料庫版本號 : " & dr("系統認證版本號") : 版本號_tb.Text = dr("系統認證版本號") : End If : conn.Close() : MsgBox("修改完成")
-    End Sub
-    Private Sub Button14_Click(sender As Object, e As EventArgs) Handles 讀取資料夾路徑_bt.Click
-        If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then : 本機資料夾_wb.Navigate(FolderBrowserDialog1.SelectedPath) : End If
+        Me.Close()
     End Sub
 End Class