生产操作员面板SFC弹出框逻辑修改

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}
         <if test="globalQuery!=null and globalQuery!=''">