B70340 3 gadus atpakaļ
vecāks
revīzija
e8e98b16f2

Binārs
.vs/GA-ERP-SYS/v16/.suo Parādīt failu


+ 1
- 1
GA-ERP-SYS/GA-ERP-SYS.vb Parādīt failu

@@ -96,7 +96,7 @@ Public Class GA_ERP_SYS
96 96
     End Sub
97 97
     Private Sub 系統執行檔版本管理ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles 系統執行檔版本管理_tsm.Click
98 98
         主資料庫() : For Each ChildForm As Form In Me.MdiChildren : ChildForm.Close() : Next
99
-        PA = "" : 系統執行檔版本管理.ShowDialog()
99
+        PA = "" : 系統執行檔版本管理.Show() : 系統執行檔版本管理.BringToFront()
100 100
     End Sub
101 101
     Private Sub FTPToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FTP_tsm.Click
102 102
         主資料庫() : For Each ChildForm As Form In Me.MdiChildren : ChildForm.Close() : Next

+ 26
- 14
GA-ERP-SYS/LoginForm1.Designer.vb Parādīt failu

@@ -51,13 +51,14 @@ Partial Class LoginForm1
51 51
         Me.資料庫版本號_lb = New System.Windows.Forms.Label()
52 52
         Me.使用者帳號_cb = New System.Windows.Forms.ComboBox()
53 53
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
54
-        Me.Button1 = New System.Windows.Forms.Button()
54
+        Me.更新_bt = New System.Windows.Forms.Button()
55 55
         Me.Label1 = New System.Windows.Forms.Label()
56 56
         Me.簡易_lb = New System.Windows.Forms.Label()
57 57
         Me.簡易登入_dgv = New System.Windows.Forms.DataGridView()
58 58
         Me.解鎖_bt = New System.Windows.Forms.Button()
59 59
         Me.藏_bt = New System.Windows.Forms.Button()
60 60
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
61
+        Me.UPDATE_bt = New System.Windows.Forms.Button()
61 62
         CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).BeginInit()
