|
|
|
@ -405,52 +405,52 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (row.getCell(13) == null || getStringCellValue(row, 13).equals("")) { |
|
|
|
throw new RuntimeException("Certification cannot be empty!(line:"+ j + ")"); |
|
|
|
} |
|
|
|
// 将由-分隔的getStringCellValue(row, 13)转换为List<String> |
|
|
|
String[] split2 = getStringCellValue(row, 13).split("-"); |
|
|
|
List<String> certificationNoList = new ArrayList<>(Arrays.asList(split2)); |
|
|
|
BasePicture basePicture = new BasePicture(); |
|
|
|
ArrayList<ExternalPartPicture> externalPartPictureList2 = new ArrayList<>(); |
|
|
|
for (String certificationNo : certificationNoList) { |
|
|
|
// 查询Certification是否存在 |
|
|
|
basePicture.setCertificationNo(certificationNo); |
|
|
|
BasePicture basePicture1 = basePictureService.getBaseMapper().selectOne(new QueryWrapper<>(basePicture)); |
|
|
|
if (basePicture1 == null) { |
|
|
|
throw new RuntimeException("Certification does not exist!(Certification No:"+ certificationNo + ")"); |
|
|
|
} |
|
|
|
// 新增关联图片 |
|
|
|
ExternalPartPicture externalPartPicture = new ExternalPartPicture(); |
|
|
|
externalPartPicture.setSite(data.getSite()); |
|
|
|
externalPartPicture.setPartNo(task.getPartNo()); |
|
|
|
// 设置图片编号为certificationNoList循环的次数+1 |
|
|
|
externalPartPicture.setPictureNo(certificationNoList.indexOf(certificationNo) + 1); |
|
|
|
externalPartPicture.setPictureDesc(basePicture1.getPictureDesc()); |
|
|
|
externalPartPicture.setPictureUrl(basePicture1.getPictureUrl()); |
|
|
|
externalPartPicture.setPictureFileName(basePicture1.getPictureFileName()); |
|
|
|
externalPartPicture.setPictureNewFileName(basePicture1.getPictureNewFileName()); |
|
|
|
externalPartPicture.setPictureType(basePicture1.getPictureType()); |
|
|
|
externalPartPicture.setCreateBy(data.getCreateBy()); |
|
|
|
externalPartPicture.setCreateTime(new Date()); |
|
|
|
externalPartPicture.setBasePictureNo(basePicture1.getPictureNo()); |
|
|
|
externalPartPicture.setPictureClassify("BoxPicture"); |
|
|
|
externalPartPicture.setProvisionalData("Y"); |
|
|
|
// 判断是否存在相同的关联图片 |
|
|
|
if (!externalPartPictureList2.isEmpty()) { |
|
|
|
for (ExternalPartPicture partPicture : externalPartPictureList2) { |
|
|
|
if (partPicture.getBasePictureNo().equals(externalPartPicture.getBasePictureNo())) { |
|
|
|
throw new RuntimeException("Certification cannot be repeated!(line:" + j + ")"); |
|
|
|
if (row.getCell(13) != null && !getStringCellValue(row, 13).equals("")) { |
|
|
|
// 将由-分隔的getStringCellValue(row, 13)转换为List<String> |
|
|
|
String[] split2 = getStringCellValue(row, 13).split("-"); |
|
|
|
List<String> certificationNoList = new ArrayList<>(Arrays.asList(split2)); |
|
|
|
BasePicture basePicture = new BasePicture(); |
|
|
|
ArrayList<ExternalPartPicture> externalPartPictureList2 = new ArrayList<>(); |
|
|
|
for (String certificationNo : certificationNoList) { |
|
|
|
// 查询Certification是否存在 |
|
|
|
basePicture.setCertificationNo(certificationNo); |
|
|
|
BasePicture basePicture1 = basePictureService.getBaseMapper().selectOne(new QueryWrapper<>(basePicture)); |
|
|
|
if (basePicture1 == null) { |
|
|
|
throw new RuntimeException("Certification does not exist!(Certification No:"+ certificationNo + ")"); |
|
|
|
} |
|
|
|
// 新增关联图片 |
|
|
|
ExternalPartPicture externalPartPicture = new ExternalPartPicture(); |
|
|
|
externalPartPicture.setSite(data.getSite()); |
|
|
|
externalPartPicture.setPartNo(task.getPartNo()); |
|
|
|
// 设置图片编号为certificationNoList循环的次数+1 |
|
|
|
externalPartPicture.setPictureNo(certificationNoList.indexOf(certificationNo) + 1); |
|
|
|
externalPartPicture.setPictureDesc(basePicture1.getPictureDesc()); |
|
|
|
externalPartPicture.setPictureUrl(basePicture1.getPictureUrl()); |
|
|
|
externalPartPicture.setPictureFileName(basePicture1.getPictureFileName()); |
|
|
|
externalPartPicture.setPictureNewFileName(basePicture1.getPictureNewFileName()); |
|
|
|
externalPartPicture.setPictureType(basePicture1.getPictureType()); |
|
|
|
externalPartPicture.setCreateBy(data.getCreateBy()); |
|
|
|
externalPartPicture.setCreateTime(new Date()); |
|
|
|
externalPartPicture.setBasePictureNo(basePicture1.getPictureNo()); |
|
|
|
externalPartPicture.setPictureClassify("BoxPicture"); |
|
|
|
externalPartPicture.setProvisionalData("Y"); |
|
|
|
// 判断是否存在相同的关联图片 |
|
|
|
if (!externalPartPictureList2.isEmpty()) { |
|
|
|
for (ExternalPartPicture partPicture : externalPartPictureList2) { |
|
|
|
if (partPicture.getBasePictureNo().equals(externalPartPicture.getBasePictureNo())) { |
|
|
|
throw new RuntimeException("Certification cannot be repeated!(line:" + j + ")"); |
|
|
|
} |
|
|
|
} |
|
|
|
externalPartPictureList2.add(externalPartPicture); |
|
|
|
externalPartPictureList.add(externalPartPicture); |
|
|
|
} else { |
|
|
|
externalPartPictureList2.add(externalPartPicture); |
|
|
|
externalPartPictureList.add(externalPartPicture); |
|
|
|
} |
|
|
|
externalPartPictureList2.add(externalPartPicture); |
|
|
|
externalPartPictureList.add(externalPartPicture); |
|
|
|
} else { |
|
|
|
externalPartPictureList2.add(externalPartPicture); |
|
|
|
externalPartPictureList.add(externalPartPicture); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Category categoryByValue = categoryService.getCategoryByValue(task.getCategory()); |
|
|
|
task.setManufacturerRequired(categoryByValue.getManufacturerRequired()); |
|
|
|
task.setMoldCodeRequired(categoryByValue.getMoldCodeRequired()); |
|
|
|
|