20230204備份

GA-ERP-SYS/LoginForm1.vb

@@ -138,8 +138,7 @@ Public Class LoginForm1
         '-----------------------刪除自動更新項目-----------------------------------------------------------------------------------------------------------------------------------------------
         Dim Str As String = Application.StartupPath
         If File.Exists(Str + "\C.txt") Then : File.Delete(Str + "\C.txt") : End If
-        If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
-        Timer2.Enabled = False
+        Timer4.Enabled = True : Timer2.Enabled = False
     End Sub
     Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
         Dim Usbkey As Boolean = False

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

@@ -1814,8 +1814,8 @@ FROM 流水帳"
     End Sub
     Friend Sub SQL_後台彙總讀取1()
         ConnOpen_子SQL()
-        SQL1 = "SELECT     後台彙總存檔.網址 AS 項次, 後台彙總存檔.網址, 後台彙總存檔.商品, 後台彙總存檔.系統, 
-                           後台彙總存檔.帳號, SUM(CAST(後台彙總存檔.虛量 AS money)) AS [總量-日], 
+        SQL1 = "SELECT     後台彙總存檔.商品 AS 項次, 後台彙總存檔.商品 AS 網址, 後台彙總存檔.商品, 後台彙總存檔.系統, 
+                           後台彙總存檔.商品 AS 帳號, SUM(CAST(後台彙總存檔.虛量 AS money)) AS [總量-日], 
                            SUM(CAST(後台彙總存檔.實量 AS money)) AS [結果-日], SUM(CAST(後台彙總存檔.退水 AS money)) AS [539-日], 
                            SUM(CAST(後台彙總存檔.中獎 AS money)) AS [加州彩-日], SUM(CAST(後台彙總存檔.輸贏 AS money)) AS [六合彩-日], 
                            SUM(CAST(後台彙總存檔.貢獻額 AS money)) AS [大樂透-日], SUM(後台彙總存檔.排序) AS 排序
@@ -1823,7 +1823,7 @@ FROM 流水帳"
                            後台商客基本資料表 ON 後台彙總存檔.帳號 = 後台商客基本資料表.帳號 AND 
                            後台彙總存檔.商品 = 後台商客基本資料表.商品
                 WHERE     (後台彙總存檔.週日月 LIKE '" & PA15 & "') AND (後台彙總存檔.開始日期 BETWEEN '" & PA16 & "' AND '" & PA17 & "') " & SQL2 & "
-                GROUP BY   後台彙總存檔.網址, 後台彙總存檔.商品, 後台彙總存檔.系統, 後台彙總存檔.帳號
+                GROUP BY   後台彙總存檔.商品, 後台彙總存檔.商品, 後台彙總存檔.系統
                 ORDER BY   後台彙總存檔.商品"
         CmdSet_For_DGV()
     End Sub
@@ -1872,7 +1872,7 @@ FROM 流水帳"
     End Sub
     Friend Sub SQL_後台彙總讀取2()
         ConnOpen_子SQL()
-        SQL1 = "SELECT     後台彙總存檔.網址 AS 項次, 後台彙總存檔.網址, 後台彙總存檔.商品, 後台彙總存檔.系統, 後台彙總存檔.帳號, 
+        SQL1 = "SELECT     後台彙總存檔.商品 AS 項次, 後台彙總存檔.商品 AS 網址, 後台彙總存檔.商品, 後台彙總存檔.系統, 後台彙總存檔.商品 AS 帳號, 
                            SUM(CAST(後台彙總存檔.虛量 AS money)) AS 虛量, SUM(CAST(後台彙總存檔.實量 AS money)) AS 實量, 
                            SUM(CAST(後台彙總存檔.退水 AS money)) AS 退水, SUM(CAST(後台彙總存檔.中獎 AS money)) AS 中獎, 
                            SUM(CAST(後台彙總存檔.輸贏 AS money)) AS 輸贏, SUM(CAST(後台彙總存檔.貢獻額 AS money)) AS 貢獻額, 
@@ -1882,7 +1882,7 @@ FROM 流水帳"
                 FROM       後台彙總存檔 LEFT OUTER JOIN 後台商客基本資料表 ON 後台彙總存檔.帳號 = 後台商客基本資料表.帳號 AND 
                            後台彙總存檔.商品 = 後台商客基本資料表.商品
                 WHERE     (後台彙總存檔.週日月 LIKE '" & PA15 & "') AND (後台彙總存檔.開始日期 BETWEEN '" & PA16 & "' AND '" & PA17 & "') " & SQL2 & "
-                GROUP BY   後台彙總存檔.網址, 後台彙總存檔.商品, 後台彙總存檔.系統, 後台彙總存檔.帳號, 後台彙總存檔.類別
+                GROUP BY   後台彙總存檔.商品, 後台彙總存檔.系統, 後台彙總存檔.類別
                 ORDER BY   後台彙總存檔.商品, 後台彙總存檔.類別"
         CmdSet_For_DGV()
     End Sub

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

@@ -7,7 +7,7 @@
     Public 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, FTP物理位置, 登入客戶, 登入資料庫, 業務名稱, AA(99), QA1, QA2, QA3, QA4, 到期 As String
     Public BB(99), CC(99), 登入判斷, IP印尼, IP台灣 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2022121502"
+    Public 版本 As String = "2023012401"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 判斷重登, 內外網, 重登確認, 主頁開啟, 無KEY登入, 內網區域, 關閉系統, 內網確認 As Boolean

GA-ERP-SYS/基本資料管理/前台/電板基本資料.Designer.vb

@@ -1086,7 +1086,7 @@ Partial Class 電板基本資料
         '
         '客戶下新增_bt
         '
