From 617d2a7fe196e8cd7415ecf19215e8c6d1739701 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Tue, 7 Jul 2026 17:44:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=B7=BB=E5=8A=A0=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=BB=B4=E5=BA=A6=E7=9A=84=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在QcMapper中为listByPart方法增加supplierNo参数
- 更新SQL映射文件添加manufacturer_id过滤条件
- 修改异常提示信息更准确地反映业务场景
- 调整注释格式提升代码可读性
- 在getTemplates方法中传递供应商编号参数
---
 src/main/java/com/xujie/modules/qms/mapper/QcMapper.java   | 3 ++-
 .../com/xujie/modules/qms/service/impl/QcServiceImpl.java  | 7 ++++---
 src/main/resources/mapper/qms/QcMapper.xml                 | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/modules/qms/mapper/QcMapper.java b/src/main/java/com/xujie/modules/qms/mapper/QcMapper.java
index 8e635b8..db3c7e4 100644
--- a/src/main/java/com/xujie/modules/qms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/modules/qms/mapper/QcMapper.java
@@ -725,7 +725,8 @@ public interface QcMapper {
                        @Param("partNo") String partNo);
 
     List<TemplateDTO> listByPart(@Param("site") String site,
-                                 @Param("partNo") String partNo);
+                                 @Param("partNo") String partNo,
+                                 @Param("supplierNo") String supplierNo);
 
     List<TemplateDetailDTO> listDetail(@Param("templateId") String templateId,
                                        @Param("site") String site,
diff --git a/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java b/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java
index 924065c..46fb4cb 100644
--- a/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java
@@ -5475,7 +5475,7 @@ public class QcServiceImpl implements QcService {
 
         List<TemplateDTO> templates = getTemplates(detail);
         if (templates == null || templates.isEmpty()) {
-            throw new RuntimeException("未配置qc_attribute_template");
+            throw new RuntimeException("该供应商未维护此物料的检验模板");
         }
 
         String inspectionNo = genInspectionNo(detail.getSite());
@@ -5484,7 +5484,7 @@ public class QcServiceImpl implements QcService {
 
         for (TemplateDTO template : templates) {
 
-            // ⑦ 查询模板明细
+            // 查询模板明细
             List<TemplateDetailDTO> items =
                     getTemplateDetail(template.getTemplateId(),
                             detail.getSite(),
@@ -5519,7 +5519,8 @@ public class QcServiceImpl implements QcService {
     private List<TemplateDTO> getTemplates(MyInspectionListVO detail) {
         return qcMapper.listByPart(
                 detail.getSite(),
-                detail.getPartNo());
+                detail.getPartNo(),
+                detail.getSupplierNo());
     }
 
     // ================= 查询模板明细 =================
diff --git a/src/main/resources/mapper/qms/QcMapper.xml b/src/main/resources/mapper/qms/QcMapper.xml
index a6b8c19..70ed60f 100644
--- a/src/main/resources/mapper/qms/QcMapper.xml
+++ b/src/main/resources/mapper/qms/QcMapper.xml
@@ -5055,6 +5055,7 @@
         FROM qc_attribute_template
         WHERE site = #{site}
           AND attribute_no = #{partNo}
+          AND manufacturer_id = #{supplierNo}
     </select>
 
     <select id="listDetail" resultType="com.xujie.modules.qms.entity.vo.TemplateDetailDTO">