Browse Source

fix(inspection): 优化检验模板验证逻辑

- 修改查询条件,不再按供应商编号过滤未维护检验模板的物料
- 移除错误信息中的供应商编号显示
- 更新SQL查询,将制造商ID条件设置为通配符匹配
- 简化排序逻辑,仅按物料编码排序
- 修正注释描述,明确查询范围为物料列表
master
qiankanghui 4 days ago
parent
commit
6e7a38a2fc
  1. 6
      src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
  2. 7
      src/main/resources/mapper/inspection/QcAttributeTemplateMapper.xml

6
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());

7
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>
Loading…
Cancel
Save