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 listByPart(@Param("site") String site, - @Param("partNo") String partNo); + @Param("partNo") String partNo, + @Param("supplierNo") String supplierNo); List 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 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 items = getTemplateDetail(template.getTemplateId(), detail.getSite(), @@ -5519,7 +5519,8 @@ public class QcServiceImpl implements QcService { private List 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}