From dcc997d5eca2ef6808f6acc423ebd5c2872b06bf Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Mon, 22 Aug 2022 10:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97=E4=BA=A7?= =?UTF-8?q?=E8=83=BD=E4=B8=8D=E8=B6=B3=E4=B8=80=E5=B0=8F=E6=97=B6=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E4=B8=BA0=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql index 1d76f614..8520c0bd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql @@ -317,10 +317,11 @@ FROM ( SELECT - device.productivity, - device.productivity * TIMESTAMPDIFF( HOUR, realproducestart_date, now( ) ) AS max_productivity, - shiftorder.produceorder_code, - shiftorder.realproducestart_date + device.productivity, + CASE WHEN TIMESTAMPDIFF( HOUR, realproducestart_date, now( ) ) = '0' THEN device.productivity + ELSE device.productivity * TIMESTAMPDIFF( HOUR, realproducestart_date, now( ) ) END AS max_productivity, + shiftorder.produceorder_code, + shiftorder.realproducestart_date FROM pdm_bi_device device RIGHT JOIN MPS_BD_ProduceShiftOrder shiftorder ON shiftorder.device_id = device.device_id