From a47c6e08479115b31d54d9cf133d92d63e13da57 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Tue, 9 Aug 2022 13:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=8A=A5=E8=A1=A8=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anomaly/src/main/resources/mapper/ReportMapper.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 0658268b..591199f3 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/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, --已完成数量