|
|
|
@ -116,6 +116,21 @@ |
|
|
|
and s.order_type = a.order_type |
|
|
|
and s.assignee_user_id = #{userId} |
|
|
|
and n.status != '已完成' |
|
|
|
and ( |
|
|
|
upper(isnull(a.node_report_mode, |
|
|
|
case |
|
|
|
when a.order_type in ('MACHINING', 'RENOVATION') then 'SEQUENTIAL' |
|
|
|
else 'PARALLEL' |
|
|
|
end |
|
|
|
)) != 'SEQUENTIAL' |
|
|
|
or n.node_code = ( |
|
|
|
select top 1 n2.node_code |
|
|
|
from lc_production_order_node n2 |
|
|
|
where n2.order_no = a.order_no |
|
|
|
and n2.status != '已完成' |
|
|
|
order by n2.sort_no asc |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
and a.status != '已完成' |
|
|
|
<if test="query.orderType != null and query.orderType != ''"> |
|
|
|
|