diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java index c6f7ca05..d34bad6c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java @@ -19,4 +19,9 @@ public class QmsIssueTicketTodoItemSearchQO extends SearchBaseQO { * 来源类型:0=IQC检测任务,1=PDI检测任务,2=巡检,3=PQC检测任务 */ private Integer sourceType; + + /** + * 是否处理完成 + */ + private Boolean hasProcessed; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java index 8620867b..786d7e9b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java @@ -238,7 +238,7 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl taskIds = new java.util.HashSet<>(); for (QmsCoaReview r : reviews) { - if (!Objects.equals(r.getStatus(), 0)) { + if (!Objects.equals(r.getStatus(), 0) && !Objects.equals(r.getStatus(), 3)) { throw new NflgException(STATE.BusinessError, "ID=" + r.getId() + " 的记录不是待提交状态,无法提交"); } // 校验供应商权限 diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml index e59ed8b2..3d1a7cb9 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml @@ -17,6 +17,9 @@ AND vit.source_type = #{request.sourceType} + + AND itd.has_processed = #{request.hasProcessed} + AND vit.ticket_title ilike concat('%', #{request.title}, '%')