From b2c9a24a044472c7321be6d0b3df0f00d1338a25 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 12 Nov 2021 11:16:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=93=8D=E4=BD=9C=E5=91=98?= =?UTF-8?q?=E9=9D=A2=E6=9D=BFSFC=E5=BC=B9=E5=87=BA=E6=A1=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meapi/src/main/resources/mapper/SfcMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 4bd762d0..b403966e 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -678,10 +678,11 @@ JOIN Z_PROD_READY_TASK zprt ON ZPRT.SFC_DISPATCH_BO=zsd.HANDLE JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO AND SR2.IN_USE = 'true' - JOIN SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0) AND ZSD.STEP_ID = SS.STEP_ID + LEFT JOIN SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0) + JOIN SFC_STEP SSS ON SR2.HANDLE =SSS.SFC_ROUTER_BO AND SSS.STEP_ID = ZSD.STEP_ID AND SSS.BYPASSED = 'false' WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START') AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404') - AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' AND SS.BYPASSED = 'false' + AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' ) T WHERE T.SITE = #{ew.entity.site}