B70340 1 rok temu
rodzic
commit
fcd8b357a0

BIN
.vs/YD-ERP-SYS/FileContentIndex/05489554-e40c-402f-8abb-e3156ff8526b.vsidx Wyświetl plik


BIN
.vs/YD-ERP-SYS/FileContentIndex/dd1bc4e0-60d7-4b26-9c09-4f5175470248.vsidx Wyświetl plik


BIN
.vs/YD-ERP-SYS/v17/.suo Wyświetl plik


+ 1
- 1
YD-ERP-SYS/Module/SQL_財務系統管理.vb Wyświetl plik

@@ -751,7 +751,7 @@
751 751
     End Sub
752 752
     Friend Sub SQL_今日結算()
753 753
         ConnOpen()
754
-        SQL1 = "SELECT 日期, 流水號, 銀行, 狀態, 前日結存, 現金, 匯款, [刷卡/支票], 支出, 備註, 當日結存
754
+        SQL1 = "SELECT 日期, 流水號, 銀行, 狀態, 前日結存, 現金, 匯款, [刷卡/支票], 支出, 支出 AS [支出(不含刷卡)], 備註, 當日結存
755 755
                 FROM   YD客製報表2
756 756
                 WHERE (日期 LIKE '" & PA & "') ORDER BY 銀行"
757 757
         CmdSet_For_DGV()

+ 1
- 1
YD-ERP-SYS/Module/全域變數.vb Wyświetl plik

@@ -3,7 +3,7 @@
3 3
     Public g_conn_type, gUserName, 登入人職稱, 登入人級別, 登入人組別, 登入人IP, 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, FTP物理位置, 業務號碼, AA(99), 類別 As String
4 4
     Public BB(99), CC(99), 登入判斷 As Boolean
5 5
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
6
-    Public 版本 As String = "2023092201"
6
+    Public 版本 As String = "2023101901"
7 7
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
8 8
     Public 列印用SQL, 列印用SQL2, 公司編號, 公司電話, 公司統編, 公司地址, 關鍵字編號, 進度條後墜 As String
9 9
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

BIN
YD-ERP-SYS/bin/Debug/YD-ERP-SYS.exe Wyświetl plik


BIN
YD-ERP-SYS/bin/Debug/YD-ERP-SYS.pdb Wyświetl plik


BIN
YD-ERP-SYS/obj/Debug/YD-ERP-SYS.exe Wyświetl plik


BIN
YD-ERP-SYS/obj/Debug/YD-ERP-SYS.pdb Wyświetl plik


BIN
YD-ERP-SYS/obj/Debug/YD-ERP-SYS.vbproj.GenerateResource.cache Wyświetl plik


+ 18
- 0
YD-ERP-SYS/業務系統管理/銷售單申請.vb Wyświetl plik

@@ -1233,6 +1233,15 @@ Public Class 銷售單申請
1233 1233
             PA = 營運成本收支單號_tb.Text : SQL_營運成本收支單申請_刪除公帳流水帳_應收用()
1234 1234
             PA12 = 流水號2_bt.Text : SQL_應收帳款未收_轉財務_退回() : conn.Close() : Set_清單6()
1235 1235
             MsgBox("退單完成!!")
1236
+            For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
1237
+                If 收款事項_dgv("內容", i).Value.ToString = "未收餘額" And 收款事項_dgv.Rows(i).Cells("金額").Value <> 0 Then
1238
+                    轉高層_cb.Checked = False
1239
+                    DTP = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Strings.Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
1240
+                    PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
1241
+                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text : BL7 = 轉高層_cb.Checked : SQL5 = ", 轉高層 = N'" & BL7 & "', 稅金另扣 = N'" & 稅金25_tb.Text & "'"
1242
+                    SQL_銷售控制表_修改() : Exit For '--------------------資料修改
1243
+                End If
1244
+            Next : Set_清單1()
1236 1245
         End If
1237 1246
     End Sub
1238 1247
     Private Sub Set_流水號()
@@ -1326,6 +1335,15 @@ Public Class 銷售單申請
1326 1335
         Else
1327 1336
             MsgBox("沒有滿足可以轉財務的需求!!!")
1328 1337
         End If