-        Me.客戶下新增_bt.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.客戶下新增_bt.BackColor = System.Drawing.SystemColors.ButtonHighlight
         Me.客戶下新增_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.客戶下新增_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.客戶下新增_bt.Location = New System.Drawing.Point(385, 15)

GA-ERP-SYS/基本資料管理/前台/電板基本資料.vb

@@ -387,11 +387,11 @@ Public Class 電板基本資料
     Private Sub 客戶下新增_bt_Click(sender As Object, e As EventArgs) Handles 客戶下新增_bt.Click
         客戶下新增_bt.Enabled = False : 客戶下_tb.Enabled = True : 客戶名稱_cb.Enabled = True : 所得指定_cb.Enabled = True : 水差_cb.Enabled = True
         客戶下_tb.Text = "" : 客戶名稱_cb.Text = "" : 參與計算_ch.Checked = True : 上下同帳_ch.Checked = False : 所得計算_ch.Checked = True
-        下層帳號_ch.Enabled = True : 客戶下_dgv.Enabled = False
+        下層帳號_ch.Enabled = True : 客戶下_dgv.Enabled = False : GroupBox1.Enabled = False : GroupBox7.Enabled = False
     End Sub
     Private Sub 客戶下修正_bt_Click(sender As Object, e As EventArgs) Handles 客戶下修正_bt.Click
         客戶下修正_bt.Enabled = False : 客戶下_tb.Enabled = True : 客戶名稱_cb.Enabled = True : 所得指定_cb.Enabled = True : 水差_cb.Enabled = True : 客戶下_dgv.Enabled = False
-        參與計算_ch.Enabled = True : 所得計算_ch.Enabled = True : 上下同帳_ch.Enabled = True
+        參與計算_ch.Enabled = True : 所得計算_ch.Enabled = True : 上下同帳_ch.Enabled = True : GroupBox1.Enabled = False : GroupBox7.Enabled = False
     End Sub
     Private Sub 存檔2_bt_Click(sender As Object, e As EventArgs) Handles 存檔2_bt.Click
         If 客戶下新增_bt.Enabled = False Then
@@ -414,7 +414,7 @@ Public Class 電板基本資料
 
                     SQL_系統編碼規則_客戶下新增() : MsgBox("新增完成") : conn.Close() : dr.Close()
                     客戶下新增_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False : 所得指定_cb.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True
-                    參與計算_ch.Enabled = False : 所得計算_ch.Enabled = False : 上下同帳_ch.Enabled = False
+                    參與計算_ch.Enabled = False : 所得計算_ch.Enabled = False : 上下同帳_ch.Enabled = False : GroupBox1.Enabled = True : GroupBox7.Enabled = True
                 End If
             End If : PA = "" : Set_客戶下清單()
         ElseIf 客戶下修正_bt.Enabled = False Then
@@ -430,6 +430,7 @@ Public Class 電板基本資料
                 End If
                 SQL_帳務明細查詢表客戶寫入_全部() : SQL_系統編碼規則_客戶下修改() : MsgBox("修改完成") : conn.Close() : dr.Close()
                 客戶下修正_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False : 所得指定_cb.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True
+                GroupBox1.Enabled = True : GroupBox7.Enabled = True
             End If : PA = "" : Set_客戶下清單()
         End If
         PA1 = 客戶名稱_cb.Text : PA2 = 所得指定_cb.Text : PA3 = 水差_cb.Text
@@ -441,13 +442,13 @@ Public Class 電板基本資料
     Private Sub 取消2_bt_Click(sender As Object, e As EventArgs) Handles 取消2_bt.Click
         客戶下修正_bt.Enabled = True : 客戶下新增_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False
         參與計算_ch.Checked = False : 上下同帳_ch.Checked = False : 所得計算_ch.Checked = False : 所得指定_cb.Enabled = False
-        下層帳號_ch.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True
+        下層帳號_ch.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True : GroupBox1.Enabled = True : GroupBox7.Enabled = True
     End Sub
     Private Sub 客戶下刪除_bt_Click(sender As Object, e As EventArgs) Handles 客戶下刪除_bt.Click
         Dim aa As MsgBoxResult = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
             SQL_系統編碼規則_客戶下刪除() : MsgBox("刪除完成")
-        End If : conn.Close() : PA = "" : Set_客戶下清單()
+        End If : conn.Close() : PA = "" : Set_客戶下清單() : GroupBox1.Enabled = True : GroupBox7.Enabled = True
     End Sub
     Private Sub 計算全選_bt_Click(sender As Object, e As EventArgs) Handles 計算全選_bt.Click
         For i As Integer = 0 To 客戶下_dgv.Rows.Count - 1 : 客戶下_dgv("計算", i).Value = True : Next
@@ -492,6 +493,7 @@ Public Class 電板基本資料
         Else
             商客新增_bt.Enabled = False : 帳號_tb.Enabled = True : 密碼_tb.Enabled = True : 上繳源_cb.Enabled = True : 商客_dgv.Enabled = False : 資料1_cb.Enabled = True
             帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 存檔1_bt.Enabled = True : 取消1_bt.Enabled = True : 下拉1_bt.Enabled = True
+            GroupBox1.Enabled = False : GroupBox5.Enabled = False
         End If
     End Sub
     Private Sub 商客修正_bt_Click(sender As Object, e As EventArgs) Handles 商客修正_bt.Click
@@ -502,7 +504,7 @@ Public Class 電板基本資料
                 MsgBox("資料有缺或有誤，請重新檢查")
             Else
                 商客修正_bt.Enabled = False : 帳號_tb.Enabled = True : 密碼_tb.Enabled = True : 上繳源_cb.Enabled = True : 商客_dgv.Enabled = False
