|
|
@ -664,7 +664,7 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void validateInspectionTemplate(String site, List<String> requestNos) { |
|
|
private void validateInspectionTemplate(String site, List<String> requestNos) { |
|
|
// 查询未维护检验模板的物料和供应商组合 |
|
|
|
|
|
|
|
|
// 查询未维护检验模板的物料列表 |
|
|
List<HashMap<String, Object>> missingTemplates = qcAttributeTemplateMapper.findMissingTemplates(site, requestNos); |
|
|
List<HashMap<String, Object>> missingTemplates = qcAttributeTemplateMapper.findMissingTemplates(site, requestNos); |
|
|
|
|
|
|
|
|
if (missingTemplates != null && !missingTemplates.isEmpty()) { |
|
|
if (missingTemplates != null && !missingTemplates.isEmpty()) { |
|
|
@ -673,13 +673,11 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH |
|
|
for (int i = 0; i < missingTemplates.size(); i++) { |
|
|
for (int i = 0; i < missingTemplates.size(); i++) { |
|
|
HashMap<String, Object> item = missingTemplates.get(i); |
|
|
HashMap<String, Object> item = missingTemplates.get(i); |
|
|
String attributeNo = (String) item.get("attributeNo"); |
|
|
String attributeNo = (String) item.get("attributeNo"); |
|
|
String manufacturerId = (String) item.get("manufacturerId"); |
|
|
|
|
|
|
|
|
|
|
|
if (i > 0) { |
|
|
if (i > 0) { |
|
|
errorMsg.append(";"); |
|
|
errorMsg.append(";"); |
|
|
} |
|
|
} |
|
|
errorMsg.append("物料编码:").append(attributeNo) |
|
|
|
|
|
.append(",供应商编号:").append(manufacturerId); |
|
|
|
|
|
|
|
|
errorMsg.append("物料编码:").append(attributeNo); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
throw new RuntimeException(errorMsg.toString()); |
|
|
throw new RuntimeException(errorMsg.toString()); |
|
|
|