From d6a61c3112cea91ff12d4ab57956ac5c72f8415d Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Tue, 7 Jul 2026 17:56:45 +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=BC=96=E5=8F=B7=E5=8F=82=E6=95=B0=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=A8=A1=E6=9D=BF=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 QcMapper 中为 listDetail 方法添加 supplierNo 参数
- 更新 QcMapper.xml 中的 SQL 查询，添加对供应商的关联查询
- 修改 QcServiceImpl 中的 getTemplateDetail 方法签名以包含供应商编号
- 调整模板明细查询逻辑以支持按供应商过滤数据
---
 .../xujie/modules/qms/mapper/QcMapper.java    |  3 ++-
 .../qms/service/impl/QcServiceImpl.java       |  8 ++++---
 src/main/resources/mapper/qms/QcMapper.xml    | 23 +++++++++++--------
 3 files changed, 21 insertions(+), 13 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 db3c7e4..2e0d352 100644
--- a/src/main/java/com/xujie/modules/qms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/modules/qms/mapper/QcMapper.java
@@ -730,7 +730,8 @@ public interface QcMapper {
 
     List<TemplateDetailDTO> listDetail(@Param("templateId") String templateId,
                                        @Param("site") String site,
-                                       @Param("buNo") String buNo);
+                                       @Param("buNo") String buNo,
+                                       @Param("supplierNo") String supplierNo);
 
     int insertMain(Map<String, Object> map);
 
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 46fb4cb..1007a0c 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
@@ -5488,7 +5488,8 @@ public class QcServiceImpl implements QcService {
             List<TemplateDetailDTO> items =
                     getTemplateDetail(template.getTemplateId(),
                             detail.getSite(),
-                            partAttr.getBuNo());
+                            partAttr.getBuNo(),
+                            detail.getSupplierNo());
 
             if (items == null || items.isEmpty()) {
                 continue;
@@ -5526,8 +5527,9 @@ public class QcServiceImpl implements QcService {
     // ================= 查询模板明细 =================
     private List<TemplateDetailDTO> getTemplateDetail(String templateId,
                                                       String site,
-                                                      String buNo) {
-        return qcMapper.listDetail(templateId, site, buNo);
+                                                      String buNo,
+                                                      String supplierNo) {
+        return qcMapper.listDetail(templateId, site, buNo, supplierNo);
     }
 
     private void insertMain(MyInspectionListVO detail,
diff --git a/src/main/resources/mapper/qms/QcMapper.xml b/src/main/resources/mapper/qms/QcMapper.xml
index 70ed60f..9270802 100644
--- a/src/main/resources/mapper/qms/QcMapper.xml
+++ b/src/main/resources/mapper/qms/QcMapper.xml
@@ -5060,15 +5060,20 @@
 
     <select id="listDetail" resultType="com.xujie.modules.qms.entity.vo.TemplateDetailDTO">
         SELECT
-            template_id AS templateId,
-            ItemNo  AS itemNo,
-            default_value AS defaultValue,
-            min_value AS minValue,
-            max_value AS maxValue
-        FROM qc_template_detailed
-        WHERE template_id = #{templateId}
-          AND site = #{site}
-          AND bu_no = #{buNo}
+            qtd.template_id AS templateId,
+            qtd.ItemNo  AS itemNo,
+            qtd.default_value AS defaultValue,
+            qtd.min_value AS minValue,
+            qtd.max_value AS maxValue
+        FROM qc_template_detailed qtd
+        LEFT JOIN qc_attribute_template qat
+            ON qtd.template_id = qat.template_id
+            AND qtd.site = qat.site
+            AND qtd.bu_no = qat.bu_no
+            AND qat.manufacturer_id = #{supplierNo}
+        WHERE qtd.template_id = #{templateId}
+          AND qtd.site = #{site}
+          AND qtd.bu_no = #{buNo}
     </select>
 
     <insert id="insertMain" parameterType="map">