From 4dabc327aa8707f6634c260a2cb9ae5631812727 Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Thu, 14 May 2026 11:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BE=E6=9C=9F=E4=BB=BB=E5=8A=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/QmsIssueTicketControllerService.java     | 12 ++++++------
 .../pojo/qo/QmsPdiInspectionResultsSearchQO.java     |  2 +-
 .../mapper/QmsPdiInspectionResultsMapper.xml         |  5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
index 6a2deb7a..f91a9c08 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
@@ -300,9 +300,9 @@ public class QmsIssueTicketControllerService {
             throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在");
         }
 
-        // 2. 校验任务状态必须为3（待流转）
-        if (!Objects.equals(taskRecord.getInspectionEnable(), 3)) {
-            throw new NflgException(STATE.BusinessError, "只有待流转状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable());
+        // 2. 校验任务状态必须为3（待流转）或4（逾期）
+        if (!Objects.equals(taskRecord.getInspectionEnable(), 3) && !Objects.equals(taskRecord.getInspectionEnable(), 4)) {
+            throw new NflgException(STATE.BusinessError, "只有待流转或逾期状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable());
         }
 
         // 3. 校验是否已存在工单
@@ -923,9 +923,9 @@ public class QmsIssueTicketControllerService {
             throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在");
         }
 
-        // 校验任务状态必须为3（待流转）
-        if (!Objects.equals(taskRecord.getInspectionEnable(), 3)) {
-            throw new NflgException(STATE.BusinessError, "只有待流转状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable());
+        // 校验任务状态必须为3（待流转）或4（逾期）
+        if (!Objects.equals(taskRecord.getInspectionEnable(), 3) && !Objects.equals(taskRecord.getInspectionEnable(), 4)) {
+            throw new NflgException(STATE.BusinessError, "只有待流转或逾期状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable());
         }
 
         // 校验是否已存在工单（同一taskRecordId只能创建一次工单）
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiInspectionResultsSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiInspectionResultsSearchQO.java
index d5835cec..efad1e68 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiInspectionResultsSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiInspectionResultsSearchQO.java
@@ -14,7 +14,7 @@ public class QmsPdiInspectionResultsSearchQO {
     private String key;
 
     /**
-     * 任务状态（可选）：0=待流转，1=质检中，2=已完成，3=待流转（逾期）
+     * 任务状态（可选）：0=待流转，1=质检中，2=已完成，3=待流转，4=逾期（根据overdue字段动态判断）
      */
     private Integer inspectionEnable;
 
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml
index cc53c1d9..c3578f30 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml
@@ -32,9 +32,12 @@
                 )
             </if>
             <!-- 任务状态筛选 -->
-            <if test="request.inspectionEnable != null">
+            <if test="request.inspectionEnable != null and request.inspectionEnable != 4">
                 AND t.inspection_enable = #{request.inspectionEnable}
             </if>
+            <if test="request.inspectionEnable != null and request.inspectionEnable == 4">
+                AND t.overdue = true
+            </if>
         </where>
         ORDER BY t.id DESC
     </select>