-                存檔1_bt.Enabled = True : 取消1_bt.Enabled = True : 下拉1_bt.Enabled = True : 資料1_cb.Enabled = True
+                存檔1_bt.Enabled = True : 取消1_bt.Enabled = True : 下拉1_bt.Enabled = True : 資料1_cb.Enabled = True : GroupBox1.Enabled = False : GroupBox5.Enabled = False
             End If
         End If
     End Sub
@@ -529,7 +531,7 @@ Public Class 電板基本資料
                         SQL_流水帳上繳() : 上繳源_cb.Items.Clear() : While (dr.Read()) : 上繳源_cb.Items.Add(dr("上繳源")) : End While : conn.Close()
                         商客修正_bt.Enabled = True : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_cb.Enabled = False : 商客_dgv.Enabled = True
                         客戶名稱_cb.Text = PA1 : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False : 下拉1_bt.Enabled = False : 資料1_cb.Enabled = False
-                        商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True
+                        商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : GroupBox1.Enabled = True : GroupBox5.Enabled = True
                     End If
                 End If
             ElseIf 商客修正_bt.Enabled = False Then
@@ -544,7 +546,7 @@ Public Class 電板基本資料
                     SQL_流水帳上繳() : 上繳源_cb.Items.Clear() : While (dr.Read()) : 上繳源_cb.Items.Add(dr("上繳源")) : End While : conn.Close()
                     商客修正_bt.Enabled = True : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_cb.Enabled = False : 商客_dgv.Enabled = True
                     客戶名稱_cb.Text = PA1 : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False : 下拉1_bt.Enabled = False : 資料1_cb.Enabled = False
-                    商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True
+                    商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : GroupBox1.Enabled = True : GroupBox5.Enabled = True
                 End If
             Else
                 MsgBox("請先確定您要新增還是修改，再來按儲存!!!!")
@@ -554,7 +556,7 @@ Public Class 電板基本資料
     Private Sub 取消1_bt_Click(sender As Object, e As EventArgs) Handles 取消1_bt.Click
         帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 網址_tb.Text = "" : 備用網址1_tb.Text = "" : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False
         商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_cb.Enabled = False : 商客_dgv.Enabled = True
-        下拉1_bt.Enabled = False
+        下拉1_bt.Enabled = False : GroupBox1.Enabled = True : GroupBox5.Enabled = True
         Set_商品下拉讀取()
     End Sub
     Private Sub 商客刪除_bt_Click(sender As Object, e As EventArgs) Handles 商客刪除_bt.Click
@@ -573,7 +575,7 @@ Public Class 電板基本資料
                 End If : PA1 = "" : PA = "" : Set_商客清單() : Set_客戶下清單() : Set_商品下拉讀取1()
             End If
         End If : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False : 下拉1_bt.Enabled = False : 資料1_cb.Enabled = False : Set_商品下拉讀取()
-        帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 網址_tb.Text = "" : 備用網址1_tb.Text = ""
+        帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 網址_tb.Text = "" : 備用網址1_tb.Text = "" : GroupBox1.Enabled = True : GroupBox5.Enabled = True
     End Sub
     Private Sub 重新整理_bt_Click(sender As Object, e As EventArgs) Handles 重新整理_bt.Click
         PA1 = "" : PA = "" : Set_商客清單() : Set_客戶下清單() : Set_商品下拉讀取1()
@@ -646,6 +648,7 @@ Public Class 電板基本資料
                 ElseIf GP > 99 Then : GPP = DD & GP : End If : 編號_tb.Text = GPP
                 新增1_bt.Enabled = False : 商品_tb.Enabled = True : 網址2_tb.Enabled = True : 備用網址_tb.Enabled = True : 編號_tb.Enabled = True
                 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = "" : 商品_dgv.Enabled = False : 系統_cb.Enabled = False
+                GroupBox7.Enabled = False : GroupBox5.Enabled = False
             End If
         End If
     End Sub
@@ -658,7 +661,7 @@ Public Class 電板基本資料
             Else
                 修正1_bt.Enabled = False : 商品_tb.Enabled = True : 網址2_tb.Enabled = True : 編號_tb.Enabled = False
                 商品_dgv.Enabled = False : 存檔_bt.Enabled = True : 取消_bt.Enabled = True : 備用網址_tb.Enabled = True
-                備用365寫入_bt.Enabled = True : 系統_cb.Enabled = False
+                備用365寫入_bt.Enabled = True : 系統_cb.Enabled = False : GroupBox7.Enabled = False : GroupBox5.Enabled = False
             End If
         End If
     End Sub
@@ -680,7 +683,7 @@ Public Class 電板基本資料
                         Else
                             SQL_商品寫入() : PA1 = "" : PA = "" : PA16 = "" : Set_商品清單() : Set_商品下拉讀取() : Set_客戶下清單() : MsgBox("新增完成!!")
                             新增1_bt.Enabled = True : 商品_tb.Enabled = False : 網址2_tb.Enabled = False : 編號_tb.Enabled = False : 商品_dgv.Enabled = True : 備用網址_tb.Enabled = False
-                            系統_cb.Enabled = True
+                            系統_cb.Enabled = True : GroupBox7.Enabled = True : GroupBox5.Enabled = True
                         End If
                     End If
                 End If
@@ -688,7 +691,7 @@ Public Class 電板基本資料
                 SQL_商品修改() : SQL_同步修正網址1() : SQL_同步修正網址2() : SQL_同步修正網址3() : SQL_同步修正網址4()
                 PA1 = "" : PA = "" : PA16 = "" : Set_商品清單() : Set_商品下拉讀取() : Set_客戶下清單() : Set_商客清單() : MsgBox("儲存完成!!")
                 修正1_bt.Enabled = True : 商品_tb.Enabled = False : 網址2_tb.Enabled = False : 編號_tb.Enabled = False : 商品_dgv.Enabled = True : 備用網址_tb.Enabled = False
