临时任务统计报表维护V5

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -1174,15 +1174,15 @@
         it.DESCRIPTION itemDescription,--物料描述
         MAX(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量
         MIN(CASE
-        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND zsd.DISPATCH_STATUS = 'CANCEL' THEN
+        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' THEN
         zsd.DISPATCH_QTY
         ELSE 0 END) doneQTY, --已完成数量
         TO_CHAR(
         DECODE(SUM(CASE
-        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND zsd.DISPATCH_STATUS = 'CANCEL' THEN
+        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' THEN
         zsd.PROD_HOURS * zsd.DISPATCH_QTY
         ELSE 0 END), 0, 0, SUM(CASE
-        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND zsd.DISPATCH_STATUS = 'CANCEL' THEN
+        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' THEN
         zsd.PROD_HOURS * zsd.DISPATCH_QTY
         ELSE 0 END) / SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY))
         * 100, '99990.99') rate,--进度（工时百分比）