From 62a805374f093ea022c0f33bd93773988aa5b76d Mon Sep 17 00:00:00 2001 From: Chase Tucker Date: Tue, 8 Oct 2024 08:08:13 -0700 Subject: [PATCH] Filtering out deleted and cancelled ECNs and CAs --- FabApprovalWorkerService/Services/CorrectiveActionService.cs | 2 +- FabApprovalWorkerService/Services/ECNService.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/FabApprovalWorkerService/Services/CorrectiveActionService.cs b/FabApprovalWorkerService/Services/CorrectiveActionService.cs index 626f9ee..9403d81 100644 --- a/FabApprovalWorkerService/Services/CorrectiveActionService.cs +++ b/FabApprovalWorkerService/Services/CorrectiveActionService.cs @@ -76,7 +76,7 @@ public class CorrectiveActionService : ICorrectiveActionService { StringBuilder queryBuilder = new(); queryBuilder.Append($"select count(CANo) as count from _8DCorrectiveAction "); - queryBuilder.Append($"where CANo={number} and "); + queryBuilder.Append($"where CANo={number} and Deleted=0 and "); queryBuilder.Append($"(ClosedDate is null or ClosedDate >= '{DateTimeUtilities.MAX_DT.ToString("yyyy-MM-dd HH:mm")}')"); int rowsReturned = (await _dalService.QueryAsync(queryBuilder.ToString())).FirstOrDefault(); diff --git a/FabApprovalWorkerService/Services/ECNService.cs b/FabApprovalWorkerService/Services/ECNService.cs index 6a70042..03a3bce 100644 --- a/FabApprovalWorkerService/Services/ECNService.cs +++ b/FabApprovalWorkerService/Services/ECNService.cs @@ -174,6 +174,7 @@ public class ECNService : IECNService { StringBuilder queryBuilder = new(); queryBuilder.Append($"select count(ECNNumber) as count from ECN where ECNNumber={number} and "); + queryBuilder.Append("Deleted=0 and Cancelled=0 and "); queryBuilder.Append($"(CloseDate is null or CloseDate >= '{DateTimeUtilities.MAX_DT.ToString("yyyy-MM-dd HH:mm")}')"); int rowsReturned = (await _dalService.QueryAsync(queryBuilder.ToString())).FirstOrDefault();