-                系統_cb.Enabled = True
+                系統_cb.Enabled = True : GroupBox7.Enabled = True : GroupBox5.Enabled = True
             Else
                 MsgBox("請先確定您要新增還是修改，再來按儲存!!!!")
             End If
@@ -700,6 +703,7 @@ Public Class 電板基本資料
         編號_tb.Text = "" : 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = "" : 存檔_bt.Enabled = False : 備用365寫入_bt.Enabled = False
         取消_bt.Enabled = False : 備用365寫入_bt.Enabled = False : 修正1_bt.Enabled = True : 新增1_bt.Enabled = True : 商品_tb.Enabled = False
         網址2_tb.Enabled = False : 編號_tb.Enabled = False : 商品_dgv.Enabled = True : 備用網址_tb.Enabled = False : 系統_cb.Enabled = True
+        GroupBox7.Enabled = True : GroupBox5.Enabled = True
     End Sub
     Private Sub 刪除1_bt_Click(sender As Object, e As EventArgs) Handles 刪除1_bt.Click
         If 狀態_tb.Text <> "" Then
@@ -719,7 +723,7 @@ Public Class 電板基本資料
                 End If
             End If
         End If
-        編號_tb.Text = "" : 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = ""
+        編號_tb.Text = "" : 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = "" : GroupBox7.Enabled = True : GroupBox5.Enabled = True
     End Sub
     Private Sub 開網站_bt_Click(sender As Object, e As EventArgs) Handles 開網站_bt.Click
         If 網址2_tb.Text = "" Then

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

@@ -43,6 +43,7 @@ Partial Class 後台基本資料
         Me.開啟基本資料_bt = New System.Windows.Forms.Button()
         Me.清除搜索3_bt = New System.Windows.Forms.Button()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        Me.客戶下_dgv = New System.Windows.Forms.DataGridView()
         Me.下拉2_bt = New System.Windows.Forms.Button()
         Me.下收客戶依帳號刪除_bt = New System.Windows.Forms.Button()
         Me.Label33 = New System.Windows.Forms.Label()
@@ -85,7 +86,6 @@ Partial Class 後台基本資料
         Me.下層帳號_ch = New System.Windows.Forms.CheckBox()
         Me.所得計算_ch = New System.Windows.Forms.CheckBox()
         Me.參與計算_ch = New System.Windows.Forms.CheckBox()
-        Me.客戶下_dgv = New System.Windows.Forms.DataGridView()
         Me.搜索4_bt = New System.Windows.Forms.Button()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.備用網址1_ch = New System.Windows.Forms.CheckBox()
@@ -141,6 +141,7 @@ Partial Class 後台基本資料
         Me.搜索3_bt = New System.Windows.Forms.Button()
         Me.資料_cb = New System.Windows.Forms.ComboBox()
         Me.GroupBox7 = New System.Windows.Forms.GroupBox()
+        Me.股東帳_Ch = New System.Windows.Forms.CheckBox()
         Me.取消3_bt = New System.Windows.Forms.Button()
         Me.存檔3_bt = New System.Windows.Forms.Button()
         Me.商客刪除1_bt = New System.Windows.Forms.Button()
@@ -183,7 +184,6 @@ Partial Class 後台基本資料
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.Timer3 = New System.Windows.Forms.Timer(Me.components)
         Me.Timer2 = New System.Windows.Forms.Timer(Me.components)
-        Me.股東帳_Ch = New System.Windows.Forms.CheckBox()
         CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.L50.SuspendLayout()
         CType(Me.LOG1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -450,6 +450,20 @@ Partial Class 後台基本資料
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "下收客戶帳號設定"
         '
+        '客戶下_dgv
+        '
+        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.BackgroundColor = System.Drawing.Color.White
+        Me.客戶下_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.客戶下_dgv.Location = New System.Drawing.Point(5, 197)
+        Me.客戶下_dgv.Name = "客戶下_dgv"
+        Me.客戶下_dgv.RowHeadersWidth = 4
+        Me.客戶下_dgv.RowTemplate.Height = 24
+        Me.客戶下_dgv.Size = New System.Drawing.Size(494, 495)
+        Me.客戶下_dgv.TabIndex = 0
+        '
         '下拉2_bt
         '
         Me.下拉2_bt.Location = New System.Drawing.Point(80, 136)
@@ -748,7 +762,7 @@ Partial Class 後台基本資料
         '
         '客戶下新增_bt
         '
-        Me.客戶下新增_bt.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.客戶下新增_bt.BackColor = System.Drawing.SystemColors.ButtonHighlight
         Me.客戶下新增_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.客戶下新增_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.客戶下新增_bt.Location = New System.Drawing.Point(341, 15)
@@ -873,20 +887,6 @@ Partial Class 後台基本資料
         Me.參與計算_ch.Text = "計算"
         Me.參與計算_ch.UseVisualStyleBackColor = True
         '
-        '客戶下_dgv
-        '
-        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.BackgroundColor = System.Drawing.Color.White
-        Me.客戶下_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.客戶下_dgv.Location = New System.Drawing.Point(5, 197)
-        Me.客戶下_dgv.Name = "客戶下_dgv"
-        Me.客戶下_dgv.RowHeadersWidth = 4
-        Me.客戶下_dgv.RowTemplate.Height = 24
-        Me.客戶下_dgv.Size = New System.Drawing.Size(494, 495)
-        Me.客戶下_dgv.TabIndex = 0
-        '
         '搜索4_bt
         '
         Me.搜索4_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -1503,6 +1503,16 @@ Partial Class 後台基本資料
         Me.GroupBox7.TabStop = False
         Me.GroupBox7.Text = "上繳帳號設定"
         '
+        '股東帳_Ch
+        '
+        Me.股東帳_Ch.AutoSize = True
+        Me.股東帳_Ch.Location = New System.Drawing.Point(247, 39)
+        Me.股東帳_Ch.Name = "股東帳_Ch"
+        Me.股東帳_Ch.Size = New System.Drawing.Size(62, 20)
+        Me.股東帳_Ch.TabIndex = 1651
+        Me.股東帳_Ch.Text = "股東帳"
+        Me.股東帳_Ch.UseVisualStyleBackColor = True
+        '
         '取消3_bt
         '
         Me.取消3_bt.ForeColor = System.Drawing.Color.Purple
@@ -1886,16 +1896,6 @@ Partial Class 後台基本資料
         '
         Me.Timer2.Interval = 1000
         '
-        '股東帳_Ch
-        '
-        Me.股東帳_Ch.AutoSize = True
-        Me.股東帳_Ch.Location = New System.Drawing.Point(247, 39)
-        Me.股東帳_Ch.Name = "股東帳_Ch"
-        Me.股東帳_Ch.Size = New System.Drawing.Size(62, 20)
-        Me.股東帳_Ch.TabIndex = 1651
-        Me.股東帳_Ch.Text = "股東帳"
-        Me.股東帳_Ch.UseVisualStyleBackColor = True
-        '
         '後台基本資料
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)

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

