|
@@ -489,9 +489,10 @@
|
|
|
from
|
|
|
aps_process_operation_process_equ apope
|
|
|
join aps_process_operation apo on apo.ID = apope.PROCESSID
|
|
|
+ join aps_blank_order abo ON abo.ID = apope.BLANKID
|
|
|
left join aps_process_operation_process_equ preapope on apope.PREVIOUSPROCESSESIDS = preapope.id AND preapope.DELETED = '0'
|
|
|
WHERE
|
|
|
- apope.deleted = '0' AND apo.DELETED = '0'
|
|
|
+ apope.deleted = '0' AND apo.DELETED = '0' AND abo.DELETED = '0'
|
|
|
and apope.TENANTID = #{tenantId}
|
|
|
and apo.PROCESS in ('中退','成退','小卷成退')
|
|
|
and apope.WORKSTATUS = '待开工'
|
|
@@ -516,9 +517,10 @@
|
|
|
from
|
|
|
aps_process_operation_process_equ apope
|
|
|
join aps_process_operation apo on apo.ID = apope.PROCESSID
|
|
|
+ join aps_blank_order abo ON abo.ID = apope.BLANKID
|
|
|
left join aps_process_operation_process_equ preapope on apope.PREVIOUSPROCESSESIDS = preapope.id AND preapope.DELETED = '0'
|
|
|
WHERE
|
|
|
- apope.deleted = '0' AND apo.DELETED = '0'
|
|
|
+ apope.deleted = '0' AND apo.DELETED = '0' AND abo.DELETED = '0'
|
|
|
and apope.TENANTID = #{tenantId}
|
|
|
and apo.PROCESS not in ('铸轧','中退','成退','小卷成退')
|
|
|
and apope.WORKSTATUS = '待开工'
|