B70340 3 år sedan
förälder
incheckning
d2440139bf

Binär
.vs/GA-ERP-SYS/v16/.suo Visa fil


+ 1
- 1
GA-ERP-SYS/Module/全域變數.vb Visa fil

7
     Public 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, FTP物理位置, 登入客戶, 登入資料庫, 業務名稱, AA(99), QA1, QA2, QA3, QA4 As String
7
     Public 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, FTP物理位置, 登入客戶, 登入資料庫, 業務名稱, AA(99), QA1, QA2, QA3, QA4 As String
8
     Public BB(99), CC(99), 登入判斷 As Boolean
8
     Public BB(99), CC(99), 登入判斷 As Boolean
9
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
9
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
10
-    Public 版本 As String = "2022022401"
10
+    Public 版本 As String = "2022030901"
11
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
11
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
12
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
12
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
13
     Public 判斷重登, 內外網, 重登確認, 主頁開啟, 無KEY登入 As Boolean
13
     Public 判斷重登, 內外網, 重登確認, 主頁開啟, 無KEY登入 As Boolean

Binär
GA-ERP-SYS/bin/Debug/GA-ERP-SYS.exe Visa fil


Binär
GA-ERP-SYS/bin/Debug/GA-ERP-SYS.pdb Visa fil


Binär
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.exe Visa fil


Binär
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.pdb Visa fil


Binär
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbproj.GenerateResource.cache Visa fil


Binär
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbproj.ResolveComReference.cache Visa fil


Binär
GA-ERP-SYS/obj/Debug/GA-ERP-SYS.vbprojAssemblyReference.cache Visa fil


Binär
GA-ERP-SYS/obj/Debug/GA_ERP_SYS.系統公告.resources Visa fil


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

59
         Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
59
         Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
60
         Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
60
         Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
61
         Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
61
         Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
62
-        Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
63
-        Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
64
-        Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
65
         Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
62
         Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
66
         Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
63
         Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
67
         Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
64
         Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
68
         Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
65
         Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
69
         Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
66
         Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
70
         Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
67
         Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
68
+        Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
69
+        Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
70
+        Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
71
         Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
71
         Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
72
         Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
72
         Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
73
         Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
73
         Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
189
         Me.所得合帳1_dgv = New System.Windows.Forms.DataGridView()
189
         Me.所得合帳1_dgv = New System.Windows.Forms.DataGridView()
190
         Me.所得2_tb = New System.Windows.Forms.TextBox()
190
         Me.所得2_tb = New System.Windows.Forms.TextBox()
191
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
191
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
192
-        Me.紅利整合_dgv = New System.Windows.Forms.DataGridView()
193
         Me.股份表一_tb = New System.Windows.Forms.Button()
192
         Me.股份表一_tb = New System.Windows.Forms.Button()
194
         Me.股份表二_tb = New System.Windows.Forms.Button()
193
         Me.股份表二_tb = New System.Windows.Forms.Button()
195
         Me.紅利支出_dgv = New System.Windows.Forms.DataGridView()
194
         Me.紅利支出_dgv = New System.Windows.Forms.DataGridView()
196
         Me.紅利收入_dgv = New System.Windows.Forms.DataGridView()
195
         Me.紅利收入_dgv = New System.Windows.Forms.DataGridView()
196
+        Me.紅利整合_dgv = New System.Windows.Forms.DataGridView()
197
         Me.紙帳前期_dgv = New System.Windows.Forms.DataGridView()
197
         Me.紙帳前期_dgv = New System.Windows.Forms.DataGridView()
198
         Me.手工帳務存檔_bt = New System.Windows.Forms.Button()
198
         Me.手工帳務存檔_bt = New System.Windows.Forms.Button()
199
         Me.紙帳非前期_dgv = New System.Windows.Forms.DataGridView()
199
         Me.紙帳非前期_dgv = New System.Windows.Forms.DataGridView()
260
         Me.SplitContainer1.Panel1.SuspendLayout()
260
         Me.SplitContainer1.Panel1.SuspendLayout()
261
         Me.SplitContainer1.Panel2.SuspendLayout()