@@ -389,10 +389,11 @@ Public Class 後台基本資料
     Private Sub 客戶下新增_bt_Click(sender As Object, e As EventArgs) Handles 客戶下新增_bt.Click
         客戶下新增_bt.Enabled = False : 客戶下_tb.Enabled = True : 客戶名稱_cb.Enabled = True : 所得指定_cb.Enabled = True : 水差_cb.Enabled = True
         客戶下_tb.Text = "" : 客戶名稱_cb.Text = "" : 參與計算_ch.Checked = True : 上下同帳_ch.Checked = False : 所得計算_ch.Checked = True
-        下層帳號_ch.Enabled = True : 客戶下_dgv.Enabled = False
+        下層帳號_ch.Enabled = True : 客戶下_dgv.Enabled = False : GroupBox1.Enabled = False : GroupBox7.Enabled = False
     End Sub
     Private Sub 客戶下修正_bt_Click(sender As Object, e As EventArgs) Handles 客戶下修正_bt.Click
-        客戶下修正_bt.Enabled = False : 客戶下_tb.Enabled = True : 客戶名稱_cb.Enabled = True : 所得指定_cb.Enabled = True : 水差_cb.Enabled = True : 客戶下_dgv.Enabled = False
+        客戶下修正_bt.Enabled = False : 客戶下_tb.Enabled = True : 客戶名稱_cb.Enabled = True : 所得指定_cb.Enabled = True : 水差_cb.Enabled = True
+        客戶下_dgv.Enabled = False : GroupBox1.Enabled = False : GroupBox7.Enabled = False
     End Sub
     Private Sub 存檔2_bt_Click(sender As Object, e As EventArgs) Handles 存檔2_bt.Click
         If 客戶下新增_bt.Enabled = False Then
@@ -414,7 +415,8 @@ Public Class 後台基本資料
                     ElseIf GP > 999999 Then : GPP = "GA" & GP : End If : PA10 = GPP
 
                     SQL_系統編碼規則_後台客戶下新增() : MsgBox("新增完成") : conn.Close() : dr.Close()
-                    客戶下新增_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False : 所得指定_cb.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True
+                    客戶下新增_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False : 所得指定_cb.Enabled = False : 水差_cb.Enabled = False
+                    客戶下_dgv.Enabled = True : GroupBox1.Enabled = True : GroupBox7.Enabled = True
                 End If
             End If : PA = "" : Set_客戶下清單()
         ElseIf 客戶下修正_bt.Enabled = False Then
@@ -425,7 +427,8 @@ Public Class 後台基本資料
                 PA6 = 流水號_tb.Text : BL1 = 參與計算_ch.Checked : BL2 = 上下同帳_ch.Checked : BL3 = 所得計算_ch.Checked : BL4 = 下層帳號_ch.Checked
                 PA7 = 水差_cb.Text
                 SQL_系統編碼規則_後台客戶下修改() : MsgBox("修改完成") : conn.Close() : dr.Close()
-                客戶下修正_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False : 所得指定_cb.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True
+                客戶下修正_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False : 所得指定_cb.Enabled = False : 水差_cb.Enabled = False
+                客戶下_dgv.Enabled = True : GroupBox1.Enabled = True : GroupBox7.Enabled = True
             End If : PA = "" : Set_客戶下清單()
         End If
         PA1 = 客戶名稱_cb.Text : PA2 = 所得指定_cb.Text : PA3 = 水差_cb.Text
@@ -437,13 +440,13 @@ Public Class 後台基本資料
     Private Sub 取消2_bt_Click(sender As Object, e As EventArgs) Handles 取消2_bt.Click
         客戶下修正_bt.Enabled = True : 客戶下新增_bt.Enabled = True : 客戶下_tb.Enabled = False : 客戶名稱_cb.Enabled = False
         參與計算_ch.Checked = False : 上下同帳_ch.Checked = False : 所得計算_ch.Checked = False : 所得指定_cb.Enabled = False
-        下層帳號_ch.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True
+        下層帳號_ch.Enabled = False : 水差_cb.Enabled = False : 客戶下_dgv.Enabled = True : GroupBox1.Enabled = True : GroupBox7.Enabled = True
     End Sub
     Private Sub 客戶下刪除_bt_Click(sender As Object, e As EventArgs) Handles 客戶下刪除_bt.Click
         Dim aa As MsgBoxResult = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
         If aa = MsgBoxResult.Ok Then
             SQL_系統編碼規則_後台客戶下刪除() : MsgBox("刪除完成")
