From 62a2750e5a6e7f0e7be629c15290a562003eca41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 29 Apr 2026 08:56:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(qms-incoming-inspection):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DAQL=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E5=92=8C=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在QmsIncomingInspectionTaskAqlRuleVO中新增id、calculatedAqlTypeName和usedAqlTypeName字段
- 修改QmsIncomingInspectionTaskAqlRuleMapper.xml，新增id字段及AQL类型名称的关联查询
- 通过LEFT JOIN字典项表获取calculated_aql_type和used_aql_type的名称
- 修复QmsIssueTicketControllerService中待办事项编码设置，改为使用taskNo代替错误生成序列号
---
 .../service/QmsIssueTicketControllerService.java     |  2 +-
 .../pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java  | 12 ++++++++++++
 .../QmsIncomingInspectionTaskAqlRuleMapper.xml       |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

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 1978d801..f9e4bc31 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
@@ -229,7 +229,7 @@ public class QmsIssueTicketControllerService {
                         .eq(User::getPurchasingGroup, detail.getPurchaseGroup())
                         .list();
                 List<QmsTodoItem> todoItems = users.stream().map(user -> new QmsTodoItem()
-                        .setCode(basdeSerialNumberControllerService.generateSerialNumber(32))
+                        .setCode(detail.getTaskNo())
                         .setSourceTypeId(dictionaryItemService.getIdByCode("MessageType", "IncomingMaterialInspectionApproval"))
                         .setSourceId(entity.getId())
                         .setCreateUserId(user.getId())
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java
index 0d393244..57e86378 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java
@@ -10,6 +10,8 @@ import java.time.LocalDateTime;
 @Data
 public class QmsIncomingInspectionTaskAqlRuleVO {
 
+    private Long id;
+
     /**
      * 检测任务编号
      */
@@ -50,11 +52,21 @@ public class QmsIncomingInspectionTaskAqlRuleVO {
      */
     private Long calculatedAqlType;
 
+    /**
+     * 计算的AQL类型名称
+     */
+    private String calculatedAqlTypeName;
+
     /**
      * 使用的AQL类型（字典项id）
      */
     private Long usedAqlType;
 
+    /**
+     * 使用的AQL类型名称
+     */
+    private String usedAqlTypeName;
+
     /**
      * 触发类别：0=默认状态，1=触发规则，2=手动调整
      */
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml
index 51d2640e..4c5ec0c1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskAqlRuleMapper.xml
@@ -4,6 +4,7 @@
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskAqlRuleVO">
         SELECT
+            r.id,
             t.task_no,
             t.supplier_code,
             t.supplier_name,
@@ -12,7 +13,9 @@
             m.material_desc,
             s.version,
             r.calculated_aql_type,
+            di1.name AS calculated_aql_type_name,
             r.used_aql_type,
+            di2.name AS used_aql_type_name,
             r.trigger_category,
             CASE r.trigger_category
                 WHEN 0 THEN '默认状态'
@@ -26,6 +29,8 @@
         INNER JOIN qms_incoming_inspection_task t ON r.task_id = t.id
         INNER JOIN qms_qc_material m ON t.material_id = m.id
         LEFT JOIN qms_inspection_standard s ON r.inspection_standard_id = s.id
+        LEFT JOIN dictionary_item di1 on r.calculated_aql_type=di1.id
+        LEFT JOIN dictionary_item di2 on r.used_aql_type=di2.id
         <where>
             t.inspection_status IN (0, 1)
             <if test="request.supplierCode != null and request.supplierCode != ''">