261
         Me.SplitContainer1.Panel2.SuspendLayout()
262
         Me.SplitContainer1.SuspendLayout()
262
         Me.SplitContainer1.SuspendLayout()
263
-        CType(Me.紅利整合_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
264
         CType(Me.紅利支出_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
263
         CType(Me.紅利支出_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
265
         CType(Me.紅利收入_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
264
         CType(Me.紅利收入_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
265
+        CType(Me.紅利整合_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
266
         CType(Me.紙帳前期_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
266
         CType(Me.紙帳前期_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
267
         CType(Me.紙帳非前期_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
267
         CType(Me.紙帳非前期_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
268
         Me.Panel3.SuspendLayout()
268
         Me.Panel3.SuspendLayout()
1769
         Me.SplitContainer1.SplitterDistance = 503
1769
         Me.SplitContainer1.SplitterDistance = 503
1770
         Me.SplitContainer1.TabIndex = 1700
1770
         Me.SplitContainer1.TabIndex = 1700
1771
         '
1771
         '
1772
-        '紅利整合_dgv
1773
-        '
1774
-        Me.紅利整合_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
1775
-            Or System.Windows.Forms.AnchorStyles.Left) _
1776
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
1777
-        Me.紅利整合_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
1778
-        Me.紅利整合_dgv.BackgroundColor = System.Drawing.Color.White
1779
-        DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
1780
-        DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control
1781
-        DataGridViewCellStyle43.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1782
-        DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText
1783
-        DataGridViewCellStyle43.SelectionBackColor = System.Drawing.Color.White
1784
-        DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText
1785
-        DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1786
-        Me.紅利整合_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43
1787
-        Me.紅利整合_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
1788
-        DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
1789
-        DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window
1790
-        DataGridViewCellStyle44.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1791
-        DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText
1792
-        DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Info
1793
-        DataGridViewCellStyle44.SelectionForeColor = System.Drawing.Color.Black
1794
-        DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
1795
-        Me.紅利整合_dgv.DefaultCellStyle = DataGridViewCellStyle44
1796
-        Me.紅利整合_dgv.Location = New System.Drawing.Point(-1, -1)
1797
-        Me.紅利整合_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
1798
-        Me.紅利整合_dgv.Name = "紅利整合_dgv"
1799
-        Me.紅利整合_dgv.RowHeadersWidth = 4
1800
-        DataGridViewCellStyle45.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1801
-        Me.紅利整合_dgv.RowsDefaultCellStyle = DataGridViewCellStyle45
1802
-        Me.紅利整合_dgv.RowTemplate.Height = 24
1803
-        Me.紅利整合_dgv.Size = New System.Drawing.Size(170, 476)
1804
-        Me.紅利整合_dgv.TabIndex = 1695
1805
-        '
1806
         '股份表一_tb
1772
         '股份表一_tb
1807
         '
1773
         '
1808
         Me.股份表一_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
1774
         Me.股份表一_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
1896
         Me.紅利收入_dgv.Size = New System.Drawing.Size(170, 322)
1862
         Me.紅利收入_dgv.Size = New System.Drawing.Size(170, 322)
1897
         Me.紅利收入_dgv.TabIndex = 1694
1863
         Me.紅利收入_dgv.TabIndex = 1694
1898
         '
1864
         '
1865
+        '紅利整合_dgv
1866
+        '
1867
+        Me.紅利整合_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
1868
+            Or System.Windows.Forms.AnchorStyles.Left) _
1869
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
1870
+        Me.紅利整合_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
1871
+        Me.紅利整合_dgv.BackgroundColor = System.Drawing.Color.White
1872
+        DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
1873
+        DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control
1874
+        DataGridViewCellStyle43.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1875
+        DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText
1876
+        DataGridViewCellStyle43.SelectionBackColor = System.Drawing.Color.White
1877
+        DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText
1878
+        DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1879
+        Me.紅利整合_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43
1880
+        Me.紅利整合_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
1881
+        DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
1882
+        DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window
1883
+        DataGridViewCellStyle44.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1884
+        DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText
1885
+        DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Info
1886
+        DataGridViewCellStyle44.SelectionForeColor = System.Drawing.Color.Black
1887
+        DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
1888
+        Me.紅利整合_dgv.DefaultCellStyle = DataGridViewCellStyle44
1889
+        Me.紅利整合_dgv.Location = New System.Drawing.Point(-1, -1)
1890
+        Me.紅利整合_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
1891
+        Me.紅利整合_dgv.Name = "紅利整合_dgv"
1892
+        Me.紅利整合_dgv.RowHeadersWidth = 4
1893
+        DataGridViewCellStyle45.Font = New System.Drawing.Font("新細明體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1894
+        Me.紅利整合_dgv.RowsDefaultCellStyle = DataGridViewCellStyle45
1895
+        Me.紅利整合_dgv.RowTemplate.Height = 24
1896
+        Me.紅利整合_dgv.Size = New System.Drawing.Size(170, 476)
1897
+        Me.紅利整合_dgv.TabIndex = 1695
1898
+        '
1899
         '紙帳前期_dgv
1899
         '紙帳前期_dgv
1900
         '
1900
         '
1901
         Me.紙帳前期_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
1901
         Me.紙帳前期_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
2309
         Me.Controls.Add(Me.合帳_dgv)
2309
         Me.Controls.Add(Me.合帳_dgv)
2310
         Me.Controls.Add(Me.彙總_dgv)
2310
         Me.Controls.Add(Me.彙總_dgv)
2311
         Me.Controls.Add(Me.Panel3)
2311
         Me.Controls.Add(Me.Panel3)
2312
-        Me.Controls.Add(Me.Panel2)
2313
         Me.Controls.Add(Me.Panel1)
2312
         Me.Controls.Add(Me.Panel1)
2314
         Me.Controls.Add(Me.流水帳_dgv)
2313
         Me.Controls.Add(Me.流水帳_dgv)
2315
         Me.Controls.Add(Me.Label4)
2314
         Me.Controls.Add(Me.Label4)
2315
+        Me.Controls.Add(Me.Panel2)
2316
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
2316
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
2317
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
2317
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
2318
         Me.Name = "帳務彙總計算表"
2318
         Me.Name = "帳務彙總計算表"
2364
         Me.SplitContainer1.Panel2.ResumeLayout(False)
2364
         Me.SplitContainer1.Panel2.ResumeLayout(False)
2365
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
2365
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
2366
         Me.SplitContainer1.ResumeLayout(False)
2366
         Me.SplitContainer1.ResumeLayout(False)
2367
-        CType(Me.紅利整合_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2368
         CType(Me.紅利支出_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2367
         CType(Me.紅利支出_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2369
         CType(Me.紅利收入_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2368
         CType(Me.紅利收入_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2369
+        CType(Me.紅利整合_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2370
         CType(Me.紙帳前期_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2370
         CType(Me.紙帳前期_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2371
         CType(Me.紙帳非前期_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2371
         CType(Me.紙帳非前期_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2372
         Me.Panel3.ResumeLayout(False)
2372
         Me.Panel3.ResumeLayout(False)

+ 9
- 10
GA-ERP-SYS/報表系統管理/帳務彙總計算表.vb Visa fil

1423
                     If 周 = 周1 Then : Exit For : End If
1423
                     If 周 = 周1 Then : Exit For : End If
1424
                 End If
1424
                 End If
1425
             ElseIf 月_ch.Checked = True Then
1425
             ElseIf 月_ch.Checked = True Then
1426
-                If DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) > 27 And DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) < 32 Then
1426
+                If DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) >= 27 And DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) < 32 Then
1427
                     月1 += 1
1427
                     月1 += 1
1428
                     資料_cb.Items.Add(日期_dgv.Rows(I).Cells("開始日期").Value & " / " & 日期_dgv.Rows(I).Cells("結束日期").Value)
1428
                     資料_cb.Items.Add(日期_dgv.Rows(I).Cells("開始日期").Value & " / " & 日期_dgv.Rows(I).Cells("結束日期").Value)
1429
                     If 月 = 月1 Then : Exit For : End If
1429
                     If 月 = 月1 Then : Exit For : End If
2525
                     不需加 = False : If 下收名_dgv.Rows(I).Cells("下收").Value.ToString = 暫存(II) Or 下收名_dgv.Rows(I).Cells("下收").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2525
                     不需加 = False : If 下收名_dgv.Rows(I).Cells("下收").Value.ToString = 暫存(II) Or 下收名_dgv.Rows(I).Cells("下收").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2526
                 Next
2526
                 Next
2527
                 If 下收名_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2527
                 If 下收名_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2528
-                    If 不需加 = False Then : MN1 += 1 : 合帳數 += 1 : 暫存(MN1) = 下收名_dgv.Rows(I).Cells("下收").Value.ToString : End If
2528
+                    If 不需加 = False Then : MN1 += 1 : MN2 += 1 : 合帳數 += 1 : 暫存(MN1) = 下收名_dgv.Rows(I).Cells("下收").Value.ToString : End If
2529
                 End If
2529
                 End If
2530
             Next
2530
             Next
2531
 
2531
 
2535
                     不需加 = False : If 所得名_dgv.Rows(I).Cells("所得").Value.ToString = 暫存(II) Or 所得名_dgv.Rows(I).Cells("所得").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2535
                     不需加 = False : If 所得名_dgv.Rows(I).Cells("所得").Value.ToString = 暫存(II) Or 所得名_dgv.Rows(I).Cells("所得").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2536
                 Next
2536
                 Next
2537
                 If 所得名_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2537
                 If 所得名_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2538
-                    If 不需加 = False Then : MN1 += 1 : 合帳數 += 1 : 暫存(MN1) = 所得名_dgv.Rows(I).Cells("所得").Value.ToString : End If
2538
+                    If 不需加 = False Then : MN1 += 1 : MN2 += 1 : 合帳數 += 1 : 暫存(MN1) = 所得名_dgv.Rows(I).Cells("所得").Value.ToString : End If
2539
                 End If
2539
                 End If
2540
             Next
2540
             Next
2541
 
2541
 
2545
                     不需加 = False : If 所得名1_dgv.Rows(I).Cells("所得").Value.ToString = 暫存(II) Or 所得名1_dgv.Rows(I).Cells("所得").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2545
                     不需加 = False : If 所得名1_dgv.Rows(I).Cells("所得").Value.ToString = 暫存(II) Or 所得名1_dgv.Rows(I).Cells("所得").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2546
                 Next
2546
                 Next
2547
                 If 所得名1_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2547
                 If 所得名1_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2548
-                    If 不需加 = False Then : MN1 += 1 : 合帳數 += 1 : 暫存(MN1) = 所得名1_dgv.Rows(I).Cells("所得").Value.ToString : End If
2548
+                    If 不需加 = False Then : MN1 += 1 : MN2 += 1 : 合帳數 += 1 : 暫存(MN1) = 所得名1_dgv.Rows(I).Cells("所得").Value.ToString : End If
2549
                 End If
2549
                 End If
2550
             Next
2550
             Next
2551
 
2551
 
2555
                     不需加 = False : If 水差名_dgv.Rows(I).Cells("水差").Value.ToString = 暫存(II) Or 水差名_dgv.Rows(I).Cells("水差").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2555
                     不需加 = False : If 水差名_dgv.Rows(I).Cells("水差").Value.ToString = 暫存(II) Or 水差名_dgv.Rows(I).Cells("水差").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2556
                 Next
2556
                 Next
2557
                 If 水差名_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2557
                 If 水差名_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2558
-                    If 不需加 = False Then : MN1 += 1 : 合帳數 += 1 : 暫存(MN1) = 水差名_dgv.Rows(I).Cells("水差").Value.ToString : End If
2558
+                    If 不需加 = False Then : MN1 += 1 : MN2 += 1 : 合帳數 += 1 : 暫存(MN1) = 水差名_dgv.Rows(I).Cells("水差").Value.ToString : End If
2559
                 End If
2559
                 End If
2560
             Next
2560
             Next
2561
 
2561
 
2565
                     不需加 = False : If 水差名1_dgv.Rows(I).Cells("水差").Value.ToString = 暫存(II) Or 水差名1_dgv.Rows(I).Cells("水差").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2565
                     不需加 = False : If 水差名1_dgv.Rows(I).Cells("水差").Value.ToString = 暫存(II) Or 水差名1_dgv.Rows(I).Cells("水差").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2566
                 Next
2566
                 Next
2567
                 If 水差名1_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2567
                 If 水差名1_dgv.Rows(I).Cells("交割金額").Value.ToString <> "0" Then
2568
-                    If 不需加 = False Then : MN1 += 1 : 合帳數 += 1 : 暫存(MN1) = 水差名1_dgv.Rows(I).Cells("水差").Value.ToString : End If
2568
+                    If 不需加 = False Then : MN1 += 1 : MN2 += 1 : 合帳數 += 1 : 暫存(MN1) = 水差名1_dgv.Rows(I).Cells("水差").Value.ToString : End If
2569
                 End If
2569
                 End If
2570
             Next
2570
             Next
2571
 
2571
 
2572
             MN2 = MN1
2572
             MN2 = MN1
2573
             For I As Integer = 0 To 紅利分表_dgv.Rows.Count - 1
2573
             For I As Integer = 0 To 紅利分表_dgv.Rows.Count - 1
2574
                 For II As Integer = 0 To MN2 + 1
2574
                 For II As Integer = 0 To MN2 + 1
2575
-                    不需加 = False
2576
-                    If 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString = 暫存(II) Or 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2575
+                    不需加 = False : If 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString = 暫存(II) Or 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString = "" Then : 不需加 = True : Exit For : End If
2577
                 Next
2576
                 Next
2578
                 If 紅利分表_dgv.Rows(I).Cells("紅利").Value.ToString <> "0" Then
2577
                 If 紅利分表_dgv.Rows(I).Cells("紅利").Value.ToString <> "0" Then
2579
-                    If 不需加 = False Then : MN1 += 1 : 合帳數 += 1 : 暫存(MN1) = 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString : End If
2578
+                    If 不需加 = False Then : MN1 += 1 : MN2 += 1 : 合帳數 += 1 : 暫存(MN1) = 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString : End If
2580
                 End If
2579
                 End If
2581
             Next
2580
             Next
2582
 
2581
 
2587
                     If 紅利分表_dgv.Rows(I).Cells("所得戶").Value.ToString = 暫存(II) Then : 不需加 = True : Exit For : End If
2586
                     If 紅利分表_dgv.Rows(I).Cells("所得戶").Value.ToString = 暫存(II) Then : 不需加 = True : Exit For : End If
2588
                 Next
2587
                 Next
2589
                 If 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString = "" Then
2588
                 If 紅利分表_dgv.Rows(I).Cells("股東").Value.ToString = "" Then
2590
-                    If 不需加 = False Then : MN1 += 1 : 合帳數 += 1 : 暫存(MN1) = 紅利分表_dgv.Rows(I).Cells("所得戶").Value.ToString : End If
2589
+                    If 不需加 = False Then : MN1 += 1 : MN2 += 1 : 合帳數 += 1 : 暫存(MN1) = 紅利分表_dgv.Rows(I).Cells("所得戶").Value.ToString : End If
2591
                 End If
2590
                 End If
2592
             Next
2591
             Next
2593
             NU1 = 合帳數 + 1
2592
             NU1 = 合帳數 + 1

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

241
                     If 周 = 周1 Then : Exit For : End If
241
                     If 周 = 周1 Then : Exit For : End If
242
                 End If
242
                 End If
243
             ElseIf 月_ch.Checked = True Then
243
             ElseIf 月_ch.Checked = True Then
244
-                If DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) > 27 And DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) < 32 Then
244
+                If DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) >= 27 And DateDiff("d", 開始日期1_dtp.Value, 結束日期1_dtp.Value) < 32 Then
245
                     月1 += 1
245
                     月1 += 1
246
                     資料_cb.Items.Add(日期_dgv.Rows(I).Cells("開始日期").Value & " / " & 日期_dgv.Rows(I).Cells("結束日期").Value)
246
                     資料_cb.Items.Add(日期_dgv.Rows(I).Cells("開始日期").Value & " / " & 日期_dgv.Rows(I).Cells("結束日期").Value)
247
                     If 月 = 月1 Then : Exit For : End If
247
                     If 月 = 月1 Then : Exit For : End If

+ 2
- 2
GA-ERP-SYS/報表系統管理/電板股東紅利設定.Designer.vb Visa fil

222
         '
222
         '
223
         Me.nud2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
223
         Me.nud2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
224
         Me.nud2.Location = New System.Drawing.Point(171, 535)
224
         Me.nud2.Location = New System.Drawing.Point(171, 535)
225
-        Me.nud2.Maximum = New Decimal(New Integer() {10000, 0, 0, 0})
226
-        Me.nud2.Minimum = New Decimal(New Integer() {10000, 0, 0, -2147483648})
225
+        Me.nud2.Maximum = New Decimal(New Integer() {1000000, 0, 0, 0})
226
+        Me.nud2.Minimum = New Decimal(New Integer() {1000000, 0, 0, -2147483648})
227
         Me.nud2.Name = "nud2"
227
         Me.nud2.Name = "nud2"
228
         Me.nud2.Size = New System.Drawing.Size(172, 23)
228
         Me.nud2.Size = New System.Drawing.Size(172, 23)
229
         Me.nud2.TabIndex = 1659
229
         Me.nud2.TabIndex = 1659

+ 1
- 2
GA-ERP-SYS/特殊操作功能/系統公告.Designer.vb Visa fil

61
         Me.TextBox3.Name = "TextBox3"
61
         Me.TextBox3.Name = "TextBox3"
62
         Me.TextBox3.Size = New System.Drawing.Size(680, 479)
62
         Me.TextBox3.Size = New System.Drawing.Size(680, 479)
63
         Me.TextBox3.TabIndex = 2
63
         Me.TextBox3.TabIndex = 2
64
-        Me.TextBox3.Text = "版本號 : 2022022401_1.32" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "更新內容如下 :" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "1、系統更新時忘記或是誤按防火牆防毒等軟體導致更新失敗時,系統自動從新運行更新 (功能測試中)。" &
65
-    ""
64
+        Me.TextBox3.Text = "版本號 : 2022030901_1.32" & 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)
66
         '
65
         '
67
         'TextBox4
66
         'TextBox4
68
         '
67
         '

+ 9
- 1
GA-ERP-SYS/特殊操作功能/系統公告.resx Visa fil

118
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119
   </resheader>
119
   </resheader>
120
   <data name="TextBox1.Text" xml:space="preserve">
120
   <data name="TextBox1.Text" xml:space="preserve">
121
-    <value>版本號 : 2022022001_1.32
121
+    <value>版本號 : 2022030302_1.32
122
+更新內容如下 :
123
+1、修正明細查詢表,與彙總表遇到2/28號(月份不足30天),明細查詢不出來的邏輯錯誤。
124
+
125
+版本號 : 2022022401_1.32
126
+更新內容如下 :
127
+1、系統更新時忘記或是誤按防火牆防毒等軟體導致更新失敗時,系統自動從新運行更新 (功能測試中)。
128
+
129
+版本號 : 2022022001_1.32
122
 更新內容如下 :
130
 更新內容如下 :
123
 1、修正明細表中修改上繳時如遇到指定帳戶會導致指定帳戶資料異常的BUG。
131
 1、修正明細表中修改上繳時如遇到指定帳戶會導致指定帳戶資料異常的BUG。
124
 2、修正明細表快速設定時對話框中的內容 (使選擇比較簡易)。
132
 2、修正明細表快速設定時對話框中的內容 (使選擇比較簡易)。

Loading…
Avbryt
Spara