-        End If : conn.Close() : PA = "" : Set_客戶下清單()
+        End If : conn.Close() : PA = "" : Set_客戶下清單() : GroupBox1.Enabled = True : GroupBox7.Enabled = True
     End Sub
     Private Sub 計算全選_bt_Click(sender As Object, e As EventArgs) Handles 計算全選_bt.Click
         For i As Integer = 0 To 客戶下_dgv.Rows.Count - 1 : 客戶下_dgv("計算", i).Value = True : Next
@@ -488,17 +491,19 @@ Public Class 後台基本資料
         Else
             商客新增_bt.Enabled = False : 帳號_tb.Enabled = True : 密碼_tb.Enabled = True : 上繳源_cb.Enabled = True : 商客_dgv.Enabled = False : 資料1_cb.Enabled = True
             帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 存檔1_bt.Enabled = True : 取消1_bt.Enabled = True : 下拉1_bt.Enabled = True : 股東帳_Ch.Enabled = True
+            GroupBox1.Enabled = False : GroupBox5.Enabled = False
         End If
     End Sub
     Private Sub 商客修正_bt_Click(sender As Object, e As EventArgs) Handles 商客修正_bt.Click
         If 商客新增_bt.Enabled = False Then
             MsgBox("新增中，無法修改!!!")
         Else
-            If 網址_tb.Text = "" Or 帳號_tb.Text = "" Or 密碼_tb.Text = "" Or 上行_cb.Text = "" Or 下行_cb.Text = "" Then
+            If 網址_tb.Text = "" Or 帳號_tb.Text = "" Or 密碼_tb.Text = "" Then
                 MsgBox("資料有缺或有誤，請重新檢查")
             Else
                 商客修正_bt.Enabled = False : 帳號_tb.Enabled = True : 密碼_tb.Enabled = True : 上繳源_cb.Enabled = True : 商客_dgv.Enabled = False
                 存檔1_bt.Enabled = True : 取消1_bt.Enabled = True : 下拉1_bt.Enabled = True : 資料1_cb.Enabled = True : 股東帳_Ch.Enabled = True
+                GroupBox1.Enabled = False : GroupBox5.Enabled = False
             End If
         End If
     End Sub
@@ -515,7 +520,7 @@ Public Class 後台基本資料
                         MsgBox("資料重複，請重新輸入或檢查") : conn.Close() : dr.Close()
                         帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 股東帳_Ch.Checked = False : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False
                         商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_cb.Enabled = False : 商客_dgv.Enabled = True
-                        下拉1_bt.Enabled = False : 股東帳_Ch.Enabled = False
+                        下拉1_bt.Enabled = False : 股東帳_Ch.Enabled = False : GroupBox1.Enabled = True : GroupBox5.Enabled = True
                     Else
                         PA1 = 網址_tb.Text : PA2 = 帳號_tb.Text : PA3 = 密碼_tb.Text : PA4 = 資料_cb.Text : PA5 = 上繳源_cb.Text : PA6 = 商品_cb.Text : PA7 = 上行_cb.Text
                         PA8 = 下行_cb.Text : PA12 = 備用網址1_tb.Text : BL1 = 股東帳_Ch.Checked
@@ -525,7 +530,7 @@ Public Class 後台基本資料
                         SQL_後台流水帳上繳() : 上繳源_cb.Items.Clear() : While (dr.Read()) : 上繳源_cb.Items.Add(dr("上繳源")) : End While : conn.Close()
                         商客修正_bt.Enabled = True : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_cb.Enabled = False : 商客_dgv.Enabled = True
                         客戶名稱_cb.Text = PA1 : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False : 下拉1_bt.Enabled = False : 資料1_cb.Enabled = False
-                        商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : 股東帳_Ch.Enabled = False
+                        商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : 股東帳_Ch.Enabled = False : GroupBox1.Enabled = True : GroupBox5.Enabled = True
                     End If
                 End If
             ElseIf 商客修正_bt.Enabled = False Then
@@ -540,7 +545,7 @@ Public Class 後台基本資料
                     SQL_後台流水帳上繳() : 上繳源_cb.Items.Clear() : While (dr.Read()) : 上繳源_cb.Items.Add(dr("上繳源")) : End While : conn.Close()
                     商客修正_bt.Enabled = True : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_cb.Enabled = False : 商客_dgv.Enabled = True
                     客戶名稱_cb.Text = PA1 : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False : 下拉1_bt.Enabled = False : 資料1_cb.Enabled = False
-                    商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : 股東帳_Ch.Enabled = False
+                    商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : 股東帳_Ch.Enabled = False : GroupBox1.Enabled = True : GroupBox5.Enabled = True
                 End If
             Else
                 MsgBox("請先確定您要新增還是修改，再來按儲存!!!!")
@@ -550,7 +555,8 @@ Public Class 後台基本資料
     Private Sub 取消1_bt_Click(sender As Object, e As EventArgs) Handles 取消1_bt.Click
         帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 網址_tb.Text = "" : 備用網址1_tb.Text = "" : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False
         商客新增_bt.Enabled = True : 商客修正_bt.Enabled = True : 帳號_tb.Enabled = False : 密碼_tb.Enabled = False : 上繳源_cb.Enabled = False : 商客_dgv.Enabled = True
