生产操作员面板查询sfc调整

meapi/src/main/resources/mapper/SfcMapper.xml

@@ -676,16 +676,10 @@
         JOIN Z_SFC_DISPATCH zsd ON S.SFC=zsd.SFC AND S.SITE=zsd.SITE
        LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1 AND  zsd.ROUTER_BO=PREZSD.ROUTER_BO
         JOIN Z_PROD_READY_TASK zprt ON ZPRT.SFC_DISPATCH_BO=zsd.HANDLE
-       	JOIN SFC S ON S.SFC=ZSD.SFC AND S.SITE=ZSD.SITE
         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'
-        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 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
         WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START')
-        AND SS.OPERATION_BO LIKE '%' || ( SELECT RT.RESOURCE_TYPE FROM RESRCE r
-            LEFT JOIN RESOURCE_TYPE_RESOURCE rtr ON RTR.RESOURCE_BO = R.HANDLE
-            LEFT JOIN RESOURCE_TYPE rt ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
-            WHERE R.RESRCE = #{ew.entity.resrce} AND R.SITE = #{ew.entity.site} ) || '%'
-        AND SS.BYPASSED = 'false'
         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'
          ) T