20211008備份

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

     <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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GA_ERP_SYS))
         Me.MenuStrip = New System.Windows.Forms.MenuStrip()
         Me.FileMenu = New System.Windows.Forms.ToolStripMenuItem()
         Me.報表系統管理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.帳務彙總計算表_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.帳務明細查詢表_tsm = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
+        Me.歷史資料查詢_tsm = New System.Windows.Forms.ToolStripMenuItem()
+        Me.歷史帳務彙總計算表_tsm = New System.Windows.Forms.ToolStripMenuItem()
+        Me.歷史帳務明細查詢表_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.特殊操作功能_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.錯誤排除手冊_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.計算機_bt = New System.Windows.Forms.Button()
         Me.計算機1_bt = New System.Windows.Forms.Button()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
-        Me.歷史資料查詢_tsm = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
-        Me.歷史帳務彙總計算表_tsm = New System.Windows.Forms.ToolStripMenuItem()
-        Me.歷史帳務明細查詢表_tsm = New System.Windows.Forms.ToolStripMenuItem()
+        Me.除錯_dgv = New System.Windows.Forms.DataGridView()
         Me.MenuStrip.SuspendLayout()
         Me.StatusStrip.SuspendLayout()
+        CType(Me.除錯_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'MenuStrip
         '
         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 = "基本資料"
         '
         '報表系統管理_tsm
         '
         Me.帳務彙總計算表_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.Report
         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.Report
         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 = "帳務明細查詢表"
         '
+        'ToolStripSeparator5
+        '
+        Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(155, 6)
+        '
+        '歷史資料查詢_tsm
+        '
+        Me.歷史資料查詢_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.歷史帳務彙總計算表_tsm, Me.歷史帳務明細查詢表_tsm})
+        Me.歷史資料查詢_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.business_info
+        Me.歷史資料查詢_tsm.Name = "歷史資料查詢_tsm"
+        Me.歷史資料查詢_tsm.Size = New System.Drawing.Size(158, 22)
+        Me.歷史資料查詢_tsm.Text = "歷史資料查詢"
+        '
+        '歷史帳務彙總計算表_tsm
+        '
+        Me.歷史帳務彙總計算表_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.business_info
+        Me.歷史帳務彙總計算表_tsm.Name = "歷史帳務彙總計算表_tsm"
+        Me.歷史帳務彙總計算表_tsm.Size = New System.Drawing.Size(182, 22)
+        Me.歷史帳務彙總計算表_tsm.Text = "歷史帳務彙總計算表"
+        '
+        '歷史帳務明細查詢表_tsm
+        '
+        Me.歷史帳務明細查詢表_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.business_info
+        Me.歷史帳務明細查詢表_tsm.Name = "歷史帳務明細查詢表_tsm"
+        Me.歷史帳務明細查詢表_tsm.Size = New System.Drawing.Size(182, 22)
+        Me.歷史帳務明細查詢表_tsm.Text = "歷史帳務明細查詢表"
+        '
         '特殊操作功能_tsm
         '
         Me.特殊操作功能_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.錯誤排除手冊_tsm, Me.ToolStripSeparator4, Me.流水帳自動導入_tsm, Me.流水帳手動輸入_tsm, Me.商客資料導入_tsm})
         '
         Me.錯誤排除手冊_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.childish_Tool
         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 = "錯誤排除手冊"
         '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
-        Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator4.Size = New System.Drawing.Size(155, 6)
         '
         '流水帳自動導入_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
         '
         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.Timer1.Interval = 1500
         '
-        '歷史資料查詢_tsm
-        '
-        Me.歷史資料查詢_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.歷史帳務彙總計算表_tsm, Me.歷史帳務明細查詢表_tsm})
-        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.Text = "歷史資料查詢"
-        '
-        'ToolStripSeparator5
-        '
-        Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
-        Me.ToolStripSeparator5.Size = New System.Drawing.Size(177, 6)
-        '
-        '歷史帳務彙總計算表_tsm
-        '
-        Me.歷史帳務彙總計算表_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.business_info
-        Me.歷史帳務彙總計算表_tsm.Name = "歷史帳務彙總計算表_tsm"
-        Me.歷史帳務彙總計算表_tsm.Size = New System.Drawing.Size(182, 22)
-        Me.歷史帳務彙總計算表_tsm.Text = "歷史帳務彙總計算表"
-        '
-        '歷史帳務明細查詢表_tsm
-        '
-        Me.歷史帳務明細查詢表_tsm.Image = Global.GA_ERP_SYS.My.Resources.Resources.business_info
-        Me.歷史帳務明細查詢表_tsm.Name = "歷史帳務明細查詢表_tsm"
-        Me.歷史帳務明細查詢表_tsm.Size = New System.Drawing.Size(182, 22)
-        Me.歷史帳務明細查詢表_tsm.Text = "歷史帳務明細查詢表"
+        '除錯_dgv
+        '
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.除錯_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.除錯_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            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(235, 194)
+        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(727, 247)
+        Me.除錯_dgv.TabIndex = 1550
+        Me.除錯_dgv.Visible = False
         '
         'GA_ERP_SYS
         '
         Me.BackgroundImage = Global.GA_ERP_SYS.My.Resources.Resources.depositphotos_189846782_stock_illustration_ga_g_a_letter_logo
         Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.ClientSize = New System.Drawing.Size(1184, 729)
+        Me.Controls.Add(Me.除錯_dgv)
         Me.Controls.Add(Me.計算機1_bt)
         Me.Controls.Add(Me.使用者_cb)
         Me.Controls.Add(Me.StatusStrip)
         Me.MenuStrip.PerformLayout()
         Me.StatusStrip.ResumeLayout(False)
         Me.StatusStrip.PerformLayout()
+        CType(Me.除錯_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     Friend WithEvents 歷史資料查詢_tsm As ToolStripMenuItem
     Friend WithEvents 歷史帳務彙總計算表_tsm As ToolStripMenuItem
     Friend WithEvents 歷史帳務明細查詢表_tsm As ToolStripMenuItem
+    Friend WithEvents 除錯_dgv As DataGridView
 End Class

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

 Imports System.Management
 Public Class GA_ERP_SYS
+    ReadOnly ds4 As New DataSet
     Private Sub ShowNewForm(ByVal sender As Object, ByVal e As EventArgs) Handles NewWindowToolStripMenuItem.Click
         ' 建立子表單的新執行個體。
         ' 將它變成這個 MDI 表單的子表單，然後才顯示。
         Next
     End Sub
     Private m_ChildFormNumber As Integer
+    Private Sub Set_修正清單()
+        除錯_dgv.DataSource = Nothing : ds4.Clear()
+        除錯_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        除錯_dgv.ColumnHeadersHeight = 25
+        除錯_dgv.AllowUserToAddRows = False
+        ConnOpen_子SQL() : SQL_流水帳修正()
+        da.Fill(ds4) : 除錯_dgv.DataSource = ds4.Tables(0) : conn.Close()
+        For I As Integer = 0 To 除錯_dgv.Rows.Count - 1
+            除錯_dgv("網址", I).Value = Strings.Mid(除錯_dgv("網址", I).Value, 7, 100)
+            PA1 = 除錯_dgv("網址", I).Value : PA2 = 除錯_dgv("index", I).Value : PA3 = 除錯_dgv("開始日期", I).Value
+            PA4 = 除錯_dgv("結束日期", I).Value : PA5 = 除錯_dgv("帳戶", I).Value
+            ConnOpen_子SQL() : SQL_修正網址()
+        Next
+    End Sub
     Private Sub GA_ERP_SYS_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.ActiveControl = 使用者_cb
         '----------系統登入時抬頭資訊顯示---------------------------------------------------------------------------------------------------------------
         特殊操作功能_tsm.Enabled = CC(10) : 流水帳自動導入_tsm.Enabled = CC(11) : 流水帳手動輸入_tsm.Enabled = CC(12) : 商客資料導入_tsm.Enabled = CC(13)
 
         If 判斷重登 = False Then : Timer1.Enabled = True : End If
+        Set_修正清單()
     End Sub
     Private Sub GA_ERP_SYS_Close(sender As Object, e As EventArgs) Handles MyBase.Closed
         SQL_登入鎖定解除() : LoginForm1.Close()

GA-ERP-SYS/LoginForm1.Designer.vb

         Me.藏_bt = New System.Windows.Forms.Button()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.UPDATE_bt = New System.Windows.Forms.Button()
+        Me.Timer2 = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer3 = New System.Windows.Forms.Timer(Me.components)
         CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.FTP清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.簡易登入_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.簡易登入_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.簡易登入_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.簡易登入_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.簡易登入_dgv.Location = New System.Drawing.Point(464, 4)
+        Me.簡易登入_dgv.Location = New System.Drawing.Point(463, 4)
         Me.簡易登入_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.簡易登入_dgv.Name = "簡易登入_dgv"
         Me.簡易登入_dgv.RowHeadersWidth = 5
         '
         '解鎖_bt
         '
-        Me.解鎖_bt.Location = New System.Drawing.Point(463, 215)
+        Me.解鎖_bt.Location = New System.Drawing.Point(687, 215)
         Me.解鎖_bt.Name = "解鎖_bt"
-        Me.解鎖_bt.Size = New System.Drawing.Size(248, 23)
+        Me.解鎖_bt.Size = New System.Drawing.Size(268, 23)
         Me.解鎖_bt.TabIndex = 682
         Me.解鎖_bt.Text = "解鎖"
         Me.解鎖_bt.UseVisualStyleBackColor = True
         '
         'UPDATE_bt
         '
-        Me.UPDATE_bt.Location = New System.Drawing.Point(710, 215)
+        Me.UPDATE_bt.Location = New System.Drawing.Point(463, 215)
         Me.UPDATE_bt.Name = "UPDATE_bt"
-        Me.UPDATE_bt.Size = New System.Drawing.Size(248, 23)
+        Me.UPDATE_bt.Size = New System.Drawing.Size(218, 23)
         Me.UPDATE_bt.TabIndex = 684
         Me.UPDATE_bt.Text = "UPDATE"
         Me.UPDATE_bt.UseVisualStyleBackColor = True
         '
+        'Timer2
+        '
+        Me.Timer2.Interval = 3000
+        '
+        'Timer3
+        '
+        Me.Timer3.Interval = 3000
+        '
         'LoginForm1
         '
         Me.AcceptButton = Me.確認_bt
         Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.CancelButton = Me.取消_bt
         Me.ClientSize = New System.Drawing.Size(964, 240)
+        Me.Controls.Add(Me.簡易登入_dgv)
         Me.Controls.Add(Me.UPDATE_bt)
         Me.Controls.Add(Me.藏_bt)
         Me.Controls.Add(Me.解鎖_bt)
         Me.Controls.Add(Me.PasswordLabel)
         Me.Controls.Add(Me.UsernameLabel)
         Me.Controls.Add(Me.LogoPictureBox)
-        Me.Controls.Add(Me.簡易登入_dgv)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.更新_bt)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
     Friend WithEvents 藏_bt As Button
     Friend WithEvents Timer1 As Timer
     Friend WithEvents UPDATE_bt As Button
+    Friend WithEvents Timer2 As Timer
+    Friend WithEvents Timer3 As Timer
 End Class

GA-ERP-SYS/LoginForm1.resx

   <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>432, 17</value>
   </metadata>
+  <metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>524, 17</value>
+  </metadata>
+  <metadata name="Timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>616, 17</value>
+  </metadata>
 </root>

GA-ERP-SYS/LoginForm1.vb

         Next
     End Sub
     Private Sub LoginForm1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        '-----------------------刪除自動更新項目-----------------------------------------------------------------------------------------------------------------------------------------------
-        Dim Str As String = Application.StartupPath
-        If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
+        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
         '-----------------------控件基本設定-----------------------------------------------------------------------------------------------------------------------------------------------
         刷卡登入_ch.Checked = True : 刷卡登入_ch.Enabled = False : 帳號_tb.Visible = False : 解鎖_bt.Visible = False : UPDATE_bt.Visible = False ': 使用者帳號_cb.Enabled = False
         執行檔版本號_lb.Text = "執行檔版本號 : " & 版本
                 Dim aa As MsgBoxResult = MsgBox("請插入USB KEY!!!", MsgBoxStyle.OkCancel)
                 If aa = MsgBoxResult.Ok Then
                     QA1 = "00" : QA2 = "00" : QA3 = "00" : QA4 = "00"
+                    FTP登入()
                 Else
                     Me.Close()
                 End If
             Else
