diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 7a3b9c11..2f3acdfe 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -3150,12 +3150,13 @@ SELECT zab.CREATED_DATE_TIME, ELSE 0 END) "unWorkHours8", WCT.DESCRIPTION WORK_CENTER_DESCRIPTION, RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION - FROM (WITH DIS AS (SELECT MIN(ZSD.DISPATCH_NO) DISPATCH_NO + FROM (WITH DIS AS (SELECT MIN(CASE + WHEN ZSD.DISPATCH_STATUS != 'CANCEL' THEN + ZSD.DISPATCH_NO END) DISPATCH_NO FROM Z_SFC_DISPATCH ZSD GROUP BY ZSD.SFC) SELECT NZSD.* - FROM ( - SELECT OZSD.*, + FROM (SELECT OZSD.*, CASE WHEN DIS.DISPATCH_NO = OZSD.DISPATCH_NO AND OZSD.DISPATCH_STATUS != 'COMPLETE' THEN N'COMPLETE' @@ -3164,7 +3165,6 @@ SELECT zab.CREATED_DATE_TIME, FROM Z_SFC_DISPATCH OZSD LEFT JOIN DIS ON DIS.DISPATCH_NO = OZSD.DISPATCH_NO WHERE OZSD.DISPATCH_STATUS != 'CANCEL' - AND OZSD.DISPATCH_STATUS != 'PAUSE' ORDER BY OZSD.SFC, OZSD.DISPATCH_NO) NZSD WHERE NZSD.DISPATCH_STATUS != 'COMPLETE' AND NZSD.PREVIOUS_STATUS = 'COMPLETE') ZSD