1338
+        For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
1339
+            If 收款事項_dgv("內容", i).Value.ToString = "未收餘額" And 收款事項_dgv.Rows(i).Cells("金額").Value = 0 Then
1340
+                轉高層_cb.Checked = True : 交貨日期_dtp.Value = 申請日期_dtp.Value
1341
+                DTP = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Strings.Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
1342
+                PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
1343
+                NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text : BL7 = 轉高層_cb.Checked : SQL5 = ", 轉高層 = N'" & BL7 & "', 稅金另扣 = N'" & 稅金25_tb.Text & "'"
1344
+                SQL_銷售控制表_修改() : Exit For  '--------------------資料修改
1345
+            End If
1346
+        Next : Set_清單1()
1329 1347
     End Sub
1330 1348
     Private Sub 刪除收款事項上點選的資料_bt_Click(sender As Object, e As EventArgs) Handles 刪除收款事項上點選的資料_bt.Click
1331 1349
         If 流水號_tb.Text = "" Then

+ 19
- 5
YD-ERP-SYS/財務系統管理/高層客製報表.Designer.vb Wyświetl plik

@@ -97,6 +97,7 @@ Partial Class 高層客製報表
97 97
         Me.順向_ch = New System.Windows.Forms.CheckBox()
98 98
         Me.空間1 = New System.Windows.Forms.Panel()
99 99
         Me.Label15 = New System.Windows.Forms.Label()
100
+        Me.Label16 = New System.Windows.Forms.Label()
100 101
         CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).BeginInit()