+                FTP登入()
                 SQL_登入鎖定解除() : 使用者帳號_cb.Text = PA16 : PA16 = ""
                 Me.ActiveControl = 密碼_tb
             End If
             Timer1.Enabled = True
         End If
+    End Sub
+    Private Sub FTP登入()
         SQL_FTP伺服器登入位置()
         If dr.Read() Then : Target = dr("FTP地址") : FTP帳號 = dr("FTP帳號") : FTP密碼 = dr("FTP密碼") : End If : conn.Close()
         Set_清單1()
         Next
         Target1 = Target & AA(0) & "/"
     End Sub
+    Private Sub Timer2_Tick(sender As Object, e As EventArgs) Handles Timer2.Tick
+        '-----------------------刪除自動更新項目-----------------------------------------------------------------------------------------------------------------------------------------------
+        Dim Str As String = Application.StartupPath
+        If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
+        Timer2.Enabled = False
+    End Sub
     Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
         Dim Usbkey As Boolean = False
         Dim cmicWmi As New ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive")
         '-----------------------系統版本號驗證-----------------------------------------------------------------------------------------------------------------------------------------------
         SQL_系統版本號驗證()
         If dr.Read() Then : 資料庫版本號_lb.Text = "資料庫版本號 : " & dr("系統認證版本號") : 版本號 = dr("系統認證版本號") : End If : conn.Close()
-
         If Strings.Right(執行檔版本號_lb.Text, 10) <> Strings.Right(資料庫版本號_lb.Text, 10) Then
             自動更新2()
-        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
         End If
+        Timer2.Enabled = True
     End Sub
     Private Sub 自動更新1()
         登入程序()
         Dim aa1 As MsgBoxResult = MsgBox("系統版本號 與 資料庫版本號 對應不上，請下載最新的執行檔。", MsgBoxStyle.OkCancel)
         If aa1 = MsgBoxResult.Ok Then
             更新下載_ch.Checked = True
-            Me.Size = New Size(980, 279)
-            If screenWidth = 1920 And screenHeight = 1080 Then
-            ElseIf screenWidth = 1366 And screenHeight = 768 Then
-            ElseIf screenWidth = 1440 And screenHeight = 900 Then
-            ElseIf screenWidth = 1280 And screenHeight = 1024 Then
-            ElseIf screenWidth = 1600 And screenHeight = 900 Then
-            End If
-            'Dim fileName As String = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
-            'Dim fullPath As String
-            'fullPath = Path.GetFullPath(fileName)
-            'Process.Start(fullPath, "--app= http://106.1.50.79:8080/ga-erp-sys/")
             Timer1.Enabled = False : UPDATE_bt.Visible = True : UPDATE_bt.PerformClick()
             更新關閉 = True
         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 : UPDATE_bt.Visible = False
         End If
     End Sub
     Private Sub 更新_bt_Click(sender As Object, e As EventArgs) Handles 更新_bt.Click
         Timer1.Enabled = False : UPDATE_bt.Visible = True
         UPDATE_bt.PerformClick()
-        'Dim fileName As String = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
-        'Dim fullPath As String
-        'fullPath = Path.GetFullPath(fileName)
-        'Process.Start(fullPath, "--app= http://106.1.50.79:8080/ga-erp-sys/")
     End Sub
     Private Sub UPDATE_bt_Click(sender As Object, e As EventArgs) Handles UPDATE_bt.Click
         Timer1.Enabled = False
+        FTP登入()
         Dim Strs As String = Application.StartupPath
         My.Computer.Network.DownloadFile(Target & AA(0) & "/" & "SYS-UPDATE.exe", Strs + "\SYS-UPDATE.exe")
         Shell(Strs + "\SYS-UPDATE.exe", vbNormalFocus)

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

     End Sub
     Friend Sub SQL_同步修正網址3()
         ConnOpen_子SQL()
-        SQL1 = "UPDATE 流水帳 SET 網址 = N'http:\" & 基本資料.網址2_tb.Text & "' WHERE  SUBSTRING(網址, 7, 50) LIKE N'" & 基本資料.網址4_tb.Text & "'"
+        SQL1 = "UPDATE 流水帳 SET 網址 = N'" & 基本資料.網址2_tb.Text & "' WHERE  SUBSTRING(網址, 7, 50) LIKE N'" & 基本資料.網址4_tb.Text & "'"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_同步修正網址4()
     Friend Sub SQL_基本資料_客戶下資料表()
         ConnOpen_子SQL()
         SQL1 = "SELECT     商客基本資料表.商品, 下行客戶.網址, 下行客戶.帳號 AS 老闆帳號, 下行客戶.客戶下 AS 客戶帳號, 下行客戶.客名 AS 客戶名稱, 下行客戶.流水號, 
-                           下行客戶.基數, 下行客戶.基數 AS 階級, 下行客戶.計算, 下行客戶.同帳, 下行客戶.所得, 下行客戶.所得另算
+                           下行客戶.基數, 下行客戶.基數 AS 階級, 下行客戶.計算, 下行客戶.同帳, 下行客戶.所得, 下行客戶.下層, 下行客戶.所得另算
                 FROM       下行客戶 LEFT OUTER JOIN
                            商客基本資料表 ON 下行客戶.網址 = 商客基本資料表.網址 AND 下行客戶.帳號 = 商客基本資料表.帳號
                 WHERE      下行客戶.客戶下 LIKE N'%" & PA & "%' " & PA9 & "
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_系統編碼規則_客戶下批改()
-        ConnOpen_子SQL() : SQL1 = "UPDATE 下行客戶 SET 計算 = '" & BL1 & "', 同帳 = '" & BL2 & "', 所得 = '" & BL3 & "', 所得另算 = N'" & PA1 & "' WHERE  流水號 LIKE N'" & PA & "'" : CmdSet_For_dr()
+        ConnOpen_子SQL()
+        SQL1 = "UPDATE 下行客戶 SET 計算 = '" & BL1 & "', 同帳 = '" & BL2 & "', 所得 = '" & BL3 & "', 所得另算 = N'" & PA1 & "', 下層 = '" & BL4 & "' WHERE  流水號 LIKE N'" & PA & "'"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_商客資料表2()
         ConnOpen_子SQL()
     End Sub
     Friend Sub SQL_流水帳同日期清除()
         ConnOpen_子SQL()
-        SQL1 = "DELETE  流水帳 
-                WHERE  (開始日期 LIKE N'" & PA1 & "' AND 結束日期 LIKE N'" & PA2 & "')"
+        SQL1 = "DELETE  流水帳 WHERE  (開始日期 LIKE N'" & PA1 & "')"
+        'SQL1 = "DELETE  流水帳 WHERE  (開始日期 LIKE N'" & PA1 & "' AND 結束日期 LIKE N'" & PA2 & "')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_查詢日期寫入()
                             QQQ.中獎s, QQQ.輸贏s, QQQ.客戶小計s, QQQ.代理小計s, QQQ.總代理小計s, QQQ.股東小計s, QQQ.大股東小計s, 
                             QQQ.總監小計s, QQQ.個人所得s, QQQ.水差s, QQQ.下注明細s, QQQ.查看對帳s, QQQ.客帳, 選擇按鈕.按鈕, 
                             QQQ.帳戶 AS 客名, 選擇按鈕.按鈕 AS 計算, 選擇按鈕.按鈕 AS 同帳, QQQ.帳戶 AS 同帳指定, 選擇按鈕.按鈕 AS 所得, 
-                            QQQ.個人所得 AS 所得另算, QQQ.總監
+                            選擇按鈕.按鈕 AS 下層, QQQ.個人所得 AS 所得另算, QQQ.總監, QQQ.天帳1 AS 天帳2, QQQ.地帳1 AS 地帳2, 
+                            QQQ.個人所得1 AS 個人所得2, QQQ.水差1 AS 水差2
                 FROM        選擇按鈕 RIGHT OUTER JOIN