-        下拉1_bt.Enabled = False : 股東帳_Ch.Enabled = False : 股東帳_Ch.Checked = False
+        下拉1_bt.Enabled = False : 股東帳_Ch.Enabled = False : 股東帳_Ch.Checked = False : GroupBox1.Enabled = True : GroupBox5.Enabled = True
+        GroupBox1.Enabled = True : GroupBox5.Enabled = True
         Set_商品下拉讀取()
     End Sub
     Private Sub 商客刪除_bt_Click(sender As Object, e As EventArgs) Handles 商客刪除_bt.Click
@@ -571,6 +577,7 @@ Public Class 後台基本資料
             End If
         End If : 存檔1_bt.Enabled = False : 取消1_bt.Enabled = False : 下拉1_bt.Enabled = False : 資料1_cb.Enabled = False : Set_商品下拉讀取()
         帳號_tb.Text = "" : 密碼_tb.Text = "" : 上繳源_cb.Text = "" : 網址_tb.Text = "" : 備用網址1_tb.Text = "" : 股東帳_Ch.Checked = False
+        GroupBox1.Enabled = True : GroupBox5.Enabled = True : GroupBox1.Enabled = True : GroupBox7.Enabled = True
     End Sub
     Private Sub 重新整理_bt_Click(sender As Object, e As EventArgs) Handles 重新整理_bt.Click
         PA1 = "" : PA = "" : Set_商客清單() : Set_客戶下清單() : Set_商品下拉讀取1()
@@ -645,6 +652,7 @@ Public Class 後台基本資料
                 ElseIf GP > 99 Then : GPP = DD & GP : End If : 編號_tb.Text = GPP
                 新增1_bt.Enabled = False : 商品_tb.Enabled = True : 網址2_tb.Enabled = True : 備用網址_tb.Enabled = True : 編號_tb.Enabled = True
                 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = "" : 商品_dgv.Enabled = False : 系統_cb.Enabled = False
+                GroupBox7.Enabled = False : GroupBox5.Enabled = False
             End If
         End If
     End Sub
@@ -657,7 +665,7 @@ Public Class 後台基本資料
             Else
                 修正1_bt.Enabled = False : 商品_tb.Enabled = True : 網址2_tb.Enabled = True : 編號_tb.Enabled = False
                 商品_dgv.Enabled = False : 存檔_bt.Enabled = True : 取消_bt.Enabled = True : 備用網址_tb.Enabled = True
-                備用365寫入_bt.Enabled = True : 系統_cb.Enabled = False
+                備用365寫入_bt.Enabled = True : 系統_cb.Enabled = False : GroupBox7.Enabled = False : GroupBox5.Enabled = False
             End If
         End If
     End Sub
@@ -679,7 +687,7 @@ Public Class 後台基本資料
                         Else
                             SQL_後台商品寫入() : PA1 = "" : PA = "" : PA16 = "" : Set_商品清單() : Set_商品下拉讀取() : Set_客戶下清單() : MsgBox("新增完成!!")
                             新增1_bt.Enabled = True : 商品_tb.Enabled = False : 網址2_tb.Enabled = False : 編號_tb.Enabled = False : 商品_dgv.Enabled = True : 備用網址_tb.Enabled = False
-                            系統_cb.Enabled = True
+                            系統_cb.Enabled = True : GroupBox7.Enabled = True : GroupBox5.Enabled = True
                         End If
                     End If
                 End If
@@ -687,7 +695,7 @@ Public Class 後台基本資料
                 SQL_後台商品修改() : SQL_後台同步修正網址1() : SQL_後台同步修正網址2() : SQL_後台同步修正網址3() : SQL_後台同步修正網址4()
                 PA1 = "" : PA = "" : PA16 = "" : Set_商品清單() : Set_商品下拉讀取() : Set_客戶下清單() : Set_商客清單() : MsgBox("儲存完成!!")
                 修正1_bt.Enabled = True : 商品_tb.Enabled = False : 網址2_tb.Enabled = False : 編號_tb.Enabled = False : 商品_dgv.Enabled = True : 備用網址_tb.Enabled = False
-                系統_cb.Enabled = True
+                系統_cb.Enabled = True : GroupBox7.Enabled = True : GroupBox5.Enabled = True
             Else
                 MsgBox("請先確定您要新增還是修改，再來按儲存!!!!")
             End If
@@ -699,6 +707,7 @@ Public Class 後台基本資料
         編號_tb.Text = "" : 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = "" : 存檔_bt.Enabled = False : 備用365寫入_bt.Enabled = False
         取消_bt.Enabled = False : 備用365寫入_bt.Enabled = False : 修正1_bt.Enabled = True : 新增1_bt.Enabled = True : 商品_tb.Enabled = False
         網址2_tb.Enabled = False : 編號_tb.Enabled = False : 商品_dgv.Enabled = True : 備用網址_tb.Enabled = False : 系統_cb.Enabled = True
+        GroupBox7.Enabled = True : GroupBox5.Enabled = True
     End Sub
     Private Sub 刪除1_bt_Click(sender As Object, e As EventArgs) Handles 刪除1_bt.Click
         If 狀態_tb.Text <> "" Then
@@ -718,7 +727,7 @@ Public Class 後台基本資料
                 End If
             End If
         End If
-        編號_tb.Text = "" : 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = ""
+        編號_tb.Text = "" : 商品_tb.Text = "" : 網址2_tb.Text = "" : 備用網址_tb.Text = "" : GroupBox7.Enabled = True : GroupBox5.Enabled = True
     End Sub
     Private Sub 開網站_bt_Click(sender As Object, e As EventArgs) Handles 開網站_bt.Click
         If 網址2_tb.Text = "" Then

GA-ERP-SYS/報表系統管理/前台/彙總報表預覽.Designer.vb

@@ -153,6 +153,8 @@ Partial Class 彙總報表預覽
         Me.Controls.Add(Me.Panel1)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(4)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
         Me.Name = "彙總報表預覽"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "彙總報表預覽"

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