101 102
         CType(Me.今日出貨_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
102 103
         CType(Me.今日簽單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -483,7 +484,7 @@ Partial Class 高層客製報表
483 484
         Me.Label11.Name = "Label11"
484 485
         Me.Label11.Size = New System.Drawing.Size(55, 16)
485 486
         Me.Label11.TabIndex = 1574
486
-        Me.Label11.Text = "今日送貨"
487
+        Me.Label11.Text = "今日結單"
487 488
         '
488 489
         'Label12
489 490
         '
@@ -552,7 +553,7 @@ Partial Class 高層客製報表
552 553
         Me.銷售單據_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
553 554
         Me.銷售單據_dgv.BackgroundColor = System.Drawing.Color.White
554 555
         Me.銷售單據_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
555
-        Me.銷售單據_dgv.Location = New System.Drawing.Point(3, 180)
556
+        Me.銷售單據_dgv.Location = New System.Drawing.Point(3, 176)
556 557
         Me.銷售單據_dgv.Name = "銷售單據_dgv"
557 558
         Me.銷售單據_dgv.RowHeadersWidth = 5
558 559
         DataGridViewCellStyle10.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
@@ -577,13 +578,13 @@ Partial Class 高層客製報表
577 578
         DataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.White
578 579
         DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
579 580
         Me.明細_dgv.DefaultCellStyle = DataGridViewCellStyle11
580
-        Me.明細_dgv.Location = New System.Drawing.Point(3, 312)
581
+        Me.明細_dgv.Location = New System.Drawing.Point(3, 343)
581 582
         Me.明細_dgv.Name = "明細_dgv"
582 583
         Me.明細_dgv.RowHeadersWidth = 5
583 584
         DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
584 585
         Me.明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
585 586
         Me.明細_dgv.RowTemplate.Height = 24
586
-        Me.明細_dgv.Size = New System.Drawing.Size(572, 363)
587
+        Me.明細_dgv.Size = New System.Drawing.Size(572, 332)
587 588
         Me.明細_dgv.TabIndex = 1578
588 589
         '
589 590
         '帶入格_tb
@@ -625,7 +626,7 @@ Partial Class 高層客製報表
625 626
         Me.Panel1.Controls.Add(Me.S1_tb)
626 627
         Me.Panel1.Controls.Add(Me.未審核_lb)
627 628
         Me.Panel1.Controls.Add(Me.業務_cb)
628
-        Me.Panel1.Location = New System.Drawing.Point(9, 333)
629
+        Me.Panel1.Location = New System.Drawing.Point(39, 377)
629 630
         Me.Panel1.Name = "Panel1"
630 631
         Me.Panel1.Size = New System.Drawing.Size(485, 147)
631 632
         Me.Panel1.TabIndex = 1582
@@ -806,6 +807,7 @@ Partial Class 高層客製報表
806 807
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
807 808
         Me.空間1.BackColor = System.Drawing.Color.White
808 809
         Me.空間1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
810
+        Me.空間1.Controls.Add(Me.Label16)
809 811
         Me.空間1.Controls.Add(Me.Label13)
810 812
         Me.空間1.Controls.Add(Me.今日開單_dgv)
811 813
         Me.空間1.Controls.Add(Me.Panel1)
@@ -833,6 +835,17 @@ Partial Class 高層客製報表
833 835
         Me.Label15.TabIndex = 1584
834 836
         Me.Label15.Text = "_________________________________________________________________________________" &
835 837
     "__________________________________"
838
+        '
839
+        'Label16
840
+        '
841
+        Me.Label16.AutoSize = True
842
+        Me.Label16.ForeColor = System.Drawing.Color.Blue
843
+        Me.Label16.Location = New System.Drawing.Point(4, 309)
844
+        Me.Label16.Name = "Label16"
845
+        Me.Label16.Size = New System.Drawing.Size(535, 32)
846
+        Me.Label16.TabIndex = 1585
847
+        Me.Label16.Text = "如果收支單上有財轉過來的收入,但是簽單結單沒有看到資料,那表示這張單付款次數有三筆以上。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "滑鼠點選下方資料時,會自動判斷是否是系統財轉單,如果是會自動調出銷售資" &
848
+    "料。"
836 849
         '
837 850
         '高層客製報表
838 851
         '
@@ -928,4 +941,5 @@ Partial Class 高層客製報表
928 941
     Friend WithEvents 逆向_ch As CheckBox
929 942
     Friend WithEvents 順向_ch As CheckBox
930 943
     Friend WithEvents 過去結算_dgv As DataGridView
944
+    Friend WithEvents Label16 As Label
931 945
 End Class

+ 50
- 19
YD-ERP-SYS/財務系統管理/高層客製報表.vb Wyświetl plik

@@ -58,7 +58,7 @@
58 58
         PA = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd")
59 59
         SQL_今日支出()
60 60
         da.Fill(ds3) : 今日支出_dgv.DataSource = ds3.Tables(0) : conn.Close()
61
-        今日支出_dgv.Columns(0).Visible = False : 今日支出_dgv.Columns(1).Visible = False : 今日支出_dgv.Columns(10).Visible = False
61
+        今日支出_dgv.Columns(0).Visible = False : 今日支出_dgv.Columns(1).Visible = False : 今日支出_dgv.Columns(10).Visible = False : 今日支出_dgv.Columns(4).FillWeight = 250
62 62
         今日支出_dgv.Columns(5).DefaultCellStyle.Format = "#,##0" : 今日支出_dgv.Columns(6).DefaultCellStyle.Format = "#,##0"
63 63
         今日支出_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 今日支出_dgv.Columns(8).DefaultCellStyle.Format = "#,##0"
64 64
         今日支出_dgv.Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -78,17 +78,30 @@
78 78
         PA = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd")
79 79
         SQL_今日結算()
80 80
         da.Fill(ds) : 今日結算_dgv.DataSource = ds.Tables(0) : conn.Close()
81
-        今日結算_dgv.Columns(0).Visible = False : 今日結算_dgv.Columns(1).Visible = False
82
-        今日結算_dgv.Columns(4).DefaultCellStyle.Format = "#,##0" : 今日結算_dgv.Columns(10).DefaultCellStyle.Format = "#,##0"
83
-        今日結算_dgv.Columns(5).DefaultCellStyle.Format = "#,##0" : 今日結算_dgv.Columns(6).DefaultCellStyle.Format = "#,##0"
84
-        今日結算_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 今日結算_dgv.Columns(8).DefaultCellStyle.Format = "#,##0"
81
+        今日結算_dgv.Columns(0).Visible = False : 今日結算_dgv.Columns(1).Visible = False : 今日結算_dgv.Columns("支出(不含刷卡)").ReadOnly = True
82
+        今日結算_dgv.Columns(4).DefaultCellStyle.Format = "#,##0" : 今日結算_dgv.Columns(11).DefaultCellStyle.Format = "#,##0" : 今日結算_dgv.Columns(5).DefaultCellStyle.Format = "#,##0"
83
+        今日結算_dgv.Columns(6).DefaultCellStyle.Format = "#,##0" : 今日結算_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 今日結算_dgv.Columns(8).DefaultCellStyle.Format = "#,##0"
84
+        今日結算_dgv.Columns(9).DefaultCellStyle.Format = "#,##0"
85 85
         今日結算_dgv.Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
86 86
         今日結算_dgv.Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
87 87
         今日結算_dgv.Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
88 88
         今日結算_dgv.Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
89 89
         今日結算_dgv.Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
90
-        今日結算_dgv.Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
90
+        今日結算_dgv.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
91
+        今日結算_dgv.Columns(11).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
91 92
         今日結算_dgv.EditMode = DataGridViewEditMode.EditOnEnter
93
+        Dim 合計 As Integer = 0
94
+        For i As Integer = 0 To 今日結算_dgv.Rows.Count - 1
95
+            If i = 0 Then
96
+                今日結算_dgv("支出(不含刷卡)", i).Value = 0
97
+            Else
98
+                If 今日結算_dgv(2, i).Value.ToString <> "7.合計" Then
99
+                    今日結算_dgv("支出(不含刷卡)", i).Value = 今日結算_dgv("支出", i).Value : 合計 += 今日結算_dgv("支出", i).Value
100
+                Else
101
+                    今日結算_dgv("支出(不含刷卡)", i).Value = 合計
102
+                End If
103
+            End If
104
+        Next
92 105
     End Sub
93 106
     Private Sub Set_清單4_1()
94 107
         過去結算_dgv.DataSource = Nothing : ds8.Clear()
@@ -102,23 +115,23 @@
102 115
         da.Fill(ds8) : 過去結算_dgv.DataSource = ds8.Tables(0) : conn.Close()
103 116
         過去結算_dgv.Columns(0).Visible = False : 過去結算_dgv.Columns(1).Visible = False : 過去結算_dgv.Columns(3).Visible = False : 過去結算_dgv.Columns(5).Visible = False
104 117
         過去結算_dgv.Columns(6).Visible = False : 過去結算_dgv.Columns(7).Visible = False : 過去結算_dgv.Columns(8).Visible = False : 過去結算_dgv.Columns(9).Visible = False
105
-        過去結算_dgv.Columns(4).DefaultCellStyle.Format = "#,##0" : 過去結算_dgv.Columns(10).DefaultCellStyle.Format = "#,##0"
106
-        過去結算_dgv.Columns(5).DefaultCellStyle.Format = "#,##0" : 過去結算_dgv.Columns(6).DefaultCellStyle.Format = "#,##0"
107
-        過去結算_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 過去結算_dgv.Columns(8).DefaultCellStyle.Format = "#,##0"
118
+        過去結算_dgv.Columns(4).DefaultCellStyle.Format = "#,##0" : 過去結算_dgv.Columns(11).DefaultCellStyle.Format = "#,##0" : 過去結算_dgv.Columns(5).DefaultCellStyle.Format = "#,##0"
119
+        過去結算_dgv.Columns(6).DefaultCellStyle.Format = "#,##0" : 過去結算_dgv.Columns(7).DefaultCellStyle.Format = "#,##0" : 過去結算_dgv.Columns(8).DefaultCellStyle.Format = "#,##0"
120
+        過去結算_dgv.Columns(9).DefaultCellStyle.Format = "#,##0"
108 121
         過去結算_dgv.Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
109 122
         過去結算_dgv.Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
110 123
         過去結算_dgv.Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
111 124
         過去結算_dgv.Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
112 125
         過去結算_dgv.Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
113
-        過去結算_dgv.Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
126
+        過去結算_dgv.Columns(11).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
114 127
         Set_清單4_自動判斷2()
115 128
     End Sub
116 129
     Private Sub Set_清單4_自動判斷2()
117 130
         If 過去結算_dgv.Rows.Count > 0 Then
118 131
             If 順向_ch.Checked = True Then
119
-                For I As Integer = 0 To 過去結算_dgv.Rows.Count - 1 : 今日結算_dgv(4, I).Value = 過去結算_dgv(10, I).Value.ToString : Next
132
+                For I As Integer = 0 To 過去結算_dgv.Rows.Count - 1 : 今日結算_dgv(4, I).Value = 過去結算_dgv(11, I).Value.ToString : Next
120 133
             Else
121
-                For I As Integer = 0 To 過去結算_dgv.Rows.Count - 1 : 今日結算_dgv(10, I).Value = 過去結算_dgv(4, I).Value.ToString : Next
134
+                For I As Integer = 0 To 過去結算_dgv.Rows.Count - 1 : 今日結算_dgv(11, I).Value = 過去結算_dgv(4, I).Value.ToString : Next
122 135
             End If : Set_今日結算_dgv_計算()
123 136
         End If
124 137
     End Sub
@@ -271,7 +284,7 @@
271 284
         While (dr.Read()) : 業務_cb.Items.Add(dr("業務號")) : End While : conn.Close()
272 285
     End Sub
273 286
     Private Sub 高層客製報表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
274
-        Me.MdiParent = YD_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
287
+        YD_ERP_SYS.WindowState = 2 : Me.MdiParent = YD_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
275 288
         A1 = 空間1.Location.X : A2 = 空間2.Location.X : B2 = 空間2.Location.Y : A3 = 空間2.Size.Width : B3 = 空間2.Size.Height
276 289
         啟動運算 = False
277 290
         業務_cb_下拉表單資料載入()
@@ -283,6 +296,9 @@
283 296
         End If
284 297
         啟動運算 = True : ZOOM_tb.PerformClick()
285 298
     End Sub
299
+    Private Sub 高層客製報表_Closed(sender As Object, e As EventArgs) Handles MyBase.Closed
300
+        YD_ERP_SYS.WindowState = 0
301
+    End Sub
286 302
     Private Sub 高層客製報表_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
287 303
         Set_清單5() : Set_清單6() : Set_費用清單() : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單4_自動判斷() : Set_清單4_自動判斷()
288 304
     End Sub
@@ -329,6 +345,9 @@
329 345
             S3_tb.Text = 明細_dgv(3, e.RowIndex).Value.ToString : S4_tb.Text = 明細_dgv(4, e.RowIndex).Value.ToString
330 346
             S5_tb.Text = 明細_dgv(5, e.RowIndex).Value.ToString : S6_tb.Text = 明細_dgv(6, e.RowIndex).Value.ToString
331 347
             S7_tb.Text = 明細_dgv(7, e.RowIndex).Value.ToString : S8_tb.Text = 明細_dgv(8, e.RowIndex).Value.ToString
348
+            If IsNumeric(Strings.Mid(明細_dgv(3, e.RowIndex).Value.ToString, 2, 5)) Then
349
+                單號_tb.Text = Strings.Left(明細_dgv(3, e.RowIndex).Value.ToString, 7) : Set_清單7()
350
+            End If
332 351
         End If
333 352
     End Sub
334 353
     Private Sub 今日結算_dgv_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles 今日結算_dgv.CellDoubleClick
@@ -434,18 +453,30 @@
434 453
         For i As Integer = 0 To 今日結算_dgv.Rows.Count - 1
435 454
             If 今日結算_dgv(2, i).Value.ToString <> "7.合計" Then
436 455
                 If 順向_ch.Checked = True Then
437
-                    今日結算_dgv(10, i).Value = 今日結算_dgv(4, i).Value + 今日結算_dgv(5, i).Value + 今日結算_dgv(6, i).Value + 今日結算_dgv(7, i).Value - 今日結算_dgv(8, i).Value
456
+                    今日結算_dgv(11, i).Value = 今日結算_dgv(4, i).Value + 今日結算_dgv(5, i).Value + 今日結算_dgv(6, i).Value + 今日結算_dgv(7, i).Value - 今日結算_dgv(8, i).Value
438 457
                 Else
439
-                    今日結算_dgv(4, i).Value = 今日結算_dgv(10, i).Value + 今日結算_dgv(8, i).Value - 今日結算_dgv(7, i).Value - 今日結算_dgv(6, i).Value - 今日結算_dgv(5, i).Value
458
+                    今日結算_dgv(4, i).Value = 今日結算_dgv(11, i).Value + 今日結算_dgv(8, i).Value - 今日結算_dgv(7, i).Value - 今日結算_dgv(6, i).Value - 今日結算_dgv(5, i).Value
440 459
                 End If
441 460
                 A4 += 今日結算_dgv(4, i).Value : A5 += 今日結算_dgv(5, i).Value : A6 += 今日結算_dgv(6, i).Value : A7 += 今日結算_dgv(7, i).Value
442
-                A8 += 今日結算_dgv(8, i).Value : A10 += 今日結算_dgv(10, i).Value
461
+                A8 += 今日結算_dgv(8, i).Value : A10 += 今日結算_dgv(11, i).Value
443 462
             End If
444 463
         Next
445 464
         For i As Integer = 0 To 今日結算_dgv.Rows.Count - 1
446 465
             If 今日結算_dgv(2, i).Value.ToString = "7.合計" Then
447 466
                 今日結算_dgv(4, i).Value = A4 : 今日結算_dgv(5, i).Value = A5 : 今日結算_dgv(6, i).Value = A6 : 今日結算_dgv(7, i).Value = A7
448
-                今日結算_dgv(8, i).Value = A8 : 今日結算_dgv(10, i).Value = A10
467
+                今日結算_dgv(8, i).Value = A8 : 今日結算_dgv(11, i).Value = A10
468
+            End If
469
+        Next
470
+        Dim 合計 As Integer = 0
471
+        For i As Integer = 0 To 今日結算_dgv.Rows.Count - 1
472
+            If i = 0 Then
473
+                今日結算_dgv("支出(不含刷卡)", i).Value = 0
474
+            Else
475
+                If 今日結算_dgv(2, i).Value.ToString <> "7.合計" Then
476
+                    今日結算_dgv("支出(不含刷卡)", i).Value = 今日結算_dgv("支出", i).Value : 合計 += 今日結算_dgv("支出", i).Value
477
+                Else
478
+                    今日結算_dgv("支出(不含刷卡)", i).Value = 合計
479
+                End If
449 480
             End If
450 481
         Next
451 482
     End Sub
@@ -518,7 +549,7 @@
518 549
         For i As Integer = 0 To 今日結算_dgv.Rows.Count - 1
519 550
             PA1 = 今日結算_dgv("流水號", i).Value.ToString : PA4 = 今日結算_dgv(4, i).Value.ToString : PA5 = 今日結算_dgv(5, i).Value.ToString
520 551
             PA6 = 今日結算_dgv(6, i).Value.ToString : PA7 = 今日結算_dgv(7, i).Value.ToString : PA8 = 今日結算_dgv(8, i).Value.ToString
521
-            PA9 = 今日結算_dgv(9, i).Value.ToString : PA10 = 今日結算_dgv(10, i).Value.ToString
552
+            PA9 = 今日結算_dgv(10, i).Value.ToString : PA10 = 今日結算_dgv(11, i).Value.ToString
522 553
             SQL_客製表2_修改()
523 554
         Next
524 555
     End Sub
@@ -529,7 +560,7 @@
529 560
         For i As Integer = 0 To 今日結算_dgv.Rows.Count - 1
530 561
             PA1 = 今日結算_dgv("流水號", i).Value.ToString : PA4 = 今日結算_dgv(4, i).Value.ToString : PA5 = 今日結算_dgv(5, i).Value.ToString
531 562
             PA6 = 今日結算_dgv(6, i).Value.ToString : PA7 = 今日結算_dgv(7, i).Value.ToString : PA8 = 今日結算_dgv(8, i).Value.ToString
532
-            PA9 = 今日結算_dgv(9, i).Value.ToString : PA10 = 今日結算_dgv(10, i).Value.ToString
563
+            PA9 = 今日結算_dgv(10, i).Value.ToString : PA10 = 今日結算_dgv(11, i).Value.ToString
533 564
             SQL_客製表2_修改()
534 565
         Next
535 566
     End Sub

Ładowanie…
Anuluj
Zapisz