From cb33f015133d410800abe7bbc4d54fcea1bd8f37 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Thu, 11 Jun 2026 15:22:45 +0800
Subject: [PATCH] =?UTF-8?q?pqc=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QmsPqcTaskRecordController.java           |  4 +++-
 .../QmsPqcTaskRecordControllerService.java    | 22 ++++++++++++-----
 .../vo/QmsPqcTaskSubmitUnqualifiedVO.java     | 24 +++++++++++++++++++
 3 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskSubmitUnqualifiedVO.java

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcTaskRecordController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcTaskRecordController.java
index e1f687b9..a64bbfd4 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcTaskRecordController.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcTaskRecordController.java
@@ -107,7 +107,9 @@ public class QmsPqcTaskRecordController {
         if (result.getType() == 1) {
             throw new NflgException(STATE.BusinessError, "有未填写的检测项");
         } else if (result.getType() == 2) {
-            return ApiResult.success(result.getUnqualifiedItems());
+            return ApiResult.success(new QmsPqcTaskSubmitUnqualifiedVO()
+                    .setTicketId(result.getTicketId())
+                    .setUnqualifiedItems(result.getUnqualifiedItems()));
         } else {
             return ApiResult.success();
         }
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
index 07cc8331..003f2372 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
@@ -1039,8 +1039,8 @@ public class QmsPqcTaskRecordControllerService {
         Map<Long, Long> detailIdMap = getTaskDetailIdMap(taskRecord.getId());
         List<QmsPqcUnqualifiedItemVO> unqualifiedItems = buildUnqualifiedItems(request, detailIdMap);
         if (!unqualifiedItems.isEmpty()) {
-            handleUnqualifiedTask(taskRecord, currentUserId, currentUserName, now);
-            return SubmitResult.unqualified(unqualifiedItems);
+            Long ticketId = handleUnqualifiedTask(taskRecord, currentUserId, currentUserName, now);
+            return SubmitResult.unqualified(ticketId, unqualifiedItems);
         }
 
         return SubmitResult.success();
@@ -1517,7 +1517,7 @@ public class QmsPqcTaskRecordControllerService {
         return result;
     }
 
-    private String handleUnqualifiedTask(QmsPqcTaskRecord taskRecord,
+    private Long handleUnqualifiedTask(QmsPqcTaskRecord taskRecord,
                                        Long currentUserId, String currentUserName, LocalDateTime now) {
         // 1. 生成工单（状态为0待流转）
         String ticketNo = basdeSerialNumberControllerService.generateSerialNumber(41);
@@ -1540,7 +1540,7 @@ public class QmsPqcTaskRecordControllerService {
 
         // 2. 任务总体合格时，仅生成工单，不创建重检任务
         if (!Boolean.FALSE.equals(taskRecord.getEnable())) {
-            return ticketNo;
+            return ticket.getId();
         }
 
         // 3. 创建返修任务
@@ -1609,7 +1609,7 @@ public class QmsPqcTaskRecordControllerService {
         }
 
         // 返回工单编号
-        return ticketNo;
+        return ticket.getId();
     }
 
     /**
@@ -1795,6 +1795,11 @@ public class QmsPqcTaskRecordControllerService {
          * 不合格项列表（type=2时使用）
          */
         private List<QmsPqcUnqualifiedItemVO> unqualifiedItems;
+
+        /**
+         * 工单ID（type=2时使用）
+         */
+        private Long ticketId;
         
         public static SubmitResult emptyFields(List<String> emptyFields) {
             SubmitResult result = new SubmitResult();
@@ -1803,9 +1808,10 @@ public class QmsPqcTaskRecordControllerService {
             return result;
         }
 
-        public static SubmitResult unqualified(List<QmsPqcUnqualifiedItemVO> unqualifiedItems) {
+        public static SubmitResult unqualified(Long ticketId, List<QmsPqcUnqualifiedItemVO> unqualifiedItems) {
             SubmitResult result = new SubmitResult();
             result.type = 2;
+            result.ticketId = ticketId;
             result.unqualifiedItems = unqualifiedItems;
             return result;
         }
@@ -1827,5 +1833,9 @@ public class QmsPqcTaskRecordControllerService {
         public List<QmsPqcUnqualifiedItemVO> getUnqualifiedItems() {
             return unqualifiedItems;
         }
+
+        public Long getTicketId() {
+            return ticketId;
+        }
     }
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskSubmitUnqualifiedVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskSubmitUnqualifiedVO.java
new file mode 100644
index 00000000..7d8f44c7
--- /dev/null
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskSubmitUnqualifiedVO.java
@@ -0,0 +1,24 @@
+package com.nflg.wms.common.pojo.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * PQC任务提交不合格返回
+ */
+@Data
+@Accessors(chain = true)
+public class QmsPqcTaskSubmitUnqualifiedVO {
+
+    /**
+     * 工单ID
+     */
+    private Long ticketId;
+
+    /**
+     * 不合格项列表
+     */
+    private List<QmsPqcUnqualifiedItemVO> unqualifiedItems;
+}