From b1346da37379e8eb0ab6eee0318dcd832db7fa53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 14 May 2026 09:06:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(qms):=20=E4=BF=AE=E5=A4=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E6=95=B0=E6=8D=AE=E5=88=86=E7=BB=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=92=8C=E5=9B=BE=E5=83=8FID=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整QmsIncomingInspectionTaskRecordItemMapper的SQL，新增关联表和字段，添加image_ids字段
- 增加SQL中task_id过滤条件，确保数据查询的准确性
- 修正QmsIssueTicketControllerService中图像ID合并逻辑，避免空值拼接问题
- 优化图像ID合并条件，确保当已有图像ID为空时直接赋值
- 保证不合格数量的正确累加逻辑
---
 .../service/QmsIssueTicketControllerService.java      | 11 +++++++----
 .../QmsIncomingInspectionTaskRecordItemMapper.xml     |  7 +++++--
 2 files changed, 12 insertions(+), 6 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 fdf802d7..f1826001 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
@@ -1171,14 +1171,17 @@ public class QmsIssueTicketControllerService {
                                 .setId(record.getId())
                                 .setName(record.getName())
                                 .setLegend(record.getLegend())
-                                .setUnqualifiedQty(0)
-                                .setImageIds(record.getImageIds());
+                                .setUnqualifiedQty(0);
                         records.add(r1);
                         return r1;
                     });
             r.setUnqualifiedQty(r.getUnqualifiedQty() + record.getUnqualifiedQty());
-            if (StrUtil.isNotBlank(r.getImageIds())) {
-                r.setImageIds(StrUtil.join(",", r.getImageIds(), record.getImageIds()));
+            if (StrUtil.isNotBlank(record.getImageIds())) {
+                if(StrUtil.isBlank(r.getImageIds())){
+                    r.setImageIds(record.getImageIds());
+                }else {
+                    r.setImageIds(StrUtil.join(",", r.getImageIds(), record.getImageIds()));
+                }
             }
         });
         records.stream()
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml
index a57b2ca4..30307fb3 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml
@@ -4,10 +4,13 @@
 
     <select id="getNonconformanceDataGroups"
             resultType="com.nflg.wms.common.pojo.vo.QmsIssueTicketInspectionRecordItemVO">
-        SELECT isic."id",CASE WHEN isi.item_type=0 THEN isi.name ELSE isic."name" END,isic.legend,iitri.unqualified_qty
-        FROM qms_incoming_inspection_task_record_item iitri
+        SELECT isic."id",CASE WHEN isi.item_type=0 THEN isi.name ELSE isic."name" END,isic.legend,iitri.unqualified_qty,iitrid.image_ids
+        FROM qms_incoming_inspection_task_record iitr
+        INNER JOIN qms_incoming_inspection_task_record_item iitri ON iitr."id"=iitri.record_id
+        INNER JOIN qms_incoming_inspection_task_record_item_data iitrid ON iitrid.item_id=iitri."id"
         INNER JOIN qms_inspection_standard_item_content isic ON iitri.inspection_standard_item_content_id=isic."id"
         INNER JOIN qms_inspection_standard_item isi ON isic.inspection_standard_item_id=isi."id"
+        WHERE iitr.task_id=#{taskId}
     </select>
 
     <select id="getUnqualifiedRecordItems"