From 4c80407a2aa1502d4971455ad1aa416d0498078e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Sun, 14 Jun 2026 15:35:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(qms):=20=E4=BF=AE=E5=A4=8DCOA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C=E5=B9=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复COA审核时状态校验逻辑，排除状态3的数据
- 新增工单待办项查询对象中的hasProcessed字段
- 在工单待办项查询SQL中添加hasProcessed过滤条件
- 完善异常提示信息，明确待提交状态要求
---
 .../wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java   | 5 +++++
 .../wms/repository/service/impl/QmsCoaReviewServiceImpl.java | 2 +-
 .../src/main/resources/mapper/QmsIssueTicketToDoMapper.xml   | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

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<QmsCoaReviewMapper, Qms
         
         Set<Long> 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 @@
         <if test="request.sourceType != null">
             AND vit.source_type = #{request.sourceType}
         </if>
+        <if test="request.hasProcessed != null">
+            AND itd.has_processed = #{request.hasProcessed}
+        </if>
         <if test="request.title != null and request.title != ''">
             AND vit.ticket_title ilike concat('%', #{request.title}, '%')
         </if>