Merge remote-tracking branch 'origin/master'

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

@@ -1154,7 +1154,10 @@
         WIP.SFC "SFC",
         WIP.itemDescription "itemDescription",
         WIP.shopOrderQTY "shopOrderQTY",
-        WIP.doneQTY "doneQTY",
+        CASE
+        WHEN zsd2.DISPATCH_STATUS = 'COMPLETE' THEN
+        zsd2.DISPATCH_QTY
+        ELSE 0 END "doneQTY",--已完成数量
         WIP.rate || '%' "rate",
         OT.DESCRIPTION "currentOperation",
         WIP.nextOperationNum "nextOperationNum",
@@ -1162,9 +1165,9 @@
         WIP.endPlanTime "endPlanTime",
         WIP.rework "rework",--是否返修工序
         CASE
-        WHEN WIP.nextOperationNum > 0 AND SYSDATE > zsd2.PLANNED_COMP_DATE
+        WHEN WIP.nextOperationNum > 0 AND SYSDATE > zsd2.PLANNED_COMP_DATE AND zsd2.DISPATCH_STATUS != 'COMPLETE'
         THEN 'true'
-        WHEN WIP.nextOperationNum = 0 AND WIP.rate !=100.00 AND SYSDATE > zsd2.PLANNED_COMP_DATE
+        WHEN WIP.nextOperationNum = 0 AND WIP.rate !=100.00 AND SYSDATE > zsd2.PLANNED_COMP_DATE AND zsd2.DISPATCH_STATUS != 'COMPLETE'
         THEN 'true'
         ELSE 'false' END   "isOverTime" --当前工序是否超时
         FROM (SELECT cf.VALUE item,--项目号
@@ -1172,8 +1175,8 @@
         zsd.SHOP_ORDER shopOrder,--订单编号
         zsd.SFC SFC,--SFC
         it.DESCRIPTION itemDescription,--物料描述
-        SUM(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量
-        SUM(CASE
+        MAX(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量
+        MIN(CASE
         WHEN zsd.DISPATCH_STATUS = 'COMPLETE' THEN
         zsd.DISPATCH_QTY
         ELSE 0 END) doneQTY, --已完成数量