62 63
         CType(Me.FTP清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
63 64
         CType(Me.簡易登入_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -264,14 +265,14 @@ Partial Class LoginForm1
264 265
         Me.使用者帳號_cb.Size = New System.Drawing.Size(201, 24)
265 266
         Me.使用者帳號_cb.TabIndex = 677
266 267
         '
267
-        'Button1
268
+        '更新_bt
268 269
         '
269
-        Me.Button1.Location = New System.Drawing.Point(462, 118)
270
-        Me.Button1.Name = "Button1"
271
-        Me.Button1.Size = New System.Drawing.Size(219, 94)
272
-        Me.Button1.TabIndex = 678
273
-        Me.Button1.Text = "開啟下載網頁,下載最新根新版本"
274
-        Me.Button1.UseVisualStyleBackColor = True
270
+        Me.更新_bt.Location = New System.Drawing.Point(462, 118)
271
+        Me.更新_bt.Name = "更新_bt"
272
+        Me.更新_bt.Size = New System.Drawing.Size(219, 94)
273
+        Me.更新_bt.TabIndex = 678
274
+        Me.更新_bt.Text = "更新最新的版本"
275
+        Me.更新_bt.UseVisualStyleBackColor = True
275 276
         '
276 277
         'Label1
277 278
         '
@@ -283,7 +284,7 @@ Partial Class LoginForm1
283 284
         Me.Label1.Name = "Label1"
284 285
         Me.Label1.Size = New System.Drawing.Size(217, 80)
285 286
         Me.Label1.TabIndex = 679
286
-        Me.Label1.Text = "如果您的網頁沒有自動開啟," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "請按下方按鈕,來啟下載最" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "新版本的網頁。下載時請注意" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "防火牆或防毒軟體的阻擋!!"
287
+        Me.Label1.Text = "如果您的系統沒有自動更新," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "請按下方按鈕,來啟下載最" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "新版本的程式。下載時請注意" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "防火牆或防毒軟體的阻擋!!"
287 288
         '
288 289
         '簡易_lb
289 290
         '
@@ -316,9 +317,9 @@ Partial Class LoginForm1
316 317
         '
317 318
         '解鎖_bt
318 319
         '
319
-        Me.解鎖_bt.Location = New System.Drawing.Point(466, 215)
320
+        Me.解鎖_bt.Location = New System.Drawing.Point(463, 215)
320 321
         Me.解鎖_bt.Name = "解鎖_bt"
321
-        Me.解鎖_bt.Size = New System.Drawing.Size(492, 23)
322
+        Me.解鎖_bt.Size = New System.Drawing.Size(248, 23)
322 323
         Me.解鎖_bt.TabIndex = 682
323 324
         Me.解鎖_bt.Text = "解鎖"
324 325
         Me.解鎖_bt.UseVisualStyleBackColor = True
@@ -341,6 +342,15 @@ Partial Class LoginForm1
341 342
         '
342 343
         Me.Timer1.Interval = 2000
343 344
         '
345
+        'UPDATE_bt
346
+        '
347
+        Me.UPDATE_bt.Location = New System.Drawing.Point(710, 215)
348
+        Me.UPDATE_bt.Name = "UPDATE_bt"
349
+        Me.UPDATE_bt.Size = New System.Drawing.Size(248, 23)
350
+        Me.UPDATE_bt.TabIndex = 684
351
+        Me.UPDATE_bt.Text = "UPDATE"
352
+        Me.UPDATE_bt.UseVisualStyleBackColor = True
353
+        '
344 354
         'LoginForm1
345 355
         '
346 356
         Me.AcceptButton = Me.確認_bt
@@ -350,7 +360,7 @@ Partial Class LoginForm1
350 360
         Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
351 361
         Me.CancelButton = Me.取消_bt
352 362
         Me.ClientSize = New System.Drawing.Size(964, 240)
353
-        Me.Controls.Add(Me.簡易登入_dgv)
363
+        Me.Controls.Add(Me.UPDATE_bt)
354 364
         Me.Controls.Add(Me.藏_bt)
355 365
         Me.Controls.Add(Me.解鎖_bt)
356 366
         Me.Controls.Add(Me.簡易_lb)
@@ -372,8 +382,9 @@ Partial Class LoginForm1
372 382
         Me.Controls.Add(Me.PasswordLabel)
373 383
         Me.Controls.Add(Me.UsernameLabel)
374 384
         Me.Controls.Add(Me.LogoPictureBox)
385
+        Me.Controls.Add(Me.簡易登入_dgv)
375 386
         Me.Controls.Add(Me.Label1)
376
-        Me.Controls.Add(Me.Button1)
387
+        Me.Controls.Add(Me.更新_bt)
377 388
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
378 389
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
379 390
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
@@ -404,11 +415,12 @@ Partial Class LoginForm1
404 415
     Friend WithEvents 資料庫版本號_lb As Label
405 416
     Friend WithEvents 使用者帳號_cb As ComboBox
406 417
     Friend WithEvents SaveFileDialog1 As SaveFileDialog
407
-    Friend WithEvents Button1 As Button
418
+    Friend WithEvents 更新_bt As Button
408 419
     Friend WithEvents Label1 As Label
409 420
     Friend WithEvents 簡易_lb As Label
410 421
     Friend WithEvents 簡易登入_dgv As DataGridView
411 422
     Friend WithEvents 解鎖_bt As Button
412 423
     Friend WithEvents 藏_bt As Button
413 424
     Friend WithEvents Timer1 As Timer
425
+    Friend WithEvents UPDATE_bt As Button
414 426
 End Class

+ 46
- 18
GA-ERP-SYS/LoginForm1.vb Parādīt failu

@@ -9,6 +9,7 @@ Public Class LoginForm1
9 9
     ' 其中 CustomPrincipal 是用來執行驗證的 IPrincipal 實作。
10 10
     ' 接著,My.User 便會傳回封裝在 CustomPrincipal 物件中的識別資訊,
11 11
     ' 例如使用者名稱、顯示名稱等。
12
+    ReadOnly ds2 As New DataSet
12 13
     ReadOnly MACKK As String 'MAC碼
13 14
     ReadOnly diskId As String '數字ID
14 15
     ReadOnly diskSerialNumber As String '硬碟序列
@@ -19,6 +20,14 @@ Public Class LoginForm1
19 20
     ReadOnly ds As New DataSet
20 21
     Dim FFGG As Integer
21 22
     Dim 更新關閉 As Boolean
23
+    Private Sub Set_清單1()
24
+        FTP清單_dgv.DataSource = Nothing : ds2.Clear()
25
+        FTP清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
26
+        FTP清單_dgv.ColumnHeadersHeight = 25
27
+        FTP清單_dgv.AllowUserToAddRows = False
28
+        SQL_FTP資料夾路徑分配()
29
+        da.Fill(ds2) : FTP清單_dgv.DataSource = ds2.Tables(0) : conn.Close()
30
+    End Sub
22 31
     Private Sub Set_使用者清單()
23 32
         簡易登入_dgv.DataSource = Nothing : ds.Clear()
24 33
         簡易登入_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -29,9 +38,6 @@ Public Class LoginForm1
29 38
         da.Fill(ds) : 簡易登入_dgv.DataSource = ds.Tables(0) : conn.Close()
30 39
         簡易登入_dgv.Columns(0).FillWeight = 80 : 簡易登入_dgv.Columns(1).FillWeight = 100 : 簡易登入_dgv.Columns(2).FillWeight = 80 : 簡易登入_dgv.Columns(3).FillWeight = 55
31 40
         簡易登入_dgv.Columns(5).FillWeight = 80 : 簡易登入_dgv.Columns(4).FillWeight = 55
32
-        Set_grid()
33
-    End Sub
34
-    Private Sub Set_grid()
35 41
         For i As Integer = 0 To 簡易登入_dgv.Rows.Count - 1
36 42
             FFGG = DateDiff("d", Format(Today(), "yyyy/MM/dd"), 簡易登入_dgv.Rows(i).Cells("到期日").Value)
37 43
             If FFGG < 0 Then
@@ -42,8 +48,11 @@ Public Class LoginForm1
42 48
         Next
43 49
     End Sub
44 50
     Private Sub LoginForm1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
51
+        '-----------------------刪除自動更新項目-----------------------------------------------------------------------------------------------------------------------------------------------
52
+        Dim Str As String = Application.StartupPath
53
+        If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
45 54
         '-----------------------控件基本設定-----------------------------------------------------------------------------------------------------------------------------------------------
46
-        刷卡登入_ch.Checked = True : 刷卡登入_ch.Enabled = False : 帳號_tb.Visible = False : 解鎖_bt.Visible = False ': 使用者帳號_cb.Enabled = False
55
+        刷卡登入_ch.Checked = True : 刷卡登入_ch.Enabled = False : 帳號_tb.Visible = False : 解鎖_bt.Visible = False : UPDATE_bt.Visible = False ': 使用者帳號_cb.Enabled = False
47 56
         執行檔版本號_lb.Text = "執行檔版本號 : " & 版本
48 57
         伺服器區域_ch.SelectedIndex = 0
49 58
         If 更新關閉 = True Then : Me.Close() : Else
@@ -79,6 +88,15 @@ Public Class LoginForm1
79 88
             End If
80 89
             Timer1.Enabled = True
81 90
         End If
91
+        SQL_FTP伺服器登入位置()
92
+        If dr.Read() Then : Target = dr("FTP地址") : FTP帳號 = dr("FTP帳號") : FTP密碼 = dr("FTP密碼") : End If : conn.Close()
93
+        Set_清單1()
94
+        Dim HH As String = ""
95
+        For i As Integer = 0 To FTP清單_dgv.Rows.Count - 1
96
+            If i < 10 Then : HH = "0" & i : ElseIf i >= 10 Then : HH = i : End If
97
+            If FTP清單_dgv("指定", i).Value.ToString = "AA" & HH Then : AA(i) = FTP清單_dgv("資料夾名稱", i).Value.ToString : End If
98
+        Next
99
+        Target1 = Target & AA(0) & "/"
82 100
     End Sub
83 101
     Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
84 102
         Dim Usbkey As Boolean = False
@@ -157,10 +175,11 @@ Public Class LoginForm1
157 175
             ElseIf screenWidth = 1280 And screenHeight = 1024 Then
158 176
             ElseIf screenWidth = 1600 And screenHeight = 900 Then
159 177
             End If
160
-            Dim fileName As String = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
161
-            Dim fullPath As String
162
-            fullPath = Path.GetFullPath(fileName)
163
-            Process.Start(fullPath, "--app= http://106.1.50.79:8080/ga-erp-sys/")
178
+            'Dim fileName As String = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
179
+            'Dim fullPath As String
180
+            'fullPath = Path.GetFullPath(fileName)
181
+            'Process.Start(fullPath, "--app= http://106.1.50.79:8080/ga-erp-sys/")
182
+            Timer1.Enabled = False : UPDATE_bt.Visible = True : UPDATE_bt.PerformClick()
164 183
             更新關閉 = True
165 184
         Else
166 185
             Me.Size = New Size(466, 279)
@@ -170,7 +189,7 @@ Public Class LoginForm1
170 189
             ElseIf screenWidth = 1280 And screenHeight = 1024 Then : Me.Location = New Point(407, 373)
171 190
             ElseIf screenWidth = 1600 And screenHeight = 900 Then : Me.Location = New Point(567, 311)
172 191
             End If
173
-            簡易登入_dgv.Visible = False : 解鎖_bt.Visible = False
192
+            簡易登入_dgv.Visible = False : 解鎖_bt.Visible = False : UPDATE_bt.Visible = False
174 193
         End If
175 194
     End Sub
176 195
     Private Sub 登入程序()
@@ -255,7 +274,7 @@ Public Class LoginForm1
255 274
             ElseIf screenWidth = 1280 And screenHeight = 1024 Then : Me.Location = New Point(407, 373)
256 275
             ElseIf screenWidth = 1600 And screenHeight = 900 Then : Me.Location = New Point(567, 311)
257 276
             End If
258
-            簡易登入_dgv.Visible = False : 解鎖_bt.Visible = False
277
+            簡易登入_dgv.Visible = False : 解鎖_bt.Visible = False : UPDATE_bt.Visible = False
259 278
         Else
260 279
             If 簡易登入_dgv.Visible = True Then : Me.Size = New Size(980, 279) : Else : Me.Size = New Size(705, 279) : End If
261 280
             If screenWidth = 1920 And screenHeight = 1080 Then : Me.Location = New Point(608, 401)
@@ -294,18 +313,12 @@ Public Class LoginForm1
294 313
             End If
295 314
         End If
296 315
     End Sub
297
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
298
-        Dim fileName As String = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
299
-        Dim fullPath As String
300
-        fullPath = Path.GetFullPath(fileName)
301
-        Process.Start(fullPath, "--app= http://106.1.50.79:8080/ga-erp-sys/")
302
-    End Sub
303 316
     Private Sub 簡易_lb_Click(sender As Object, e As EventArgs) Handles 簡易_lb.Click
304 317
         PA = InputBox("請輸入系統商管理密碼!!")
305 318
         If PA = "753582" Then
306
-            簡易登入_dgv.Visible = True : 解鎖_bt.Visible = True : 更新下載_ch.Checked = True : Set_使用者清單()
319
+            簡易登入_dgv.Visible = True : 解鎖_bt.Visible = True : UPDATE_bt.Visible = True : 更新下載_ch.Checked = True : Set_使用者清單()
307 320
         Else
308
-            簡易登入_dgv.Visible = False : 解鎖_bt.Visible = False : 更新下載_ch.Checked = False : Set_使用者清單()
321
+            簡易登入_dgv.Visible = False : 解鎖_bt.Visible = False : UPDATE_bt.Visible = False : 更新下載_ch.Checked = False : Set_使用者清單()
309 322
         End If
310 323
     End Sub
311 324
     Private Sub 解鎖_bt_Click(sender As Object, e As EventArgs) Handles 解鎖_bt.Click
@@ -321,4 +334,19 @@ Public Class LoginForm1
321 334
             登入綁定_ch.Checked = True : 藏_bt.Visible = True
322 335
         End If
323 336
     End Sub
337
+    Private Sub 更新_bt_Click(sender As Object, e As EventArgs) Handles 更新_bt.Click
338
+        Timer1.Enabled = False : UPDATE_bt.Visible = True
339
+        UPDATE_bt.PerformClick()
340
+        'Dim fileName As String = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
341
+        'Dim fullPath As String
342
+        'fullPath = Path.GetFullPath(fileName)
343
+        'Process.Start(fullPath, "--app= http://106.1.50.79:8080/ga-erp-sys/")
344
+    End Sub
345
+    Private Sub UPDATE_bt_Click(sender As Object, e As EventArgs) Handles UPDATE_bt.Click
346
+        Timer1.Enabled = False
347
+        Dim Strs As String = Application.StartupPath
348
+        My.Computer.Network.DownloadFile(Target & AA(0) & "/" & "SYS-UPDATE.exe", Strs + "\SYS-UPDATE.exe")
349
+        Shell(Strs + "\SYS-UPDATE.exe", vbNormalFocus)
350
+        Me.Close()
351
+    End Sub
324 352
 End Class

+ 6
- 6
GA-ERP-SYS/Module/SQL_子系統管理.vb Parādīt failu

@@ -539,8 +539,8 @@
539 539
     Friend Sub SQL_帳務明細查詢表查詢()
540 540
         ConnOpen_子SQL()
541 541
         SQL1 = "SELECT      QQQ.開始日期, QQQ.結束日期, QQQ.網址, QQQ.商品, QQQ.帳戶, QQQ.資料, QQQ.上行基數, QQQ.下行基數, QQQ.老闆, 
542
-                            QQQ.客戶, QQQ.[會員.], QQQ.[代理.], QQQ.[總代理.], QQQ.[股東.], QQQ.[大股東.], QQQ.[總監.], QQQ.個人所得, 
543
-                            QQQ.水差, QQQ.會員1, QQQ.代理1, QQQ.總代理1, QQQ.股東1, QQQ.大股東1, QQQ.總監1, QQQ.個人所得1, 
542
+                            QQQ.客戶, QQQ.[會員.], QQQ.[代理.], QQQ.[總代理.], QQQ.[股東.], QQQ.[大股東.], QQQ.[總監.], QQQ.[上繳金額.], QQQ.個人所得, 
543
+                            QQQ.水差, QQQ.會員1, QQQ.代理1, QQQ.總代理1, QQQ.股東1, QQQ.大股東1, QQQ.總監1, QQQ.上繳金額1, QQQ.個人所得1, 
544 544
                             QQQ.水差1, QQQ.總量, QQQ.退水, QQQ.中獎, QQQ.輸贏, QQQ.佔成輸贏, QQQ.水倍差, QQQ.上繳金額, 
545 545
                             QQQ.自已總輸贏, QQQ.上繳貢獻額, QQQ.貢獻額, QQQ.貢獻度, QQQ.下注明細, QQQ.玩法明細, QQQ.調盤退水, 
546 546
                             QQQ.調退實佔, QQQ.上繳, QQQ.會員, QQQ.代理, QQQ.總代理, QQQ.股東, QQQ.大股東, QQQ.客戶s, QQQ.總量s, 
@@ -554,11 +554,11 @@
554 554
                                        商客基本資料表.上繳源 AS 老闆, 流水帳.名稱 AS 客戶, 商客基本資料表.上行基數 AS [會員.], 
555 555
                                        商客基本資料表.下行基數 AS [代理.], 商客基本資料表.下行基數 AS [總代理.], 
556 556
                                        商客基本資料表.下行基數 AS [股東.], 商客基本資料表.下行基數 AS [大股東.], 
557
-                                       商客基本資料表.下行基數 AS [總監.], 商客基本資料表.上行基數 AS 個人所得, 
558
-                                       商客基本資料表.下行基數 AS 水差, 商客基本資料表.上行基數 AS 會員1, 
559
-                                       商客基本資料表.下行基數 AS 代理1, 商客基本資料表.下行基數 AS 總代理1, 
557
+                                       商客基本資料表.下行基數 AS [總監.], 商客基本資料表.下行基數 AS [上繳金額.], 
558
+                                       商客基本資料表.上行基數 AS 個人所得, 商客基本資料表.下行基數 AS 水差, 
559
+                                       商客基本資料表.上行基數 AS 會員1, 商客基本資料表.下行基數 AS 代理1, 商客基本資料表.下行基數 AS 總代理1, 
560 560
                                        商客基本資料表.下行基數 AS 股東1, 商客基本資料表.下行基數 AS 大股東1, 
561
-                                       商客基本資料表.下行基數 AS 總監1, 商客基本資料表.上行基數 AS 個人所得1, 
561
+                                       商客基本資料表.下行基數 AS 總監1, 商客基本資料表.下行基數 AS [上繳金額1], 商客基本資料表.上行基數 AS 個人所得1, 
562 562
                                        商客基本資料表.下行基數 AS 水差1, 流水帳.總量, 流水帳.退水, 流水帳.中獎, 流水帳.輸贏, 
563 563
                                        流水帳.佔成輸贏, 流水帳.水倍差, 流水帳.上繳金額, 流水帳.自已總輸贏, 流水帳.上繳貢獻額, 
564 564
                                        流水帳.貢獻額, 流水帳.貢獻度, 流水帳.下注明細, 流水帳.玩法明細, 流水帳.調盤退水, 

+ 2
- 2
GA-ERP-SYS/My Project/AssemblyInfo.vb Parādīt failu

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
31 31
 ' 設為預設,如下所示:
32 32
 ' <Assembly: AssemblyVersion("1.0.*")>
33 33
 
34
-<Assembly: AssemblyVersion("1.9.0.0")>
35
-<Assembly: AssemblyFileVersion("1.9.0.0")>
34
+<Assembly: AssemblyVersion("1.10.0.0")>
35
+<Assembly: AssemblyFileVersion("1.10.0.0")>

Binārs
GA-ERP-SYS/bin/Debug - 2021073001.zip Parādīt failu


Binārs
GA-ERP-SYS/bin/Debug - 2021081001.zip Parādīt failu


Binārs
GA-ERP-SYS/bin/Debug - 2021091101.rar Parādīt failu


Binārs
GA-ERP-SYS/bin/Debug/GA-ERP-SYS.exe Parādīt failu


Binārs
GA-ERP-SYS/bin/Debug/GA-ERP-SYS.pdb Parādīt failu


Binārs
GA-ERP-SYS/bin/Debug - 2021081301.zip → GA-ERP-SYS/bin/GA-ERP-SYS-4.exe Parādīt failu


Binārs
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.exe Parādīt failu


Binārs
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.pdb Parādīt failu


+ 1
- 1
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbproj.CoreCompileInputs.cache Parādīt failu

@@ -1 +1 @@
1
-6526e6772923c5594ab2b4b0d5a97d2ed4a7694f
1
+ac3e807adc43f305246c981a40a2d7dfaa464546

+ 36
- 0
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbproj.FileListAbsolute.txt Parādīt failu

@@ -120,3 +120,39 @@ D:\工巧明\GAME- Accounting-SYS\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.資
120 120
 D:\工巧明\GAME- Accounting-SYS\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.帳務彙總計算表.resources
121 121
 D:\工巧明\GAME- Accounting-SYS\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.帳務明細查詢表.resources
122 122
 D:\工巧明\GAME- Accounting-SYS\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.錯誤排除手冊.resources
123
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\GA-ERP-SYS.exe.config
124
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\GA-ERP-SYS.exe
125
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\GA-ERP-SYS.pdb
126
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\GA-ERP-SYS.xml
127
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\DocumentFormat.OpenXml.dll
128
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\bin\Debug\DocumentFormat.OpenXml.xml
129
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.vbprojAssemblyReference.cache
130
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.網址帳號驗證中.resources
131
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.帳務明細查詢表.resources
132
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.錯誤排除手冊.resources
133
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.LOG檔.resources
134
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.帳務彙總計算表.resources
135
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.GA_ERP_SYS.resources
136
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.LoginForm1.resources
137
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.Resources.resources
138
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.SplashScreen1.resources
139
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.USB_KEY_指定.resources
140
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.商客資料導入.resources
141
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.基本資料.resources
142
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.流水帳手動輸入.resources
143
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.流水帳自動導入.resources
144
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.FTP資料夾管理.resources
145
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.人員ID卡系統配置設定.resources
146
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.個人帳號管理.resources
147
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.PY執行錯誤LOG檔.resources
148
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.系統使用者管理.resources
149
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.系統執行檔版本管理.resources
150
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.系統編碼規則.resources
151
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.計算機.resources
152
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA_ERP_SYS.資料備份轉移.resources
153
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.vbproj.GenerateResource.cache
154
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.vbproj.CoreCompileInputs.cache
155
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.vbproj.CopyComplete
156
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.exe
157
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.xml
158
+D:\工巧明\GA\GA-ERP-SYS\GA-ERP-SYS\obj\Debug\GA-ERP-SYS.pdb

Binārs
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbproj.GenerateResource.cache Parādīt failu


Binārs
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbprojAssemblyReference.cache Parādīt failu


+ 2
- 1
GA-ERP-SYS/基本資料管理/基本資料.vb Parādīt failu

@@ -547,10 +547,11 @@ Public Class 基本資料
547 547
         End While
548 548
     End Sub
549 549
     Private Sub 開網站1_bt_Click(sender As Object, e As EventArgs) Handles 開網站1_bt.Click
550
+        Dim Strs As String = Application.StartupPath
550 551
         If 網址1_tb.Text = "" Or 帳號_tb.Text = "" Or 密碼_tb.Text = "" Then
551 552
             MsgBox("資料不齊全,請重新確認!!!")
552 553
         Else
553
-            If File.Exists("lorv.csv") Then
554
+            If File.Exists(Strs + "\lorv.csv") Then
554 555
                 File.Delete("lorv.csv")
555 556
             End If
556 557
             If File.Exists(My.Computer.FileSystem.SpecialDirectories.Desktop & "lorv.csv") Then

+ 45
- 19
GA-ERP-SYS/報表系統管理/帳務明細查詢表.vb Parādīt failu

@@ -109,7 +109,7 @@ Public Class 帳務明細查詢表
109 109
         流水帳_dgv.Columns("網址").Visible = False : 流水帳_dgv.Columns("所得另算").Visible = False : 流水帳_dgv.Columns("按鈕").Visible = False
110 110
         流水帳_dgv.Columns("index").Visible = False : 流水帳_dgv.Columns("下客流水").Visible = False
111 111
         流水帳_dgv.Columns("總監").Visible = False
112
-        For i As Integer = 0 To 67 : 流水帳_dgv.Columns(i).ReadOnly = True : Next
112
+        For i As Integer = 0 To 69 : 流水帳_dgv.Columns(i).ReadOnly = True : Next
113 113
 
114 114
         流水帳_dgv.Columns("會員.").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
115 115
         流水帳_dgv.Columns("代理.").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -117,10 +117,11 @@ Public Class 帳務明細查詢表
117 117
         流水帳_dgv.Columns("股東.").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
118 118
         流水帳_dgv.Columns("大股東.").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
119 119
         流水帳_dgv.Columns("總監.").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
120
+        流水帳_dgv.Columns("上繳金額.").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
120 121
         流水帳_dgv.Columns("水差").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
121 122
         流水帳_dgv.Columns("個人所得").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
122 123
 
123
-        For i As Integer = 18 To 60 : 流水帳_dgv.Columns(i).Visible = False : Next
124
+        For i As Integer = 19 To 62 : 流水帳_dgv.Columns(i).Visible = False : Next
124 125
         For i As Integer = 0 To 流水帳_dgv.Rows.Count - 1
125 126
             If IsDBNull(流水帳_dgv("同帳", i).Value) = True Then : 流水帳_dgv("同帳", i).Value = False : End If
126 127
             If IsDBNull(流水帳_dgv("計算", i).Value) = True Then : 流水帳_dgv("計算", i).Value = False : End If
@@ -177,12 +178,15 @@ Public Class 帳務明細查詢表
177 178
                 Else : 流水帳_dgv.Rows(i).Cells("代理1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value.ToString : End If
178 179
                 If 流水帳_dgv.Rows(i).Cells("客戶小計s").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("會員1").Value = "0"
179 180
                 Else : 流水帳_dgv.Rows(i).Cells("會員1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value.ToString : End If
181
+                流水帳_dgv.Rows(i).Cells("上繳金額1").Value = "0"
180 182
                 '------------長版轉換---------------------------------------------------------------------------------------------------------------------------------------
181 183
             ElseIf Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "長板" Or Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "長版" Then
182 184
                 If 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0"
183 185
                 Else : 流水帳_dgv.Rows(i).Cells("個人所得1").Value = 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString : End If
184 186
                 If 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
185 187
                 Else : 流水帳_dgv.Rows(i).Cells("水差1").Value = 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString : End If
188
+                If 流水帳_dgv.Rows(i).Cells("上繳金額").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("上繳金額1").Value = "0"
189
+                Else : 流水帳_dgv.Rows(i).Cells("上繳金額1").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value.ToString : End If
186 190
                 If 流水帳_dgv.Rows(i).Cells("總監").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("總監1").Value = "0"
187 191
                 Else : 流水帳_dgv.Rows(i).Cells("總監1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value.ToString : End If
188 192
                 If 流水帳_dgv.Rows(i).Cells("大股東").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("大股東1").Value = "0"
@@ -196,7 +200,7 @@ Public Class 帳務明細查詢表
196 200
                 If 流水帳_dgv.Rows(i).Cells("會員").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("會員1").Value = "0"
197 201
                 Else : 流水帳_dgv.Rows(i).Cells("會員1").Value = 流水帳_dgv.Rows(i).Cells("會員").Value.ToString : End If
198 202
             Else
199
-                流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(i).Cells("會員1").Value = "0"
203
+                流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(i).Cells("會員1").Value = "0" : 流水帳_dgv.Rows(i).Cells("上繳金額1").Value = "0"
200 204
                 流水帳_dgv.Rows(i).Cells("水差1").Value = "0" : 流水帳_dgv.Rows(i).Cells("總監1").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東1").Value = "0"
201 205
                 流水帳_dgv.Rows(i).Cells("股東1").Value = "0" : 流水帳_dgv.Rows(i).Cells("總代理1").Value = "0" : 流水帳_dgv.Rows(i).Cells("代理1").Value = "0"
202 206
             End If
@@ -206,6 +210,7 @@ Public Class 帳務明細查詢表
206 210
             流水帳_dgv.Rows(i).Cells("股東.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("股東1").Value), "#,##0")
207 211
             流水帳_dgv.Rows(i).Cells("大股東.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("大股東1").Value), "#,##0")
208 212
             流水帳_dgv.Rows(i).Cells("總監.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("總監1").Value), "#,##0")
213
+            流水帳_dgv.Rows(i).Cells("上繳金額.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("上繳金額1").Value), "#,##0")
209 214
             流水帳_dgv.Rows(i).Cells("個人所得").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("個人所得1").Value), "#,##0")
210 215
             流水帳_dgv.Rows(i).Cells("水差").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("水差1").Value), "#,##0")
211 216
             流水帳_dgv.Rows(i).Cells("所得另算").Value = 流水帳_dgv.Rows(i).Cells("個人所得1").Value
@@ -213,7 +218,7 @@ Public Class 帳務明細查詢表
213 218
             If 流水帳_dgv("計算", i).Value = False Then
214 219
                 流水帳_dgv.Rows(i).Cells("會員.").Value = "0" : 流水帳_dgv.Rows(i).Cells("代理.").Value = "0" : 流水帳_dgv.Rows(i).Cells("個人所得").Value = "0"
215 220
                 流水帳_dgv.Rows(i).Cells("水差").Value = "0" : 流水帳_dgv.Rows(i).Cells("總代理.").Value = "0" : 流水帳_dgv.Rows(i).Cells("總監.").Value = "0"
216
-                流水帳_dgv.Rows(i).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東.").Value = "0"
221
+                流水帳_dgv.Rows(i).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東.").Value = "0" : 流水帳_dgv.Rows(i).Cells("上繳金額.").Value = "0"
217 222
             End If
218 223
             If 流水帳_dgv("所得", i).Value = False Then
219 224
                 流水帳_dgv.Rows(i).Cells("所得另算").Value = "0"
@@ -278,6 +283,10 @@ Public Class 帳務明細查詢表
278 283
                         流水帳_dgv.Rows(i).Cells("會員.").Value = 流水帳_dgv.Rows(i).Cells("會員").Value : 流水帳_dgv.Rows(i).Cells("代理.").Value = "0"
279 284
                         流水帳_dgv.Rows(i).Cells("總代理.").Value = "0" : 流水帳_dgv.Rows(i).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東.").Value = "0"
280 285
                         流水帳_dgv.Rows(i).Cells("總監.").Value = "0"
286
+                    ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "上繳金額" Then
287
+                        流水帳_dgv.Rows(i).Cells("會員.").Value = "0" : 流水帳_dgv.Rows(i).Cells("代理.").Value = "0"
288
+                        流水帳_dgv.Rows(i).Cells("總代理.").Value = "0" : 流水帳_dgv.Rows(i).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東.").Value = "0"
289
+                        流水帳_dgv.Rows(i).Cells("總監.").Value = "0" : 流水帳_dgv.Rows(i).Cells("上繳金額.").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
281 290
                     End If
282 291
                 End If
283 292
             End If
@@ -349,15 +358,15 @@ Public Class 帳務明細查詢表
349 358
     Private Sub 流水帳_dgv_CellClick(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles 流水帳_dgv.CellMouseClick
350 359
         Dim YY As Integer
351 360
         If 流水帳_dgv.SelectedCells.Count = 1 Then
352
-            If 流水帳_dgv.SelectedCells(0).ColumnIndex = 64 Then
361
+            If 流水帳_dgv.SelectedCells(0).ColumnIndex = 66 Then
353 362
                 If 流水帳_dgv("計算", 流水帳_dgv.SelectedCells(0).RowIndex).Value = False Then : 流水帳_dgv("計算", 流水帳_dgv.SelectedCells(0).RowIndex).Value = True
354 363
                 ElseIf 流水帳_dgv("計算", 流水帳_dgv.SelectedCells(0).RowIndex).Value = True Then : 流水帳_dgv("計算", 流水帳_dgv.SelectedCells(0).RowIndex).Value = False
355 364
                 End If
356
-            ElseIf 流水帳_dgv.SelectedCells(0).ColumnIndex = 65 Then
365
+            ElseIf 流水帳_dgv.SelectedCells(0).ColumnIndex = 67 Then
357 366
                 If 流水帳_dgv("同帳", 流水帳_dgv.SelectedCells(0).RowIndex).Value = False Then : 流水帳_dgv("同帳", 流水帳_dgv.SelectedCells(0).RowIndex).Value = True
358 367
                 ElseIf 流水帳_dgv("同帳", 流水帳_dgv.SelectedCells(0).RowIndex).Value = True Then : 流水帳_dgv("同帳", 流水帳_dgv.SelectedCells(0).RowIndex).Value = False
359 368
                 End If
360
-            ElseIf 流水帳_dgv.SelectedCells(0).ColumnIndex = 67 Then
369
+            ElseIf 流水帳_dgv.SelectedCells(0).ColumnIndex = 69 Then
361 370
                 If 流水帳_dgv("所得", 流水帳_dgv.SelectedCells(0).RowIndex).Value = False Then : 流水帳_dgv("所得", 流水帳_dgv.SelectedCells(0).RowIndex).Value = True
362 371
                 ElseIf 流水帳_dgv("所得", 流水帳_dgv.SelectedCells(0).RowIndex).Value = True Then : 流水帳_dgv("所得", 流水帳_dgv.SelectedCells(0).RowIndex).Value = False
363 372
                 End If
@@ -381,12 +390,15 @@ Public Class 帳務明細查詢表
381 390
                 Else : 流水帳_dgv.Rows(YY).Cells("代理1").Value = 流水帳_dgv.Rows(YY).Cells("代理小計s").Value.ToString : End If
382 391
                 If 流水帳_dgv.Rows(YY).Cells("客戶小計s").Value.ToString = "" Then : 流水帳_dgv.Rows(YY).Cells("會員1").Value = "0"
383 392
                 Else : 流水帳_dgv.Rows(YY).Cells("會員1").Value = 流水帳_dgv.Rows(YY).Cells("客戶小計s").Value.ToString : End If
393
+                流水帳_dgv.Rows(YY).Cells("上繳金額1").Value = "0"
384 394
                 '------------長版轉換---------------------------------------------------------------------------------------------------------------------------------------
385 395
             ElseIf Strings.Left(流水帳_dgv.Rows(YY).Cells("資料").Value, 2) = "長板" Or Strings.Left(流水帳_dgv.Rows(YY).Cells("資料").Value, 2) = "長版" Then
386 396
                 If 流水帳_dgv.Rows(YY).Cells("自已總輸贏").Value.ToString = "" Then : 流水帳_dgv.Rows(YY).Cells("個人所得1").Value = "0"
387 397
                 Else : 流水帳_dgv.Rows(YY).Cells("個人所得1").Value = 流水帳_dgv.Rows(YY).Cells("自已總輸贏").Value.ToString : End If
388 398
                 If 流水帳_dgv.Rows(YY).Cells("水倍差").Value.ToString = "" Then : 流水帳_dgv.Rows(YY).Cells("水差1").Value = "0"
389 399
                 Else : 流水帳_dgv.Rows(YY).Cells("水差1").Value = 流水帳_dgv.Rows(YY).Cells("水倍差").Value.ToString : End If
400
+                If 流水帳_dgv.Rows(YY).Cells("上繳金額").Value.ToString = "" Then : 流水帳_dgv.Rows(YY).Cells("上繳金額1").Value = "0"
401
+                Else : 流水帳_dgv.Rows(YY).Cells("上繳金額1").Value = 流水帳_dgv.Rows(YY).Cells("上繳金額").Value.ToString : End If
390 402
                 If 流水帳_dgv.Rows(YY).Cells("總監").Value.ToString = "" Then : 流水帳_dgv.Rows(YY).Cells("總監1").Value = "0"
391 403
                 Else : 流水帳_dgv.Rows(YY).Cells("總監1").Value = 流水帳_dgv.Rows(YY).Cells("總監").Value.ToString : End If
392 404
                 If 流水帳_dgv.Rows(YY).Cells("大股東").Value.ToString = "" Then : 流水帳_dgv.Rows(YY).Cells("大股東1").Value = "0"
@@ -402,7 +414,7 @@ Public Class 帳務明細查詢表
402 414
             Else
403 415
                 流水帳_dgv.Rows(YY).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(YY).Cells("會員1").Value = "0" : 流水帳_dgv.Rows(YY).Cells("水差1").Value = "0"
404 416
                 流水帳_dgv.Rows(YY).Cells("總監1").Value = "0" : 流水帳_dgv.Rows(YY).Cells("大股東1").Value = "0" : 流水帳_dgv.Rows(YY).Cells("股東1").Value = "0"
405
-                流水帳_dgv.Rows(YY).Cells("總代理1").Value = "0" : 流水帳_dgv.Rows(YY).Cells("代理1").Value = "0"
417
+                流水帳_dgv.Rows(YY).Cells("總代理1").Value = "0" : 流水帳_dgv.Rows(YY).Cells("代理1").Value = "0" : 流水帳_dgv.Rows(YY).Cells("上繳金額1").Value = "0"
406 418
             End If
407 419
             流水帳_dgv.Rows(YY).Cells("會員.").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("會員1").Value), "#,##0")
408 420
             流水帳_dgv.Rows(YY).Cells("代理.").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("代理1").Value), "#,##0")
@@ -410,6 +422,7 @@ Public Class 帳務明細查詢表
410 422
             流水帳_dgv.Rows(YY).Cells("股東.").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("股東1").Value), "#,##0")