@@ -242,10 +242,10 @@ Partial Class 電板帳務彙總計算表
         Me.正負調整存檔_bt = New System.Windows.Forms.Button()
         Me.股東紅利設定_bt = New System.Windows.Forms.Button()
         Me.核帳0_tb = New System.Windows.Forms.TextBox()
+        Me.Label20 = New System.Windows.Forms.Label()
         Me.SplitContainer4 = New System.Windows.Forms.SplitContainer()
         Me.其他操作功能_bt = New System.Windows.Forms.Button()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.Label20 = New System.Windows.Forms.Label()
         CType(Me.流水帳_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.彙總_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.彙總1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -2397,7 +2397,7 @@ Partial Class 電板帳務彙總計算表
         Me.依電板習慣_ch.Name = "依電板習慣_ch"
         Me.依電板習慣_ch.Size = New System.Drawing.Size(86, 20)
         Me.依電板習慣_ch.TabIndex = 1701
-        Me.依電板習慣_ch.Text = "依電板習慣"
+        Me.依電板習慣_ch.Text = "依彩票習慣"
         Me.依電板習慣_ch.UseVisualStyleBackColor = True
         '
         '自動正負反_ch
@@ -2541,6 +2541,17 @@ Partial Class 電板帳務彙總計算表
         Me.核帳0_tb.TabIndex = 1698
         Me.核帳0_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.Label20.ForeColor = System.Drawing.Color.Red
+        Me.Label20.Location = New System.Drawing.Point(11, 106)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(359, 15)
+        Me.Label20.TabIndex = 1704
+        Me.Label20.Text = "請注意，自動判斷正負反的功能不一定適合使用者的習慣，請斟酌使用。"
+        '
         'SplitContainer4
         '
         Me.SplitContainer4.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -2597,17 +2608,6 @@ Partial Class 電板帳務彙總計算表
         Me.PictureBox1.TabIndex = 1619
         Me.PictureBox1.TabStop = False
         '
-        'Label20
-        '
-        Me.Label20.AutoSize = True
-        Me.Label20.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label20.ForeColor = System.Drawing.Color.Red
-        Me.Label20.Location = New System.Drawing.Point(11, 106)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(359, 15)
-        Me.Label20.TabIndex = 1704
-        Me.Label20.Text = "請注意，自動判斷正負反的功能不一定適合使用者的習慣，請斟酌使用。"
-        '
         '電板帳務彙總計算表
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)

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

@@ -3215,9 +3215,9 @@ Public Class 電板帳務彙總計算表
         End If
         Dim NH As Integer = 140 + (NN10 * 19)
         If NH > Screen.PrimaryScreen.Bounds.Height - 60 Then
-            彙總報表預覽.Size = New Size(448, Screen.PrimaryScreen.Bounds.Height - 60) : 彙總報表預覽.Show()
+            彙總報表預覽.Size = New Size(448, Screen.PrimaryScreen.Bounds.Height - 60) : 彙總報表預覽.ShowDialog()
         Else
-            彙總報表預覽.Size = New Size(448, NH) : 彙總報表預覽.Show()
+            彙總報表預覽.Size = New Size(448, NH) : 彙總報表預覽.ShowDialog()
         End If
 
     End Sub

GA-ERP-SYS/特殊操作功能/系統公告.Designer.vb

@@ -39,11 +39,11 @@ Partial Class 系統公告
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBox1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TextBox1.Location = New System.Drawing.Point(2, 425)
+        Me.TextBox1.Location = New System.Drawing.Point(2, 126)
         Me.TextBox1.Multiline = True
         Me.TextBox1.Name = "TextBox1"
         Me.TextBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-        Me.TextBox1.Size = New System.Drawing.Size(680, 143)
+        Me.TextBox1.Size = New System.Drawing.Size(680, 442)
         Me.TextBox1.TabIndex = 0
         Me.TextBox1.Text = resources.GetString("TextBox1.Text")
         '
@@ -65,7 +65,8 @@ Partial Class 系統公告
         Me.TextBox3.Name = "TextBox3"
         Me.TextBox3.Size = New System.Drawing.Size(680, 514)
         Me.TextBox3.TabIndex = 2
-        Me.TextBox3.Text = "版本號 : 2022121501" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "更新內容如下 :" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "1、修正後台帳務計算BUG。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "2、更新抓帳時顯示網址資訊。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
+        Me.TextBox3.Text = "版本號 : 2023010901" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "更新內容如下 :" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "1、修正帳務彙總預覽為強制視窗。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "2、延長抓帳等待網站時間。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "3、修正後台帳務抓取效能優化與其他BUG" &
+    "修正。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
         '
         'TextBox4
         '
@@ -109,11 +110,11 @@ Partial Class 系統公告
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(685, 546)
         Me.Controls.Add(Me.TextBox1)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.TextBox2)
         Me.Controls.Add(Me.TextBox3)
         Me.Controls.Add(Me.TextBox4)
         Me.Controls.Add(Me.PictureBox2)
+        Me.Controls.Add(Me.PictureBox1)
+        Me.Controls.Add(Me.TextBox2)
         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/特殊操作功能/系統公告.resx

@@ -118,7 +118,12 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="TextBox1.Text" xml:space="preserve">
-    <value>版本號 : 2022120501
+    <value>版本號 : 2022121501
+更新內容如下 :
+1、修正後台帳務計算BUG。
+2、更新抓帳時顯示網址資訊。
+
+版本號 : 2022120501
 更新內容如下 :
 1、電板彙總表新增報表預覽，(解決對帳表太長的問題)。
 2、後台彙總表新增日、周、月、年，四種帳務可以自由配合顯示。