sryang/thinkyu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 個人費用彙整表及扣繳明細排除已作廢領據 #3

Merged
sryang merged 1 commits from fix/voided-receipt-in-expense-summary into master 2026-09-14 13:33:01 +08:00
Conversation 0 Commits 1 Files Changed 1
+6 -3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ad64ee268 - Show all commits
教育訓練系統/Web/DAC/領據系統/DAC_領據2.cs
+6 -3
View File
@@ -310,9 +310,10 @@ namespace Education
, ISNULL(B.合計金額, 0) - ISNULL(B.應扣繳稅額, 0) - ISNULL(B.服務費, 0) + ISNULL(C.合計, 0) 付款金額
, row_number() over (order by A.領款人姓名) as rowid
from 領據 A
left join 勞務費 B on A.編號 = B.領據編號 and B.編號 is not NULL and B.編號 <> ''
left join 差旅費 C on A.編號 = C.領據編號 and C.編號 is not NULL and C.編號 <> ''
left join 勞務費 B on A.編號 = B.領據編號 and B.編號 is not NULL and B.編號 <> '' and ISNULL(B.作廢, 0) <> 1
left join 差旅費 C on A.編號 = C.領據編號 and C.編號 is not NULL and C.編號 <> '' and ISNULL(C.作廢, 0) <> 1
where 1=1
and ISNULL(A.作廢, 0) <> 1
";
AddWhere(cmdSelect, ref noInput, 起日, 迄日, 身分別, null, null, null, null, null, 付款方式);
@@ -411,7 +412,9 @@ namespace Education
, row_number() over (order by A.領款人姓名) as rowid
from 領據 A
join 勞務費 B on A.編號 = B.領據編號 and B.編號 is not NULL and B.編號 <> ''
where 1=1";
where 1=1
and ISNULL(A.作廢, 0) <> 1
and ISNULL(B.作廢, 0) <> 1";
List<WhereItem> wheres = new List<WhereItem>();
if (起日 != null && 迄日 != null)