411 423
             流水帳_dgv.Rows(YY).Cells("大股東.").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("大股東1").Value), "#,##0")
412 424
             流水帳_dgv.Rows(YY).Cells("總監.").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("總監1").Value), "#,##0")
425
+            流水帳_dgv.Rows(YY).Cells("上繳金額.").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("上繳金額1").Value), "#,##0")
413 426
             流水帳_dgv.Rows(YY).Cells("個人所得").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("個人所得1").Value), "#,##0")
414 427
             流水帳_dgv.Rows(YY).Cells("水差").Value = Strings.Format(Val(流水帳_dgv.Rows(YY).Cells("水差1").Value), "#,##0")
415 428
             流水帳_dgv.Rows(YY).Cells("所得另算").Value = 流水帳_dgv.Rows(YY).Cells("個人所得1").Value
@@ -417,7 +430,7 @@ Public Class 帳務明細查詢表
417 430
             If 流水帳_dgv("計算", YY).Value = False Then
418 431
                 流水帳_dgv.Rows(YY).Cells("會員.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("代理.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("大股東.").Value = "0"
419 432
                 流水帳_dgv.Rows(YY).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("水差").Value = "0" : 流水帳_dgv.Rows(YY).Cells("總代理.").Value = "0"
420
-                流水帳_dgv.Rows(YY).Cells("總監.").Value = "0"
433
+                流水帳_dgv.Rows(YY).Cells("總監.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("上繳金額.").Value = "0"
421 434
             End If
422 435
             If 流水帳_dgv("所得", YY).Value = False Then
423 436
                 流水帳_dgv.Rows(YY).Cells("個人所得").Value = "0"
@@ -474,6 +487,10 @@ Public Class 帳務明細查詢表
474 487
                         流水帳_dgv.Rows(YY).Cells("會員.").Value = 流水帳_dgv.Rows(YY).Cells("會員").Value : 流水帳_dgv.Rows(YY).Cells("代理.").Value = "0"
475 488
                         流水帳_dgv.Rows(YY).Cells("總代理.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("大股東.").Value = "0"
476 489
                         流水帳_dgv.Rows(YY).Cells("總監.").Value = "0"
490
+                    ElseIf 流水帳_dgv.Rows(YY).Cells("同帳指定").Value.ToString = "上繳金額" Then
491
+                        流水帳_dgv.Rows(YY).Cells("會員.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("代理.").Value = "0"
492
+                        流水帳_dgv.Rows(YY).Cells("總代理.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("大股東.").Value = "0"
493
+                        流水帳_dgv.Rows(YY).Cells("總監.").Value = "0" : 流水帳_dgv.Rows(YY).Cells("上繳金額.").Value = 流水帳_dgv.Rows(YY).Cells("上繳金額").Value
477 494
                     End If
478 495
                 End If
479 496
             End If
@@ -782,12 +799,15 @@ Public Class 帳務明細查詢表
782 799
                 Else : 流水帳_dgv.Rows(i).Cells("代理1").Value = 流水帳_dgv.Rows(i).Cells("代理小計s").Value.ToString : End If
783 800
                 If 流水帳_dgv.Rows(i).Cells("客戶小計s").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("會員1").Value = "0"
784 801
                 Else : 流水帳_dgv.Rows(i).Cells("會員1").Value = 流水帳_dgv.Rows(i).Cells("客戶小計s").Value.ToString : End If
802
+                流水帳_dgv.Rows(i).Cells("上繳金額1").Value = "0"
785 803
                 '------------長版轉換---------------------------------------------------------------------------------------------------------------------------------------
786 804
             ElseIf Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "長板" Or Strings.Left(流水帳_dgv.Rows(i).Cells("資料").Value, 2) = "長版" Then
787 805
                 If 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0"
788 806
                 Else : 流水帳_dgv.Rows(i).Cells("個人所得1").Value = 流水帳_dgv.Rows(i).Cells("自已總輸贏").Value.ToString : End If
789 807
                 If 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
790 808
                 Else : 流水帳_dgv.Rows(i).Cells("水差1").Value = 流水帳_dgv.Rows(i).Cells("水倍差").Value.ToString : End If
809
+                If 流水帳_dgv.Rows(i).Cells("上繳金額").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("上繳金額1").Value = "0"
810
+                Else : 流水帳_dgv.Rows(i).Cells("上繳金額1").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value.ToString : End If
791 811
                 If 流水帳_dgv.Rows(i).Cells("總監").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("總監1").Value = "0"
792 812
                 Else : 流水帳_dgv.Rows(i).Cells("總監1").Value = 流水帳_dgv.Rows(i).Cells("總監").Value.ToString : End If
793 813
                 If 流水帳_dgv.Rows(i).Cells("大股東").Value.ToString = "" Then : 流水帳_dgv.Rows(i).Cells("大股東1").Value = "0"
@@ -803,7 +823,7 @@ Public Class 帳務明細查詢表
803 823
             Else
804 824
                 流水帳_dgv.Rows(i).Cells("個人所得1").Value = "0" : 流水帳_dgv.Rows(i).Cells("會員1").Value = "0" : 流水帳_dgv.Rows(i).Cells("水差1").Value = "0"
805 825
                 流水帳_dgv.Rows(i).Cells("總監1").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東1").Value = "0" : 流水帳_dgv.Rows(i).Cells("股東1").Value = "0"
806
-                流水帳_dgv.Rows(i).Cells("總代理1").Value = "0" : 流水帳_dgv.Rows(i).Cells("代理1").Value = "0"
826
+                流水帳_dgv.Rows(i).Cells("總代理1").Value = "0" : 流水帳_dgv.Rows(i).Cells("代理1").Value = "0" : 流水帳_dgv.Rows(i).Cells("上繳金額1").Value = "0"
807 827
             End If
808 828
             流水帳_dgv.Rows(i).Cells("會員.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("會員1").Value), "#,##0")
809 829
             流水帳_dgv.Rows(i).Cells("代理.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("代理1").Value), "#,##0")
@@ -811,6 +831,7 @@ Public Class 帳務明細查詢表
811 831
             流水帳_dgv.Rows(i).Cells("股東.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("股東1").Value), "#,##0")
812 832
             流水帳_dgv.Rows(i).Cells("大股東.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("大股東1").Value), "#,##0")
813 833
             流水帳_dgv.Rows(i).Cells("總監.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("總監1").Value), "#,##0")
834
+            流水帳_dgv.Rows(i).Cells("上繳金額.").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("上繳金額1").Value), "#,##0")
814 835
             流水帳_dgv.Rows(i).Cells("個人所得").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("個人所得1").Value), "#,##0")
815 836
             流水帳_dgv.Rows(i).Cells("水差").Value = Strings.Format(Val(流水帳_dgv.Rows(i).Cells("水差1").Value), "#,##0")
816 837
             流水帳_dgv.Rows(i).Cells("所得另算").Value = 流水帳_dgv.Rows(i).Cells("個人所得1").Value
@@ -875,6 +896,10 @@ Public Class 帳務明細查詢表
875 896
                         流水帳_dgv.Rows(i).Cells("會員.").Value = 流水帳_dgv.Rows(i).Cells("會員").Value : 流水帳_dgv.Rows(i).Cells("代理.").Value = "0"
876 897
                         流水帳_dgv.Rows(i).Cells("總代理.").Value = "0" : 流水帳_dgv.Rows(i).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東.").Value = "0"
877 898
                         流水帳_dgv.Rows(i).Cells("總監.").Value = "0"
899
+                    ElseIf 流水帳_dgv.Rows(i).Cells("同帳指定").Value.ToString = "上繳金額" Then
900
+                        流水帳_dgv.Rows(i).Cells("會員.").Value = "0" : 流水帳_dgv.Rows(i).Cells("代理.").Value = "0"
901
+                        流水帳_dgv.Rows(i).Cells("總代理.").Value = "0" : 流水帳_dgv.Rows(i).Cells("股東.").Value = "0" : 流水帳_dgv.Rows(i).Cells("大股東.").Value = "0"
902
+                        流水帳_dgv.Rows(i).Cells("總監.").Value = "0" : 流水帳_dgv.Rows(i).Cells("上繳金額.").Value = 流水帳_dgv.Rows(i).Cells("上繳金額").Value
878 903
                     End If
879 904
                 End If
880 905
             End If
@@ -1019,15 +1044,15 @@ Public Class 帳務明細查詢表
1019 1044
 
1020 1045
         xlSheet.Cells(2, 1) = "商品" : xlSheet.Cells(2, 2) = "帳戶" : xlSheet.Cells(2, 3) = "老闆" : xlSheet.Cells(2, 4) = "客戶帳號" : xlSheet.Cells(2, 5) = "客戶"
1021 1046
         xlSheet.Cells(2, 6) = "會員" : xlSheet.Cells(2, 7) = "代理" : xlSheet.Cells(2, 8) = "總代理" : xlSheet.Cells(2, 9) = "股東" : xlSheet.Cells(2, 10) = "大股東"
1022
-        xlSheet.Cells(2, 11) = "總監" : xlSheet.Cells(2, 12) = "個人所得" : xlSheet.Cells(2, 13) = "水差"
1047
+        xlSheet.Cells(2, 11) = "總監" : xlSheet.Cells(2, 12) = "上繳金額" : xlSheet.Cells(2, 13) = "個人所得" : xlSheet.Cells(2, 14) = "水差"
1023 1048
         For I As Integer = 0 To 流水帳_dgv.Rows.Count - 1
1024 1049
             xlSheet.Cells(3 + N1, 1) = 流水帳_dgv.Rows(I).Cells("商品").Value : xlSheet.Cells(3 + N1, 2) = 流水帳_dgv.Rows(I).Cells("帳戶").Value
1025 1050
             xlSheet.Cells(3 + N1, 3) = 流水帳_dgv.Rows(I).Cells("老闆").Value : xlSheet.Cells(3 + N1, 4) = 流水帳_dgv.Rows(I).Cells("客戶帳號").Value
1026 1051
             xlSheet.Cells(3 + N1, 5) = 流水帳_dgv.Rows(I).Cells("客戶").Value : xlSheet.Cells(3 + N1, 6) = 流水帳_dgv.Rows(I).Cells("會員.").Value
1027 1052
             xlSheet.Cells(3 + N1, 7) = 流水帳_dgv.Rows(I).Cells("代理.").Value : xlSheet.Cells(3 + N1, 8) = 流水帳_dgv.Rows(I).Cells("總代理.").Value
1028 1053
             xlSheet.Cells(3 + N1, 9) = 流水帳_dgv.Rows(I).Cells("股東.").Value : xlSheet.Cells(3 + N1, 10) = 流水帳_dgv.Rows(I).Cells("大股東.").Value
1029
-            xlSheet.Cells(3 + N1, 11) = 流水帳_dgv.Rows(I).Cells("總監.").Value : xlSheet.Cells(3 + N1, 12) = 流水帳_dgv.Rows(I).Cells("個人所得").Value
1030
-            xlSheet.Cells(3 + N1, 13) = 流水帳_dgv.Rows(I).Cells("水差").Value
1054
+            xlSheet.Cells(3 + N1, 11) = 流水帳_dgv.Rows(I).Cells("總監.").Value : xlSheet.Cells(3 + N1, 12) = 流水帳_dgv.Rows(I).Cells("上繳金額.").Value
1055
+            xlSheet.Cells(3 + N1, 13) = 流水帳_dgv.Rows(I).Cells("個人所得").Value : xlSheet.Cells(3 + N1, 14) = 流水帳_dgv.Rows(I).Cells("水差").Value
1031 1056
             N1 += 1
1032 1057
         Next
1033 1058
         xlSheet.Cells(4 + N1, 5) = "合計"
@@ -1035,6 +1060,7 @@ Public Class 帳務明細查詢表
1035 1060
         xlSheet.Cells(4 + N1, 8) = "=SUM(H3:H" & N1 + 3 & ")" : xlSheet.Cells(4 + N1, 9) = "=SUM(I3:I" & N1 + 3 & ")"
1036 1061
         xlSheet.Cells(4 + N1, 10) = "=SUM(J3:J" & N1 + 3 & ")" : xlSheet.Cells(4 + N1, 11) = "=SUM(K3:K" & N1 + 3 & ")"
1037 1062
         xlSheet.Cells(4 + N1, 12) = "=SUM(L3:L" & N1 + 3 & ")" : xlSheet.Cells(4 + N1, 13) = "=SUM(M3:M" & N1 + 3 & ")"
1063
+        xlSheet.Cells(4 + N1, 14) = "=SUM(N3:N" & N1 + 3 & ")"
1038 1064
         總表格式(xlApp, xlSheet)
1039 1065
 
1040 1066
         If xlApp.Sheets(2).Name = "工作表1" Then : xlApp.Sheets("工作表1").Delete : Else : xlApp.Sheets("sheet1").Delete : End If
@@ -1056,15 +1082,15 @@ Public Class 帳務明細查詢表
1056 1082
         With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
1057 1083
             .IndentLevel = 0 : .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
1058 1084
 
1059
-        xlSheet.Range("F2:M2").Select()
1085
+        xlSheet.Range("F2:N2").Select()
1060 1086
         With myExcel.Selection : .HorizontalAlignment = xlRight : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
1061 1087
             .IndentLevel = 0 : .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
1062 1088
 
1063
-        xlSheet.Columns("A:M").Select : myExcel.Columns("A:M").EntireColumn.AutoFit
1064
-        xlSheet.Range("F3:M" & N1 + 4).Select() : myExcel.Selection.NumberFormatLocal = "#,##0;[紅色]-#,##0"
1065
-        xlSheet.Columns("F:M").Select : myExcel.Selection.ColumnWidth = 12
1089
+        xlSheet.Columns("A:N").Select : myExcel.Columns("A:N").EntireColumn.AutoFit
1090
+        xlSheet.Range("F3:N" & N1 + 4).Select() : myExcel.Selection.NumberFormatLocal = "#,##0;[紅色]-#,##0"
1091
+        xlSheet.Columns("F:N").Select : myExcel.Selection.ColumnWidth = 12
1066 1092
 
1067
-        xlSheet.Range("A2:M2").Select()
1093
+        xlSheet.Range("A2:N2").Select()
1068 1094
         myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
1069 1095
         myExcel.Selection.Borders(xlEdgeLeft).LineStyle = xlNone
1070 1096
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -1072,7 +1098,7 @@ Public Class 帳務明細查詢表
1072 1098
         myExcel.Selection.Borders(xlEdgeRight).LineStyle = xlNone : myExcel.Selection.Borders(xlInsideVertical).LineStyle = xlNone
1073 1099
         myExcel.Selection.Borders(xlInsideHorizontal).LineStyle = xlNone
1074 1100
 
1075
-        xlSheet.Range("A" & N1 + 3 & ":M" & N1 + 3).Select()
1101
+        xlSheet.Range("A" & N1 + 3 & ":N" & N1 + 3).Select()
1076 1102
         myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
1077 1103
         myExcel.Selection.Borders(xlEdgeLeft).LineStyle = xlNone : myExcel.Selection.Borders(xlEdgeTop).LineStyle = xlNone
1078 1104
         With myExcel.Selection.Borders(xlEdgeBottom) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlMedium : End With

+ 110
- 12
GA-ERP-SYS/資料庫系統管理/系統執行檔版本管理.Designer.vb Parādīt failu

@@ -27,24 +27,31 @@ Partial Class 系統執行檔版本管理
27 27
         Me.Label3 = New System.Windows.Forms.Label()
28 28
         Me.版本號_tb = New System.Windows.Forms.TextBox()
29 29
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
30
+        Me.Label13 = New System.Windows.Forms.Label()
31
+        Me.讀取料夾路徑_bt = New System.Windows.Forms.Button()
32
+        Me.Label1 = New System.Windows.Forms.Label()
33
+        Me.WebBrowser3 = New System.Windows.Forms.WebBrowser()
34
+        Me.Label12 = New System.Windows.Forms.Label()
35
+        Me.WebBrowser2 = New System.Windows.Forms.WebBrowser()
36
+        Me.WebBrowser1 = New System.Windows.Forms.WebBrowser()
30 37
         Me.SuspendLayout()
31 38
         '
32 39
         '資料庫版本號_lb
33 40
         '
34 41
         Me.資料庫版本號_lb.AutoSize = True
35 42
         Me.資料庫版本號_lb.BackColor = System.Drawing.SystemColors.Control
36
-        Me.資料庫版本號_lb.Location = New System.Drawing.Point(262, 12)
43
+        Me.資料庫版本號_lb.Location = New System.Drawing.Point(469, 9)
37 44
         Me.資料庫版本號_lb.Name = "資料庫版本號_lb"
38
-        Me.資料庫版本號_lb.Size = New System.Drawing.Size(146, 12)
45
+        Me.資料庫版本號_lb.Size = New System.Drawing.Size(159, 16)
39 46
         Me.資料庫版本號_lb.TabIndex = 658
40 47
         Me.資料庫版本號_lb.Text = "資料庫版本號 : 2021060901"
41 48
         '
42 49
         '修改_bt
43 50
         '
44
-        Me.修改_bt.Location = New System.Drawing.Point(155, 6)
45
-        Me.修改_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
51
+        Me.修改_bt.Location = New System.Drawing.Point(344, 4)
52
+        Me.修改_bt.Margin = New System.Windows.Forms.Padding(3, 5, 3, 5)
46 53
         Me.修改_bt.Name = "修改_bt"
47
-        Me.修改_bt.Size = New System.Drawing.Size(105, 24)
54
+        Me.修改_bt.Size = New System.Drawing.Size(122, 25)
48 55
         Me.修改_bt.TabIndex = 652
49 56
         Me.修改_bt.Text = "修改"
50 57
         '
@@ -52,30 +59,114 @@ Partial Class 系統執行檔版本管理
52 59
         '
53 60
         Me.Label3.AutoSize = True
54 61
         Me.Label3.BackColor = System.Drawing.SystemColors.Control
55
-        Me.Label3.Location = New System.Drawing.Point(9, 12)
62
+        Me.Label3.Location = New System.Drawing.Point(177, 9)
56 63
         Me.Label3.Name = "Label3"
57
-        Me.Label3.Size = New System.Drawing.Size(41, 12)
64
+        Me.Label3.Size = New System.Drawing.Size(44, 16)
58 65
         Me.Label3.TabIndex = 651
59 66
         Me.Label3.Text = "版本號"
60 67
         '
61 68
         '版本號_tb
62 69
         '
63 70
         Me.版本號_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
64
-        Me.版本號_tb.Location = New System.Drawing.Point(52, 7)
65
-        Me.版本號_tb.Margin = New System.Windows.Forms.Padding(5)
71
+        Me.版本號_tb.Location = New System.Drawing.Point(224, 5)
72
+        Me.版本號_tb.Margin = New System.Windows.Forms.Padding(6, 7, 6, 7)
66 73
         Me.版本號_tb.Name = "版本號_tb"
67
-        Me.版本號_tb.Size = New System.Drawing.Size(101, 23)
74
+        Me.版本號_tb.Size = New System.Drawing.Size(117, 23)
68 75
         Me.版本號_tb.TabIndex = 650
69 76
         '
77
+        'Label13
78
+        '
79
+        Me.Label13.AutoSize = True
80
+        Me.Label13.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
81
+        Me.Label13.Location = New System.Drawing.Point(12, 9)
82
+        Me.Label13.Name = "Label13"
83
+        Me.Label13.Size = New System.Drawing.Size(56, 16)
84
+        Me.Label13.TabIndex = 660
85
+        Me.Label13.Text = "我的電腦"
86
+        '
87
+        '讀取料夾路徑_bt
88
+        '
89
+        Me.讀取料夾路徑_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
90
+        Me.讀取料夾路徑_bt.ForeColor = System.Drawing.Color.Blue
91
+        Me.讀取料夾路徑_bt.Location = New System.Drawing.Point(74, 5)
92
+        Me.讀取料夾路徑_bt.Name = "讀取料夾路徑_bt"
93
+        Me.讀取料夾路徑_bt.Size = New System.Drawing.Size(97, 24)
94
+        Me.讀取料夾路徑_bt.TabIndex = 659
95
+        Me.讀取料夾路徑_bt.Text = "讀取料夾路徑"
96
+        Me.讀取料夾路徑_bt.UseVisualStyleBackColor = True
97
+        '
98
+        'Label1
99
+        '
100
+        Me.Label1.AutoSize = True
101
+        Me.Label1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
102
+        Me.Label1.Location = New System.Drawing.Point(950, 352)
103
+        Me.Label1.Name = "Label1"
104
+        Me.Label1.Size = New System.Drawing.Size(80, 16)
105
+        Me.Label1.TabIndex = 665
106
+        Me.Label1.Text = "原代碼存放區"
107
+        '
108
+        'WebBrowser3
109
+        '
110
+        Me.WebBrowser3.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
111
+            Or System.Windows.Forms.AnchorStyles.Left) _
112
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
113
+        Me.WebBrowser3.Location = New System.Drawing.Point(958, 371)
114
+        Me.WebBrowser3.MinimumSize = New System.Drawing.Size(20, 20)
115
+        Me.WebBrowser3.Name = "WebBrowser3"
116
+        Me.WebBrowser3.Size = New System.Drawing.Size(382, 322)
117
+        Me.WebBrowser3.TabIndex = 664
118
+        Me.WebBrowser3.Url = New System.Uri("", System.UriKind.Relative)
119
+        '
120
+        'Label12
121
+        '
122
+        Me.Label12.AutoSize = True
123
+        Me.Label12.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
124
+        Me.Label12.Location = New System.Drawing.Point(957, 8)
125
+        Me.Label12.Name = "Label12"
126
+        Me.Label12.Size = New System.Drawing.Size(80, 16)
127
+        Me.Label12.TabIndex = 663
128
+        Me.Label12.Text = "執行檔存放區"
129
+        '
130
+        'WebBrowser2
131
+        '
132
+        Me.WebBrowser2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
133
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
134
+        Me.WebBrowser2.Location = New System.Drawing.Point(8, 33)
135
+        Me.WebBrowser2.MinimumSize = New System.Drawing.Size(20, 20)
136
+        Me.WebBrowser2.Name = "WebBrowser2"
137
+        Me.WebBrowser2.Size = New System.Drawing.Size(944, 660)
138
+        Me.WebBrowser2.TabIndex = 662
139
+        Me.WebBrowser2.Url = New System.Uri("", System.UriKind.Relative)
140
+        '
141
+        'WebBrowser1
142
+        '
143
+        Me.WebBrowser1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
144
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
145
+        Me.WebBrowser1.Location = New System.Drawing.Point(960, 33)
146
+        Me.WebBrowser1.MinimumSize = New System.Drawing.Size(20, 20)
147
+        Me.WebBrowser1.Name = "WebBrowser1"
148
+        Me.WebBrowser1.Size = New System.Drawing.Size(382, 311)
149
+        Me.WebBrowser1.TabIndex = 661
150
+        Me.WebBrowser1.Url = New System.Uri("", System.UriKind.Relative)
151
+        '
70 152
         '系統執行檔版本管理
71 153
         '
72
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
154
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
73 155
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
74
-        Me.ClientSize = New System.Drawing.Size(411, 35)
156
+        Me.ClientSize = New System.Drawing.Size(1350, 701)
157
+        Me.Controls.Add(Me.Label1)
158
+        Me.Controls.Add(Me.WebBrowser3)
159
+        Me.Controls.Add(Me.Label12)
160
+        Me.Controls.Add(Me.WebBrowser2)
161
+        Me.Controls.Add(Me.WebBrowser1)
162
+        Me.Controls.Add(Me.Label13)
163
+        Me.Controls.Add(Me.讀取料夾路徑_bt)
75 164
         Me.Controls.Add(Me.資料庫版本號_lb)
76 165
         Me.Controls.Add(Me.修改_bt)
77 166
         Me.Controls.Add(Me.Label3)
78 167
         Me.Controls.Add(Me.版本號_tb)
168
+        Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
169
+        Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
79 170
         Me.Name = "系統執行檔版本管理"
80 171
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
81 172
         Me.Text = "系統執行檔版本管理"
@@ -88,4 +179,11 @@ Partial Class 系統執行檔版本管理
88 179
     Friend WithEvents Label3 As Label
89 180
     Friend WithEvents 版本號_tb As TextBox
90 181
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
182
+    Friend WithEvents Label13 As Label
183
+    Friend WithEvents 讀取料夾路徑_bt As Button
184
+    Friend WithEvents Label1 As Label
185
+    Friend WithEvents WebBrowser3 As WebBrowser
186
+    Friend WithEvents Label12 As Label
187
+    Friend WithEvents WebBrowser2 As WebBrowser
188
+    Friend WithEvents WebBrowser1 As WebBrowser
91 189
 End Class

+ 4
- 1
GA-ERP-SYS/資料庫系統管理/系統執行檔版本管理.resx Parādīt failu

@@ -118,6 +118,9 @@
118 118
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119 119
   </resheader>
120 120
   <metadata name="FolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121
-    <value>17, 17</value>
121
+    <value>17, 7</value>
122
+  </metadata>
123
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124
+    <value>39</value>
122 125
   </metadata>
123 126
 </root>

+ 13
- 0
GA-ERP-SYS/資料庫系統管理/系統執行檔版本管理.vb Parādīt failu

@@ -1,12 +1,25 @@
1 1
 Option Strict Off
2 2
 Public Class 系統執行檔版本管理
3 3
     Private Sub 系統執行檔版本管理_Load(sender As Object, e As EventArgs) Handles MyBase.Load
4
+        Me.MdiParent = GA_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
5
+        Target1 = Target & AA(0) & "/"
6
+        WebBrowser1.Url = New Uri(Target1)
7
+        Target2 = Target & AA(1) & "/"
8
+        WebBrowser3.Url = New Uri(Target2)
4 9
         SQL_系統版本號驗證()
5 10
         If dr.Read() Then : 資料庫版本號_lb.Text = "資料庫版本號 : " & dr("系統認證版本號") : 版本號_tb.Text = dr("系統認證版本號") : End If : conn.Close()
11
+        If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then
12
+            WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath)
13
+        End If
6 14
     End Sub
7 15
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 修改_bt.Click
8 16
         SQL_版本號管理修改() : conn.Close() : SQL_系統版本號驗證()
9 17
         If dr.Read() Then : 資料庫版本號_lb.Text = "資料庫版本號 : " & dr("系統認證版本號") : 版本號_tb.Text = dr("系統認證版本號") : End If : conn.Close() : MsgBox("修改完成")
10 18
         Me.Close()
11 19
     End Sub
20
+    Private Sub Button14_Click(sender As Object, e As EventArgs) Handles 讀取料夾路徑_bt.Click
21
+        If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then
22
+            WebBrowser2.Navigate(FolderBrowserDialog1.SelectedPath)
23
+        End If
24
+    End Sub
12 25
 End Class

Notiek ielāde…
Atcelt
Saglabāt