-                           (SELECT          流水帳.開始日期, 流水帳.結束日期, SUBSTRING(流水帳.網址, 7, 50) AS 網址, 流水帳.帳戶, 
+                           (SELECT          流水帳.開始日期, 流水帳.結束日期, 流水帳.網址 AS 網址, 流水帳.帳戶, 
                                             商客基本資料表.商品, 商客基本資料表.資料, 商客基本資料表.上行基數, 商客基本資料表.下行基數, 
                                             商客基本資料表.上繳源 AS 老闆, 流水帳.名稱 AS 客戶, 商客基本資料表.上行基數 AS 天帳, 
                                             商客基本資料表.下行基數 AS 地帳, 商客基本資料表.上行基數 AS 個人所得, 
                                             流水帳.輸贏s, 流水帳.客戶小計s, 流水帳.代理小計s, 流水帳.總代理小計s, 流水帳.股東小計s, 
                                             流水帳.大股東小計s, 流水帳.總監小計s, 流水帳.個人所得s, 流水帳.水差s, 流水帳.下注明細s, 
                                             流水帳.查看對帳s, 商客基本資料表.上繳源 AS 客帳
-                            FROM            流水帳 LEFT OUTER JOIN 商客基本資料表 ON SUBSTRING(流水帳.網址, 7, 50) = 商客基本資料表.網址 AND 
+                            FROM            流水帳 LEFT OUTER JOIN 商客基本資料表 ON 流水帳.網址 = 商客基本資料表.網址 AND 
                                             流水帳.帳戶 = 商客基本資料表.帳號
                             WHERE          (流水帳.開始日期 LIKE N'" & Strings.Left(帳務彙總計算表.資料_cb.Text, 10) & "') AND 
                                            (流水帳.結束日期 LIKE N'" & Strings.Right(帳務彙總計算表.資料_cb.Text, 10) & "') AND 
                                            (商客基本資料表.商品 LIKE N'%" & 帳務彙總計算表.商品_cb.Text & "%') AND 
                                            (商客基本資料表.上繳源 LIKE N'%" & 帳務彙總計算表.老闆_cb.Text & "%') AND 
-                                           (SUBSTRING(流水帳.網址, 7, 50) LIKE N'%" & PA40 & "%')
-                            GROUP BY        流水帳.開始日期, 流水帳.結束日期, SUBSTRING(流水帳.網址, 7, 50), 流水帳.帳戶, 
+                                           (流水帳.網址 LIKE N'%" & PA40 & "%')
+                            GROUP BY        流水帳.開始日期, 流水帳.結束日期, 流水帳.網址, 流水帳.帳戶, 
                                             商客基本資料表.商品, 商客基本資料表.資料, 商客基本資料表.上行基數, 商客基本資料表.下行基數, 
                                             商客基本資料表.上繳源, 流水帳.名稱, 流水帳.總量, 流水帳.退水, 流水帳.中獎, 流水帳.輸贏, 
                                             流水帳.佔成輸贏, 流水帳.水倍差, 流水帳.上繳金額, 流水帳.自已總輸贏, 流水帳.上繳貢獻額, 
                             商客基本資料表.上繳源 AS 地帳, 商客基本資料表.上繳源 AS 個人所得, 商客基本資料表.上繳源 AS 水差, 商客基本資料表.上繳源 AS 核帳, 
                             商客基本資料表.網址 AS 狀態, 商客基本資料表.密碼
                 FROM        流水帳 FULL OUTER JOIN
-                            商客基本資料表 ON SUBSTRING(流水帳.網址, 7, 50) = 商客基本資料表.網址 AND 
+                            商客基本資料表 ON 流水帳.網址 = 商客基本資料表.網址 AND 
                             流水帳.帳戶 = 商客基本資料表.帳號
                 WHERE      (商客基本資料表.商品 LIKE N'%" & 帳務彙總計算表.商品_cb.Text & "%') AND (商客基本資料表.上繳源 LIKE N'%" & 帳務彙總計算表.老闆_cb.Text & "%') AND 
                             商客基本資料表.網址 LIKE N'%" & PA40 & "%'
                             商客基本資料表.商品 AS 天帳, 商客基本資料表.商品 AS 地帳, 商客基本資料表.商品 AS 個人所得, 
                             商客基本資料表.商品 AS 水差, 商客基本資料表.商品 AS 核帳
                 FROM        流水帳 FULL OUTER JOIN
-                            商客基本資料表 ON SUBSTRING(流水帳.網址, 7, 50) = 商客基本資料表.網址 AND 
+                            商客基本資料表 ON 流水帳.網址 = 商客基本資料表.網址 AND 
                             流水帳.帳戶 = 商客基本資料表.帳號
                 WHERE      (商客基本資料表.商品 LIKE N'%" & 帳務彙總計算表.商品_cb.Text & "%') AND (商客基本資料表.上繳源 LIKE N'%" & 帳務彙總計算表.老闆_cb.Text & "%') AND 
                             商客基本資料表.網址 LIKE N'%" & PA40 & "%'
                                         商客基本資料表.上繳源 AS 個人所得, 商客基本資料表.上繳源 AS 水差, 
                                         商客基本資料表.上繳源 AS 核帳
                                   FROM  商客基本資料表 FULL OUTER JOIN
-                                        流水帳 ON SUBSTRING(流水帳.網址, 7, 50) = 商客基本資料表.網址 AND 
+                                        流水帳 ON 流水帳.網址 = 商客基本資料表.網址 AND 
                                         流水帳.帳戶 = 商客基本資料表.帳號
                             WHERE      (商客基本資料表.商品 LIKE N'%" & 帳務彙總計算表.商品_cb.Text & "%') AND (商客基本資料表.上繳源 LIKE N'%" & 帳務彙總計算表.老闆_cb.Text & "%') AND 
                                         商客基本資料表.網址 LIKE N'%" & PA40 & "%'
         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()
                             QQQ.中獎s, QQQ.輸贏s, QQQ.客戶小計s, QQQ.代理小計s, QQQ.總代理小計s, QQQ.股東小計s, QQQ.大股東小計s, 
                             QQQ.總監小計s, QQQ.個人所得s, QQQ.水差s, QQQ.下注明細s, QQQ.查看對帳s, QQQ.客帳 AS 客戶帳號, 選擇按鈕.按鈕, 
                             QQQ.帳戶 AS 客戶名稱, 選擇按鈕.按鈕 AS 計算, 選擇按鈕.按鈕 AS 同帳, QQQ.帳戶 AS 同帳指定, 選擇按鈕.按鈕 AS 所得, 
-                            QQQ.個人所得 AS 所得另算, QQQ.[index], QQQ.帳戶 AS 下客流水, QQQ.總監, QQQ.帳戶 AS 所得指定
+                            選擇按鈕.按鈕 AS 下層, QQQ.個人所得 AS 所得另算, QQQ.[index], QQQ.帳戶 AS 下客流水, QQQ.總監, QQQ.帳戶 AS 所得指定
                 FROM        選擇按鈕 RIGHT OUTER JOIN
-                           (SELECT     流水帳.開始日期, 流水帳.結束日期, SUBSTRING(流水帳.網址, 7, 50) AS 網址, 流水帳.帳戶, 
+                           (SELECT     流水帳.開始日期, 流水帳.結束日期, 流水帳.網址 AS 網址, 流水帳.帳戶, 
                                        商客基本資料表.商品, 商客基本資料表.資料, 商客基本資料表.上行基數, 商客基本資料表.下行基數, 
                                        商客基本資料表.上繳源 AS 老闆, 流水帳.名稱 AS 客戶, 商客基本資料表.上行基數 AS [會員.], 
                                        商客基本資料表.下行基數 AS [代理.], 商客基本資料表.下行基數 AS [總代理.], 
                                        流水帳.代理小計s, 流水帳.總代理小計s, 流水帳.股東小計s, 流水帳.大股東小計s, 流水帳.總監小計s, 
                                        流水帳.個人所得s, 流水帳.水差s, 流水帳.下注明細s, 流水帳.查看對帳s, 
                                        商客基本資料表.上繳源 AS 客帳, 流水帳.[index]
-                             FROM      流水帳 LEFT OUTER JOIN 商客基本資料表 ON SUBSTRING(流水帳.網址, 7, 50) = 商客基本資料表.網址 AND 流水帳.帳戶 = 商客基本資料表.帳號
+                             FROM      流水帳 LEFT OUTER JOIN 商客基本資料表 ON 流水帳.網址 = 商客基本資料表.網址 AND 流水帳.帳戶 = 商客基本資料表.帳號
                              WHERE    (流水帳.開始日期 LIKE N'" & Strings.Left(帳務明細查詢表.資料_cb.Text, 10) & "') AND 
                                       (流水帳.結束日期 LIKE N'" & Strings.Right(帳務明細查詢表.資料_cb.Text, 10) & "') AND 
                                       (商客基本資料表.商品 LIKE N'%" & 帳務明細查詢表.商品_cb.Text & "%') AND 
                                       (商客基本資料表.上繳源 LIKE N'%" & 帳務明細查詢表.老闆_cb.Text & "%') " & PA32 & "
-                             GROUP BY  流水帳.開始日期, 流水帳.結束日期, SUBSTRING(流水帳.網址, 7, 50), 流水帳.帳戶, 
+                             GROUP BY  流水帳.開始日期, 流水帳.結束日期, 流水帳.網址, 流水帳.帳戶, 
                                        商客基本資料表.商品, 商客基本資料表.資料, 商客基本資料表.上行基數, 商客基本資料表.下行基數, 
                                        商客基本資料表.上繳源, 流水帳.名稱, 流水帳.總量, 流水帳.退水, 流水帳.中獎, 流水帳.輸贏, 
                                        流水帳.佔成輸贏, 流水帳.水倍差, 流水帳.上繳金額, 流水帳.自已總輸贏, 流水帳.上繳貢獻額, 
         ConnOpen_子SQL()
         SQL1 = "UPDATE 流水帳 SET 查看對帳s = N'" & PA38 & "', 下注明細s = N'" & PA32 & "'
                 WHERE ([index] LIKE N'" & PA37 & "') AND (開始日期 LIKE N'" & PA36 & "') AND (結束日期 LIKE N'" & PA35 & "') AND 
-                      (SUBSTRING(網址, 7, 50) LIKE N'" & PA34 & "') AND (帳戶 LIKE N'" & PA33 & "')"
+                      (網址 LIKE N'" & PA34 & "') AND (帳戶 LIKE N'" & PA33 & "')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_所得另算表()
         ConnOpen_子SQL()
         SQL1 = "SELECT     商客基本資料表.商品, 商客基本資料表.商品 AS 所得
                 FROM       流水帳 LEFT OUTER JOIN
-                           商客基本資料表 ON 流水帳.帳戶 = 商客基本資料表.帳號 AND SUBSTRING(流水帳.網址, 7, 50) = 商客基本資料表.網址
+                           商客基本資料表 ON 流水帳.帳戶 = 商客基本資料表.帳號 AND 流水帳.網址 = 商客基本資料表.網址
                 WHERE     (流水帳.下注明細s LIKE N'%" & 帳務明細查詢表.所得指定_cb.Text & "%') AND (流水帳.開始日期 LIKE N'" & Strings.Left(帳務明細查詢表.資料_cb.Text, 10) & "') AND 
                           (流水帳.結束日期 LIKE N'" & Strings.Right(帳務明細查詢表.資料_cb.Text, 10) & "')
                 GROUP BY   商客基本資料表.商品
                 ORDER BY   商客基本資料表.商品"
         CmdSet_For_DGV()
     End Sub
+    Friend Sub SQL_流水帳修正()
+        SQL1 = "SELECT [index], 開始日期, 結束日期, 網址, 帳戶 FROM 流水帳 WHERE (網址 LIKE 'http:\%') ORDER BY 結束日期 DESC" : CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_修正網址()
+        SQL1 = "UPDATE 流水帳 SET 網址 = N'" & PA1 & "' WHERE [index] LIKE N'" & PA2 & "' AND 開始日期 LIKE N'" & PA3 & "' AND 結束日期 LIKE N'" & PA4 & "' AND 帳戶 LIKE N'" & PA5 & "'"
+        CmdSet_For_dr()
+    End Sub
 End Module

GA-ERP-SYS/Module/SQL_資料庫系統管理.vb

         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_資料庫轉換3()
-        ConnOpen_備份1() : SQL1 = "SELECT 客戶下, 網址, 帳號, 基數, 流水號, 客名, 計算, 同帳, 所得, 所得另算 FROM 下行客戶" : CmdSet_For_DGV()
+        ConnOpen_備份1() : SQL1 = "SELECT 客戶下, 網址, 帳號, 基數, 流水號, 客名, 計算, 同帳, 所得, 所得另算, 下層 FROM 下行客戶" : CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_資料庫轉換3_1()
-        ConnOpen_備份2() : SQL1 = "SELECT 客戶下, 網址, 帳號, 基數, 流水號, 客名, 計算, 同帳, 所得, 所得另算 FROM 下行客戶" : CmdSet_For_DGV()
+        ConnOpen_備份2() : SQL1 = "SELECT 客戶下, 網址, 帳號, 基數, 流水號, 客名, 計算, 同帳, 所得, 所得另算, 下層 FROM 下行客戶" : CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_資料庫轉換3_刪除()
         ConnOpen_備份2() : SQL1 = "DELETE FROM 下行客戶" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_資料庫轉換3_新增()
         ConnOpen_備份2()
-        SQL1 = "INSERT INTO 下行客戶 (客戶下, 網址, 帳號, 基數, 流水號, 客名, 計算, 同帳, 所得, 所得另算) 
+        SQL1 = "INSERT INTO 下行客戶 (客戶下, 網址, 帳號, 基數, 流水號, 客名, 計算, 同帳, 所得, 所得另算, 下層) 
                 VALUES (N'" & PA & "', N'" & PA1 & "', N'" & PA2 & "', N'" & PA3 & "', N'" & PA4 & "', N'" & PA5 & "', N'" & PA6 & "', N'" & PA7 & "', N'" & PA8 & "', N'" & PA9 & "')"
         CmdSet_For_dr()
     End Sub

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

     Public AA(99) As String : Public BB(99) As Boolean : Public CC(99) As Boolean : Public 登入判斷 As Boolean : Public 登入客戶 As String : Public 登入資料庫 As String : Public 業務名稱 As String
     Public QA1 As String : Public QA2 As String : Public QA3 As String : Public QA4 As String
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2021091601"
+    Public 版本 As String = "2021100801"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 判斷重登 As Boolean : Public 內外網 As Boolean : Public 重登確認 As Boolean : Public 主頁開啟 As Boolean

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

 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("1.10.0.0")>
-<Assembly: AssemblyFileVersion("1.10.0.0")>
+<Assembly: AssemblyFileVersion("1.10.1.0")>

GA-ERP-SYS/bin/Debug/lorverrorlog.txt

+Traceback (most recent call last):
+  File "LoginVerify.py", line 134, in <module>
+FileNotFoundError: [Errno 2] No such file or directory: 'lorv.csv'

GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbproj.FileListAbsolute.txt

 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\GA-ERP-SYS.xml
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\DocumentFormat.OpenXml.dll
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\DocumentFormat.OpenXml.xml
-D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.vbprojAssemblyReference.cache
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.網址帳號驗證中.resources
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.帳務明細查詢表.resources
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.錯誤排除手冊.resources
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.exe
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.xml
 D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.pdb
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.vbprojAssemblyReference.cache

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

         Me.Label14 = New System.Windows.Forms.Label()
         Me.狀態_tb = New System.Windows.Forms.TextBox()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        Me.所得指定_tb = New System.Windows.Forms.TextBox()
+        Me.Label28 = New System.Windows.Forms.Label()
         Me.所得計算_ch = New System.Windows.Forms.CheckBox()
         Me.參與計算_ch = New System.Windows.Forms.CheckBox()
         Me.取消2_bt = New System.Windows.Forms.Button()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.所得取消_bt = New System.Windows.Forms.Button()
         Me.所得全選_bt = New System.Windows.Forms.Button()
-        Me.所得指定_tb = New System.Windows.Forms.TextBox()
-        Me.Label28 = New System.Windows.Forms.Label()
+        Me.字體大小調整_lb = New System.Windows.Forms.Label()
+        Me.字體_NUD = New System.Windows.Forms.NumericUpDown()
+        Me.下層帳號_ch = New System.Windows.Forms.CheckBox()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         CType(Me.基數_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LOG1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LOG2_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'GroupBox1
         Me.清除搜索3_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.清除搜索3_bt.Location = New System.Drawing.Point(309, 649)
         Me.清除搜索3_bt.Name = "清除搜索3_bt"
-        Me.清除搜索3_bt.Size = New System.Drawing.Size(85, 47)
+        Me.清除搜索3_bt.Size = New System.Drawing.Size(85, 25)
         Me.清除搜索3_bt.TabIndex = 1537
         Me.清除搜索3_bt.Text = "清除搜索"
         Me.清除搜索3_bt.UseVisualStyleBackColor = False
         '
         Me.GroupBox5.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.GroupBox5.Controls.Add(Me.下層帳號_ch)
         Me.GroupBox5.Controls.Add(Me.所得指定_tb)
         Me.GroupBox5.Controls.Add(Me.Label28)
         Me.GroupBox5.Controls.Add(Me.所得計算_ch)
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "下收客戶帳號設定"
         '
+        '所得指定_tb
+        '
+        Me.所得指定_tb.Location = New System.Drawing.Point(253, 119)
+        Me.所得指定_tb.Name = "所得指定_tb"
+        Me.所得指定_tb.Size = New System.Drawing.Size(133, 23)
+        Me.所得指定_tb.TabIndex = 1558
+        '
+        'Label28
+        '
+        Me.Label28.AutoSize = True
+        Me.Label28.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.Label28.Location = New System.Drawing.Point(197, 123)
+        Me.Label28.Name = "Label28"
+        Me.Label28.Size = New System.Drawing.Size(56, 16)
+        Me.Label28.TabIndex = 1557
+        Me.Label28.Text = "所得指定"
+        '
         '所得計算_ch
         '
         Me.所得計算_ch.AutoSize = True
-        Me.所得計算_ch.Location = New System.Drawing.Point(298, 99)
+        Me.所得計算_ch.Location = New System.Drawing.Point(210, 98)
         Me.所得計算_ch.Name = "所得計算_ch"
         Me.所得計算_ch.Size = New System.Drawing.Size(75, 20)
         Me.所得計算_ch.TabIndex = 1556
         '參與計算_ch
         '
         Me.參與計算_ch.AutoSize = True
-        Me.參與計算_ch.Location = New System.Drawing.Point(68, 99)
+        Me.參與計算_ch.Location = New System.Drawing.Point(10, 98)
         Me.參與計算_ch.Name = "參與計算_ch"
         Me.參與計算_ch.Size = New System.Drawing.Size(75, 20)
         Me.參與計算_ch.TabIndex = 1554
         '上下同帳_ch
         '
         Me.上下同帳_ch.AutoSize = True
-        Me.上下同帳_ch.Location = New System.Drawing.Point(185, 99)
+        Me.上下同帳_ch.Location = New System.Drawing.Point(111, 98)
         Me.上下同帳_ch.Name = "上下同帳_ch"
         Me.上下同帳_ch.Size = New System.Drawing.Size(75, 20)
         Me.上下同帳_ch.TabIndex = 1555
         Me.所得全選_bt.Text = "所得全選"
         Me.所得全選_bt.UseVisualStyleBackColor = False
         '
-        '所得指定_tb
-        '
-        Me.所得指定_tb.Location = New System.Drawing.Point(253, 119)
-        Me.所得指定_tb.Name = "所得指定_tb"
-        Me.所得指定_tb.Size = New System.Drawing.Size(133, 23)
-        Me.所得指定_tb.TabIndex = 1558
-        '
-        'Label28
-        '
-        Me.Label28.AutoSize = True
-        Me.Label28.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label28.Location = New System.Drawing.Point(197, 123)
-        Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(56, 16)
-        Me.Label28.TabIndex = 1557
-        Me.Label28.Text = "所得指定"
+        '字體大小調整_lb
+        '
+        Me.字體大小調整_lb.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.字體大小調整_lb.AutoSize = True
+        Me.字體大小調整_lb.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.字體大小調整_lb.ForeColor = System.Drawing.Color.Red
+        Me.字體大小調整_lb.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.字體大小調整_lb.Location = New System.Drawing.Point(307, 676)
+        Me.字體大小調整_lb.Name = "字體大小調整_lb"
+        Me.字體大小調整_lb.Size = New System.Drawing.Size(60, 17)
+        Me.字體大小調整_lb.TabIndex = 1632
+        Me.字體大小調整_lb.Text = "字體調整"
+        '
+        '字體_NUD
+        '
+        Me.字體_NUD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.字體_NUD.DecimalPlaces = 1
+        Me.字體_NUD.Increment = New Decimal(New Integer() {1, 0, 0, 65536})
+        Me.字體_NUD.Location = New System.Drawing.Point(368, 674)
+        Me.字體_NUD.Maximum = New Decimal(New Integer() {18, 0, 0, 0})
+        Me.字體_NUD.Minimum = New Decimal(New Integer() {6, 0, 0, 0})
+        Me.字體_NUD.Name = "字體_NUD"
+        Me.字體_NUD.Size = New System.Drawing.Size(38, 22)
+        Me.字體_NUD.TabIndex = 1631
+        Me.字體_NUD.Value = New Decimal(New Integer() {9, 0, 0, 0})
+        '
+        '下層帳號_ch
+        '
+        Me.下層帳號_ch.AutoSize = True
+        Me.下層帳號_ch.Location = New System.Drawing.Point(313, 98)
+        Me.下層帳號_ch.Name = "下層帳號_ch"
+        Me.下層帳號_ch.Size = New System.Drawing.Size(75, 20)
+        Me.下層帳號_ch.TabIndex = 1559
+        Me.下層帳號_ch.Text = "下層帳號"
+        Me.下層帳號_ch.UseVisualStyleBackColor = True
         '
         '基本資料
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1499, 698)
+        Me.Controls.Add(Me.字體大小調整_lb)
+        Me.Controls.Add(Me.字體_NUD)
         Me.Controls.Add(Me.所得取消_bt)
         Me.Controls.Add(Me.所得全選_bt)
         Me.Controls.Add(Me.同帳取消_bt)
         CType(Me.LOG1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LOG2_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
     Friend WithEvents GroupBox1 As GroupBox
     Friend WithEvents 所得全選_bt As Button
     Friend WithEvents 所得指定_tb As TextBox
     Friend WithEvents Label28 As Label
+    Friend WithEvents 字體大小調整_lb As Label
+    Friend WithEvents 字體_NUD As NumericUpDown
+    Friend WithEvents 下層帳號_ch As CheckBox
 End Class

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

         客戶下_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
         客戶下_dgv.Columns(0).FillWeight = 80 : 客戶下_dgv.Columns(1).Visible = False : 客戶下_dgv.Columns(2).FillWeight = 80 : 客戶下_dgv.Columns(3).FillWeight = 80
         客戶下_dgv.Columns(4).FillWeight = 80 : 客戶下_dgv.Columns(5).Visible = False : 客戶下_dgv.Columns(6).Visible = False : 客戶下_dgv.Columns(7).FillWeight = 70
-        客戶下_dgv.Columns(8).FillWeight = 47 : 客戶下_dgv.Columns(9).FillWeight = 47 : 客戶下_dgv.Columns(10).FillWeight = 47
+        客戶下_dgv.Columns(8).FillWeight = 47 : 客戶下_dgv.Columns(9).FillWeight = 47 : 客戶下_dgv.Columns(10).FillWeight = 47 : 客戶下_dgv.Columns(11).FillWeight = 47
         For i As Integer = 0 To 客戶下_dgv.Rows.Count - 1
             If IsDBNull(客戶下_dgv("計算", i).Value) Then : 客戶下_dgv("計算", i).Value = False : End If
             If IsDBNull(客戶下_dgv("同帳", i).Value) Then : 客戶下_dgv("同帳", i).Value = False : End If
             If IsDBNull(客戶下_dgv("所得", i).Value) Then : 客戶下_dgv("所得", i).Value = False : End If
+            If IsDBNull(客戶下_dgv("下層", i).Value) Then : 客戶下_dgv("下層", i).Value = False : End If
         Next
     End Sub
     Private Sub Set_商客清單()
         Me.MdiParent = GA_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True : GA_ERP_SYS.WindowState = 0
         商品_tb.Enabled = False : 網址2_tb.Enabled = False : 編號_tb.Enabled = False : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_tb.Enabled = False
         客戶下_tb.Enabled = False : 客戶名稱_tb.Enabled = False : L50.Visible = False : 參與計算_ch.Enabled = False : 上下同帳_ch.Enabled = False : 所得計算_ch.Enabled = False
-        所得指定_tb.Enabled = False
+        所得指定_tb.Enabled = False : 下層帳號_ch.Enabled = False
         PictureBox1.BringToFront()
         '-------------------------------------------------------------------------------------------------------
         SQL_下拉資料清單讀取()
         資料_cb.Items.Clear() : While (dr.Read()) : 資料_cb.Items.Add(dr("資料")) : End While : conn.Close()
         '-------------------------------------------------------------------------------------------------------
         Set_基數下拉讀取1() : Set_商品下拉讀取1()
-
+        If GA_ERP_SYS.Size.Width > 1440 And GA_ERP_SYS.Size.Height > 900 Then
+            字體_NUD.Value = 9
+        ElseIf GA_ERP_SYS.Size.Width <= 1440 And GA_ERP_SYS.Size.Height <= 900 Then
+            字體_NUD.Value = 7.6
+        End If
         If CC(16) = False Then
             進階控制_bt.Enabled = False
         End If
         系統_cb.SelectedIndex = 0 : 系統1_cb.SelectedIndex = 0
         PA = "" : PA1 = "" : PA9 = "" : PA16 = "" : Set_商品清單() : Set_基數清單() : Set_資料清單() : Set_客戶下清單() : Set_商客清單() : Set_LOG1() : Set_LOG2()
     End Sub
+    Private Sub 基本資料_SizeChanged(sender As Object, e As EventArgs) Handles MyBase.SizeChanged
+        If GA_ERP_SYS.Size.Width > 1440 And GA_ERP_SYS.Size.Height > 900 Then
+            字體_NUD.Value = 9
+        ElseIf GA_ERP_SYS.Size.Width <= 1440 And GA_ERP_SYS.Size.Height <= 900 Then
+            字體_NUD.Value = 7.6
+        End If
+    End Sub
+    Private Sub 字體_NUD_ValueChanged(sender As Object, e As EventArgs) Handles 字體_NUD.ValueChanged
+        商品_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        商客_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        客戶下_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+    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 : 編號_tb.Text = 商品_dgv("編號", e.RowIndex).Value.ToString
             下行1_cb.Text = 客戶下_dgv("基數", e.RowIndex).Value.ToString : 客戶名稱_tb.Text = 客戶下_dgv("客戶名稱", e.RowIndex).Value.ToString
             網址4_tb.Text = 客戶下_dgv("網址", e.RowIndex).Value.ToString : 參與計算_ch.Checked = 客戶下_dgv("計算", e.RowIndex).Value
             上下同帳_ch.Checked = 客戶下_dgv("同帳", e.RowIndex).Value : 所得計算_ch.Checked = 客戶下_dgv("所得", e.RowIndex).Value
-            帳號3_cb.Text = 帳號4_cb.Text & " - " & 老闆_cb.Text
+            帳號3_cb.Text = 帳號4_cb.Text & " - " & 老闆_cb.Text : 所得指定_tb.Text = 客戶下_dgv("所得另算", e.RowIndex).Value.ToString
+            下層帳號_ch.Checked = 客戶下_dgv("下層", e.RowIndex).Value
         End If
     End Sub
     Private Sub 商客_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 商客_dgv.CellClick
     Private Sub 客戶下新增_bt_Click(sender As Object, e As EventArgs) Handles 客戶下新增_bt.Click
         客戶下新增_bt.Enabled = False : 客戶下_tb.Enabled = True : 客戶名稱_tb.Enabled = True : 所得指定_tb.Enabled = True
         客戶下_tb.Text = "" : 客戶名稱_tb.Text = "" : 參與計算_ch.Checked = True : 上下同帳_ch.Checked = False : 所得計算_ch.Checked = True
+        下層帳號_ch.Enabled = True
     End Sub
     Private Sub 客戶下修正_bt_Click(sender As Object, e As EventArgs) Handles 客戶下修正_bt.Click
         客戶下修正_bt.Enabled = False : 客戶下_tb.Enabled = True : 客戶名稱_tb.Enabled = True : 所得指定_tb.Enabled = True
     Private Sub 取消2_bt_Click(sender As Object, e As EventArgs) Handles 取消2_bt.Click
         客戶下修正_bt.Enabled = True : 客戶下新增_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_tb.Enabled = False
         參與計算_ch.Checked = False : 上下同帳_ch.Checked = False : 所得計算_ch.Checked = False : 所得指定_tb.Enabled = False
+        下層帳號_ch.Enabled = False
     End Sub
     Private Sub 客戶下刪除_bt_Click(sender As Object, e As EventArgs) Handles 客戶下刪除_bt.Click
         Dim aa As MsgBoxResult = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
             For i As Integer = 0 To 客戶下_dgv.Rows.Count - 1
                 MyModule1.進度條()
                 PA = 客戶下_dgv("流水號", i).Value.ToString : BL1 = 客戶下_dgv("計算", i).Value : BL2 = 客戶下_dgv("同帳", i).Value : BL3 = 客戶下_dgv("所得", i).Value
-                PA1 = 客戶下_dgv("所得指定", i).Value.ToString
+                PA1 = 客戶下_dgv("所得另算", i).Value.ToString : BL4 = 客戶下_dgv("下層", i).Value
                 SQL_系統編碼規則_客戶下批改()
             Next : GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0 : MsgBox("批量存檔完成!!!")
         End If : conn.Close() : PA = ""
     End Sub
     Private Sub 進階控制_bt_Click(sender As Object, e As EventArgs) Handles 進階控制_bt.Click
         If PictureBox1.Visible = False Then
-            PictureBox1.Visible = True : 參與計算_ch.Enabled = False : 上下同帳_ch.Enabled = False : 所得計算_ch.Enabled = False
+            PictureBox1.Visible = True : 參與計算_ch.Enabled = False : 上下同帳_ch.Enabled = False : 所得計算_ch.Enabled = False : 下層帳號_ch.Enabled = False
         Else
-            PictureBox1.Visible = False : 參與計算_ch.Enabled = True : 上下同帳_ch.Enabled = True : 所得計算_ch.Enabled = True
+            PictureBox1.Visible = False : 參與計算_ch.Enabled = True : 上下同帳_ch.Enabled = True : 所得計算_ch.Enabled = True : 下層帳號_ch.Enabled = True
         End If
     End Sub
     Private Sub LOG檔_bt_Click(sender As Object, e As EventArgs) Handles LOG檔_bt.Click

GA-ERP-SYS/報表系統管理/帳務彙總計算表.Designer.vb

     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        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()
-        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.流水帳_dgv = New System.Windows.Forms.DataGridView()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.資料_cb = New System.Windows.Forms.ComboBox()
         '
         '流水帳_dgv
         '
-        DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.流水帳_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
+        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
         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
         '
         '彙總_dgv
         '
-        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.彙總_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.彙總_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.彙總_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.彙總_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.彙總_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.彙總_dgv.Name = "彙總_dgv"
         Me.彙總_dgv.RowHeadersWidth = 4
-        DataGridViewCellStyle18.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.彙總_dgv.RowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.彙總_dgv.RowsDefaultCellStyle = DataGridViewCellStyle3
         Me.彙總_dgv.RowTemplate.Height = 24
         Me.彙總_dgv.Size = New System.Drawing.Size(241, 961)
         Me.彙總_dgv.TabIndex = 1521
         '
         '彙總1_dgv
         '
-        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.彙總1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.彙總1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.彙總1_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.彙總1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.彙總2_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.彙總2_dgv.Name = "彙總2_dgv"
         Me.彙總2_dgv.RowHeadersWidth = 4
-        DataGridViewCellStyle20.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.彙總2_dgv.RowsDefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.彙總2_dgv.RowsDefaultCellStyle = DataGridViewCellStyle5
         Me.彙總2_dgv.RowTemplate.Height = 24
         Me.彙總2_dgv.Size = New System.Drawing.Size(512, 257)
         Me.彙總2_dgv.TabIndex = 1535
         '
         '客戶下_dgv
         '
-        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.客戶下_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.客戶下_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
         Me.客戶下_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.客戶下_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         '
         'LOG1_dgv
         '
-        DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.LOG1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.LOG1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
         Me.LOG1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.LOG1_dgv.Location = New System.Drawing.Point(6, 18)
         Me.LOG1_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         '
         'LOG2_dgv
         '
-        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.LOG2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.LOG2_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
         Me.LOG2_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.LOG2_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         '
         '日期_dgv
         '
-        DataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.日期_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.日期_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
         Me.日期_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         '
         '彙總3_dgv
         '
-        DataGridViewCellStyle25.BackColor = System.Drawing.Color.LightGoldenrodYellow
-        Me.彙總3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.彙總3_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
         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.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.彙總3_dgv.Name = "彙總3_dgv"
         Me.彙總3_dgv.RowHeadersWidth = 4
-        DataGridViewCellStyle26.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.彙總3_dgv.RowsDefaultCellStyle = DataGridViewCellStyle26
+        DataGridViewCellStyle11.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.彙總3_dgv.RowsDefaultCellStyle = DataGridViewCellStyle11
         Me.彙總3_dgv.RowTemplate.Height = 24
         Me.彙總3_dgv.Size = New System.Drawing.Size(512, 514)
         Me.彙總3_dgv.TabIndex = 1579
         '
         '彙總4_dgv
         '
-        DataGridViewCellStyle27.BackColor = System.Drawing.Color.LightGoldenrodYellow
-        Me.彙總4_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightGoldenrodYellow
+        Me.彙總4_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
         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.客戶_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.客戶_dgv.Name = "客戶_dgv"
         Me.客戶_dgv.RowHeadersWidth = 4
-        DataGridViewCellStyle28.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.客戶_dgv.RowsDefaultCellStyle = DataGridViewCellStyle28
+        DataGridViewCellStyle13.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.客戶_dgv.RowsDefaultCellStyle = DataGridViewCellStyle13
         Me.客戶_dgv.RowTemplate.Height = 24
         Me.客戶_dgv.Size = New System.Drawing.Size(393, 257)
         Me.客戶_dgv.TabIndex = 1588
         '
         '彙總5_dgv
         '
-        DataGridViewCellStyle29.BackColor = System.Drawing.Color.LightCyan
-        Me.彙總5_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29
+        DataGridViewCellStyle14.BackColor = System.Drawing.Color.LightCyan
+        Me.彙總5_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
         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.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.彙總5_dgv.Name = "彙總5_dgv"
         Me.彙總5_dgv.RowHeadersWidth = 4
-        DataGridViewCellStyle30.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.彙總5_dgv.RowsDefaultCellStyle = DataGridViewCellStyle30
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.彙總5_dgv.RowsDefaultCellStyle = DataGridViewCellStyle15
         Me.彙總5_dgv.RowTemplate.Height = 24
         Me.彙總5_dgv.Size = New System.Drawing.Size(393, 514)
         Me.彙總5_dgv.TabIndex = 1589
         Me.Controls.Add(Me.PictureBox1)
         Me.Controls.Add(Me.彙總1_dgv)
         Me.Controls.Add(Me.彙總_dgv)
-        Me.Controls.Add(Me.彙總4_dgv)
         Me.Controls.Add(Me.L50)
         Me.Controls.Add(Me.客戶下_dgv)
         Me.Controls.Add(Me.流水帳_dgv)
         Me.Controls.Add(Me.彙總3_dgv)
-        Me.Controls.Add(Me.Label22)
         Me.Controls.Add(Me.Label21)
+        Me.Controls.Add(Me.Label22)
         Me.Controls.Add(Me.Label18)
+        Me.Controls.Add(Me.彙總4_dgv)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "帳務彙總計算表"

GA-ERP-SYS/報表系統管理/帳務彙總計算表.vb

             If IsDBNull(客戶下_dgv("同帳", i).Value) = True Then : 客戶下_dgv("同帳", i).Value = False : End If
             If IsDBNull(客戶下_dgv("計算", i).Value) = True Then : 客戶下_dgv("計算", i).Value = False : End If
             If IsDBNull(客戶下_dgv("所得", i).Value) = True Then : 客戶下_dgv("所得", i).Value = False : End If
+            If IsDBNull(客戶下_dgv("下層", i).Value) = True Then : 客戶下_dgv("下層", i).Value = False : End If
         Next
     End Sub
     Private Sub Set_流水帳清單1()
         流水帳_dgv.Columns("客戶").FillWeight = 110 : 流水帳_dgv.Columns("商品").FillWeight = 70
         流水帳_dgv.Columns("老闆").FillWeight = 55 : 流水帳_dgv.Columns("帳戶").FillWeight = 70
         流水帳_dgv.Columns("計算").FillWeight = 50 : 流水帳_dgv.Columns("同帳").FillWeight = 50
-        流水帳_dgv.Columns("所得").FillWeight = 50
+        流水帳_dgv.Columns("所得").FillWeight = 50 : 流水帳_dgv.Columns("下層").FillWeight = 50
 
         流水帳_dgv.Columns(7).Visible = False : 流水帳_dgv.Columns(6).Visible = False : 流水帳_dgv.Columns("資料").Visible = False
         流水帳_dgv.Columns(0).Visible = False : 流水帳_dgv.Columns(1).Visible = False : 流水帳_dgv.Columns("同帳指定").Visible = False
         流水帳_dgv.Columns("網址").Visible = False : 流水帳_dgv.Columns("水差").Visible = False : 流水帳_dgv.Columns("所得另算").Visible = False
-        流水帳_dgv.Columns("總監").Visible = False
+        流水帳_dgv.Columns("總監").Visible = False : 流水帳_dgv.Columns("水差2").Visible = False
         流水帳_dgv.Columns("天帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         流水帳_dgv.Columns("地帳").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
         流水帳_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
             If IsDBNull(流水帳_dgv("同帳", i).Value) = True Then : 流水帳_dgv("同帳", i).Value = False : End If
             If IsDBNull(流水帳_dgv("計算", i).Value) = True Then : 流水帳_dgv("計算", i).Value = False : End If
             If IsDBNull(流水帳_dgv("所得", i).Value) = True Then : 流水帳_dgv("所得", i).Value = False : End If
+            If IsDBNull(流水帳_dgv("下層", i).Value) = True Then : 流水帳_dgv("下層", i).Value = False : End If
         Next
         計算()
     End Sub
                 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 : 流水帳_dgv("計算", i).Value = 客戶下_dgv("計算", ii).Value
                     流水帳_dgv("同帳", i).Value = 客戶下_dgv("同帳", ii).Value : 流水帳_dgv("同帳指定", i).Value = 客戶下_dgv("基數", ii).Value
-                    流水帳_dgv("所得", i).Value = 客戶下_dgv("所得", ii).Value : Exit For
+                    流水帳_dgv("所得", i).Value = 客戶下_dgv("所得", ii).Value : 流水帳_dgv("下層", i).Value = 客戶下_dgv("下層", ii).Value : Exit For
                 Else
                     流水帳_dgv("客名", i).Value = "" : 流水帳_dgv("計算", i).Value = False : 流水帳_dgv("同帳", i).Value = False : 流水帳_dgv("所得", i).Value = False
+                    流水帳_dgv("下層", i).Value = False
                 End If
             Next
 
             '------------短版轉換---------------------------------------------------------------------------------------------------------------------------------------
             If Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "短版" Or Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "短板" Then
+                流水帳_dgv.Rows(i).Cells("個人所得").Value = 流水帳_dgv.Rows(i).Cells("個人所得s").Value.ToString
+                流水帳_dgv.Rows(i).Cells("水差").Value = 流水帳_dgv.Rows(i).Cells("水差s").Value.ToString
+                流水帳_dgv.Rows(i).Cells("個人所得1").Value = 流水帳_dgv.Rows(i).Cells("個人所得s").Value.ToString
+                流水帳_dgv.Rows(i).Cells("水差1").Value = 流水帳_dgv.Rows(i).Cells("水差s").Value.ToString
+                流水帳_dgv.Rows(i).Cells("個人所得2").Value = 流水帳_dgv.Rows(i).Cells("個人所得s").Value.ToString
+                流水帳_dgv.Rows(i).Cells("水差2").Value = 流水帳_dgv.Rows(i).Cells("水差s").Value.ToString
                 If 流水帳_dgv("同帳", i).Value = False Then
-                    流水帳_dgv.Rows(i).Cells("個人所得").Value = 流水帳_dgv.Rows(i).Cells("個人所得s").Value.ToString
-                    流水帳_dgv.Rows(i).Cells("水差").Value = 流水帳_dgv.Rows(i).Cells("水差s").Value.ToString
-                    流水帳_dgv.Rows(i).Cells("個人所得1").Value = 流水帳_dgv.Rows(i).Cells("個人所得s").Value.ToString
-                    流水帳_dgv.Rows(i).Cells("水差1").Value = 流水帳_dgv.Rows(i).Cells("水差s").Value.ToString
                     If 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = "短版下行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
                     End If
                     If 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = "短版上行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
                     End If
                 ElseIf 流水帳_dgv("同帳", i).Value = True Then
-                    流水帳_dgv.Rows(i).Cells("個人所得").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差").Value = "0"
-                    流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
+                    '    流水帳_dgv.Rows(i).Cells("個人所得").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差").Value = "0"
+                    '    流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
+                    '    流水帳_dgv.Rows(i).Cells("個人所得2").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差2").Value = "0"
                     If 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = "短版下行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
                     End If
                     If 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總監小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("大股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("股東小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = "短版上行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value
                     End If
                 End If
                 '------------長版轉換---------------------------------------------------------------------------------------------------------------------------------------
             ElseIf Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "長板" Or Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "長版" Then
+                流水帳_dgv.Rows(i).Cells("個人所得").Value = 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString
+                流水帳_dgv.Rows(i).Cells("水差").Value = 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString
+                流水帳_dgv.Rows(i).Cells("個人所得1").Value = 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString
+                流水帳_dgv.Rows(i).Cells("水差1").Value = 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString
+                流水帳_dgv.Rows(i).Cells("個人所得2").Value = 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString
+                流水帳_dgv.Rows(i).Cells("水差2").Value = 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString
                 If 流水帳_dgv("同帳", i).Value = False Then
-                    流水帳_dgv.Rows(i).Cells("個人所得").Value = 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString
-                    流水帳_dgv.Rows(i).Cells("水差").Value = 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString
-                    流水帳_dgv.Rows(i).Cells("個人所得1").Value = 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString
-                    流水帳_dgv.Rows(i).Cells("水差1").Value = 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString
                     If 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("下行基數").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = "長版下行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
                     End If
                     If 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "上缴金额" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("上行基數").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = "長版上行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
                     End If
                 ElseIf 流水帳_dgv("同帳", i).Value = True Then
-                    流水帳_dgv.Rows(i).Cells("個人所得").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差").Value = "0"
-                    流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
+                    '流水帳_dgv.Rows(i).Cells("個人所得").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差").Value = "0"
+                    '流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
+                    '流水帳_dgv.Rows(i).Cells("個人所得2").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差2").Value = "0"
                     If 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value : 流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("地帳").Value = "長版下行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("地帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("地帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("地帳2").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
                     End If
                     If 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "上缴金额" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總監" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總監").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "大股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("大股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "股東" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("股東").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "總代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("總代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "代理" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("代理").Value
                     ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "會員" Then
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value : 流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
-                    Else
-                        流水帳_dgv.Rows(i).Cells("天帳").Value = "長版上行基數沒轉到"
+                        流水帳_dgv.Rows(i).Cells("天帳").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("天帳1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
+                        流水帳_dgv.Rows(i).Cells("天帳2").Value = 流水帳_dgv.Rows(i).Cells("會員").Value
                     End If
                 End If
-            Else
-                流水帳_dgv.Rows(i).Cells("天帳").Value = "長短版沒轉到" : 流水帳_dgv.Rows(i).Cells("地帳").Value = "長短版沒轉到"
-                流水帳_dgv.Rows(i).Cells("個人所得").Value = "長短版沒轉到" : 流水帳_dgv.Rows(i).Cells("水差").Value = "長短版沒轉到"
             End If
 
             '------------地帳反轉---------------------------------------------------------------------------------------------------------------------------------------
             流水帳_dgv.Rows(i).Cells("地帳1").Value = Val(流水帳_dgv.Rows(i).Cells("地帳1").Value) * -1
+            流水帳_dgv.Rows(i).Cells("地帳2").Value = Val(流水帳_dgv.Rows(i).Cells("地帳2").Value) * -1
             '------------天地合帳---------------------------------------------------------------------------------------------------------------------------------------
             流水帳_dgv.Rows(i).Cells("核帳").Value = Val(流水帳_dgv.Rows(i).Cells("天帳1").Value) + Val(流水帳_dgv.Rows(i).Cells("地帳1").Value) +
                                                      Val(流水帳_dgv.Rows(i).Cells("個人所得1").Value)
                 流水帳_dgv.Rows(i).Cells("天帳").Value = "0" : 流水帳_dgv.Rows(i).Cells("地帳").Value = "0" : 流水帳_dgv.Rows(i).Cells("個人所得").Value = "0"
                 流水帳_dgv.Rows(i).Cells("水差").Value = "0" : 流水帳_dgv.Rows(i).Cells("核帳").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
                 流水帳_dgv.Rows(i).Cells("天帳1").Value = "0" : 流水帳_dgv.Rows(i).Cells("地帳1").Value = "0" : 流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0"
+                流水帳_dgv.Rows(i).Cells("天帳2").Value = "0" : 流水帳_dgv.Rows(i).Cells("地帳2").Value = "0" : 流水帳_dgv.Rows(i).Cells("個人所得2").Value = "0"
+                流水帳_dgv.Rows(i).Cells("水差2").Value = "0"
             End If
             If 流水帳_dgv("所得", i).Value = False Then
                 流水帳_dgv.Rows(i).Cells("所得另算").Value = "0"
+                流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0"
+                流水帳_dgv.Rows(i).Cells("個人所得2").Value = "0"
+            End If
+            If 流水帳_dgv("下層", i).Value = True Then
+                流水帳_dgv.Rows(i).Cells("天帳2").Value = "0" : 流水帳_dgv.Rows(i).Cells("地帳2").Value = "0" : 流水帳_dgv.Rows(i).Cells("個人所得2").Value = "0"
+                流水帳_dgv.Rows(i).Cells("水差2").Value = "0"
             End If
             '-----------加總-----------------------------------------------------------------------------------------------------------------------------------------------
             天帳_tb.Text = Val(天帳_tb.Text) + Val(流水帳_dgv.Rows(i).Cells("天帳1").Value)
             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)
+                    彙總3_dgv.Rows(i).Cells("天帳").Value = Val(彙總3_dgv.Rows(i).Cells("天帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("天帳2").Value)
+                    彙總3_dgv.Rows(i).Cells("地帳").Value = Val(彙總3_dgv.Rows(i).Cells("地帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("地帳2").Value)
+                    彙總3_dgv.Rows(i).Cells("個人所得").Value = Val(彙總3_dgv.Rows(i).Cells("個人所得").Value) + Val(流水帳_dgv.Rows(ii).Cells("個人所得2").Value)
+                    彙總3_dgv.Rows(i).Cells("水差").Value = Val(彙總3_dgv.Rows(i).Cells("水差").Value) + Val(流水帳_dgv.Rows(ii).Cells("水差2").Value)
                 End If
             Next
 
                 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)
+                    彙總4_dgv.Rows(i).Cells("天帳").Value = Val(彙總4_dgv.Rows(i).Cells("天帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("天帳2").Value)
+                    彙總4_dgv.Rows(i).Cells("地帳").Value = Val(彙總4_dgv.Rows(i).Cells("地帳").Value) + Val(流水帳_dgv.Rows(ii).Cells("地帳2").Value)
+                    彙總4_dgv.Rows(i).Cells("個人所得").Value = Val(彙總4_dgv.Rows(i).Cells("個人所得").Value) + Val(流水帳_dgv.Rows(ii).Cells("個人所得2").Value)
+                    彙總4_dgv.Rows(i).Cells("水差").Value = Val(彙總4_dgv.Rows(i).Cells("水差").Value) + Val(流水帳_dgv.Rows(ii).Cells("水差2").Value)
                 End If
             Next
 
         彙總2_dgv.Visible = True : 彙總3_dgv.Visible = True : 彙總4_dgv.Visible = False : PictureBox1.Visible = True : PictureBox1.BringToFront()
         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
+        If GA_ERP_SYS.Size.Width > 1440 And GA_ERP_SYS.Size.Height > 900 Then
+            字體_NUD.Value = 9
+        ElseIf GA_ERP_SYS.Size.Width <= 1440 And GA_ERP_SYS.Size.Height <= 900 Then
+            字體_NUD.Value = 7.6
+        End If
     End Sub
     Private Sub 帳務彙總計算表_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
         資料數 = 8
         資料_cb.SelectedIndex = 0 : MyModule1.進度條()
         GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
     End Sub
+    Private Sub 帳務彙總計算表_SizeChanged(sender As Object, e As EventArgs) Handles MyBase.SizeChanged
+        If GA_ERP_SYS.Size.Width > 1440 And GA_ERP_SYS.Size.Height > 900 Then
+            字體_NUD.Value = 9
+        ElseIf GA_ERP_SYS.Size.Width <= 1440 And GA_ERP_SYS.Size.Height <= 900 Then
+            字體_NUD.Value = 7.6
+        End If
+    End Sub
+    Private Sub 字體_NUD_ValueChanged(sender As Object, e As EventArgs) Handles 字體_NUD.ValueChanged
+        彙總_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        彙總2_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        彙總3_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        彙總4_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        客戶_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        彙總5_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+    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
         Else : 彙總1_dgv.Visible = False : GA_ERP_SYS.WindowState = 0 : End If
     End Sub
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 上繳關聯表_bt.Click
-        If 彙總4_dgv.Visible = False Then : 彙總4_dgv.Visible = True : 彙總1_dgv.BringToFront() : Else : 彙總4_dgv.Visible = False : End If
+        If 彙總4_dgv.Visible = False Then : 彙總4_dgv.Visible = True : 彙總4_dgv.BringToFront() : Else : 彙總4_dgv.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
-        Dim 執行 As Boolean
-        For i As Integer = 0 To 彙總_dgv.Rows.Count - 1
-            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
+        If 結束日期_dtp.Value > Today() Then
+            MsgBox("日期條件大於今日，網站無法給出資料!!!!")
+        Else
+            Dim 執行 As Boolean
+            For i As Integer = 0 To 彙總_dgv.Rows.Count - 1
+                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
+            Next
+
+            If 執行 = True Then
+                SQL_自動導入判斷()
+                If dr.Read() Then
+                    If dr("正在自動導入中").ToString = "YES" Then
+                        MsgBox("自動導入進行中，不可以重複導入!!") : conn.Close() : dr.Close()
+                    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_刪除1() : SQL_查詢日期寫入1()
+                        If File.Exists("000.csv") Then
+                            File.Delete("000.csv")
+                        End If
+                        If File.Exists(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv") Then
+                            File.Delete(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv")
+                        End If
+                        Dim FilePath As String = "000.csv"
+                        Try
+                            Using fs As IO.FileStream = New IO.FileStream(FilePath, FileMode.Append)
+                                Using sw As StreamWriter = New StreamWriter(fs, Encoding.Default)
+                                    Dim str As String = "8888,"
+                                    Dim str1 As String = 業務名稱 & ","
+                                    sw.WriteLine(str)   '插入一整行
+                                    sw.Write(str1)   '第一行
+                                    sw.Flush()
+                                End Using
+                            End Using
+                        Catch ex As Exception
+                        End Try
+                        '-----------------------------------------------------------------------
+                        Shell("Auto.exe", vbNormalFocus)
+                        Timer1.Enabled = True
+                    End If
+                End If
+            Else
+                MsgBox("沒有需要重新導入的網址與帳號!!")
             End If
-        Next
+        End If
+    End Sub
 
-        If 執行 = True Then
+    Private Sub 自動導入_bt_Click(sender As Object, e As EventArgs) Handles 自動導入_bt.Click
+        If 結束日期_dtp.Value > Today() Then
+            MsgBox("日期條件大於今日，網站無法給出資料!!!!")
+        Else
             SQL_自動導入判斷()
             If dr.Read() Then
                 If dr("正在自動導入中").ToString = "YES" Then
                 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_刪除1() : SQL_查詢日期寫入1()
+                    SQL_流水帳同日期清除() : SQL_查詢日期清空() : SQL_LOG_刪除1() : SQL_查詢日期寫入()
                     If File.Exists("000.csv") Then
                         File.Delete("000.csv")
                     End If
                     Timer1.Enabled = True
                 End If
             End If
-        Else
-            MsgBox("沒有需要重新導入的網址與帳號!!")
-        End If
-    End Sub
-
-    Private Sub 自動導入_bt_Click(sender As Object, e As EventArgs) Handles 自動導入_bt.Click
-        SQL_自動導入判斷()
-        If dr.Read() Then
-            If dr("正在自動導入中").ToString = "YES" Then
-                MsgBox("自動導入進行中，不可以重複導入!!") : conn.Close() : dr.Close()
-            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_查詢日期清空() : SQL_LOG_刪除1() : SQL_查詢日期寫入()
-                If File.Exists("000.csv") Then
-                    File.Delete("000.csv")
-                End If
-                If File.Exists(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv") Then
-                    File.Delete(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv")
-                End If
-                Dim FilePath As String = "000.csv"
-                Try
-                    Using fs As IO.FileStream = New IO.FileStream(FilePath, FileMode.Append)
-                        Using sw As StreamWriter = New StreamWriter(fs, Encoding.Default)
-                            Dim str As String = "8888,"
-                            Dim str1 As String = 業務名稱 & ","
-                            sw.WriteLine(str)   '插入一整行
-                            sw.Write(str1)   '第一行
-                            sw.Flush()
-                        End Using
-                    End Using
-                Catch ex As Exception
-                End Try
-                '-----------------------------------------------------------------------
-                Shell("Auto.exe", vbNormalFocus)
-                Timer1.Enabled = True
-            End If
         End If
     End Sub
     Private Sub 開網站_bt_Click(sender As Object, e As EventArgs) Handles 開網站_bt.Click
         End If
     End Sub
     Private Sub 批次導入_bt_Click(sender As Object, e As EventArgs) Handles 批次導入_bt.Click
-        R_bT.PerformClick() : 批次 = 0 : Timer2.Enabled = True
+        If 結束日期_dtp.Value > Today() Then
+            MsgBox("日期條件大於今日，網站無法給出資料!!!!")
+        Else
+            R_bT.PerformClick() : 批次 = 0 : Timer2.Enabled = True
+        End If
     End Sub
     Private Sub 清除_bt_Click(sender As Object, e As EventArgs) Handles 清除_bt.Click
         網址_tb.Text = "" : 重讀_bt.PerformClick()
             End If
         End If
     End Sub
-    Private Sub 字體_NUD_ValueChanged(sender As Object, e As EventArgs) Handles 字體_NUD.ValueChanged
-        彙總_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
-        彙總2_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
-        彙總3_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
-        彙總4_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
-        客戶_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
-        彙總5_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
-    End Sub
     Dim 已超出 As Boolean
     Private Sub 彙總1_dgv_MouseUp(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles 彙總1_dgv.MouseUp
         'If 彙總1_dgv.SelectedCells.Count = 1 Then : MsgBox(彙總1_dgv.SelectedCells(0).ColumnIndex & "  " & 彙總1_dgv.SelectedCells(0).RowIndex) : End If

GA-ERP-SYS/報表系統管理/帳務明細查詢表.vb

         For i As Integer = 0 To 所得彙總_dgv.Rows.Count - 1
             所得彙總_dgv("所得", i).Value = "0"
             For II As Integer = 0 To 流水帳_dgv.Rows.Count - 1
-                If 流水帳_dgv("所得指定", II).Value.ToString = 所得指定_cb.Text And 流水帳_dgv("所得", i).Value = True And
+                If 流水帳_dgv("所得指定", II).Value.ToString = 所得指定_cb.Text And 流水帳_dgv("所得", II).Value = True And
                     流水帳_dgv("商品", II).Value.ToString = 所得彙總_dgv("商品", i).Value.ToString Then
                     所得彙總_dgv("所得", i).Value = Val(所得彙總_dgv("所得", i).Value) + Val(流水帳_dgv("個人所得1", II).Value.ToString)
                 End If
             If IsDBNull(客戶下_dgv("同帳", i).Value) = True Then : 客戶下_dgv("同帳", i).Value = False : End If
             If IsDBNull(客戶下_dgv("計算", i).Value) = True Then : 客戶下_dgv("計算", i).Value = False : End If
             If IsDBNull(客戶下_dgv("所得", i).Value) = True Then : 客戶下_dgv("所得", i).Value = False : End If
+            If IsDBNull(客戶下_dgv("下層", i).Value) = True Then : 客戶下_dgv("下層", i).Value = False : End If
         Next
     End Sub
     Private Sub Set_日期清單()
         流水帳_dgv.Columns("客戶").FillWeight = 110 : 流水帳_dgv.Columns("商品").FillWeight = 70
         流水帳_dgv.Columns("老闆").FillWeight = 55 : 流水帳_dgv.Columns("帳戶").FillWeight = 70
         流水帳_dgv.Columns("計算").FillWeight = 50 : 流水帳_dgv.Columns("同帳").FillWeight = 50
-        流水帳_dgv.Columns("所得").FillWeight = 50
+        流水帳_dgv.Columns("所得").FillWeight = 50 : 流水帳_dgv.Columns("下層").FillWeight = 50
 
         流水帳_dgv.Columns(7).Visible = False : 流水帳_dgv.Columns(6).Visible = False : 流水帳_dgv.Columns("資料").Visible = False
         流水帳_dgv.Columns(0).Visible = False : 流水帳_dgv.Columns(1).Visible = False : 流水帳_dgv.Columns("同帳指定").Visible = False
             If IsDBNull(流水帳_dgv("同帳", i).Value) = True Then : 流水帳_dgv("同帳", i).Value = False : End If
             If IsDBNull(流水帳_dgv("計算", i).Value) = True Then : 流水帳_dgv("計算", i).Value = False : End If
             If IsDBNull(流水帳_dgv("所得", i).Value) = True Then : 流水帳_dgv("所得", i).Value = False : End If
+            If IsDBNull(流水帳_dgv("下層", i).Value) = True Then : 流水帳_dgv("下層", i).Value = False : End If
             流水帳_dgv("所得指定", i).Value = ""
         Next
         計算()
                     流水帳_dgv("客戶名稱", i).Value = 客戶下_dgv("客戶名稱", ii).Value.ToString : 流水帳_dgv("計算", i).Value = 客戶下_dgv("計算", ii).Value
                     流水帳_dgv("同帳", i).Value = 客戶下_dgv("同帳", ii).Value : 流水帳_dgv("同帳指定", i).Value = 客戶下_dgv("基數", ii).Value
                     流水帳_dgv("所得", i).Value = 客戶下_dgv("所得", ii).Value : 流水帳_dgv("下客流水", i).Value = 客戶下_dgv("流水號", ii).Value
-                    流水帳_dgv("所得指定", i).Value = 客戶下_dgv("所得另算", ii).Value
+                    流水帳_dgv("所得指定", i).Value = 客戶下_dgv("所得另算", ii).Value : 流水帳_dgv("下層", i).Value = 客戶下_dgv("下層", ii).Value
                     Exit For
                 Else
                     流水帳_dgv("客戶名稱", i).Value = "" : 流水帳_dgv("計算", i).Value = False : 流水帳_dgv("同帳", i).Value = False : 流水帳_dgv("所得", i).Value = False
+                    流水帳_dgv("下層", i).Value = False
                 End If
             Next
             '------------短版轉換---------------------------------------------------------------------------------------------------------------------------------------
             End If
             If 流水帳_dgv("所得", i).Value = False Then
                 流水帳_dgv.Rows(i).Cells("所得另算").Value = "0"
+                流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0"
             End If
         Next
         GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
         For i As Integer = 0 To 流水帳_dgv.Rows.Count - 1
             If 流水帳_dgv("所得", i).Value = False Then
                 流水帳_dgv.Rows(i).Cells("個人所得").Value = "0"
+                流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0"
             End If
             If 流水帳_dgv("同帳", i).Value = True Then
                 If Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "短版" Or Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "短板" Then
         日期_dgv.Visible = False : 客戶下_dgv.Visible = False : PictureBox1.BringToFront() : Panel1.Visible = False
         天_ch.Checked = False : 周_ch.Checked = True : 月_ch.Checked = False
         DA1_bt.Text = "上一週" : DA2_bt.Text = "本週" : DA3_bt.Text = "下一週"
+        If GA_ERP_SYS.Size.Width > 1440 And GA_ERP_SYS.Size.Height > 900 Then
+            字體_NUD.Value = 9
+        ElseIf GA_ERP_SYS.Size.Width <= 1440 And GA_ERP_SYS.Size.Height <= 900 Then
+            字體_NUD.Value = 7.6
+        End If
     End Sub
     Private Sub 帳務明細查詢表_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
         Set_日期清單() : 資料_cb.SelectedIndex = 0
     End Sub
     Private Sub 帳務明細查詢表_SizeChanged(sender As Object, e As EventArgs) Handles MyBase.SizeChanged
         If 首次登入 = False Then : Set_客戶下清單() : Set_流水帳清單1() : End If
+        If GA_ERP_SYS.Size.Width > 1440 And GA_ERP_SYS.Size.Height > 900 Then
+            字體_NUD.Value = 9
+        ElseIf GA_ERP_SYS.Size.Width <= 1440 And GA_ERP_SYS.Size.Height <= 900 Then
+            字體_NUD.Value = 7.6
+        End If
+    End Sub
+    Private Sub 字體_NUD_ValueChanged(sender As Object, e As EventArgs) Handles 字體_NUD.ValueChanged
+        流水帳_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
+        所得彙總_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
     End Sub
     Private Sub 帳務明細查詢表_Closing(sender As Object, e As EventArgs) Handles MyBase.Closing
         首次登入 = True
             End If
             If 流水帳_dgv("所得", YY).Value = False Then
                 流水帳_dgv.Rows(YY).Cells("個人所得").Value = "0"
+                流水帳_dgv.Rows(YY).Cells("個人所得1").Value = "0"
             End If
             If 流水帳_dgv("同帳", YY).Value = True Then
                 If Strings.Left(流水帳_dgv.Rows(YY).Cells("資料").Value, 2) = "短版" Or Strings.Left(流水帳_dgv.Rows(YY).Cells("資料").Value, 2) = "短板" Then
         'If 流水帳_dgv.SelectedCells.Count = 1 Then : MsgBox(流水帳_dgv.SelectedCells(0).ColumnIndex & "  " & 流水帳_dgv.SelectedCells(0).RowIndex) : End If
         If 流水帳_dgv.SelectedCells.Count = 1 Then : 已超出 = False : End If
         If 流水帳_dgv.SelectedCells.Count > 0 Then
-            If 流水帳_dgv.SelectedCells(0).ColumnIndex >= 10 And 流水帳_dgv.SelectedCells(0).ColumnIndex <= 17 Then
+            If 流水帳_dgv.SelectedCells(0).ColumnIndex >= 10 And 流水帳_dgv.SelectedCells(0).ColumnIndex <= 18 Then
                 If 已超出 = False Then
                     Dim x As Double = 0
                     For i As Integer = 0 To 流水帳_dgv.SelectedCells.Count - 1
-                        x += Val(流水帳_dgv.Rows(流水帳_dgv.SelectedCells.Item(i).RowIndex).Cells(流水帳_dgv.SelectedCells.Item(i).ColumnIndex + 8).Value)
+                        If 流水帳_dgv.Rows(流水帳_dgv.SelectedCells.Item(i).RowIndex).Cells("所得").Value = False Then
+
+                        End If
+                        x += Val(流水帳_dgv.Rows(流水帳_dgv.SelectedCells.Item(i).RowIndex).Cells(流水帳_dgv.SelectedCells.Item(i).ColumnIndex + 9).Value)
                     Next i : 加總_tb.Text = Strings.Format(x, "#,##0") : GA_ERP_SYS.合計_TSSL.Text = "合計 : " & Strings.Format(x, "#,##0")
                 Else : 加總_tb.Text = Strings.Format(0, "#,##0") : GA_ERP_SYS.合計_TSSL.Text = "合計 : " & Strings.Format(0, "#,##0") : End If
             Else : 已超出 = True : 加總_tb.Text = Strings.Format(0, "#,##0") : GA_ERP_SYS.合計_TSSL.Text = "合計 : " & Strings.Format(0, "#,##0")
         GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
     End Sub
     Private Sub 自動導入_bt_Click(sender As Object, e As EventArgs) Handles 自動導入_bt.Click
-        SQL_自動導入判斷()
-        If dr.Read() Then
-            If dr("正在自動導入中").ToString = "YES" Then
-                MsgBox("自動導入進行中，不可以重複導入!!") : conn.Close() : dr.Close()
-            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_查詢日期清空() : SQL_LOG_刪除1() : SQL_查詢日期寫入()
-                If File.Exists("000.csv") Then
-                    File.Delete("000.csv")
-                End If
-                If File.Exists(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv") Then
-                    File.Delete(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv")
-                End If
-                Dim FilePath As String = "000.csv"
-                Try
-                    Using fs As IO.FileStream = New IO.FileStream(FilePath, FileMode.Append)
-                        Using sw As StreamWriter = New StreamWriter(fs, Encoding.Default)
-                            Dim str As String = "8888,"
-                            Dim str1 As String = 業務名稱 & ","
-                            sw.WriteLine(str)   '插入一整行
-                            sw.Write(str1)   '第一行
-                            sw.Flush()
+        If 結束日期_dtp.Value > Today() Then
+            MsgBox("日期條件大於今日，網站無法給出資料!!!!")
+        Else
+            SQL_自動導入判斷()
+            If dr.Read() Then
+                If dr("正在自動導入中").ToString = "YES" Then
+                    MsgBox("自動導入進行中，不可以重複導入!!") : conn.Close() : dr.Close()
+                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_查詢日期清空() : SQL_LOG_刪除1() : SQL_查詢日期寫入()
+                    If File.Exists("000.csv") Then
+                        File.Delete("000.csv")
+                    End If
+                    If File.Exists(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv") Then
+                        File.Delete(My.Computer.FileSystem.SpecialDirectories.Desktop & "000.csv")
+                    End If
+                    Dim FilePath As String = "000.csv"
+                    Try
+                        Using fs As IO.FileStream = New IO.FileStream(FilePath, FileMode.Append)
+                            Using sw As StreamWriter = New StreamWriter(fs, Encoding.Default)
+                                Dim str As String = "8888,"
+                                Dim str1 As String = 業務名稱 & ","
+                                sw.WriteLine(str)   '插入一整行
+                                sw.Write(str1)   '第一行
+                                sw.Flush()
+                            End Using
                         End Using
-                    End Using
-                Catch ex As Exception
-                End Try
-                '-----------------------------------------------------------------------
-                Shell("Auto.exe", vbNormalFocus)
-                Timer1.Enabled = True
+                    Catch ex As Exception
+                    End Try
+                    '-----------------------------------------------------------------------
+                    Shell("Auto.exe", vbNormalFocus)
+                    Timer1.Enabled = True
+                End If
             End If
         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 字體_NUD_ValueChanged(sender As Object, e As EventArgs) Handles 字體_NUD.ValueChanged
-        流水帳_dgv.RowsDefaultCellStyle.Font = New System.Drawing.Font("微軟正黑體", 字體_NUD.Value)
-    End Sub
     Private Sub 開啟基本資料_bt_Click(sender As Object, e As EventArgs) Handles 開啟基本資料_bt.Click
         基本資料.Show() : 基本資料.BringToFront() : Me.Close()
     End Sub
             End If
             If 流水帳_dgv("所得", i).Value = False Then
                 流水帳_dgv.Rows(i).Cells("個人所得").Value = "0"
+                流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0"
             End If
             If 流水帳_dgv("同帳", i).Value = True Then
                 If Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "短版" Or Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "短板" Then
             For i As Integer = 0 To 流水帳_dgv.Rows.Count - 1
                 MyModule1.進度條()
                 PA = 流水帳_dgv("下客流水", i).Value.ToString : BL1 = 流水帳_dgv("計算", i).Value : BL2 = 流水帳_dgv("同帳", i).Value : BL3 = 流水帳_dgv("所得", i).Value
-                PA1 = 流水帳_dgv("所得指定", i).Value.ToString
+                PA1 = 流水帳_dgv("所得指定", i).Value.ToString : BL4 = 流水帳_dgv("下層", i).Value
                 SQL_系統編碼規則_客戶下批改()
             Next : GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0 : MsgBox("批量存檔完成!!!")
             SQL_客戶下所得名稱清單() : 所得指定_cb.Items.Clear() : While (dr.Read()) : 所得指定_cb.Items.Add(dr("所得另算")) : End While : conn.Close()

GA-ERP-SYS/特殊操作功能/流水帳手動輸入.vb

         流水帳_dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill
         For i As Integer = 0 To 流水帳_dgv.Rows.Count - 1
             流水帳_dgv.Rows(i).Cells("選擇").Value = False
-            流水帳_dgv.Rows(i).Cells("網址").Value = "http:\" & 流水帳_dgv.Rows(i).Cells("網址").Value.ToString
+            流水帳_dgv.Rows(i).Cells("網址").Value = 流水帳_dgv.Rows(i).Cells("網址").Value.ToString
         Next
     End Sub
     Private Sub Set_商客清單()
         For II As Integer = 0 To 流水帳_dgv.Rows.Count - 1
             流水帳_dgv("日期", II).Value = Format(結束日期_dtp.Value, "yyyy-MM-dd")
             流水帳_dgv.Rows(II).Cells("選擇").Value = True
-            流水帳_dgv.Rows(II).Cells("網址").Value = "http:\" & 網址_tb.Text
+            流水帳_dgv.Rows(II).Cells("網址").Value = 網址_tb.Text
             流水帳_dgv.Rows(II).Cells("帳號").Value = 帳號_tb.Text
             流水帳_dgv.Rows(II).Cells("資料").Value = 資料_tb.Text
         Next
             If 流水帳_dgv.Rows(I).Cells("選擇").Value = True And 流水帳_dgv.Rows(I).Cells("資料").Value.ToString <> "" And 流水帳_dgv.Rows(I).Cells("1").Value.ToString <> "" And
                 流水帳_dgv.Rows(I).Cells("2").Value.ToString <> "" And 流水帳_dgv.Rows(I).Cells("3").Value.ToString <> "" And 流水帳_dgv.Rows(I).Cells("4").Value.ToString <> "" Then
                 PA37 = Strings.Right(流水帳_dgv("資料流水號", I).Value.ToString, 6) : PA38 = Format(開始日期_dtp.Value, "yyyy-MM-dd")
-                PA39 = Format(結束日期_dtp.Value, "yyyy-MM-dd") : PA40 = "http:\" & 網址_tb.Text : PA41 = 帳號_tb.Text
+                PA39 = Format(結束日期_dtp.Value, "yyyy-MM-dd") : PA40 = 網址_tb.Text : PA41 = 帳號_tb.Text
                 If 流水帳_dgv.Rows(I).Cells("資料").Value = "短版(會員)" Then
                     PA1 = "" : PA2 = "" : PA3 = "" : PA4 = "" : PA5 = "" : PA6 = "" : PA7 = "" : PA8 = "" : PA9 = "" : PA10 = "" : PA11 = "" : PA12 = "" : PA13 = ""
                     PA14 = "" : PA15 = "" : PA16 = "" : PA17 = "" : PA18 = "" : PA19 = "" : PA20 = "" : PA21 = "" : PA22 = ""

GA-ERP-SYS/資料庫系統管理/資料備份轉移.Designer.vb

         Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.客戶資料表_dgv = New System.Windows.Forms.DataGridView()
         Me.商品資料表_dgv = New System.Windows.Forms.DataGridView()
         Me.商客基本資料表_dgv = New System.Windows.Forms.DataGridView()
         Me.資料庫_bt = New System.Windows.Forms.Button()
         Me.備份庫_bt = New System.Windows.Forms.Button()
         Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
+        Me.除錯_dgv = New System.Windows.Forms.DataGridView()
         CType(Me.客戶資料表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.商品資料表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.商客基本資料表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.下行客戶1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.商客基本資料表1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.商品資料表1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.除錯_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '客戶資料表_dgv
         Me.ProgressBar1.Size = New System.Drawing.Size(1132, 20)
         Me.ProgressBar1.TabIndex = 1529
         '
+        '除錯_dgv
+        '
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.除錯_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        Me.除錯_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.除錯_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.除錯_dgv.Location = New System.Drawing.Point(434, 34)
+        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(243, 140)
+        Me.除錯_dgv.TabIndex = 1551
+        Me.除錯_dgv.Visible = False
+        '
         '資料備份轉移
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1147, 698)
+        Me.Controls.Add(Me.除錯_dgv)
         Me.Controls.Add(Me.ProgressBar1)
         Me.Controls.Add(Me.備份庫_bt)
         Me.Controls.Add(Me.資料庫_bt)
         CType(Me.下行客戶1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.商客基本資料表1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.商品資料表1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.除錯_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     Friend WithEvents 資料庫_bt As Button
     Friend WithEvents 備份庫_bt As Button
     Friend WithEvents ProgressBar1 As ProgressBar
+    Friend WithEvents 除錯_dgv As DataGridView
 End Class

GA-ERP-SYS/資料庫系統管理/資料備份轉移.vb

 Public Class 資料備份轉移
-    ReadOnly ds, ds1, ds2, ds3, ds4, ds5, ds6, ds7, ds8 As New DataSet
+    ReadOnly ds, ds1, ds2, ds3, ds4, ds5, ds6, ds7, ds8 As New DataSet : Public 連接 As String
     Public 平均數1 As Integer : Public 最終數1 As Integer = 0 : Public 資料數1 As Integer = 0
     Private Sub Set_客戶資料清單()
         客戶資料表_dgv.DataSource = Nothing : ds.Clear()
         商品資料表1_dgv.Visible = False : 商客基本資料表1_dgv.Visible = False : 下行客戶1_dgv.Visible = False : 流水帳1_dgv.Visible = False
         Set_客戶資料清單()
     End Sub
+    Private Sub Set_修正清單()
+        除錯_dgv.DataSource = Nothing : ds4.Clear()
+        除錯_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        除錯_dgv.ColumnHeadersHeight = 25
+        除錯_dgv.AllowUserToAddRows = False
+        If 連接 = 1 Then : ConnOpen_備份1() : Else : ConnOpen_備份2() : End If
+        SQL_流水帳修正()
+        da.Fill(ds4) : 除錯_dgv.DataSource = ds4.Tables(0) : conn.Close()
+        資料數 = 除錯_dgv.Rows.Count
+        For I As Integer = 0 To 除錯_dgv.Rows.Count - 1
+            MyModule1.進度條()
+            除錯_dgv("網址", I).Value = Strings.Mid(除錯_dgv("網址", I).Value, 7, 100)
+            PA1 = 除錯_dgv("網址", I).Value : PA2 = 除錯_dgv("index", I).Value : PA3 = 除錯_dgv("開始日期", I).Value
+            PA4 = 除錯_dgv("結束日期", I).Value : PA5 = 除錯_dgv("帳戶", I).Value
+            If 連接 = 1 Then : ConnOpen_備份1() : Else : ConnOpen_備份2() : End If
+            SQL_修正網址()
+        Next : GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+    End Sub
     Private Sub 客戶資料表_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 客戶資料表_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             子SQL名稱2 = 客戶資料表_dgv("資料庫", e.RowIndex).Value.ToString : 子SQL名稱3 = 客戶資料表_dgv("資料庫", e.RowIndex).Value.ToString
             登入人IP4 = 客戶資料表_dgv("IP位置", e.RowIndex).Value.ToString : 登入人IP5 = 客戶資料表_dgv("備份IP", e.RowIndex).Value.ToString
             業務帳號2 = 客戶資料表_dgv("帳號", e.RowIndex).Value.ToString : 業務帳號3 = 客戶資料表_dgv("備份帳號", e.RowIndex).Value.ToString
             業務密碼2 = 客戶資料表_dgv("密碼", e.RowIndex).Value.ToString : 業務密碼3 = 客戶資料表_dgv("備份密碼", e.RowIndex).Value.ToString
-            SQL_連線字串_備份1() : SQL_連線字串_備份2() : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_清單7() : Set_清單8()
+            SQL_連線字串_備份1() : 連接 = 1 : Set_修正清單() : SQL_連線字串_備份2() : 連接 = 2 : Set_修正清單()
+            Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_清單7() : Set_清單8()
         End If
     End Sub
     Private Sub 資料轉移_bt_Click(sender As Object, e As EventArgs) Handles 資料轉移_bt.Click
                     PA = 下行客戶_dgv("客戶下", ii).Value : PA1 = 下行客戶_dgv("網址", ii).Value : PA2 = 下行客戶_dgv("帳號", ii).Value
                     PA3 = 下行客戶_dgv("基數", ii).Value : PA4 = 下行客戶_dgv("流水號", ii).Value : PA5 = 下行客戶_dgv("客名", ii).Value
                     PA6 = 下行客戶_dgv("計算", ii).Value : PA7 = 下行客戶_dgv("同帳", ii).Value : PA8 = 下行客戶_dgv("所得", ii).Value
-                    PA9 = 下行客戶_dgv("所得另算", ii).Value
+                    PA9 = 下行客戶_dgv("所得另算", ii).Value : PA10 = 下行客戶_dgv("下層", ii).Value
                     SQL_資料庫轉換3_新增()
                 Next : GA_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
                 資料數 = 下行客戶_dgv.Rows.Count : 進度條1()