From 6e7a38a2fcdd97812bca3ce2f17916282a9b46e7 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Wed, 8 Jul 2026 17:28:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(inspection):=20=E4=BC=98=E5=8C=96=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=A8=A1=E6=9D=BF=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改查询条件，不再按供应商编号过滤未维护检验模板的物料
- 移除错误信息中的供应商编号显示
- 更新SQL查询，将制造商ID条件设置为通配符匹配
- 简化排序逻辑，仅按物料编码排序
- 修正注释描述，明确查询范围为物料列表
---
 .../service/impl/InspectionRequestServiceImpl.java         | 6 ++----
 .../mapper/inspection/QcAttributeTemplateMapper.xml        | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
index 3d7e1ba..337a1f8 100644
--- a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
+++ b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
@@ -664,7 +664,7 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH
     }
 
     private void validateInspectionTemplate(String site, List<String> requestNos) {
-        // 查询未维护检验模板的物料和供应商组合
+        // 查询未维护检验模板的物料列表
         List<HashMap<String, Object>> missingTemplates = qcAttributeTemplateMapper.findMissingTemplates(site, requestNos);
 
         if (missingTemplates != null && !missingTemplates.isEmpty()) {
@@ -673,13 +673,11 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH
             for (int i = 0; i < missingTemplates.size(); i++) {
                 HashMap<String, Object> item = missingTemplates.get(i);
                 String attributeNo = (String) item.get("attributeNo");
-                String manufacturerId = (String) item.get("manufacturerId");
 
                 if (i > 0) {
                     errorMsg.append("；");
                 }
-                errorMsg.append("物料编码：").append(attributeNo)
-                        .append("，供应商编号：").append(manufacturerId);
+                errorMsg.append("物料编码：").append(attributeNo);
             }
 
             throw new RuntimeException(errorMsg.toString());
diff --git a/src/main/resources/mapper/inspection/QcAttributeTemplateMapper.xml b/src/main/resources/mapper/inspection/QcAttributeTemplateMapper.xml
index 169d758..5fa134e 100644
--- a/src/main/resources/mapper/inspection/QcAttributeTemplateMapper.xml
+++ b/src/main/resources/mapper/inspection/QcAttributeTemplateMapper.xml
@@ -5,8 +5,7 @@
     <!-- 查询申请单中没有维护检验模板的物料列表 -->
     <select id="findMissingTemplates" resultType="java.util.HashMap">
         SELECT DISTINCT
-            d.part_no AS attributeNo,
-            h.supplier_no AS manufacturerId
+            d.part_no AS attributeNo
         FROM srm_inspect_request_detail_sub d
         LEFT JOIN srm_inspection_request_header h
             ON d.site = h.site
@@ -21,9 +20,9 @@
               FROM qc_attribute_template t
               WHERE t.site = d.site
                 AND t.attribute_no = d.part_no
-                AND t.manufacturer_id = h.supplier_no
+                AND t.manufacturer_id = '*'
           )
-        ORDER BY d.part_no, h.supplier_no
+        ORDER BY d.part_no
     </select>
 
 </mapper>