|
@@ -55,7 +55,7 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
|
|
|
|
|
|
@Select("<script>select DISTINCT a.*,c.DELIVERYDATE,c.DELIVERYTIME from aps_blank_order a LEFT JOIN aps_process_operation b on a.ID=b.BLANKID LEFT JOIN aps_production_order c on a.PRODUCTIONORDERID=c.ID\n" +
|
|
|
"where a.DELETED='0' and b.DELETED='0' and c.DELETED='0' and (b.LOCKMARK='n' OR b.LOCKMARK is null) " +
|
|
|
- "and c.TENANTID = #{tenantId} and a.SCHEDULINGSTATUS = '20' and a.ISSTAG = '否'" +
|
|
|
+ "and c.TENANTID = #{tenantId} and a.SCHEDULINGSTATUS != '10' and a.ISSTAG = '否'" +
|
|
|
"<if test='hasIds != null and hasIds != '''> " +
|
|
|
" and a.ID not in (${hasIds})" +
|
|
|
"</if></script>")
|