|
|
|
@ -109,6 +109,25 @@ public class SysFileServiceImpl implements SysFileService { |
|
|
|
@Override |
|
|
|
public List<SysOssEntity> getInspectionFile(SysOssEntity inData) { |
|
|
|
List<SysOssEntity> files1 = sysOssDao.getSysFileByOrderRef2(inData); |
|
|
|
if (files1 == null) { |
|
|
|
files1 = new ArrayList<>(); |
|
|
|
} |
|
|
|
|
|
|
|
// 按料号追加 PartSop 文件 |
|
|
|
if (isNotBlank(inData.getOrderRef1()) && isNotBlank(inData.getPartNo())) { |
|
|
|
List<SysOssEntity> partSopList = sysOssDao.queryPartSopList(inData.getOrderRef1(), inData.getPartNo()); |
|
|
|
markSopDisplayRemark(partSopList, "物料SOP"); |
|
|
|
appendUniqueFiles(files1, partSopList); |
|
|
|
|
|
|
|
// 读取物料分类(1/2/3级)并追加 PartFamilySop 文件 |
|
|
|
List<String> familyIds = sysOssDao.queryPartFamilyIds(inData.getOrderRef1(), inData.getPartNo()); |
|
|
|
if (familyIds != null && !familyIds.isEmpty()) { |
|
|
|
List<SysOssEntity> partFamilySopList = sysOssDao.queryPartFamilySopList(inData.getOrderRef1(), familyIds); |
|
|
|
markSopDisplayRemark(partFamilySopList, "物料分类SOP"); |
|
|
|
appendUniqueFiles(files1, partFamilySopList); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// mes文件 这些是ckp mes里面的 不需要 |
|
|
|
// List<SysOssEntity> list = sysOssDao.searchPartSopListFather(inData); |
|
|
|
// for (SysOssEntity p : list) { |
|
|
|
@ -127,6 +146,56 @@ public class SysFileServiceImpl implements SysFileService { |
|
|
|
return files1; |
|
|
|
} |
|
|
|
|
|
|
|
private void markSopDisplayRemark(List<SysOssEntity> list, String defaultRemark) { |
|
|
|
if (list == null || list.isEmpty()) { |
|
|
|
return; |
|
|
|
} |
|
|
|
for (SysOssEntity entity : list) { |
|
|
|
if (!isNotBlank(entity.getOrderRef3())) { |
|
|
|
if ("物料分类SOP".equals(defaultRemark) && isNotBlank(entity.getOrderRef2())) { |
|
|
|
entity.setOrderRef3(defaultRemark + "(" + entity.getOrderRef2() + ")"); |
|
|
|
} else { |
|
|
|
entity.setOrderRef3(defaultRemark); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void appendUniqueFiles(List<SysOssEntity> target, List<SysOssEntity> source) { |
|
|
|
if (target == null || source == null || source.isEmpty()) { |
|
|
|
return; |
|
|
|
} |
|
|
|
for (SysOssEntity sourceFile : source) { |
|
|
|
if (!containsFile(target, sourceFile)) { |
|
|
|
target.add(sourceFile); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private boolean containsFile(List<SysOssEntity> target, SysOssEntity file) { |
|
|
|
if (target == null || file == null) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
for (SysOssEntity targetFile : target) { |
|
|
|
if (targetFile == null) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
if (targetFile.getId() != null && file.getId() != null |
|
|
|
&& targetFile.getId().equals(file.getId())) { |
|
|
|
return true; |
|
|
|
} |
|
|
|
if (Objects.equals(targetFile.getUrl(), file.getUrl()) |
|
|
|
&& Objects.equals(targetFile.getFileName(), file.getFileName())) { |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
private boolean isNotBlank(String value) { |
|
|
|
return value != null && value.trim().length() > 0; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected SysUserEntity getUser() { |
|
|
|
return (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
|